diff --git a/application/pom.xml b/application/pom.xml
index c2d80d62ac..d97f6d92e3 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>application</artifactId>
diff --git a/application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json b/application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json
index 9adeb4f49e..6701b59e0e 100644
--- a/application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json
+++ b/application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json
@@ -33,8 +33,13 @@
         },
         "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
         "name": "Save Timeseries",
+        "configurationVersion": 1,
         "configuration": {
-          "defaultTTL": 0
+          "defaultTTL": 0,
+          "useServerTs": false,
+          "processingSettings": {
+            "type": "ON_EVERY_MESSAGE"
+          }
         },
         "externalId": null
       },
@@ -185,4 +190,4 @@
     ],
     "ruleChainConnections": null
   }
-}
\ No newline at end of file
+}
diff --git a/application/src/main/data/json/system/scada_symbols/3-phase-voltage-relay-hp.svg b/application/src/main/data/json/system/scada_symbols/3-phase-voltage-relay-hp.svg
new file mode 100644
index 0000000000..f6d881b172
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/3-phase-voltage-relay-hp.svg
@@ -0,0 +1,548 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="400" fill="none" version="1.1" viewBox="0 0 400 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP 3 phase voltage relay",
+  "description": "Three phase voltage relay with various states and inications.",
+  "searchTags": [
+    "energy",
+    "power",
+    "protection"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "firstPhaseIndicator",
+      "stateRenderFunction": "if (ctx.values.running) {\n    element.stroke(ctx.properties.phaseIndicatorColor);\n    if (!ctx.values.firstPhaseVoltage) {\n        element.fill('#fff');\n    } else {\n        element.fill(ctx.properties.phaseIndicatorColor);\n    }\n} else {\n    element.stroke('#000');\n    element.fill(ctx.properties.stoppedColor);\n}",
+      "actions": null
+    },
+    {
+      "tag": "firstPhaseValue",
+      "stateRenderFunction": "if (ctx.values.running) {\n    element.show();\n    ctx.api.font(element, ctx.properties.currentVoltageFont, ctx.properties.currentVoltageColor);\n    ctx.api.text(element, ctx.api.formatValue(ctx.values.firstPhaseVoltage, 0, null, 0));\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "secondPhaseIndicator",
+      "stateRenderFunction": "if (ctx.values.running) {\n    element.stroke(ctx.properties.phaseIndicatorColor);\n    if (!ctx.values.secondPhaseVoltage) {\n        element.fill('#fff');\n    } else {\n        element.fill(ctx.properties.phaseIndicatorColor);\n    }\n} else {\n    element.stroke('#000');\n    element.fill(ctx.properties.stoppedColor);\n}",
+      "actions": null
+    },
+    {
+      "tag": "secondPhaseValue",
+      "stateRenderFunction": "if (ctx.values.running) {\n    element.show();\n    ctx.api.font(element, ctx.properties.currentVoltageFont, ctx.properties.currentVoltageColor);\n    ctx.api.text(element, ctx.api.formatValue(ctx.values.secondPhaseVoltage, 0, null, 0));\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "thirdPhaseIndicator",
+      "stateRenderFunction": "if (ctx.values.running) {\n    element.stroke(ctx.properties.phaseIndicatorColor);\n    if (!ctx.values.thirdPhaseVoltage) {\n        element.fill('#fff');\n    } else {\n        element.fill(ctx.properties.phaseIndicatorColor);\n    }\n} else {\n    element.stroke('#000');\n    element.fill(ctx.properties.stoppedColor);\n}",
+      "actions": null
+    },
+    {
+      "tag": "thirdPhaseValue",
+      "stateRenderFunction": "if (ctx.values.running) {\n    element.show();\n    ctx.api.font(element, ctx.properties.currentVoltageFont, ctx.properties.currentVoltageColor);\n    ctx.api.text(element, ctx.api.formatValue(ctx.values.thirdPhaseVoltage, 0, null, 0));\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "units",
+      "stateRenderFunction": "if (ctx.properties.showUnits) {\n    element.show();\n    ctx.api.font(element, ctx.properties.unitsFont, ctx.properties.unitsColor);\n    ctx.api.text(element, ctx.properties.units);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.valueBoxBackground;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "firstPhaseVoltage",
+      "name": "{i18n:scada.symbol.first-phase-voltage}",
+      "hint": "{i18n:scada.symbol.phase-voltage-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "firstPhaseVoltage"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "secondPhaseVoltage",
+      "name": "{i18n:scada.symbol.second-phase-voltage}",
+      "hint": "{i18n:scada.symbol.phase-voltage-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "secondPhaseVoltage"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "thirdPhaseVoltage",
+      "name": "{i18n:scada.symbol.third-phase-voltage}",
+      "hint": "{i18n:scada.symbol.phase-voltage-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "thirdPhaseVoltage"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "phaseIndicatorColor",
+      "name": "{i18n:scada.symbol.phase-indicator-color}",
+      "type": "color",
+      "default": "#198038",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "currentVoltageFont",
+      "name": "{i18n:scada.symbol.current-voltage-color}",
+      "type": "font",
+      "default": {
+        "size": 32,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "400",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "currentVoltageColor",
+      "name": "{i18n:scada.symbol.current-voltage-color}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showUnits",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "units",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "units",
+      "default": "V",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "unitsFont",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "font",
+      "default": {
+        "size": 24,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "500",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "unitsColor",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect width="400" height="400" fill="#fff" tb:tag="background"/><rect x="1" y="1" width="398" height="398" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="200" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="112" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="288" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="200" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="112" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="288" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="150" y="180" width="100" height="80" rx="2" fill="#DEDEDE" tb:tag="value-box"/><rect x="151" y="181" width="98" height="78" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="270" y="180" width="100" height="80" rx="2" fill="#DEDEDE" tb:tag="value-box"/><rect x="271" y="181" width="98" height="78" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="30" y="180" width="100" height="80" rx="2" fill="#DEDEDE" tb:tag="value-box"/><rect x="31" y="181" width="98" height="78" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/><text x="201.6431" y="233.64844" fill="#002878" font-family="Roboto" font-size="32px" font-weight="400" text-anchor="middle" tb:tag="secondPhaseValue" xml:space="preserve"><tspan dominant-baseline="start">220</tspan></text><text x="321.46201" y="233.29332" fill="#002878" font-family="Roboto" font-size="32px" font-weight="400" text-anchor="middle" tb:tag="thirdPhaseValue" xml:space="preserve"><tspan dominant-baseline="start">220</tspan></text><text x="81.372673" y="233.21404" fill="#002878" font-family="Roboto" font-size="32px" font-weight="400" text-anchor="middle" tb:tag="firstPhaseValue" xml:space="preserve"><tspan dominant-baseline="start">220</tspan></text><circle cx="80" cy="146" r="10" fill="#198038" stroke="#198038" stroke-width=".5" tb:tag="firstPhaseIndicator"/><path d="m79.446 125.67v2.332h-8.5664v-2.332h8.5664zm-7.7461-14.73v17.062h-2.9414v-17.062h2.9414zm17.635-0.059v17.121h-2.8242v-13.77l-4.1836 1.418v-2.332l6.668-2.437h0.3398z" fill="#000" fill-opacity=".87"/><circle cx="199" cy="146" r="10" fill="#198038" stroke="#198038" stroke-width=".5" tb:tag="secondPhaseIndicator"/><path d="m198.45 125.67v2.332h-8.566v-2.332h8.566zm-7.746-14.73v17.062h-2.941v-17.062h2.941zm21.362 14.812v2.25h-11.438v-1.934l5.555-6.058c0.609-0.688 1.09-1.281 1.441-1.781 0.352-0.5 0.598-0.95 0.739-1.348 0.148-0.406 0.222-0.801 0.222-1.184 0-0.539-0.101-1.011-0.304-1.418-0.196-0.414-0.485-0.738-0.868-0.972-0.382-0.243-0.847-0.364-1.394-0.364-0.633 0-1.164 0.137-1.594 0.411-0.43 0.273-0.754 0.652-0.972 1.136-0.219 0.477-0.329 1.024-0.329 1.641h-2.824c0-0.992 0.227-1.899 0.68-2.719 0.453-0.828 1.109-1.484 1.969-1.969 0.859-0.492 1.894-0.738 3.105-0.738 1.141 0 2.109 0.192 2.906 0.574 0.797 0.383 1.403 0.926 1.817 1.629 0.422 0.703 0.633 1.535 0.633 2.496 0 0.532-0.086 1.059-0.258 1.582-0.172 0.524-0.418 1.047-0.739 1.571-0.312 0.515-0.683 1.035-1.113 1.558-0.43 0.516-0.902 1.039-1.418 1.571l-3.691 4.066h7.875z" fill="#000" fill-opacity=".87"/><circle cx="320" cy="146" r="10" fill="#198038" stroke="#198038" stroke-width=".5" tb:tag="thirdPhaseIndicator"/><path d="m319.45 125.67v2.332h-8.566v-2.332h8.566zm-7.746-14.73v17.062h-2.941v-17.062h2.941zm13.241 7.253h1.687c0.656 0 1.199-0.113 1.629-0.339 0.438-0.227 0.762-0.54 0.973-0.938s0.316-0.855 0.316-1.371c0-0.539-0.097-1-0.293-1.383-0.187-0.39-0.476-0.691-0.867-0.902-0.383-0.211-0.871-0.317-1.465-0.317-0.5 0-0.953 0.102-1.359 0.305-0.399 0.195-0.715 0.477-0.949 0.844-0.235 0.359-0.352 0.789-0.352 1.289h-2.836c0-0.906 0.238-1.711 0.715-2.414 0.476-0.703 1.125-1.254 1.945-1.653 0.828-0.406 1.758-0.609 2.789-0.609 1.102 0 2.063 0.184 2.883 0.551 0.828 0.359 1.473 0.898 1.934 1.617s0.691 1.609 0.691 2.672c0 0.484-0.113 0.977-0.34 1.477-0.226 0.5-0.562 0.957-1.008 1.371-0.445 0.406-1 0.738-1.664 0.996-0.664 0.25-1.433 0.375-2.308 0.375h-2.121v-1.571zm0 2.204v-1.547h2.121c1 0 1.851 0.117 2.554 0.351 0.711 0.235 1.29 0.559 1.735 0.973 0.445 0.406 0.769 0.871 0.973 1.394 0.21 0.524 0.316 1.079 0.316 1.664 0 0.797-0.145 1.508-0.434 2.133-0.281 0.617-0.683 1.141-1.207 1.571-0.523 0.429-1.136 0.754-1.84 0.972-0.695 0.219-1.453 0.328-2.273 0.328-0.734 0-1.437-0.101-2.109-0.304s-1.274-0.504-1.805-0.903c-0.531-0.406-0.953-0.91-1.266-1.511-0.304-0.61-0.457-1.313-0.457-2.11h2.825c0 0.508 0.117 0.957 0.351 1.348 0.242 0.383 0.578 0.684 1.008 0.902 0.437 0.219 0.937 0.328 1.5 0.328 0.594 0 1.105-0.105 1.535-0.316s0.758-0.523 0.984-0.938c0.235-0.414 0.352-0.914 0.352-1.5 0-0.664-0.129-1.203-0.387-1.617s-0.625-0.718-1.101-0.914c-0.477-0.203-1.039-0.304-1.688-0.304h-1.687z" fill="#000" fill-opacity=".87"/><text x="199.75247" y="299.65625" fill="#000000" font-family="Roboto" font-size="28px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">v</tspan></text><path d="m134.53 0s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6404 8 4.6404h384c4.418 0 8-1.9892 8-4.6404v-328.36c0-67-132.14-67-132.14-67h-67.858zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/apartments-hp.svg b/application/src/main/data/json/system/scada_symbols/apartments-hp.svg
new file mode 100644
index 0000000000..9e2c965f79
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/apartments-hp.svg
@@ -0,0 +1,344 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="400" fill="none" version="1.1" viewBox="0 0 400 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Apartments",
+  "description": "Apartments with various states.",
+  "searchTags": [
+    "power",
+    "energy",
+    "consumer"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<path d="m25 106c0-2.761 2.2386-5 5-5h210c2.761 0 5 2.239 5 5v266c0 2.761-2.239 5-5 5h-210c-2.7614 0-5-2.239-5-5v-266z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="143" y="146" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="143" y="254" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="143" y="200" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="143" y="308" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m155 6c0-2.7614 2.239-5 5-5h210c2.761 0 5 2.2386 5 5v366c0 2.761-2.239 5-5 5h-210c-2.761 0-5-2.239-5-5v-366z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="269" y="57" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="269" y="165" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="269" y="111" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="269" y="219" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="175" y="57" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="175" y="165" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="175" y="111" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="175" y="219" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="216" y="286" width="98" height="91" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="49" y="146" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="49" y="254" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="49" y="200" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="49" y="308" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="1" y="377" width="398" height="22" rx="5" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m134.53 0s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6403 8 4.6403h384c4.418 0 8-1.9892 8-4.6403v-328.36c0-67-132.14-67-132.14-67h-67.86zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill-opacity="0" style="stroke-width:1.4784" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 320.94)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/battery-hp.svg b/application/src/main/data/json/system/scada_symbols/battery-hp.svg
new file mode 100644
index 0000000000..8b63a9ab29
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/battery-hp.svg
@@ -0,0 +1,473 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="200" fill="none" version="1.1" viewBox="0 0 600 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Battery",
+  "description": "Battery with various states and scalable quantity.",
+  "searchTags": [
+    "energy",
+    "power",
+    "rechargeable",
+    "storage",
+    "lithium-ion",
+    "ev"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "indicator",
+      "stateRenderFunction": "if (ctx.values.running) {\n    element.fill(ctx.properties.runningIndicatorColor);\n} else {\n    element.fill(ctx.properties.stoppedIndicatorColor);\n}",
+      "actions": null
+    },
+    {
+      "tag": "label",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.labelFont, ctx.properties.labelColor);\nctx.api.text(element, ctx.properties.label);",
+      "actions": null
+    },
+    {
+      "tag": "left-bottom-connector",
+      "stateRenderFunction": "if (!ctx.properties.leftBottomConnector) {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "left-connector",
+      "stateRenderFunction": "if (!ctx.properties.leftConnector) {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "left-top-connector",
+      "stateRenderFunction": "if (!ctx.properties.leftTopConnector) {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "right-bottom-connector",
+      "stateRenderFunction": "if (!ctx.properties.rightBottomConnector) {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "right-connector",
+      "stateRenderFunction": "if (!ctx.properties.rightConnector) {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "right-top-connector",
+      "stateRenderFunction": "if (!ctx.properties.rightTopConnector) {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "runningIndicatorColor",
+      "name": "{i18n:scada.symbol.indicator-colors}",
+      "type": "color",
+      "default": "#198038",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedIndicatorColor",
+      "name": "{i18n:scada.symbol.indicator-colors}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "label",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "text",
+      "default": "ON",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "labelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "font",
+      "default": {
+        "size": 30,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "400",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "labelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "color",
+      "default": "#1A1A1A",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "leftConnector",
+      "name": "{i18n:scada.symbol.left-connector}",
+      "group": "{i18n:scada.symbol.connectors-positions}",
+      "type": "switch",
+      "default": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "leftTopConnector",
+      "name": "{i18n:scada.symbol.left-top-connector}",
+      "group": "{i18n:scada.symbol.connectors-positions}",
+      "type": "switch",
+      "default": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "leftBottomConnector",
+      "name": "{i18n:scada.symbol.left-bottom-connector}",
+      "group": "{i18n:scada.symbol.connectors-positions}",
+      "type": "switch",
+      "default": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "rightConnector",
+      "name": "{i18n:scada.symbol.right-connector}",
+      "group": "{i18n:scada.symbol.connectors-positions}",
+      "type": "switch",
+      "default": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "rightTopConnector",
+      "name": "{i18n:scada.symbol.right-top-connector}",
+      "group": "{i18n:scada.symbol.connectors-positions}",
+      "type": "switch",
+      "default": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "rightBottomConnector",
+      "name": "{i18n:scada.symbol.right-bottom-connector}",
+      "group": "{i18n:scada.symbol.connectors-positions}",
+      "type": "switch",
+      "default": false,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" tb:tag="background">
+  <rect x="1" y="41" width="598" height="120" rx="6" stroke="#000" stroke-width="2"/>
+  <circle cx="468" cy="102.5" r="12"/>
+  <circle cx="468" cy="101.5" r="11" stroke="#000" stroke-opacity=".87" stroke-width="2"/>
+  <circle cx="84" cy="101.5" r="11" stroke="#1a1a1a" stroke-width="2"/>
+  <circle cx="516" cy="102.5" r="12"/>
+  <circle cx="516" cy="101.5" r="11" stroke="#000" stroke-opacity=".87" stroke-width="2"/>
+  <circle cx="132" cy="101.5" r="11" stroke="#1a1a1a" stroke-width="2"/>
+ </g><circle cx="204" cy="102" r="10" fill="#198038" tb:tag="indicator"/><text x="221" y="105.37933" fill="#000000" font-family="Roboto" font-size="30px" font-weight="400" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="middle">ON</tspan></text><path d="m103 200h-6s7.858-27.047 14-44c6.324-17.455 18-44 18-44h6s-11.676 26.545-18 44c-6.142 16.953-14 44-14 44z" fill="#1a1a1a" tb:tag="left-bottom-connector"/><path d="m103 0h-6s-6.4394 26.077-9.5 43c-3.2977 18.234-6.5 47-6.5 47h6s2.7023-26.766 6-45c3.0606-16.923 10-45 10-45z" fill="#1a1a1a" tb:tag="left-top-connector"/><path d="m497 0h6s6.439 26.077 9.5 43c3.298 18.234 6.5 47 6.5 47h-6s-2.702-26.766-6-45c-3.061-16.923-10-45-10-45z" fill="#1a1a1a" tb:tag="right-top-connector"/><path d="m0 100h73" stroke="#1a1a1a" stroke-width="6" tb:tag="left-connector"/><path d="m527 100h73" stroke="#1a1a1a" stroke-width="6" tb:tag="right-connector"/><path d="m497 200h6s-7.858-27.047-14-44c-6.324-17.455-18-44-18-44h-6s11.676 26.545 18 44c6.142 16.953 14 44 14 44z" fill="#1a1a1a" tb:tag="right-bottom-connector"/><path d="m201.8 40s-201.8 0-201.8 20.435v100.15c0 0.80861 5.3727 1.4153 12 1.4153h576c6.627 0 12-0.60671 12-1.4153v-100.15c0-20.435-198.21-20.435-198.21-20.435h-101.79zm201.21 24.766c-3.8661 0-6.9999 0.38235-6.9999 0.854v91.622c0 0.47165 3.1341 0.854 6.9999 0.854h43.998c3.8661 0 6.9999-0.38235 6.9999-0.854v-91.622c0-0.47165-3.1341-0.854-6.9999-0.854z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/bottom-flow-meter.svg b/application/src/main/data/json/system/scada_symbols/bottom-flow-meter.svg
index 7d22c90abf..794e6e61d9 100644
--- a/application/src/main/data/json/system/scada_symbols/bottom-flow-meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/bottom-flow-meter.svg
@@ -57,7 +57,7 @@
     },
     {
       "tag": "value",
-      "stateRenderFunction": "var value = ctx.values.value;\nctx.api.text(element, value.toFixed(0));\n",
+      "stateRenderFunction": "var value = ctx.api.formatValue(ctx.values.value, ctx.properties.valueDecimals, '', false);\nctx.api.text(element, value);\n",
       "actions": {
         "click": {
           "actionFunction": "ctx.api.callAction(event, 'displayClick');"
@@ -463,16 +463,20 @@
       "name": "{i18n:scada.symbol.units}",
       "type": "units",
       "default": "m³/hr",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
       "fieldClass": "medium-width",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueDecimals",
+      "name": "{i18n:scada.symbol.decimals}",
+      "type": "number",
+      "default": 0,
+      "fieldClass": "medium-width",
+      "min": 0,
+      "step": 1,
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "defaultBorderColor",
@@ -511,16 +515,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "activeBorderColor",
@@ -559,16 +555,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "warningBorderColor",
@@ -607,16 +595,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "criticalBorderColor",
@@ -655,16 +635,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "backgroundColor",
@@ -703,48 +675,24 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "fluidColor",
       "name": "{i18n:scada.symbol.fluid-color}",
       "type": "color",
       "default": "#1EC1F480",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "pipeColor",
       "name": "{i18n:scada.symbol.pipe-color}",
       "type": "color",
       "default": "#FFFFFF",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     }
   ]
 }]]></tb:metadata>
diff --git a/application/src/main/data/json/system/scada_symbols/bottom-light-bulb-hp.svg b/application/src/main/data/json/system/scada_symbols/bottom-light-bulb-hp.svg
new file mode 100644
index 0000000000..4f0603b904
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/bottom-light-bulb-hp.svg
@@ -0,0 +1,346 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Bottom light bulb",
+  "description": "Bottom light bulb with various states.",
+  "searchTags": [
+    "energy"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <path d="m77.22 69 1.6-8h42.36l1.6 8h-45.56z"/>
+  <path d="m77.117 69h45.742c0.108 0.2569 0.244 0.5047 0.385 0.7358 0.342 0.5586 0.824 1.1869 1.403 1.8699 1.16 1.3677 2.802 3.0619 4.738 5.0193 0.519 0.5244 1.059 1.0689 1.62 1.6328 3.641 3.6659 8.098 8.154 12.557 13.274 10.326 11.856 20.438 26.862 20.438 42.468 0 21.266-7.121 37.489-18.622 48.399-11.511 10.92-27.5 16.601-45.378 16.601-17.878 0-33.867-5.681-45.378-16.601-11.502-10.91-18.622-27.133-18.622-48.399 0-15.606 10.106-30.612 20.426-42.468 4.456-5.1195 8.9107-9.6073 12.55-13.273 0.5601-0.5643 1.1009-1.1091 1.6194-1.6337 1.9344-1.9574 3.576-3.6516 4.735-5.0193 0.5788-0.683 1.0604-1.3114 1.4022-1.87 0.1413-0.231 0.2771-0.4787 0.3847-0.7355z"/>
+  <path d="m80.13 5.9751c1.5245-3.049 4.6409-4.9751 8.0498-4.9751h23.64c3.409 0 6.525 1.926 8.05 4.9751l6.18 12.361c0.625 1.2497 0.95 2.6277 0.95 4.0249v38.639h-54v-38.639c0-1.3972 0.3253-2.7752 0.9502-4.0249l6.1803-12.361z"/>
+ </g><path d="m73 53h54" stroke="#1A1A1A" stroke-width="2"/><path d="m73 21h54" stroke="#1A1A1A" stroke-width="2"/><path d="m67.265 0s-67.265 0-67.265 33.5v164.18c0 1.3256 1.7909 2.3202 4 2.3202h192c2.209 0 4-0.9946 4-2.3202v-164.18c0-33.5-66.07-33.5-66.07-33.5h-33.93zm67.07 40.6c-1.2887 0-2.3333 0.6268-2.3333 1.4v150.2c0 0.7732 1.0447 1.4 2.3333 1.4h14.666c1.2887 0 2.3333-0.6268 2.3333-1.4v-150.2c0-0.7732-1.0447-1.4-2.3333-1.4z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/consumers-hp.svg b/application/src/main/data/json/system/scada_symbols/consumers-hp.svg
new file mode 100644
index 0000000000..e4005d7ae2
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/consumers-hp.svg
@@ -0,0 +1,346 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="400" fill="none" version="1.1" viewBox="0 0 600 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Consumers",
+  "description": "Consumers with various states.",
+  "searchTags": [
+    "power",
+    "energy"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <path d="m21 240.65c0-1.409 0.5943-2.752 1.6366-3.699l104-94.546c1.907-1.734 4.819-1.734 6.726 0l104 94.546c1.043 0.947 1.637 2.29 1.637 3.699v131.35c0 2.761-2.239 5-5 5h-208c-2.7614 0-5-2.239-5-5v-131.35z"/>
+  <path d="m130.68 141.26-0.678-0.626-0.678 0.626-112.38 103.74h-14.385l127.44-117.64 127.44 117.64h-14.384l-112.38-103.74z"/>
+ </g><rect x="56" y="307" width="44" height="70" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m80 240c0-0.552 0.4477-1 1-1h18c0.5523 0 1 0.448 1 1v44c0 0.552-0.4477 1-1 1h-18c-0.5523 0-1-0.448-1-1v-44z" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m170 240c0-0.552 0.448-1 1-1h18c0.552 0 1 0.448 1 1v44c0 0.552-0.448 1-1 1h-18c-0.552 0-1-0.448-1-1v-44z" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m170 308c0-0.552 0.448-1 1-1h18c0.552 0 1 0.448 1 1v44c0 0.552-0.448 1-1 1h-18c-0.552 0-1-0.448-1-1v-44z" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m56 240c0-0.552 0.4477-1 1-1h18c0.5523 0 1 0.448 1 1v44c0 0.552-0.4477 1-1 1h-18c-0.5523 0-1-0.448-1-1v-44z" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m146 240c0-0.552 0.448-1 1-1h18c0.552 0 1 0.448 1 1v44c0 0.552-0.448 1-1 1h-18c-0.552 0-1-0.448-1-1v-44z" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="rotate(-90 194 285)" x="194" y="285" width="46" height="20" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m146 308c0-0.552 0.448-1 1-1h18c0.552 0 1 0.448 1 1v44c0 0.552-0.448 1-1 1h-18c-0.552 0-1-0.448-1-1v-44z" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="rotate(-90 194 353)" x="194" y="353" width="46" height="20" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m129.26 178.32c0.397-0.442 1.089-0.442 1.486 0l0.744-0.669-0.744 0.669 13.51 15.01c0.579 0.644 0.122 1.669-0.744 1.669h-27.018c-0.866 0-1.323-1.025-0.744-1.669l13.51-15.01z" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m425 176v1.804l1.53-0.956 60.94-38.088c0.666-0.416 1.53 0.063 1.53 0.848v37.392h85c2.761 0 5 2.239 5 5v190c0 2.761-2.239 5-5 5h-217c-2.761 0-5-2.239-5-5v-194.8c0-0.369 0.204-0.709 0.529-0.882l71-37.867c0.667-0.355 1.471 0.127 1.471 0.882v36.667z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m519.88 19.938c0.033-0.527 0.47-0.9376 0.998-0.9376h30.242c0.528 0 0.965 0.4106 0.998 0.9376l9.75 156c0.036 0.575-0.421 1.062-0.998 1.062h-49.742c-0.577 0-1.034-0.487-0.998-1.062l9.75-156z" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="429" y="236" width="38" height="38" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="385" y="236" width="38" height="38" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="429" y="280" width="38" height="38" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="385" y="280" width="38" height="38" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="473" y="236" width="38" height="38" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="473" y="280" width="38" height="38" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="517" y="236" width="38" height="38" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="517" y="280" width="38" height="38" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m190 6c0-2.7614 2.239-5 5-5h210c2.761 0 5 2.2386 5 5v366c0 2.761-2.239 5-5 5h-210c-2.761 0-5-2.239-5-5v-366z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="304" y="57" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="304" y="165" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="304" y="111" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="304" y="219" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="210" y="57" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="210" y="165" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="210" y="111" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="210" y="219" width="86" height="36" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="251" y="286" width="98" height="91" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="1" y="377" width="598" height="22" rx="5" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m201.8 0s-201.8 0-201.8 67v328.36c0 2.6512 5.3727 4.6403 12 4.6403h576c6.627 0 12-1.9892 12-4.6403v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill-opacity="0" style="stroke-width:1.8107" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 320.94)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/control-panel-hp.svg b/application/src/main/data/json/system/scada_symbols/control-panel-hp.svg
index 630d0faa28..d9b0857156 100644
--- a/application/src/main/data/json/system/scada_symbols/control-panel-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/control-panel-hp.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="200" fill="none" version="1.1" viewBox="0 0 400 200"><tb:metadata xmlns=""><![CDATA[{
   "title": "HP Control panel",
-  "description": "Control panel",
+  "description": "Sends the command to the device or updates attribute/time series when the user pushes the button. Widget settings will enable you to configure behavior, how to fetch the initial state, and what to trigger when power on/off states.",
   "searchTags": [
     "control"
   ],
diff --git a/application/src/main/data/json/system/scada_symbols/crane-hp.svg b/application/src/main/data/json/system/scada_symbols/crane-hp.svg
new file mode 100644
index 0000000000..7e7c64c99c
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/crane-hp.svg
@@ -0,0 +1,346 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="1e3" height="1200" fill="none" version="1.1" viewBox="0 0 1e3 1200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Crane",
+  "description": "Crane with various states.",
+  "searchTags": [
+    "crane"
+  ],
+  "widgetSizeX": 5,
+  "widgetSizeY": 6,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1a1a1a" stroke-width="2" tb:tag="background">
+  <path d="m999 1101h-518v98h518z"/>
+  <path d="m89 301h-88v38h88z"/>
+  <path d="m38.637 353.25c1.8257-2.795 3.0211-5.169 3.5801-7.616 0.4834-2.115 0.4778-4.225 0.0646-6.636h22.765c0.4236 2.76 0.5531 8.434-2.4543 17.437-1.0074 3.015-3.2478 5.918-6.1765 8.829-2.4452 2.43-5.2981 4.799-8.1981 7.207-0.57 0.473-1.1418 0.948-1.7126 1.425-3.4492 2.882-6.8589 5.843-9.4634 8.969s-4.4841 6.511-4.7352 10.25c-0.4781 7.123 1.5349 12.183 4.5904 15.755 3.0323 3.545 7.0211 5.546 10.381 6.711 2.6292 0.911 7.97 1.542 12.913-0.172 2.4934-0.865 4.9095-2.335 6.8093-4.687 1.9017-2.355 3.2394-5.537 3.6645-9.748 0.2685-2.66 0.4677-4.993 0.639-7.001 0.0914-1.07 0.1749-2.048 0.2566-2.933 0.2394-2.589 0.4634-4.351 0.8094-5.493 0.345-1.138 0.6919-1.294 0.9494-1.334 0.2122-0.033 0.5457-0.012 1.0684 0.146 0.5169 0.156 1.1513 0.424 1.9388 0.814 8.6238 4.272 11.837 11.217 12.524 18.027 0.6932 6.867-1.1952 13.571-2.7777 17.098-6.6047 14.722-20.145 23.7-37.326 23.7-10.333 0-18.218-1.819-24.553-5.103-6.3316-3.283-11.186-8.065-15.404-14.105-3.3703-4.826-6.7534-12.808-7.5927-21.713-0.83751-8.887 0.86149-18.628 7.5566-27.085 6.2949-7.951 12.501-11.818 17.718-14.561 0.9365-0.492 1.8598-0.957 2.7531-1.407 1.5646-0.788 3.0372-1.53 4.3284-2.291 2.0627-1.216 3.8384-2.576 5.0837-4.483z"/>
+ </g><path d="m559.64 1101-515.24-1098.3 341.87 221.97 538.94 876.28z" stroke="#1a1a1a" stroke-width="2"/><path d="m148 225h237" stroke="#1a1a1a" stroke-width="2"/><path d="m249 438h269" stroke="#1a1a1a" stroke-width="2"/><path d="m362 680h304" stroke="#1a1a1a" stroke-width="2"/><path d="m491 955h344" stroke="#1a1a1a" stroke-width="2"/><path d="m249 437.92 136.32-212.92" stroke="#1a1a1a" stroke-width="2"/><path d="m362 680.92 155.32-242.92" stroke="#1a1a1a" stroke-width="1.9997"/><path d="m492 954.92 175.31-274.92" stroke="#1a1a1a" stroke-width="2.0018"/><path d="m44 2v299" stroke="#1a1a1a" stroke-width="2"/><path d="m336.32 0s-336.32 0-336.32 201v985.08c0 7.9536 8.9545 13.921 20 13.921h960c11.045 0 20-5.9676 20-13.921v-985.08c0-201-330.35-201-330.35-201h-169.65zm335.35 243.6c-6.4435 0-11.667 3.7608-11.667 8.4v901.2c0 4.6392 5.2235 8.4 11.667 8.4h73.33c6.4435 0 11.667-3.7608 11.667-8.4v-901.2c0-4.6392-5.2235-8.4-11.667-8.4z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/curcuit-breaker-hp.svg b/application/src/main/data/json/system/scada_symbols/curcuit-breaker-hp.svg
new file mode 100644
index 0000000000..12f8b4944f
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/curcuit-breaker-hp.svg
@@ -0,0 +1,444 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="400" fill="none" version="1.1" viewBox="0 0 200 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Circuit breaker",
+  "description": "Circuit breaker with various states.",
+  "searchTags": [
+    "energy",
+    "power",
+    "ev",
+    "switch"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.backgroundColor});",
+      "actions": null
+    },
+    {
+      "tag": "breaker",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "var initial = ctx.values.initialState;\nvar action = initial ? 'offUpdateState' : 'onUpdateState';\n\nctx.api.callAction(event, action, undefined, {\n  next: () => {\n     ctx.api.setValue('initialState', !initial);\n  }\n});"
+        }
+      }
+    },
+    {
+      "tag": "breaker-trigger",
+      "stateRenderFunction": "element.fill(ctx.properties.disabledColor);\nif (ctx.values.initialState) {\n    element.transform({translateY: 0});\n} else {\n    element.transform({translateY: 160});\n}",
+      "actions": null
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "label",
+      "stateRenderFunction": "if (ctx.properties.label) {\n    element.show();\n    var label = ctx.values.initialState ? ctx.properties.onLabel : ctx.properties.offLabel;\n    ctx.api.font(element, ctx.properties.labelFont, ctx.properties.labelColor);\n    ctx.api.text(element, label);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "label-box",
+      "stateRenderFunction": "var color = ctx.properties.disabledColor;\nif (ctx.values.initialState) {\n    color = ctx.properties.enabledColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "initialState",
+      "name": "{i18n:scada.symbol.on-off-state}",
+      "hint": "{i18n:scada.symbol.on-off-state-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": "{i18n:scada.symbol.on}",
+      "falseLabel": "{i18n:scada.symbol.off}",
+      "stateLabel": "",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "onUpdateState",
+      "name": "{i18n:scada.symbol.on-update-state}",
+      "hint": "{i18n:scada.symbol.on-update-state-hint}",
+      "group": null,
+      "type": "action",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": {
+        "action": "EXECUTE_RPC",
+        "executeRpc": {
+          "method": "setState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "setAttribute": {
+          "scope": "SERVER_SCOPE",
+          "key": "state"
+        },
+        "putTimeSeries": {
+          "key": "state"
+        },
+        "valueToData": {
+          "type": "CONSTANT",
+          "constantValue": true,
+          "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;"
+        }
+      },
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "offUpdateState",
+      "name": "{i18n:scada.symbol.off-update-state}",
+      "hint": "{i18n:scada.symbol.off-update-state-hint}",
+      "group": null,
+      "type": "action",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": {
+        "action": "EXECUTE_RPC",
+        "executeRpc": {
+          "method": "setState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "setAttribute": {
+          "key": "state",
+          "scope": "SERVER_SCOPE"
+        },
+        "putTimeSeries": {
+          "key": "state"
+        },
+        "valueToData": {
+          "type": "CONSTANT",
+          "constantValue": false,
+          "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;"
+        }
+      },
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    }
+  ],
+  "properties": [
+    {
+      "id": "label",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "onLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "text",
+      "default": "ON",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "text",
+      "default": "OFF",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "labelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "font",
+      "default": {
+        "size": 42,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "400",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "labelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "color",
+      "default": "#1A1A1A",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "backgroundColor",
+      "name": "{i18n:scada.symbol.background-color}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "enabledColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.enabled}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "disabledColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.disabled}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect width="200" height="400" fill="#fff" tb:tag="background"/><rect x="1" y="1" width="198" height="398" stroke="#000" stroke-opacity=".87" stroke-width="2"/><g tb:tag="breaker">
+  <path d="m50 100h100v198c0 1.105-0.895 2-2 2h-96c-1.1046 0-2-0.895-2-2v-198z"/>
+  <path d="m51 101h98v197c0 0.552-0.448 1-1 1h-96c-0.5523 0-1-0.448-1-1v-197z" stroke="#000" stroke-opacity=".87" stroke-width="2" tb:tag="label-box"/>
+  <text x="100" y="201.65533" fill="#000000" font-family="Roboto" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="start">ON</tspan></text>
+  <g tb:tag="breaker-trigger">
+   <rect x="24" y="100" width="152" height="40" rx="2" fill="#999"/>
+   <rect x="25" y="101" width="150" height="38" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/>
+  </g>
+ </g><circle cx="100" cy="50" r="20" fill="#fff"/><circle cx="100" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="100" cy="350" r="20" fill="#fff"/><circle cx="100" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><path d="m100 0v31" stroke="#1a1a1a" stroke-width="6"/><path d="m100 369v31" stroke="#1a1a1a" stroke-width="6"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/drawwork-hp.svg b/application/src/main/data/json/system/scada_symbols/drawwork-hp.svg
new file mode 100644
index 0000000000..bb98d8cb5e
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/drawwork-hp.svg
@@ -0,0 +1,355 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="400" fill="none" version="1.1" viewBox="0 0 600 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Drawwork",
+  "description": "Drawwork with various states.",
+  "searchTags": [
+    "drawwork"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "circle-background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = '#dedede';\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "drawwork-background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1a1a1a" tb:tag="drawwork-background">
+  <path d="m65.049 374 49.936-64h143.35l49.622 64z" stroke-width="2"/>
+  <rect x="24.777" y="374" width="324" height="24.999" rx="3.6512" stroke-width="2.0011"/>
+  <rect x="188" y="1" width="333" height="252" stroke-width="2"/>
+  <rect x="521" y="1" width="78" height="398" stroke-width="2"/>
+  <circle cx="187" cy="187" r="186" stroke-width="2"/>
+ </g><mask id="path-6-inside-1_4465_2848" fill="#ffffff">
+  <path d="m308.33 187c0 66.274-53.726 120-120 120s-120-53.726-120-120 53.726-120 120-120 120 53.726 120 120zm-221.31 0c0 55.95 45.357 101.31 101.31 101.31s101.31-45.357 101.31-101.31-45.357-101.31-101.31-101.31-101.31 45.357-101.31 101.31z"/>
+ </mask><path d="m308.33 187c0 66.274-53.726 120-120 120s-120-53.726-120-120 53.726-120 120-120 120 53.726 120 120zm-221.31 0c0 55.95 45.357 101.31 101.31 101.31s101.31-45.357 101.31-101.31-45.357-101.31-101.31-101.31-101.31 45.357-101.31 101.31z" fill="#dedede" mask="url(#path-6-inside-1_4465_2848)" stroke="#1a1a1a" stroke-width="4" tb:tag="circle-background"/><line x1="421.5" x2="421.5" y1="4.3711e-8" y2="254" stroke="#1a1a1a" stroke-width="2"/><line x1="442" x2="442" y1="4.3711e-8" y2="254" stroke="#1a1a1a" stroke-width="2"/><line x1="462" x2="462" y1="4.3711e-8" y2="254" stroke="#1a1a1a" stroke-width="2"/><line x1="482" x2="482" y1="4.3711e-8" y2="254" stroke="#1a1a1a" stroke-width="2"/><line x1="502" x2="502" y1="4.3711e-8" y2="254" stroke="#1a1a1a" stroke-width="2"/><path d="m201.79 0s-201.79 0-201.79 67v328.36c0 2.6512 5.3727 4.6404 12 4.6404h576c6.627 0 12-1.9892 12-4.6404v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/drill-hp.svg b/application/src/main/data/json/system/scada_symbols/drill-hp.svg
new file mode 100644
index 0000000000..66e06398ed
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/drill-hp.svg
@@ -0,0 +1,354 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Drill",
+  "description": "Drill with various states.",
+  "searchTags": [
+    "drill",
+    "drilling"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<mask id="path-5-inside-1_4566_53869" fill="#ffffff">
+  <path d="m160 113.52v50.507h-20.5l-10.711-48.771c-13.492 6.47-22.789 20.101-22.789 35.871 0 22.024 18.132 39.877 40.5 39.877s40.5-17.853 40.5-39.877c0-17.362-11.27-32.133-27-37.607z" clip-rule="evenodd" fill-rule="evenodd"/>
+ </mask><mask id="path-7-inside-2_4566_53869" fill="#ffffff">
+  <path d="m40 113.52v50.507h20.5l10.711-48.771c13.492 6.47 22.789 20.101 22.789 35.871 0 22.024-18.132 39.877-40.5 39.877s-40.5-17.853-40.5-39.877c0-17.362 11.27-32.133 27-37.607z" clip-rule="evenodd" fill-rule="evenodd"/>
+ </mask><g fill="#fff" tb:tag="background">
+  <path d="m62.143 81 10.732-80h54.25l10.732 80z" stroke="#1a1a1a" stroke-width="2"/>
+  <path d="m70 81h60v103.02c-0.122 0.098-0.274 0.218-0.453 0.358-0.534 0.419-1.312 1.019-2.284 1.739-1.945 1.442-4.662 3.363-7.751 5.283-3.092 1.921-6.539 3.829-9.947 5.255-3.421 1.431-6.73 2.344-9.565 2.344-2.8349 0-6.1436-0.913-9.5652-2.344-3.4077-1.426-6.8551-3.334-9.9469-5.255-3.0891-1.92-5.806-3.841-7.7511-5.283-0.9721-0.72-1.7501-1.32-2.2841-1.739-0.179-0.14-0.3305-0.26-0.4527-0.358z" stroke="#1a1a1a" stroke-width="2"/>
+  <path d="m120.9 81.054c4e-3 -0.0183 8e-3 -0.0363 0.012-0.054h24.671l15.413 23.301v60.699h-22.222c-0.093-0.212-0.209-0.478-0.346-0.794-0.389-0.898-0.951-2.199-1.637-3.812-1.373-3.226-3.245-7.696-5.241-12.672-4.001-9.972-8.476-21.912-10.459-29.961-2.355-9.559-2.358-18.942-1.767-25.951 0.296-3.5009 0.739-6.4002 1.108-8.4209 0.184-1.0102 0.35-1.8002 0.468-2.3352z" stroke="#1a1a1a" stroke-width="2"/>
+  <path d="m79.096 81.054c-0.0041-0.0183-0.0081-0.0363-0.012-0.054h-24.67l-15.413 23.301v60.699h22.222c0.0926-0.212 0.2084-0.478 0.3456-0.794 0.3896-0.898 0.951-2.199 1.6373-3.812 1.3728-3.226 3.2446-7.696 5.2411-12.672 4.0007-9.972 8.4754-21.912 10.459-29.961 2.3552-9.559 2.3585-18.942 1.7667-25.951-0.2956-3.5009-0.7389-6.4002-1.1075-8.4209-0.1842-1.0102-0.3497-1.8002-0.4685-2.3352z" stroke="#1a1a1a" stroke-width="2"/>
+  <path d="m160 113.52v50.507h-20.5l-10.711-48.771c-13.492 6.47-22.789 20.101-22.789 35.871 0 22.024 18.132 39.877 40.5 39.877s40.5-17.853 40.5-39.877c0-17.362-11.27-32.133-27-37.607z" clip-rule="evenodd" fill-rule="evenodd"/>
+  <path d="m40 113.52v50.507h20.5l10.711-48.771c13.492 6.47 22.789 20.101 22.789 35.871 0 22.024-18.132 39.877-40.5 39.877s-40.5-17.853-40.5-39.877c0-17.362 11.27-32.133 27-37.607z" clip-rule="evenodd" fill-rule="evenodd"/>
+ </g><path d="m139.62 111.98 0.876 52.023-2 0.033-0.876-52.022zm20.376 1.533h-2v-2.814l2.657 0.925zm0 50.507h2v2h-2zm-20.5 0v2h-1.608l-0.345-1.571zm-10.711-48.771-0.865-1.804 2.277-1.091 0.541 2.466zm33.211-1.736v50.507h-4v-50.507zm-2 52.507h-20.5v-4h20.5zm-22.453-1.571-10.712-48.771 3.907-0.858 10.711 48.771zm-7.893-47.397c-12.836 6.156-21.654 19.109-21.654 34.068h-4c0-16.58 9.776-30.89 23.924-37.675zm-21.654 34.068c0 20.89 17.208 37.877 38.5 37.877v4c-23.443 0-42.5-18.72-42.5-41.877zm38.5 37.877c21.292 0 38.5-16.987 38.5-37.877h4c0 23.157-19.057 41.877-42.5 41.877zm38.5-37.877c0-16.469-10.69-30.51-25.657-35.719l1.314-3.777c16.494 5.739 28.343 21.24 28.343 39.496z" fill="#1a1a1a" mask="url(#path-5-inside-1_4566_53869)"/><path d="m59.5 111.84v52.183h2v-52.183zm-19.5 1.676h2v-2.814l-2.6574 0.925zm0 50.507h-2v2h2zm20.5 0v2h1.6084l0.345-1.571zm10.711-48.771 0.8648-1.804-2.2766-1.091-0.5417 2.466zm-33.211-1.736v50.507h4v-50.507zm2 52.507h20.5v-4h-20.5zm22.453-1.571 10.711-48.771-3.9069-0.858-10.711 48.771zm7.8931-47.397c12.836 6.156 21.654 19.109 21.654 34.068h4c0-16.58-9.7765-30.89-23.924-37.675zm21.654 34.068c0 20.89-17.208 37.877-38.5 37.877v4c23.443 0 42.5-18.72 42.5-41.877zm-38.5 37.877c-21.292 0-38.5-16.987-38.5-37.877h-4c0 23.157 19.057 41.877 42.5 41.877zm-38.5-37.877c0-16.469 10.69-30.51 25.657-35.719l-1.3148-3.777c-16.493 5.739-28.343 21.24-28.343 39.496z" fill="#1a1a1a" mask="url(#path-7-inside-2_4566_53869)"/><path d="m121.36 81.141 17.501 23.335" stroke="#1a1a1a" stroke-width="2"/><path d="m138.65 164.92v-61.051" stroke="#1a1a1a" stroke-width="2"/><path d="m138.59 104.21h22.274" stroke="#1a1a1a" stroke-width="2"/><path d="m79.019 81.141-17.854 23.246" stroke="#1a1a1a" stroke-width="2"/><path d="m61.342 164.58-0.17678-60.281" stroke="#1a1a1a" stroke-width="2"/><path d="m39.023 104.3 22.185 0.0442" stroke="#1a1a1a" stroke-width="2"/><path d="m67.264 0s-67.264 0-67.264 33.5v164.18c0 1.3256 1.7909 2.3202 4 2.3202h192c2.209 0 4-0.9946 4-2.3202v-164.18c0-33.5-66.07-33.5-66.07-33.5h-33.929zm67.07 40.6c-1.2887 0-2.3333 0.6268-2.3333 1.4v150.2c0 0.7732 1.0447 1.4 2.3333 1.4h14.666c1.2887 0 2.3333-0.6268 2.3333-1.4v-150.2c0-0.7732-1.0447-1.4-2.3333-1.4z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/drilling-line-hp.svg b/application/src/main/data/json/system/scada_symbols/drilling-line-hp.svg
new file mode 100644
index 0000000000..60bce1a645
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/drilling-line-hp.svg
@@ -0,0 +1,361 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="400" fill="none" version="1.1" viewBox="0 0 200 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Drilling line",
+  "description": "Drilling line with various states.",
+  "searchTags": [
+    "drilling line"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "secondary-background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = '#dedede';\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke-width="2" tb:tag="background">
+  <path d="m63 121h74v240h-74z" stroke="#1A1A1A"/>
+  <ellipse cx="100.54" cy="101" rx="99.422" ry="100"/>
+  <g transform="translate(-.043811 1)" clip-path="url(#clip0_4864_4144)" stroke="#727171">
+   <path d="m97.225 37.672c-7.5861-19.484-16.826-28.051-22.054-34.859l-28.813 0.75778-20.347 24.447c1.6695-1.8123 10.516-0.092 32.545 21.288 22.029 21.38 29.908 40.861 31.093 47.929l15.475-10.344c0-15.191-0.313-29.735-7.899-49.219z"/>
+   <path d="m166.5 132.89c20.8 2.127 32.637-2.193 41.079-3.744l12.457-25.992-12.488-29.253c0.852 2.312-4.71 9.4022-33.78 19.267-29.07 9.8649-50.001 7.9989-56.833 5.8331l-3.553 17.159c13.521 6.923 32.318 14.603 53.118 16.73z"/>
+   <path d="m46.728 132.5c-14.634 14.934-23.517 27.044-27.569 34.611l12.551 25.947 30.656 8.48c-2.3389-0.776-4.4126-9.546 6.0037-38.423s24.928-44.076 30.881-48.066l-12.593-9.458c-13.844 6.253-25.296 11.976-39.93 26.909z"/>
+  </g>
+  <circle cx="100.47" cy="101.51" r="20.796" fill="#dedede" stroke="#000" tb:tag="secondary-background"/>
+  <path d="m39 361h122v38h-122z" fill="#dedede" stroke="#000" tb:tag="secondary-background"/>
+ </g><ellipse cx="100.11" cy="101" rx="99.009" ry="99.164" stroke="#000" stroke-width="2"/><path d="m67.264 0s-67.264 0-67.264 67v328.36c0 2.6512 1.7909 4.6404 4 4.6404h192c2.209 0 4-1.9892 4-4.6404v-328.36c0-67-66.07-67-66.07-67h-33.929zm67.07 81.2c-1.2887 0-2.3333 1.2536-2.3333 2.8v300.4c0 1.5464 1.0447 2.8 2.3333 2.8h14.666c1.2887 0 2.3333-1.2536 2.3333-2.8v-300.4c0-1.5464-1.0447-2.8-2.3333-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><defs>
+  <clipPath id="clip0_4864_4144">
+   <rect width="200" height="200" rx="100" fill="#fff"/>
+  </clipPath>
+ </defs>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/drilling-rig-hp.svg b/application/src/main/data/json/system/scada_symbols/drilling-rig-hp.svg
new file mode 100644
index 0000000000..76c9af6454
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/drilling-rig-hp.svg
@@ -0,0 +1,354 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="800" height="1800" fill="none" version="1.1" viewBox="0 0 800 1800"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Drilling rig",
+  "description": "Drilling rig with various states.",
+  "searchTags": [
+    "drilling rig"
+  ],
+  "widgetSizeX": 4,
+  "widgetSizeY": 9,
+  "tags": [
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "drilling-ring",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<path d="m280.06 201h239.89c2.435 0 4.516 1.754 4.928 4.153l273.94 1593.8h-797.63l273.94-1593.8c0.413-2.399 2.493-4.153 4.928-4.153z" stroke="#1a1a1a" stroke-width="2"/><line x1="276.08" x2="575.67" y1="202.29" y2="501.88" stroke="#1a1a1a" stroke-width="1.9986"/><line x1="523.29" x2="224.71" y1="201.71" y2="500.29" stroke="#1a1a1a" stroke-width="1.9986"/><line x1="225.08" x2="647.67" y1="500.29" y2="922.88" stroke="#1a1a1a" stroke-width="1.999"/><line x1="573.88" x2="151.29" y1="502.29" y2="924.88" stroke="#1a1a1a" stroke-width="1.999"/><line x1="152.71" x2="751.29" y1="925.29" y2="1523.9" stroke="#1a1a1a" stroke-width="1.9993"/><line x1="647.29" x2="48.707" y1="924.71" y2="1523.3" stroke="#1a1a1a" stroke-width="1.9993"/><path d="m389.98 1028.8c2.365-3.65 3.896-6.72 4.6109-9.87 0.64099-2.82 0.61099-5.64 0.017-8.92h30.21c0.58999 3.57 0.85699 11.11-3.162 23.22-1.333 4.02-4.2859 7.86-8.1039 11.68-3.19 3.19-6.9109 6.3-10.681 9.45-0.73999 0.62-1.482 1.24-2.223 1.86-4.4839 3.77-8.8969 7.63-12.264 11.69-3.366 4.07-5.7649 8.44-6.0849 13.24-0.61599 9.24 1.978 15.78 5.8949 20.39 3.8929 4.58 9.0239 7.17 13.365 8.69 3.366 1.17 10.24 1.99 16.595-0.23 3.199-1.11 6.2889-3.01 8.7169-6.03 2.429-3.03 4.1489-7.14 4.6969-12.59 0.349-3.48 0.607-6.53 0.82999-9.15 0.119-1.4 0.227-2.69 0.334-3.85 0.31099-3.38 0.60399-5.72 1.064-7.25 0.461-1.53 0.96899-1.88 1.476-1.96 0.337-0.05 0.81799-0.01 1.519 0.2 0.69499 0.21 1.536 0.57 2.566 1.09 11.321 5.64 15.547 14.83 16.45 23.83 0.90799 9.05-1.564 17.88-3.637 22.53-8.6369 19.38-26.348 31.19-48.797 31.19-13.467 0-23.767-2.39-32.055-6.71-8.2839-4.32-14.63-10.62-20.134-18.55-4.4109-6.36-8.8289-16.85-9.9249-28.56-1.095-11.69 1.125-24.52 9.8889-35.66 8.2179-10.45 16.325-15.53 23.13-19.13 1.229-0.65 2.434-1.27 3.598-1.85 2.026-1.03 3.924-1.99 5.5949-2.99 2.665-1.58 4.9279-3.33 6.5099-5.76z" fill="#dedede" stroke="#1a1a1a" stroke-width="2"/><path d="m339 1150h122v38h-122z" fill="#dedede" stroke="#1a1a1a" stroke-width="2"/><path d="m339 981h122v38h-122z" fill="#dedede" stroke="#1a1a1a" stroke-width="2"/><path d="m363 1188h74v487h-74z" fill="#dedede" stroke="#1a1a1a" stroke-width="2"/><path d="m363 201h74v780h-74z" stroke="#1a1a1a" stroke-width="2"/><circle cx="401.33" cy="120" r="119" fill="#dedede" stroke="#1a1a1a" stroke-width="2.0026"/><g clip-path="url(#clip0_4613_175962)" fill="#dedede">
+  <path d="m397.27 45.19c-9.0358-23.378-20.04-33.657-26.268-41.826l-34.32 0.90925-24.236 29.334c1.9888-2.1746 12.525-0.11046 38.765 25.543 26.239 25.653 35.623 49.028 37.035 57.509l18.432-12.412c0-18.227-0.37246-35.679-9.4092-59.057z" stroke="#727171" stroke-width="1.996"/>
+  <path d="m480.57 159.3c24.917 2.557 39.097-2.6364 49.21-4.5l14.922-31.246-14.959-35.167c1.0206 2.7794-5.643 11.303-40.467 23.162-34.824 11.859-59.898 9.617-68.082 7.0128l-4.2568 20.627c16.198 8.3224 38.716 17.554 63.633 20.112z" stroke="#727171" stroke-width="2.0051"/>
+  <path d="m337.34 158.51c-17.566 17.88-28.229 32.38-33.094 41.44l15.066 31.067 36.799 10.153c-2.8073-0.928-5.2964-11.429 7.2073-46.004 12.504-34.575 29.922-52.773 37.069-57.55l-15.116-11.324c-16.619 7.4871-30.366 14.338-47.932 32.219z" stroke="#727171" stroke-width="2.0037"/>
+  <ellipse cx="401.68" cy="120.34" rx="24.997" ry="24.997" stroke="#1a1a1a" stroke-width="2.0051"/>
+ </g><circle cx="401.33" cy="120" r="119" stroke="#1a1a1a" stroke-width="2.0026"/><defs>
+  <clipPath id="clip0_4613_175962">
+   <rect x="281.33" width="240" height="240" rx="120" fill="#fff"/>
+  </clipPath>
+ </defs><g fill="#fff" stroke="#1a1a1a" stroke-width="2" tb:tag="drilling-ring">
+  <path d="m229 1675h342v91h-342z"/>
+  <path d="m141 1765h518v34h-518z"/>
+ </g><path d="m269.06 0s-269.06 0-269.06 301.5v1477.6c0 11.93 7.1636 20.882 16 20.882h768c8.836 0 16-8.9514 16-20.882v-1477.6c0-301.5-264.28-301.5-264.28-301.5h-135.72zm268.28 365.4c-5.1548 0-9.3332 5.6412-9.3332 12.6v1351.8c0 6.9588 4.1788 12.6 9.3332 12.6h58.664c5.1548 0 9.3332-5.6412 9.3332-12.6v-1351.8c0-6.9588-4.1788-12.6-9.3332-12.6z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/dynamic-vertical-scale-hp.svg b/application/src/main/data/json/system/scada_symbols/dynamic-vertical-scale-hp.svg
index 98185cbc8d..960abed340 100644
--- a/application/src/main/data/json/system/scada_symbols/dynamic-vertical-scale-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/dynamic-vertical-scale-hp.svg
@@ -776,7 +776,7 @@
     }
   ]
 }]]></tb:metadata>
-<text x="206.16602" y="43.234375" fill="#000000" font-family="Roboto" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">Outdoor</tspan></text><text x="195.21875" y="784.75" fill="#000000" font-family="Roboto" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">°C</tspan></text><g stroke="#000" tb:tag="scale">
+<text x="206.16602" y="43.234375" fill="#000000" font-family="Roboto" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">Outdoor</tspan></text><text x="195.21875" y="770" fill="#000000" font-family="Roboto" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">°C</tspan></text><g stroke="#000" tb:tag="scale">
   <rect x="176.5" y="83" width="41" height="652" fill="#c8dff7" tb:tag="scaleBackground"/>
   <rect transform="scale(1,-1)" x="176.5" y="-735" width="41" height="164" fill="#ebebeb" tb:tag="lowWarningScale"/>
   <rect x="176.5" y="83.5" width="41" height="164" fill="#ebebeb" tb:tag="highWarningScale"/>
diff --git a/application/src/main/data/json/system/scada_symbols/electrical-distribution-board-hp.svg b/application/src/main/data/json/system/scada_symbols/electrical-distribution-board-hp.svg
new file mode 100644
index 0000000000..0fcfe4dde0
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/electrical-distribution-board-hp.svg
@@ -0,0 +1,332 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="600" fill="none" version="1.1" viewBox="0 0 400 600"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Electrical distribution board",
+  "description": "Electrical distribution board with various states.",
+  "searchTags": [
+    "energy",
+    "power",
+    "fuse",
+    "panel"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 3,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.backgroundColor});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "icon",
+      "stateRenderFunction": "var showIcon = ctx.properties.showIcon;\nvar showLabel = ctx.properties.label;\nif (showIcon) {\n    element.show();\n    var icon = ctx.properties.icon;\n    var iconSize = ctx.properties.iconSize;\n    var iconColor = ctx.properties.iconColor;\n    ctx.api.icon(element, icon, iconSize, iconColor, true);\n    if (!showLabel) {\n        element.transform({translateX: 200, translateY: 310});\n    }\n} else {\n    element.hide()\n}",
+      "actions": null
+    },
+    {
+      "tag": "triangle",
+      "stateRenderFunction": "if (ctx.properties.showTriangle) {\n    element.show();\n    element.stroke(ctx.properties.triangleColor);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "showIcon",
+      "name": "{i18n:scada.symbol.icon}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "iconSize",
+      "name": "{i18n:scada.symbol.icon}",
+      "type": "number",
+      "default": 44,
+      "fieldSuffix": "px",
+      "min": 0,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "icon",
+      "name": "{i18n:scada.symbol.icon}",
+      "type": "icon",
+      "default": "bolt",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showTriangle",
+      "name": "{i18n:scada.symbol.triangle}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "triangleColor",
+      "name": "{i18n:scada.symbol.triangle}",
+      "type": "color",
+      "default": "#D12730",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "iconColor",
+      "name": "{i18n:scada.symbol.icon}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "backgroundColor",
+      "name": "{i18n:scada.symbol.background-color}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "divider": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="398" height="598" rx="3" fill="#fff" stroke="#1a1a1a" stroke-width="2" tb:tag="background"/><path d="m150.82 344.75c-1.541 0-2.503-1.669-1.731-3.002l49.176-84.942c0.771-1.33 2.692-1.33 3.462 0l49.177 84.942c0.772 1.333-0.19 3.002-1.731 3.002h-98.353z" stroke="#D12730" stroke-width="8" tb:tag="triangle"/><g transform="translate(200,310)" tb:tag="icon">
+  <path d="m4.3731-15.914-16.841 15.085c-1.041 0.943-0.455 2.682 0.943 2.812l13.151 1.268-7.884 10.989c-0.358 0.504-0.309 1.203 0.13 1.642 0.487 0.488 1.251 0.504 1.755 0.033l16.841-15.086c1.041-0.943 0.455-2.682-0.943-2.812l-13.151-1.268 7.885-10.989c0.357-0.504 0.308-1.203-0.131-1.642-0.487-0.488-1.251-0.504-1.755-0.032z" fill="#1a1a1a"/>
+ </g><path d="m134.53 0s-134.53 0-134.53 100.5v492.54c0 3.9768 3.5818 6.9606 8 6.9606h384c4.418 0 8-2.9838 8-6.9606v-492.54c0-100.5-132.14-100.5-132.14-100.5h-67.86zm134.14 121.8c-2.5774 0-4.6666 1.8804-4.6666 4.2v450.6c0 2.3196 2.0894 4.2 4.6666 4.2h29.332c2.5774 0 4.6666-1.8804 4.6666-4.2v-450.6c0-2.3196-2.0894-4.2-4.6666-4.2z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/electrical-engine-hp.svg b/application/src/main/data/json/system/scada_symbols/electrical-engine-hp.svg
new file mode 100644
index 0000000000..a41de55142
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/electrical-engine-hp.svg
@@ -0,0 +1,360 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="400" fill="none" version="1.1" viewBox="0 0 600 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Electrical engine",
+  "description": "Electrical engine with various states.",
+  "searchTags": [
+    "extraction",
+    "power"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <rect x="161" y="21" width="178" height="30" rx="1"/>
+  <rect x="201" y="1" width="98" height="20" rx="1"/>
+  <rect x="51" y="377" width="398" height="22" rx="3"/>
+  <path d="m76.152 377 32.051-38h283.59l32.051 38h-347.7z"/>
+  <path d="m1 100c0-27.062 21.938-49 49-49h446c1.657 0 3 1.3431 3 3v282c0 1.657-1.343 3-3 3h-446c-27.062 0-49-21.938-49-49v-190z"/>
+  <path d="m499 116h16v158h-16v-158z"/>
+  <path d="m515 29c0-1.6569 1.343-3 3-3h26c1.657 0 3 1.3431 3 3v332c0 1.657-1.343 3-3 3h-26c-1.657 0-3-1.343-3-3v-332z"/>
+  <path d="m545 183c0-1.657 1.343-3 3-3h48c1.657 0 3 1.343 3 3v24c0 1.657-1.343 3-3 3h-48c-1.657 0-3-1.343-3-3v-24z"/>
+ </g><path d="m56 50v290" stroke="#1A1A1A" stroke-width="2"/><path d="m56 83h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 67h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 99h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 115h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 131h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 147h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 163h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 179h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 211h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 195h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 227h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 259h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 243h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 275h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 291h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 307h389" stroke="#1A1A1A" stroke-width="2"/><path d="m56 323h389" stroke="#1A1A1A" stroke-width="2"/><path d="m445 50v290" stroke="#1A1A1A" stroke-width="2"/><path d="m201.79 0s-201.79 0-201.79 67v328.36c0 2.6512 5.3727 4.6404 12 4.6404h576c6.627 0 12-1.9892 12-4.6404v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 316)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/energy-meter-hp.svg b/application/src/main/data/json/system/scada_symbols/energy-meter-hp.svg
new file mode 100644
index 0000000000..606eb1153d
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/energy-meter-hp.svg
@@ -0,0 +1,482 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="400" fill="none" version="1.1" viewBox="0 0 400 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Energy meter",
+  "description": "Energy meter with various states.",
+  "searchTags": [
+    "power",
+    "energy"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "label",
+      "stateRenderFunction": "if (ctx.properties.showLabel) {\n    element.show();\n    ctx.api.font(element, ctx.properties.labelFont, ctx.properties.labelColor);\n    ctx.api.text(element, ctx.properties.label);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "units",
+      "stateRenderFunction": "if (ctx.properties.showUnits) {\n    element.show();\n    ctx.api.font(element, ctx.properties.unitsFont, ctx.properties.unitsColor);\n    ctx.api.text(element, ctx.properties.units);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "value",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.valueFont, ctx.properties.valueColor);\nctx.api.text(element, ctx.api.formatValue(ctx.values.measured, 0, null, 0));",
+      "actions": null
+    },
+    {
+      "tag": "value-box",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.valueBoxBackground;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "measured",
+      "name": "{i18n:scada.symbol.measured}",
+      "hint": "{i18n:scada.symbol.measured-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "measured"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "label",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "text",
+      "default": "T1",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "labelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "400",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "labelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showUnits",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "units",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "units",
+      "default": "kWh",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "unitsFont",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "500",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "unitsColor",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueFont",
+      "name": "{i18n:scada.symbol.value}",
+      "type": "font",
+      "default": {
+        "size": 48,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "500",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueColor",
+      "name": "{i18n:scada.symbol.value}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="398" height="398" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="49" y="143" width="302" height="114" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box"/><text x="199.83594" y="217.64844" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="value" xml:space="preserve"><tspan dominant-baseline="start">000023</tspan></text><text x="199.89453" y="341.65625" fill="#000000" font-family="Roboto" font-size="36px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">kWh</tspan></text><text x="199.70117" y="83.648438" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="default"><tspan dominant-baseline="start">T1</tspan></text><path d="m134.53-2e-4s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6404 8 4.6404h384c4.418 0 8-1.9892 8-4.6404v-328.36c0-67-132.14-67-132.14-67h-67.858zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/four-rate-energy-meter-hp.svg b/application/src/main/data/json/system/scada_symbols/four-rate-energy-meter-hp.svg
new file mode 100644
index 0000000000..de4fb13836
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/four-rate-energy-meter-hp.svg
@@ -0,0 +1,876 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="400" fill="none" version="1.1" viewBox="0 0 600 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Four-rate energy meter",
+  "description": "Four-rate energy meter with various states.",
+  "searchTags": [
+    "power",
+    "energy"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "export-label",
+      "stateRenderFunction": "if (ctx.properties.showExportLabel) {\n    element.show();\n    ctx.api.font(element, ctx.properties.exportLabelFont, ctx.properties.exportLabelColor);\n    ctx.api.text(element, ctx.properties.exportLabel);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "export-rate",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.exportValueFont, ctx.properties.exportValueColor);\nctx.api.text(element, ctx.api.formatValue(ctx.values.exportRate, 0, null, 0));",
+      "actions": null
+    },
+    {
+      "tag": "night-label",
+      "stateRenderFunction": "if (ctx.properties.showNightLabel) {\n    element.show();\n    ctx.api.font(element, ctx.properties.nightLabelFont, ctx.properties.nightLabelColor);\n    ctx.api.text(element, ctx.properties.nightLabel);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "night-rate",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.nightValueFont, ctx.properties.nightValueColor);\nctx.api.text(element, ctx.api.formatValue(ctx.values.nightRate, 0, null, 0));",
+      "actions": null
+    },
+    {
+      "tag": "off-peak-label",
+      "stateRenderFunction": "if (ctx.properties.showOffPeakLabel) {\n    element.show();\n    ctx.api.font(element, ctx.properties.offPeakLabelFont, ctx.properties.offPeakLabelColor);\n    ctx.api.text(element, ctx.properties.offPeakLabel);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "off-peak-rate",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.offPeakValueFont, ctx.properties.offPeakValueColor);\nctx.api.text(element, ctx.api.formatValue(ctx.values.offPeakRate, 0, null, 0));",
+      "actions": null
+    },
+    {
+      "tag": "peak-label",
+      "stateRenderFunction": "if (ctx.properties.showPeakLabel) {\n    element.show();\n    ctx.api.font(element, ctx.properties.peakLabelFont, ctx.properties.peakLabelColor);\n    ctx.api.text(element, ctx.properties.peakLabel);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "peak-rate",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.peakValueFont, ctx.properties.peakValueColor);\nctx.api.text(element, ctx.api.formatValue(ctx.values.peakRate, 0, null, 0));",
+      "actions": null
+    },
+    {
+      "tag": "units",
+      "stateRenderFunction": "if (ctx.properties.showUnits) {\n    element.show();\n    ctx.api.font(element, ctx.properties.unitsFont, ctx.properties.unitsColor);\n    ctx.api.text(element, ctx.properties.units);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box-export",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.exportValueBoxBackground;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "value-box-night",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.nightValueBoxBackground;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "value-box-off-peak",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.offPeakValueBoxBackground;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "value-box-peak",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.peakValueBoxBackground;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "offPeakRate",
+      "name": "{i18n:scada.symbol.off-peak-rate}",
+      "hint": "{i18n:scada.symbol.measured-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "offPeakRate"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "nightRate",
+      "name": "{i18n:scada.symbol.night-rate}",
+      "hint": "{i18n:scada.symbol.measured-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "nightRate"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "peakRate",
+      "name": "{i18n:scada.symbol.peak-rate}",
+      "hint": "{i18n:scada.symbol.measured-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "peakRate"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "exportRate",
+      "name": "{i18n:scada.symbol.export-rate}",
+      "hint": "{i18n:scada.symbol.measured-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "exportRate"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showOffPeakLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offPeakLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "text",
+      "default": "T1",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offPeakLabelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offPeakLabelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "color",
+      "default": "#000000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offPeakValueFont",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "font",
+      "default": {
+        "size": 48,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offPeakValueColor",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offPeakValueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showNightLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "text",
+      "default": "T2",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightLabelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightLabelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightValueFont",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "font",
+      "default": {
+        "size": 48,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightValueColor",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightValueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showPeakLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "peakLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "text",
+      "default": "T3",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "peakLabelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "peakLabelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "peakValueFont",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "font",
+      "default": {
+        "size": 48,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "peakValueColor",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "peakValueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showExportLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.export-rate}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "exportLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.export-rate}",
+      "type": "text",
+      "default": "Export",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "exportLabelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.export-rate}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "exportLabelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.export-rate}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "exportValueFont",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.export-rate}",
+      "type": "font",
+      "default": {
+        "size": 48,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "exportValueColor",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.export-rate}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "exportValueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "group": "{i18n:scada.symbol.export-rate}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showUnits",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "units",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "units",
+      "default": "kWh",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "unitsFont",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "unitsColor",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="598" height="398" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="49" y="81" width="238" height="82" rx="3" fill="#dedede" stroke="#1a1a1a" stroke-width="2" tb:tag="value-box-off-peak"/><rect x="313" y="81" width="238" height="82" rx="3" fill="#dedede" stroke="#1a1a1a" stroke-width="2" tb:tag="value-box-night"/><rect x="49" y="237" width="238" height="82" rx="3" fill="#dedede" stroke="#1a1a1a" stroke-width="2" tb:tag="value-box-peak"/><rect x="313" y="237" width="238" height="82" rx="3" fill="#dedede" stroke="#1a1a1a" stroke-width="2" tb:tag="value-box-export"/><text x="171.2998" y="58.286133" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="off-peak-label" xml:space="default"><tspan dominant-baseline="start">T1</tspan></text><text x="433.2998" y="58.734375" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="night-label"><tspan dominant-baseline="start">T2</tspan></text><text x="169.2998" y="214.23438" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="peak-label" xml:space="default"><tspan dominant-baseline="start">T3</tspan></text><text x="432.31152" y="213.78613" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="export-label" xml:space="default"><tspan dominant-baseline="start">Export</tspan></text><text x="169.45312" y="139.625" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="off-peak-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="433.45312" y="139.625" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="night-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="169.45312" y="295.625" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="peak-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="433.45312" y="295.625" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="export-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="299.89453" y="371.67578" fill="#000000" font-family="Roboto" font-size="36px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">kWh</tspan></text><path d="m201.8-2e-4s-201.8 0-201.8 67v328.36c0 2.6512 5.3727 4.6404 12 4.6404h576c6.627 0 12-1.9892 12-4.6404v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/fuel-generator-hp.svg b/application/src/main/data/json/system/scada_symbols/fuel-generator-hp.svg
new file mode 100644
index 0000000000..52a3c70d6e
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/fuel-generator-hp.svg
@@ -0,0 +1,359 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="400" fill="none" version="1.1" viewBox="0 0 600 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Fuel generator",
+  "description": "Fuel generator with various states.",
+  "searchTags": [
+    "power",
+    "energy",
+    "fuel",
+    "generation"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <path d="m1 24c0-12.702 10.298-23 23-23h95c12.703 0 23 10.298 23 23v37c0 3.866-3.134 7-7 7h-14c-3.866 0-7-3.134-7-7v-21c0-6.0751-4.925-11-11-11h-63c-6.0751 0-11 4.9249-11 11v282c0 6.075 4.9249 11 11 11h520c6.075 0 11-4.925 11-11v-314c0-3.866 3.134-7 7-7h14c3.866 0 7 3.134 7 7v330c0 12.703-10.297 23-23 23h-552c-12.702 0-23-10.297-23-23v-314z"/>
+  <path d="m29 78c0-12.702 10.298-23 23-23h496c12.703 0 23 10.298 23 23v244c0 6.075-4.925 11-11 11h-520c-6.0751 0-11-4.925-11-11v-244z"/>
+  <circle cx="478" cy="350" r="49"/>
+  <path d="m60 361h30v33c0 2.761-2.2386 5-5 5h-20c-2.7614 0-5-2.239-5-5v-33z"/>
+  <path d="m221 44c0-12.702 10.297-23 23-23h272c12.703 0 23 10.298 23 23v11h-318v-11z"/>
+ </g><line x1="87" x2="181" y1="211" y2="211" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><line x1="87" x2="181" y1="243" y2="243" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><line x1="87" x2="181" y1="275" y2="275" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><line x1="203" x2="297" y1="211" y2="211" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><line x1="203" x2="297" y1="243" y2="243" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><line x1="203" x2="297" y1="275" y2="275" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><path d="m201.8 0s-201.8 0-201.8 67v328.36c0 2.6512 5.3727 4.6403 12 4.6403h576c6.627 0 12-1.9892 12-4.6403v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/gas-preventer-hp.svg b/application/src/main/data/json/system/scada_symbols/gas-preventer-hp.svg
new file mode 100644
index 0000000000..ea5a479eda
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/gas-preventer-hp.svg
@@ -0,0 +1,361 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Gas preventer",
+  "description": "Gas preventer with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <rect x="58" y="177" width="84" height="22" rx="2"/>
+  <rect x="41" y="147" width="118" height="30" rx="2"/>
+  <rect x="1" y="1" width="198" height="146" rx="2"/>
+  <rect x="1" y="33" width="198" height="38"/>
+  <circle cx="20" cy="52" r="7"/>
+  <circle cx="52" cy="52" r="7"/>
+  <circle cx="84" cy="52" r="7"/>
+  <circle cx="116" cy="52" r="7"/>
+  <circle cx="148" cy="52" r="7"/>
+  <circle cx="180" cy="52" r="7"/>
+ </g><path d="m67.263 0s-67.263 0-67.263 33.5v164.18c0 1.3256 1.7909 2.3202 4 2.3202h192c2.209 0 4-0.9946 4-2.3202v-164.18c0-33.5-66.07-33.5-66.07-33.5h-33.93zm67.07 40.6c-1.2887 0-2.3333 0.6268-2.3333 1.4v150.2c0 0.7732 1.0447 1.4 2.3333 1.4h14.666c1.2887 0 2.3333-0.6268 2.3333-1.4v-150.2c0-0.7732-1.0447-1.4-2.3333-1.4z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,116)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 116)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/gas-wellhead-hp.svg b/application/src/main/data/json/system/scada_symbols/gas-wellhead-hp.svg
new file mode 100644
index 0000000000..c2fee0f7ac
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/gas-wellhead-hp.svg
@@ -0,0 +1,363 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="800" height="1000" fill="none" version="1.1" viewBox="0 0 800 1000"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Gas wellhead",
+  "description": "Gas wellhead with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 4,
+  "widgetSizeY": 5,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<path d="m368 869h1v-45c0-0.552 0.448-1 1-1h60c0.552 0 1 0.448 1 1v45h1 38c0.552 0 1 0.448 1 1v60c0 0.552-0.448 1-1 1h-39v45c0 0.552-0.448 1-1 1h-60c-0.552 0-1-0.448-1-1v-45h-39c-0.552 0-1-0.448-1-1v-60c0-0.552 0.448-1 1-1h38z" stroke="#1A1A1A" stroke-width="2"/><rect x="385" y="116" width="30" height="143" stroke="#1A1A1A" stroke-width="2"/><rect x="377" y="106" width="46" height="10" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="377" y="259" width="46" height="10" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="385" y="588" width="30" height="225" stroke="#1A1A1A" stroke-width="2"/><rect x="385" y="341" width="30" height="225" stroke="#1A1A1A" stroke-width="2"/><rect x="377" y="578" width="46" height="10" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="377" y="331" width="46" height="10" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="377" y="813" width="46" height="10" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="377" y="566" width="46" height="10" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="377" y="94" width="46" height="10" rx="1" stroke="#1A1A1A" stroke-width="2"/><circle cx="400" cy="30" r="29" stroke="#1A1A1A" stroke-width="2"/><circle cx="400" cy="30" r="20" stroke="#1A1A1A" stroke-width="2"/><rect x="390" y="57" width="2" height="37" fill="#1A1A1A"/><rect x="176" y="285" width="143" height="30" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="408" y="57" width="2" height="37" fill="#1A1A1A"/><rect x="176" y="885" width="143" height="30" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="646" y="285" width="143" height="30" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="646" y="885" width="143" height="30" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="11" y="285" width="143" height="30" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="11" y="885" width="143" height="30" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="481" y="285" width="143" height="30" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="481" y="885" width="143" height="30" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="319" y="277" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="319" y="877" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="789" y="277" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="789" y="877" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="329" y="269" width="142" height="62" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="166" y="277" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="166" y="877" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="636" y="277" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="636" y="877" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="154" y="277" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="154" y="877" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="624" y="277" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="624" y="877" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="1" y="277" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="1" y="877" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="471" y="277" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="471" y="877" width="10" height="46" rx="1" stroke="#1A1A1A" stroke-width="2"/><g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <rect x="281" y="977" width="238" height="22" rx="1"/>
+  <path d="m436.76 159.34-0.692-0.919-0.813 0.814-27.767 27.766 27.767 27.766 0.813 0.814 0.692-0.919c5.803-7.698 9.243-17.279 9.243-27.661s-3.44-19.963-9.243-27.661zm-10.147-8.434 0.84-0.84-0.971-0.684c-7.488-5.28-16.623-8.381-26.479-8.381-10.382 0-19.963 3.44-27.661 9.243l-0.919 0.692 0.814 0.813 26.766 26.767 27.61-27.61zm-62.705 9.485-0.84-0.84-0.684 0.971c-5.28 7.488-8.381 16.623-8.381 26.479s3.101 18.991 8.381 26.479l0.684 0.971 27.45-27.45-26.61-26.61zm8.329 61.862-0.814 0.813 0.919 0.692c7.698 5.803 17.279 9.243 27.661 9.243 9.856 0 18.991-3.101 26.479-8.381l0.971-0.684-28.45-28.45-26.766 26.767zm27.766-98.252c34.794 0 63 28.206 63 63s-28.206 63-63 63-63-28.206-63-63 28.206-63 63-63z"/>
+  <path d="m436.76 430.34-0.692-0.919-0.813 0.814-27.767 27.766 27.767 27.766 0.813 0.814 0.692-0.919c5.803-7.698 9.243-17.279 9.243-27.661s-3.44-19.963-9.243-27.661zm-10.147-8.434 0.84-0.84-0.971-0.684c-7.488-5.28-16.623-8.381-26.479-8.381-10.382 0-19.963 3.44-27.661 9.243l-0.919 0.692 0.814 0.813 26.766 26.767 27.61-27.61zm-62.705 9.485-0.84-0.84-0.684 0.971c-5.28 7.488-8.381 16.623-8.381 26.479s3.101 18.991 8.381 26.479l0.684 0.971 27.45-27.45-26.61-26.61zm8.329 61.862-0.814 0.813 0.919 0.692c7.698 5.803 17.279 9.243 27.661 9.243 9.856 0 18.991-3.101 26.479-8.381l0.971-0.684-28.45-28.45-26.766 26.767zm27.766-98.252c34.794 0 63 28.206 63 63s-28.206 63-63 63-63-28.206-63-63 28.206-63 63-63z"/>
+  <path d="m436.76 677.34-0.692-0.919-0.813 0.814-27.767 27.766 27.767 27.766 0.813 0.814 0.692-0.919c5.803-7.698 9.243-17.279 9.243-27.661s-3.44-19.963-9.243-27.661zm-10.147-8.434 0.84-0.84-0.971-0.684c-7.488-5.28-16.623-8.381-26.479-8.381-10.382 0-19.963 3.44-27.661 9.243l-0.919 0.692 0.814 0.813 26.766 26.767 27.61-27.61zm-62.705 9.485-0.84-0.84-0.684 0.971c-5.28 7.488-8.381 16.623-8.381 26.479s3.101 18.991 8.381 26.479l0.684 0.971 27.45-27.45-26.61-26.61zm8.329 61.862-0.814 0.813 0.919 0.692c7.698 5.803 17.279 9.243 27.661 9.243 9.856 0 18.991-3.101 26.479-8.381l0.971-0.684-28.45-28.45-26.766 26.767zm27.766-98.252c34.794 0 63 28.206 63 63s-28.206 63-63 63-63-28.206-63-63 28.206-63 63-63z"/>
+  <path d="m275.66 336.76 0.919-0.692-0.814-0.813-27.766-27.767-27.766 27.767-0.814 0.813 0.919 0.692c7.698 5.803 17.279 9.243 27.661 9.243s19.963-3.44 27.661-9.243zm8.434-10.147 0.84 0.84 0.684-0.971c5.28-7.488 8.381-16.623 8.381-26.479 0-10.382-3.44-19.963-9.243-27.661l-0.692-0.919-0.813 0.814-26.767 26.766 27.61 27.61zm-9.485-62.705 0.84-0.84-0.971-0.684c-7.488-5.28-16.623-8.381-26.479-8.381s-18.991 3.101-26.479 8.381l-0.971 0.684 27.45 27.45 26.61-26.61zm-61.862 8.329-0.813-0.814-0.692 0.919c-5.803 7.698-9.243 17.279-9.243 27.661 0 9.856 3.101 18.991 8.381 26.479l0.684 0.971 28.45-28.45-26.767-26.766zm98.252 27.766c0 34.794-28.206 63-63 63s-63-28.206-63-63 28.206-63 63-63 63 28.206 63 63z"/>
+  <path d="m275.66 936.76 0.919-0.692-0.814-0.813-27.766-27.767-27.766 27.767-0.814 0.813 0.919 0.692c7.698 5.803 17.279 9.243 27.661 9.243s19.963-3.44 27.661-9.243zm8.434-10.147 0.84 0.84 0.684-0.971c5.28-7.488 8.381-16.623 8.381-26.479 0-10.382-3.44-19.963-9.243-27.661l-0.692-0.919-0.813 0.814-26.767 26.766 27.61 27.61zm-9.485-62.705 0.84-0.84-0.971-0.684c-7.488-5.28-16.623-8.381-26.479-8.381s-18.991 3.101-26.479 8.381l-0.971 0.684 27.45 27.45 26.61-26.61zm-61.862 8.329-0.813-0.814-0.692 0.919c-5.803 7.698-9.243 17.279-9.243 27.661 0 9.856 3.101 18.991 8.381 26.479l0.684 0.971 28.45-28.45-26.767-26.766zm98.252 27.766c0 34.794-28.206 63-63 63s-63-28.206-63-63 28.206-63 63-63 63 28.206 63 63z"/>
+  <path d="m745.66 336.76 0.919-0.692-0.814-0.813-27.766-27.767-27.766 27.767-0.814 0.813 0.919 0.692c7.698 5.803 17.279 9.243 27.661 9.243s19.963-3.44 27.661-9.243zm8.434-10.147 0.84 0.84 0.684-0.971c5.28-7.488 8.381-16.623 8.381-26.479 0-10.382-3.44-19.963-9.243-27.661l-0.692-0.919-0.813 0.814-26.767 26.766 27.61 27.61zm-9.485-62.705 0.84-0.84-0.971-0.684c-7.488-5.28-16.623-8.381-26.479-8.381s-18.991 3.101-26.479 8.381l-0.971 0.684 27.45 27.45 26.61-26.61zm-61.862 8.329-0.813-0.814-0.692 0.919c-5.803 7.698-9.243 17.279-9.243 27.661 0 9.856 3.101 18.991 8.381 26.479l0.684 0.971 28.45-28.45-26.767-26.766zm98.252 27.766c0 34.794-28.206 63-63 63s-63-28.206-63-63 28.206-63 63-63 63 28.206 63 63z"/>
+  <path d="m745.66 936.76 0.919-0.692-0.814-0.813-27.766-27.767-27.766 27.767-0.814 0.813 0.919 0.692c7.698 5.803 17.279 9.243 27.661 9.243s19.963-3.44 27.661-9.243zm8.434-10.147 0.84 0.84 0.684-0.971c5.28-7.488 8.381-16.623 8.381-26.479 0-10.382-3.44-19.963-9.243-27.661l-0.692-0.919-0.813 0.814-26.767 26.766 27.61 27.61zm-9.485-62.705 0.84-0.84-0.971-0.684c-7.488-5.28-16.623-8.381-26.479-8.381s-18.991 3.101-26.479 8.381l-0.971 0.684 27.45 27.45 26.61-26.61zm-61.862 8.329-0.813-0.814-0.692 0.919c-5.803 7.698-9.243 17.279-9.243 27.661 0 9.856 3.101 18.991 8.381 26.479l0.684 0.971 28.45-28.45-26.767-26.766zm98.252 27.766c0 34.794-28.206 63-63 63s-63-28.206-63-63 28.206-63 63-63 63 28.206 63 63z"/>
+  <path d="m110.66 336.76 0.919-0.692-0.814-0.813-27.059-27.06-0.7071-0.707-0.7071 0.707-27.059 27.06-0.8134 0.813 0.9186 0.692c7.6985 5.803 17.28 9.243 27.661 9.243s19.963-3.44 27.661-9.243zm8.434-10.147 0.84 0.84 0.684-0.971c5.28-7.488 8.381-16.623 8.381-26.479 0-10.382-3.44-19.963-9.243-27.661l-0.692-0.919-0.813 0.814-26.06 26.059-0.7071 0.707 0.7071 0.707 26.903 26.903zm-9.485-62.705 0.84-0.84-0.971-0.684c-7.488-5.28-16.623-8.381-26.479-8.381s-18.991 3.101-26.479 8.381l-0.9707 0.684 0.8399 0.84 25.903 25.903 0.7071 0.707 0.7071-0.707 25.903-25.903zm-61.862 8.329-0.8134-0.814-0.6923 0.919c-5.8024 7.698-9.2427 17.279-9.2427 27.661 0 9.856 3.1011 18.991 8.3807 26.479l0.6844 0.971 0.8399-0.84 26.903-26.903 0.7071-0.707-0.7071-0.707-26.059-26.059zm98.252 27.766c0 34.794-28.206 63-63 63-34.794 0-63-28.206-63-63s28.206-63 63-63c34.794 0 63 28.206 63 63z"/>
+  <path d="m110.66 936.76 0.919-0.692-0.814-0.813-27.059-27.06-0.7071-0.707-0.7071 0.707-27.059 27.06-0.8134 0.813 0.9186 0.692c7.6985 5.803 17.28 9.243 27.661 9.243s19.963-3.44 27.661-9.243zm8.434-10.147 0.84 0.84 0.684-0.971c5.28-7.488 8.381-16.623 8.381-26.479 0-10.382-3.44-19.963-9.243-27.661l-0.692-0.919-0.813 0.814-26.06 26.059-0.7071 0.707 0.7071 0.707 26.903 26.903zm-9.485-62.705 0.84-0.84-0.971-0.684c-7.488-5.28-16.623-8.381-26.479-8.381s-18.991 3.101-26.479 8.381l-0.9707 0.684 0.8399 0.84 25.903 25.903 0.7071 0.707 0.7071-0.707 25.903-25.903zm-61.862 8.329-0.8134-0.814-0.6923 0.919c-5.8024 7.698-9.2427 17.279-9.2427 27.661 0 9.856 3.1011 18.991 8.3807 26.479l0.6844 0.971 0.8399-0.84 26.903-26.903 0.7071-0.707-0.7071-0.707-26.059-26.059zm98.252 27.766c0 34.794-28.206 63-63 63-34.794 0-63-28.206-63-63s28.206-63 63-63c34.794 0 63 28.206 63 63z"/>
+  <path d="m580.66 336.76 0.919-0.692-0.814-0.813-27.766-27.767-27.766 27.767-0.814 0.813 0.919 0.692c7.698 5.803 17.279 9.243 27.661 9.243s19.963-3.44 27.661-9.243zm8.434-10.147 0.84 0.84 0.684-0.971c5.28-7.488 8.381-16.623 8.381-26.479 0-10.382-3.44-19.963-9.243-27.661l-0.692-0.919-0.813 0.814-26.767 26.766 27.61 27.61zm-9.485-62.705 0.84-0.84-0.971-0.684c-7.488-5.28-16.623-8.381-26.479-8.381s-18.991 3.101-26.479 8.381l-0.971 0.684 27.45 27.45 26.61-26.61zm-61.862 8.329-0.813-0.814-0.692 0.919c-5.803 7.698-9.243 17.279-9.243 27.661 0 9.856 3.101 18.991 8.381 26.479l0.684 0.971 28.45-28.45-26.767-26.766zm98.252 27.766c0 34.794-28.206 63-63 63s-63-28.206-63-63 28.206-63 63-63 63 28.206 63 63z"/>
+  <path d="m580.66 936.76 0.919-0.692-0.814-0.813-27.766-27.767-27.766 27.767-0.814 0.813 0.919 0.692c7.698 5.803 17.279 9.243 27.661 9.243s19.963-3.44 27.661-9.243zm8.434-10.147 0.84 0.84 0.684-0.971c5.28-7.488 8.381-16.623 8.381-26.479 0-10.382-3.44-19.963-9.243-27.661l-0.692-0.919-0.813 0.814-26.767 26.766 27.61 27.61zm-9.485-62.705 0.84-0.84-0.971-0.684c-7.488-5.28-16.623-8.381-26.479-8.381s-18.991 3.101-26.479 8.381l-0.971 0.684 27.45 27.45 26.61-26.61zm-61.862 8.329-0.813-0.814-0.692 0.919c-5.803 7.698-9.243 17.279-9.243 27.661 0 9.856 3.101 18.991 8.381 26.479l0.684 0.971 28.45-28.45-26.767-26.766zm98.252 27.766c0 34.794-28.206 63-63 63s-63-28.206-63-63 28.206-63 63-63 63 28.206 63 63z"/>
+ </g><path d="m269.05 0s-269.05 0-269.05 167.5v820.9c0 6.628 7.1636 11.601 16 11.601h768c8.836 0 16-4.973 16-11.601v-820.9c0-167.5-264.28-167.5-264.28-167.5h-135.72zm268.28 203c-5.1548 0-9.3332 3.134-9.3332 7v751c0 3.866 4.1788 7 9.3332 7h58.664c5.1548 0 9.3332-3.134 9.3332-7v-751c0-3.866-4.1788-7-9.3332-7z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,916)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 916)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/heat-exchanger-hp.svg b/application/src/main/data/json/system/scada_symbols/heat-exchanger-hp.svg
new file mode 100644
index 0000000000..797220ea96
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/heat-exchanger-hp.svg
@@ -0,0 +1,363 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="600" fill="none" version="1.1" viewBox="0 0 600 600"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Heat exchanger",
+  "description": "Heat exchanger with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 3,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <path d="m1 5c0-2.2091 1.7909-4 4-4h590c2.209 0 4 1.7909 4 4v134h-598v-134z"/>
+  <path d="m121 317h358v54c0 2.209-1.791 4-4 4h-350c-2.209 0-4-1.791-4-4v-54z"/>
+  <rect x="271" y="375" width="58" height="80"/>
+  <rect x="248" y="456" width="104" height="14" rx="2"/>
+  <path d="m221 474c0-2.209 1.791-4 4-4h150c2.209 0 4 1.791 4 4v125h-158v-125z"/>
+  <path d="m120.65 317-79.111-178h516.92l-79.111 178h-358.7z"/>
+  <path d="m263 318v56"/>
+  <path d="m188 318v56"/>
+  <path d="m413 318v56"/>
+  <path d="m200 0v138"/>
+  <path d="m400 0v138"/>
+  <path d="m338 318v56"/>
+ </g><path d="m201.79 0s-201.79 0-201.79 100.5v492.54c0 3.9768 5.3727 6.9606 12 6.9606h576c6.627 0 12-2.9838 12-6.9606v-492.54c0-100.5-198.21-100.5-198.21-100.5h-101.79zm201.21 121.8c-3.8661 0-6.9999 1.8804-6.9999 4.2v450.6c0 2.3196 3.1341 4.2 6.9999 4.2h43.998c3.8661 0 6.9999-1.8804 6.9999-4.2v-450.6c0-2.3196-3.1341-4.2-6.9999-4.2z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/high-voltage-tower-hp.svg b/application/src/main/data/json/system/scada_symbols/high-voltage-tower-hp.svg
new file mode 100644
index 0000000000..3aef3ff948
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/high-voltage-tower-hp.svg
@@ -0,0 +1,297 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="800" fill="none" version="1.1" viewBox="0 0 400 800"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP High voltage tower",
+  "description": "High voltage tower with various states.",
+  "searchTags": [
+    "power",
+    "energy"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 4,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.backgroundColor});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "backgroundColor",
+      "name": "{i18n:scada.symbol.background-color}",
+      "type": "color",
+      "default": "#999999",
+      "divider": false
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#999" stroke="#1a1a1a" tb:tag="background">
+  <path d="m140 300h120" stroke-width="2"/>
+  <path d="m397 240v63" stroke-width="6"/>
+  <path d="m312 100v50" stroke-width="2"/>
+  <path d="m88 100v50" stroke-width="2"/>
+  <path d="m3 240v63" stroke-width="6"/>
+  <path d="m294 150h36" stroke-width="2"/>
+  <path d="m70 150h36" stroke-width="2"/>
+  <path d="m259.73 61 66.5 38h-252.47l66.5-38z" stroke-width="2"/>
+  <path d="m399.62 239h-399.23l139.46-58h120.32z" stroke-width="2.0004"/>
+  <path d="m259.02 299.7 99.599 497.5-158.17-79.085-0.447-0.224-0.447 0.224-158.17 79.085 99.599-497.5 0.019-0.097v-238.19l59-59.983 59 59.983v238.19z" stroke-width="2"/>
+  <path d="m200.08 718.22-130.08-67.22" stroke-width="2.0033"/>
+  <path d="m200.08 584-129.08 67.226" stroke-width="2.0006"/>
+  <path d="m200 718.22 130.08-67.22" stroke-width="2.0033"/>
+  <path d="m200 584 129.08 67.226" stroke-width="2.0006"/>
+  <path d="m200 584.22 105.08-54.222" stroke-width="2.0009"/>
+  <path d="m200 476 105.08 54.222" stroke-width="2.0009"/>
+  <path d="m200 476.52 85.077-44.225" stroke-width="2.0013"/>
+  <path d="m200 387.29 85.073 44.215" stroke-width="2.0113"/>
+  <path d="m200 387.22 69.098-35.23" stroke-width="1.9864"/>
+  <path d="m200.09 387.22-69.098-35.23" stroke-width="1.9864"/>
+  <path d="m200.09 475.5-85.094-43.216" stroke-width="2.0007"/>
+  <path d="m200.09 387.28-85.094 43.216" stroke-width="2.0007"/>
+  <path d="m200.08 584.22-105.08-54.222" stroke-width="2.0009"/>
+  <path d="m200.08 476-105.08 54.219" stroke-width="2.004"/>
+  <path d="m141 300h118" stroke-width="2"/>
+  <path d="m141 61h118" stroke-width="2"/>
+  <path d="m141 181h118" stroke-width="2"/>
+  <path d="m141 239h118" stroke-width="2"/>
+  <path d="m141 99h118" stroke-width="2"/>
+  <path d="m141 61h118" stroke-width="2"/>
+ </g><path d="m134.53 0s-134.53 0-134.53 134v656.72c0 5.3024 3.5818 9.2806 8 9.2806h384c4.418 0 8-3.9784 8-9.2806v-656.72c0-134-132.14-134-132.14-134h-67.86zm134.14 162.4c-2.5774 0-4.6666 2.5072-4.6666 5.6v600.8c0 3.0928 2.0894 5.6 4.6666 5.6h29.332c2.5774 0 4.6666-2.5072 4.6666-5.6v-600.8c0-3.0928-2.0894-5.6-4.6666-5.6z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,716)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 720.94)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/hook-hp.svg b/application/src/main/data/json/system/scada_symbols/hook-hp.svg
new file mode 100644
index 0000000000..742d1fe811
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/hook-hp.svg
@@ -0,0 +1,293 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="400" fill="none" version="1.1" viewBox="0 0 200 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Hook",
+  "description": "Hook with various states.",
+  "searchTags": [
+    "hook",
+    "drilling"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "hook",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.hookColor});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "hookColor",
+      "name": "{i18n:scada.symbol.hook-color}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "",
+      "divider": false,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1a1a1a" stroke-width="2" tb:tag="hook">
+  <path d="m83.979 279.78c2.3649-3.644 3.8966-6.715 4.6115-9.864 0.64089-2.823 0.61129-5.644 0.017-8.921h30.209c0.58999 3.566 0.85699 11.114-3.162 23.222-1.333 4.015-4.2859 7.854-8.1039 11.674-3.19 3.19-6.9109 6.3-10.681 9.45-0.74019 0.619-1.4823 1.239-2.2226 1.862-4.4846 3.772-8.8978 7.63-12.264 11.697-3.3665 4.066-5.7648 8.433-6.0848 13.232-0.61659 9.244 1.9776 15.781 5.8941 20.39 3.8938 4.582 9.0245 7.176 13.366 8.691 3.3656 1.175 10.24 1.992 16.594-0.225 3.199-1.116 6.2889-3.011 8.7169-6.037 2.429-3.028 4.149-7.131 4.6969-12.59 0.34899-3.477 0.60699-6.524 0.82999-9.148 0.119-1.403 0.22699-2.684 0.33399-3.846 0.311-3.382 0.60399-5.72 1.064-7.249 0.46099-1.528 0.96899-1.88 1.476-1.959 0.33699-0.054 0.81799-0.013 1.519 0.199 0.69499 0.211 1.536 0.57 2.566 1.084 11.321 5.643 15.547 14.835 16.45 23.832 0.90798 9.053-1.564 17.881-3.637 22.532-8.6369 19.376-26.348 31.189-48.797 31.189-13.468 0-23.767-2.387-32.055-6.711-8.2843-4.322-14.63-10.617-20.134-18.55-4.4111-6.357-8.8287-16.852-9.925-28.56-1.0945-11.689 1.1254-24.52 9.889-35.661 8.2183-10.447 16.325-15.531 23.129-19.132 1.2292-0.65 2.4347-1.261 3.5979-1.851 2.0264-1.027 3.9244-1.989 5.5955-2.981 2.6649-1.581 4.9275-3.332 6.5092-5.769z"/>
+  <path d="m58.08 261.38c-1.9988-1.28-4.4082-3.607-7.1067-6.92-2.688-3.299-5.6227-7.526-8.6813-12.552-6.1167-10.053-12.701-23.261-18.777-38.55-12.154-30.585-22.24-69.418-22.511-107.89-0.43146-61.407 29.982-85.126 51.186-90.56 10.719-2.7467 30.395-3.9859 49.703-3.9086 19.316 0.07727 38.034 1.4712 46.85 3.9039 17.425 4.8087 50.257 32.066 50.257 90.571 0 32.108-9.83 70.081-22.104 101.85-6.133 15.874-12.866 30.17-19.264 41.38-6.423 11.254-12.436 19.266-17.095 22.714-1.119 0.828-3.04 1.62-5.682 2.327-2.615 0.701-5.841 1.294-9.494 1.775-7.304 0.96-16.24 1.459-25.255 1.477-9.0138 0.019-18.079-0.442-25.642-1.393-3.7817-0.476-7.1717-1.072-9.9838-1.787-2.8296-0.72-5.0029-1.542-6.4004-2.437z"/>
+ </g><mask id="path-5-inside-1_4471_52357" fill="#ffffff">
+  <path d="m172.8 99c0 39.765-32.236 72-72 72-39.765 0-72-32.235-72-72 0-39.764 32.236-72 72-72 39.764 0 72 32.236 72 72zm-132.78 0c0 33.57 27.214 60.784 60.784 60.784 33.57 0 60.784-27.214 60.784-60.784 0-33.57-27.214-60.784-60.784-60.784-33.57 0-60.784 27.214-60.784 60.784z"/>
+ </mask><path d="m172.8 99c0 39.765-32.236 72-72 72-39.765 0-72-32.235-72-72 0-39.764 32.236-72 72-72 39.764 0 72 32.236 72 72zm-132.78 0c0 33.57 27.214 60.784 60.784 60.784 33.57 0 60.784-27.214 60.784-60.784 0-33.57-27.214-60.784-60.784-60.784-33.57 0-60.784 27.214-60.784 60.784z" fill="#dedede" mask="url(#path-5-inside-1_4471_52357)" stroke="#1a1a1a" stroke-width="4"/><path d="m67.264 0s-67.264 0-67.264 67v328.36c0 2.6512 1.7909 4.6404 4 4.6404h192c2.209 0 4-1.9892 4-4.6404v-328.36c0-67-66.07-67-66.07-67h-33.929zm67.07 81.2c-1.2887 0-2.3333 1.2536-2.3333 2.8v300.4c0 1.5464 1.0447 2.8 2.3333 2.8h14.666c1.2887 0 2.3333-1.2536 2.3333-2.8v-300.4c0-1.5464-1.0447-2.8-2.3333-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-connector-hp.svg b/application/src/main/data/json/system/scada_symbols/horizontal-connector-hp.svg
index 3548d687c5..33b6c0a222 100644
--- a/application/src/main/data/json/system/scada_symbols/horizontal-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/horizontal-connector-hp.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200"><tb:metadata xmlns=""><![CDATA[{
   "title": "HP Horizontal connector",
-  "description": "Horizontal connector",
+  "description": "Horizontal connector with an optional directional arrow to visually indicate flow.",
   "widgetSizeX": 1,
   "widgetSizeY": 1,
   "tags": [
diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-curcuit-breaker-hp.svg b/application/src/main/data/json/system/scada_symbols/horizontal-curcuit-breaker-hp.svg
new file mode 100644
index 0000000000..17fd1ba69e
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/horizontal-curcuit-breaker-hp.svg
@@ -0,0 +1,439 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="200" fill="none" version="1.1" viewBox="0 0 400 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Horizontal circuit breaker",
+  "description": "Horizontal circuit breaker with various states.",
+  "searchTags": [
+    "energy",
+    "power",
+    "ev"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.backgroundColor});",
+      "actions": null
+    },
+    {
+      "tag": "breaker",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "var initial = ctx.values.initialState;\nvar action = initial ? 'offUpdateState' : 'onUpdateState';\n\nctx.api.callAction(event, action, undefined, {\n  next: () => {\n     ctx.api.setValue('initialState', !initial);\n  }\n});"
+        }
+      }
+    },
+    {
+      "tag": "breaker-trigger",
+      "stateRenderFunction": "element.fill(ctx.properties.disabledColor);\nif (ctx.values.initialState) {\n    element.transform({translateX: 0});\n} else {\n    element.transform({translateX: -160});\n}",
+      "actions": null
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "label",
+      "stateRenderFunction": "if (ctx.properties.label) {\n    element.show();\n    var label = ctx.values.initialState ? ctx.properties.onLabel : ctx.properties.offLabel;\n    ctx.api.font(element, ctx.properties.labelFont, ctx.properties.labelColor);\n    ctx.api.text(element, label);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "label-box",
+      "stateRenderFunction": "var color = ctx.properties.disabledColor;\nif (ctx.values.initialState) {\n    color = ctx.properties.enabledColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "initialState",
+      "name": "{i18n:scada.symbol.on-off-state}",
+      "hint": "{i18n:scada.symbol.on-off-state-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": "{i18n:scada.symbol.on}",
+      "falseLabel": "{i18n:scada.symbol.off}",
+      "stateLabel": "",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "onUpdateState",
+      "name": "{i18n:scada.symbol.on-update-state}",
+      "hint": "{i18n:scada.symbol.on-update-state-hint}",
+      "group": null,
+      "type": "action",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": {
+        "action": "EXECUTE_RPC",
+        "executeRpc": {
+          "method": "setState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "setAttribute": {
+          "scope": "SERVER_SCOPE",
+          "key": "state"
+        },
+        "putTimeSeries": {
+          "key": "state"
+        },
+        "valueToData": {
+          "type": "CONSTANT",
+          "constantValue": true,
+          "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;"
+        }
+      },
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "offUpdateState",
+      "name": "{i18n:scada.symbol.off-update-state}",
+      "hint": "{i18n:scada.symbol.off-update-state-hint}",
+      "group": null,
+      "type": "action",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": {
+        "action": "EXECUTE_RPC",
+        "executeRpc": {
+          "method": "setState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "setAttribute": {
+          "key": "state",
+          "scope": "SERVER_SCOPE"
+        },
+        "putTimeSeries": {
+          "key": "state"
+        },
+        "valueToData": {
+          "type": "CONSTANT",
+          "constantValue": false,
+          "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;"
+        }
+      },
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    }
+  ],
+  "properties": [
+    {
+      "id": "label",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "onLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "text",
+      "default": "ON",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "text",
+      "default": "OFF",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "labelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "font",
+      "default": {
+        "size": 42,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "400",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "labelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "color",
+      "default": "#1A1A1A",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "backgroundColor",
+      "name": "{i18n:scada.symbol.background-color}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "enabledColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.enabled}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "disabledColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.disabled}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="398" height="198" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><circle cx="49" cy="100" r="19" stroke="#1a1a1a" stroke-width="2"/><circle cx="351" cy="100" r="19" stroke="#1a1a1a" stroke-width="2"/><path d="m0 100h31" stroke="#1A1A1A" stroke-width="6"/><path d="m369 100h31" stroke="#1A1A1A" stroke-width="6"/><g tb:tag="breaker">
+  <path d="m101 51h198v97c0 0.552-0.448 1-1 1h-196c-0.552 0-1-0.448-1-1v-97z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="label-box"/>
+  <text x="200.83984" y="114.56055" fill="#000000" font-family="Roboto" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="start">ON</tspan></text>
+  <rect x="261" y="25" width="38" height="150" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2" tb:tag="breaker-trigger"/>
+ </g><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-energy-system-controller-hp.svg b/application/src/main/data/json/system/scada_symbols/horizontal-energy-system-controller-hp.svg
new file mode 100644
index 0000000000..13ee85821b
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/horizontal-energy-system-controller-hp.svg
@@ -0,0 +1,378 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="400" fill="none" version="1.1" viewBox="0 0 600 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Horizontal energy systems controller",
+  "description": "Horizontal energy systems controller with various states.",
+  "searchTags": [
+    "energy",
+    "power",
+    "monitoring"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.disconnectedColor;\nif (ctx.values.connected) {\n    color = ctx.properties.connectedColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "indicator",
+      "stateRenderFunction": "var color = ctx.properties.disconnectedIndicatorColor;\nif (ctx.values.connected) {\n    color = ctx.properties.connectedIndicatorColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "label",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.labelFont, ctx.properties.labelColor);\n    ctx.api.text(element, ctx.properties.label);",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "connected",
+      "name": "{i18n:scada.symbol.connected}",
+      "hint": "{i18n:scada.symbol.connected-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.connected}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "connected"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "connectedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.connected}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "disconnectedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.disconnected}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "connectedIndicatorColor",
+      "name": "{i18n:scada.symbol.indicator}",
+      "type": "color",
+      "default": "#198038",
+      "subLabel": "{i18n:scada.symbol.connected}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "disconnectedIndicatorColor",
+      "name": "{i18n:scada.symbol.indicator}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "subLabel": "{i18n:scada.symbol.disconnected}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "label",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "text",
+      "default": "Connected",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "labelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "font",
+      "default": {
+        "size": 30,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "labelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="17" width="598" height="366" rx="5" fill="#fff" stroke="#000" stroke-opacity=".87" stroke-width="2" tb:tag="background"/><rect x="26" y="1" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="26" y="383" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="426" y="383" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="226" y="1" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="426" y="1" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="66" cy="88" r="10" fill="#198038" tb:tag="indicator"/><text x="83.31543" y="91.589844" fill="#000000" font-family="Roboto" font-size="30px" font-weight="400" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="middle">Connected</tspan></text><path d="m201.8 0s-201.8 0-201.8 67v328.36c0 2.6512 5.3727 4.6403 12 4.6403h576c6.627 0 12-1.9892 12-4.6403v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 320.94)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-inline-flow-meter.svg b/application/src/main/data/json/system/scada_symbols/horizontal-inline-flow-meter.svg
index 4ad766764a..5e0c781941 100644
--- a/application/src/main/data/json/system/scada_symbols/horizontal-inline-flow-meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/horizontal-inline-flow-meter.svg
@@ -57,7 +57,7 @@
     },
     {
       "tag": "value",
-      "stateRenderFunction": "var value = ctx.values.value;\nctx.api.text(element, value.toFixed(0));\n",
+      "stateRenderFunction": "var value = ctx.api.formatValue(ctx.values.value, ctx.properties.valueDecimals, '', false);\nctx.api.text(element, value);\n",
       "actions": {
         "click": {
           "actionFunction": "ctx.api.callAction(event, 'displayClick');"
@@ -463,16 +463,20 @@
       "name": "{i18n:scada.symbol.units}",
       "type": "units",
       "default": "m³/hr",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
       "fieldClass": "medium-width",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueDecimals",
+      "name": "{i18n:scada.symbol.decimals}",
+      "type": "number",
+      "default": 0,
+      "fieldClass": "medium-width",
+      "min": 0,
+      "step": 1,
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "defaultBorderColor",
@@ -511,16 +515,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "activeBorderColor",
@@ -559,16 +555,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "warningBorderColor",
@@ -607,16 +595,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "criticalBorderColor",
@@ -655,16 +635,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "backgroundColor",
@@ -703,48 +675,24 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "fluidColor",
       "name": "{i18n:scada.symbol.fluid-color}",
       "type": "color",
       "default": "#1EC1F480",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "pipeColor",
       "name": "{i18n:scada.symbol.pipe-color}",
       "type": "color",
       "default": "#FFFFFF",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     }
   ]
 }]]></tb:metadata>
diff --git a/application/src/main/data/json/system/scada_symbols/house-hp.svg b/application/src/main/data/json/system/scada_symbols/house-hp.svg
new file mode 100644
index 0000000000..d95c47bb8b
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/house-hp.svg
@@ -0,0 +1,349 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="400" fill="none" version="1.1" viewBox="0 0 400 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP House",
+  "description": "House with various states.",
+  "searchTags": [
+    "power",
+    "energy",
+    "consumer"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <path d="m370 377h-340c-2.7614 0-5-2.239-5-5v-185.42c0-1.372 0.5635-2.683 1.5584-3.627l170-161.31c1.93-1.8306 4.954-1.8306 6.884 0l170 161.31c0.995 0.944 1.558 2.255 1.558 3.627v185.42c0 2.761-2.239 5-5 5z"/>
+  <path d="m287 60c0-2.7614 2.239-5 5-5h54.5c2.761 0 5 2.2386 5 5v86.08c0 4.322-5.113 6.609-8.334 3.727l-54.5-48.763c-1.06-0.949-1.666-2.3042-1.666-3.7267v-37.317z"/>
+  <rect x="1" y="377" width="398" height="22" rx="5"/>
+  <path d="m29.655 185h-24.568c-0.9085 0-1.3463-1.114-0.68102-1.732l193.55-180c1.151-1.0709 2.935-1.0709 4.086 0l193.55 180c0.665 0.618 0.227 1.732-0.681 1.732h-24.568c-1.256 0-2.467-0.473-3.39-1.325l-164.92-152.16c-1.149-1.0601-2.919-1.0601-4.068 0l-164.92 152.16c-0.9235 0.852-2.1339 1.325-3.3904 1.325z"/>
+ </g><rect x="89" y="187" width="30" height="63" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="221" y="187" width="30" height="63" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="221" y="286" width="30" height="63" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="89" y="286" width="64" height="91" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="123" y="187" width="30" height="63" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="255" y="187" width="30" height="63" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="255" y="286" width="30" height="63" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="289" y="187" width="30" height="63" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="289" y="286" width="30" height="63" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m200.7 104.07 27.061 26.216c0.645 0.625 0.203 1.718-0.696 1.718h-54.122c-0.899 0-1.341-1.093-0.696-1.718l27.061-26.216c0.388-0.375 1.004-0.375 1.392 0z" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m134.53 0s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6403 8 4.6403h384c4.418 0 8-1.9892 8-4.6403v-328.36c0-67-132.14-67-132.14-67h-67.86zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 320.94)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/industrial-fuel-generator-hp.svg b/application/src/main/data/json/system/scada_symbols/industrial-fuel-generator-hp.svg
new file mode 100644
index 0000000000..2b7a476a92
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/industrial-fuel-generator-hp.svg
@@ -0,0 +1,358 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="1000" height="600" fill="none" version="1.1" viewBox="0 0 1000 600"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Industrial fuel generator",
+  "description": "Industrial fuel generator with various states.",
+  "searchTags": [
+    "power",
+    "energy",
+    "fuel",
+    "generation"
+  ],
+  "widgetSizeX": 5,
+  "widgetSizeY": 3,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "sub-background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = '#999999';\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="998" height="598" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="1" y="1" width="998" height="28" stroke="#1A1A1A" stroke-width="2"/><line x1="858" x2="952" y1="361" y2="361" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><line x1="858" x2="952" y1="393" y2="393" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><line x1="858" x2="952" y1="425" y2="425" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><line x1="858" x2="952" y1="457" y2="457" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><line x1="858" x2="952" y1="67" y2="67" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><line x1="858" x2="952" y1="99" y2="99" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><line x1="858" x2="952" y1="131" y2="131" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><line x1="858" x2="952" y1="163" y2="163" stroke="#1A1A1A" stroke-linecap="round" stroke-width="6"/><rect x="79" y="96" width="278" height="338" rx="3" stroke="#1A1A1A" stroke-width="2"/><rect x="479" y="96" width="278" height="338" rx="3" stroke="#1A1A1A" stroke-width="2"/><circle cx="418" cy="278" r="19" stroke="#1A1A1A" stroke-width="2"/><circle cx="418" cy="278" r="7" fill="#1A1A1A"/><rect x="1" y="501" width="998" height="98" fill="#999" stroke="#1A1A1A" stroke-width="2" tb:tag="sub-background"/><path d="m336.32 0s-336.32 0-336.32 100.5v492.54c0 3.9768 8.9545 6.9604 20 6.9604h960c11.045 0 20-2.9838 20-6.9604v-492.54c0-100.5-330.35-100.5-330.35-100.5h-169.65zm335.35 121.8c-6.4435 0-11.666 1.8804-11.666 4.2v450.6c0 2.3196 5.2235 4.2 11.666 4.2h73.33c6.4435 0 11.666-1.8804 11.666-4.2v-450.6c0-2.3196-5.2235-4.2-11.666-4.2z" fill-opacity="0" style="stroke-width:2.8629" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/inverter-hp.svg b/application/src/main/data/json/system/scada_symbols/inverter-hp.svg
new file mode 100644
index 0000000000..73f14c8e75
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/inverter-hp.svg
@@ -0,0 +1,578 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="600" fill="none" version="1.1" viewBox="0 0 600 600"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Inverter",
+  "description": "Inverter with various states.",
+  "searchTags": [
+    "energy",
+    "power",
+    "hybrid",
+    "solar",
+    "backup"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 3,
+  "tags": [
+    {
+      "tag": "absorption",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.chargingMode === 2) {\n    element.fill(ctx.properties.chargingIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "bulk",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.chargingMode === 1) {\n    element.fill(ctx.properties.chargingIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "float",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.chargingMode === 3) {\n    element.fill(ctx.properties.chargingIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "inverterOn",
+      "stateRenderFunction": "if (ctx.values.running && !ctx.values.operationMode) {\n    element.fill(ctx.properties.operationIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "lowBattery",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.lowBattery) {\n    element.fill(ctx.properties.faultIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "mainsOn",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.operationMode) {\n    element.fill(ctx.properties.operationIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "overload",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.overload) {\n    element.fill(ctx.properties.faultIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "temperature",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.temperature) {\n    element.fill(ctx.properties.faultIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "operationMode",
+      "name": "{i18n:scada.symbol.operation-mode}",
+      "hint": "{i18n:scada.symbol.operation-mode-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": "{i18n:scada.symbol.mains-on-mode}",
+      "falseLabel": "{i18n:scada.symbol.inverter-on-mode}",
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": true,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "chargingMode",
+      "name": "{i18n:scada.symbol.charging-mode}",
+      "hint": "{i18n:scada.symbol.charging-mode-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "INTEGER",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "chargingMode"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "overload",
+      "name": "{i18n:scada.symbol.overload-fault}",
+      "hint": "{i18n:scada.symbol.overload-fault-hint}",
+      "group": "{i18n:scada.symbol.inverter-faults}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "lowBattery",
+      "name": "{i18n:scada.symbol.low-battery-fault}",
+      "hint": "{i18n:scada.symbol.low-battery-fault-hint}",
+      "group": "{i18n:scada.symbol.inverter-faults}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "temperature",
+      "name": "{i18n:scada.symbol.temperature-fault}",
+      "hint": "{i18n:scada.symbol.temperature-fault-hint}",
+      "group": "{i18n:scada.symbol.inverter-faults}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "operationIndicatorsColor",
+      "name": "{i18n:scada.symbol.operation-mode-indicators-color}",
+      "type": "color",
+      "default": "#198038",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "chargingIndicatorsColor",
+      "name": "{i18n:scada.symbol.charging-mode-indicators-color}",
+      "type": "color",
+      "default": "#FAA405",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "faultIndicatorsColor",
+      "name": "{i18n:scada.symbol.inverter-fault-indicators-color}",
+      "type": "color",
+      "default": "#D12730",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<path d="m1 6c0-2.7614 2.2386-5 5-5h588c2.761 0 5 2.2386 5 5v588c0 2.761-2.239 5-5 5h-8c-2.761 0-5-2.239-5-5v-17.9c0-3.866-3.134-7-7-7h-548c-3.866 0-7 3.134-7 7v17.9c0 2.761-2.2386 5-5 5h-8c-2.7614 0-5-2.239-5-5v-588z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="51" y="569" width="98" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="151" y="569" width="98" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="251" y="569" width="98" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="476" y="569" width="48" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m89.269 122.87h-6.375c-0.1818-1.045-0.5171-1.971-1.0057-2.778-0.4886-0.818-1.0966-1.511-1.8239-2.08-0.7272-0.568-1.5568-0.994-2.4886-1.278-0.9205-0.295-1.9148-0.443-2.983-0.443-1.8977 0-3.5795 0.477-5.0454 1.432-1.4659 0.943-2.6137 2.329-3.4432 4.159-0.8295 1.818-1.2443 4.039-1.2443 6.664 0 2.671 0.4148 4.921 1.2443 6.75 0.8409 1.819 1.9886 3.194 3.4432 4.125 1.4659 0.921 3.142 1.381 5.0284 1.381 1.0454 0 2.0227-0.136 2.9318-0.409 0.9205-0.284 1.7443-0.699 2.4716-1.244 0.7386-0.546 1.358-1.216 1.858-2.012 0.5113-0.795 0.8636-1.704 1.0568-2.727l6.375 0.034c-0.2387 1.659-0.7557 3.216-1.5512 4.671-0.7841 1.454-1.8125 2.738-3.0852 3.852-1.2727 1.102-2.7613 1.966-4.4659 2.591-1.7045 0.613-3.5966 0.92-5.6761 0.92-3.0682 0-5.8069-0.71-8.2159-2.13-2.4091-1.421-4.3069-3.472-5.6932-6.154-1.3864-2.682-2.0796-5.898-2.0796-9.648 0-3.761 0.6989-6.977 2.0966-9.647 1.3977-2.682 3.3012-4.733 5.7102-6.154 2.4091-1.42 5.1364-2.13 8.1819-2.13 1.9431 0 3.75 0.272 5.4204 0.818 1.6705 0.545 3.1591 1.346 4.4659 2.403 1.3068 1.046 2.3807 2.33 3.2216 3.853 0.8523 1.511 1.4091 3.238 1.6705 5.181zm11.689 7.79v15.341h-6.1704v-34.909h6.0344v13.176h0.307c0.613-1.477 1.562-2.642 2.846-3.494 1.296-0.864 2.943-1.296 4.943-1.296 1.819 0 3.404 0.381 4.756 1.142 1.352 0.762 2.398 1.875 3.136 3.341 0.75 1.466 1.125 3.256 1.125 5.37v16.67h-6.17v-15.716c0-1.761-0.455-3.131-1.364-4.108-0.897-0.989-2.159-1.483-3.784-1.483-1.091 0-2.068 0.239-2.932 0.716-0.852 0.466-1.522 1.142-2.011 2.029-0.477 0.886-0.716 1.96-0.716 3.221zm30.801 15.869c-1.659 0-3.153-0.295-4.483-0.886-1.318-0.602-2.363-1.489-3.136-2.659-0.761-1.171-1.142-2.614-1.142-4.33 0-1.477 0.273-2.698 0.818-3.664 0.546-0.966 1.29-1.739 2.233-2.319 0.943-0.579 2.006-1.017 3.188-1.312 1.193-0.307 2.426-0.528 3.698-0.665 1.534-0.159 2.779-0.301 3.733-0.426 0.955-0.136 1.648-0.341 2.08-0.614 0.443-0.284 0.665-0.721 0.665-1.312v-0.102c0-1.284-0.381-2.279-1.142-2.983-0.762-0.705-1.858-1.057-3.29-1.057-1.512 0-2.71 0.329-3.597 0.989-0.875 0.659-1.466 1.437-1.772 2.335l-5.762-0.818c0.455-1.591 1.205-2.921 2.25-3.989 1.046-1.08 2.324-1.886 3.835-2.421 1.512-0.545 3.182-0.818 5.012-0.818 1.261 0 2.517 0.148 3.767 0.443 1.25 0.296 2.392 0.785 3.426 1.466 1.034 0.671 1.864 1.586 2.489 2.745 0.636 1.159 0.954 2.608 0.954 4.346v17.523h-5.932v-3.597h-0.204c-0.375 0.728-0.904 1.409-1.585 2.046-0.671 0.625-1.518 1.131-2.54 1.517-1.012 0.375-2.199 0.562-3.563 0.562zm1.603-4.534c1.238 0 2.312-0.244 3.221-0.733 0.909-0.5 1.608-1.159 2.097-1.977 0.5-0.818 0.75-1.71 0.75-2.676v-3.085c-0.193 0.159-0.523 0.307-0.989 0.443-0.454 0.136-0.966 0.256-1.534 0.358s-1.131 0.193-1.688 0.273c-0.556 0.079-1.039 0.147-1.448 0.204-0.921 0.125-1.745 0.33-2.472 0.614s-1.301 0.682-1.722 1.193c-0.42 0.5-0.63 1.148-0.63 1.943 0 1.137 0.415 1.994 1.244 2.574 0.83 0.58 1.886 0.869 3.171 0.869zm18.426 4.006v-26.182h5.983v4.364h0.272c0.478-1.512 1.296-2.676 2.455-3.494 1.17-0.83 2.506-1.245 4.006-1.245 0.34 0 0.721 0.017 1.142 0.051 0.431 0.023 0.789 0.063 1.073 0.12v5.676c-0.261-0.091-0.676-0.171-1.244-0.239-0.557-0.079-1.096-0.119-1.619-0.119-1.125 0-2.137 0.244-3.034 0.733-0.887 0.477-1.585 1.142-2.097 1.994-0.511 0.852-0.767 1.835-0.767 2.949v15.392h-6.17zm29.339 10.364c-2.216 0-4.119-0.301-5.71-0.904-1.591-0.591-2.869-1.386-3.835-2.386s-1.637-2.108-2.012-3.324l5.557-1.347c0.25 0.512 0.614 1.017 1.091 1.517 0.477 0.512 1.119 0.932 1.926 1.262 0.818 0.341 1.847 0.511 3.085 0.511 1.75 0 3.199-0.426 4.347-1.278 1.148-0.841 1.722-2.227 1.722-4.159v-4.961h-0.307c-0.318 0.637-0.784 1.29-1.398 1.961-0.602 0.67-1.403 1.233-2.403 1.687-0.989 0.455-2.233 0.682-3.733 0.682-2.012 0-3.836-0.472-5.472-1.415-1.625-0.954-2.92-2.375-3.886-4.261-0.955-1.898-1.432-4.273-1.432-7.125 0-2.875 0.477-5.301 1.432-7.279 0.966-1.988 2.267-3.494 3.903-4.517 1.636-1.034 3.46-1.551 5.472-1.551 1.534 0 2.795 0.262 3.784 0.784 1 0.512 1.795 1.131 2.386 1.858 0.591 0.716 1.04 1.392 1.347 2.029h0.341v-4.33h6.085v26.608c0 2.239-0.534 4.091-1.602 5.557-1.069 1.466-2.529 2.562-4.381 3.29-1.852 0.727-3.955 1.091-6.307 1.091zm0.051-15.58c1.307 0 2.421-0.318 3.341-0.954 0.921-0.637 1.619-1.552 2.097-2.745 0.477-1.193 0.716-2.625 0.716-4.295 0-1.648-0.239-3.091-0.716-4.33-0.466-1.238-1.159-2.199-2.08-2.88-0.909-0.694-2.028-1.04-3.358-1.04-1.375 0-2.522 0.358-3.443 1.074-0.92 0.716-1.614 1.698-2.079 2.948-0.466 1.239-0.699 2.648-0.699 4.228 0 1.602 0.233 3.005 0.699 4.21 0.477 1.193 1.176 2.125 2.096 2.795 0.932 0.66 2.074 0.989 3.426 0.989zm30.154 5.727c-2.625 0-4.892-0.545-6.801-1.636-1.898-1.102-3.358-2.659-4.381-4.67-1.023-2.023-1.534-4.404-1.534-7.143 0-2.693 0.511-5.056 1.534-7.09 1.034-2.046 2.477-3.637 4.329-4.773 1.853-1.148 4.029-1.722 6.529-1.722 1.613 0 3.136 0.262 4.568 0.784 1.443 0.512 2.716 1.307 3.818 2.387 1.114 1.079 1.989 2.454 2.625 4.125 0.637 1.659 0.955 3.636 0.955 5.932v1.892h-21.461v-4.159h15.546c-0.011-1.182-0.267-2.233-0.767-3.154-0.5-0.932-1.199-1.665-2.097-2.199-0.886-0.534-1.92-0.801-3.102-0.801-1.261 0-2.369 0.307-3.324 0.921-0.954 0.602-1.699 1.397-2.233 2.386-0.523 0.977-0.79 2.051-0.801 3.221v3.631c0 1.523 0.278 2.83 0.835 3.921 0.557 1.079 1.336 1.909 2.336 2.488 1 0.568 2.17 0.853 3.511 0.853 0.898 0 1.71-0.125 2.437-0.375 0.728-0.262 1.358-0.642 1.892-1.142 0.535-0.5 0.938-1.12 1.211-1.858l5.761 0.647c-0.364 1.523-1.057 2.853-2.08 3.989-1.011 1.125-2.306 2-3.886 2.625-1.579 0.614-3.386 0.92-5.42 0.92zm16.862-0.511v-26.182h5.983v4.364h0.273c0.477-1.512 1.295-2.676 2.454-3.494 1.171-0.83 2.506-1.245 4.006-1.245 0.341 0 0.721 0.017 1.142 0.051 0.432 0.023 0.79 0.063 1.074 0.12v5.676c-0.262-0.091-0.676-0.171-1.245-0.239-0.556-0.079-1.096-0.119-1.619-0.119-1.125 0-2.136 0.244-3.034 0.733-0.886 0.477-1.585 1.142-2.097 1.994-0.511 0.852-0.767 1.835-0.767 2.949v15.392h-6.17z" fill="#1A1A1A"/><circle cx="42" cy="212" r="10" fill="#198038" tb:tag="mainsOn"/><path d="m63.523 197.91h4.2046l9.8863 24.148h0.3409l9.8864-24.148h4.2046v29.091h-3.2955v-22.102h-0.2841l-9.0909 22.102h-3.1818l-9.0909-22.102h-0.2841v22.102h-3.2955v-29.091zm41.552 29.602c-1.383 0-2.638-0.26-3.765-0.781-1.127-0.53-2.0214-1.292-2.6843-2.287-0.6629-1.004-0.9943-2.216-0.9943-3.636 0-1.25 0.2462-2.263 0.7386-3.04 0.4925-0.786 1.1506-1.401 1.974-1.847 0.824-0.445 1.733-0.776 2.728-0.994 1.004-0.227 2.012-0.407 3.025-0.54 1.326-0.17 2.401-0.298 3.225-0.383 0.833-0.095 1.439-0.251 1.818-0.469 0.388-0.218 0.582-0.597 0.582-1.136v-0.114c0-1.401-0.383-2.49-1.15-3.267-0.758-0.776-1.908-1.165-3.452-1.165-1.6 0-2.855 0.351-3.764 1.051-0.909 0.701-1.548 1.449-1.918 2.245l-3.1816-1.137c0.5682-1.325 1.3257-2.358 2.2726-3.096 0.957-0.748 1.998-1.269 3.125-1.563 1.136-0.303 2.254-0.454 3.352-0.454 0.701 0 1.506 0.085 2.415 0.255 0.919 0.161 1.804 0.498 2.656 1.009 0.862 0.511 1.577 1.283 2.145 2.315s0.853 2.415 0.853 4.148v14.375h-3.353v-2.955h-0.17c-0.227 0.474-0.606 0.981-1.137 1.52-0.53 0.54-1.235 0.999-2.116 1.378s-1.955 0.568-3.224 0.568zm0.511-3.011c1.326 0 2.443-0.26 3.352-0.781 0.919-0.521 1.61-1.193 2.074-2.017 0.474-0.824 0.71-1.691 0.71-2.6v-3.068c-0.142 0.171-0.454 0.327-0.937 0.469-0.474 0.132-1.023 0.251-1.648 0.355-0.615 0.095-1.217 0.18-1.804 0.256-0.578 0.066-1.046 0.123-1.406 0.17-0.871 0.114-1.686 0.298-2.443 0.554-0.748 0.246-1.355 0.62-1.819 1.122-0.454 0.493-0.681 1.165-0.681 2.017 0 1.165 0.431 2.046 1.292 2.642 0.871 0.587 1.975 0.881 3.31 0.881zm15.607 2.5v-21.818h3.352v21.818h-3.352zm1.705-25.455c-0.654 0-1.217-0.222-1.691-0.667-0.464-0.445-0.696-0.98-0.696-1.605s0.232-1.16 0.696-1.605c0.474-0.445 1.037-0.668 1.691-0.668 0.653 0 1.212 0.223 1.676 0.668 0.473 0.445 0.71 0.98 0.71 1.605s-0.237 1.16-0.71 1.605c-0.464 0.445-1.023 0.667-1.676 0.667zm11.14 12.33v13.125h-3.353v-21.818h3.239v3.409h0.284c0.511-1.108 1.288-1.998 2.33-2.671 1.041-0.681 2.386-1.022 4.034-1.022 1.477 0 2.77 0.303 3.878 0.909 1.108 0.596 1.969 1.505 2.585 2.727 0.615 1.212 0.923 2.746 0.923 4.602v13.864h-3.352v-13.636c0-1.714-0.445-3.05-1.335-4.006-0.891-0.966-2.112-1.449-3.665-1.449-1.07 0-2.027 0.232-2.869 0.696-0.834 0.464-1.492 1.141-1.975 2.031-0.483 0.891-0.724 1.97-0.724 3.239zm35.5-3.807-3.011 0.852c-0.189-0.501-0.469-0.989-0.838-1.463-0.36-0.483-0.852-0.88-1.477-1.193-0.625-0.312-1.426-0.469-2.401-0.469-1.335 0-2.448 0.308-3.338 0.924-0.881 0.606-1.321 1.378-1.321 2.315 0 0.833 0.303 1.492 0.909 1.975 0.606 0.482 1.553 0.885 2.841 1.207l3.239 0.795c1.95 0.474 3.404 1.198 4.36 2.174 0.957 0.966 1.435 2.211 1.435 3.735 0 1.25-0.36 2.368-1.079 3.353-0.711 0.985-1.705 1.761-2.983 2.329-1.279 0.568-2.766 0.853-4.461 0.853-2.225 0-4.067-0.483-5.525-1.449-1.459-0.966-2.382-2.377-2.77-4.233l3.182-0.796c0.303 1.175 0.876 2.055 1.718 2.642 0.853 0.587 1.965 0.881 3.339 0.881 1.562 0 2.803-0.331 3.721-0.994 0.928-0.673 1.392-1.478 1.392-2.415 0-0.758-0.265-1.392-0.795-1.903-0.531-0.521-1.345-0.91-2.443-1.165l-3.637-0.853c-1.998-0.473-3.466-1.207-4.403-2.201-0.928-1.004-1.392-2.259-1.392-3.764 0-1.232 0.345-2.321 1.037-3.267 0.7-0.947 1.652-1.691 2.855-2.231 1.212-0.539 2.585-0.809 4.119-0.809 2.159 0 3.854 0.473 5.085 1.42 1.241 0.947 2.122 2.197 2.642 3.75zm25.558 17.387c-1.97 0-3.698-0.469-5.185-1.407-1.477-0.937-2.632-2.249-3.466-3.934-0.824-1.686-1.235-3.656-1.235-5.909 0-2.273 0.411-4.257 1.235-5.952 0.834-1.695 1.989-3.012 3.466-3.949 1.487-0.938 3.215-1.406 5.185-1.406s3.693 0.468 5.17 1.406c1.487 0.937 2.642 2.254 3.466 3.949 0.834 1.695 1.25 3.679 1.25 5.952 0 2.253-0.416 4.223-1.25 5.909-0.824 1.685-1.979 2.997-3.466 3.934-1.477 0.938-3.2 1.407-5.17 1.407zm0-3.012c1.496 0 2.727-0.383 3.693-1.15s1.681-1.776 2.145-3.026 0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.966-0.777-2.197-1.165-3.693-1.165s-2.727 0.388-3.693 1.165c-0.966 0.776-1.681 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.179 2.259 2.145 3.026 2.197 1.15 3.693 1.15zm18.356-10.568v13.125h-3.353v-21.818h3.239v3.409h0.284c0.512-1.108 1.288-1.998 2.33-2.671 1.041-0.681 2.386-1.022 4.034-1.022 1.477 0 2.77 0.303 3.878 0.909 1.108 0.596 1.969 1.505 2.585 2.727 0.615 1.212 0.923 2.746 0.923 4.602v13.864h-3.352v-13.636c0-1.714-0.445-3.05-1.335-4.006-0.89-0.966-2.112-1.449-3.665-1.449-1.07 0-2.027 0.232-2.869 0.696-0.834 0.464-1.492 1.141-1.975 2.031-0.483 0.891-0.724 1.97-0.724 3.239z" fill="#1A1A1A"/><circle cx="42" cy="280" r="10" fill="#DEDEDE" tb:tag="bulk"/><path d="m63.523 295v-29.091h10.17c2.0265 0 3.6979 0.35 5.0142 1.051 1.3163 0.692 2.2964 1.624 2.9403 2.799 0.644 1.164 0.9659 2.457 0.9659 3.877 0 1.25-0.2225 2.283-0.6676 3.097-0.4356 0.814-1.0132 1.458-1.7329 1.932-0.7103 0.473-1.482 0.824-2.3154 1.051v0.284c0.8902 0.057 1.7851 0.369 2.6847 0.938 0.8996 0.568 1.6524 1.382 2.2585 2.443 0.6061 1.06 0.9091 2.358 0.9091 3.892 0 1.458-0.3314 2.77-0.9943 3.934-0.6629 1.165-1.7093 2.088-3.1392 2.77s-3.2907 1.023-5.5824 1.023h-10.511zm3.5228-3.125h6.9886c2.3011 0 3.9347-0.445 4.9006-1.335 0.9753-0.9 1.463-1.989 1.463-3.267 0-0.985-0.2509-1.894-0.7528-2.728-0.5019-0.842-1.2169-1.515-2.1449-2.017-0.928-0.511-2.0265-0.767-3.2955-0.767h-7.159v10.114zm0-13.182h6.534c1.0607 0 2.0171-0.208 2.8694-0.625 0.8617-0.416 1.5435-1.004 2.0454-1.761 0.5114-0.758 0.7671-1.648 0.7671-2.671 0-1.278-0.4451-2.362-1.3353-3.252-0.8901-0.9-2.3011-1.35-4.2329-1.35h-6.6477v9.659zm35.788 7.387v-12.898h3.352v21.818h-3.352v-3.693h-0.227c-0.512 1.108-1.307 2.05-2.387 2.827-1.0794 0.767-2.443 1.15-4.0907 1.15-1.3637 0-2.5758-0.298-3.6364-0.895-1.0606-0.606-1.8939-1.515-2.5-2.727-0.6061-1.222-0.9091-2.76-0.9091-4.617v-13.863h3.3523v13.636c0 1.591 0.4451 2.86 1.3352 3.807 0.8996 0.947 2.0455 1.42 3.4375 1.42 0.8333 0 1.6809-0.213 2.5426-0.639 0.8716-0.426 1.6006-1.079 2.1876-1.96 0.597-0.881 0.895-2.003 0.895-3.366zm12.844-20.171v29.091h-3.352v-29.091h3.352zm9.265 21.136-0.057-4.147h0.682l9.546-9.716h4.147l-10.17 10.284h-0.284l-3.864 3.579zm-3.125 7.955v-29.091h3.352v29.091h-3.352zm13.864 0-8.523-10.795 2.386-2.33 10.398 13.125h-4.261z" fill="#1A1A1A"/><circle cx="42" cy="348" r="10" fill="#DEDEDE" tb:tag="absorption"/><path d="m64.716 363h-3.6932l10.682-29.091h3.6364l10.682 29.091h-3.6932l-8.6931-24.489h-0.2273l-8.6932 24.489zm1.3636-11.364h14.886v3.125h-14.886v-3.125zm24.474 11.364v-29.091h3.3522v10.739h0.2841c0.2463-0.379 0.5872-0.862 1.0228-1.449 0.445-0.597 1.0795-1.127 1.9034-1.591 0.8333-0.474 1.9602-0.71 3.3805-0.71 1.837 0 3.457 0.459 4.858 1.378 1.402 0.918 2.495 2.22 3.281 3.906 0.786 1.685 1.179 3.674 1.179 5.966 0 2.31-0.393 4.313-1.179 6.008-0.786 1.686-1.875 2.993-3.267 3.921-1.392 0.918-2.997 1.378-4.815 1.378-1.4015 0-2.5237-0.232-3.3665-0.696-0.8428-0.474-1.4915-1.009-1.946-1.606-0.4546-0.606-0.8049-1.108-1.0512-1.505h-0.3977v3.352h-3.2386zm3.2954-10.909c0 1.648 0.2415 3.101 0.7245 4.361 0.4829 1.25 1.1884 2.23 2.1164 2.94 0.9281 0.701 2.0644 1.051 3.4087 1.051 1.402 0 2.571-0.369 3.509-1.108 0.947-0.748 1.657-1.752 2.131-3.011 0.483-1.269 0.724-2.68 0.724-4.233 0-1.534-0.237-2.917-0.71-4.148-0.464-1.24-1.17-2.22-2.117-2.94-0.937-0.729-2.116-1.094-3.537-1.094-1.3632 0-2.509 0.346-3.4371 1.037-0.928 0.682-1.6288 1.638-2.1022 2.869-0.4735 1.222-0.7103 2.647-0.7103 4.276zm36.549-6.023-3.012 0.852c-0.189-0.501-0.468-0.989-0.838-1.463-0.36-0.483-0.852-0.88-1.477-1.193-0.625-0.312-1.425-0.469-2.401-0.469-1.335 0-2.447 0.308-3.338 0.924-0.88 0.606-1.321 1.378-1.321 2.315 0 0.833 0.303 1.492 0.909 1.975 0.607 0.482 1.553 0.885 2.841 1.207l3.239 0.795c1.951 0.474 3.404 1.198 4.361 2.174 0.956 0.966 1.434 2.211 1.434 3.735 0 1.25-0.359 2.368-1.079 3.353-0.71 0.985-1.705 1.761-2.983 2.329s-2.765 0.853-4.46 0.853c-2.226 0-4.068-0.483-5.526-1.449s-2.381-2.377-2.77-4.233l3.182-0.796c0.303 1.175 0.876 2.055 1.719 2.642 0.852 0.587 1.965 0.881 3.338 0.881 1.562 0 2.803-0.331 3.722-0.994 0.928-0.673 1.392-1.478 1.392-2.415 0-0.758-0.266-1.392-0.796-1.903-0.53-0.521-1.345-0.91-2.443-1.165l-3.636-0.853c-1.999-0.473-3.466-1.207-4.404-2.201-0.928-1.004-1.392-2.259-1.392-3.764 0-1.232 0.346-2.321 1.037-3.267 0.701-0.947 1.652-1.691 2.855-2.231 1.212-0.539 2.585-0.809 4.119-0.809 2.16 0 3.855 0.473 5.086 1.42 1.24 0.947 2.121 2.197 2.642 3.75zm14.307 17.387c-1.969 0-3.698-0.469-5.184-1.407-1.478-0.937-2.633-2.249-3.466-3.934-0.824-1.686-1.236-3.656-1.236-5.909 0-2.273 0.412-4.257 1.236-5.952 0.833-1.695 1.988-3.012 3.466-3.949 1.486-0.938 3.215-1.406 5.184-1.406 1.97 0 3.693 0.468 5.171 1.406 1.486 0.937 2.642 2.254 3.466 3.949 0.833 1.695 1.25 3.679 1.25 5.952 0 2.253-0.417 4.223-1.25 5.909-0.824 1.685-1.98 2.997-3.466 3.934-1.478 0.938-3.201 1.407-5.171 1.407zm0-3.012c1.496 0 2.728-0.383 3.693-1.15 0.966-0.767 1.681-1.776 2.145-3.026s0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.965-0.777-2.197-1.165-3.693-1.165s-2.727 0.388-3.693 1.165c-0.966 0.776-1.681 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.179 2.259 2.145 3.026 2.197 1.15 3.693 1.15zm15.004 2.557v-21.818h3.238v3.295h0.228c0.397-1.079 1.117-1.955 2.159-2.628 1.041-0.672 2.216-1.008 3.523-1.008 0.246 0 0.554 5e-3 0.923 0.014 0.369 0.01 0.649 0.024 0.838 0.043v3.409c-0.114-0.029-0.374-0.071-0.781-0.128-0.398-0.066-0.819-0.099-1.265-0.099-1.06 0-2.007 0.222-2.84 0.667-0.824 0.436-1.478 1.042-1.961 1.818-0.473 0.767-0.71 1.643-0.71 2.628v13.807h-3.352zm14.883 8.182v-30h3.238v3.466h0.398c0.246-0.379 0.587-0.862 1.023-1.449 0.445-0.597 1.079-1.127 1.903-1.591 0.833-0.474 1.96-0.71 3.381-0.71 1.837 0 3.456 0.459 4.858 1.378 1.401 0.918 2.495 2.22 3.281 3.906 0.786 1.685 1.179 3.674 1.179 5.966 0 2.31-0.393 4.313-1.179 6.008-0.786 1.686-1.875 2.993-3.267 3.921-1.392 0.918-2.997 1.378-4.815 1.378-1.402 0-2.524-0.232-3.367-0.696-0.843-0.474-1.491-1.009-1.946-1.606-0.454-0.606-0.805-1.108-1.051-1.505h-0.284v11.534h-3.352zm3.295-19.091c0 1.648 0.242 3.101 0.725 4.361 0.482 1.25 1.188 2.23 2.116 2.94 0.928 0.701 2.064 1.051 3.409 1.051 1.402 0 2.571-0.369 3.509-1.108 0.947-0.748 1.657-1.752 2.13-3.011 0.483-1.269 0.725-2.68 0.725-4.233 0-1.534-0.237-2.917-0.711-4.148-0.464-1.24-1.169-2.22-2.116-2.94-0.937-0.729-2.116-1.094-3.537-1.094-1.364 0-2.509 0.346-3.437 1.037-0.928 0.682-1.629 1.638-2.103 2.869-0.473 1.222-0.71 2.647-0.71 4.276zm30.568-10.909v2.841h-11.307v-2.841h11.307zm-8.011-5.227h3.352v20.795c0 0.947 0.137 1.657 0.412 2.131 0.284 0.464 0.644 0.776 1.08 0.937 0.445 0.152 0.913 0.227 1.406 0.227 0.369 0 0.672-0.018 0.909-0.056 0.237-0.048 0.426-0.086 0.568-0.114l0.682 3.011c-0.227 0.086-0.545 0.171-0.952 0.256-0.407 0.095-0.923 0.142-1.548 0.142-0.947 0-1.875-0.204-2.784-0.611-0.9-0.407-1.648-1.027-2.244-1.861-0.588-0.833-0.881-1.884-0.881-3.153v-21.704zm13.054 27.045v-21.818h3.352v21.818h-3.352zm1.704-25.455c-0.653 0-1.216-0.222-1.69-0.667-0.464-0.445-0.696-0.98-0.696-1.605s0.232-1.16 0.696-1.605c0.474-0.445 1.037-0.668 1.69-0.668 0.654 0 1.213 0.223 1.677 0.668 0.473 0.445 0.71 0.98 0.71 1.605s-0.237 1.16-0.71 1.605c-0.464 0.445-1.023 0.667-1.677 0.667zm16.652 25.91c-1.97 0-3.698-0.469-5.185-1.407-1.477-0.937-2.633-2.249-3.466-3.934-0.824-1.686-1.236-3.656-1.236-5.909 0-2.273 0.412-4.257 1.236-5.952 0.833-1.695 1.989-3.012 3.466-3.949 1.487-0.938 3.215-1.406 5.185-1.406 1.969 0 3.693 0.468 5.17 1.406 1.487 0.937 2.642 2.254 3.466 3.949 0.833 1.695 1.25 3.679 1.25 5.952 0 2.253-0.417 4.223-1.25 5.909-0.824 1.685-1.979 2.997-3.466 3.934-1.477 0.938-3.201 1.407-5.17 1.407zm0-3.012c1.496 0 2.727-0.383 3.693-1.15s1.681-1.776 2.145-3.026 0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.966-0.777-2.197-1.165-3.693-1.165-1.497 0-2.728 0.388-3.693 1.165-0.966 0.776-1.681 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.179 2.259 2.145 3.026c0.965 0.767 2.196 1.15 3.693 1.15zm18.356-10.568v13.125h-3.353v-21.818h3.239v3.409h0.284c0.511-1.108 1.288-1.998 2.33-2.671 1.041-0.681 2.386-1.022 4.034-1.022 1.477 0 2.769 0.303 3.877 0.909 1.108 0.596 1.97 1.505 2.586 2.727 0.615 1.212 0.923 2.746 0.923 4.602v13.864h-3.352v-13.636c0-1.714-0.445-3.05-1.336-4.006-0.89-0.966-2.111-1.449-3.664-1.449-1.07 0-2.027 0.232-2.87 0.696-0.833 0.464-1.491 1.141-1.974 2.031-0.483 0.891-0.724 1.97-0.724 3.239z" fill="#1A1A1A"/><circle cx="42" cy="416" r="10" fill="#DEDEDE" tb:tag="float"/><path d="m63.523 431v-29.091h17.443v3.125h-13.92v9.83h12.614v3.125h-12.614v13.011h-3.5228zm26.374-29.091v29.091h-3.3523v-29.091h3.3523zm15.004 29.546c-1.97 0-3.698-0.469-5.1851-1.407-1.4773-0.937-2.6326-2.249-3.4659-3.934-0.8239-1.686-1.2358-3.656-1.2358-5.909 0-2.273 0.4119-4.257 1.2358-5.952 0.8333-1.695 1.9886-3.012 3.4659-3.949 1.4871-0.938 3.2151-1.406 5.1851-1.406 1.969 0 3.693 0.468 5.17 1.406 1.487 0.937 2.642 2.254 3.466 3.949 0.833 1.695 1.25 3.679 1.25 5.952 0 2.253-0.417 4.223-1.25 5.909-0.824 1.685-1.979 2.997-3.466 3.934-1.477 0.938-3.201 1.407-5.17 1.407zm0-3.012c1.496 0 2.727-0.383 3.693-1.15s1.681-1.776 2.145-3.026 0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.966-0.777-2.197-1.165-3.693-1.165-1.497 0-2.728 0.388-3.694 1.165-0.966 0.776-1.6805 1.794-2.1445 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.1785 2.259 2.1445 3.026 2.197 1.15 3.694 1.15zm21.424 3.068c-1.383 0-2.638-0.26-3.765-0.781-1.127-0.53-2.021-1.292-2.684-2.287-0.663-1.004-0.995-2.216-0.995-3.636 0-1.25 0.247-2.263 0.739-3.04 0.492-0.786 1.151-1.401 1.974-1.847 0.824-0.445 1.733-0.776 2.728-0.994 1.004-0.227 2.012-0.407 3.025-0.54 1.326-0.17 2.401-0.298 3.225-0.383 0.833-0.095 1.439-0.251 1.818-0.469 0.388-0.218 0.582-0.597 0.582-1.136v-0.114c0-1.401-0.383-2.49-1.15-3.267-0.758-0.776-1.908-1.165-3.452-1.165-1.6 0-2.855 0.351-3.764 1.051-0.909 0.701-1.548 1.449-1.918 2.245l-3.182-1.137c0.569-1.325 1.326-2.358 2.273-3.096 0.957-0.748 1.998-1.269 3.125-1.563 1.136-0.303 2.254-0.454 3.352-0.454 0.701 0 1.506 0.085 2.415 0.255 0.919 0.161 1.804 0.498 2.656 1.009 0.862 0.511 1.577 1.283 2.145 2.315s0.853 2.415 0.853 4.148v14.375h-3.353v-2.955h-0.17c-0.227 0.474-0.606 0.981-1.137 1.52-0.53 0.54-1.235 0.999-2.116 1.378s-1.955 0.568-3.224 0.568zm0.511-3.011c1.326 0 2.443-0.26 3.352-0.781 0.919-0.521 1.61-1.193 2.074-2.017 0.474-0.824 0.71-1.691 0.71-2.6v-3.068c-0.142 0.171-0.454 0.327-0.937 0.469-0.474 0.132-1.023 0.251-1.648 0.355-0.615 0.095-1.217 0.18-1.804 0.256-0.578 0.066-1.046 0.123-1.406 0.17-0.871 0.114-1.686 0.298-2.443 0.554-0.748 0.246-1.355 0.62-1.819 1.122-0.454 0.493-0.681 1.165-0.681 2.017 0 1.165 0.431 2.046 1.292 2.642 0.871 0.587 1.975 0.881 3.31 0.881zm25.096-19.318v2.841h-11.307v-2.841h11.307zm-8.012-5.227h3.353v20.795c0 0.947 0.137 1.657 0.412 2.131 0.284 0.464 0.644 0.776 1.079 0.937 0.445 0.152 0.914 0.227 1.406 0.227 0.37 0 0.673-0.018 0.91-0.056 0.236-0.048 0.426-0.086 0.568-0.114l0.682 3.011c-0.228 0.086-0.545 0.171-0.952 0.256-0.407 0.095-0.923 0.142-1.548 0.142-0.947 0-1.875-0.204-2.785-0.611-0.899-0.407-1.647-1.027-2.244-1.861-0.587-0.833-0.881-1.884-0.881-3.153v-21.704z" fill="#1A1A1A"/><path d="m351.98 111.09v34.909h-6.324v-34.909h6.324zm12.746 19.568v15.341h-6.171v-26.182h5.898v4.449h0.307c0.602-1.466 1.562-2.631 2.88-3.494 1.33-0.864 2.972-1.296 4.927-1.296 1.806 0 3.38 0.387 4.721 1.159 1.352 0.773 2.398 1.892 3.137 3.358 0.75 1.466 1.119 3.245 1.108 5.336v16.67h-6.171v-15.716c0-1.75-0.454-3.119-1.364-4.108-0.897-0.989-2.142-1.483-3.733-1.483-1.079 0-2.039 0.239-2.88 0.716-0.83 0.466-1.483 1.142-1.96 2.029-0.466 0.886-0.699 1.96-0.699 3.221zm45.528-10.841-9.324 26.182h-6.818l-9.324-26.182h6.58l6.017 19.449h0.273l6.034-19.449h6.562zm14.97 26.693c-2.625 0-4.892-0.545-6.801-1.636-1.898-1.102-3.358-2.659-4.381-4.67-1.022-2.023-1.534-4.404-1.534-7.143 0-2.693 0.512-5.056 1.534-7.09 1.035-2.046 2.478-3.637 4.33-4.773 1.852-1.148 4.028-1.722 6.528-1.722 1.614 0 3.137 0.262 4.569 0.784 1.443 0.512 2.716 1.307 3.818 2.387 1.113 1.079 1.988 2.454 2.625 4.125 0.636 1.659 0.954 3.636 0.954 5.932v1.892h-21.46v-4.159h15.546c-0.012-1.182-0.267-2.233-0.767-3.154-0.5-0.932-1.199-1.665-2.097-2.199-0.886-0.534-1.921-0.801-3.102-0.801-1.262 0-2.37 0.307-3.324 0.921-0.955 0.602-1.699 1.397-2.233 2.386-0.523 0.977-0.79 2.051-0.801 3.221v3.631c0 1.523 0.278 2.83 0.835 3.921 0.557 1.079 1.335 1.909 2.335 2.488 1 0.568 2.171 0.853 3.512 0.853 0.897 0 1.71-0.125 2.437-0.375 0.727-0.262 1.358-0.642 1.892-1.142s0.938-1.12 1.21-1.858l5.762 0.647c-0.364 1.523-1.057 2.853-2.08 3.989-1.011 1.125-2.307 2-3.886 2.625-1.58 0.614-3.387 0.92-5.421 0.92zm16.863-0.511v-26.182h5.982v4.364h0.273c0.477-1.512 1.296-2.676 2.455-3.494 1.17-0.83 2.505-1.245 4.005-1.245 0.341 0 0.722 0.017 1.142 0.051 0.432 0.023 0.79 0.063 1.074 0.12v5.676c-0.261-0.091-0.676-0.171-1.244-0.239-0.557-0.079-1.097-0.119-1.619-0.119-1.125 0-2.137 0.244-3.034 0.733-0.887 0.477-1.586 1.142-2.097 1.994s-0.767 1.835-0.767 2.949v15.392h-6.17zm33.511-26.182v4.773h-15.051v-4.773h15.051zm-11.335-6.273h6.17v24.58c0 0.83 0.125 1.466 0.375 1.909 0.261 0.432 0.602 0.727 1.023 0.886 0.42 0.16 0.886 0.239 1.398 0.239 0.386 0 0.738-0.028 1.056-0.085 0.33-0.057 0.58-0.108 0.75-0.154l1.04 4.824c-0.329 0.114-0.801 0.239-1.415 0.375-0.602 0.137-1.341 0.216-2.216 0.239-1.545 0.045-2.937-0.188-4.176-0.699-1.238-0.523-2.221-1.329-2.949-2.42-0.715-1.091-1.068-2.455-1.056-4.091v-25.603zm27.805 32.966c-2.625 0-4.892-0.545-6.801-1.636-1.898-1.102-3.358-2.659-4.381-4.67-1.022-2.023-1.534-4.404-1.534-7.143 0-2.693 0.512-5.056 1.534-7.09 1.034-2.046 2.478-3.637 4.33-4.773 1.852-1.148 4.028-1.722 6.528-1.722 1.614 0 3.137 0.262 4.568 0.784 1.444 0.512 2.716 1.307 3.819 2.387 1.113 1.079 1.988 2.454 2.625 4.125 0.636 1.659 0.954 3.636 0.954 5.932v1.892h-21.46v-4.159h15.545c-0.011-1.182-0.267-2.233-0.767-3.154-0.5-0.932-1.199-1.665-2.096-2.199-0.887-0.534-1.921-0.801-3.103-0.801-1.261 0-2.369 0.307-3.323 0.921-0.955 0.602-1.699 1.397-2.233 2.386-0.523 0.977-0.79 2.051-0.802 3.221v3.631c0 1.523 0.279 2.83 0.836 3.921 0.557 1.079 1.335 1.909 2.335 2.488 1 0.568 2.17 0.853 3.511 0.853 0.898 0 1.711-0.125 2.438-0.375 0.727-0.262 1.358-0.642 1.892-1.142s0.937-1.12 1.21-1.858l5.761 0.647c-0.363 1.523-1.056 2.853-2.079 3.989-1.011 1.125-2.307 2-3.886 2.625-1.58 0.614-3.387 0.92-5.421 0.92zm16.862-0.511v-26.182h5.983v4.364h0.273c0.477-1.512 1.295-2.676 2.454-3.494 1.171-0.83 2.506-1.245 4.006-1.245 0.341 0 0.722 0.017 1.142 0.051 0.432 0.023 0.79 0.063 1.074 0.12v5.676c-0.261-0.091-0.676-0.171-1.244-0.239-0.557-0.079-1.097-0.119-1.62-0.119-1.125 0-2.136 0.244-3.034 0.733-0.886 0.477-1.585 1.142-2.096 1.994-0.512 0.852-0.767 1.835-0.767 2.949v15.392h-6.171z" fill="#1A1A1A"/><circle cx="309" cy="212" r="10" fill="#DEDEDE" tb:tag="inverterOn"/><path d="m334.04 197.91v29.091h-3.522v-29.091h3.522zm9.961 15.966v13.125h-3.352v-21.818h3.239v3.409h0.284c0.511-1.108 1.288-1.998 2.329-2.671 1.042-0.681 2.387-1.022 4.034-1.022 1.478 0 2.77 0.303 3.878 0.909 1.108 0.596 1.97 1.505 2.586 2.727 0.615 1.212 0.923 2.746 0.923 4.602v13.864h-3.352v-13.636c0-1.714-0.446-3.05-1.336-4.006-0.89-0.966-2.111-1.449-3.664-1.449-1.071 0-2.027 0.232-2.87 0.696-0.833 0.464-1.491 1.141-1.974 2.031-0.483 0.891-0.725 1.97-0.725 3.239zm37.106-8.693-8.068 21.818h-3.409l-8.068-21.818h3.636l6.023 17.386h0.227l6.023-17.386h3.636zm12.791 22.273c-2.102 0-3.915-0.464-5.44-1.393-1.515-0.937-2.685-2.244-3.508-3.92-0.815-1.686-1.222-3.646-1.222-5.881 0-2.234 0.407-4.204 1.222-5.909 0.823-1.714 1.969-3.049 3.437-4.005 1.477-0.966 3.201-1.449 5.17-1.449 1.137 0 2.259 0.189 3.367 0.568s2.116 0.994 3.026 1.846c0.909 0.843 1.633 1.961 2.173 3.353s0.81 3.106 0.81 5.142v1.42h-16.819v-2.897h13.409c0-1.232-0.246-2.33-0.738-3.296-0.483-0.966-1.174-1.728-2.074-2.287-0.89-0.559-1.941-0.838-3.154-0.838-1.335 0-2.49 0.332-3.465 0.994-0.966 0.654-1.71 1.506-2.231 2.557-0.52 1.051-0.781 2.178-0.781 3.381v1.932c0 1.647 0.284 3.044 0.853 4.19 0.577 1.136 1.377 2.003 2.4 2.599 1.023 0.588 2.211 0.881 3.565 0.881 0.881 0 1.677-0.123 2.387-0.369 0.719-0.256 1.34-0.635 1.861-1.136 0.52-0.512 0.923-1.146 1.207-1.904l3.239 0.909c-0.341 1.099-0.914 2.065-1.719 2.898-0.805 0.824-1.799 1.468-2.983 1.932-1.184 0.454-2.514 0.682-3.992 0.682zm14.134-0.455v-21.818h3.239v3.295h0.227c0.398-1.079 1.117-1.955 2.159-2.628 1.042-0.672 2.216-1.008 3.523-1.008 0.246 0 0.554 5e-3 0.923 0.014 0.369 0.01 0.649 0.024 0.838 0.043v3.409c-0.114-0.029-0.374-0.071-0.781-0.128-0.398-0.066-0.819-0.099-1.264-0.099-1.061 0-2.008 0.222-2.841 0.667-0.824 0.436-1.478 1.042-1.961 1.818-0.473 0.767-0.71 1.643-0.71 2.628v13.807h-3.352zm25.739-21.818v2.841h-11.307v-2.841h11.307zm-8.012-5.227h3.352v20.795c0 0.947 0.138 1.657 0.412 2.131 0.285 0.464 0.644 0.776 1.08 0.937 0.445 0.152 0.914 0.227 1.406 0.227 0.37 0 0.673-0.018 0.909-0.056 0.237-0.048 0.426-0.086 0.568-0.114l0.682 3.011c-0.227 0.086-0.544 0.171-0.951 0.256-0.408 0.095-0.924 0.142-1.549 0.142-0.947 0-1.875-0.204-2.784-0.611-0.899-0.407-1.648-1.027-2.244-1.861-0.587-0.833-0.881-1.884-0.881-3.153v-21.704zm21.968 27.5c-2.103 0-3.916-0.464-5.441-1.393-1.515-0.937-2.684-2.244-3.508-3.92-0.815-1.686-1.222-3.646-1.222-5.881 0-2.234 0.407-4.204 1.222-5.909 0.824-1.714 1.969-3.049 3.437-4.005 1.477-0.966 3.201-1.449 5.171-1.449 1.136 0 2.258 0.189 3.366 0.568s2.117 0.994 3.026 1.846c0.909 0.843 1.633 1.961 2.173 3.353s0.81 3.106 0.81 5.142v1.42h-16.819v-2.897h13.41c0-1.232-0.247-2.33-0.739-3.296-0.483-0.966-1.174-1.728-2.074-2.287-0.89-0.559-1.941-0.838-3.153-0.838-1.336 0-2.491 0.332-3.466 0.994-0.966 0.654-1.71 1.506-2.23 2.557-0.521 1.051-0.782 2.178-0.782 3.381v1.932c0 1.647 0.284 3.044 0.853 4.19 0.577 1.136 1.377 2.003 2.4 2.599 1.023 0.588 2.211 0.881 3.566 0.881 0.88 0 1.676-0.123 2.386-0.369 0.72-0.256 1.34-0.635 1.861-1.136 0.521-0.512 0.923-1.146 1.207-1.904l3.239 0.909c-0.341 1.099-0.914 2.065-1.719 2.898-0.805 0.824-1.799 1.468-2.983 1.932-1.184 0.454-2.514 0.682-3.991 0.682zm14.133-0.455v-21.818h3.239v3.295h0.227c0.398-1.079 1.117-1.955 2.159-2.628 1.042-0.672 2.216-1.008 3.523-1.008 0.246 0 0.554 5e-3 0.923 0.014 0.369 0.01 0.649 0.024 0.838 0.043v3.409c-0.113-0.029-0.374-0.071-0.781-0.128-0.398-0.066-0.819-0.099-1.264-0.099-1.061 0-2.008 0.222-2.841 0.667-0.824 0.436-1.477 1.042-1.96 1.818-0.474 0.767-0.711 1.643-0.711 2.628v13.807h-3.352zm34.997 0.455c-1.97 0-3.698-0.469-5.185-1.407-1.477-0.937-2.633-2.249-3.466-3.934-0.824-1.686-1.236-3.656-1.236-5.909 0-2.273 0.412-4.257 1.236-5.952 0.833-1.695 1.989-3.012 3.466-3.949 1.487-0.938 3.215-1.406 5.185-1.406 1.969 0 3.693 0.468 5.17 1.406 1.487 0.937 2.642 2.254 3.466 3.949 0.833 1.695 1.25 3.679 1.25 5.952 0 2.253-0.417 4.223-1.25 5.909-0.824 1.685-1.979 2.997-3.466 3.934-1.477 0.938-3.201 1.407-5.17 1.407zm0-3.012c1.496 0 2.727-0.383 3.693-1.15s1.681-1.776 2.145-3.026 0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.966-0.777-2.197-1.165-3.693-1.165-1.497 0-2.728 0.388-3.694 1.165-0.966 0.776-1.681 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.179 2.259 2.145 3.026 2.197 1.15 3.694 1.15zm18.355-10.568v13.125h-3.352v-21.818h3.239v3.409h0.284c0.511-1.108 1.288-1.998 2.329-2.671 1.042-0.681 2.387-1.022 4.034-1.022 1.478 0 2.77 0.303 3.878 0.909 1.108 0.596 1.97 1.505 2.585 2.727 0.616 1.212 0.924 2.746 0.924 4.602v13.864h-3.352v-13.636c0-1.714-0.446-3.05-1.336-4.006-0.89-0.966-2.111-1.449-3.664-1.449-1.071 0-2.027 0.232-2.87 0.696-0.833 0.464-1.491 1.141-1.974 2.031-0.483 0.891-0.725 1.97-0.725 3.239z" fill="#1A1A1A"/><circle cx="309" cy="280" r="10" fill="#DEDEDE" tb:tag="overload"/><path d="m355.07 280.46c0 3.068-0.554 5.719-1.662 7.954s-2.628 3.958-4.559 5.171c-1.932 1.212-4.139 1.818-6.62 1.818s-4.687-0.606-6.619-1.818c-1.932-1.213-3.452-2.936-4.56-5.171s-1.662-4.886-1.662-7.954c0-3.069 0.554-5.72 1.662-7.955s2.628-3.958 4.56-5.17c1.932-1.213 4.138-1.819 6.619-1.819s4.688 0.606 6.62 1.819c1.931 1.212 3.451 2.935 4.559 5.17s1.662 4.886 1.662 7.955zm-3.409 0c0-2.519-0.421-4.645-1.264-6.378-0.833-1.733-1.965-3.045-3.395-3.935-1.42-0.89-3.011-1.335-4.773-1.335-1.761 0-3.357 0.445-4.787 1.335-1.42 0.89-2.552 2.202-3.395 3.935-0.833 1.733-1.25 3.859-1.25 6.378 0 2.518 0.417 4.644 1.25 6.377 0.843 1.733 1.975 3.045 3.395 3.935 1.43 0.89 3.026 1.335 4.787 1.335 1.762 0 3.353-0.445 4.773-1.335 1.43-0.89 2.562-2.202 3.395-3.935 0.843-1.733 1.264-3.859 1.264-6.377zm26.719-7.273-8.068 21.818h-3.409l-8.069-21.818h3.637l6.022 17.386h0.228l6.022-17.386h3.637zm12.791 22.273c-2.102 0-3.916-0.464-5.44-1.393-1.515-0.937-2.685-2.244-3.509-3.92-0.814-1.686-1.221-3.646-1.221-5.881 0-2.234 0.407-4.204 1.221-5.909 0.824-1.714 1.97-3.049 3.438-4.005 1.477-0.966 3.2-1.449 5.17-1.449 1.136 0 2.259 0.189 3.367 0.568s2.116 0.994 3.025 1.846c0.909 0.843 1.634 1.961 2.173 3.353 0.54 1.392 0.81 3.106 0.81 5.142v1.42h-16.818v-2.897h13.409c0-1.232-0.246-2.33-0.739-3.296-0.483-0.966-1.174-1.728-2.073-2.287-0.891-0.559-1.942-0.838-3.154-0.838-1.335 0-2.49 0.332-3.466 0.994-0.966 0.654-1.709 1.506-2.23 2.557s-0.781 2.178-0.781 3.381v1.932c0 1.647 0.284 3.044 0.852 4.19 0.578 1.136 1.378 2.003 2.401 2.599 1.022 0.588 2.211 0.881 3.565 0.881 0.881 0 1.676-0.123 2.386-0.369 0.72-0.256 1.34-0.635 1.861-1.136 0.521-0.512 0.923-1.146 1.208-1.904l3.238 0.909c-0.341 1.099-0.914 2.065-1.719 2.898-0.804 0.824-1.799 1.468-2.982 1.932-1.184 0.454-2.515 0.682-3.992 0.682zm14.134-0.455v-21.818h3.238v3.295h0.227c0.398-1.079 1.118-1.955 2.16-2.628 1.041-0.672 2.215-1.008 3.522-1.008 0.246 0 0.554 5e-3 0.924 0.014 0.369 0.01 0.648 0.024 0.838 0.043v3.409c-0.114-0.029-0.374-0.071-0.782-0.128-0.397-0.066-0.819-0.099-1.264-0.099-1.06 0-2.007 0.222-2.841 0.667-0.824 0.436-1.477 1.042-1.96 1.818-0.473 0.767-0.71 1.643-0.71 2.628v13.807h-3.352zm18.235-29.091v29.091h-3.353v-29.091h3.353zm15.003 29.546c-1.97 0-3.698-0.469-5.184-1.407-1.478-0.937-2.633-2.249-3.466-3.934-0.824-1.686-1.236-3.656-1.236-5.909 0-2.273 0.412-4.257 1.236-5.952 0.833-1.695 1.988-3.012 3.466-3.949 1.486-0.938 3.214-1.406 5.184-1.406s3.693 0.468 5.171 1.406c1.486 0.937 2.642 2.254 3.466 3.949 0.833 1.695 1.25 3.679 1.25 5.952 0 2.253-0.417 4.223-1.25 5.909-0.824 1.685-1.98 2.997-3.466 3.934-1.478 0.938-3.201 1.407-5.171 1.407zm0-3.012c1.496 0 2.727-0.383 3.693-1.15s1.681-1.776 2.145-3.026 0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.966-0.777-2.197-1.165-3.693-1.165s-2.727 0.388-3.693 1.165c-0.966 0.776-1.681 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.179 2.259 2.145 3.026 2.197 1.15 3.693 1.15zm21.424 3.068c-1.382 0-2.637-0.26-3.764-0.781-1.127-0.53-2.022-1.292-2.685-2.287-0.663-1.004-0.994-2.216-0.994-3.636 0-1.25 0.246-2.263 0.739-3.04 0.492-0.786 1.15-1.401 1.974-1.847 0.824-0.445 1.733-0.776 2.727-0.994 1.004-0.227 2.013-0.407 3.026-0.54 1.326-0.17 2.4-0.298 3.224-0.383 0.834-0.095 1.44-0.251 1.819-0.469 0.388-0.218 0.582-0.597 0.582-1.136v-0.114c0-1.401-0.384-2.49-1.151-3.267-0.757-0.776-1.908-1.165-3.451-1.165-1.601 0-2.855 0.351-3.765 1.051-0.909 0.701-1.548 1.449-1.917 2.245l-3.182-1.137c0.568-1.325 1.326-2.358 2.273-3.096 0.956-0.748 1.998-1.269 3.125-1.563 1.136-0.303 2.254-0.454 3.352-0.454 0.701 0 1.506 0.085 2.415 0.255 0.918 0.161 1.804 0.498 2.656 1.009 0.862 0.511 1.577 1.283 2.145 2.315s0.852 2.415 0.852 4.148v14.375h-3.352v-2.955h-0.171c-0.227 0.474-0.606 0.981-1.136 1.52-0.53 0.54-1.236 0.999-2.116 1.378-0.881 0.379-1.956 0.568-3.225 0.568zm0.512-3.011c1.325 0 2.443-0.26 3.352-0.781 0.918-0.521 1.61-1.193 2.074-2.017 0.473-0.824 0.71-1.691 0.71-2.6v-3.068c-0.142 0.171-0.455 0.327-0.938 0.469-0.473 0.132-1.022 0.251-1.647 0.355-0.616 0.095-1.217 0.18-1.804 0.256-0.578 0.066-1.047 0.123-1.407 0.17-0.871 0.114-1.685 0.298-2.443 0.554-0.748 0.246-1.354 0.62-1.818 1.122-0.454 0.493-0.682 1.165-0.682 2.017 0 1.165 0.431 2.046 1.293 2.642 0.871 0.587 1.974 0.881 3.31 0.881zm23.845 2.955c-1.818 0-3.423-0.46-4.815-1.378-1.392-0.928-2.481-2.235-3.267-3.921-0.786-1.695-1.179-3.698-1.179-6.008 0-2.292 0.393-4.281 1.179-5.966 0.786-1.686 1.88-2.988 3.281-3.906 1.402-0.919 3.021-1.378 4.858-1.378 1.421 0 2.543 0.236 3.367 0.71 0.833 0.464 1.468 0.994 1.903 1.591 0.445 0.587 0.791 1.07 1.037 1.449h0.284v-10.739h3.352v29.091h-3.238v-3.352h-0.398c-0.246 0.397-0.597 0.899-1.051 1.505-0.455 0.597-1.103 1.132-1.946 1.606-0.843 0.464-1.965 0.696-3.367 0.696zm0.455-3.012c1.345 0 2.481-0.35 3.409-1.051 0.928-0.71 1.634-1.69 2.117-2.94 0.483-1.26 0.724-2.713 0.724-4.361 0-1.629-0.237-3.054-0.71-4.276-0.474-1.231-1.174-2.187-2.103-2.869-0.928-0.691-2.073-1.037-3.437-1.037-1.42 0-2.604 0.365-3.551 1.094-0.938 0.72-1.643 1.7-2.117 2.94-0.464 1.231-0.696 2.614-0.696 4.148 0 1.553 0.237 2.964 0.711 4.233 0.483 1.259 1.193 2.263 2.13 3.011 0.947 0.739 2.121 1.108 3.523 1.108z" fill="#1A1A1A"/><circle cx="309" cy="348" r="10" fill="#DEDEDE" tb:tag="lowBattery"/><path d="m330.52 363v-29.091h3.522v25.966h13.523v3.125h-17.045zm30.909 0.455c-1.97 0-3.698-0.469-5.185-1.407-1.477-0.937-2.632-2.249-3.466-3.934-0.824-1.686-1.236-3.656-1.236-5.909 0-2.273 0.412-4.257 1.236-5.952 0.834-1.695 1.989-3.012 3.466-3.949 1.487-0.938 3.215-1.406 5.185-1.406s3.693 0.468 5.17 1.406c1.487 0.937 2.642 2.254 3.466 3.949 0.834 1.695 1.25 3.679 1.25 5.952 0 2.253-0.416 4.223-1.25 5.909-0.824 1.685-1.979 2.997-3.466 3.934-1.477 0.938-3.2 1.407-5.17 1.407zm0-3.012c1.496 0 2.727-0.383 3.693-1.15s1.681-1.776 2.145-3.026 0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.966-0.777-2.197-1.165-3.693-1.165s-2.727 0.388-3.693 1.165c-0.966 0.776-1.681 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.179 2.259 2.145 3.026 2.197 1.15 3.693 1.15zm19.204 2.557-6.647-21.818h3.522l4.716 16.704h0.228l4.659-16.704h3.579l4.602 16.648h0.228l4.716-16.648h3.522l-6.647 21.818h-3.296l-4.773-16.761h-0.34l-4.773 16.761h-3.296zm39.262 0v-29.091h3.352v10.739h0.284c0.246-0.379 0.587-0.862 1.023-1.449 0.445-0.597 1.079-1.127 1.903-1.591 0.834-0.474 1.96-0.71 3.381-0.71 1.837 0 3.456 0.459 4.858 1.378 1.401 0.918 2.495 2.22 3.281 3.906 0.786 1.685 1.179 3.674 1.179 5.966 0 2.31-0.393 4.313-1.179 6.008-0.786 1.686-1.875 2.993-3.267 3.921-1.392 0.918-2.997 1.378-4.815 1.378-1.402 0-2.524-0.232-3.367-0.696-0.843-0.474-1.491-1.009-1.946-1.606-0.454-0.606-0.805-1.108-1.051-1.505h-0.398v3.352h-3.238zm3.295-10.909c0 1.648 0.242 3.101 0.725 4.361 0.483 1.25 1.188 2.23 2.116 2.94 0.928 0.701 2.064 1.051 3.409 1.051 1.402 0 2.571-0.369 3.509-1.108 0.947-0.748 1.657-1.752 2.13-3.011 0.483-1.269 0.725-2.68 0.725-4.233 0-1.534-0.237-2.917-0.71-4.148-0.464-1.24-1.17-2.22-2.117-2.94-0.937-0.729-2.116-1.094-3.537-1.094-1.363 0-2.509 0.346-3.437 1.037-0.928 0.682-1.629 1.638-2.103 2.869-0.473 1.222-0.71 2.647-0.71 4.276zm27.514 11.42c-1.382 0-2.637-0.26-3.764-0.781-1.127-0.53-2.022-1.292-2.684-2.287-0.663-1.004-0.995-2.216-0.995-3.636 0-1.25 0.246-2.263 0.739-3.04 0.492-0.786 1.15-1.401 1.974-1.847 0.824-0.445 1.733-0.776 2.728-0.994 1.003-0.227 2.012-0.407 3.025-0.54 1.326-0.17 2.401-0.298 3.225-0.383 0.833-0.095 1.439-0.251 1.818-0.469 0.388-0.218 0.582-0.597 0.582-1.136v-0.114c0-1.401-0.383-2.49-1.15-3.267-0.758-0.776-1.909-1.165-3.452-1.165-1.601 0-2.855 0.351-3.764 1.051-0.909 0.701-1.549 1.449-1.918 2.245l-3.182-1.137c0.568-1.325 1.326-2.358 2.273-3.096 0.956-0.748 1.998-1.269 3.125-1.563 1.136-0.303 2.254-0.454 3.352-0.454 0.701 0 1.506 0.085 2.415 0.255 0.919 0.161 1.804 0.498 2.656 1.009 0.862 0.511 1.577 1.283 2.145 2.315s0.852 2.415 0.852 4.148v14.375h-3.352v-2.955h-0.17c-0.228 0.474-0.606 0.981-1.137 1.52-0.53 0.54-1.235 0.999-2.116 1.378s-1.956 0.568-3.225 0.568zm0.512-3.011c1.326 0 2.443-0.26 3.352-0.781 0.919-0.521 1.61-1.193 2.074-2.017 0.473-0.824 0.71-1.691 0.71-2.6v-3.068c-0.142 0.171-0.454 0.327-0.937 0.469-0.474 0.132-1.023 0.251-1.648 0.355-0.616 0.095-1.217 0.18-1.804 0.256-0.578 0.066-1.046 0.123-1.406 0.17-0.872 0.114-1.686 0.298-2.444 0.554-0.748 0.246-1.354 0.62-1.818 1.122-0.454 0.493-0.682 1.165-0.682 2.017 0 1.165 0.431 2.046 1.293 2.642 0.871 0.587 1.975 0.881 3.31 0.881zm25.096-19.318v2.841h-11.307v-2.841h11.307zm-8.012-5.227h3.353v20.795c0 0.947 0.137 1.657 0.411 2.131 0.285 0.464 0.644 0.776 1.08 0.937 0.445 0.152 0.914 0.227 1.406 0.227 0.37 0 0.673-0.018 0.909-0.056 0.237-0.048 0.426-0.086 0.569-0.114l0.681 3.011c-0.227 0.086-0.544 0.171-0.951 0.256-0.408 0.095-0.924 0.142-1.549 0.142-0.947 0-1.875-0.204-2.784-0.611-0.899-0.407-1.647-1.027-2.244-1.861-0.587-0.833-0.881-1.884-0.881-3.153v-21.704zm22.543 5.227v2.841h-11.307v-2.841h11.307zm-8.011-5.227h3.352v20.795c0 0.947 0.137 1.657 0.412 2.131 0.284 0.464 0.644 0.776 1.079 0.937 0.445 0.152 0.914 0.227 1.407 0.227 0.369 0 0.672-0.018 0.909-0.056 0.236-0.048 0.426-0.086 0.568-0.114l0.682 3.011c-0.228 0.086-0.545 0.171-0.952 0.256-0.407 0.095-0.923 0.142-1.548 0.142-0.947 0-1.875-0.204-2.784-0.611-0.9-0.407-1.648-1.027-2.245-1.861-0.587-0.833-0.88-1.884-0.88-3.153v-21.704zm21.967 27.5c-2.102 0-3.916-0.464-5.44-1.393-1.516-0.937-2.685-2.244-3.509-3.92-0.814-1.686-1.222-3.646-1.222-5.881 0-2.234 0.408-4.204 1.222-5.909 0.824-1.714 1.97-3.049 3.437-4.005 1.478-0.966 3.201-1.449 5.171-1.449 1.136 0 2.258 0.189 3.366 0.568s2.117 0.994 3.026 1.846c0.909 0.843 1.634 1.961 2.173 3.353 0.54 1.392 0.81 3.106 0.81 5.142v1.42h-16.818v-2.897h13.409c0-1.232-0.246-2.33-0.739-3.296-0.483-0.966-1.174-1.728-2.074-2.287-0.89-0.559-1.941-0.838-3.153-0.838-1.335 0-2.491 0.332-3.466 0.994-0.966 0.654-1.709 1.506-2.23 2.557s-0.781 2.178-0.781 3.381v1.932c0 1.647 0.284 3.044 0.852 4.19 0.578 1.136 1.378 2.003 2.401 2.599 1.022 0.588 2.211 0.881 3.565 0.881 0.881 0 1.676-0.123 2.386-0.369 0.72-0.256 1.34-0.635 1.861-1.136 0.521-0.512 0.923-1.146 1.207-1.904l3.239 0.909c-0.341 1.099-0.914 2.065-1.719 2.898-0.805 0.824-1.799 1.468-2.983 1.932-1.183 0.454-2.514 0.682-3.991 0.682zm14.133-0.455v-21.818h3.239v3.295h0.227c0.398-1.079 1.118-1.955 2.159-2.628 1.042-0.672 2.216-1.008 3.523-1.008 0.246 0 0.554 5e-3 0.923 0.014 0.37 0.01 0.649 0.024 0.838 0.043v3.409c-0.113-0.029-0.374-0.071-0.781-0.128-0.398-0.066-0.819-0.099-1.264-0.099-1.061 0-2.008 0.222-2.841 0.667-0.824 0.436-1.477 1.042-1.96 1.818-0.474 0.767-0.71 1.643-0.71 2.628v13.807h-3.353zm17.706 8.182c-0.568 0-1.074-0.048-1.52-0.142-0.445-0.085-0.752-0.171-0.923-0.256l0.852-2.954c0.815 0.208 1.535 0.284 2.16 0.227s1.178-0.336 1.661-0.838c0.493-0.493 0.943-1.293 1.35-2.401l0.625-1.704-8.068-21.932h3.636l6.023 17.386h0.227l6.023-17.386h3.636l-9.261 25c-0.417 1.127-0.933 2.059-1.549 2.798-0.615 0.748-1.33 1.302-2.144 1.662-0.805 0.36-1.714 0.54-2.728 0.54z" fill="#1A1A1A"/><circle cx="309" cy="416" r="10" fill="#DEDEDE" tb:tag="temperature"/><path d="m328.93 405.03v-3.125h21.818v3.125h-9.148v25.966h-3.522v-25.966h-9.148zm32.784 26.421c-2.102 0-3.916-0.464-5.44-1.393-1.516-0.937-2.685-2.244-3.509-3.92-0.814-1.686-1.222-3.646-1.222-5.881 0-2.234 0.408-4.204 1.222-5.909 0.824-1.714 1.97-3.049 3.438-4.005 1.477-0.966 3.2-1.449 5.17-1.449 1.136 0 2.259 0.189 3.366 0.568 1.108 0.379 2.117 0.994 3.026 1.846 0.909 0.843 1.634 1.961 2.173 3.353 0.54 1.392 0.81 3.106 0.81 5.142v1.42h-16.818v-2.897h13.409c0-1.232-0.246-2.33-0.739-3.296-0.483-0.966-1.174-1.728-2.074-2.287-0.89-0.559-1.941-0.838-3.153-0.838-1.335 0-2.491 0.332-3.466 0.994-0.966 0.654-1.709 1.506-2.23 2.557s-0.781 2.178-0.781 3.381v1.932c0 1.647 0.284 3.044 0.852 4.19 0.578 1.136 1.378 2.003 2.401 2.599 1.022 0.588 2.211 0.881 3.565 0.881 0.881 0 1.676-0.123 2.386-0.369 0.72-0.256 1.34-0.635 1.861-1.136 0.521-0.512 0.923-1.146 1.207-1.904l3.239 0.909c-0.341 1.099-0.914 2.065-1.719 2.898-0.805 0.824-1.799 1.468-2.983 1.932-1.183 0.454-2.514 0.682-3.991 0.682zm14.133-0.455v-21.818h3.239v3.409h0.284c0.455-1.165 1.189-2.069 2.202-2.713 1.013-0.654 2.23-0.98 3.65-0.98 1.44 0 2.638 0.326 3.594 0.98 0.966 0.644 1.719 1.548 2.259 2.713h0.227c0.559-1.127 1.397-2.022 2.514-2.685 1.118-0.672 2.458-1.008 4.02-1.008 1.951 0 3.546 0.611 4.787 1.832 1.241 1.212 1.861 3.101 1.861 5.668v14.602h-3.352v-14.602c0-1.61-0.441-2.761-1.322-3.452-0.88-0.691-1.917-1.037-3.11-1.037-1.534 0-2.723 0.464-3.566 1.392-0.842 0.919-1.264 2.083-1.264 3.494v14.205h-3.409v-14.943c0-1.241-0.402-2.24-1.207-2.997-0.805-0.767-1.842-1.151-3.111-1.151-0.871 0-1.686 0.232-2.443 0.696-0.748 0.464-1.354 1.108-1.818 1.932-0.455 0.814-0.682 1.757-0.682 2.827v13.636h-3.353zm34.766 8.182v-30h3.239v3.466h0.397c0.247-0.379 0.588-0.862 1.023-1.449 0.445-0.597 1.08-1.127 1.904-1.591 0.833-0.474 1.96-0.71 3.38-0.71 1.837 0 3.457 0.459 4.858 1.378 1.402 0.918 2.495 2.22 3.281 3.906 0.786 1.685 1.179 3.674 1.179 5.966 0 2.31-0.393 4.313-1.179 6.008-0.786 1.686-1.875 2.993-3.267 3.921-1.392 0.918-2.997 1.378-4.815 1.378-1.401 0-2.524-0.232-3.366-0.696-0.843-0.474-1.492-1.009-1.946-1.606-0.455-0.606-0.805-1.108-1.052-1.505h-0.284v11.534h-3.352zm3.296-19.091c0 1.648 0.241 3.101 0.724 4.361 0.483 1.25 1.188 2.23 2.116 2.94 0.928 0.701 2.065 1.051 3.41 1.051 1.401 0 2.571-0.369 3.508-1.108 0.947-0.748 1.657-1.752 2.131-3.011 0.483-1.269 0.724-2.68 0.724-4.233 0-1.534-0.237-2.917-0.71-4.148-0.464-1.24-1.17-2.22-2.117-2.94-0.937-0.729-2.116-1.094-3.536-1.094-1.364 0-2.51 0.346-3.438 1.037-0.928 0.682-1.629 1.638-2.102 2.869-0.474 1.222-0.71 2.647-0.71 4.276zm30.227 11.364c-2.102 0-3.916-0.464-5.441-1.393-1.515-0.937-2.684-2.244-3.508-3.92-0.814-1.686-1.222-3.646-1.222-5.881 0-2.234 0.408-4.204 1.222-5.909 0.824-1.714 1.97-3.049 3.437-4.005 1.478-0.966 3.201-1.449 5.171-1.449 1.136 0 2.258 0.189 3.366 0.568s2.117 0.994 3.026 1.846c0.909 0.843 1.633 1.961 2.173 3.353s0.81 3.106 0.81 5.142v1.42h-16.818v-2.897h13.409c0-1.232-0.246-2.33-0.739-3.296-0.483-0.966-1.174-1.728-2.074-2.287-0.89-0.559-1.941-0.838-3.153-0.838-1.335 0-2.491 0.332-3.466 0.994-0.966 0.654-1.709 1.506-2.23 2.557s-0.781 2.178-0.781 3.381v1.932c0 1.647 0.284 3.044 0.852 4.19 0.578 1.136 1.378 2.003 2.4 2.599 1.023 0.588 2.212 0.881 3.566 0.881 0.88 0 1.676-0.123 2.386-0.369 0.72-0.256 1.34-0.635 1.861-1.136 0.521-0.512 0.923-1.146 1.207-1.904l3.239 0.909c-0.341 1.099-0.914 2.065-1.719 2.898-0.805 0.824-1.799 1.468-2.983 1.932-1.183 0.454-2.514 0.682-3.991 0.682zm14.133-0.455v-21.818h3.239v3.295h0.227c0.398-1.079 1.118-1.955 2.159-2.628 1.042-0.672 2.216-1.008 3.523-1.008 0.246 0 0.554 5e-3 0.923 0.014 0.37 0.01 0.649 0.024 0.838 0.043v3.409c-0.113-0.029-0.374-0.071-0.781-0.128-0.398-0.066-0.819-0.099-1.264-0.099-1.061 0-2.008 0.222-2.841 0.667-0.824 0.436-1.477 1.042-1.96 1.818-0.474 0.767-0.71 1.643-0.71 2.628v13.807h-3.353zm21.304 0.511c-1.383 0-2.638-0.26-3.765-0.781-1.127-0.53-2.021-1.292-2.684-2.287-0.663-1.004-0.995-2.216-0.995-3.636 0-1.25 0.247-2.263 0.739-3.04 0.492-0.786 1.151-1.401 1.974-1.847 0.824-0.445 1.733-0.776 2.728-0.994 1.004-0.227 2.012-0.407 3.025-0.54 1.326-0.17 2.401-0.298 3.225-0.383 0.833-0.095 1.439-0.251 1.818-0.469 0.388-0.218 0.582-0.597 0.582-1.136v-0.114c0-1.401-0.383-2.49-1.15-3.267-0.758-0.776-1.908-1.165-3.452-1.165-1.6 0-2.855 0.351-3.764 1.051-0.909 0.701-1.548 1.449-1.918 2.245l-3.182-1.137c0.569-1.325 1.326-2.358 2.273-3.096 0.957-0.748 1.998-1.269 3.125-1.563 1.136-0.303 2.254-0.454 3.352-0.454 0.701 0 1.506 0.085 2.415 0.255 0.919 0.161 1.804 0.498 2.656 1.009 0.862 0.511 1.577 1.283 2.145 2.315s0.853 2.415 0.853 4.148v14.375h-3.353v-2.955h-0.17c-0.227 0.474-0.606 0.981-1.137 1.52-0.53 0.54-1.235 0.999-2.116 1.378s-1.955 0.568-3.224 0.568zm0.511-3.011c1.326 0 2.443-0.26 3.352-0.781 0.919-0.521 1.61-1.193 2.074-2.017 0.474-0.824 0.71-1.691 0.71-2.6v-3.068c-0.142 0.171-0.454 0.327-0.937 0.469-0.474 0.132-1.023 0.251-1.648 0.355-0.615 0.095-1.217 0.18-1.804 0.256-0.578 0.066-1.046 0.123-1.406 0.17-0.871 0.114-1.686 0.298-2.443 0.554-0.748 0.246-1.355 0.62-1.819 1.122-0.454 0.493-0.681 1.165-0.681 2.017 0 1.165 0.431 2.046 1.292 2.642 0.871 0.587 1.975 0.881 3.31 0.881zm25.096-19.318v2.841h-11.307v-2.841h11.307zm-8.012-5.227h3.353v20.795c0 0.947 0.137 1.657 0.412 2.131 0.284 0.464 0.644 0.776 1.079 0.937 0.445 0.152 0.914 0.227 1.406 0.227 0.37 0 0.673-0.018 0.91-0.056 0.236-0.048 0.426-0.086 0.568-0.114l0.682 3.011c-0.228 0.086-0.545 0.171-0.952 0.256-0.407 0.095-0.923 0.142-1.548 0.142-0.947 0-1.875-0.204-2.785-0.611-0.899-0.407-1.647-1.027-2.244-1.861-0.587-0.833-0.881-1.884-0.881-3.153v-21.704zm26.804 18.125v-12.898h3.353v21.818h-3.353v-3.693h-0.227c-0.511 1.108-1.307 2.05-2.386 2.827-1.08 0.767-2.443 1.15-4.091 1.15-1.364 0-2.576-0.298-3.636-0.895-1.061-0.606-1.894-1.515-2.5-2.727-0.607-1.222-0.91-2.76-0.91-4.617v-13.863h3.353v13.636c0 1.591 0.445 2.86 1.335 3.807 0.9 0.947 2.045 1.42 3.437 1.42 0.834 0 1.681-0.213 2.543-0.639 0.871-0.426 1.6-1.079 2.188-1.96 0.596-0.881 0.894-2.003 0.894-3.366zm9.493 8.92v-21.818h3.238v3.295h0.228c0.397-1.079 1.117-1.955 2.159-2.628 1.041-0.672 2.216-1.008 3.522-1.008 0.247 0 0.554 5e-3 0.924 0.014 0.369 0.01 0.648 0.024 0.838 0.043v3.409c-0.114-0.029-0.374-0.071-0.782-0.128-0.397-0.066-0.819-0.099-1.264-0.099-1.06 0-2.007 0.222-2.841 0.667-0.824 0.436-1.477 1.042-1.96 1.818-0.473 0.767-0.71 1.643-0.71 2.628v13.807h-3.352zm23.366 0.455c-2.102 0-3.916-0.464-5.44-1.393-1.515-0.937-2.685-2.244-3.509-3.92-0.814-1.686-1.221-3.646-1.221-5.881 0-2.234 0.407-4.204 1.221-5.909 0.824-1.714 1.97-3.049 3.438-4.005 1.477-0.966 3.2-1.449 5.17-1.449 1.137 0 2.259 0.189 3.367 0.568s2.116 0.994 3.025 1.846c0.909 0.843 1.634 1.961 2.174 3.353 0.539 1.392 0.809 3.106 0.809 5.142v1.42h-16.818v-2.897h13.409c0-1.232-0.246-2.33-0.739-3.296-0.482-0.966-1.174-1.728-2.073-2.287-0.891-0.559-1.942-0.838-3.154-0.838-1.335 0-2.49 0.332-3.466 0.994-0.966 0.654-1.709 1.506-2.23 2.557s-0.781 2.178-0.781 3.381v1.932c0 1.647 0.284 3.044 0.852 4.19 0.578 1.136 1.378 2.003 2.401 2.599 1.022 0.588 2.211 0.881 3.565 0.881 0.881 0 1.676-0.123 2.386-0.369 0.72-0.256 1.34-0.635 1.861-1.136 0.521-0.512 0.924-1.146 1.208-1.904l3.238 0.909c-0.341 1.099-0.914 2.065-1.718 2.898-0.805 0.824-1.8 1.468-2.983 1.932-1.184 0.454-2.515 0.682-3.992 0.682z" fill="#1A1A1A"/><path d="m201.79-2e-4s-201.79 0-201.79 100.5v492.54c0 3.9768 5.3727 6.9604 12 6.9604h576c6.627 0 12-2.9838 12-6.9604v-492.54c0-100.5-198.21-100.5-198.21-100.5h-101.79zm201.21 121.8c-3.8661 0-6.9996 1.8804-6.9996 4.2v450.6c0 2.3196 3.1341 4.2 6.9996 4.2h43.998c3.8661 0 6.9996-1.8804 6.9996-4.2v-450.6c0-2.3196-3.1341-4.2-6.9996-4.2z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/large-horizontal-separator-connector-hp.svg b/application/src/main/data/json/system/scada_symbols/large-horizontal-separator-connector-hp.svg
new file mode 100644
index 0000000000..ae1c604e9a
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/large-horizontal-separator-connector-hp.svg
@@ -0,0 +1,342 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="1000" height="600" fill="none" version="1.1" viewBox="0 0 1000 600"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Large horizontal separator with connector",
+  "description": "Large horizontal separator with connector with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 5,
+  "widgetSizeY": 3,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="81" width="898" height="518" rx="159" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m1e3 300h-8c-16.569 0-30-13.431-30-30v-237c0-16.568-13.431-30-30-30h-240c-16.569 0-30 13.432-30 30v47" stroke="#1A1A1A" stroke-width="6"/><path d="m336.71-0.31324s-336.32 0-336.32 100.5v492.54c0 3.9768 8.9545 6.9605 20 6.9605h960c11.045 0 20-2.9838 20-6.9605v-492.54c0-100.5-330.35-100.5-330.35-100.5h-169.65zm335.35 121.8c-6.4435 0-11.666 1.8804-11.666 4.2v450.6c0 2.3196 5.2235 4.2 11.666 4.2h73.33c6.4435 0 11.666-1.8804 11.666-4.2v-450.6c0-2.3196-5.2235-4.2-11.666-4.2z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,516)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0,516)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/large-horizontal-separator-hp.svg b/application/src/main/data/json/system/scada_symbols/large-horizontal-separator-hp.svg
new file mode 100644
index 0000000000..79f6745a73
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/large-horizontal-separator-hp.svg
@@ -0,0 +1,350 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="1000" height="600" fill="none" version="1.1" viewBox="0 0 1000 600"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Large horizontal separator",
+  "description": "Large horizontal separator with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 5,
+  "widgetSizeY": 3,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="998" height="598" rx="159" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m336.32 0s-336.32 0-336.32 100.5v492.54c0 3.9768 8.9545 6.9605 20 6.9605h960c11.045 0 20-2.9838 20-6.9605v-492.54c0-100.5-330.35-100.5-330.35-100.5h-169.65zm335.35 121.8c-6.4435 0-11.666 1.8804-11.666 4.2v450.6c0 2.3196 5.2235 4.2 11.666 4.2h73.33c6.4435 0 11.666-1.8804 11.666-4.2v-450.6c0-2.3196-5.2235-4.2-11.666-4.2z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,516)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 516)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/large-inverter-hp.svg b/application/src/main/data/json/system/scada_symbols/large-inverter-hp.svg
new file mode 100644
index 0000000000..11bc5da0a6
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/large-inverter-hp.svg
@@ -0,0 +1,578 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="1200" height="600" fill="none" version="1.1" viewBox="0 0 1200 600"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Large inverter",
+  "description": "Large inverter with various states.",
+  "searchTags": [
+    "energy",
+    "power",
+    "hybrid",
+    "solar",
+    "backup"
+  ],
+  "widgetSizeX": 6,
+  "widgetSizeY": 3,
+  "tags": [
+    {
+      "tag": "absorption",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.chargingMode === 2) {\n    element.fill(ctx.properties.chargingIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "bulk",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.chargingMode === 1) {\n    element.fill(ctx.properties.chargingIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "float",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.chargingMode === 3) {\n    element.fill(ctx.properties.chargingIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "inverterOn",
+      "stateRenderFunction": "if (ctx.values.running && !ctx.values.operationMode) {\n    element.fill(ctx.properties.operationIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "lowBattery",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.lowBattery) {\n    element.fill(ctx.properties.faultIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "mainsOn",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.operationMode) {\n    element.fill(ctx.properties.operationIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "overload",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.overload) {\n    element.fill(ctx.properties.faultIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "temperature",
+      "stateRenderFunction": "if (ctx.values.running && ctx.values.temperature) {\n    element.fill(ctx.properties.faultIndicatorsColor);\n} else {\n    element.fill('#dedede');\n}",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "operationMode",
+      "name": "{i18n:scada.symbol.operation-mode}",
+      "hint": "{i18n:scada.symbol.operation-mode-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": "{i18n:scada.symbol.mains-on-mode}",
+      "falseLabel": "{i18n:scada.symbol.inverter-on-mode}",
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": true,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "chargingMode",
+      "name": "{i18n:scada.symbol.charging-mode}",
+      "hint": "{i18n:scada.symbol.charging-mode-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "INTEGER",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "chargingMode"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "overload",
+      "name": "{i18n:scada.symbol.overload-fault}",
+      "hint": "{i18n:scada.symbol.overload-fault-hint}",
+      "group": "{i18n:scada.symbol.inverter-faults}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "lowBattery",
+      "name": "{i18n:scada.symbol.low-battery-fault}",
+      "hint": "{i18n:scada.symbol.low-battery-fault-hint}",
+      "group": "{i18n:scada.symbol.inverter-faults}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "temperature",
+      "name": "{i18n:scada.symbol.temperature-fault}",
+      "hint": "{i18n:scada.symbol.temperature-fault-hint}",
+      "group": "{i18n:scada.symbol.inverter-faults}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "operationIndicatorsColor",
+      "name": "{i18n:scada.symbol.operation-mode-indicators-color}",
+      "type": "color",
+      "default": "#198038",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "chargingIndicatorsColor",
+      "name": "{i18n:scada.symbol.charging-mode-indicators-color}",
+      "type": "color",
+      "default": "#FAA405",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "faultIndicatorsColor",
+      "name": "{i18n:scada.symbol.inverter-fault-indicators-color}",
+      "type": "color",
+      "default": "#D12730",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<path d="m1 6c0-2.7614 2.2386-5 5-5h1188c2.76 0 5 2.2386 5 5v588c0 2.761-2.24 5-5 5h-8c-2.76 0-5-2.239-5-5v-17.95c0-3.866-3.13-7-7-7h-1148c-3.866 0-7 3.134-7 7v17.95c0 2.761-2.2386 5-5 5h-8c-2.7614 0-5-2.239-5-5v-588z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="51" y="569" width="98" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="151" y="569" width="98" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="251" y="569" width="98" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="351" y="569" width="98" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="451" y="569" width="98" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="551" y="569" width="98" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="751" y="569" width="98" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="651" y="569" width="98" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="851" y="569" width="98" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="1076" y="569" width="48" height="30" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m297.27 122.87h-6.375c-0.182-1.045-0.517-1.971-1.006-2.778-0.488-0.818-1.096-1.511-1.823-2.08-0.728-0.568-1.557-0.994-2.489-1.278-0.92-0.295-1.915-0.443-2.983-0.443-1.898 0-3.58 0.477-5.045 1.432-1.466 0.943-2.614 2.329-3.444 4.159-0.829 1.818-1.244 4.039-1.244 6.664 0 2.671 0.415 4.921 1.244 6.75 0.841 1.819 1.989 3.194 3.444 4.125 1.465 0.921 3.142 1.381 5.028 1.381 1.045 0 2.023-0.136 2.932-0.409 0.92-0.284 1.744-0.699 2.471-1.244 0.739-0.546 1.358-1.216 1.858-2.012 0.512-0.795 0.864-1.704 1.057-2.727l6.375 0.034c-0.238 1.659-0.756 3.216-1.551 4.671-0.784 1.454-1.812 2.738-3.085 3.852-1.273 1.102-2.762 1.966-4.466 2.591-1.705 0.613-3.597 0.92-5.676 0.92-3.068 0-5.807-0.71-8.216-2.13-2.409-1.421-4.307-3.472-5.693-6.154-1.387-2.682-2.08-5.898-2.08-9.648 0-3.761 0.699-6.977 2.097-9.647 1.397-2.682 3.301-4.733 5.71-6.154 2.409-1.42 5.136-2.13 8.182-2.13 1.943 0 3.75 0.272 5.42 0.818 1.671 0.545 3.159 1.346 4.466 2.403 1.307 1.046 2.381 2.33 3.222 3.853 0.852 1.511 1.409 3.238 1.67 5.181zm11.689 7.79v15.341h-6.17v-34.909h6.034v13.176h0.307c0.613-1.477 1.562-2.642 2.846-3.494 1.296-0.864 2.943-1.296 4.943-1.296 1.819 0 3.404 0.381 4.756 1.142 1.352 0.762 2.398 1.875 3.136 3.341 0.75 1.466 1.125 3.256 1.125 5.37v16.67h-6.17v-15.716c0-1.761-0.455-3.131-1.364-4.108-0.897-0.989-2.159-1.483-3.784-1.483-1.091 0-2.068 0.239-2.932 0.716-0.852 0.466-1.522 1.142-2.011 2.029-0.477 0.886-0.716 1.96-0.716 3.221zm30.801 15.869c-1.659 0-3.153-0.295-4.483-0.886-1.318-0.602-2.363-1.489-3.136-2.659-0.761-1.171-1.142-2.614-1.142-4.33 0-1.477 0.273-2.698 0.818-3.664 0.546-0.966 1.29-1.739 2.233-2.319 0.943-0.579 2.006-1.017 3.188-1.312 1.193-0.307 2.426-0.528 3.698-0.665 1.534-0.159 2.779-0.301 3.733-0.426 0.955-0.136 1.648-0.341 2.08-0.614 0.443-0.284 0.665-0.721 0.665-1.312v-0.102c0-1.284-0.381-2.279-1.142-2.983-0.762-0.705-1.858-1.057-3.29-1.057-1.512 0-2.71 0.329-3.597 0.989-0.875 0.659-1.466 1.437-1.772 2.335l-5.762-0.818c0.455-1.591 1.205-2.921 2.25-3.989 1.046-1.08 2.324-1.886 3.835-2.421 1.512-0.545 3.182-0.818 5.012-0.818 1.261 0 2.517 0.148 3.767 0.443 1.25 0.296 2.392 0.785 3.426 1.466 1.034 0.671 1.864 1.586 2.489 2.745 0.636 1.159 0.954 2.608 0.954 4.346v17.523h-5.932v-3.597h-0.204c-0.375 0.728-0.904 1.409-1.585 2.046-0.671 0.625-1.518 1.131-2.54 1.517-1.012 0.375-2.199 0.562-3.563 0.562zm1.603-4.534c1.238 0 2.312-0.244 3.221-0.733 0.909-0.5 1.608-1.159 2.097-1.977 0.5-0.818 0.75-1.71 0.75-2.676v-3.085c-0.193 0.159-0.523 0.307-0.989 0.443-0.454 0.136-0.966 0.256-1.534 0.358s-1.131 0.193-1.688 0.273c-0.556 0.079-1.039 0.147-1.448 0.204-0.921 0.125-1.745 0.33-2.472 0.614s-1.301 0.682-1.722 1.193c-0.42 0.5-0.63 1.148-0.63 1.943 0 1.137 0.415 1.994 1.244 2.574 0.83 0.58 1.886 0.869 3.171 0.869zm18.426 4.006v-26.182h5.983v4.364h0.272c0.478-1.512 1.296-2.676 2.455-3.494 1.17-0.83 2.506-1.245 4.006-1.245 0.34 0 0.721 0.017 1.142 0.051 0.431 0.023 0.789 0.063 1.073 0.12v5.676c-0.261-0.091-0.676-0.171-1.244-0.239-0.557-0.079-1.096-0.119-1.619-0.119-1.125 0-2.137 0.244-3.034 0.733-0.887 0.477-1.585 1.142-2.097 1.994-0.511 0.852-0.767 1.835-0.767 2.949v15.392h-6.17zm29.339 10.364c-2.216 0-4.119-0.301-5.71-0.904-1.591-0.591-2.869-1.386-3.835-2.386s-1.637-2.108-2.012-3.324l5.557-1.347c0.25 0.512 0.614 1.017 1.091 1.517 0.477 0.512 1.119 0.932 1.926 1.262 0.818 0.341 1.847 0.511 3.085 0.511 1.75 0 3.199-0.426 4.347-1.278 1.148-0.841 1.722-2.227 1.722-4.159v-4.961h-0.307c-0.318 0.637-0.784 1.29-1.398 1.961-0.602 0.67-1.403 1.233-2.403 1.687-0.989 0.455-2.233 0.682-3.733 0.682-2.012 0-3.836-0.472-5.472-1.415-1.625-0.954-2.92-2.375-3.886-4.261-0.955-1.898-1.432-4.273-1.432-7.125 0-2.875 0.477-5.301 1.432-7.279 0.966-1.988 2.267-3.494 3.903-4.517 1.636-1.034 3.46-1.551 5.472-1.551 1.534 0 2.795 0.262 3.784 0.784 1 0.512 1.795 1.131 2.386 1.858 0.591 0.716 1.04 1.392 1.347 2.029h0.341v-4.33h6.085v26.608c0 2.239-0.534 4.091-1.602 5.557-1.069 1.466-2.529 2.562-4.381 3.29-1.852 0.727-3.955 1.091-6.307 1.091zm0.051-15.58c1.307 0 2.421-0.318 3.341-0.954 0.921-0.637 1.619-1.552 2.097-2.745 0.477-1.193 0.716-2.625 0.716-4.295 0-1.648-0.239-3.091-0.716-4.33-0.466-1.238-1.159-2.199-2.08-2.88-0.909-0.694-2.028-1.04-3.358-1.04-1.375 0-2.522 0.358-3.443 1.074-0.92 0.716-1.614 1.698-2.079 2.948-0.466 1.239-0.699 2.648-0.699 4.228 0 1.602 0.233 3.005 0.699 4.21 0.477 1.193 1.176 2.125 2.096 2.795 0.932 0.66 2.074 0.989 3.426 0.989zm30.154 5.727c-2.625 0-4.892-0.545-6.801-1.636-1.898-1.102-3.358-2.659-4.381-4.67-1.023-2.023-1.534-4.404-1.534-7.143 0-2.693 0.511-5.056 1.534-7.09 1.034-2.046 2.477-3.637 4.329-4.773 1.853-1.148 4.029-1.722 6.529-1.722 1.613 0 3.136 0.262 4.568 0.784 1.443 0.512 2.716 1.307 3.818 2.387 1.114 1.079 1.989 2.454 2.625 4.125 0.637 1.659 0.955 3.636 0.955 5.932v1.892h-21.461v-4.159h15.546c-0.011-1.182-0.267-2.233-0.767-3.154-0.5-0.932-1.199-1.665-2.097-2.199-0.886-0.534-1.92-0.801-3.102-0.801-1.261 0-2.369 0.307-3.324 0.921-0.954 0.602-1.699 1.397-2.233 2.386-0.523 0.977-0.79 2.051-0.801 3.221v3.631c0 1.523 0.278 2.83 0.835 3.921 0.557 1.079 1.336 1.909 2.336 2.488 1 0.568 2.17 0.853 3.511 0.853 0.898 0 1.71-0.125 2.437-0.375 0.728-0.262 1.358-0.642 1.892-1.142 0.535-0.5 0.938-1.12 1.211-1.858l5.761 0.647c-0.364 1.523-1.057 2.853-2.08 3.989-1.011 1.125-2.306 2-3.886 2.625-1.579 0.614-3.386 0.92-5.42 0.92zm16.862-0.511v-26.182h5.983v4.364h0.273c0.477-1.512 1.295-2.676 2.454-3.494 1.171-0.83 2.506-1.245 4.006-1.245 0.341 0 0.721 0.017 1.142 0.051 0.432 0.023 0.79 0.063 1.074 0.12v5.676c-0.262-0.091-0.676-0.171-1.245-0.239-0.556-0.079-1.096-0.119-1.619-0.119-1.125 0-2.136 0.244-3.034 0.733-0.886 0.477-1.585 1.142-2.097 1.994-0.511 0.852-0.767 1.835-0.767 2.949v15.392h-6.17z" fill="#1A1A1A"/><circle cx="250" cy="212" r="10" fill="#198038" tb:tag="mainsOn"/><path d="m271.52 197.91h4.204l9.887 24.148h0.341l9.886-24.148h4.204v29.091h-3.295v-22.102h-0.284l-9.091 22.102h-3.182l-9.091-22.102h-0.284v22.102h-3.295v-29.091zm41.552 29.602c-1.383 0-2.638-0.26-3.765-0.781-1.127-0.53-2.021-1.292-2.684-2.287-0.663-1.004-0.995-2.216-0.995-3.636 0-1.25 0.247-2.263 0.739-3.04 0.492-0.786 1.151-1.401 1.974-1.847 0.824-0.445 1.733-0.776 2.728-0.994 1.004-0.227 2.012-0.407 3.025-0.54 1.326-0.17 2.401-0.298 3.225-0.383 0.833-0.095 1.439-0.251 1.818-0.469 0.388-0.218 0.582-0.597 0.582-1.136v-0.114c0-1.401-0.383-2.49-1.15-3.267-0.758-0.776-1.908-1.165-3.452-1.165-1.6 0-2.855 0.351-3.764 1.051-0.909 0.701-1.548 1.449-1.918 2.245l-3.182-1.137c0.569-1.325 1.326-2.358 2.273-3.096 0.957-0.748 1.998-1.269 3.125-1.563 1.136-0.303 2.254-0.454 3.352-0.454 0.701 0 1.506 0.085 2.415 0.255 0.919 0.161 1.804 0.498 2.656 1.009 0.862 0.511 1.577 1.283 2.145 2.315s0.853 2.415 0.853 4.148v14.375h-3.353v-2.955h-0.17c-0.227 0.474-0.606 0.981-1.137 1.52-0.53 0.54-1.235 0.999-2.116 1.378s-1.955 0.568-3.224 0.568zm0.511-3.011c1.326 0 2.443-0.26 3.352-0.781 0.919-0.521 1.61-1.193 2.074-2.017 0.474-0.824 0.71-1.691 0.71-2.6v-3.068c-0.142 0.171-0.454 0.327-0.937 0.469-0.474 0.132-1.023 0.251-1.648 0.355-0.615 0.095-1.217 0.18-1.804 0.256-0.578 0.066-1.046 0.123-1.406 0.17-0.871 0.114-1.686 0.298-2.443 0.554-0.748 0.246-1.355 0.62-1.819 1.122-0.454 0.493-0.681 1.165-0.681 2.017 0 1.165 0.431 2.046 1.292 2.642 0.871 0.587 1.975 0.881 3.31 0.881zm15.607 2.5v-21.818h3.352v21.818h-3.352zm1.705-25.455c-0.654 0-1.217-0.222-1.691-0.667-0.464-0.445-0.696-0.98-0.696-1.605s0.232-1.16 0.696-1.605c0.474-0.445 1.037-0.668 1.691-0.668 0.653 0 1.212 0.223 1.676 0.668 0.473 0.445 0.71 0.98 0.71 1.605s-0.237 1.16-0.71 1.605c-0.464 0.445-1.023 0.667-1.676 0.667zm11.14 12.33v13.125h-3.353v-21.818h3.239v3.409h0.284c0.511-1.108 1.288-1.998 2.33-2.671 1.041-0.681 2.386-1.022 4.034-1.022 1.477 0 2.77 0.303 3.878 0.909 1.108 0.596 1.969 1.505 2.585 2.727 0.615 1.212 0.923 2.746 0.923 4.602v13.864h-3.352v-13.636c0-1.714-0.445-3.05-1.335-4.006-0.891-0.966-2.112-1.449-3.665-1.449-1.07 0-2.027 0.232-2.869 0.696-0.834 0.464-1.492 1.141-1.975 2.031-0.483 0.891-0.724 1.97-0.724 3.239zm35.5-3.807-3.011 0.852c-0.189-0.501-0.469-0.989-0.838-1.463-0.36-0.483-0.852-0.88-1.477-1.193-0.625-0.312-1.426-0.469-2.401-0.469-1.335 0-2.448 0.308-3.338 0.924-0.881 0.606-1.321 1.378-1.321 2.315 0 0.833 0.303 1.492 0.909 1.975 0.606 0.482 1.553 0.885 2.841 1.207l3.239 0.795c1.95 0.474 3.404 1.198 4.36 2.174 0.957 0.966 1.435 2.211 1.435 3.735 0 1.25-0.36 2.368-1.079 3.353-0.711 0.985-1.705 1.761-2.983 2.329-1.279 0.568-2.766 0.853-4.461 0.853-2.225 0-4.067-0.483-5.525-1.449-1.459-0.966-2.382-2.377-2.77-4.233l3.182-0.796c0.303 1.175 0.876 2.055 1.718 2.642 0.853 0.587 1.965 0.881 3.339 0.881 1.562 0 2.803-0.331 3.721-0.994 0.928-0.673 1.392-1.478 1.392-2.415 0-0.758-0.265-1.392-0.795-1.903-0.531-0.521-1.345-0.91-2.443-1.165l-3.637-0.853c-1.998-0.473-3.466-1.207-4.403-2.201-0.928-1.004-1.392-2.259-1.392-3.764 0-1.232 0.345-2.321 1.037-3.267 0.7-0.947 1.652-1.691 2.855-2.231 1.212-0.539 2.585-0.809 4.119-0.809 2.159 0 3.854 0.473 5.085 1.42 1.241 0.947 2.122 2.197 2.642 3.75zm25.558 17.387c-1.97 0-3.698-0.469-5.185-1.407-1.477-0.937-2.632-2.249-3.466-3.934-0.824-1.686-1.235-3.656-1.235-5.909 0-2.273 0.411-4.257 1.235-5.952 0.834-1.695 1.989-3.012 3.466-3.949 1.487-0.938 3.215-1.406 5.185-1.406s3.693 0.468 5.17 1.406c1.487 0.937 2.642 2.254 3.466 3.949 0.834 1.695 1.25 3.679 1.25 5.952 0 2.253-0.416 4.223-1.25 5.909-0.824 1.685-1.979 2.997-3.466 3.934-1.477 0.938-3.2 1.407-5.17 1.407zm0-3.012c1.496 0 2.727-0.383 3.693-1.15s1.681-1.776 2.145-3.026 0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.966-0.777-2.197-1.165-3.693-1.165s-2.727 0.388-3.693 1.165c-0.966 0.776-1.681 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.179 2.259 2.145 3.026 2.197 1.15 3.693 1.15zm18.356-10.568v13.125h-3.353v-21.818h3.239v3.409h0.284c0.512-1.108 1.288-1.998 2.33-2.671 1.041-0.681 2.386-1.022 4.034-1.022 1.477 0 2.77 0.303 3.878 0.909 1.108 0.596 1.969 1.505 2.585 2.727 0.615 1.212 0.923 2.746 0.923 4.602v13.864h-3.352v-13.636c0-1.714-0.445-3.05-1.335-4.006-0.89-0.966-2.112-1.449-3.665-1.449-1.07 0-2.027 0.232-2.869 0.696-0.834 0.464-1.492 1.141-1.975 2.031-0.483 0.891-0.724 1.97-0.724 3.239z" fill="#1A1A1A"/><circle cx="250" cy="280" r="10" fill="#DEDEDE" tb:tag="bulk"/><path d="m271.52 295v-29.091h10.17c2.027 0 3.698 0.35 5.014 1.051 1.317 0.692 2.297 1.624 2.941 2.799 0.644 1.164 0.966 2.457 0.966 3.877 0 1.25-0.223 2.283-0.668 3.097-0.436 0.814-1.013 1.458-1.733 1.932-0.71 0.473-1.482 0.824-2.315 1.051v0.284c0.89 0.057 1.785 0.369 2.684 0.938 0.9 0.568 1.653 1.382 2.259 2.443 0.606 1.06 0.909 2.358 0.909 3.892 0 1.458-0.331 2.77-0.994 3.934-0.663 1.165-1.71 2.088-3.14 2.77-1.429 0.682-3.29 1.023-5.582 1.023h-10.511zm3.522-3.125h6.989c2.301 0 3.935-0.445 4.901-1.335 0.975-0.9 1.463-1.989 1.463-3.267 0-0.985-0.251-1.894-0.753-2.728-0.502-0.842-1.217-1.515-2.145-2.017-0.928-0.511-2.027-0.767-3.295-0.767h-7.16v10.114zm0-13.182h6.535c1.06 0 2.017-0.208 2.869-0.625 0.862-0.416 1.543-1.004 2.045-1.761 0.512-0.758 0.767-1.648 0.767-2.671 0-1.278-0.445-2.362-1.335-3.252-0.89-0.9-2.301-1.35-4.233-1.35h-6.648v9.659zm35.789 7.387v-12.898h3.352v21.818h-3.352v-3.693h-0.227c-0.512 1.108-1.307 2.05-2.387 2.827-1.079 0.767-2.443 1.15-4.091 1.15-1.363 0-2.575-0.298-3.636-0.895-1.061-0.606-1.894-1.515-2.5-2.727-0.606-1.222-0.909-2.76-0.909-4.617v-13.863h3.352v13.636c0 1.591 0.445 2.86 1.335 3.807 0.9 0.947 2.046 1.42 3.438 1.42 0.833 0 1.681-0.213 2.542-0.639 0.872-0.426 1.601-1.079 2.188-1.96 0.597-0.881 0.895-2.003 0.895-3.366zm12.844-20.171v29.091h-3.352v-29.091h3.352zm9.265 21.136-0.057-4.147h0.682l9.546-9.716h4.147l-10.17 10.284h-0.284l-3.864 3.579zm-3.125 7.955v-29.091h3.352v29.091h-3.352zm13.864 0-8.523-10.795 2.386-2.33 10.398 13.125h-4.261z" fill="#1A1A1A"/><circle cx="250" cy="348" r="10" fill="#DEDEDE" tb:tag="absorption"/><path d="m272.72 363h-3.693l10.682-29.091h3.636l10.682 29.091h-3.693l-8.694-24.489h-0.227l-8.693 24.489zm1.364-11.364h14.886v3.125h-14.886v-3.125zm24.474 11.364v-29.091h3.352v10.739h0.284c0.247-0.379 0.587-0.862 1.023-1.449 0.445-0.597 1.08-1.127 1.903-1.591 0.834-0.474 1.961-0.71 3.381-0.71 1.837 0 3.457 0.459 4.858 1.378 1.402 0.918 2.495 2.22 3.281 3.906 0.786 1.685 1.179 3.674 1.179 5.966 0 2.31-0.393 4.313-1.179 6.008-0.786 1.686-1.875 2.993-3.267 3.921-1.392 0.918-2.997 1.378-4.815 1.378-1.402 0-2.524-0.232-3.366-0.696-0.843-0.474-1.492-1.009-1.947-1.606-0.454-0.606-0.804-1.108-1.051-1.505h-0.397v3.352h-3.239zm3.295-10.909c0 1.648 0.242 3.101 0.725 4.361 0.483 1.25 1.188 2.23 2.116 2.94 0.928 0.701 2.065 1.051 3.409 1.051 1.402 0 2.571-0.369 3.509-1.108 0.947-0.748 1.657-1.752 2.131-3.011 0.483-1.269 0.724-2.68 0.724-4.233 0-1.534-0.237-2.917-0.71-4.148-0.464-1.24-1.17-2.22-2.117-2.94-0.937-0.729-2.116-1.094-3.537-1.094-1.363 0-2.509 0.346-3.437 1.037-0.928 0.682-1.629 1.638-2.102 2.869-0.474 1.222-0.711 2.647-0.711 4.276zm36.549-6.023-3.012 0.852c-0.189-0.501-0.468-0.989-0.838-1.463-0.36-0.483-0.852-0.88-1.477-1.193-0.625-0.312-1.425-0.469-2.401-0.469-1.335 0-2.447 0.308-3.338 0.924-0.88 0.606-1.321 1.378-1.321 2.315 0 0.833 0.303 1.492 0.909 1.975 0.607 0.482 1.553 0.885 2.841 1.207l3.239 0.795c1.951 0.474 3.404 1.198 4.361 2.174 0.956 0.966 1.434 2.211 1.434 3.735 0 1.25-0.359 2.368-1.079 3.353-0.71 0.985-1.705 1.761-2.983 2.329s-2.765 0.853-4.46 0.853c-2.226 0-4.068-0.483-5.526-1.449s-2.381-2.377-2.77-4.233l3.182-0.796c0.303 1.175 0.876 2.055 1.719 2.642 0.852 0.587 1.965 0.881 3.338 0.881 1.562 0 2.803-0.331 3.722-0.994 0.928-0.673 1.392-1.478 1.392-2.415 0-0.758-0.266-1.392-0.796-1.903-0.53-0.521-1.345-0.91-2.443-1.165l-3.636-0.853c-1.999-0.473-3.466-1.207-4.404-2.201-0.928-1.004-1.392-2.259-1.392-3.764 0-1.232 0.346-2.321 1.037-3.267 0.701-0.947 1.652-1.691 2.855-2.231 1.212-0.539 2.585-0.809 4.119-0.809 2.16 0 3.855 0.473 5.086 1.42 1.24 0.947 2.121 2.197 2.642 3.75zm14.307 17.387c-1.969 0-3.698-0.469-5.184-1.407-1.478-0.937-2.633-2.249-3.466-3.934-0.824-1.686-1.236-3.656-1.236-5.909 0-2.273 0.412-4.257 1.236-5.952 0.833-1.695 1.988-3.012 3.466-3.949 1.486-0.938 3.215-1.406 5.184-1.406 1.97 0 3.693 0.468 5.171 1.406 1.486 0.937 2.642 2.254 3.466 3.949 0.833 1.695 1.25 3.679 1.25 5.952 0 2.253-0.417 4.223-1.25 5.909-0.824 1.685-1.98 2.997-3.466 3.934-1.478 0.938-3.201 1.407-5.171 1.407zm0-3.012c1.496 0 2.728-0.383 3.693-1.15 0.966-0.767 1.681-1.776 2.145-3.026s0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.965-0.777-2.197-1.165-3.693-1.165s-2.727 0.388-3.693 1.165c-0.966 0.776-1.681 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.179 2.259 2.145 3.026 2.197 1.15 3.693 1.15zm15.004 2.557v-21.818h3.238v3.295h0.228c0.397-1.079 1.117-1.955 2.159-2.628 1.041-0.672 2.216-1.008 3.523-1.008 0.246 0 0.554 5e-3 0.923 0.014 0.369 0.01 0.649 0.024 0.838 0.043v3.409c-0.114-0.029-0.374-0.071-0.781-0.128-0.398-0.066-0.819-0.099-1.265-0.099-1.06 0-2.007 0.222-2.84 0.667-0.824 0.436-1.478 1.042-1.961 1.818-0.473 0.767-0.71 1.643-0.71 2.628v13.807h-3.352zm14.883 8.182v-30h3.238v3.466h0.398c0.246-0.379 0.587-0.862 1.023-1.449 0.445-0.597 1.079-1.127 1.903-1.591 0.833-0.474 1.96-0.71 3.381-0.71 1.837 0 3.456 0.459 4.858 1.378 1.401 0.918 2.495 2.22 3.281 3.906 0.786 1.685 1.179 3.674 1.179 5.966 0 2.31-0.393 4.313-1.179 6.008-0.786 1.686-1.875 2.993-3.267 3.921-1.392 0.918-2.997 1.378-4.815 1.378-1.402 0-2.524-0.232-3.367-0.696-0.843-0.474-1.491-1.009-1.946-1.606-0.454-0.606-0.805-1.108-1.051-1.505h-0.284v11.534h-3.352zm3.295-19.091c0 1.648 0.242 3.101 0.725 4.361 0.482 1.25 1.188 2.23 2.116 2.94 0.928 0.701 2.064 1.051 3.409 1.051 1.402 0 2.571-0.369 3.509-1.108 0.947-0.748 1.657-1.752 2.13-3.011 0.483-1.269 0.725-2.68 0.725-4.233 0-1.534-0.237-2.917-0.711-4.148-0.464-1.24-1.169-2.22-2.116-2.94-0.937-0.729-2.116-1.094-3.537-1.094-1.364 0-2.509 0.346-3.437 1.037-0.928 0.682-1.629 1.638-2.103 2.869-0.473 1.222-0.71 2.647-0.71 4.276zm30.568-10.909v2.841h-11.307v-2.841h11.307zm-8.011-5.227h3.352v20.795c0 0.947 0.137 1.657 0.412 2.131 0.284 0.464 0.644 0.776 1.08 0.937 0.445 0.152 0.913 0.227 1.406 0.227 0.369 0 0.672-0.018 0.909-0.056 0.237-0.048 0.426-0.086 0.568-0.114l0.682 3.011c-0.227 0.086-0.545 0.171-0.952 0.256-0.407 0.095-0.923 0.142-1.548 0.142-0.947 0-1.875-0.204-2.784-0.611-0.9-0.407-1.648-1.027-2.244-1.861-0.588-0.833-0.881-1.884-0.881-3.153v-21.704zm13.054 27.045v-21.818h3.352v21.818h-3.352zm1.704-25.455c-0.653 0-1.216-0.222-1.69-0.667-0.464-0.445-0.696-0.98-0.696-1.605s0.232-1.16 0.696-1.605c0.474-0.445 1.037-0.668 1.69-0.668 0.654 0 1.213 0.223 1.677 0.668 0.473 0.445 0.71 0.98 0.71 1.605s-0.237 1.16-0.71 1.605c-0.464 0.445-1.023 0.667-1.677 0.667zm16.652 25.91c-1.97 0-3.698-0.469-5.185-1.407-1.477-0.937-2.633-2.249-3.466-3.934-0.824-1.686-1.236-3.656-1.236-5.909 0-2.273 0.412-4.257 1.236-5.952 0.833-1.695 1.989-3.012 3.466-3.949 1.487-0.938 3.215-1.406 5.185-1.406 1.969 0 3.693 0.468 5.17 1.406 1.487 0.937 2.642 2.254 3.466 3.949 0.833 1.695 1.25 3.679 1.25 5.952 0 2.253-0.417 4.223-1.25 5.909-0.824 1.685-1.979 2.997-3.466 3.934-1.477 0.938-3.201 1.407-5.17 1.407zm0-3.012c1.496 0 2.727-0.383 3.693-1.15s1.681-1.776 2.145-3.026 0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.966-0.777-2.197-1.165-3.693-1.165-1.497 0-2.728 0.388-3.693 1.165-0.966 0.776-1.681 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.179 2.259 2.145 3.026c0.965 0.767 2.196 1.15 3.693 1.15zm18.356-10.568v13.125h-3.353v-21.818h3.239v3.409h0.284c0.511-1.108 1.288-1.998 2.33-2.671 1.041-0.681 2.386-1.022 4.034-1.022 1.477 0 2.769 0.303 3.877 0.909 1.108 0.596 1.97 1.505 2.586 2.727 0.615 1.212 0.923 2.746 0.923 4.602v13.864h-3.352v-13.636c0-1.714-0.445-3.05-1.336-4.006-0.89-0.966-2.111-1.449-3.664-1.449-1.07 0-2.027 0.232-2.87 0.696-0.833 0.464-1.491 1.141-1.974 2.031-0.483 0.891-0.724 1.97-0.724 3.239z" fill="#1A1A1A"/><circle cx="250" cy="416" r="10" fill="#DEDEDE" tb:tag="float"/><path d="m271.52 431v-29.091h17.443v3.125h-13.921v9.83h12.614v3.125h-12.614v13.011h-3.522zm26.374-29.091v29.091h-3.352v-29.091h3.352zm15.004 29.546c-1.97 0-3.698-0.469-5.185-1.407-1.477-0.937-2.633-2.249-3.466-3.934-0.824-1.686-1.236-3.656-1.236-5.909 0-2.273 0.412-4.257 1.236-5.952 0.833-1.695 1.989-3.012 3.466-3.949 1.487-0.938 3.215-1.406 5.185-1.406 1.969 0 3.693 0.468 5.17 1.406 1.487 0.937 2.642 2.254 3.466 3.949 0.833 1.695 1.25 3.679 1.25 5.952 0 2.253-0.417 4.223-1.25 5.909-0.824 1.685-1.979 2.997-3.466 3.934-1.477 0.938-3.201 1.407-5.17 1.407zm0-3.012c1.496 0 2.727-0.383 3.693-1.15s1.681-1.776 2.145-3.026 0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.966-0.777-2.197-1.165-3.693-1.165-1.497 0-2.728 0.388-3.694 1.165-0.966 0.776-1.68 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062 0.465 1.25 1.179 2.259 2.145 3.026s2.197 1.15 3.694 1.15zm21.424 3.068c-1.383 0-2.638-0.26-3.765-0.781-1.127-0.53-2.021-1.292-2.684-2.287-0.663-1.004-0.995-2.216-0.995-3.636 0-1.25 0.247-2.263 0.739-3.04 0.492-0.786 1.151-1.401 1.974-1.847 0.824-0.445 1.733-0.776 2.728-0.994 1.004-0.227 2.012-0.407 3.025-0.54 1.326-0.17 2.401-0.298 3.225-0.383 0.833-0.095 1.439-0.251 1.818-0.469 0.388-0.218 0.582-0.597 0.582-1.136v-0.114c0-1.401-0.383-2.49-1.15-3.267-0.758-0.776-1.908-1.165-3.452-1.165-1.6 0-2.855 0.351-3.764 1.051-0.909 0.701-1.548 1.449-1.918 2.245l-3.182-1.137c0.569-1.325 1.326-2.358 2.273-3.096 0.957-0.748 1.998-1.269 3.125-1.563 1.136-0.303 2.254-0.454 3.352-0.454 0.701 0 1.506 0.085 2.415 0.255 0.919 0.161 1.804 0.498 2.656 1.009 0.862 0.511 1.577 1.283 2.145 2.315s0.853 2.415 0.853 4.148v14.375h-3.353v-2.955h-0.17c-0.227 0.474-0.606 0.981-1.137 1.52-0.53 0.54-1.235 0.999-2.116 1.378s-1.955 0.568-3.224 0.568zm0.511-3.011c1.326 0 2.443-0.26 3.352-0.781 0.919-0.521 1.61-1.193 2.074-2.017 0.474-0.824 0.71-1.691 0.71-2.6v-3.068c-0.142 0.171-0.454 0.327-0.937 0.469-0.474 0.132-1.023 0.251-1.648 0.355-0.615 0.095-1.217 0.18-1.804 0.256-0.578 0.066-1.046 0.123-1.406 0.17-0.871 0.114-1.686 0.298-2.443 0.554-0.748 0.246-1.355 0.62-1.819 1.122-0.454 0.493-0.681 1.165-0.681 2.017 0 1.165 0.431 2.046 1.292 2.642 0.871 0.587 1.975 0.881 3.31 0.881zm25.096-19.318v2.841h-11.307v-2.841h11.307zm-8.012-5.227h3.353v20.795c0 0.947 0.137 1.657 0.412 2.131 0.284 0.464 0.644 0.776 1.079 0.937 0.445 0.152 0.914 0.227 1.406 0.227 0.37 0 0.673-0.018 0.91-0.056 0.236-0.048 0.426-0.086 0.568-0.114l0.682 3.011c-0.228 0.086-0.545 0.171-0.952 0.256-0.407 0.095-0.923 0.142-1.548 0.142-0.947 0-1.875-0.204-2.785-0.611-0.899-0.407-1.647-1.027-2.244-1.861-0.587-0.833-0.881-1.884-0.881-3.153v-21.704z" fill="#1A1A1A"/><path d="m743.98 111.09v34.909h-6.324v-34.909h6.324zm12.746 19.568v15.341h-6.171v-26.182h5.898v4.449h0.307c0.602-1.466 1.562-2.631 2.88-3.494 1.33-0.864 2.972-1.296 4.927-1.296 1.806 0 3.38 0.387 4.721 1.159 1.352 0.773 2.398 1.892 3.137 3.358 0.75 1.466 1.119 3.245 1.108 5.336v16.67h-6.171v-15.716c0-1.75-0.454-3.119-1.364-4.108-0.897-0.989-2.142-1.483-3.733-1.483-1.079 0-2.039 0.239-2.88 0.716-0.83 0.466-1.483 1.142-1.96 2.029-0.466 0.886-0.699 1.96-0.699 3.221zm45.528-10.841-9.324 26.182h-6.818l-9.324-26.182h6.58l6.017 19.449h0.273l6.034-19.449h6.562zm14.97 26.693c-2.625 0-4.892-0.545-6.801-1.636-1.898-1.102-3.358-2.659-4.381-4.67-1.022-2.023-1.534-4.404-1.534-7.143 0-2.693 0.512-5.056 1.534-7.09 1.035-2.046 2.478-3.637 4.33-4.773 1.852-1.148 4.028-1.722 6.528-1.722 1.614 0 3.137 0.262 4.569 0.784 1.443 0.512 2.716 1.307 3.818 2.387 1.113 1.079 1.988 2.454 2.625 4.125 0.636 1.659 0.954 3.636 0.954 5.932v1.892h-21.46v-4.159h15.546c-0.012-1.182-0.267-2.233-0.767-3.154-0.5-0.932-1.199-1.665-2.097-2.199-0.886-0.534-1.921-0.801-3.102-0.801-1.262 0-2.37 0.307-3.324 0.921-0.955 0.602-1.699 1.397-2.233 2.386-0.523 0.977-0.79 2.051-0.801 3.221v3.631c0 1.523 0.278 2.83 0.835 3.921 0.557 1.079 1.335 1.909 2.335 2.488 1 0.568 2.171 0.853 3.512 0.853 0.897 0 1.71-0.125 2.437-0.375 0.727-0.262 1.358-0.642 1.892-1.142s0.938-1.12 1.21-1.858l5.762 0.647c-0.364 1.523-1.057 2.853-2.08 3.989-1.011 1.125-2.307 2-3.886 2.625-1.58 0.614-3.387 0.92-5.421 0.92zm16.863-0.511v-26.182h5.982v4.364h0.273c0.477-1.512 1.296-2.676 2.455-3.494 1.17-0.83 2.505-1.245 4.005-1.245 0.341 0 0.722 0.017 1.142 0.051 0.432 0.023 0.79 0.063 1.074 0.12v5.676c-0.261-0.091-0.676-0.171-1.244-0.239-0.557-0.079-1.097-0.119-1.619-0.119-1.125 0-2.137 0.244-3.034 0.733-0.887 0.477-1.586 1.142-2.097 1.994s-0.767 1.835-0.767 2.949v15.392h-6.17zm33.511-26.182v4.773h-15.051v-4.773h15.051zm-11.335-6.273h6.17v24.58c0 0.83 0.125 1.466 0.375 1.909 0.261 0.432 0.602 0.727 1.023 0.886 0.42 0.16 0.886 0.239 1.398 0.239 0.386 0 0.738-0.028 1.056-0.085 0.33-0.057 0.58-0.108 0.75-0.154l1.04 4.824c-0.329 0.114-0.801 0.239-1.415 0.375-0.602 0.137-1.341 0.216-2.216 0.239-1.545 0.045-2.937-0.188-4.176-0.699-1.238-0.523-2.221-1.329-2.949-2.42-0.715-1.091-1.068-2.455-1.056-4.091v-25.603zm27.805 32.966c-2.625 0-4.892-0.545-6.801-1.636-1.898-1.102-3.358-2.659-4.381-4.67-1.022-2.023-1.534-4.404-1.534-7.143 0-2.693 0.512-5.056 1.534-7.09 1.034-2.046 2.478-3.637 4.33-4.773 1.852-1.148 4.028-1.722 6.528-1.722 1.614 0 3.137 0.262 4.568 0.784 1.444 0.512 2.716 1.307 3.819 2.387 1.113 1.079 1.988 2.454 2.625 4.125 0.636 1.659 0.954 3.636 0.954 5.932v1.892h-21.46v-4.159h15.545c-0.011-1.182-0.267-2.233-0.767-3.154-0.5-0.932-1.199-1.665-2.096-2.199-0.887-0.534-1.921-0.801-3.103-0.801-1.261 0-2.369 0.307-3.323 0.921-0.955 0.602-1.699 1.397-2.233 2.386-0.523 0.977-0.79 2.051-0.802 3.221v3.631c0 1.523 0.279 2.83 0.836 3.921 0.557 1.079 1.335 1.909 2.335 2.488 1 0.568 2.17 0.853 3.511 0.853 0.898 0 1.711-0.125 2.438-0.375 0.727-0.262 1.358-0.642 1.892-1.142s0.937-1.12 1.21-1.858l5.761 0.647c-0.363 1.523-1.056 2.853-2.079 3.989-1.011 1.125-2.307 2-3.886 2.625-1.58 0.614-3.387 0.92-5.421 0.92zm16.862-0.511v-26.182h5.983v4.364h0.273c0.477-1.512 1.295-2.676 2.454-3.494 1.171-0.83 2.506-1.245 4.006-1.245 0.341 0 0.722 0.017 1.142 0.051 0.432 0.023 0.79 0.063 1.074 0.12v5.676c-0.261-0.091-0.676-0.171-1.244-0.239-0.557-0.079-1.097-0.119-1.62-0.119-1.125 0-2.136 0.244-3.034 0.733-0.886 0.477-1.585 1.142-2.096 1.994-0.512 0.852-0.767 1.835-0.767 2.949v15.392h-6.171z" fill="#1A1A1A"/><circle cx="701" cy="212" r="10" fill="#DEDEDE" tb:tag="inverterOn"/><path d="m726.04 197.91v29.091h-3.522v-29.091h3.522zm9.961 15.966v13.125h-3.352v-21.818h3.239v3.409h0.284c0.511-1.108 1.288-1.998 2.329-2.671 1.042-0.681 2.387-1.022 4.034-1.022 1.478 0 2.77 0.303 3.878 0.909 1.108 0.596 1.97 1.505 2.586 2.727 0.615 1.212 0.923 2.746 0.923 4.602v13.864h-3.352v-13.636c0-1.714-0.446-3.05-1.336-4.006-0.89-0.966-2.111-1.449-3.664-1.449-1.071 0-2.027 0.232-2.87 0.696-0.833 0.464-1.491 1.141-1.974 2.031-0.483 0.891-0.725 1.97-0.725 3.239zm37.106-8.693-8.068 21.818h-3.409l-8.068-21.818h3.636l6.023 17.386h0.227l6.023-17.386h3.636zm12.791 22.273c-2.102 0-3.915-0.464-5.44-1.393-1.515-0.937-2.685-2.244-3.508-3.92-0.815-1.686-1.222-3.646-1.222-5.881 0-2.234 0.407-4.204 1.222-5.909 0.823-1.714 1.969-3.049 3.437-4.005 1.477-0.966 3.201-1.449 5.17-1.449 1.137 0 2.259 0.189 3.367 0.568s2.116 0.994 3.026 1.846c0.909 0.843 1.633 1.961 2.173 3.353s0.81 3.106 0.81 5.142v1.42h-16.819v-2.897h13.409c0-1.232-0.246-2.33-0.738-3.296-0.483-0.966-1.174-1.728-2.074-2.287-0.89-0.559-1.941-0.838-3.154-0.838-1.335 0-2.49 0.332-3.465 0.994-0.966 0.654-1.71 1.506-2.231 2.557-0.52 1.051-0.781 2.178-0.781 3.381v1.932c0 1.647 0.284 3.044 0.853 4.19 0.577 1.136 1.377 2.003 2.4 2.599 1.023 0.588 2.211 0.881 3.565 0.881 0.881 0 1.677-0.123 2.387-0.369 0.719-0.256 1.34-0.635 1.861-1.136 0.52-0.512 0.923-1.146 1.207-1.904l3.239 0.909c-0.341 1.099-0.914 2.065-1.719 2.898-0.805 0.824-1.799 1.468-2.983 1.932-1.184 0.454-2.514 0.682-3.992 0.682zm14.134-0.455v-21.818h3.239v3.295h0.227c0.398-1.079 1.117-1.955 2.159-2.628 1.042-0.672 2.216-1.008 3.523-1.008 0.246 0 0.554 5e-3 0.923 0.014 0.369 0.01 0.649 0.024 0.838 0.043v3.409c-0.114-0.029-0.374-0.071-0.781-0.128-0.398-0.066-0.819-0.099-1.264-0.099-1.061 0-2.008 0.222-2.841 0.667-0.824 0.436-1.478 1.042-1.961 1.818-0.473 0.767-0.71 1.643-0.71 2.628v13.807h-3.352zm25.739-21.818v2.841h-11.307v-2.841h11.307zm-8.012-5.227h3.352v20.795c0 0.947 0.138 1.657 0.412 2.131 0.285 0.464 0.644 0.776 1.08 0.937 0.445 0.152 0.914 0.227 1.406 0.227 0.37 0 0.673-0.018 0.909-0.056 0.237-0.048 0.426-0.086 0.568-0.114l0.682 3.011c-0.227 0.086-0.544 0.171-0.951 0.256-0.408 0.095-0.924 0.142-1.549 0.142-0.947 0-1.875-0.204-2.784-0.611-0.899-0.407-1.648-1.027-2.244-1.861-0.587-0.833-0.881-1.884-0.881-3.153v-21.704zm21.968 27.5c-2.103 0-3.916-0.464-5.441-1.393-1.515-0.937-2.684-2.244-3.508-3.92-0.815-1.686-1.222-3.646-1.222-5.881 0-2.234 0.407-4.204 1.222-5.909 0.824-1.714 1.969-3.049 3.437-4.005 1.477-0.966 3.201-1.449 5.171-1.449 1.136 0 2.258 0.189 3.366 0.568s2.117 0.994 3.026 1.846c0.909 0.843 1.633 1.961 2.173 3.353s0.81 3.106 0.81 5.142v1.42h-16.819v-2.897h13.41c0-1.232-0.247-2.33-0.739-3.296-0.483-0.966-1.174-1.728-2.074-2.287-0.89-0.559-1.941-0.838-3.153-0.838-1.336 0-2.491 0.332-3.466 0.994-0.966 0.654-1.71 1.506-2.23 2.557-0.521 1.051-0.782 2.178-0.782 3.381v1.932c0 1.647 0.284 3.044 0.853 4.19 0.577 1.136 1.377 2.003 2.4 2.599 1.023 0.588 2.211 0.881 3.566 0.881 0.88 0 1.676-0.123 2.386-0.369 0.72-0.256 1.34-0.635 1.861-1.136 0.521-0.512 0.923-1.146 1.207-1.904l3.239 0.909c-0.341 1.099-0.914 2.065-1.719 2.898-0.805 0.824-1.799 1.468-2.983 1.932-1.184 0.454-2.514 0.682-3.991 0.682zm14.133-0.455v-21.818h3.239v3.295h0.227c0.398-1.079 1.117-1.955 2.159-2.628 1.042-0.672 2.216-1.008 3.523-1.008 0.246 0 0.554 5e-3 0.923 0.014 0.369 0.01 0.649 0.024 0.838 0.043v3.409c-0.113-0.029-0.374-0.071-0.781-0.128-0.398-0.066-0.819-0.099-1.264-0.099-1.061 0-2.008 0.222-2.841 0.667-0.824 0.436-1.477 1.042-1.96 1.818-0.474 0.767-0.711 1.643-0.711 2.628v13.807h-3.352zm34.997 0.455c-1.97 0-3.698-0.469-5.185-1.407-1.477-0.937-2.633-2.249-3.466-3.934-0.824-1.686-1.236-3.656-1.236-5.909 0-2.273 0.412-4.257 1.236-5.952 0.833-1.695 1.989-3.012 3.466-3.949 1.487-0.938 3.215-1.406 5.185-1.406 1.969 0 3.693 0.468 5.17 1.406 1.487 0.937 2.642 2.254 3.466 3.949 0.833 1.695 1.25 3.679 1.25 5.952 0 2.253-0.417 4.223-1.25 5.909-0.824 1.685-1.979 2.997-3.466 3.934-1.477 0.938-3.201 1.407-5.17 1.407zm0-3.012c1.496 0 2.727-0.383 3.693-1.15s1.681-1.776 2.145-3.026 0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.966-0.777-2.197-1.165-3.693-1.165-1.497 0-2.728 0.388-3.694 1.165-0.966 0.776-1.681 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.179 2.259 2.145 3.026 2.197 1.15 3.694 1.15zm18.355-10.568v13.125h-3.352v-21.818h3.239v3.409h0.284c0.511-1.108 1.288-1.998 2.329-2.671 1.042-0.681 2.387-1.022 4.034-1.022 1.478 0 2.77 0.303 3.878 0.909 1.108 0.596 1.97 1.505 2.585 2.727 0.616 1.212 0.924 2.746 0.924 4.602v13.864h-3.352v-13.636c0-1.714-0.446-3.05-1.336-4.006-0.89-0.966-2.111-1.449-3.664-1.449-1.071 0-2.027 0.232-2.87 0.696-0.833 0.464-1.491 1.141-1.974 2.031-0.483 0.891-0.725 1.97-0.725 3.239z" fill="#1A1A1A"/><circle cx="701" cy="280" r="10" fill="#DEDEDE" tb:tag="overload"/><path d="m747.07 280.46c0 3.068-0.554 5.719-1.662 7.954s-2.628 3.958-4.559 5.171c-1.932 1.212-4.139 1.818-6.62 1.818s-4.687-0.606-6.619-1.818c-1.932-1.213-3.452-2.936-4.56-5.171s-1.662-4.886-1.662-7.954c0-3.069 0.554-5.72 1.662-7.955s2.628-3.958 4.56-5.17c1.932-1.213 4.138-1.819 6.619-1.819s4.688 0.606 6.62 1.819c1.931 1.212 3.451 2.935 4.559 5.17s1.662 4.886 1.662 7.955zm-3.409 0c0-2.519-0.421-4.645-1.264-6.378-0.833-1.733-1.965-3.045-3.395-3.935-1.42-0.89-3.011-1.335-4.773-1.335-1.761 0-3.357 0.445-4.787 1.335-1.42 0.89-2.552 2.202-3.395 3.935-0.833 1.733-1.25 3.859-1.25 6.378 0 2.518 0.417 4.644 1.25 6.377 0.843 1.733 1.975 3.045 3.395 3.935 1.43 0.89 3.026 1.335 4.787 1.335 1.762 0 3.353-0.445 4.773-1.335 1.43-0.89 2.562-2.202 3.395-3.935 0.843-1.733 1.264-3.859 1.264-6.377zm26.719-7.273-8.068 21.818h-3.409l-8.069-21.818h3.637l6.022 17.386h0.228l6.022-17.386h3.637zm12.791 22.273c-2.102 0-3.916-0.464-5.44-1.393-1.515-0.937-2.685-2.244-3.509-3.92-0.814-1.686-1.221-3.646-1.221-5.881 0-2.234 0.407-4.204 1.221-5.909 0.824-1.714 1.97-3.049 3.438-4.005 1.477-0.966 3.2-1.449 5.17-1.449 1.136 0 2.259 0.189 3.367 0.568s2.116 0.994 3.025 1.846c0.909 0.843 1.634 1.961 2.173 3.353 0.54 1.392 0.81 3.106 0.81 5.142v1.42h-16.818v-2.897h13.409c0-1.232-0.246-2.33-0.739-3.296-0.483-0.966-1.174-1.728-2.073-2.287-0.891-0.559-1.942-0.838-3.154-0.838-1.335 0-2.49 0.332-3.466 0.994-0.966 0.654-1.709 1.506-2.23 2.557s-0.781 2.178-0.781 3.381v1.932c0 1.647 0.284 3.044 0.852 4.19 0.578 1.136 1.378 2.003 2.401 2.599 1.022 0.588 2.211 0.881 3.565 0.881 0.881 0 1.676-0.123 2.386-0.369 0.72-0.256 1.34-0.635 1.861-1.136 0.521-0.512 0.923-1.146 1.208-1.904l3.238 0.909c-0.341 1.099-0.914 2.065-1.719 2.898-0.804 0.824-1.799 1.468-2.982 1.932-1.184 0.454-2.515 0.682-3.992 0.682zm14.134-0.455v-21.818h3.238v3.295h0.227c0.398-1.079 1.118-1.955 2.16-2.628 1.041-0.672 2.215-1.008 3.522-1.008 0.246 0 0.554 5e-3 0.924 0.014 0.369 0.01 0.648 0.024 0.838 0.043v3.409c-0.114-0.029-0.374-0.071-0.782-0.128-0.397-0.066-0.819-0.099-1.264-0.099-1.06 0-2.007 0.222-2.841 0.667-0.824 0.436-1.477 1.042-1.96 1.818-0.473 0.767-0.71 1.643-0.71 2.628v13.807h-3.352zm18.235-29.091v29.091h-3.353v-29.091h3.353zm15.003 29.546c-1.97 0-3.698-0.469-5.184-1.407-1.478-0.937-2.633-2.249-3.466-3.934-0.824-1.686-1.236-3.656-1.236-5.909 0-2.273 0.412-4.257 1.236-5.952 0.833-1.695 1.988-3.012 3.466-3.949 1.486-0.938 3.214-1.406 5.184-1.406s3.693 0.468 5.171 1.406c1.486 0.937 2.642 2.254 3.466 3.949 0.833 1.695 1.25 3.679 1.25 5.952 0 2.253-0.417 4.223-1.25 5.909-0.824 1.685-1.98 2.997-3.466 3.934-1.478 0.938-3.201 1.407-5.171 1.407zm0-3.012c1.496 0 2.727-0.383 3.693-1.15s1.681-1.776 2.145-3.026 0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.966-0.777-2.197-1.165-3.693-1.165s-2.727 0.388-3.693 1.165c-0.966 0.776-1.681 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.179 2.259 2.145 3.026 2.197 1.15 3.693 1.15zm21.424 3.068c-1.382 0-2.637-0.26-3.764-0.781-1.127-0.53-2.022-1.292-2.685-2.287-0.663-1.004-0.994-2.216-0.994-3.636 0-1.25 0.246-2.263 0.739-3.04 0.492-0.786 1.15-1.401 1.974-1.847 0.824-0.445 1.733-0.776 2.727-0.994 1.004-0.227 2.013-0.407 3.026-0.54 1.326-0.17 2.4-0.298 3.224-0.383 0.834-0.095 1.44-0.251 1.819-0.469 0.388-0.218 0.582-0.597 0.582-1.136v-0.114c0-1.401-0.384-2.49-1.151-3.267-0.757-0.776-1.908-1.165-3.451-1.165-1.601 0-2.855 0.351-3.765 1.051-0.909 0.701-1.548 1.449-1.917 2.245l-3.182-1.137c0.568-1.325 1.326-2.358 2.273-3.096 0.956-0.748 1.998-1.269 3.125-1.563 1.136-0.303 2.254-0.454 3.352-0.454 0.701 0 1.506 0.085 2.415 0.255 0.918 0.161 1.804 0.498 2.656 1.009 0.862 0.511 1.577 1.283 2.145 2.315s0.852 2.415 0.852 4.148v14.375h-3.352v-2.955h-0.171c-0.227 0.474-0.606 0.981-1.136 1.52-0.53 0.54-1.236 0.999-2.116 1.378-0.881 0.379-1.956 0.568-3.225 0.568zm0.512-3.011c1.325 0 2.443-0.26 3.352-0.781 0.918-0.521 1.61-1.193 2.074-2.017 0.473-0.824 0.71-1.691 0.71-2.6v-3.068c-0.142 0.171-0.455 0.327-0.938 0.469-0.473 0.132-1.022 0.251-1.647 0.355-0.616 0.095-1.217 0.18-1.804 0.256-0.578 0.066-1.047 0.123-1.407 0.17-0.871 0.114-1.685 0.298-2.443 0.554-0.748 0.246-1.354 0.62-1.818 1.122-0.454 0.493-0.682 1.165-0.682 2.017 0 1.165 0.431 2.046 1.293 2.642 0.871 0.587 1.974 0.881 3.31 0.881zm23.845 2.955c-1.818 0-3.423-0.46-4.815-1.378-1.392-0.928-2.481-2.235-3.267-3.921-0.786-1.695-1.179-3.698-1.179-6.008 0-2.292 0.393-4.281 1.179-5.966 0.786-1.686 1.88-2.988 3.281-3.906 1.402-0.919 3.021-1.378 4.858-1.378 1.421 0 2.543 0.236 3.367 0.71 0.833 0.464 1.468 0.994 1.903 1.591 0.445 0.587 0.791 1.07 1.037 1.449h0.284v-10.739h3.352v29.091h-3.238v-3.352h-0.398c-0.246 0.397-0.597 0.899-1.051 1.505-0.455 0.597-1.103 1.132-1.946 1.606-0.843 0.464-1.965 0.696-3.367 0.696zm0.455-3.012c1.345 0 2.481-0.35 3.409-1.051 0.928-0.71 1.634-1.69 2.117-2.94 0.483-1.26 0.724-2.713 0.724-4.361 0-1.629-0.237-3.054-0.71-4.276-0.474-1.231-1.174-2.187-2.103-2.869-0.928-0.691-2.073-1.037-3.437-1.037-1.42 0-2.604 0.365-3.551 1.094-0.938 0.72-1.643 1.7-2.117 2.94-0.464 1.231-0.696 2.614-0.696 4.148 0 1.553 0.237 2.964 0.711 4.233 0.483 1.259 1.193 2.263 2.13 3.011 0.947 0.739 2.121 1.108 3.523 1.108z" fill="#1A1A1A"/><circle cx="701" cy="348" r="10" fill="#DEDEDE" tb:tag="lowBattery"/><path d="m722.52 363v-29.091h3.522v25.966h13.523v3.125h-17.045zm30.909 0.455c-1.97 0-3.698-0.469-5.185-1.407-1.477-0.937-2.632-2.249-3.466-3.934-0.824-1.686-1.236-3.656-1.236-5.909 0-2.273 0.412-4.257 1.236-5.952 0.834-1.695 1.989-3.012 3.466-3.949 1.487-0.938 3.215-1.406 5.185-1.406s3.693 0.468 5.17 1.406c1.487 0.937 2.642 2.254 3.466 3.949 0.834 1.695 1.25 3.679 1.25 5.952 0 2.253-0.416 4.223-1.25 5.909-0.824 1.685-1.979 2.997-3.466 3.934-1.477 0.938-3.2 1.407-5.17 1.407zm0-3.012c1.496 0 2.727-0.383 3.693-1.15s1.681-1.776 2.145-3.026 0.696-2.604 0.696-4.062c0-1.459-0.232-2.818-0.696-4.077-0.464-1.26-1.179-2.278-2.145-3.054-0.966-0.777-2.197-1.165-3.693-1.165s-2.727 0.388-3.693 1.165c-0.966 0.776-1.681 1.794-2.145 3.054-0.464 1.259-0.696 2.618-0.696 4.077 0 1.458 0.232 2.812 0.696 4.062s1.179 2.259 2.145 3.026 2.197 1.15 3.693 1.15zm19.204 2.557-6.647-21.818h3.522l4.716 16.704h0.228l4.659-16.704h3.579l4.602 16.648h0.228l4.716-16.648h3.522l-6.647 21.818h-3.296l-4.773-16.761h-0.34l-4.773 16.761h-3.296zm39.262 0v-29.091h3.352v10.739h0.284c0.246-0.379 0.587-0.862 1.023-1.449 0.445-0.597 1.079-1.127 1.903-1.591 0.834-0.474 1.96-0.71 3.381-0.71 1.837 0 3.456 0.459 4.858 1.378 1.401 0.918 2.495 2.22 3.281 3.906 0.786 1.685 1.179 3.674 1.179 5.966 0 2.31-0.393 4.313-1.179 6.008-0.786 1.686-1.875 2.993-3.267 3.921-1.392 0.918-2.997 1.378-4.815 1.378-1.402 0-2.524-0.232-3.367-0.696-0.843-0.474-1.491-1.009-1.946-1.606-0.454-0.606-0.805-1.108-1.051-1.505h-0.398v3.352h-3.238zm3.295-10.909c0 1.648 0.242 3.101 0.725 4.361 0.483 1.25 1.188 2.23 2.116 2.94 0.928 0.701 2.064 1.051 3.409 1.051 1.402 0 2.571-0.369 3.509-1.108 0.947-0.748 1.657-1.752 2.13-3.011 0.483-1.269 0.725-2.68 0.725-4.233 0-1.534-0.237-2.917-0.71-4.148-0.464-1.24-1.17-2.22-2.117-2.94-0.937-0.729-2.116-1.094-3.537-1.094-1.363 0-2.509 0.346-3.437 1.037-0.928 0.682-1.629 1.638-2.103 2.869-0.473 1.222-0.71 2.647-0.71 4.276zm27.514 11.42c-1.382 0-2.637-0.26-3.764-0.781-1.127-0.53-2.022-1.292-2.684-2.287-0.663-1.004-0.995-2.216-0.995-3.636 0-1.25 0.246-2.263 0.739-3.04 0.492-0.786 1.15-1.401 1.974-1.847 0.824-0.445 1.733-0.776 2.728-0.994 1.003-0.227 2.012-0.407 3.025-0.54 1.326-0.17 2.401-0.298 3.225-0.383 0.833-0.095 1.439-0.251 1.818-0.469 0.388-0.218 0.582-0.597 0.582-1.136v-0.114c0-1.401-0.383-2.49-1.15-3.267-0.758-0.776-1.909-1.165-3.452-1.165-1.601 0-2.855 0.351-3.764 1.051-0.909 0.701-1.549 1.449-1.918 2.245l-3.182-1.137c0.568-1.325 1.326-2.358 2.273-3.096 0.956-0.748 1.998-1.269 3.125-1.563 1.136-0.303 2.254-0.454 3.352-0.454 0.701 0 1.506 0.085 2.415 0.255 0.919 0.161 1.804 0.498 2.656 1.009 0.862 0.511 1.577 1.283 2.145 2.315s0.852 2.415 0.852 4.148v14.375h-3.352v-2.955h-0.17c-0.228 0.474-0.606 0.981-1.137 1.52-0.53 0.54-1.235 0.999-2.116 1.378s-1.956 0.568-3.225 0.568zm0.512-3.011c1.326 0 2.443-0.26 3.352-0.781 0.919-0.521 1.61-1.193 2.074-2.017 0.473-0.824 0.71-1.691 0.71-2.6v-3.068c-0.142 0.171-0.454 0.327-0.937 0.469-0.474 0.132-1.023 0.251-1.648 0.355-0.616 0.095-1.217 0.18-1.804 0.256-0.578 0.066-1.046 0.123-1.406 0.17-0.872 0.114-1.686 0.298-2.444 0.554-0.748 0.246-1.354 0.62-1.818 1.122-0.454 0.493-0.682 1.165-0.682 2.017 0 1.165 0.431 2.046 1.293 2.642 0.871 0.587 1.975 0.881 3.31 0.881zm25.096-19.318v2.841h-11.307v-2.841h11.307zm-8.012-5.227h3.353v20.795c0 0.947 0.137 1.657 0.411 2.131 0.285 0.464 0.644 0.776 1.08 0.937 0.445 0.152 0.914 0.227 1.406 0.227 0.37 0 0.673-0.018 0.909-0.056 0.237-0.048 0.426-0.086 0.569-0.114l0.681 3.011c-0.227 0.086-0.544 0.171-0.951 0.256-0.408 0.095-0.924 0.142-1.549 0.142-0.947 0-1.875-0.204-2.784-0.611-0.899-0.407-1.647-1.027-2.244-1.861-0.587-0.833-0.881-1.884-0.881-3.153v-21.704zm22.543 5.227v2.841h-11.307v-2.841h11.307zm-8.011-5.227h3.352v20.795c0 0.947 0.137 1.657 0.412 2.131 0.284 0.464 0.644 0.776 1.079 0.937 0.445 0.152 0.914 0.227 1.407 0.227 0.369 0 0.672-0.018 0.909-0.056 0.236-0.048 0.426-0.086 0.568-0.114l0.682 3.011c-0.228 0.086-0.545 0.171-0.952 0.256-0.407 0.095-0.923 0.142-1.548 0.142-0.947 0-1.875-0.204-2.784-0.611-0.9-0.407-1.648-1.027-2.245-1.861-0.587-0.833-0.88-1.884-0.88-3.153v-21.704zm21.967 27.5c-2.102 0-3.916-0.464-5.44-1.393-1.516-0.937-2.685-2.244-3.509-3.92-0.814-1.686-1.222-3.646-1.222-5.881 0-2.234 0.408-4.204 1.222-5.909 0.824-1.714 1.97-3.049 3.437-4.005 1.478-0.966 3.201-1.449 5.171-1.449 1.136 0 2.258 0.189 3.366 0.568s2.117 0.994 3.026 1.846c0.909 0.843 1.634 1.961 2.173 3.353 0.54 1.392 0.81 3.106 0.81 5.142v1.42h-16.818v-2.897h13.409c0-1.232-0.246-2.33-0.739-3.296-0.483-0.966-1.174-1.728-2.074-2.287-0.89-0.559-1.941-0.838-3.153-0.838-1.335 0-2.491 0.332-3.466 0.994-0.966 0.654-1.709 1.506-2.23 2.557s-0.781 2.178-0.781 3.381v1.932c0 1.647 0.284 3.044 0.852 4.19 0.578 1.136 1.378 2.003 2.401 2.599 1.022 0.588 2.211 0.881 3.565 0.881 0.881 0 1.676-0.123 2.386-0.369 0.72-0.256 1.34-0.635 1.861-1.136 0.521-0.512 0.923-1.146 1.207-1.904l3.239 0.909c-0.341 1.099-0.914 2.065-1.719 2.898-0.805 0.824-1.799 1.468-2.983 1.932-1.183 0.454-2.514 0.682-3.991 0.682zm14.133-0.455v-21.818h3.239v3.295h0.227c0.398-1.079 1.118-1.955 2.159-2.628 1.042-0.672 2.216-1.008 3.523-1.008 0.246 0 0.554 5e-3 0.923 0.014 0.37 0.01 0.649 0.024 0.838 0.043v3.409c-0.113-0.029-0.374-0.071-0.781-0.128-0.398-0.066-0.819-0.099-1.264-0.099-1.061 0-2.008 0.222-2.841 0.667-0.824 0.436-1.477 1.042-1.96 1.818-0.474 0.767-0.71 1.643-0.71 2.628v13.807h-3.353zm17.706 8.182c-0.568 0-1.074-0.048-1.52-0.142-0.445-0.085-0.752-0.171-0.923-0.256l0.852-2.954c0.815 0.208 1.535 0.284 2.16 0.227s1.178-0.336 1.661-0.838c0.493-0.493 0.943-1.293 1.35-2.401l0.625-1.704-8.068-21.932h3.636l6.023 17.386h0.227l6.023-17.386h3.636l-9.261 25c-0.417 1.127-0.933 2.059-1.549 2.798-0.615 0.748-1.33 1.302-2.144 1.662-0.805 0.36-1.714 0.54-2.728 0.54z" fill="#1A1A1A"/><circle cx="701" cy="416" r="10" fill="#DEDEDE" tb:tag="temperature"/><path d="m720.93 405.03v-3.125h21.818v3.125h-9.148v25.966h-3.522v-25.966h-9.148zm32.784 26.421c-2.102 0-3.916-0.464-5.44-1.393-1.516-0.937-2.685-2.244-3.509-3.92-0.814-1.686-1.222-3.646-1.222-5.881 0-2.234 0.408-4.204 1.222-5.909 0.824-1.714 1.97-3.049 3.438-4.005 1.477-0.966 3.2-1.449 5.17-1.449 1.136 0 2.259 0.189 3.366 0.568 1.108 0.379 2.117 0.994 3.026 1.846 0.909 0.843 1.634 1.961 2.173 3.353 0.54 1.392 0.81 3.106 0.81 5.142v1.42h-16.818v-2.897h13.409c0-1.232-0.246-2.33-0.739-3.296-0.483-0.966-1.174-1.728-2.074-2.287-0.89-0.559-1.941-0.838-3.153-0.838-1.335 0-2.491 0.332-3.466 0.994-0.966 0.654-1.709 1.506-2.23 2.557s-0.781 2.178-0.781 3.381v1.932c0 1.647 0.284 3.044 0.852 4.19 0.578 1.136 1.378 2.003 2.401 2.599 1.022 0.588 2.211 0.881 3.565 0.881 0.881 0 1.676-0.123 2.386-0.369 0.72-0.256 1.34-0.635 1.861-1.136 0.521-0.512 0.923-1.146 1.207-1.904l3.239 0.909c-0.341 1.099-0.914 2.065-1.719 2.898-0.805 0.824-1.799 1.468-2.983 1.932-1.183 0.454-2.514 0.682-3.991 0.682zm14.133-0.455v-21.818h3.239v3.409h0.284c0.455-1.165 1.189-2.069 2.202-2.713 1.013-0.654 2.23-0.98 3.65-0.98 1.44 0 2.638 0.326 3.594 0.98 0.966 0.644 1.719 1.548 2.259 2.713h0.227c0.559-1.127 1.397-2.022 2.514-2.685 1.118-0.672 2.458-1.008 4.02-1.008 1.951 0 3.546 0.611 4.787 1.832 1.241 1.212 1.861 3.101 1.861 5.668v14.602h-3.352v-14.602c0-1.61-0.441-2.761-1.322-3.452-0.88-0.691-1.917-1.037-3.11-1.037-1.534 0-2.723 0.464-3.566 1.392-0.842 0.919-1.264 2.083-1.264 3.494v14.205h-3.409v-14.943c0-1.241-0.402-2.24-1.207-2.997-0.805-0.767-1.842-1.151-3.111-1.151-0.871 0-1.686 0.232-2.443 0.696-0.748 0.464-1.354 1.108-1.818 1.932-0.455 0.814-0.682 1.757-0.682 2.827v13.636h-3.353zm34.766 8.182v-30h3.239v3.466h0.397c0.247-0.379 0.588-0.862 1.023-1.449 0.445-0.597 1.08-1.127 1.904-1.591 0.833-0.474 1.96-0.71 3.38-0.71 1.837 0 3.457 0.459 4.858 1.378 1.402 0.918 2.495 2.22 3.281 3.906 0.786 1.685 1.179 3.674 1.179 5.966 0 2.31-0.393 4.313-1.179 6.008-0.786 1.686-1.875 2.993-3.267 3.921-1.392 0.918-2.997 1.378-4.815 1.378-1.401 0-2.524-0.232-3.366-0.696-0.843-0.474-1.492-1.009-1.946-1.606-0.455-0.606-0.805-1.108-1.052-1.505h-0.284v11.534h-3.352zm3.296-19.091c0 1.648 0.241 3.101 0.724 4.361 0.483 1.25 1.188 2.23 2.116 2.94 0.928 0.701 2.065 1.051 3.41 1.051 1.401 0 2.571-0.369 3.508-1.108 0.947-0.748 1.657-1.752 2.131-3.011 0.483-1.269 0.724-2.68 0.724-4.233 0-1.534-0.237-2.917-0.71-4.148-0.464-1.24-1.17-2.22-2.117-2.94-0.937-0.729-2.116-1.094-3.536-1.094-1.364 0-2.51 0.346-3.438 1.037-0.928 0.682-1.629 1.638-2.102 2.869-0.474 1.222-0.71 2.647-0.71 4.276zm30.227 11.364c-2.102 0-3.916-0.464-5.441-1.393-1.515-0.937-2.684-2.244-3.508-3.92-0.814-1.686-1.222-3.646-1.222-5.881 0-2.234 0.408-4.204 1.222-5.909 0.824-1.714 1.97-3.049 3.437-4.005 1.478-0.966 3.201-1.449 5.171-1.449 1.136 0 2.258 0.189 3.366 0.568s2.117 0.994 3.026 1.846c0.909 0.843 1.633 1.961 2.173 3.353s0.81 3.106 0.81 5.142v1.42h-16.818v-2.897h13.409c0-1.232-0.246-2.33-0.739-3.296-0.483-0.966-1.174-1.728-2.074-2.287-0.89-0.559-1.941-0.838-3.153-0.838-1.335 0-2.491 0.332-3.466 0.994-0.966 0.654-1.709 1.506-2.23 2.557s-0.781 2.178-0.781 3.381v1.932c0 1.647 0.284 3.044 0.852 4.19 0.578 1.136 1.378 2.003 2.4 2.599 1.023 0.588 2.212 0.881 3.566 0.881 0.88 0 1.676-0.123 2.386-0.369 0.72-0.256 1.34-0.635 1.861-1.136 0.521-0.512 0.923-1.146 1.207-1.904l3.239 0.909c-0.341 1.099-0.914 2.065-1.719 2.898-0.805 0.824-1.799 1.468-2.983 1.932-1.183 0.454-2.514 0.682-3.991 0.682zm14.133-0.455v-21.818h3.239v3.295h0.227c0.398-1.079 1.118-1.955 2.159-2.628 1.042-0.672 2.216-1.008 3.523-1.008 0.246 0 0.554 5e-3 0.923 0.014 0.37 0.01 0.649 0.024 0.838 0.043v3.409c-0.113-0.029-0.374-0.071-0.781-0.128-0.398-0.066-0.819-0.099-1.264-0.099-1.061 0-2.008 0.222-2.841 0.667-0.824 0.436-1.477 1.042-1.96 1.818-0.474 0.767-0.71 1.643-0.71 2.628v13.807h-3.353zm21.304 0.511c-1.383 0-2.638-0.26-3.765-0.781-1.127-0.53-2.021-1.292-2.684-2.287-0.663-1.004-0.995-2.216-0.995-3.636 0-1.25 0.247-2.263 0.739-3.04 0.492-0.786 1.151-1.401 1.974-1.847 0.824-0.445 1.733-0.776 2.728-0.994 1.004-0.227 2.012-0.407 3.025-0.54 1.326-0.17 2.401-0.298 3.225-0.383 0.833-0.095 1.439-0.251 1.818-0.469 0.388-0.218 0.582-0.597 0.582-1.136v-0.114c0-1.401-0.383-2.49-1.15-3.267-0.758-0.776-1.908-1.165-3.452-1.165-1.6 0-2.855 0.351-3.764 1.051-0.909 0.701-1.548 1.449-1.918 2.245l-3.182-1.137c0.569-1.325 1.326-2.358 2.273-3.096 0.957-0.748 1.998-1.269 3.125-1.563 1.136-0.303 2.254-0.454 3.352-0.454 0.701 0 1.506 0.085 2.415 0.255 0.919 0.161 1.804 0.498 2.656 1.009 0.862 0.511 1.577 1.283 2.145 2.315s0.853 2.415 0.853 4.148v14.375h-3.353v-2.955h-0.17c-0.227 0.474-0.606 0.981-1.137 1.52-0.53 0.54-1.235 0.999-2.116 1.378s-1.955 0.568-3.224 0.568zm0.511-3.011c1.326 0 2.443-0.26 3.352-0.781 0.919-0.521 1.61-1.193 2.074-2.017 0.474-0.824 0.71-1.691 0.71-2.6v-3.068c-0.142 0.171-0.454 0.327-0.937 0.469-0.474 0.132-1.023 0.251-1.648 0.355-0.615 0.095-1.217 0.18-1.804 0.256-0.578 0.066-1.046 0.123-1.406 0.17-0.871 0.114-1.686 0.298-2.443 0.554-0.748 0.246-1.355 0.62-1.819 1.122-0.454 0.493-0.681 1.165-0.681 2.017 0 1.165 0.431 2.046 1.292 2.642 0.871 0.587 1.975 0.881 3.31 0.881zm25.096-19.318v2.841h-11.307v-2.841h11.307zm-8.012-5.227h3.353v20.795c0 0.947 0.137 1.657 0.412 2.131 0.284 0.464 0.644 0.776 1.079 0.937 0.445 0.152 0.914 0.227 1.406 0.227 0.37 0 0.673-0.018 0.91-0.056 0.236-0.048 0.426-0.086 0.568-0.114l0.682 3.011c-0.228 0.086-0.545 0.171-0.952 0.256-0.407 0.095-0.923 0.142-1.548 0.142-0.947 0-1.875-0.204-2.785-0.611-0.899-0.407-1.647-1.027-2.244-1.861-0.587-0.833-0.881-1.884-0.881-3.153v-21.704zm26.804 18.125v-12.898h3.353v21.818h-3.353v-3.693h-0.227c-0.511 1.108-1.307 2.05-2.386 2.827-1.08 0.767-2.443 1.15-4.091 1.15-1.364 0-2.576-0.298-3.636-0.895-1.061-0.606-1.894-1.515-2.5-2.727-0.607-1.222-0.91-2.76-0.91-4.617v-13.863h3.353v13.636c0 1.591 0.445 2.86 1.335 3.807 0.9 0.947 2.045 1.42 3.437 1.42 0.834 0 1.681-0.213 2.543-0.639 0.871-0.426 1.6-1.079 2.188-1.96 0.596-0.881 0.894-2.003 0.894-3.366zm9.493 8.92v-21.818h3.238v3.295h0.228c0.397-1.079 1.117-1.955 2.159-2.628 1.041-0.672 2.216-1.008 3.522-1.008 0.247 0 0.554 5e-3 0.924 0.014 0.369 0.01 0.648 0.024 0.838 0.043v3.409c-0.114-0.029-0.374-0.071-0.782-0.128-0.397-0.066-0.819-0.099-1.264-0.099-1.06 0-2.007 0.222-2.841 0.667-0.824 0.436-1.477 1.042-1.96 1.818-0.473 0.767-0.71 1.643-0.71 2.628v13.807h-3.352zm23.366 0.455c-2.102 0-3.916-0.464-5.44-1.393-1.515-0.937-2.685-2.244-3.509-3.92-0.814-1.686-1.221-3.646-1.221-5.881 0-2.234 0.407-4.204 1.221-5.909 0.824-1.714 1.97-3.049 3.438-4.005 1.477-0.966 3.2-1.449 5.17-1.449 1.137 0 2.259 0.189 3.367 0.568s2.116 0.994 3.025 1.846c0.909 0.843 1.634 1.961 2.174 3.353 0.539 1.392 0.809 3.106 0.809 5.142v1.42h-16.818v-2.897h13.409c0-1.232-0.246-2.33-0.739-3.296-0.482-0.966-1.174-1.728-2.073-2.287-0.891-0.559-1.942-0.838-3.154-0.838-1.335 0-2.49 0.332-3.466 0.994-0.966 0.654-1.709 1.506-2.23 2.557s-0.781 2.178-0.781 3.381v1.932c0 1.647 0.284 3.044 0.852 4.19 0.578 1.136 1.378 2.003 2.401 2.599 1.022 0.588 2.211 0.881 3.565 0.881 0.881 0 1.676-0.123 2.386-0.369 0.72-0.256 1.34-0.635 1.861-1.136 0.521-0.512 0.924-1.146 1.208-1.904l3.238 0.909c-0.341 1.099-0.914 2.065-1.718 2.898-0.805 0.824-1.8 1.468-2.983 1.932-1.184 0.454-2.515 0.682-3.992 0.682z" fill="#1A1A1A"/><path d="m403.58 0s-403.58 0-403.58 100.5v492.54c0 3.9768 10.745 6.9604 24 6.9604h1152c13.254 0 24-2.9838 24-6.9604v-492.54c0-100.5-396.42-100.5-396.42-100.5h-203.58zm402.42 121.8c-7.7322 0-13.999 1.8804-13.999 4.2v450.6c0 2.3196 6.2682 4.2 13.999 4.2h87.996c7.7322 0 13.999-1.8804 13.999-4.2v-450.6c0-2.3196-6.2682-4.2-13.999-4.2z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/large-vertical-separator-connector-hp.svg b/application/src/main/data/json/system/scada_symbols/large-vertical-separator-connector-hp.svg
new file mode 100644
index 0000000000..df463b12a4
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/large-vertical-separator-connector-hp.svg
@@ -0,0 +1,350 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="1000" fill="none" version="1.1" viewBox="0 0 600 1000"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Large vertical separator with connector",
+  "description": "Large vertical separator with connector with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 5,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<path d="m1 744c0 44.821 7.8e-4 78.376 2.1766 105.01 2.1748 26.619 6.5177 46.23 15.153 63.178 15.244 29.918 39.568 54.242 69.486 69.486 16.948 8.636 36.56 12.979 63.178 15.153 26.63 2.176 60.185 2.177 105.01 2.177h8c44.821 0 78.376-1e-3 105.01-2.177 26.619-2.174 46.23-6.517 63.178-15.153 29.918-15.244 54.242-39.568 69.486-69.486 8.636-16.948 12.979-36.559 15.153-63.178 2.176-26.63 2.177-60.185 2.177-105.01v-388c0-44.821-1e-3 -78.376-2.177-105.01-2.174-26.619-6.517-46.23-15.153-63.179-15.244-29.917-39.568-54.241-69.486-69.485-16.948-8.636-36.559-12.979-63.178-15.153-26.63-2.176-60.185-2.177-105.01-2.177h-8c-44.821 0-78.376 1e-3 -105.01 2.177-26.619 2.174-46.23 6.517-63.178 15.153-29.918 15.244-54.242 39.568-69.486 69.485-8.6357 16.949-12.979 36.56-15.153 63.179-2.1758 26.63-2.1766 60.185-2.1766 105.01v388z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m600 700h-10c-16.569 0-30-13.431-30-30v-637c0-16.569-13.431-30-30-30h-240c-16.569 0-30 13.432-30 30v67" stroke="#1A1A1A" stroke-width="6"/><path d="m201.92 0s-201.79 0-201.79 167.5v820.9c0 6.628 5.3727 11.601 12 11.601h576c6.627 0 12-4.973 12-11.601v-820.9c0-167.5-198.21-167.5-198.21-167.5h-101.79zm201.21 203c-3.8661 0-6.9996 3.134-6.9996 7v751c0 3.866 3.1341 7 6.9996 7h43.998c3.8661 0 6.9996-3.134 6.9996-7v-751c0-3.866-3.1341-7-6.9996-7z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,916)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 916)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/large-vertical-separator-hp.svg b/application/src/main/data/json/system/scada_symbols/large-vertical-separator-hp.svg
new file mode 100644
index 0000000000..99ff420530
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/large-vertical-separator-hp.svg
@@ -0,0 +1,350 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="1000" fill="none" version="1.1" viewBox="0 0 600 1000"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Large vertical separator",
+  "description": "Large vertical separator with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 5,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="598" height="998" rx="159" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m201.79 0s-201.79 0-201.79 167.5v820.9c0 6.628 5.3727 11.601 12 11.601h576c6.627 0 12-4.973 12-11.601v-820.9c0-167.5-198.21-167.5-198.21-167.5h-101.79zm201.21 203c-3.8661 0-6.9996 3.134-6.9996 7v751c0 3.866 3.1341 7 6.9996 7h43.998c3.8661 0 6.9996-3.134 6.9996-7v-751c0-3.866-3.1341-7-6.9996-7z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,916)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 916)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/leak-sensor.svg b/application/src/main/data/json/system/scada_symbols/leak-sensor.svg
index e2859ea90c..0fce8be608 100644
--- a/application/src/main/data/json/system/scada_symbols/leak-sensor.svg
+++ b/application/src/main/data/json/system/scada_symbols/leak-sensor.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="100" height="100" fill="none" version="1.1" viewBox="0 0 100 100"><tb:metadata xmlns=""><![CDATA[{
   "title": "Leak sensor",
-  "description": "Leak sensor",
+  "description": "Leak sensor for real-time detection and warning of fluid leakage.",
   "searchTags": [
     "leak"
   ],
diff --git a/application/src/main/data/json/system/scada_symbols/left-analog-water-level-meter.svg b/application/src/main/data/json/system/scada_symbols/left-analog-water-level-meter.svg
index 18394d3d2c..2cdc9e587a 100644
--- a/application/src/main/data/json/system/scada_symbols/left-analog-water-level-meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/left-analog-water-level-meter.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200"><tb:metadata xmlns=""><![CDATA[{
   "title": "Left analog water level meter",
-  "description": "Left analog water level meter",
+  "description": "Left analog water level meter with real-time display of fluid levels.",
   "searchTags": [
     "water meter"
   ],
diff --git a/application/src/main/data/json/system/scada_symbols/left-drain-pipe.svg b/application/src/main/data/json/system/scada_symbols/left-drain-pipe.svg
index 326a263208..cb7bb26821 100644
--- a/application/src/main/data/json/system/scada_symbols/left-drain-pipe.svg
+++ b/application/src/main/data/json/system/scada_symbols/left-drain-pipe.svg
@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="200" fill="none" version="1.1" viewBox="0 0 400 200">
  <tb:metadata><![CDATA[{
   "title": "Left drain pipe",
-  "description": "Left drain pipe",
+  "description": "Left drain pipe with configurable fluid and leak visualizations.",
   "searchTags": [
     "pipe",
     "drain"
diff --git a/application/src/main/data/json/system/scada_symbols/left-elbow-drain-pipe.svg b/application/src/main/data/json/system/scada_symbols/left-elbow-drain-pipe.svg
index b9a6aa6057..085830c5e4 100644
--- a/application/src/main/data/json/system/scada_symbols/left-elbow-drain-pipe.svg
+++ b/application/src/main/data/json/system/scada_symbols/left-elbow-drain-pipe.svg
@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="200" fill="none" version="1.1" viewBox="0 0 400 200">
 <tb:metadata xmlns=""><![CDATA[{
   "title": "Left elbow drain pipe",
-  "description": "Left elbow drain pipe",
+  "description": "Left elbow drain pipe with configurable fluid and leak visualizations.",
   "searchTags": [
     "pipe",
     "drain"
diff --git a/application/src/main/data/json/system/scada_symbols/left-flow-meter.svg b/application/src/main/data/json/system/scada_symbols/left-flow-meter.svg
index 12ec888e66..1c29a79479 100644
--- a/application/src/main/data/json/system/scada_symbols/left-flow-meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/left-flow-meter.svg
@@ -57,7 +57,7 @@
     },
     {
       "tag": "value",
-      "stateRenderFunction": "var value = ctx.values.value;\nctx.api.text(element, value.toFixed(0));\n",
+      "stateRenderFunction": "var value = ctx.api.formatValue(ctx.values.value, ctx.properties.valueDecimals, '', false);\nctx.api.text(element, value);\n",
       "actions": {
         "click": {
           "actionFunction": "ctx.api.callAction(event, 'displayClick');"
@@ -463,16 +463,16 @@
       "name": "{i18n:scada.symbol.units}",
       "type": "units",
       "default": "m³/hr",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
+      "fieldClass": "medium-width"
+    },
+    {
+      "id": "valueDecimals",
+      "name": "{i18n:scada.symbol.decimals}",
+      "type": "number",
+      "default": 0,
       "fieldClass": "medium-width",
-      "min": null,
-      "max": null,
-      "step": null
+      "min": 0,
+      "step": 1
     },
     {
       "id": "defaultBorderColor",
@@ -510,17 +510,7 @@
           "rangeAdvanced": []
         },
         "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';"
-      },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      }
     },
     {
       "id": "activeBorderColor",
@@ -558,17 +548,7 @@
           "rangeAdvanced": []
         },
         "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';"
-      },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      }
     },
     {
       "id": "warningBorderColor",
@@ -606,17 +586,7 @@
           "rangeAdvanced": []
         },
         "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';"
-      },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      }
     },
     {
       "id": "criticalBorderColor",
@@ -654,17 +624,7 @@
           "rangeAdvanced": []
         },
         "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';"
-      },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      }
     },
     {
       "id": "backgroundColor",
@@ -702,49 +662,19 @@
           "rangeAdvanced": []
         },
         "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';"
-      },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      }
     },
     {
       "id": "fluidColor",
       "name": "{i18n:scada.symbol.fluid-color}",
       "type": "color",
-      "default": "#1EC1F480",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "default": "#1EC1F480"
     },
     {
       "id": "pipeColor",
       "name": "{i18n:scada.symbol.pipe-color}",
       "type": "color",
-      "default": "#FFFFFF",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "default": "#FFFFFF"
     }
   ]
 }]]></tb:metadata>
diff --git a/application/src/main/data/json/system/scada_symbols/long-bottom-filter.svg b/application/src/main/data/json/system/scada_symbols/long-bottom-filter.svg
index d9defd33d9..689851529d 100644
--- a/application/src/main/data/json/system/scada_symbols/long-bottom-filter.svg
+++ b/application/src/main/data/json/system/scada_symbols/long-bottom-filter.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="600" fill="none" version="1.1" viewBox="0 0 200 600">
 <tb:metadata xmlns=""><![CDATA[{
-  "title": "Long bottom filter",
+  "title": "Long bottom filter with configurable click actions for custom operations, dashboard manipulation, etc.",
   "description": "Long bottom filter",
   "searchTags": [
     "filter"
diff --git a/application/src/main/data/json/system/scada_symbols/long-horizontal-connector-hp.svg b/application/src/main/data/json/system/scada_symbols/long-horizontal-connector-hp.svg
index 4376bb2348..86bb07a520 100644
--- a/application/src/main/data/json/system/scada_symbols/long-horizontal-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/long-horizontal-connector-hp.svg
@@ -1,7 +1,7 @@
 <svg width="400" height="200" fill="none" version="1.1" viewBox="0 0 400 200" xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg">
  <tb:metadata><![CDATA[{
   "title": "HP Long horizontal connector",
-  "description": "Long horizontal connector",
+  "description": "Long horizontal connector with an optional directional arrow to visually indicate flow.",
   "widgetSizeX": 2,
   "widgetSizeY": 1,
   "tags": [
diff --git a/application/src/main/data/json/system/scada_symbols/long-top-filter.svg b/application/src/main/data/json/system/scada_symbols/long-top-filter.svg
index a63b679f0a..9b287cbe46 100644
--- a/application/src/main/data/json/system/scada_symbols/long-top-filter.svg
+++ b/application/src/main/data/json/system/scada_symbols/long-top-filter.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="600" fill="none" version="1.1" viewBox="0 0 200 600">
 <tb:metadata xmlns=""><![CDATA[{
-  "title": "Long top filter",
+  "title": "Long top filter with configurable click actions for custom operations, dashboard manipulation, etc.",
   "description": "Title\nLong top filter\n",
   "searchTags": [
     "filter"
diff --git a/application/src/main/data/json/system/scada_symbols/long-vertical-connector-hp.svg b/application/src/main/data/json/system/scada_symbols/long-vertical-connector-hp.svg
index 86235ff1c1..d7a0aa8aa7 100644
--- a/application/src/main/data/json/system/scada_symbols/long-vertical-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/long-vertical-connector-hp.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="400" fill="none" version="1.1" viewBox="0 0 200 400"><tb:metadata xmlns=""><![CDATA[{
   "title": "HP Long vertical connector",
-  "description": "Long vertical connector",
+  "description": "Long vertical connector with an optional directional arrow to visually indicate flow.",
   "widgetSizeX": 1,
   "widgetSizeY": 2,
   "tags": [
diff --git a/application/src/main/data/json/system/scada_symbols/low-voltage-tower-hp.svg b/application/src/main/data/json/system/scada_symbols/low-voltage-tower-hp.svg
new file mode 100644
index 0000000000..812e616433
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/low-voltage-tower-hp.svg
@@ -0,0 +1,278 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="800" fill="none" version="1.1" viewBox="0 0 400 800"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Low voltage tower",
+  "description": "Low voltage tower with various states.",
+  "searchTags": [
+    "power",
+    "energy"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 4,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.backgroundColor});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "backgroundColor",
+      "name": "{i18n:scada.symbol.background-color}",
+      "type": "color",
+      "default": "#999999",
+      "divider": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#999" stroke="#1a1a1a" tb:tag="background">
+  <path d="m397 352v-55" stroke-width="6"/>
+  <path d="m3 352v-55" stroke-width="6"/>
+  <path d="m397 152v-55" stroke-width="6"/>
+  <path d="m3 152v-55" stroke-width="6"/>
+  <rect transform="matrix(-4.3711e-8 1 1 4.3711e-8 -4.3711e-8 150)" x="1" y="1" width="46" height="184" rx="1" stroke-width="2"/>
+  <rect transform="matrix(-4.3711e-8 1 1 4.3711e-8 214 150)" x="1" y="1" width="46" height="184" rx="1" stroke-width="2"/>
+  <rect transform="matrix(-4.3711e-8 1 1 4.3711e-8 -4.3711e-8 350)" x="1" y="1" width="46" height="184" rx="1" stroke-width="2"/>
+  <rect transform="matrix(-4.3711e-8 1 1 4.3711e-8 214 350)" x="1" y="1" width="46" height="184" rx="1" stroke-width="2"/>
+  <rect x="185" y="1" width="30" height="798" rx="5" stroke-width="2"/>
+ </g><path d="m134.53 0s-134.53 0-134.53 134v656.72c0 5.3024 3.5818 9.2806 8 9.2806h384c4.418 0 8-3.9784 8-9.2806v-656.72c0-134-132.14-134-132.14-134h-67.86zm134.14 162.4c-2.5774 0-4.6666 2.5072-4.6666 5.6v600.8c0 3.0928 2.0894 5.6 4.6666 5.6h29.332c2.5774 0 4.6666-2.5072 4.6666-5.6v-600.8c0-3.0928-2.0894-5.6-4.6666-5.6z" fill-opacity="0" style="stroke-width:2.0908" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/low-voltage-transformer-tower-hp.svg b/application/src/main/data/json/system/scada_symbols/low-voltage-transformer-tower-hp.svg
new file mode 100644
index 0000000000..2985dc600c
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/low-voltage-transformer-tower-hp.svg
@@ -0,0 +1,334 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="800" fill="none" version="1.1" viewBox="0 0 400 800"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Low voltage transformer tower",
+  "description": "Low voltage transformer tower with various states.",
+  "searchTags": [
+    "power",
+    "energy"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 4,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.backgroundColor});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "transformer",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "backgroundColor",
+      "name": "{i18n:scada.symbol.background-color}",
+      "type": "color",
+      "default": "#999999"
+    },
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.stopped}"
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}"
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#999" stroke="#1A1A1A" tb:tag="background">
+  <rect x="1" y="351" width="398" height="46" rx="1" stroke-width="2"/>
+  <rect x="1" y="151" width="398" height="46" rx="1" stroke-width="2"/>
+  <rect x="185" y="1" width="30" height="798" rx="5" stroke-width="2"/>
+  <path d="m3 97v55" stroke-width="6"/>
+  <path d="m3 297v55" stroke-width="6"/>
+  <path d="m397 97v55" stroke-width="6"/>
+  <path d="m397 297v55" stroke-width="6"/>
+ </g><g fill="#fff" tb:tag="transformer">
+  <rect x="131" y="501" width="138" height="134" stroke="#1A1A1A" stroke-width="2"/>
+  <rect x="121" y="479" width="158" height="22" rx="1" stroke="#1A1A1A" stroke-width="2"/>
+  <rect x="121" y="635" width="158" height="22" rx="1" stroke="#1A1A1A" stroke-width="2"/>
+  <path d="m162.17 602.42c-1.185 0-1.925-1.284-1.331-2.31l37.828-65.339c0.592-1.024 2.07-1.024 2.663 0l37.828 65.339c0.594 1.026-0.146 2.31-1.331 2.31h-75.657z" stroke="#1A1A1A" stroke-width="6.1538"/>
+  <path d="m203.36 565.96-12.954 11.604c-0.801 0.725-0.351 2.063 0.725 2.163l10.116 0.976-6.065 8.453c-0.275 0.387-0.237 0.925 0.1 1.262 0.375 0.376 0.963 0.388 1.351 0.025l12.954-11.604c0.801-0.725 0.351-2.063-0.725-2.163l-10.116-0.975 6.065-8.453c0.275-0.388 0.237-0.926-0.1-1.263-0.375-0.375-0.963-0.388-1.351-0.025z" fill="#1A1A1A"/>
+ </g><path d="m134.53 0s-134.53 0-134.53 134v656.72c0 5.3024 3.5818 9.2806 8 9.2806h384c4.418 0 8-3.9784 8-9.2806v-656.72c0-134-132.14-134-132.14-134h-67.86zm134.14 162.4c-2.5774 0-4.6666 2.5072-4.6666 5.6v600.8c0 3.0928 2.0894 5.6 4.6666 5.6h29.332c2.5774 0 4.6666-2.5072 4.6666-5.6v-600.8c0-3.0928-2.0894-5.6-4.6666-5.6z" fill-opacity="0" style="stroke-width:2.0908" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/manufacture-hp.svg b/application/src/main/data/json/system/scada_symbols/manufacture-hp.svg
new file mode 100644
index 0000000000..5b35f2eaf2
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/manufacture-hp.svg
@@ -0,0 +1,344 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="400" fill="none" version="1.1" viewBox="0 0 400 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Manufacture",
+  "description": "Manufacture with various states.",
+  "searchTags": [
+    "power",
+    "energy",
+    "consumer"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<path d="m294.35 1.9284c0.037-0.52316 0.473-0.92842 0.997-0.92842h35.314c0.524 0 0.96 0.40526 0.997 0.92843l11.195 156c0.041 0.579-0.417 1.072-0.998 1.072h-57.702c-0.581 0-1.039-0.493-0.998-1.072l11.195-156z" fill="#999" stroke="#1A1A1A" stroke-width="2"/><path d="m94.682 136.73 73.318-68.43v70l1.682-1.57 73.318-68.43v68.699h132c2.761 0 5 2.239 5 5v230c0 2.761-2.239 5-5 5h-350c-2.7614 0-5-2.239-5-5v-235.13c0-0.277 0.115-0.542 0.3177-0.731l72.682-67.837v70l1.6823-1.57z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="72" y="203" width="58" height="58" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="138" y="203" width="58" height="58" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="204" y="203" width="58" height="58" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="270" y="203" width="58" height="58" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="72" y="269" width="58" height="58" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="138" y="269" width="58" height="58" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="204" y="269" width="58" height="58" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="270" y="269" width="58" height="58" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect x="1" y="377" width="398" height="22" rx="5" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m134.53 0s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6403 8 4.6403h384c4.418 0 8-1.9892 8-4.6403v-328.36c0-67-132.14-67-132.14-67h-67.86zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill-opacity="0" style="stroke-width:1.4784" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 320.94)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/meter.svg b/application/src/main/data/json/system/scada_symbols/meter.svg
new file mode 100644
index 0000000000..02b2833133
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/meter.svg
@@ -0,0 +1,743 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="100" height="400" fill="none" version="1.1" viewBox="0 0 100 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "Meter",
+  "description": "Meter displays the current value with a moving pointer on the scale.",
+  "searchTags": [
+    "scale",
+    "level",
+    "progress",
+    "thermometer"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 4,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.backgroundColor});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "progress-indicator",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue, initial) {\n    var clampedValue = Math.max(Math.min(value, Math.max(minValue, maxValue)), Math.min(minValue, maxValue));\n    var normalizedValue = minValue < maxValue\n        ? (clampedValue - minValue) / (maxValue - minValue)\n        : (minValue - clampedValue) / (minValue - maxValue);\n    var offset = initial - (normalizedValue * initial);\n    return offset;\n}\n\nvar valueSet = element.remember('valueSet');\n\nif (ctx.properties.progressArrow && !ctx.properties.progressBar) {\n    element.show();\n    var initial = ctx.properties.valueBox ? 329: 366;\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.transform({\n            translateY: initial\n        });\n    }\n    \n    var minValue = ctx.properties.minValue;\n    var maxValue = ctx.properties.maxValue;\n    var value = ctx.values.value;\n    \n    var colorProcessor = ctx.properties.progressArrowColor;\n    colorProcessor.update(value);\n    var fill = colorProcessor.color;\n    element.attr({fill: fill});\n    \n    var offset = calculateOffset(value, minValue, maxValue, initial);\n\n    var elementOffset = element.remember('offset');\n    if (offset !== elementOffset) {\n        element.remember('offset', offset);\n        ctx.api.cssAnimate(element, 500).transform({\n            translateY: offset\n        });\n    }\n} else {\n    element.hide();\n    if (valueSet) {\n        element.remember('valueSet', false);\n    }\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressBar",
+      "stateRenderFunction": "if (ctx.properties.progressBar) {\n    element.show();\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressBorder",
+      "stateRenderFunction": "if (!ctx.properties.valueBox) {\n    element.attr({'height': 367})\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressCircle",
+      "stateRenderFunction": "if (!ctx.properties.valueBox) {\n    element.attr({cy:383});\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressFill",
+      "stateRenderFunction": "if (!ctx.properties.valueBox) {\n    element.attr({y:-378});\n}\n\nfunction calculateOffset(value, minValue, maxValue, initial) {\n    var clampedValue = Math.max(Math.min(value, Math.max(minValue, maxValue)), Math.min(minValue, maxValue));\n    var normalizedValue = minValue < maxValue\n        ? (clampedValue - minValue) / (maxValue - minValue)\n        : (minValue - clampedValue) / (minValue - maxValue);\n    var offset = normalizedValue * initial;\n    return offset;\n}\n\nvar valueSet = element.remember('valueSet');\nif (ctx.properties.progressBar) {\n    var initial = ctx.properties.valueBox ? 329: 366;\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 2});\n    }\n    \n    var minValue = ctx.properties.minValue;\n    var maxValue = ctx.properties.maxValue;\n    var value = ctx.values.value;\n    \n    var colorProcessor = ctx.properties.progressBarColor;\n    colorProcessor.update(value);\n    var fill = colorProcessor.color;\n    element.attr({fill: fill, stroke: fill});\n    ctx.tags.progressCircle[0].fill(fill);\n    \n    var height = calculateOffset(value, minValue, maxValue, initial);\n\n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.cssAnimate(element, 500).attr({height: height+2});\n    }\n} else {\n    if (valueSet) {\n        element.remember('valueSet', false);\n    }\n}",
+      "actions": null
+    },
+    {
+      "tag": "scale",
+      "stateRenderFunction": "var scaleSet = element.remember('scaleSet');\nif (!scaleSet) {\n    element.remember('scaleSet', true);\n    element.clear();\n    \n    var majorIntervals = ctx.properties.majorIntervals;\n    var minorIntervals = ctx.properties.minorIntervals;\n    var minValue = ctx.properties.minValue;\n    var maxValue = ctx.properties.maxValue;\n    \n    var start = 11;\n    var end = ctx.properties.valueBox ? 328 : 365;\n    var majorIntervalLength = end / majorIntervals;\n    var minorIntervalLength = majorIntervalLength / minorIntervals;\n    element.add(ctx.svg.line(63, end+11, 63, 11).stroke({ width: 1 }).attr({class: 'majorTick'}));\n    for (var i = 0; i < majorIntervals+1; i++) {\n        var y = start + i * majorIntervalLength;\n        var line = ctx.svg.line(51, y, 63, y).stroke({ width: 1 }).attr({class: 'majorTick'});\n        element.add(line);\n        var majorText = (maxValue - ((maxValue - (minValue)) / (majorIntervals) * i)).toFixed(0);\n        var majorTickText = ctx.svg.text(majorText);\n        majorTickText.attr({x: 45, y: y + 2, 'text-anchor': 'end', class: 'majorTickText'});\n        majorTickText.first().attr({'dominant-baseline': 'middle'});\n        element.add(majorTickText);\n        if (i < majorIntervals) {\n            drawMinorTicks(y, minorIntervals, minorIntervalLength);\n        }\n    }\n}\n\nvar majorFont = ctx.properties.majorFont;\nvar majorColor = ctx.properties.majorColor;\nvar minorColor = ctx.properties.minorColor;\nif (ctx.values.critical) {\n    majorColor = ctx.properties.majorCriticalColor;\n    minorColor = ctx.properties.minorCriticalColor;\n} else if (ctx.values.warning) {\n    majorColor = ctx.properties.minorWarningColor;\n    minorColor = ctx.properties.minorWarningColor;\n}\n\nvar majorTicks = element.find('line.majorTick');\nmajorTicks.forEach(t => t.attr({stroke: majorColor}));\n\nvar majorTicksText = element.find('text.majorTickText');\nctx.api.font(majorTicksText, majorFont, majorColor);\n\nvar minorTicks = element.find('line.minorTick');\nminorTicks.forEach(t => t.attr({stroke: minorColor}));\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\nfunction drawMinorTicks(start, minorIntervals, minorIntervalLength) {\n    for (var i = 1; i < minorIntervals; i++) {\n        var minorY = start + i * minorIntervalLength;\n        var minorLine = ctx.svg.line(57, minorY, 63, minorY).stroke({ width: 1 }).attr({class: 'minorTick'});\n        element.add(minorLine);\n    }\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    element.show();\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box-background",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    var colorProcessor = ctx.properties.valueBoxColor;\n    colorProcessor.update(ctx.values.value);\n    element.attr({fill: colorProcessor.color});\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-text",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    var valueTextFont = ctx.properties.valueTextFont;\n    var valueTextColor = ctx.properties.valueTextColor;\n    var currentVolume = ctx.values.value;\n    var valueText = ctx.api.formatValue(currentVolume, 0, ctx.properties.valueUnits, false);\n    var colorProcessor = ctx.properties.valueTextColor;\n    colorProcessor.update(ctx.values.value);\n    ctx.api.font(element, valueTextFont, colorProcessor.color);\n    ctx.api.text(element, valueText);\n}",
+      "actions": null
+    }
+  ],
+  "behavior": [
+    {
+      "id": "value",
+      "name": "{i18n:scada.symbol.value}",
+      "hint": null,
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "waterLevel"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning-state}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical-state}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "minValue",
+      "name": "{i18n:scada.symbol.min-max-value}",
+      "type": "number",
+      "default": 0,
+      "required": true,
+      "subLabel": "{i18n:scada.symbol.min-value}",
+      "divider": true,
+      "min": -1000,
+      "step": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "maxValue",
+      "name": "{i18n:scada.symbol.min-max-value}",
+      "type": "number",
+      "default": 100,
+      "required": true,
+      "subLabel": "{i18n:scada.symbol.max-value}",
+      "max": 1000,
+      "step": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "backgroundColor",
+      "name": "{i18n:scada.symbol.background-color}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressBar",
+      "name": "{i18n:scada.symbol.progress-bar}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressBarColor",
+      "name": "{i18n:scada.symbol.progress-bar}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#4D94E1",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "progressBar",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressArrow",
+      "name": "{i18n:scada.symbol.progress-arrow}",
+      "type": "switch",
+      "default": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressArrowColor",
+      "name": "{i18n:scada.symbol.progress-arrow}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#1C943E",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "progressArrow",
+      "disabled": true,
+      "visible": true
+    },
+    {
+      "id": "valueBox",
+      "name": "{i18n:scada.symbol.value-box}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueBoxColor",
+      "name": "{i18n:scada.symbol.value-box}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#F3F3F3",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "valueBox",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueUnits",
+      "name": "{i18n:scada.symbol.value-text}",
+      "type": "units",
+      "default": "%",
+      "subLabel": "{i18n:scada.symbol.units}",
+      "disableOnProperty": "valueBox",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueTextFont",
+      "name": "{i18n:scada.symbol.value-text}",
+      "type": "font",
+      "default": {
+        "size": 14,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "500",
+        "style": "normal"
+      },
+      "disableOnProperty": "valueBox",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueTextColor",
+      "name": "{i18n:scada.symbol.value-text}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#0000008A",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "valueBox",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorIntervals",
+      "name": "{i18n:scada.symbol.major-ticks}",
+      "type": "number",
+      "default": 10,
+      "subLabel": "{i18n:scada.symbol.intervals}",
+      "divider": true,
+      "min": 1,
+      "step": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorFont",
+      "name": "{i18n:scada.symbol.major-ticks}",
+      "type": "font",
+      "default": {
+        "size": 12,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "500",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorColor",
+      "name": "{i18n:scada.symbol.major-ticks-color}",
+      "type": "color",
+      "default": "#747474",
+      "subLabel": "{i18n:scada.symbol.normal}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorWarningColor",
+      "name": "{i18n:scada.symbol.major-ticks-color}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorCriticalColor",
+      "name": "{i18n:scada.symbol.major-ticks-color}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorIntervals",
+      "name": "{i18n:scada.symbol.minor-ticks}",
+      "type": "number",
+      "default": 10,
+      "subLabel": "{i18n:scada.symbol.intervals}",
+      "min": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorColor",
+      "name": "{i18n:scada.symbol.minor-ticks-color}",
+      "type": "color",
+      "default": "#747474",
+      "subLabel": "{i18n:scada.symbol.normal}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorWarningColor",
+      "name": "{i18n:scada.symbol.minor-ticks-color}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorCriticalColor",
+      "name": "{i18n:scada.symbol.minor-ticks-color}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<path d="m16 400c-2.2091 0-4-1.791-4-4v-392c0-2.2091 1.7909-4 4-4h68c2.2091 0 4 1.7909 4 4v392c0 2.209-1.7909 4-4 4h-68z" fill="#E5E5E5" tb:tag="background"/><path d="m16 400c-2.2091 0-4-1.791-4-4v-392c0-2.2091 1.7909-4 4-4h68c2.2091 0 4 1.7909 4 4v392c0 2.209-1.7909 4-4 4h-68z" fill="url(#paint0_linear_2475_365165)"/><path d="m16 398.5c-1.3807 0-2.5-1.119-2.5-2.5v-392c0-1.3807 1.1193-2.5 2.5-2.5h68c1.3807 0 2.5 1.1193 2.5 2.5v392c0 1.381-1.1193 2.5-2.5 2.5h-68z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><g tb:tag="scale">
+  <path d="m27.539 10.44v8.5605h-1.4121v-6.8848l-2.0918 0.709v-1.166l3.3339-1.2187h0.17zm8.7754 3.58v1.3946c0 0.6679-0.0665 1.2382-0.1993 1.7109-0.1289 0.4688-0.3164 0.8496-0.5625 1.1426-0.2461 0.2929-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2383 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5468 0.2129 0.7734 0.3925 0.2305 0.1797 0.4258 0.4141 0.5859 0.7032 0.1641 0.2851 0.2891 0.6308 0.375 1.0371 0.086 0.4023 0.129 0.8711 0.129 1.4062zm-1.4122 1.5938v-1.8047c0-0.3398-0.0195-0.6387-0.0585-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1133-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4336 0.3984-0.1171 0.1836-0.207 0.4258-0.2695 0.7266-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0195 0.6465 0.0586 0.9082s0.0977 0.4863 0.1758 0.6738c0.0781 0.1836 0.1719 0.3359 0.2812 0.457 0.1133 0.1172 0.2422 0.2032 0.3868 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2226 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441 0.0585-0.3047 0.0878-0.6699 0.0878-1.0957zm8.4825-1.5938v1.3946c0 0.6679-0.0664 1.2382-0.1993 1.7109-0.1289 0.4688-0.3164 0.8496-0.5625 1.1426-0.246 0.2929-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2383 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5469 0.2129 0.7734 0.3925 0.2305 0.1797 0.4258 0.4141 0.586 0.7032 0.164 0.2851 0.289 0.6308 0.375 1.0371 0.0859 0.4023 0.1289 0.8711 0.1289 1.4062zm-1.4121 1.5938v-1.8047c0-0.3398-0.0196-0.6387-0.0586-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1132-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4335 0.3984-0.1172 0.1836-0.2071 0.4258-0.2696 0.7266-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0196 0.6465 0.0586 0.9082 0.0391 0.2617 0.0977 0.4863 0.1758 0.6738 0.0781 0.1836 0.1719 0.3359 0.2813 0.457 0.1132 0.1172 0.2421 0.2032 0.3867 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441s0.0879-0.6699 0.0879-1.0957z" fill="#000" fill-opacity=".38"/>
+  <path d="m31.891 50.186h0.1172c0.5391 0 0.9883-0.0703 1.3477-0.2109 0.3633-0.1445 0.6523-0.3438 0.8672-0.5977 0.2148-0.2539 0.3691-0.5527 0.4628-0.8965 0.0938-0.3437 0.1407-0.7168 0.1407-1.1191v-1.4707c0-0.3477-0.0371-0.6523-0.1114-0.9141-0.0703-0.2656-0.1718-0.4863-0.3046-0.6621-0.129-0.1797-0.2793-0.3144-0.4512-0.4043-0.168-0.0898-0.3496-0.1347-0.5449-0.1347-0.2149 0-0.4082 0.0488-0.5801 0.1465-0.168 0.0937-0.3106 0.2246-0.4278 0.3925-0.1132 0.1641-0.2011 0.3575-0.2636 0.5801-0.0586 0.2188-0.0879 0.4531-0.0879 0.7031 0 0.2344 0.0273 0.461 0.082 0.6797 0.0586 0.2149 0.1445 0.4063 0.2578 0.5742 0.1133 0.168 0.2559 0.3008 0.4278 0.3985 0.1718 0.0976 0.373 0.1465 0.6035 0.1465 0.2187 0 0.4199-0.0411 0.6035-0.1231 0.1836-0.0859 0.3437-0.2012 0.4805-0.3457 0.1367-0.1445 0.2441-0.3066 0.3222-0.4863 0.0782-0.1797 0.1211-0.3633 0.1289-0.5508l0.5391 0.1641c0 0.2968-0.0625 0.5898-0.1875 0.8789-0.1211 0.2851-0.291 0.5468-0.5098 0.7851-0.2148 0.2344-0.4668 0.4219-0.7558 0.5625-0.2852 0.1407-0.5957 0.211-0.9317 0.211-0.4062 0-0.7656-0.0762-1.0781-0.2286-0.3086-0.1562-0.5664-0.3671-0.7734-0.6328-0.2032-0.2656-0.3555-0.5703-0.4571-0.914-0.1015-0.3438-0.1523-0.7051-0.1523-1.084 0-0.4102 0.0625-0.7949 0.1875-1.1543s0.3066-0.6758 0.5449-0.9492c0.2383-0.2774 0.5274-0.4922 0.8672-0.6446 0.3438-0.1562 0.7324-0.2343 1.166-0.2343 0.461 0 0.8653 0.0898 1.2129 0.2695 0.3477 0.1797 0.6406 0.4277 0.8789 0.7441s0.418 0.6836 0.5391 1.1016 0.1816 0.8672 0.1816 1.3477v0.498c0 0.5039-0.0449 0.9902-0.1347 1.459-0.0899 0.4648-0.2364 0.8965-0.4395 1.2949-0.1992 0.3945-0.4629 0.7422-0.791 1.043-0.3242 0.2969-0.7227 0.5293-1.1953 0.6972-0.4688 0.1641-1.0196 0.2461-1.6524 0.2461h-0.1289v-1.166zm11.494-3.8672v1.3946c0 0.6679-0.0664 1.2382-0.1993 1.7109-0.1289 0.4688-0.3164 0.8496-0.5625 1.1426-0.246 0.293-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2382 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5469 0.2129 0.7734 0.3926 0.2305 0.1796 0.4258 0.414 0.586 0.7031 0.164 0.2851 0.289 0.6308 0.375 1.0371 0.0859 0.4023 0.1289 0.8711 0.1289 1.4062zm-1.4121 1.5938v-1.8047c0-0.3398-0.0196-0.6387-0.0586-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1132-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0546-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4335 0.3985-0.1172 0.1835-0.2071 0.4257-0.2696 0.7265-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0196 0.6465 0.0586 0.9082 0.0391 0.2617 0.0977 0.4863 0.1758 0.6738 0.0781 0.1836 0.1719 0.336 0.2813 0.457 0.1132 0.1172 0.2421 0.2032 0.3867 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441s0.0879-0.6699 0.0879-1.0957z" fill="#000" fill-opacity=".38"/>
+  <path d="m36.332 81.274c0 0.5313-0.123 0.9785-0.3691 1.3418s-0.582 0.6387-1.0078 0.8262c-0.4219 0.1836-0.8985 0.2754-1.4297 0.2754-0.5313 0-1.0098-0.0918-1.4356-0.2754-0.4257-0.1875-0.7617-0.4629-1.0078-0.8262s-0.3691-0.8105-0.3691-1.3418c0-0.3515 0.0683-0.6699 0.2051-0.9551 0.1367-0.289 0.33-0.5371 0.58-0.7441 0.254-0.2109 0.5508-0.373 0.8907-0.4863 0.3437-0.1133 0.7187-0.1699 1.125-0.1699 0.539 0 1.0215 0.0996 1.4472 0.2988 0.4258 0.1992 0.7598 0.4746 1.002 0.8262 0.2461 0.3515 0.3691 0.7617 0.3691 1.2304zm-1.4179-0.0703c0-0.2851-0.0586-0.5351-0.1758-0.75-0.1172-0.2148-0.2813-0.3808-0.4922-0.498s-0.4551-0.1758-0.7324-0.1758c-0.2813 0-0.5254 0.0586-0.7325 0.1758-0.207 0.1172-0.3691 0.2832-0.4863 0.498-0.1133 0.2149-0.1699 0.4649-0.1699 0.75 0 0.2891 0.0566 0.5391 0.1699 0.75 0.1133 0.207 0.2754 0.3652 0.4863 0.4746 0.211 0.1094 0.459 0.1641 0.7442 0.1641 0.2851 0 0.5312-0.0547 0.7383-0.1641 0.207-0.1094 0.3672-0.2676 0.4804-0.4746 0.1133-0.2109 0.17-0.4609 0.17-0.75zm1.2246-3.8906c0 0.4258-0.1133 0.8047-0.3399 1.1367-0.2226 0.332-0.5312 0.5938-0.9258 0.7852-0.3945 0.1875-0.8437 0.2812-1.3476 0.2812-0.5078 0-0.9609-0.0937-1.3594-0.2812-0.3945-0.1914-0.7051-0.4532-0.9316-0.7852-0.2227-0.332-0.334-0.7109-0.334-1.1367 0-0.5078 0.1113-0.9356 0.334-1.2832 0.2265-0.3516 0.5371-0.6192 0.9316-0.8027 0.3945-0.1836 0.8457-0.2754 1.3535-0.2754s0.959 0.0918 1.3535 0.2754c0.3946 0.1835 0.7032 0.4511 0.9258 0.8027 0.2266 0.3476 0.3399 0.7754 0.3399 1.2832zm-1.4121 0.0469c0-0.2539-0.0508-0.4766-0.1524-0.668-0.0976-0.1953-0.2363-0.3477-0.416-0.457-0.1797-0.1094-0.3926-0.1641-0.6387-0.1641s-0.459 0.0527-0.6386 0.1582c-0.1797 0.1055-0.3184 0.2539-0.4161 0.4453-0.0976 0.1914-0.1464 0.4199-0.1464 0.6856 0 0.2617 0.0488 0.4902 0.1464 0.6855 0.0977 0.1914 0.2364 0.3418 0.4161 0.4512 0.1836 0.1094 0.3984 0.164 0.6445 0.164s0.459-0.0546 0.6387-0.164 0.3183-0.2598 0.416-0.4512c0.0976-0.1953 0.1465-0.4238 0.1465-0.6855zm8.6582 1.2597v1.3946c0 0.6679-0.0664 1.2382-0.1993 1.7109-0.1289 0.4687-0.3164 0.8496-0.5625 1.1426-0.246 0.2929-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2383 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5469 0.2129 0.7734 0.3925 0.2305 0.1797 0.4258 0.4141 0.586 0.7032 0.164 0.2851 0.289 0.6308 0.375 1.0371 0.0859 0.4023 0.1289 0.8711 0.1289 1.4062zm-1.4121 1.5938v-1.8047c0-0.3399-0.0196-0.6387-0.0586-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1132-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4335 0.3984-0.1172 0.1836-0.2071 0.4258-0.2696 0.7266-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0196 0.6465 0.0586 0.9082 0.0391 0.2617 0.0977 0.4863 0.1758 0.6738 0.0781 0.1836 0.1719 0.3359 0.2813 0.457 0.1132 0.1172 0.2421 0.2032 0.3867 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441s0.0879-0.6699 0.0879-1.0957z" fill="#000" fill-opacity=".38"/>
+  <path d="m36.42 107.37v0.773l-3.4101 7.758h-1.4883l3.4043-7.406h-4.418v-1.125h5.9121zm6.9649 3.55v1.395c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.142-0.246 0.293-0.541 0.508-0.8847 0.645-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.221-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.643-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.395c0-0.671 0.0664-1.238 0.1992-1.699 0.1328-0.465 0.3222-0.842 0.5683-1.131 0.2461-0.293 0.5391-0.506 0.8789-0.638 0.3438-0.133 0.7266-0.2 1.1485-0.2 0.3398 0 0.6523 0.043 0.9375 0.129 0.289 0.082 0.5469 0.213 0.7734 0.393 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.406zm-1.4121 1.594v-1.805c0-0.339-0.0196-0.638-0.0586-0.896-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.184-0.168-0.332-0.2813-0.445-0.1132-0.118-0.2422-0.202-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.214-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.296-0.0879 0.658-0.0879 1.083v1.805c0 0.344 0.0196 0.647 0.0586 0.908 0.0391 0.262 0.0977 0.487 0.1758 0.674 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.117 0.2421 0.203 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z" fill="#000" fill-opacity=".38"/>
+  <path d="m35.02 139.62h0.1758v1.155h-0.0996c-0.5039 0-0.9395 0.078-1.3066 0.234-0.3633 0.156-0.6621 0.371-0.8965 0.644-0.2344 0.274-0.4102 0.594-0.5274 0.961-0.1132 0.364-0.1699 0.75-0.1699 1.161v1.341c0 0.34 0.0371 0.641 0.1113 0.903 0.0743 0.257 0.1778 0.474 0.3106 0.65 0.1367 0.172 0.293 0.303 0.4687 0.393 0.1758 0.089 0.3653 0.134 0.5684 0.134 0.2109 0 0.4023-0.043 0.5742-0.129 0.1719-0.089 0.3184-0.212 0.4395-0.369 0.1211-0.156 0.2129-0.341 0.2754-0.556s0.0937-0.45 0.0937-0.703c0-0.243-0.0312-0.469-0.0937-0.68-0.0586-0.215-0.1465-0.402-0.2637-0.563-0.1172-0.164-0.2637-0.291-0.4395-0.38-0.1718-0.094-0.3711-0.141-0.5976-0.141-0.2813 0-0.5371 0.066-0.7676 0.199-0.2266 0.133-0.4102 0.307-0.5508 0.522-0.1367 0.211-0.2109 0.435-0.2226 0.673l-0.5391-0.175c0.0313-0.364 0.1113-0.69 0.2402-0.979 0.1328-0.289 0.3067-0.535 0.5215-0.738 0.2149-0.203 0.4629-0.358 0.7442-0.463 0.2851-0.109 0.5976-0.164 0.9375-0.164 0.414 0 0.7734 0.078 1.0781 0.234 0.3047 0.157 0.5566 0.369 0.7558 0.639 0.2032 0.266 0.3536 0.57 0.4512 0.914 0.1016 0.34 0.1524 0.695 0.1524 1.066 0 0.411-0.0625 0.793-0.1875 1.149-0.125 0.351-0.3086 0.66-0.5508 0.926-0.2383 0.265-0.5293 0.472-0.8731 0.621-0.3398 0.148-0.7265 0.222-1.1601 0.222-0.4571 0-0.8653-0.088-1.2246-0.263-0.3555-0.176-0.6582-0.418-0.9082-0.727-0.2461-0.308-0.4336-0.664-0.5625-1.066-0.1289-0.403-0.1934-0.828-0.1934-1.278v-0.586c0-0.648 0.082-1.259 0.2461-1.834 0.1641-0.578 0.416-1.087 0.7559-1.529 0.3437-0.441 0.7832-0.787 1.3183-1.037 0.5352-0.254 1.1738-0.381 1.916-0.381zm8.3653 3.604v1.394c0 0.668-0.0664 1.239-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.293-0.541 0.508-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.085-0.543-0.22-0.7734-0.404-0.2305-0.183-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.642-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.394c0-0.672 0.0664-1.239 0.1992-1.699 0.1328-0.465 0.3222-0.842 0.5683-1.131 0.2461-0.293 0.5391-0.506 0.8789-0.639 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.043 0.9375 0.129 0.289 0.082 0.5469 0.213 0.7734 0.392 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.286 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.872 0.1289 1.407zm-1.4121 1.593v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.261-0.0977-0.482-0.1758-0.662-0.0742-0.183-0.168-0.332-0.2813-0.445-0.1132-0.117-0.2422-0.201-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.215-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.297-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.909 0.0391 0.261 0.0977 0.486 0.1758 0.674 0.0781 0.183 0.1719 0.335 0.2813 0.457 0.1132 0.117 0.2421 0.203 0.3867 0.257 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129 0.1719-0.085 0.3164-0.222 0.4336-0.41 0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z" fill="#000" fill-opacity=".38"/>
+  <path d="m32.236 176.53-1.125-0.275 0.4629-4.289h4.5996v1.195h-3.4277l-0.2344 2.092c0.1328-0.078 0.3164-0.154 0.5508-0.229 0.2344-0.078 0.502-0.117 0.8027-0.117 0.4024 0 0.7618 0.067 1.0782 0.199 0.3203 0.129 0.5918 0.319 0.8144 0.569 0.2227 0.246 0.3926 0.547 0.5098 0.902 0.1172 0.352 0.1758 0.748 0.1758 1.19 0 0.394-0.0586 0.763-0.1758 1.107-0.1133 0.344-0.2852 0.646-0.5156 0.908-0.2305 0.262-0.5215 0.467-0.8731 0.615-0.3477 0.145-0.7598 0.217-1.2363 0.217-0.3555 0-0.6973-0.051-1.0254-0.152-0.3242-0.106-0.6152-0.26-0.8731-0.463-0.2578-0.207-0.4648-0.461-0.6211-0.762-0.1562-0.304-0.246-0.654-0.2695-1.049h1.3828c0.0352 0.278 0.1114 0.514 0.2285 0.709 0.1211 0.192 0.2813 0.338 0.4805 0.44 0.1992 0.101 0.4297 0.152 0.6914 0.152 0.2383 0 0.4434-0.041 0.6153-0.123 0.1718-0.086 0.3144-0.207 0.4277-0.363 0.1172-0.16 0.2031-0.348 0.2578-0.563 0.0586-0.214 0.0879-0.453 0.0879-0.714 0-0.25-0.0332-0.479-0.0996-0.686-0.0625-0.207-0.1582-0.387-0.2871-0.539-0.125-0.152-0.2832-0.27-0.4746-0.352-0.1914-0.086-0.4121-0.129-0.6621-0.129-0.336 0-0.5938 0.049-0.7735 0.147-0.1758 0.098-0.3398 0.219-0.4922 0.363zm11.148-1.013v1.394c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.293-0.541 0.507-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.22-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.643-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.394c0-0.672 0.0664-1.239 0.1992-1.7 0.1328-0.465 0.3222-0.841 0.5683-1.131 0.2461-0.293 0.5391-0.505 0.8789-0.638 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.043 0.9375 0.128 0.289 0.082 0.5469 0.213 0.7734 0.393 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.407zm-1.4121 1.593v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.184-0.168-0.332-0.2813-0.445-0.1132-0.117-0.2422-0.201-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.214-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.296-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.908 0.0391 0.262 0.0977 0.487 0.1758 0.674 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.118 0.2421 0.203 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z" fill="#000" fill-opacity=".38"/>
+  <path d="m36.631 209.76v1.125h-6.1524l-0.0469-0.85 3.6797-5.765h1.1309l-1.2246 2.097-2.1153 3.393h4.7286zm-1.0664-5.49v8.531h-1.4122v-8.531h1.4122zm7.8203 3.55v1.395c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.849-0.5625 1.142-0.246 0.293-0.541 0.508-0.8847 0.645-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.221-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.643-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.395c0-0.672 0.0664-1.238 0.1992-1.699 0.1328-0.465 0.3222-0.842 0.5683-1.131 0.2461-0.293 0.5391-0.506 0.8789-0.638 0.3438-0.133 0.7266-0.2 1.1485-0.2 0.3398 0 0.6523 0.043 0.9375 0.129 0.289 0.082 0.5469 0.213 0.7734 0.393 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.402 0.1289 0.871 0.1289 1.406zm-1.4121 1.594v-1.805c0-0.339-0.0196-0.638-0.0586-0.896-0.0391-0.262-0.0977-0.483-0.1758-0.662-0.0742-0.184-0.168-0.332-0.2813-0.446-0.1132-0.117-0.2422-0.201-0.3867-0.251-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.042-0.586 0.128-0.1718 0.082-0.3164 0.215-0.4335 0.399-0.1172 0.183-0.2071 0.426-0.2696 0.726-0.0586 0.297-0.0879 0.659-0.0879 1.084v1.805c0 0.344 0.0196 0.647 0.0586 0.908 0.0391 0.262 0.0977 0.487 0.1758 0.674 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.117 0.2421 0.203 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.223 0.4336-0.41c0.1172-0.191 0.2051-0.44 0.2637-0.744 0.0586-0.305 0.0879-0.67 0.0879-1.096z" fill="#000" fill-opacity=".38"/>
+  <path d="m32.412 240.2h0.8438c0.3281 0 0.5996-0.057 0.8144-0.17 0.2188-0.113 0.3809-0.27 0.4863-0.469 0.1055-0.199 0.1582-0.428 0.1582-0.685 0-0.27-0.0488-0.5-0.1464-0.692-0.0938-0.195-0.2383-0.346-0.4336-0.451-0.1914-0.105-0.4356-0.158-0.7325-0.158-0.25 0-0.4765 0.051-0.6796 0.152-0.1993 0.098-0.3575 0.238-0.4747 0.422-0.1171 0.18-0.1757 0.395-0.1757 0.645h-1.418c0-0.454 0.1191-0.856 0.3574-1.207 0.2383-0.352 0.5625-0.627 0.9727-0.827 0.414-0.203 0.8789-0.304 1.3945-0.304 0.5508 0 1.0313 0.091 1.4414 0.275 0.4141 0.18 0.7363 0.449 0.9668 0.809 0.2305 0.359 0.3457 0.804 0.3457 1.336 0 0.242-0.0566 0.488-0.1699 0.738s-0.2813 0.478-0.5039 0.685c-0.2227 0.204-0.5 0.37-0.832 0.498-0.3321 0.125-0.7168 0.188-1.1543 0.188h-1.0606v-0.785zm0 1.101v-0.773h1.0606c0.5 0 0.9257 0.059 1.2773 0.176 0.3555 0.117 0.6445 0.279 0.8672 0.486 0.2226 0.203 0.3848 0.436 0.4863 0.697 0.1055 0.262 0.1582 0.539 0.1582 0.832 0 0.399-0.0722 0.754-0.2168 1.067-0.1406 0.308-0.3418 0.57-0.6035 0.785s-0.5684 0.377-0.9199 0.486c-0.3477 0.11-0.7266 0.164-1.1367 0.164-0.3672 0-0.7188-0.05-1.0547-0.152-0.336-0.102-0.6367-0.252-0.9024-0.451-0.2656-0.203-0.4765-0.455-0.6328-0.756-0.1523-0.305-0.2285-0.656-0.2285-1.055h1.4121c0 0.254 0.0586 0.479 0.1758 0.674 0.1211 0.191 0.2891 0.342 0.5039 0.451 0.2188 0.11 0.4688 0.164 0.75 0.164 0.2969 0 0.5527-0.052 0.7676-0.158 0.2148-0.105 0.3789-0.262 0.4922-0.469 0.1172-0.207 0.1758-0.457 0.1758-0.75 0-0.332-0.0645-0.601-0.1934-0.808s-0.3125-0.36-0.5508-0.457c-0.2383-0.102-0.5195-0.153-0.8437-0.153h-0.8438zm10.973-1.177v1.394c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.293-0.541 0.507-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.22-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.642-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.394c0-0.672 0.0664-1.239 0.1992-1.7 0.1328-0.464 0.3222-0.841 0.5683-1.13 0.2461-0.293 0.5391-0.506 0.8789-0.639 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.043 0.9375 0.129 0.289 0.082 0.5469 0.212 0.7734 0.392 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.407zm-1.4121 1.593v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.183-0.168-0.332-0.2813-0.445-0.1132-0.117-0.2422-0.201-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.215-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.297-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.909 0.0391 0.261 0.0977 0.486 0.1758 0.673 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.118 0.2421 0.204 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z" fill="#000" fill-opacity=".38"/>
+  <path d="m36.473 276.28v1.125h-5.7188v-0.967l2.7773-3.029c0.3047-0.344 0.545-0.641 0.7208-0.891 0.1757-0.25 0.2988-0.474 0.3691-0.674 0.0742-0.203 0.1113-0.4 0.1113-0.591 0-0.27-0.0508-0.506-0.1523-0.709-0.0977-0.207-0.2422-0.37-0.4336-0.487-0.1914-0.121-0.4238-0.181-0.6973-0.181-0.3164 0-0.582 0.068-0.7969 0.205-0.2148 0.136-0.3769 0.326-0.4863 0.568-0.1094 0.238-0.164 0.512-0.164 0.82h-1.4122c0-0.496 0.1133-0.949 0.3399-1.359 0.2265-0.414 0.5547-0.742 0.9844-0.984 0.4297-0.246 0.9472-0.37 1.5527-0.37 0.5703 0 1.0547 0.096 1.4531 0.288 0.3985 0.191 0.7012 0.462 0.9082 0.814 0.211 0.352 0.3164 0.768 0.3164 1.248 0 0.266-0.0429 0.529-0.1289 0.791-0.0859 0.262-0.209 0.524-0.3691 0.785-0.1563 0.258-0.3418 0.518-0.5567 0.78-0.2148 0.257-0.4511 0.519-0.7089 0.785l-1.8457 2.033h3.9375zm6.9121-3.856v1.395c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.142-0.246 0.293-0.541 0.508-0.8847 0.645-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.221-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.643-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.395c0-0.671 0.0664-1.238 0.1992-1.699 0.1328-0.465 0.3222-0.842 0.5683-1.131 0.2461-0.293 0.5391-0.506 0.8789-0.638 0.3438-0.133 0.7266-0.2 1.1485-0.2 0.3398 0 0.6523 0.043 0.9375 0.129 0.289 0.082 0.5469 0.213 0.7734 0.393 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.406zm-1.4121 1.594v-1.805c0-0.339-0.0196-0.638-0.0586-0.896-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.184-0.168-0.332-0.2813-0.445-0.1132-0.118-0.2422-0.202-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.214-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.296-0.0879 0.658-0.0879 1.083v1.805c0 0.344 0.0196 0.647 0.0586 0.908 0.0391 0.262 0.0977 0.487 0.1758 0.674 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.117 0.2421 0.203 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z" fill="#000" fill-opacity=".38"/>
+  <path d="m34.609 301.14v8.56h-1.4121v-6.885l-2.0918 0.709v-1.166l3.334-1.218h0.1699zm8.7754 3.58v1.394c0 0.668-0.0664 1.239-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.293-0.541 0.508-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.085-0.543-0.22-0.7734-0.404-0.2305-0.183-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.642-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.394c0-0.672 0.0664-1.239 0.1992-1.699 0.1328-0.465 0.3222-0.842 0.5683-1.131 0.2461-0.293 0.5391-0.506 0.8789-0.639 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.043 0.9375 0.129 0.289 0.082 0.5469 0.213 0.7734 0.392 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.286 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.872 0.1289 1.407zm-1.4121 1.593v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.261-0.0977-0.482-0.1758-0.662-0.0742-0.183-0.168-0.332-0.2813-0.445-0.1132-0.117-0.2422-0.201-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.215-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.297-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.909 0.0391 0.261 0.0977 0.486 0.1758 0.674 0.0781 0.183 0.1719 0.335 0.2813 0.457 0.1132 0.117 0.2421 0.203 0.3867 0.257 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129 0.1719-0.085 0.3164-0.222 0.4336-0.41 0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z" fill="#000" fill-opacity=".38"/>
+  <path d="m43.385 337.02v1.394c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.293-0.541 0.507-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.22-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.643-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.394c0-0.672 0.0664-1.239 0.1992-1.7 0.1328-0.465 0.3222-0.841 0.5683-1.131 0.2461-0.293 0.5391-0.505 0.8789-0.638 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.043 0.9375 0.128 0.289 0.082 0.5469 0.213 0.7734 0.393 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.407zm-1.4121 1.593v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.184-0.168-0.332-0.2813-0.445-0.1132-0.117-0.2422-0.201-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.214-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.296-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.908 0.0391 0.262 0.0977 0.487 0.1758 0.674 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.118 0.2421 0.203 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z" fill="#000" fill-opacity=".38"/>
+  <path d="m63 10v329h1v-329z" fill="#747474" style="stroke-width:.70711"/>
+  <line x1="52" x2="64" y1="10.5" y2="10.5" stroke="#747474"/>
+  <line x1="58" x2="64" y1="13.79" y2="13.79" stroke="#747474"/>
+  <line x1="58" x2="64" y1="17.08" y2="17.08" stroke="#747474"/>
+  <line x1="58" x2="64" y1="20.37" y2="20.37" stroke="#747474"/>
+  <line x1="58" x2="64" y1="23.66" y2="23.66" stroke="#747474"/>
+  <line x1="58" x2="64" y1="26.95" y2="26.95" stroke="#747474"/>
+  <line x1="58" x2="64" y1="30.24" y2="30.24" stroke="#747474"/>
+  <line x1="58" x2="64" y1="33.53" y2="33.53" stroke="#747474"/>
+  <line x1="58" x2="64" y1="36.82" y2="36.82" stroke="#747474"/>
+  <line x1="58" x2="64" y1="40.11" y2="40.11" stroke="#747474"/>
+  <line x1="52" x2="64" y1="43.4" y2="43.4" stroke="#747474"/>
+  <line x1="58" x2="64" y1="46.69" y2="46.69" stroke="#747474"/>
+  <line x1="58" x2="64" y1="49.98" y2="49.98" stroke="#747474"/>
+  <line x1="58" x2="64" y1="53.27" y2="53.27" stroke="#747474"/>
+  <line x1="58" x2="64" y1="56.56" y2="56.56" stroke="#747474"/>
+  <line x1="58" x2="64" y1="59.85" y2="59.85" stroke="#747474"/>
+  <line x1="58" x2="64" y1="63.14" y2="63.14" stroke="#747474"/>
+  <line x1="58" x2="64" y1="66.43" y2="66.43" stroke="#747474"/>
+  <line x1="58" x2="64" y1="69.72" y2="69.72" stroke="#747474"/>
+  <line x1="58" x2="64" y1="73.01" y2="73.01" stroke="#747474"/>
+  <line x1="52" x2="64" y1="76.3" y2="76.3" stroke="#747474"/>
+  <line x1="58" x2="64" y1="79.59" y2="79.59" stroke="#747474"/>
+  <line x1="58" x2="64" y1="82.88" y2="82.88" stroke="#747474"/>
+  <line x1="58" x2="64" y1="86.17" y2="86.17" stroke="#747474"/>
+  <line x1="58" x2="64" y1="89.46" y2="89.46" stroke="#747474"/>
+  <line x1="58" x2="64" y1="92.75" y2="92.75" stroke="#747474"/>
+  <line x1="58" x2="64" y1="96.04" y2="96.04" stroke="#747474"/>
+  <line x1="58" x2="64" y1="99.33" y2="99.33" stroke="#747474"/>
+  <line x1="58" x2="64" y1="102.62" y2="102.62" stroke="#747474"/>
+  <line x1="58" x2="64" y1="105.91" y2="105.91" stroke="#747474"/>
+  <line x1="52" x2="64" y1="109.2" y2="109.2" stroke="#747474"/>
+  <line x1="58" x2="64" y1="112.49" y2="112.49" stroke="#747474"/>
+  <line x1="58" x2="64" y1="115.78" y2="115.78" stroke="#747474"/>
+  <line x1="58" x2="64" y1="119.07" y2="119.07" stroke="#747474"/>
+  <line x1="58" x2="64" y1="122.36" y2="122.36" stroke="#747474"/>
+  <line x1="58" x2="64" y1="125.65" y2="125.65" stroke="#747474"/>
+  <line x1="58" x2="64" y1="128.94" y2="128.94" stroke="#747474"/>
+  <line x1="58" x2="64" y1="132.23" y2="132.23" stroke="#747474"/>
+  <line x1="58" x2="64" y1="135.52" y2="135.52" stroke="#747474"/>
+  <line x1="58" x2="64" y1="138.81" y2="138.81" stroke="#747474"/>
+  <line x1="52" x2="64" y1="142.1" y2="142.1" stroke="#747474"/>
+  <line x1="58" x2="64" y1="145.39" y2="145.39" stroke="#747474"/>
+  <line x1="58" x2="64" y1="148.68" y2="148.68" stroke="#747474"/>
+  <line x1="58" x2="64" y1="151.97" y2="151.97" stroke="#747474"/>
+  <line x1="58" x2="64" y1="155.26" y2="155.26" stroke="#747474"/>
+  <line x1="58" x2="64" y1="158.55" y2="158.55" stroke="#747474"/>
+  <line x1="58" x2="64" y1="161.84" y2="161.84" stroke="#747474"/>
+  <line x1="58" x2="64" y1="165.13" y2="165.13" stroke="#747474"/>
+  <line x1="58" x2="64" y1="168.42" y2="168.42" stroke="#747474"/>
+  <line x1="58" x2="64" y1="171.71" y2="171.71" stroke="#747474"/>
+  <line x1="52" x2="64" y1="175" y2="175" stroke="#747474"/>
+  <line x1="58" x2="64" y1="178.29" y2="178.29" stroke="#747474"/>
+  <line x1="58" x2="64" y1="181.58" y2="181.58" stroke="#747474"/>
+  <line x1="58" x2="64" y1="184.87" y2="184.87" stroke="#747474"/>
+  <line x1="58" x2="64" y1="188.16" y2="188.16" stroke="#747474"/>
+  <line x1="58" x2="64" y1="191.45" y2="191.45" stroke="#747474"/>
+  <line x1="58" x2="64" y1="194.74" y2="194.74" stroke="#747474"/>
+  <line x1="58" x2="64" y1="198.03" y2="198.03" stroke="#747474"/>
+  <line x1="58" x2="64" y1="201.32" y2="201.32" stroke="#747474"/>
+  <line x1="58" x2="64" y1="204.61" y2="204.61" stroke="#747474"/>
+  <line x1="52" x2="64" y1="207.9" y2="207.9" stroke="#747474"/>
+  <line x1="58" x2="64" y1="211.19" y2="211.19" stroke="#747474"/>
+  <line x1="58" x2="64" y1="214.48" y2="214.48" stroke="#747474"/>
+  <line x1="58" x2="64" y1="217.77" y2="217.77" stroke="#747474"/>
+  <line x1="58" x2="64" y1="221.06" y2="221.06" stroke="#747474"/>
+  <line x1="58" x2="64" y1="224.35" y2="224.35" stroke="#747474"/>
+  <line x1="58" x2="64" y1="227.64" y2="227.64" stroke="#747474"/>
+  <line x1="58" x2="64" y1="230.93" y2="230.93" stroke="#747474"/>
+  <line x1="58" x2="64" y1="234.22" y2="234.22" stroke="#747474"/>
+  <line x1="58" x2="64" y1="237.51" y2="237.51" stroke="#747474"/>
+  <line x1="52" x2="64" y1="240.8" y2="240.8" stroke="#747474"/>
+  <line x1="58" x2="64" y1="244.09" y2="244.09" stroke="#747474"/>
+  <line x1="58" x2="64" y1="247.38" y2="247.38" stroke="#747474"/>
+  <line x1="58" x2="64" y1="250.67" y2="250.67" stroke="#747474"/>
+  <line x1="58" x2="64" y1="253.96" y2="253.96" stroke="#747474"/>
+  <line x1="58" x2="64" y1="257.25" y2="257.25" stroke="#747474"/>
+  <line x1="58" x2="64" y1="260.54" y2="260.54" stroke="#747474"/>
+  <line x1="58" x2="64" y1="263.83" y2="263.83" stroke="#747474"/>
+  <line x1="58" x2="64" y1="267.12" y2="267.12" stroke="#747474"/>
+  <line x1="58" x2="64" y1="270.41" y2="270.41" stroke="#747474"/>
+  <line x1="52" x2="64" y1="273.7" y2="273.7" stroke="#747474"/>
+  <line x1="58" x2="64" y1="276.99" y2="276.99" stroke="#747474"/>
+  <line x1="58" x2="64" y1="280.28" y2="280.28" stroke="#747474"/>
+  <line x1="58" x2="64" y1="283.57" y2="283.57" stroke="#747474"/>
+  <line x1="58" x2="64" y1="286.86" y2="286.86" stroke="#747474"/>
+  <line x1="58" x2="64" y1="290.15" y2="290.15" stroke="#747474"/>
+  <line x1="58" x2="64" y1="293.44" y2="293.44" stroke="#747474"/>
+  <line x1="58" x2="64" y1="296.73" y2="296.73" stroke="#747474"/>
+  <line x1="58" x2="64" y1="300.02" y2="300.02" stroke="#747474"/>
+  <line x1="58" x2="64" y1="303.31" y2="303.31" stroke="#747474"/>
+  <line x1="52" x2="64" y1="306.6" y2="306.6" stroke="#747474"/>
+  <line x1="58" x2="64" y1="309.89" y2="309.89" stroke="#747474"/>
+  <line x1="58" x2="64" y1="313.18" y2="313.18" stroke="#747474"/>
+  <line x1="58" x2="64" y1="316.47" y2="316.47" stroke="#747474"/>
+  <line x1="58" x2="64" y1="319.76" y2="319.76" stroke="#747474"/>
+  <line x1="58" x2="64" y1="323.05" y2="323.05" stroke="#747474"/>
+  <line x1="58" x2="64" y1="326.34" y2="326.34" stroke="#747474"/>
+  <line x1="58" x2="64" y1="329.63" y2="329.63" stroke="#747474"/>
+  <line x1="58" x2="64" y1="332.92" y2="332.92" stroke="#747474"/>
+  <line x1="58" x2="64" y1="336.21" y2="336.21" stroke="#747474"/>
+  <line x1="52" x2="64" y1="339.5" y2="339.5" stroke="#747474"/>
+ </g><g tb:tag="progressBar">
+  <rect x="68" y="10.5" width="6" height="331" ry="1.12" stroke="#cecece" tb:tag="progressBorder"/>
+  <rect transform="scale(1,-1)" x="68" y="-342" width="6" height="125" ry="1.12" fill="#4d94e1" stroke="#4d94e1" tb:tag="progressFill"/>
+  <circle cx="71" cy="347" r="7" fill="#4d94e1" tb:tag="progressCircle"/>
+ </g><g transform="translate(0,329)" fill="#1c943e" style="display: none;" tb:tag="progress-indicator">
+  <path d="m63.022 10.562 10.5 6.062v-12.124z" style=""/>
+ </g><g filter="url(#filter0_ii_2475_365165)" tb:tag="value-box">
+  <rect x="21.5" y="362" width="56" height="30" rx="4" fill="#f3f3f3" fill-opacity=".75" tb:tag="value-box-background"/>
+  <rect x="22.5" y="363" width="54" height="28" rx="3" stroke="#fff" stroke-width="2"/>
+  <text x="50.492188" y="378.0625" fill="#727171" font-family="Roboto" font-size="14px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan dominant-baseline="middle">37%</tspan></text>
+ </g><path d="m37.56 0s-25.56 0-25.56 67v328.36c0 2.6512 0.68053 4.6404 1.52 4.6404h72.96c0.83942 0 1.52-1.9892 1.52-4.6404v-328.36c0-67-25.107-67-25.107-67h-12.893zm25.487 81.2c-0.48969 0-0.88669 1.2536-0.88669 2.8v300.4c0 1.5464 0.39697 2.8 0.88669 2.8h5.5733c0.48969 0 0.88669-1.2536 0.88669-2.8v-300.4c0-1.5464-0.39697-2.8-0.88669-2.8z" fill="#000" fill-opacity="0" style="stroke-width:.17436" tb:tag="clickArea"/><defs>
+  <filter id="filter0_ii_2475_365165" x="19.5" y="360" width="60" height="34" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+   <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+   <feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+   <feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+   <feOffset dx="-2" dy="2"/>
+   <feGaussianBlur stdDeviation="3"/>
+   <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic"/>
+   <feColorMatrix values="0 0 0 0 0.445833 0 0 0 0 0.445833 0 0 0 0 0.445833 0 0 0 0.5 0"/>
+   <feBlend in2="shape" result="effect1_innerShadow_2475_365165"/>
+   <feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+   <feOffset dx="2" dy="-2"/>
+   <feGaussianBlur stdDeviation="2"/>
+   <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic"/>
+   <feColorMatrix values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.5 0"/>
+   <feBlend in2="effect1_innerShadow_2475_365165" result="effect2_innerShadow_2475_365165"/>
+  </filter>
+  <linearGradient id="paint0_linear_2475_365165" x1="88" x2="12" y1="200" y2="200.04" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#020202" stop-opacity=".35" offset="0"/>
+   <stop stop-color="#020202" stop-opacity=".12" offset=".02629"/>
+   <stop stop-color="#fff" stop-opacity=".12" offset=".11617"/>
+   <stop stop-color="#fff" stop-opacity=".3" offset=".49829"/>
+   <stop stop-color="#fff" stop-opacity=".12" offset=".88762"/>
+   <stop stop-color="#020202" stop-opacity=".12" offset=".96591"/>
+   <stop stop-color="#020202" stop-opacity=".35" offset="1"/>
+  </linearGradient>
+ </defs>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/oil-pump-hp.svg b/application/src/main/data/json/system/scada_symbols/oil-pump-hp.svg
new file mode 100644
index 0000000000..e7dfa8f0c8
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/oil-pump-hp.svg
@@ -0,0 +1,357 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="1000" height="1200" fill="none" version="1.1" viewBox="0 0 1000 1200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Oil pump",
+  "description": "Oil pump with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 5,
+  "widgetSizeY": 6,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1161" width="998" height="38" rx="3" stroke="#1A1A1A" stroke-width="2"/><path d="m315.2 1161 151.18-840.74 63.841-21.443 154.58 862.18h-369.61z" stroke="#1A1A1A" stroke-width="2"/><path d="m900 541v384" stroke="#000" stroke-width="6"/><path d="m315 1160 313-313" stroke="#1A1A1A" stroke-width="2"/><path d="m685 1160-313-313" stroke="#1A1A1A" stroke-width="2"/><path d="m628 847-217-217" stroke="#1A1A1A" stroke-width="2"/><path d="m589 630-151-151" stroke="#1A1A1A" stroke-width="2"/><path d="m562 479-106-106" stroke="#1A1A1A" stroke-width="2"/><path d="m438 479 106-106" stroke="#1A1A1A" stroke-width="2"/><path d="m411 630 151-151" stroke="#1A1A1A" stroke-width="2"/><path d="m372 847 217-217" stroke="#1A1A1A" stroke-width="2"/><path d="m372 847h256" stroke="#1A1A1A" stroke-width="2"/><path d="m410 630h180" stroke="#1A1A1A" stroke-width="2"/><path d="m438 479h124" stroke="#1A1A1A" stroke-width="2"/><path d="m114 451 154 564" stroke="#1A1A1A" stroke-width="2"/><rect x="861" y="1143" width="78" height="18" rx="1" stroke="#1A1A1A" stroke-width="2"/><rect x="881" y="925" width="38" height="218" stroke="#1A1A1A" stroke-width="2"/><path d="m920 1100h80" stroke="#1A1A1A" stroke-width="6"/><g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <path d="m91.339 388.56c0.0845-1.178 0.8541-2.197 1.9665-2.601l563.4-204.78c1.558-0.567 3.28 0.236 3.847 1.791l0.939-0.343-0.939 0.343 23.263 63.828c0.566 1.553-0.235 3.272-1.793 3.839l-592 215.18c-2.0459 0.744-4.1755-0.866-4.0202-3.029l5.3305-74.221z"/>
+  <path d="m682.58 4.8723-69.104 147.33c-0.776 1.654-0.587 3.599 0.493 5.073l279.32 381.28c0.926 1.265 2.393 2.021 3.961 2.041l31.595 0.409c2.586 0.033 4.775-1.947 5.019-4.523 24.171-254.85-96.897-453.81-161.98-523.16-0.794-0.8464-1.821-1.3367-2.973-1.4758l-81.21-9.8032c-2.138-0.25813-4.201 0.88532-5.116 2.8362z"/>
+  <path d="m341.58 903.6c0.934-0.934 2.338-0.737 2.922 0.302 4.821 8.575 17.591 33.981 20.073 66.303 2.478 32.286-5.299 71.486-41.597 107.78-36.297 36.3-75.496 44.08-107.78 41.6-32.322-2.48-57.728-15.25-66.303-20.07-1.039-0.59-1.236-1.99-0.302-2.93l192.98-192.98z"/>
+  <path d="m24.767 832.67c0.5636-1.6 2.0759-2.671 3.7729-2.671h152.67c1.791 0 3.364 1.191 3.85 2.915l18.592 66c0.199 0.71 0.199 1.46 0 2.17l-18.592 66c-0.486 1.724-2.059 2.915-3.85 2.915h-152.67c-1.697 0-3.2093-1.071-3.7729-2.671l-23.239-66c-0.30274-0.86-0.30274-1.798 0-2.658l23.239-66z"/>
+  <rect x="65" y="970" width="76" height="191"/>
+  <path d="m134.96 889.96c6.62-6.619 17.351-6.619 23.97 0l124.1 124.11c6.619 6.61 6.619 17.35 0 23.97-6.62 6.61-17.351 6.61-23.97 0l-124.1-124.11c-6.619-6.619-6.619-17.35 0-23.97z"/>
+ </g><path d="m278.34 1033.8c-4.296 4.29-11.261 4.29-15.557 0-4.295-4.3-4.295-11.26 0-15.56 4.296-4.29 11.261-4.29 15.557 0 4.296 4.3 4.296 11.26 0 15.56z" stroke="#1A1A1A" stroke-width="2"/><path d="m155.75 910.75c-4.296 4.296-11.261 4.296-15.556 0-4.296-4.296-4.296-11.261 0-15.556 4.295-4.296 11.26-4.296 15.556 0 4.296 4.295 4.296 11.26 0 15.556z" stroke="#1A1A1A" stroke-width="2"/><path d="m336.32 0s-336.32 0-336.32 201v985.08c0 7.9536 8.9545 13.921 20 13.921h960c11.045 0 20-5.9676 20-13.921v-985.08c0-201-330.35-201-330.35-201h-169.65zm335.35 243.6c-6.4435 0-11.666 3.7608-11.666 8.4v901.2c0 4.6392 5.2235 8.4 11.666 8.4h73.33c6.4435 0 11.666-3.7608 11.666-8.4v-901.2c0-4.6392-5.2235-8.4-11.666-8.4z" fill="#000" fill-opacity="0" style="stroke-width:2.2361" tb:tag="clickArea"/><g transform="translate(0,1116)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 1116)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/platform-hp.svg b/application/src/main/data/json/system/scada_symbols/platform-hp.svg
new file mode 100644
index 0000000000..af9b72a2e5
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/platform-hp.svg
@@ -0,0 +1,267 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="1200" height="600" fill="none" version="1.1" viewBox="0 0 1200 600"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Platform",
+  "description": "Platform with various states.",
+  "searchTags": [
+    "platform",
+    "drilling"
+  ],
+  "widgetSizeX": 6,
+  "widgetSizeY": 3,
+  "tags": [
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<path d="m1199 201.7v397.3h-1198v-397.3c0.62677 0.346 1.4439 0.79199 2.4378 1.328 2.5404 1.371 6.2364 3.328 10.864 5.676 9.2543 4.696 22.238 10.957 37.156 17.218 29.8 12.508 67.456 25.078 98.542 25.078s68.743-12.57 98.542-25.078c14.918-6.261 27.902-12.522 37.156-17.218 4.628-2.348 8.324-4.305 10.864-5.676 1.27-0.68499 2.252-1.224 2.916-1.592 0.204-0.113 0.379-0.209 0.522-0.28999 0.143 0.081 0.318 0.17699 0.522 0.28999 0.664 0.368 1.646 0.907 2.916 1.592 2.54 1.371 6.236 3.328 10.864 5.676 9.254 4.696 22.238 10.957 37.156 17.218 29.799 12.508 67.456 25.078 98.542 25.078s68.743-12.57 98.542-25.078c14.918-6.261 27.902-12.522 37.156-17.218 4.628-2.348 8.324-4.305 10.864-5.676 1.27-0.68499 2.252-1.224 2.916-1.592 0.204-0.113 0.379-0.209 0.522-0.28999 0.143 0.081 0.318 0.17699 0.522 0.28999 0.664 0.368 1.646 0.907 2.916 1.592 2.54 1.371 6.236 3.328 10.864 5.676 9.254 4.696 22.238 10.957 37.156 17.218 29.799 12.508 67.456 25.078 98.542 25.078s68.743-12.57 98.542-25.078c14.918-6.261 27.902-12.522 37.156-17.218 4.628-2.348 8.324-4.305 10.864-5.676 1.27-0.68499 2.252-1.224 2.916-1.592 0.204-0.113 0.379-0.209 0.522-0.28999 0.143 0.081 0.318 0.17699 0.522 0.28999 0.664 0.368 1.646 0.907 2.916 1.592 2.54 1.371 6.236 3.328 10.864 5.676 9.254 4.696 22.238 10.957 37.156 17.218 29.799 12.508 67.452 25.078 98.542 25.078s68.74-12.57 98.54-25.078c14.92-6.261 27.9-12.522 37.16-17.218 4.63-2.348 8.32-4.305 10.86-5.676 1-0.536 1.81-0.98199 2.44-1.328z" stroke="#1a1a1a" stroke-width="2"/><path d="m700 300h500" stroke="#1a1a1a" stroke-width="6"/><path d="m600 0v200" stroke="#1a1a1a" stroke-width="6"/><path d="m600 400v200" stroke="#1a1a1a" stroke-width="6"/><path d="m700 300h-85c-8.284 0-15 6.716-15 15v85" stroke="#1a1a1a" stroke-width="6"/><path d="m700 300h-85c-8.284 0-15-6.716-15-15v-85" stroke="#1a1a1a" stroke-width="6"/><path d="m600 200v200" stroke="#1a1a1a" stroke-width="6"/><path d="m600 313v-26s0 13 14 13c-14 0-14 13-14 13z" fill="#1a1a1a" stroke="#1a1a1a" stroke-width="2"/><rect x="1074" y="99" width="48" height="462" stroke="#1a1a1a" stroke-width="2"/><rect x="1037" y="561" width="122" height="38" stroke="#1a1a1a" stroke-width="2"/><rect x="78" y="99" width="48" height="462" stroke="#1a1a1a" stroke-width="2"/><rect x="41" y="561" width="122" height="38" stroke="#1a1a1a" stroke-width="2"/><rect x="1" y="1" width="1198" height="98" stroke="#1a1a1a" stroke-width="2"/><path d="m599.68 99.026-598.68-98.026" stroke="#1a1a1a" stroke-width="2.0003"/><path d="m599.68 99.026-598.68-98.027" stroke="#1a1a1a" stroke-width="1.9995"/><path d="m600 99.026 598.68-98.026" stroke="#1a1a1a" stroke-width="2.0003"/><path d="m599.68 0.99987-598.68 98.027" stroke="#1a1a1a" stroke-width="1.9995"/><path d="m600 1.0007 599.68 98.025" stroke="#1a1a1a" stroke-width="2.0011"/><path d="m403.58 0s-403.58 0-403.58 100.5v492.54c0 3.9768 10.745 6.9606 24 6.9606h1152c13.254 0 24-2.9838 24-6.9606v-492.54c0-100.5-396.42-100.5-396.42-100.5h-203.57zm402.42 121.8c-7.7322 0-14 1.8804-14 4.2v450.6c0 2.3196 6.2682 4.2 14 4.2h87.996c7.7322 0 14-1.8804 14-4.2v-450.6c0-2.3196-6.2682-4.2-14-4.2z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,516)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 516)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/power-socket-hp.svg b/application/src/main/data/json/system/scada_symbols/power-socket-hp.svg
new file mode 100644
index 0000000000..5524b3bb14
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/power-socket-hp.svg
@@ -0,0 +1,371 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Power socket",
+  "description": "Power socket with various states.",
+  "searchTags": [
+    "EU socket",
+    "US socket",
+    "Middle East socket",
+    "energy"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "eu-socket",
+      "stateRenderFunction": "if (ctx.properties.socketType === 'eu') {\n    element.show();\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "middle-east-socket",
+      "stateRenderFunction": "if (ctx.properties.socketType === 'middleEast') {\n    element.show();\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "us-socket",
+      "stateRenderFunction": "if (ctx.properties.socketType === 'us') {\n    element.show();\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "socketType",
+      "name": "{i18n:scada.symbol.socket}",
+      "type": "select",
+      "default": "eu",
+      "fieldClass": "flex",
+      "items": [
+        {
+          "value": "eu",
+          "label": "EU"
+        },
+        {
+          "value": "us",
+          "label": "US"
+        },
+        {
+          "value": "middleEast",
+          "label": "Middle East"
+        }
+      ],
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="198" height="198" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><g tb:tag="eu-socket">
+  <circle cx="100" cy="100" r="69" stroke="#1A1A1A" stroke-width="2"/>
+  <circle cx="100" cy="64" r="7" stroke="#727171" stroke-width="2"/>
+  <circle cx="129" cy="100" r="8" fill="#1A1A1A"/>
+  <circle cx="71" cy="100" r="8" fill="#1A1A1A"/>
+ </g><g style="display: none;" tb:tag="us-socket">
+  <rect x="74" y="84" width="6" height="32" rx="1" fill="#1a1a1a" style=""/>
+  <rect x="120" y="84" width="6" height="32" rx="1" fill="#1a1a1a" style=""/>
+  <rect x="31" y="31" width="138" height="138" rx="3" stroke="#1a1a1a" stroke-width="2" style=""/>
+ </g><g style="display: none;" tb:tag="middle-east-socket">
+  <rect x="31" y="31" width="138" height="138" rx="3" stroke="#1a1a1a" stroke-width="2" style=""/>
+  <rect transform="rotate(90,85,124)" x="85" y="124" width="6" height="24" rx="1" fill="#1a1a1a" style=""/>
+  <rect transform="rotate(-90,115,130)" x="115" y="130" width="6" height="24" rx="1" fill="#1a1a1a" style=""/>
+  <rect x="95" y="70" width="10" height="24" rx="1" fill="#1a1a1a" style=""/>
+ </g><path d="m67.267 0s-67.267 0-67.267 33.5v164.18c0 1.3256 1.7909 2.3202 4 2.3202h192c2.209 0 4-0.9946 4-2.3202v-164.18c0-33.5-66.07-33.5-66.07-33.5h-33.93zm67.07 40.6c-1.2887 0-2.3333 0.6268-2.3333 1.4v150.2c0 0.7732 1.0447 1.4 2.3333 1.4h14.666c1.2887 0 2.3333-0.6268 2.3333-1.4v-150.2c0-0.7732-1.0447-1.4-2.3333-1.4z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/power-transformer-hp.svg b/application/src/main/data/json/system/scada_symbols/power-transformer-hp.svg
new file mode 100644
index 0000000000..67e75be827
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/power-transformer-hp.svg
@@ -0,0 +1,359 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="600" fill="none" version="1.1" viewBox="0 0 400 600"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Power transformer",
+  "description": "Power transformer with various states.",
+  "searchTags": [
+    "power",
+    "energy"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 3,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke-width="2" tb:tag="background">
+  <rect x="17" y="161" width="366" height="398" rx="5" stroke="#1a1a1a"/>
+  <rect x="1" y="559" width="398" height="40" rx="5" stroke="#1a1a1a"/>
+  <path d="m67 35.406c0-3.4797 1.5105-6.788 4.1398-9.0673l5.4938-4.7625c5.6366-4.8862 12.846-7.576 20.306-7.576h6.1218c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.7625c2.63 2.2793 4.14 5.5876 4.14 9.0673v2.3965c0 5.0878-3.208 9.6226-8.006 11.316l-2.189 0.7724c-3.955 1.3961-8.119 2.1094-12.314 2.1094h-20.982c-4.1947 0-8.3588-0.7133-12.314-2.1094l-2.1886-0.7724c-4.7978-1.6933-8.0062-6.2281-8.0062-11.316v-2.3965z" stroke="#1A1A1A"/>
+  <path d="m67 73.406c0-3.4797 1.5105-6.788 4.1398-9.0673l5.4938-4.7625c5.6366-4.8862 12.846-7.576 20.306-7.576h6.1218c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.7625c2.63 2.2793 4.14 5.5876 4.14 9.0673v2.3965c0 5.0878-3.208 9.6226-8.006 11.316l-2.189 0.7724c-3.955 1.3961-8.119 2.1094-12.314 2.1094h-20.982c-4.1947 0-8.3588-0.7133-12.314-2.1094l-2.1886-0.7724c-4.7978-1.6933-8.0062-6.2281-8.0062-11.316v-2.3965z" stroke="#1A1A1A"/>
+  <path d="m67 111.41c0-3.48 1.5105-6.788 4.1398-9.068l5.4938-4.762c5.6366-4.8862 12.846-7.576 20.306-7.576h6.1218c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.762c2.63 2.28 4.14 5.588 4.14 9.068v2.396c0 5.088-3.208 9.623-8.006 11.316l-2.189 0.773c-3.955 1.396-8.119 2.109-12.314 2.109h-20.982c-4.1947 0-8.3588-0.713-12.314-2.109l-2.1886-0.773c-4.7978-1.693-8.0062-6.228-8.0062-11.316v-2.396z" stroke="#1A1A1A"/>
+  <rect x="85" y="128" width="30" height="11" rx="1" stroke="#1A1A1A"/>
+  <path d="m267 35.406c0-3.4797 1.51-6.788 4.14-9.0673l5.494-4.7625c5.636-4.8862 12.846-7.576 20.305-7.576h6.122c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.7625c2.63 2.2793 4.14 5.5876 4.14 9.0673v2.3965c0 5.0878-3.208 9.6226-8.006 11.316l-2.189 0.7724c-3.955 1.3961-8.119 2.1094-12.314 2.1094h-20.982c-4.195 0-8.359-0.7133-12.314-2.1094l-2.189-0.7724c-4.798-1.6933-8.006-6.2281-8.006-11.316z" stroke="#1a1a1a"/>
+  <path d="m267 73.406c0-3.4797 1.51-6.788 4.14-9.0673l5.494-4.7625c5.636-4.8862 12.846-7.576 20.305-7.576h6.122c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.7625c2.63 2.2793 4.14 5.5876 4.14 9.0673v2.3965c0 5.0878-3.208 9.6226-8.006 11.316l-2.189 0.7724c-3.955 1.3961-8.119 2.1094-12.314 2.1094h-20.982c-4.195 0-8.359-0.7133-12.314-2.1094l-2.189-0.7724c-4.798-1.6933-8.006-6.2281-8.006-11.316z" stroke="#1a1a1a"/>
+  <path d="m267 111.41c0-3.48 1.51-6.788 4.14-9.068l5.494-4.762c5.636-4.8862 12.846-7.576 20.305-7.576h6.122c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.762c2.63 2.28 4.14 5.588 4.14 9.068v2.396c0 5.088-3.208 9.623-8.006 11.316l-2.189 0.773c-3.955 1.396-8.119 2.109-12.314 2.109h-20.982c-4.195 0-8.359-0.713-12.314-2.109l-2.189-0.773c-4.798-1.693-8.006-6.228-8.006-11.316z" stroke="#1a1a1a"/>
+  <rect x="285" y="128" width="30" height="11" rx="1" stroke="#1a1a1a"/>
+  <path d="m167 35.406c0-3.4797 1.51-6.788 4.14-9.0673l5.494-4.7625c5.636-4.8862 12.846-7.576 20.305-7.576h6.122c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.7625c2.63 2.2793 4.14 5.5876 4.14 9.0673v2.3965c0 5.0878-3.208 9.6226-8.006 11.316l-2.189 0.7724c-3.955 1.3961-8.119 2.1094-12.314 2.1094h-20.982c-4.195 0-8.359-0.7133-12.314-2.1094l-2.189-0.7724c-4.798-1.6933-8.006-6.2281-8.006-11.316z" stroke="#1a1a1a"/>
+  <path d="m167 73.406c0-3.4797 1.51-6.788 4.14-9.0673l5.494-4.7625c5.636-4.8862 12.846-7.576 20.305-7.576h6.122c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.7625c2.63 2.2793 4.14 5.5876 4.14 9.0673v2.3965c0 5.0878-3.208 9.6226-8.006 11.316l-2.189 0.7724c-3.955 1.3961-8.119 2.1094-12.314 2.1094h-20.982c-4.195 0-8.359-0.7133-12.314-2.1094l-2.189-0.7724c-4.798-1.6933-8.006-6.2281-8.006-11.316z" stroke="#1a1a1a"/>
+  <path d="m167 111.41c0-3.48 1.51-6.788 4.14-9.068l5.494-4.762c5.636-4.8862 12.846-7.576 20.305-7.576h6.122c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.762c2.63 2.28 4.14 5.588 4.14 9.068v2.396c0 5.088-3.208 9.623-8.006 11.316l-2.189 0.773c-3.955 1.396-8.119 2.109-12.314 2.109h-20.982c-4.195 0-8.359-0.713-12.314-2.109l-2.189-0.773c-4.798-1.693-8.006-6.228-8.006-11.316z" stroke="#1a1a1a"/>
+  <rect x="185" y="128" width="30" height="11" rx="1" stroke="#1a1a1a"/>
+  <rect x="1" y="139" width="398" height="22" rx="5" stroke="#1A1A1A"/>
+ </g><path d="m150.82 410.75c-1.541 0-2.503-1.669-1.731-3.002l49.176-84.942c0.771-1.33 2.692-1.33 3.462 0l49.177 84.942c0.772 1.333-0.19 3.002-1.731 3.002h-98.353z" stroke="#1A1A1A" stroke-width="8"/><path d="m204.37 363.34-16.841 15.085c-1.041 0.943-0.455 2.682 0.943 2.812l13.151 1.268-7.884 10.989c-0.358 0.504-0.309 1.203 0.13 1.642 0.487 0.488 1.251 0.504 1.755 0.033l16.841-15.086c1.041-0.943 0.455-2.682-0.943-2.812l-13.151-1.268 7.885-10.989c0.357-0.504 0.308-1.203-0.131-1.642-0.487-0.488-1.251-0.504-1.755-0.032z" fill="#1A1A1A"/><rect x="90" width="20" height="15" rx="2" fill="#1A1A1A"/><rect x="290" width="20" height="15" rx="2" fill="#1a1a1a"/><rect x="190" width="20" height="15" rx="2" fill="#1a1a1a"/><path d="m134.53 0s-134.53 0-134.53 100.5v492.54c0 3.9768 3.5818 6.9605 8 6.9605h384c4.418 0 8-2.9838 8-6.9605v-492.54c0-100.5-132.14-100.5-132.14-100.5h-67.86zm134.14 121.8c-2.5774 0-4.6666 1.8804-4.6666 4.2v450.6c0 2.3196 2.0894 4.2 4.6666 4.2h29.332c2.5774 0 4.6666-1.8804 4.6666-4.2v-450.6c0-2.3196-2.0894-4.2-4.6666-4.2z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,516)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 520.94)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/preventer-hp.svg b/application/src/main/data/json/system/scada_symbols/preventer-hp.svg
new file mode 100644
index 0000000000..0b193a5665
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/preventer-hp.svg
@@ -0,0 +1,343 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="200" fill="none" version="1.1" viewBox="0 0 400 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Preventer",
+  "description": "Preventer with various states.",
+  "searchTags": [
+    "preventer",
+    "drilling"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<path d="m137 15h1v-14h124v14h32.947l46.053 4.8993v21.201l-46.053 4.8993h-9.947v24h45.907l68.093 12.829v32.342l-68.093 12.829h-45.907v25h8.938l47.062 5.883v20.234l-47.062 5.883h-31.938v14h-124v-14h-31.938l-47.062-5.883v-20.234l47.062-5.883h8.938v-25h-45.907l-68.093-12.829v-32.342l68.093-12.829h45.907v-24h-9.947l-46.053-4.8993v-21.201l46.053-4.8993z" tb:tag="background" fill="#fff" stroke="#1a1a1a" stroke-width="2"/><path d="m134.53 0s-134.53 0-134.53 33.5v164.18c0 1.3256 3.5818 2.3202 8 2.3202h384c4.418 0 8-0.9946 8-2.3202v-164.18c0-33.5-132.14-33.5-132.14-33.5h-67.858zm134.14 40.6c-2.5774 0-4.6666 0.6268-4.6666 1.4v150.2c0 0.7732 2.0894 1.4 4.6666 1.4h29.332c2.5774 0 4.6666-0.6268 4.6666-1.4v-150.2c0-0.7732-2.0894-1.4-4.6666-1.4z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/right-analog-water-level-meter.svg b/application/src/main/data/json/system/scada_symbols/right-analog-water-level-meter.svg
index 4bd6754f5c..1b1be4f007 100644
--- a/application/src/main/data/json/system/scada_symbols/right-analog-water-level-meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/right-analog-water-level-meter.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200"><tb:metadata xmlns=""><![CDATA[{
   "title": "Right analog water level meter",
-  "description": "Right analog water level meter",
+  "description": "Right analog water level meter with real-time display of fluid levels.",
   "searchTags": [
     "water meter"
   ],
diff --git a/application/src/main/data/json/system/scada_symbols/right-drain-pipe.svg b/application/src/main/data/json/system/scada_symbols/right-drain-pipe.svg
index 093078c69b..a990e023e1 100644
--- a/application/src/main/data/json/system/scada_symbols/right-drain-pipe.svg
+++ b/application/src/main/data/json/system/scada_symbols/right-drain-pipe.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="200" fill="none" version="1.1" viewBox="0 0 400 200"><tb:metadata xmlns=""><![CDATA[{
   "title": "Right drain pipe",
-  "description": "Right drain pipe",
+  "description": "Right drain pipe with configurable fluid and leak visualizations.",
   "searchTags": [
     "pipe",
     "drain"
diff --git a/application/src/main/data/json/system/scada_symbols/right-elbow-drain-pipe.svg b/application/src/main/data/json/system/scada_symbols/right-elbow-drain-pipe.svg
index 63b143eeef..6f5ae5abb9 100644
--- a/application/src/main/data/json/system/scada_symbols/right-elbow-drain-pipe.svg
+++ b/application/src/main/data/json/system/scada_symbols/right-elbow-drain-pipe.svg
@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="200" fill="none" version="1.1" viewBox="0 0 400 200">
 <tb:metadata xmlns=""><![CDATA[{
   "title": "Right elbow drain pipe",
-  "description": "Right elbow drain pipe",
+  "description": "Right elbow drain pipe with configurable fluid and leak visualizations.",
   "searchTags": [
     "pipe",
     "drain"
diff --git a/application/src/main/data/json/system/scada_symbols/right-flow-meter.svg b/application/src/main/data/json/system/scada_symbols/right-flow-meter.svg
index 9be5ec5857..6a201111ef 100644
--- a/application/src/main/data/json/system/scada_symbols/right-flow-meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/right-flow-meter.svg
@@ -57,7 +57,7 @@
     },
     {
       "tag": "value",
-      "stateRenderFunction": "var value = ctx.values.value;\nctx.api.text(element, value.toFixed(0));\n",
+      "stateRenderFunction": "var value = ctx.api.formatValue(ctx.values.value, ctx.properties.valueDecimals, '', false);\nctx.api.text(element, value);\n",
       "actions": {
         "click": {
           "actionFunction": "ctx.api.callAction(event, 'displayClick');"
@@ -463,16 +463,16 @@
       "name": "{i18n:scada.symbol.units}",
       "type": "units",
       "default": "m³/hr",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
+      "fieldClass": "medium-width"
+    },
+    {
+      "id": "valueDecimals",
+      "name": "{i18n:scada.symbol.decimals}",
+      "type": "number",
+      "default": 0,
       "fieldClass": "medium-width",
-      "min": null,
-      "max": null,
-      "step": null
+      "min": 0,
+      "step": 1
     },
     {
       "id": "defaultBorderColor",
@@ -510,17 +510,7 @@
           "rangeAdvanced": []
         },
         "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';"
-      },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      }
     },
     {
       "id": "activeBorderColor",
@@ -558,17 +548,7 @@
           "rangeAdvanced": []
         },
         "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';"
-      },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      }
     },
     {
       "id": "warningBorderColor",
@@ -606,17 +586,7 @@
           "rangeAdvanced": []
         },
         "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';"
-      },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      }
     },
     {
       "id": "criticalBorderColor",
@@ -654,17 +624,7 @@
           "rangeAdvanced": []
         },
         "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';"
-      },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      }
     },
     {
       "id": "backgroundColor",
@@ -702,49 +662,19 @@
           "rangeAdvanced": []
         },
         "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';"
-      },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      }
     },
     {
       "id": "fluidColor",
       "name": "{i18n:scada.symbol.fluid-color}",
       "type": "color",
-      "default": "#1EC1F480",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "default": "#1EC1F480"
     },
     {
       "id": "pipeColor",
       "name": "{i18n:scada.symbol.pipe-color}",
       "type": "color",
-      "default": "#FFFFFF",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "default": "#FFFFFF"
     }
   ]
 }]]></tb:metadata>
diff --git a/application/src/main/data/json/system/scada_symbols/rotor-hp.svg b/application/src/main/data/json/system/scada_symbols/rotor-hp.svg
new file mode 100644
index 0000000000..729e85eac1
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/rotor-hp.svg
@@ -0,0 +1,346 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="200" fill="none" version="1.1" viewBox="0 0 400 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Rotor",
+  "description": "Rotor with various states.",
+  "searchTags": [
+    "rotor",
+    "drilling"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "rotor-background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<path d="m163 1h74v76h-74v-76z" fill="#fff" stroke="#1A1A1A" stroke-width="2"/><g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="rotor-background">
+  <path d="m51 77h298v88h-298v-88z"/>
+  <path d="m1 165h398v34h-398l-5e-5 -34z"/>
+ </g><path d="m134.53 0s-134.53 0-134.53 33.5v164.18c0 1.3256 3.5818 2.3202 8 2.3202h384c4.418 0 8-0.9946 8-2.3202v-164.18c0-33.5-132.14-33.5-132.14-33.5h-67.858zm134.14 40.6c-2.5774 0-4.6666 0.6268-4.6666 1.4v150.2c0 0.7732 2.0894 1.4 4.6666 1.4h29.332c2.5774 0 4.6666-0.6268 4.6666-1.4v-150.2c0-0.7732-2.0894-1.4-4.6666-1.4z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,116)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0,116)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/short-bottom-filter.svg b/application/src/main/data/json/system/scada_symbols/short-bottom-filter.svg
index b3235c5906..cf191d40fe 100644
--- a/application/src/main/data/json/system/scada_symbols/short-bottom-filter.svg
+++ b/application/src/main/data/json/system/scada_symbols/short-bottom-filter.svg
@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="400" fill="none" version="1.1" viewBox="0 0 200 400">
 <tb:metadata xmlns=""><![CDATA[{
   "title": "Short bottom filter",
-  "description": "Short bottom filter",
+  "description": "Short bottom filter with configurable click actions for custom operations, dashboard manipulation, etc.",
   "searchTags": [
     "filter"
   ],
diff --git a/application/src/main/data/json/system/scada_symbols/short-left-drain-pipe.svg b/application/src/main/data/json/system/scada_symbols/short-left-drain-pipe.svg
index abf43aacb9..da2273d096 100644
--- a/application/src/main/data/json/system/scada_symbols/short-left-drain-pipe.svg
+++ b/application/src/main/data/json/system/scada_symbols/short-left-drain-pipe.svg
@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200">
  <tb:metadata><![CDATA[{
   "title": "Short left drain pipe",
-  "description": "Short left drain pipe",
+  "description": "Short left drain pipe with configurable fluid and leak visualizations.",
   "searchTags": [
     "pipe",
     "drain"
diff --git a/application/src/main/data/json/system/scada_symbols/short-right-drain-pipe.svg b/application/src/main/data/json/system/scada_symbols/short-right-drain-pipe.svg
index 1b2ae3934a..1e01fe8b77 100644
--- a/application/src/main/data/json/system/scada_symbols/short-right-drain-pipe.svg
+++ b/application/src/main/data/json/system/scada_symbols/short-right-drain-pipe.svg
@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200">
  <tb:metadata><![CDATA[{
   "title": "Short right drain pipe",
-  "description": "Short right drain pipe",
+  "description": "Short right drain pipe with configurable fluid and leak visualizations.",
   "searchTags": [
     "pipe",
     "drain"
diff --git a/application/src/main/data/json/system/scada_symbols/short-top-filter.svg b/application/src/main/data/json/system/scada_symbols/short-top-filter.svg
index d50eada2aa..0a77c78f00 100644
--- a/application/src/main/data/json/system/scada_symbols/short-top-filter.svg
+++ b/application/src/main/data/json/system/scada_symbols/short-top-filter.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="400" fill="none" version="1.1" viewBox="0 0 200 400">
 <tb:metadata xmlns=""><![CDATA[{
-  "title": "Short top filter",
+  "title": "Short top filter with configurable click actions for custom operations, dashboard manipulation, etc.",
   "description": "Short top filter",
   "searchTags": [
     "filter"
diff --git a/application/src/main/data/json/system/scada_symbols/simple-vertical-scale-hp.svg b/application/src/main/data/json/system/scada_symbols/simple-vertical-scale-hp.svg
index bfc356cca2..fa0c0fc4d1 100644
--- a/application/src/main/data/json/system/scada_symbols/simple-vertical-scale-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/simple-vertical-scale-hp.svg
@@ -704,7 +704,7 @@
     }
   ]
 }]]></tb:metadata>
-<text x="206.16602" y="43.234375" fill="#000000" font-family="Roboto" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">Outdoor</tspan></text><text x="195.21875" y="786.75" fill="#000000" font-family="Roboto" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">°C</tspan></text><g stroke="#000" tb:tag="scale">
+<text x="206.16602" y="43.234375" fill="#000000" font-family="Roboto" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">Outdoor</tspan></text><text x="195.21875" y="770" fill="#000000" font-family="Roboto" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">°C</tspan></text><g stroke="#000" tb:tag="scale">
   <rect x="176.5" y="83" width="41" height="652" fill="#c8dff7" tb:tag="scaleBackground"/>
   <rect transform="scale(1,-1)" x="176.5" y="-735" width="41" height="164" fill="#ebebeb" tb:tag="lowWarningScale"/>
   <rect x="176.5" y="83.5" width="41" height="164" fill="#ebebeb" tb:tag="highWarningScale"/>
diff --git a/application/src/main/data/json/system/scada_symbols/single-key-switch-hp.svg b/application/src/main/data/json/system/scada_symbols/single-key-switch-hp.svg
new file mode 100644
index 0000000000..77d6e7f95d
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/single-key-switch-hp.svg
@@ -0,0 +1,373 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Single-key switch",
+  "description": "Single-key switch with various states.",
+  "searchTags": [
+    "energy",
+    "power"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.backgroundColor});",
+      "actions": null
+    },
+    {
+      "tag": "button",
+      "stateRenderFunction": "var color = ctx.properties.disabledColor;\nif (ctx.values.initialState) {\n    color = ctx.properties.enabledColor;\n}\nelement.attr({fill: color});",
+      "actions": {
+        "click": {
+          "actionFunction": "var initial = ctx.values.initialState;\nvar action = initial ? 'offUpdateState' : 'onUpdateState';\n\nctx.api.callAction(event, action, undefined, {\n  next: () => {\n     ctx.api.setValue('initialState', !initial);\n  }\n});"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "initialState",
+      "name": "{i18n:scada.symbol.on-off-state}",
+      "hint": "{i18n:scada.symbol.on-off-state-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": "{i18n:scada.symbol.on}",
+      "falseLabel": "{i18n:scada.symbol.off}",
+      "stateLabel": "",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "onUpdateState",
+      "name": "{i18n:scada.symbol.on-update-state}",
+      "hint": "{i18n:scada.symbol.on-update-state-hint}",
+      "group": null,
+      "type": "action",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": {
+        "action": "EXECUTE_RPC",
+        "executeRpc": {
+          "method": "setState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "setAttribute": {
+          "scope": "SERVER_SCOPE",
+          "key": "state"
+        },
+        "putTimeSeries": {
+          "key": "state"
+        },
+        "valueToData": {
+          "type": "CONSTANT",
+          "constantValue": true,
+          "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;"
+        }
+      },
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "offUpdateState",
+      "name": "{i18n:scada.symbol.off-update-state}",
+      "hint": "{i18n:scada.symbol.off-update-state-hint}",
+      "group": null,
+      "type": "action",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": {
+        "action": "EXECUTE_RPC",
+        "executeRpc": {
+          "method": "setState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "setAttribute": {
+          "key": "state",
+          "scope": "SERVER_SCOPE"
+        },
+        "putTimeSeries": {
+          "key": "state"
+        },
+        "valueToData": {
+          "type": "CONSTANT",
+          "constantValue": false,
+          "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;"
+        }
+      },
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    }
+  ],
+  "properties": [
+    {
+      "id": "backgroundColor",
+      "name": "{i18n:scada.symbol.background-color}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "enabledColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.enabled}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "disabledColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.disabled}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="198" height="198" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m26 29c0-1.6569 1.3431-3 3-3h142c1.657 0 3 1.3431 3 3v142c0 1.657-1.343 3-3 3h-142c-1.6569 0-3-1.343-3-3v-142z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="button"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/small-horizontal-separator-connector-hp.svg b/application/src/main/data/json/system/scada_symbols/small-horizontal-separator-connector-hp.svg
new file mode 100644
index 0000000000..dedc4dc81e
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/small-horizontal-separator-connector-hp.svg
@@ -0,0 +1,342 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="1000" height="400" fill="none" version="1.1" viewBox="0 0 1000 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Small horizontal separator with connector",
+  "description": "Small horizontal separator with connector with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 5,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="81" width="898" height="318" rx="119" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m1e3 300h-8c-16.569 0-30-13.431-30-30v-237c0-16.568-13.431-30-30-30h-240c-16.569 0-30 13.432-30 30v47" stroke="#1A1A1A" stroke-width="6"/><path d="m336.71 0.31299s-336.32 0-336.32 67v328.36c0 2.6512 8.9545 4.6403 20 4.6403h960c11.045 0 20-1.9892 20-4.6403v-328.36c0-67-330.35-67-330.35-67h-169.65zm335.35 81.2c-6.4435 0-11.666 1.2536-11.666 2.8v300.4c0 1.5464 5.2235 2.8 11.666 2.8h73.33c6.4435 0 11.666-1.2536 11.666-2.8v-300.4c0-1.5464-5.2235-2.8-11.666-2.8z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 316)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/small-horizontal-separator-hp.svg b/application/src/main/data/json/system/scada_symbols/small-horizontal-separator-hp.svg
new file mode 100644
index 0000000000..2bb0b1b244
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/small-horizontal-separator-hp.svg
@@ -0,0 +1,342 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="1000" height="400" fill="none" version="1.1" viewBox="0 0 1000 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Small horizontal separator",
+  "description": "Small horizontal separator with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 5,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="998" height="398" rx="159" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m336.32 0s-336.32 0-336.32 67v328.36c0 2.6512 8.9545 4.6403 20 4.6403h960c11.045 0 20-1.9892 20-4.6403v-328.36c0-67-330.35-67-330.35-67h-169.65zm335.35 81.2c-6.4435 0-11.666 1.2536-11.666 2.8v300.4c0 1.5464 5.2235 2.8 11.666 2.8h73.33c6.4435 0 11.666-1.2536 11.666-2.8v-300.4c0-1.5464-5.2235-2.8-11.666-2.8z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 316)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/small-left-meter.svg b/application/src/main/data/json/system/scada_symbols/small-left-meter.svg
new file mode 100644
index 0000000000..a480412366
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/small-left-meter.svg
@@ -0,0 +1,717 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="100" height="200" fill="none" version="1.1" viewBox="0 0 100 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "Small left meter",
+  "description": "Small left meter displays the current value with a moving pointer on the scale.",
+  "searchTags": [
+    "scale",
+    "level",
+    "progress",
+    "thermometer"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.backgroundColor});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "progress-indicator",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue, initial) {\n    var clampedValue = Math.max(Math.min(value, Math.max(minValue, maxValue)), Math.min(minValue, maxValue));\n    var normalizedValue = minValue < maxValue\n        ? (clampedValue - minValue) / (maxValue - minValue)\n        : (minValue - clampedValue) / (minValue - maxValue);\n    var offset = initial - (normalizedValue * initial);\n    return offset;\n}\n\nvar valueSet = element.remember('valueSet');\n\nif (ctx.properties.progressArrow && !ctx.properties.progressBar) {\n    element.show();\n    var initial = ctx.properties.valueBox ? 135 : 168;\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.transform({\n            translateY: initial\n        });\n    }\n    \n    var minValue = ctx.properties.minValue;\n    var maxValue = ctx.properties.maxValue;\n    var value = ctx.values.value;\n    \n    var colorProcessor = ctx.properties.progressArrowColor;\n    colorProcessor.update(value);\n    var fill = colorProcessor.color;\n    element.attr({fill: fill});\n    \n    var offset = calculateOffset(value, minValue, maxValue, initial);\n\n    var elementOffset = element.remember('offset');\n    if (offset !== elementOffset) {\n        element.remember('offset', offset);\n        ctx.api.cssAnimate(element, 500).transform({\n            translateY: offset\n        });\n    }\n} else {\n    element.hide();\n    if (valueSet) {\n        element.remember('valueSet', false);\n    }\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressBar",
+      "stateRenderFunction": "if (ctx.properties.progressBar) {\n    element.show();\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressBorder",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    element.attr({'height': 137})\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressCircle",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    element.attr({cy:152});\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressFill",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    element.attr({y:-147});\n}\n\nfunction calculateOffset(value, minValue, maxValue, initial) {\n    var clampedValue = Math.max(Math.min(value, Math.max(minValue, maxValue)), Math.min(minValue, maxValue));\n    var normalizedValue = minValue < maxValue\n        ? (clampedValue - minValue) / (maxValue - minValue)\n        : (minValue - clampedValue) / (minValue - maxValue);\n    var offset = normalizedValue * initial;\n    return offset;\n}\n\nvar valueSet = element.remember('valueSet');\nif (ctx.properties.progressBar) {\n    var initial = ctx.properties.valueBox ? 135: 168;\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 2});\n    }\n    \n    var minValue = ctx.properties.minValue;\n    var maxValue = ctx.properties.maxValue;\n    var value = ctx.values.value;\n    \n    var colorProcessor = ctx.properties.progressBarColor;\n    colorProcessor.update(value);\n    var fill = colorProcessor.color;\n    element.attr({fill: fill, stroke: fill});\n    ctx.tags.progressCircle[0].fill(fill);\n    \n    var height = calculateOffset(value, minValue, maxValue, initial);\n\n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.cssAnimate(element, 500).attr({height: height+2});\n    }\n} else {\n    if (valueSet) {\n        element.remember('valueSet', false);\n    }\n}",
+      "actions": null
+    },
+    {
+      "tag": "scale",
+      "stateRenderFunction": "var scaleSet = element.remember('scaleSet');\nif (!scaleSet) {\n    element.remember('scaleSet', true);\n    element.clear();\n    \n    var majorIntervals = ctx.properties.majorIntervals;\n    var minorIntervals = ctx.properties.minorIntervals;\n    var minValue = ctx.properties.minValue;\n    var maxValue = ctx.properties.maxValue;\n    \n    var start = 11;\n    var end = ctx.properties.valueBox ? 134 : 167;\n    var majorIntervalLength = end / majorIntervals;\n    var minorIntervalLength = majorIntervalLength / minorIntervals;\n    element.add(ctx.svg.line(50, end+11, 50, 11).stroke({ width: 1 }).attr({class: 'majorTick'}));\n    for (var i = 0; i < majorIntervals+1; i++) {\n        var y = start + i * majorIntervalLength;\n        var line = ctx.svg.line(38, y, 50, y).stroke({ width: 1 }).attr({class: 'majorTick'});\n        element.add(line);\n        var majorText = (maxValue - ((maxValue - (minValue)) / (majorIntervals) * i)).toFixed(0);\n        var majorTickText = ctx.svg.text(majorText);\n        majorTickText.attr({x: 32, y: y + 2, 'text-anchor': 'end', class: 'majorTickText'});\n        majorTickText.first().attr({'dominant-baseline': 'middle'});\n        element.add(majorTickText);\n        if (i < majorIntervals) {\n            drawMinorTicks(y, minorIntervals, minorIntervalLength);\n        }\n    }\n}\n\nvar majorFont = ctx.properties.majorFont;\nvar majorColor = ctx.properties.majorColor;\nvar minorColor = ctx.properties.minorColor;\nif (ctx.values.critical) {\n    majorColor = ctx.properties.majorCriticalColor;\n    minorColor = ctx.properties.minorCriticalColor;\n} else if (ctx.values.warning) {\n    majorColor = ctx.properties.minorWarningColor;\n    minorColor = ctx.properties.minorWarningColor;\n}\n\nvar majorTicks = element.find('line.majorTick');\nmajorTicks.forEach(t => t.attr({stroke: majorColor}));\n\nvar majorTicksText = element.find('text.majorTickText');\nctx.api.font(majorTicksText, majorFont, majorColor);\n\nvar minorTicks = element.find('line.minorTick');\nminorTicks.forEach(t => t.attr({stroke: minorColor}));\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\nfunction drawMinorTicks(start, minorIntervals, minorIntervalLength) {\n    for (var i = 1; i < minorIntervals; i++) {\n        var minorY = start + i * minorIntervalLength;\n        var minorLine = ctx.svg.line(44, minorY, 50, minorY).stroke({ width: 1 }).attr({class: 'minorTick'});\n        element.add(minorLine);\n    }\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    element.show();\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box-background",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    var colorProcessor = ctx.properties.valueBoxColor;\n    colorProcessor.update(ctx.values.value);\n    element.attr({fill: colorProcessor.color});\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-text",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    var valueTextFont = ctx.properties.valueTextFont;\n    var valueTextColor = ctx.properties.valueTextColor;\n    var currentVolume = ctx.values.value;\n    var valueText = ctx.api.formatValue(currentVolume, 0, ctx.properties.valueUnits, false);\n    var colorProcessor = ctx.properties.valueTextColor;\n    colorProcessor.update(ctx.values.value);\n    ctx.api.font(element, valueTextFont, colorProcessor.color);\n    ctx.api.text(element, valueText);\n}",
+      "actions": null
+    }
+  ],
+  "behavior": [
+    {
+      "id": "value",
+      "name": "{i18n:scada.symbol.value}",
+      "hint": null,
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "waterLevel"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning-state}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical-state}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "minValue",
+      "name": "{i18n:scada.symbol.min-max-value}",
+      "type": "number",
+      "default": 0,
+      "required": true,
+      "subLabel": "{i18n:scada.symbol.min-value}",
+      "divider": true,
+      "min": -1000,
+      "step": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "maxValue",
+      "name": "{i18n:scada.symbol.min-max-value}",
+      "type": "number",
+      "default": 100,
+      "required": true,
+      "subLabel": "{i18n:scada.symbol.max-value}",
+      "max": 1000,
+      "step": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "backgroundColor",
+      "name": "{i18n:scada.symbol.background-color}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressBar",
+      "name": "{i18n:scada.symbol.progress-bar}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressBarColor",
+      "name": "{i18n:scada.symbol.progress-bar}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#4D94E1",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "progressBar",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressArrow",
+      "name": "{i18n:scada.symbol.progress-arrow}",
+      "type": "switch",
+      "default": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressArrowColor",
+      "name": "{i18n:scada.symbol.progress-arrow}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#1C943E",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "progressArrow",
+      "disabled": true,
+      "visible": true
+    },
+    {
+      "id": "valueBox",
+      "name": "{i18n:scada.symbol.value-box}",
+      "type": "switch",
+      "default": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueBoxColor",
+      "name": "{i18n:scada.symbol.value-box}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#F3F3F3",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "valueBox",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueUnits",
+      "name": "{i18n:scada.symbol.value-text}",
+      "type": "units",
+      "default": "%",
+      "subLabel": "{i18n:scada.symbol.units}",
+      "disableOnProperty": "valueBox",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueTextFont",
+      "name": "{i18n:scada.symbol.value-text}",
+      "type": "font",
+      "default": {
+        "size": 14,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "500",
+        "style": "normal"
+      },
+      "disableOnProperty": "valueBox",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueTextColor",
+      "name": "{i18n:scada.symbol.value-text}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#0000008A",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "valueBox",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorIntervals",
+      "name": "{i18n:scada.symbol.major-ticks}",
+      "type": "number",
+      "default": 5,
+      "subLabel": "{i18n:scada.symbol.intervals}",
+      "divider": true,
+      "min": 1,
+      "step": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorFont",
+      "name": "{i18n:scada.symbol.major-ticks}",
+      "type": "font",
+      "default": {
+        "size": 12,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "500",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorColor",
+      "name": "{i18n:scada.symbol.major-ticks-color}",
+      "type": "color",
+      "default": "#747474",
+      "subLabel": "{i18n:scada.symbol.normal}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorWarningColor",
+      "name": "{i18n:scada.symbol.major-ticks-color}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorCriticalColor",
+      "name": "{i18n:scada.symbol.major-ticks-color}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorIntervals",
+      "name": "{i18n:scada.symbol.minor-ticks}",
+      "type": "number",
+      "default": 10,
+      "subLabel": "{i18n:scada.symbol.intervals}",
+      "min": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorColor",
+      "name": "{i18n:scada.symbol.minor-ticks-color}",
+      "type": "color",
+      "default": "#747474",
+      "subLabel": "{i18n:scada.symbol.normal}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorWarningColor",
+      "name": "{i18n:scada.symbol.minor-ticks-color}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorCriticalColor",
+      "name": "{i18n:scada.symbol.minor-ticks-color}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<path d="m4 200c-2.2091 0-4-1.791-4-4v-192c0-2.2091 1.7909-4 4-4h68c2.2091 0 4 1.7909 4 4v192c0 2.209-1.7909 4-4 4h-68z" fill="#E5E5E5" tb:tag="background"/><path d="m4 200c-2.2091 0-4-1.791-4-4v-192c0-2.2091 1.7909-4 4-4h68c2.2091 0 4 1.7909 4 4v192c0 2.209-1.7909 4-4 4h-68z" fill="url(#paint0_linear_3742_299967)"/><path d="m4 198.5c-1.3807 0-2.5-1.119-2.5-2.5v-192c0-1.3807 1.1193-2.5 2.5-2.5h68c1.3807 0 2.5 1.1193 2.5 2.5v192c0 1.381-1.1193 2.5-2.5 2.5h-68z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><g tb:tag="scale">
+  <g fill="#919191">
+   <path d="m14.539 10.088v8.5605h-1.4121v-6.8848l-2.0918 0.709v-1.166l3.3339-1.2187zm8.7754 3.58v1.3946c0 0.6679-0.0665 1.2382-0.1993 1.7109-0.1289 0.4688-0.3164 0.8496-0.5625 1.1426-0.2461 0.2929-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2383 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5468 0.2129 0.7734 0.3925 0.2305 0.1797 0.4258 0.4141 0.5859 0.7032 0.1641 0.2851 0.2891 0.6308 0.375 1.0371 0.086 0.4023 0.129 0.8711 0.129 1.4062zm-1.4122 1.5938v-1.8047c0-0.3398-0.0195-0.6387-0.0585-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1133-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4336 0.3984-0.1171 0.1836-0.207 0.4258-0.2695 0.7266-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0195 0.6465 0.0586 0.9082s0.0977 0.4863 0.1758 0.6738c0.0781 0.1836 0.1719 0.3359 0.2812 0.457 0.1133 0.1172 0.2422 0.2032 0.3868 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2226 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441 0.0585-0.3047 0.0878-0.6699 0.0878-1.0957zm8.4825-1.5938v1.3946c0 0.6679-0.0664 1.2382-0.1993 1.7109-0.1289 0.4688-0.3164 0.8496-0.5625 1.1426-0.246 0.2929-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2383 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5469 0.2129 0.7734 0.3925 0.2305 0.1797 0.4258 0.4141 0.586 0.7032 0.164 0.2851 0.289 0.6308 0.375 1.0371 0.0859 0.4023 0.1289 0.8711 0.1289 1.4062zm-1.4121 1.5938v-1.8047c0-0.3398-0.0196-0.6387-0.0586-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1132-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4335 0.3984-0.1172 0.1836-0.2071 0.4258-0.2696 0.7266-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0196 0.6465 0.0586 0.9082 0.0391 0.2617 0.0977 0.4863 0.1758 0.6738 0.0781 0.1836 0.1719 0.3359 0.2813 0.457 0.1132 0.1172 0.2421 0.2032 0.3867 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441s0.0879-0.6699 0.0879-1.0957z"/>
+   <path d="m23.332 49.374c0 0.5313-0.123 0.9785-0.3691 1.3418s-0.582 0.6387-1.0078 0.8262c-0.4219 0.1836-0.8985 0.2754-1.4297 0.2754-0.5313 0-1.0098-0.0918-1.4356-0.2754-0.4257-0.1875-0.7617-0.4629-1.0078-0.8262s-0.3691-0.8105-0.3691-1.3418c0-0.3515 0.0683-0.6699 0.2051-0.955 0.1367-0.2891 0.33-0.5372 0.58-0.7442 0.254-0.2109 0.5508-0.373 0.8907-0.4863 0.3437-0.1133 0.7187-0.1699 1.125-0.1699 0.539 0 1.0215 0.0996 1.4472 0.2988 0.4258 0.1992 0.7598 0.4746 1.002 0.8262 0.2461 0.3515 0.3691 0.7617 0.3691 1.2304zm-1.4179-0.0703c0-0.2851-0.0586-0.5351-0.1758-0.75-0.1172-0.2148-0.2813-0.3808-0.4922-0.498s-0.4551-0.1758-0.7324-0.1758c-0.2813 0-0.5254 0.0586-0.7325 0.1758-0.207 0.1172-0.3691 0.2832-0.4863 0.498-0.1133 0.2149-0.1699 0.4649-0.1699 0.75 0 0.2891 0.0566 0.5391 0.1699 0.75 0.1133 0.207 0.2754 0.3653 0.4863 0.4746 0.211 0.1094 0.459 0.1641 0.7442 0.1641 0.2851 0 0.5312-0.0547 0.7383-0.1641 0.207-0.1093 0.3672-0.2676 0.4804-0.4746 0.1133-0.2109 0.17-0.4609 0.17-0.75zm1.2246-3.8906c0 0.4258-0.1133 0.8047-0.3399 1.1367-0.2226 0.332-0.5312 0.5938-0.9258 0.7852-0.3945 0.1875-0.8437 0.2812-1.3476 0.2812-0.5078 0-0.9609-0.0937-1.3594-0.2812-0.3945-0.1914-0.7051-0.4532-0.9316-0.7852-0.2227-0.332-0.334-0.7109-0.334-1.1367 0-0.5078 0.1113-0.9356 0.334-1.2832 0.2265-0.3516 0.5371-0.6192 0.9316-0.8027 0.3945-0.1836 0.8457-0.2754 1.3535-0.2754s0.959 0.0918 1.3535 0.2754c0.3946 0.1835 0.7032 0.4511 0.9258 0.8027 0.2266 0.3476 0.3399 0.7754 0.3399 1.2832zm-1.4121 0.0469c0-0.2539-0.0508-0.4766-0.1524-0.668-0.0976-0.1953-0.2363-0.3477-0.416-0.457-0.1797-0.1094-0.3926-0.1641-0.6387-0.1641s-0.459 0.0527-0.6386 0.1582c-0.1797 0.1055-0.3184 0.2539-0.4161 0.4453-0.0976 0.1914-0.1464 0.4199-0.1464 0.6856 0 0.2617 0.0488 0.4902 0.1464 0.6855 0.0977 0.1914 0.2364 0.3418 0.4161 0.4512 0.1836 0.1094 0.3984 0.164 0.6445 0.164s0.459-0.0546 0.6387-0.164 0.3183-0.2598 0.416-0.4512c0.0976-0.1953 0.1465-0.4238 0.1465-0.6855zm8.6582 1.2597v1.3946c0 0.6679-0.0664 1.2382-0.1993 1.7109-0.1289 0.4688-0.3164 0.8496-0.5625 1.1426-0.246 0.2929-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2382 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5469 0.2129 0.7734 0.3925 0.2305 0.1797 0.4258 0.4141 0.586 0.7032 0.164 0.2851 0.289 0.6308 0.375 1.0371 0.0859 0.4023 0.1289 0.8711 0.1289 1.4062zm-1.4121 1.5938v-1.8047c0-0.3398-0.0196-0.6387-0.0586-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1132-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4335 0.3984-0.1172 0.1836-0.2071 0.4258-0.2696 0.7266-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0196 0.6465 0.0586 0.9082 0.0391 0.2617 0.0977 0.4863 0.1758 0.6738 0.0781 0.1836 0.1719 0.336 0.2813 0.457 0.1132 0.1172 0.2421 0.2032 0.3867 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441s0.0879-0.6699 0.0879-1.0957z"/>
+   <path d="m22.02 74.016h0.1758v1.1543h-0.0996c-0.5039 0-0.9395 0.0781-1.3066 0.2343-0.3633 0.1563-0.6621 0.3711-0.8965 0.6446-0.2344 0.2734-0.4102 0.5937-0.5274 0.9609-0.1132 0.3633-0.1699 0.75-0.1699 1.1602v1.3418c0 0.3398 0.0371 0.6406 0.1113 0.9023 0.0743 0.2578 0.1778 0.4746 0.3106 0.6504 0.1367 0.1719 0.293 0.3027 0.4687 0.3926 0.1758 0.0898 0.3653 0.1347 0.5684 0.1347 0.2109 0 0.4023-0.0429 0.5742-0.1289 0.1719-0.0898 0.3184-0.2129 0.4395-0.3691 0.1211-0.1563 0.2129-0.3418 0.2754-0.5567 0.0625-0.2148 0.0937-0.4492 0.0937-0.7031 0-0.2422-0.0312-0.4687-0.0937-0.6797-0.0586-0.2148-0.1465-0.4023-0.2637-0.5625-0.1172-0.164-0.2637-0.291-0.4395-0.3808-0.1718-0.0938-0.3711-0.1406-0.5976-0.1406-0.2813 0-0.5371 0.0664-0.7676 0.1992-0.2266 0.1328-0.4102 0.3066-0.5508 0.5215-0.1367 0.2109-0.2109 0.4355-0.2226 0.6738l-0.5391-0.1758c0.0313-0.3633 0.1113-0.6895 0.2402-0.9785 0.1328-0.2891 0.3067-0.5352 0.5215-0.7383 0.2149-0.2031 0.4629-0.3574 0.7442-0.4629 0.2851-0.1094 0.5976-0.164 0.9375-0.164 0.414 0 0.7734 0.0781 1.0781 0.2343 0.3047 0.1563 0.5566 0.3692 0.7558 0.6387 0.2032 0.2656 0.3536 0.5703 0.4512 0.9141 0.1016 0.3398 0.1524 0.6953 0.1524 1.0664 0 0.4101-0.0625 0.7929-0.1875 1.1484-0.125 0.3516-0.3086 0.6602-0.5508 0.9258-0.2383 0.2656-0.5293 0.4726-0.8731 0.6211-0.3398 0.1484-0.7265 0.2226-1.1601 0.2226-0.4571 0-0.8653-0.0879-1.2246-0.2636-0.3555-0.1758-0.6582-0.418-0.9082-0.7266-0.2461-0.3086-0.4336-0.6641-0.5625-1.0664s-0.1934-0.8281-0.1934-1.2773v-0.586c0-0.6484 0.082-1.2598 0.2461-1.834 0.1641-0.5781 0.416-1.0879 0.7559-1.5293 0.3437-0.4414 0.7832-0.7871 1.3183-1.0371 0.5352-0.2539 1.1738-0.3808 1.916-0.3808zm8.3653 3.6035v1.3945c0 0.668-0.0664 1.2383-0.1993 1.7109-0.1289 0.4688-0.3164 0.8497-0.5625 1.1426-0.246 0.293-0.541 0.5078-0.8847 0.6446-0.3399 0.1367-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.0429-0.9375-0.1289-0.2852-0.0859-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.2929-0.2852-0.6425-0.375-1.0488-0.086-0.4062-0.1289-0.8769-0.1289-1.4121v-1.3945c0-0.6719 0.0664-1.2383 0.1992-1.6992 0.1328-0.4649 0.3222-0.8418 0.5683-1.1309 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.043 0.9375 0.1289 0.289 0.082 0.5469 0.2129 0.7734 0.3926 0.2305 0.1797 0.4258 0.4141 0.586 0.7031 0.164 0.2852 0.289 0.6309 0.375 1.0371 0.0859 0.4024 0.1289 0.8711 0.1289 1.4063zm-1.4121 1.5937v-1.8047c0-0.3398-0.0196-0.6386-0.0586-0.8964-0.0391-0.2618-0.0977-0.4825-0.1758-0.6622-0.0742-0.1835-0.168-0.332-0.2813-0.4453-0.1132-0.1172-0.2422-0.2011-0.3867-0.2519-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.0429-0.586 0.1289-0.1718 0.082-0.3164 0.2148-0.4335 0.3984-0.1172 0.1836-0.2071 0.4258-0.2696 0.7266-0.0586 0.2968-0.0879 0.6582-0.0879 1.0839v1.8047c0 0.3438 0.0196 0.6465 0.0586 0.9082 0.0391 0.2618 0.0977 0.4864 0.1758 0.6739 0.0781 0.1836 0.1719 0.3359 0.2813 0.457 0.1132 0.1172 0.2421 0.2031 0.3867 0.2578 0.1484 0.0547 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.0429 0.5918-0.1289 0.1719-0.0859 0.3164-0.2226 0.4336-0.4101 0.1172-0.1914 0.2051-0.4395 0.2637-0.7442s0.0879-0.6699 0.0879-1.0957z"/>
+   <path d="m23.631 111.66v1.125h-6.1524l-0.0469-0.85 3.6797-5.765h1.1309l-1.2246 2.097-2.1153 3.393zm-1.0664-5.49v8.531h-1.4122v-8.531zm7.8203 3.55v1.395c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.292-0.541 0.507-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.22-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.643-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.395c0-0.671 0.0664-1.238 0.1992-1.699 0.1328-0.465 0.3222-0.842 0.5683-1.131 0.2461-0.293 0.5391-0.505 0.8789-0.638 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.042 0.9375 0.128 0.289 0.082 0.5469 0.213 0.7734 0.393 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.406zm-1.4121 1.594v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.184-0.168-0.332-0.2813-0.445-0.1132-0.118-0.2422-0.202-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.214-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.296-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.908 0.0391 0.262 0.0977 0.487 0.1758 0.674 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.117 0.2421 0.203 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z"/>
+   <path d="m23.473 145.48v1.125h-5.7188v-0.967l2.7773-3.029c0.3047-0.344 0.545-0.641 0.7208-0.891 0.1757-0.25 0.2988-0.474 0.3691-0.673 0.0742-0.204 0.1113-0.401 0.1113-0.592 0-0.27-0.0508-0.506-0.1523-0.709-0.0977-0.207-0.2422-0.369-0.4336-0.487-0.1914-0.121-0.4238-0.181-0.6973-0.181-0.3164 0-0.582 0.068-0.7969 0.205-0.2148 0.137-0.3769 0.326-0.4863 0.568-0.1094 0.239-0.164 0.512-0.164 0.821h-1.4122c0-0.497 0.1133-0.95 0.3399-1.36 0.2265-0.414 0.5547-0.742 0.9844-0.984 0.4297-0.246 0.9472-0.369 1.5527-0.369 0.5703 0 1.0547 0.095 1.4531 0.287 0.3985 0.191 0.7012 0.463 0.9082 0.814 0.211 0.352 0.3164 0.768 0.3164 1.248 0 0.266-0.0429 0.53-0.1289 0.791-0.0859 0.262-0.209 0.524-0.3691 0.785-0.1563 0.258-0.3418 0.518-0.5567 0.78-0.2148 0.258-0.4511 0.519-0.7089 0.785l-1.8457 2.033zm6.9121-3.855v1.394c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.293-0.541 0.507-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.22-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.642-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.394c0-0.672 0.0664-1.239 0.1992-1.7 0.1328-0.464 0.3222-0.841 0.5683-1.13 0.2461-0.293 0.5391-0.506 0.8789-0.639 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.043 0.9375 0.129 0.289 0.082 0.5469 0.212 0.7734 0.392 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.407zm-1.4121 1.593v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.183-0.168-0.332-0.2813-0.445-0.1132-0.117-0.2422-0.201-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.215-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.297-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.909 0.0391 0.261 0.0977 0.486 0.1758 0.673 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.118 0.2421 0.204 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z"/>
+   <path d="m30.385 173.02v1.394c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.293-0.541 0.507-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.22-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.643-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.394c0-0.672 0.0664-1.239 0.1992-1.7 0.1328-0.465 0.3222-0.841 0.5683-1.131 0.2461-0.293 0.5391-0.505 0.8789-0.638 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.043 0.9375 0.128 0.289 0.082 0.5469 0.213 0.7734 0.393 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.407zm-1.4121 1.593v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.184-0.168-0.332-0.2813-0.445-0.1132-0.117-0.2422-0.201-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.214-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.296-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.908 0.0391 0.262 0.0977 0.487 0.1758 0.674 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.118 0.2421 0.203 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z"/>
+  </g>
+  <g transform="matrix(1 0 0 1.0194 9.4118e-7 -3.9105)" stroke="#747474">
+   <path d="m50.695 14.031v164.03h0.22794v-164.03z" fill="#747474" stroke-width=".77206"/>
+   <line x1="39" x2="51" y1="14.145" y2="14.145"/>
+   <line x1="45" x2="51" y1="17.76" y2="17.76"/>
+   <line x1="45" x2="51" y1="21.02" y2="21.02"/>
+   <line x1="45" x2="51" y1="24.28" y2="24.28"/>
+   <line x1="45" x2="51" y1="27.54" y2="27.54"/>
+   <line x1="45" x2="51" y1="30.8" y2="30.8"/>
+   <line x1="45" x2="51" y1="34.06" y2="34.06"/>
+   <line x1="45" x2="51" y1="37.32" y2="37.32"/>
+   <line x1="45" x2="51" y1="40.58" y2="40.58"/>
+   <line x1="45" x2="51" y1="43.84" y2="43.84"/>
+   <line x1="39" x2="51" y1="47.1" y2="47.1"/>
+   <line x1="45" x2="51" y1="50.36" y2="50.36"/>
+   <line x1="45" x2="51" y1="53.62" y2="53.62"/>
+   <line x1="45" x2="51" y1="56.88" y2="56.88"/>
+   <line x1="45" x2="51" y1="60.14" y2="60.14"/>
+   <line x1="45" x2="51" y1="63.4" y2="63.4"/>
+   <line x1="45" x2="51" y1="66.66" y2="66.66"/>
+   <line x1="45" x2="51" y1="69.92" y2="69.92"/>
+   <line x1="45" x2="51" y1="73.18" y2="73.18"/>
+   <line x1="45" x2="51" y1="76.44" y2="76.44"/>
+   <line x1="39" x2="51" y1="79.7" y2="79.7"/>
+   <line x1="45" x2="51" y1="82.96" y2="82.96"/>
+   <line x1="45" x2="51" y1="86.22" y2="86.22"/>
+   <line x1="45" x2="51" y1="89.48" y2="89.48"/>
+   <line x1="45" x2="51" y1="92.74" y2="92.74"/>
+   <line x1="45" x2="51" y1="96" y2="96"/>
+   <line x1="45" x2="51" y1="99.26" y2="99.26"/>
+   <line x1="45" x2="51" y1="102.52" y2="102.52"/>
+   <line x1="45" x2="51" y1="105.78" y2="105.78"/>
+   <line x1="45" x2="51" y1="109.04" y2="109.04"/>
+   <line x1="39" x2="51" y1="112.3" y2="112.3"/>
+   <line x1="45" x2="51" y1="115.56" y2="115.56"/>
+   <line x1="45" x2="51" y1="118.82" y2="118.82"/>
+   <line x1="45" x2="51" y1="122.08" y2="122.08"/>
+   <line x1="45" x2="51" y1="125.34" y2="125.34"/>
+   <line x1="45" x2="51" y1="128.6" y2="128.6"/>
+   <line x1="45" x2="51" y1="131.86" y2="131.86"/>
+   <line x1="45" x2="51" y1="135.12" y2="135.12"/>
+   <line x1="45" x2="51" y1="138.38" y2="138.38"/>
+   <line x1="45" x2="51" y1="141.64" y2="141.64"/>
+   <line x1="39" x2="51" y1="144.9" y2="144.9"/>
+   <line x1="45" x2="51" y1="148.16" y2="148.16"/>
+   <line x1="45" x2="51" y1="151.42" y2="151.42"/>
+   <line x1="45" x2="51" y1="154.68" y2="154.68"/>
+   <line x1="45" x2="51" y1="157.94" y2="157.94"/>
+   <line x1="45" x2="51" y1="161.2" y2="161.2"/>
+   <line x1="45" x2="51" y1="164.46" y2="164.46"/>
+   <line x1="45" x2="51" y1="167.72" y2="167.72"/>
+   <line x1="45" x2="51" y1="170.98" y2="170.98"/>
+   <line x1="45" x2="51" y1="174.24" y2="174.24"/>
+   <line x1="38.985" x2="50.985" y1="177.96" y2="177.96"/>
+  </g>
+ </g><path d="m96 200c2.2091 0 4-1.791 4-4v-192c0-2.2091-1.7909-4-4-4h-4c-2.2091 0-4 1.7909-4 4v192c0 2.209 1.7909 4 4 4h4z" fill="#93979B"/><path d="m96 200c2.2091 0 4-1.791 4-4v-192c0-2.2091-1.7909-4-4-4h-4c-2.2091 0-4 1.7909-4 4v192c0 2.209 1.7909 4 4 4h4z" fill="url(#paint1_linear_3742_299967)"/><path d="m96 198.5c1.3807 0 2.5-1.119 2.5-2.5v-192c0-1.3807-1.1193-2.5-2.5-2.5h-4c-1.3807 0-2.5 1.1193-2.5 2.5v192c0 1.381 1.1193 2.5 2.5 2.5h4z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m76 140c0 2.209 1.7908 4 3.9999 4h4c2.2092 0 4.0001-1.791 4.0001-4v-92c0-2.2091-1.7909-4-4-4h-4c-2.2091 0-4 1.7909-4 4v92z" fill="#647484"/><path d="m76 140c0 2.209 1.7908 4 3.9999 4h4c2.2092 0 4.0001-1.791 4.0001-4v-92c0-2.2091-1.7909-4-4-4h-4c-2.2091 0-4 1.7909-4 4v92z" fill="url(#paint2_linear_3742_299967)"/><path d="m77.5 140c0 1.38 1.1193 2.5 2.4999 2.5h4c1.3808 0 2.5001-1.119 2.5001-2.5v-92c0-1.3807-1.1193-2.5-2.5-2.5h-4c-1.3807 0-2.5 1.1193-2.5 2.5v92z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><defs>
+  <linearGradient id="paint0_linear_3742_299967" x1="76" x2=".00010292" y1="100" y2="100.09" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#020202" stop-opacity=".35" offset="0"/>
+   <stop stop-color="#020202" stop-opacity=".12" offset=".02629"/>
+   <stop stop-color="#fff" stop-opacity=".12" offset=".11617"/>
+   <stop stop-color="#fff" stop-opacity=".3" offset=".49829"/>
+   <stop stop-color="#fff" stop-opacity=".12" offset=".88762"/>
+   <stop stop-color="#020202" stop-opacity=".12" offset=".96591"/>
+   <stop stop-color="#020202" stop-opacity=".35" offset="1"/>
+  </linearGradient>
+  <linearGradient id="paint1_linear_3742_299967" x1="89.93" x2="134" y1="-14.344" y2="205.53" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#020202" stop-opacity=".35" offset="0"/>
+   <stop stop-color="#020202" stop-opacity=".12" offset=".23574"/>
+   <stop stop-color="#fff" stop-opacity=".12" offset=".39937"/>
+   <stop stop-color="#fff" stop-opacity=".3" offset=".49829"/>
+   <stop stop-color="#fff" stop-opacity=".12" offset=".59721"/>
+   <stop stop-color="#020202" stop-opacity=".12" offset=".76303"/>
+   <stop stop-color="#020202" stop-opacity=".35" offset="1"/>
+  </linearGradient>
+  <linearGradient id="paint2_linear_3742_299967" x1="83.045" x2="78.639" y1="47.812" y2="139.03" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#020202" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#020202" stop-opacity=".18" offset=".090959"/>
+   <stop stop-color="#020202" stop-opacity=".1" offset=".1"/>
+   <stop stop-color="#020202" stop-opacity=".08" offset=".20513"/>
+   <stop stop-color="#020202" stop-opacity=".05" offset=".21555"/>
+   <stop stop-color="#020202" stop-opacity=".02" offset=".36962"/>
+   <stop stop-color="#fff" stop-opacity=".01" offset=".37768"/>
+   <stop stop-color="#fff" stop-opacity=".01" offset=".62413"/>
+   <stop stop-color="#020202" stop-opacity=".02" offset=".6313"/>
+   <stop stop-color="#020202" stop-opacity=".05" offset=".77601"/>
+   <stop stop-color="#020202" stop-opacity=".08" offset=".7898"/>
+   <stop stop-color="#020202" stop-opacity=".1" offset=".9"/>
+   <stop stop-color="#020202" stop-opacity=".18" offset=".90846"/>
+   <stop stop-color="#020202" stop-opacity=".2" offset="1"/>
+  </linearGradient>
+  <filter id="filter0_ii_3742_299961" x="20" y="162" width="60" height="32" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+   <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+   <feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+   <feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+   <feOffset dx="-2" dy="2"/>
+   <feGaussianBlur stdDeviation="3"/>
+   <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic"/>
+   <feColorMatrix values="0 0 0 0 0.445833 0 0 0 0 0.445833 0 0 0 0 0.445833 0 0 0 0.5 0"/>
+   <feBlend in2="shape" result="effect1_innerShadow_3742_299961"/>
+   <feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+   <feOffset dx="2" dy="-2"/>
+   <feGaussianBlur stdDeviation="2"/>
+   <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic"/>
+   <feColorMatrix values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.5 0"/>
+   <feBlend in2="effect1_innerShadow_3742_299961" result="effect2_innerShadow_3742_299961"/>
+  </filter>
+ </defs><g tb:tag="progressBar">
+  <rect x="56" y="10.5" width="6" height="169" ry="1.12" stroke="#cecece" tb:tag="progressBorder"/>
+  <rect transform="scale(1,-1)" x="56" y="-180" width="6" height="62" ry="1.12" fill="#4d94e1" stroke="#4d94e1" tb:tag="progressFill"/>
+  <circle cx="59" cy="185" r="7" fill="#4d94e1" tb:tag="progressCircle"/>
+ </g><g transform="translate(0,166)" fill="#1c943e" style="display: none;" tb:tag="progress-indicator">
+  <path d="m52 10.562 10.5 6.062v-12.124z" style=""/>
+ </g><g transform="translate(-12)" filter="url(#filter0_ii_3742_299961)" style="display: none;" tb:tag="value-box">
+  <rect x="22" y="164" width="56" height="28" rx="4" fill="#fffefe" fill-opacity=".75" tb:tag="value-box-background" style=""/>
+  <rect x="23" y="165" width="54" height="26" rx="3" stroke="#fff" stroke-width="2" style=""/>
+  <text x="49.853027" y="179.5625" fill="#727171" font-family="Roboto" font-size="14px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve" style=""><tspan dominant-baseline="middle">37%</tspan></text>
+ </g><path d="m25.56-0.12402s-25.56 0-25.56 33.5v164.18c0 1.3256 0.68053 2.3202 1.52 2.3202h72.96c0.83942 0 1.52-0.9946 1.52-2.3202v-164.18c0-33.5-25.107-33.5-25.107-33.5h-12.893zm25.487 40.6c-0.48969 0-0.88669 0.6268-0.88669 1.4v150.2c0 0.7732 0.39697 1.4 0.88669 1.4h5.5733c0.48969 0 0.88669-0.6268 0.88669-1.4v-150.2c0-0.7732-0.39697-1.4-0.88669-1.4z" fill-opacity="0" tb:tag="clickArea"/>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/small-meter.svg b/application/src/main/data/json/system/scada_symbols/small-meter.svg
new file mode 100644
index 0000000000..551c8d520a
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/small-meter.svg
@@ -0,0 +1,688 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="100" height="200" fill="none" version="1.1" viewBox="0 0 100 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "Small meter",
+  "description": "Small meter displays the current value with a moving pointer on the scale.",
+  "searchTags": [
+    "scale",
+    "level",
+    "progress",
+    "thermometer"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.backgroundColor});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "progress-indicator",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue, initial) {\n    var clampedValue = Math.max(Math.min(value, Math.max(minValue, maxValue)), Math.min(minValue, maxValue));\n    var normalizedValue = minValue < maxValue\n        ? (clampedValue - minValue) / (maxValue - minValue)\n        : (minValue - clampedValue) / (minValue - maxValue);\n    var offset = initial - (normalizedValue * initial);\n    return offset;\n}\n\nvar valueSet = element.remember('valueSet');\n\nif (ctx.properties.progressArrow && !ctx.properties.progressBar) {\n    element.show();\n    var initial = ctx.properties.valueBox ? 132 : 167;\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.transform({\n            translateY: initial\n        });\n    }\n    \n    var minValue = ctx.properties.minValue;\n    var maxValue = ctx.properties.maxValue;\n    var value = ctx.values.value;\n    \n    var colorProcessor = ctx.properties.progressArrowColor;\n    colorProcessor.update(value);\n    var fill = colorProcessor.color;\n    element.attr({fill: fill});\n    \n    var offset = calculateOffset(value, minValue, maxValue, initial);\n\n    var elementOffset = element.remember('offset');\n    if (offset !== elementOffset) {\n        element.remember('offset', offset);\n        ctx.api.cssAnimate(element, 500).transform({\n            translateY: offset\n        });\n    }\n} else {\n    element.hide();\n    if (valueSet) {\n        element.remember('valueSet', false);\n    }\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressBar",
+      "stateRenderFunction": "if (ctx.properties.progressBar) {\n    element.show();\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressBorder",
+      "stateRenderFunction": "if (!ctx.properties.valueBox) {\n    element.attr({'height': 168})\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressCircle",
+      "stateRenderFunction": "if (!ctx.properties.valueBox) {\n    element.attr({cy:185});\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressFill",
+      "stateRenderFunction": "if (!ctx.properties.valueBox) {\n    element.attr({y:-180});\n}\n\nfunction calculateOffset(value, minValue, maxValue, initial) {\n    var clampedValue = Math.max(Math.min(value, Math.max(minValue, maxValue)), Math.min(minValue, maxValue));\n    var normalizedValue = minValue < maxValue\n        ? (clampedValue - minValue) / (maxValue - minValue)\n        : (minValue - clampedValue) / (minValue - maxValue);\n    var offset = normalizedValue * initial;\n    return offset;\n}\n\nvar valueSet = element.remember('valueSet');\nif (ctx.properties.progressBar) {\n    var initial = ctx.properties.valueBox ? 132: 168;\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 2});\n    }\n    \n    var minValue = ctx.properties.minValue;\n    var maxValue = ctx.properties.maxValue;\n    var value = ctx.values.value;\n    \n    var colorProcessor = ctx.properties.progressBarColor;\n    colorProcessor.update(value);\n    var fill = colorProcessor.color;\n    element.attr({fill: fill, stroke: fill});\n    ctx.tags.progressCircle[0].fill(fill);\n    \n    var height = calculateOffset(value, minValue, maxValue, initial);\n\n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.cssAnimate(element, 500).attr({height: height+2});\n    }\n} else {\n    if (valueSet) {\n        element.remember('valueSet', false);\n    }\n}",
+      "actions": null
+    },
+    {
+      "tag": "scale",
+      "stateRenderFunction": "var scaleSet = element.remember('scaleSet');\nif (!scaleSet) {\n    element.remember('scaleSet', true);\n    element.clear();\n    \n    var majorIntervals = ctx.properties.majorIntervals;\n    var minorIntervals = ctx.properties.minorIntervals;\n    var minValue = ctx.properties.minValue;\n    var maxValue = ctx.properties.maxValue;\n    \n    var start = 11;\n    var end = ctx.properties.valueBox ? 132 : 167;\n    var majorIntervalLength = end / majorIntervals;\n    var minorIntervalLength = majorIntervalLength / minorIntervals;\n    element.add(ctx.svg.line(63, end+11, 63, 11).stroke({ width: 1 }).attr({class: 'majorTick'}));\n    for (var i = 0; i < majorIntervals+1; i++) {\n        var y = start + i * majorIntervalLength;\n        var line = ctx.svg.line(51, y, 63, y).stroke({ width: 1 }).attr({class: 'majorTick'});\n        element.add(line);\n        var majorText = (maxValue - ((maxValue - (minValue)) / (majorIntervals) * i)).toFixed(0);\n        var majorTickText = ctx.svg.text(majorText);\n        majorTickText.attr({x: 45, y: y + 2, 'text-anchor': 'end', class: 'majorTickText'});\n        majorTickText.first().attr({'dominant-baseline': 'middle'});\n        element.add(majorTickText);\n        if (i < majorIntervals) {\n            drawMinorTicks(y, minorIntervals, minorIntervalLength);\n        }\n    }\n}\n\nvar majorFont = ctx.properties.majorFont;\nvar majorColor = ctx.properties.majorColor;\nvar minorColor = ctx.properties.minorColor;\nif (ctx.values.critical) {\n    majorColor = ctx.properties.majorCriticalColor;\n    minorColor = ctx.properties.minorCriticalColor;\n} else if (ctx.values.warning) {\n    majorColor = ctx.properties.minorWarningColor;\n    minorColor = ctx.properties.minorWarningColor;\n}\n\nvar majorTicks = element.find('line.majorTick');\nmajorTicks.forEach(t => t.attr({stroke: majorColor}));\n\nvar majorTicksText = element.find('text.majorTickText');\nctx.api.font(majorTicksText, majorFont, majorColor);\n\nvar minorTicks = element.find('line.minorTick');\nminorTicks.forEach(t => t.attr({stroke: minorColor}));\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\nfunction drawMinorTicks(start, minorIntervals, minorIntervalLength) {\n    for (var i = 1; i < minorIntervals; i++) {\n        var minorY = start + i * minorIntervalLength;\n        var minorLine = ctx.svg.line(57, minorY, 63, minorY).stroke({ width: 1 }).attr({class: 'minorTick'});\n        element.add(minorLine);\n    }\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    element.show();\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box-background",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    var colorProcessor = ctx.properties.valueBoxColor;\n    colorProcessor.update(ctx.values.value);\n    element.attr({fill: colorProcessor.color});\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-text",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    var valueTextFont = ctx.properties.valueTextFont;\n    var valueTextColor = ctx.properties.valueTextColor;\n    var currentVolume = ctx.values.value;\n    var valueText = ctx.api.formatValue(currentVolume, 0, ctx.properties.valueUnits, false);\n    var colorProcessor = ctx.properties.valueTextColor;\n    colorProcessor.update(ctx.values.value);\n    ctx.api.font(element, valueTextFont, colorProcessor.color);\n    ctx.api.text(element, valueText);\n}",
+      "actions": null
+    }
+  ],
+  "behavior": [
+    {
+      "id": "value",
+      "name": "{i18n:scada.symbol.value}",
+      "hint": null,
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "waterLevel"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning-state}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical-state}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "minValue",
+      "name": "{i18n:scada.symbol.min-max-value}",
+      "type": "number",
+      "default": 0,
+      "required": true,
+      "subLabel": "{i18n:scada.symbol.min-value}",
+      "divider": true,
+      "min": -1000,
+      "step": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "maxValue",
+      "name": "{i18n:scada.symbol.min-max-value}",
+      "type": "number",
+      "default": 100,
+      "required": true,
+      "subLabel": "{i18n:scada.symbol.max-value}",
+      "max": 1000,
+      "step": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "backgroundColor",
+      "name": "{i18n:scada.symbol.background-color}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressBar",
+      "name": "{i18n:scada.symbol.progress-bar}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressBarColor",
+      "name": "{i18n:scada.symbol.progress-bar}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#4D94E1",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "progressBar",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressArrow",
+      "name": "{i18n:scada.symbol.progress-arrow}",
+      "type": "switch",
+      "default": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressArrowColor",
+      "name": "{i18n:scada.symbol.progress-arrow}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#1C943E",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "progressArrow",
+      "disabled": true,
+      "visible": true
+    },
+    {
+      "id": "valueBox",
+      "name": "{i18n:scada.symbol.value-box}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueBoxColor",
+      "name": "{i18n:scada.symbol.value-box}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#F3F3F3",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "valueBox",
+      "disabled": true,
+      "visible": true
+    },
+    {
+      "id": "valueUnits",
+      "name": "{i18n:scada.symbol.value-text}",
+      "type": "units",
+      "default": "%",
+      "subLabel": "{i18n:scada.symbol.units}",
+      "disableOnProperty": "valueBox",
+      "disabled": true,
+      "visible": true
+    },
+    {
+      "id": "valueTextFont",
+      "name": "{i18n:scada.symbol.value-text}",
+      "type": "font",
+      "default": {
+        "size": 14,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "500",
+        "style": "normal"
+      },
+      "disableOnProperty": "valueBox",
+      "disabled": true,
+      "visible": true
+    },
+    {
+      "id": "valueTextColor",
+      "name": "{i18n:scada.symbol.value-text}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#0000008A",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "valueBox",
+      "disabled": true,
+      "visible": true
+    },
+    {
+      "id": "majorIntervals",
+      "name": "{i18n:scada.symbol.major-ticks}",
+      "type": "number",
+      "default": 5,
+      "subLabel": "{i18n:scada.symbol.intervals}",
+      "divider": true,
+      "min": 1,
+      "step": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorFont",
+      "name": "{i18n:scada.symbol.major-ticks}",
+      "type": "font",
+      "default": {
+        "size": 12,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "500",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorColor",
+      "name": "{i18n:scada.symbol.major-ticks-color}",
+      "type": "color",
+      "default": "#747474",
+      "subLabel": "{i18n:scada.symbol.normal}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorWarningColor",
+      "name": "{i18n:scada.symbol.major-ticks-color}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorCriticalColor",
+      "name": "{i18n:scada.symbol.major-ticks-color}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorIntervals",
+      "name": "{i18n:scada.symbol.minor-ticks}",
+      "type": "number",
+      "default": 10,
+      "subLabel": "{i18n:scada.symbol.intervals}",
+      "min": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorColor",
+      "name": "{i18n:scada.symbol.minor-ticks-color}",
+      "type": "color",
+      "default": "#747474",
+      "subLabel": "{i18n:scada.symbol.normal}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorWarningColor",
+      "name": "{i18n:scada.symbol.minor-ticks-color}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorCriticalColor",
+      "name": "{i18n:scada.symbol.minor-ticks-color}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<path d="m16 200c-2.2091 0-4-1.791-4-4v-192c0-2.2091 1.7909-4 4-4h68c2.2091 0 4 1.7909 4 4v192c0 2.209-1.7909 4-4 4h-68z" fill="#E5E5E5" tb:tag="background"/><path d="m16 200c-2.2091 0-4-1.791-4-4v-192c0-2.2091 1.7909-4 4-4h68c2.2091 0 4 1.7909 4 4v192c0 2.209-1.7909 4-4 4h-68z" fill="url(#paint0_linear_3742_299961)"/><path d="m16 198.5c-1.3807 0-2.5-1.119-2.5-2.5v-192c0-1.3807 1.1193-2.5 2.5-2.5h68c1.3807 0 2.5 1.1193 2.5 2.5v192c0 1.381-1.1193 2.5-2.5 2.5h-68z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><g tb:tag="scale">
+  <path d="m28.539 10.088v8.5605h-1.4121v-6.8848l-2.0918 0.709v-1.166l3.3339-1.2187zm8.7754 3.58v1.3946c0 0.6679-0.0665 1.2382-0.1993 1.7109-0.1289 0.4688-0.3164 0.8496-0.5625 1.1426-0.2461 0.2929-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2383 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5468 0.2129 0.7734 0.3925 0.2305 0.1797 0.4258 0.4141 0.5859 0.7032 0.1641 0.2851 0.2891 0.6308 0.375 1.0371 0.086 0.4023 0.129 0.8711 0.129 1.4062zm-1.4122 1.5938v-1.8047c0-0.3398-0.0195-0.6387-0.0585-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1133-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4336 0.3984-0.1171 0.1836-0.207 0.4258-0.2695 0.7266-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0195 0.6465 0.0586 0.9082s0.0977 0.4863 0.1758 0.6738c0.0781 0.1836 0.1719 0.3359 0.2812 0.457 0.1133 0.1172 0.2422 0.2032 0.3868 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2226 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441 0.0585-0.3047 0.0878-0.6699 0.0878-1.0957zm8.4825-1.5938v1.3946c0 0.6679-0.0664 1.2382-0.1993 1.7109-0.1289 0.4688-0.3164 0.8496-0.5625 1.1426-0.246 0.2929-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2383 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5469 0.2129 0.7734 0.3925 0.2305 0.1797 0.4258 0.4141 0.586 0.7032 0.164 0.2851 0.289 0.6308 0.375 1.0371 0.0859 0.4023 0.1289 0.8711 0.1289 1.4062zm-1.4121 1.5938v-1.8047c0-0.3398-0.0196-0.6387-0.0586-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1132-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4335 0.3984-0.1172 0.1836-0.2071 0.4258-0.2696 0.7266-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0196 0.6465 0.0586 0.9082 0.0391 0.2617 0.0977 0.4863 0.1758 0.6738 0.0781 0.1836 0.1719 0.3359 0.2813 0.457 0.1132 0.1172 0.2421 0.2032 0.3867 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441s0.0879-0.6699 0.0879-1.0957z" fill="#000" fill-opacity=".38"/>
+  <path d="m37.332 40.682c0 0.5313-0.123 0.9785-0.3691 1.3418s-0.582 0.6387-1.0078 0.8262c-0.4219 0.1836-0.8985 0.2754-1.4297 0.2754-0.5313 0-1.0098-0.0918-1.4356-0.2754-0.4257-0.1875-0.7617-0.4629-1.0078-0.8262s-0.3691-0.8105-0.3691-1.3418c0-0.3515 0.0683-0.6699 0.2051-0.955 0.1367-0.2891 0.33-0.5372 0.58-0.7442 0.254-0.2109 0.5508-0.373 0.8907-0.4863 0.3437-0.1133 0.7187-0.1699 1.125-0.1699 0.539 0 1.0215 0.0996 1.4472 0.2988 0.4258 0.1992 0.7598 0.4746 1.002 0.8262 0.2461 0.3515 0.3691 0.7617 0.3691 1.2304zm-1.4179-0.0703c0-0.2851-0.0586-0.5351-0.1758-0.75-0.1172-0.2148-0.2813-0.3808-0.4922-0.498s-0.4551-0.1758-0.7324-0.1758c-0.2813 0-0.5254 0.0586-0.7325 0.1758-0.207 0.1172-0.3691 0.2832-0.4863 0.498-0.1133 0.2149-0.1699 0.4649-0.1699 0.75 0 0.2891 0.0566 0.5391 0.1699 0.75 0.1133 0.207 0.2754 0.3653 0.4863 0.4746 0.211 0.1094 0.459 0.1641 0.7442 0.1641 0.2851 0 0.5312-0.0547 0.7383-0.1641 0.207-0.1093 0.3672-0.2676 0.4804-0.4746 0.1133-0.2109 0.17-0.4609 0.17-0.75zm1.2246-3.8906c0 0.4258-0.1133 0.8047-0.3399 1.1367-0.2226 0.332-0.5312 0.5938-0.9258 0.7852-0.3945 0.1875-0.8437 0.2812-1.3476 0.2812-0.5078 0-0.9609-0.0937-1.3594-0.2812-0.3945-0.1914-0.7051-0.4532-0.9316-0.7852-0.2227-0.332-0.334-0.7109-0.334-1.1367 0-0.5078 0.1113-0.9356 0.334-1.2832 0.2265-0.3516 0.5371-0.6192 0.9316-0.8027 0.3945-0.1836 0.8457-0.2754 1.3535-0.2754s0.959 0.0918 1.3535 0.2754c0.3946 0.1835 0.7032 0.4511 0.9258 0.8027 0.2266 0.3476 0.3399 0.7754 0.3399 1.2832zm-1.4121 0.0469c0-0.2539-0.0508-0.4766-0.1524-0.668-0.0976-0.1953-0.2363-0.3477-0.416-0.457-0.1797-0.1094-0.3926-0.1641-0.6387-0.1641s-0.459 0.0527-0.6386 0.1582c-0.1797 0.1055-0.3184 0.2539-0.4161 0.4453-0.0976 0.1914-0.1464 0.4199-0.1464 0.6856 0 0.2617 0.0488 0.4902 0.1464 0.6855 0.0977 0.1914 0.2364 0.3418 0.4161 0.4512 0.1836 0.1094 0.3984 0.164 0.6445 0.164s0.459-0.0546 0.6387-0.164 0.3183-0.2598 0.416-0.4512c0.0976-0.1953 0.1465-0.4238 0.1465-0.6855zm8.6582 1.2597v1.3946c0 0.6679-0.0664 1.2382-0.1993 1.7109-0.1289 0.4688-0.3164 0.8496-0.5625 1.1426-0.246 0.2929-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2382 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5469 0.2129 0.7734 0.3925 0.2305 0.1797 0.4258 0.4141 0.586 0.7032 0.164 0.2851 0.289 0.6308 0.375 1.0371 0.0859 0.4023 0.1289 0.8711 0.1289 1.4062zm-1.4121 1.5938v-1.8047c0-0.3398-0.0196-0.6387-0.0586-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1132-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4335 0.3984-0.1172 0.1836-0.2071 0.4258-0.2696 0.7266-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0196 0.6465 0.0586 0.9082 0.0391 0.2617 0.0977 0.4863 0.1758 0.6738 0.0781 0.1836 0.1719 0.336 0.2813 0.457 0.1132 0.1172 0.2421 0.2032 0.3867 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441s0.0879-0.6699 0.0879-1.0957z" fill="#000" fill-opacity=".38"/>
+  <path d="m36.02 60.784h0.1758v1.1543h-0.0996c-0.5039 0-0.9395 0.078-1.3066 0.2343-0.3633 0.1563-0.6621 0.3711-0.8965 0.6446-0.2344 0.2734-0.4102 0.5937-0.5274 0.9609-0.1132 0.3633-0.1699 0.75-0.1699 1.1602v1.3418c0 0.3398 0.0371 0.6406 0.1113 0.9023 0.0743 0.2578 0.1778 0.4746 0.3106 0.6504 0.1367 0.1719 0.293 0.3027 0.4687 0.3926 0.1758 0.09 0.3653 0.1347 0.5684 0.1347 0.2109 0 0.4023-0.043 0.5742-0.1289 0.1719-0.09 0.3184-0.2129 0.4395-0.3691 0.1211-0.1563 0.2129-0.3418 0.2754-0.5567 0.0625-0.2148 0.0937-0.4492 0.0937-0.7031 0-0.2422-0.0312-0.4687-0.0937-0.6797-0.0586-0.2148-0.1465-0.4023-0.2637-0.5625-0.1172-0.164-0.2637-0.291-0.4395-0.3808-0.1718-0.094-0.3711-0.1406-0.5976-0.1406-0.2813 0-0.5371 0.066-0.7676 0.1992-0.2266 0.1328-0.4102 0.3066-0.5508 0.5215-0.1367 0.2109-0.2109 0.4355-0.2226 0.6738l-0.5391-0.1758c0.0313-0.3633 0.1113-0.6895 0.2402-0.9785 0.1328-0.2891 0.3067-0.5352 0.5215-0.7383 0.2149-0.2031 0.4629-0.3574 0.7442-0.4629 0.2851-0.1094 0.5976-0.164 0.9375-0.164 0.414 0 0.7734 0.078 1.0781 0.2343s0.5566 0.3692 0.7558 0.6387c0.2032 0.2656 0.3536 0.5703 0.4512 0.9141 0.1016 0.3398 0.1524 0.6953 0.1524 1.0664 0 0.4101-0.0625 0.7929-0.1875 1.1484-0.125 0.3516-0.3086 0.6602-0.5508 0.9258-0.2383 0.2656-0.5293 0.4726-0.8731 0.6211-0.3398 0.1484-0.7265 0.2226-1.1601 0.2226-0.4571 0-0.8653-0.088-1.2246-0.2636-0.3555-0.1758-0.6582-0.418-0.9082-0.7266-0.2461-0.3086-0.4336-0.6641-0.5625-1.0664s-0.1934-0.8281-0.1934-1.2773v-0.586c0-0.6484 0.082-1.2598 0.2461-1.834 0.1641-0.5781 0.416-1.0879 0.7559-1.5293 0.3437-0.4414 0.7832-0.7871 1.3183-1.0371 0.5352-0.2539 1.1738-0.3808 1.916-0.3808zm8.3653 3.6035v1.3945c0 0.668-0.0664 1.2383-0.1993 1.7109-0.1289 0.4688-0.3164 0.8497-0.5625 1.1426-0.246 0.293-0.541 0.5078-0.8847 0.6446-0.3399 0.1367-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.2929-0.2852-0.6425-0.375-1.0488-0.086-0.4062-0.1289-0.8769-0.1289-1.4121v-1.3945c0-0.6719 0.0664-1.2383 0.1992-1.6992 0.1328-0.4649 0.3222-0.8418 0.5683-1.1309 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.043 0.9375 0.1289 0.289 0.082 0.5469 0.2129 0.7734 0.3926 0.2305 0.1797 0.4258 0.4141 0.586 0.7031 0.164 0.2852 0.289 0.6309 0.375 1.0371 0.0859 0.4024 0.1289 0.8711 0.1289 1.4063zm-1.4121 1.5937v-1.8047c0-0.3398-0.0196-0.6386-0.0586-0.8964-0.0391-0.2618-0.0977-0.4825-0.1758-0.6622-0.0742-0.1835-0.168-0.332-0.2813-0.4453-0.1132-0.1172-0.2422-0.2011-0.3867-0.2519-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2148-0.4335 0.3984-0.1172 0.1836-0.2071 0.4258-0.2696 0.7266-0.0586 0.2968-0.0879 0.6582-0.0879 1.0839v1.8047c0 0.3438 0.0196 0.6465 0.0586 0.9082 0.0391 0.2618 0.0977 0.4864 0.1758 0.6739 0.0781 0.1836 0.1719 0.3359 0.2813 0.457 0.1132 0.1172 0.2421 0.2031 0.3867 0.2578 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2226 0.4336-0.4101 0.1172-0.1914 0.2051-0.4395 0.2637-0.7442s0.0879-0.6699 0.0879-1.0957z" fill="#000" fill-opacity=".38"/>
+  <path d="m37.631 90.687v1.125h-6.1524l-0.0469-0.8496 3.6797-5.7656h1.1309l-1.2246 2.0977-2.1153 3.3925zm-1.0664-5.4902v8.5313h-1.4122v-8.5313zm7.8203 3.5508v1.3945c0 0.668-0.0664 1.2383-0.1993 1.711-0.1289 0.4687-0.3164 0.8496-0.5625 1.1425-0.246 0.293-0.541 0.5078-0.8847 0.6446-0.3399 0.1367-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.0429-0.9375-0.1289-0.2852-0.0859-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.7089-0.1602-0.293-0.2852-0.6426-0.375-1.0489-0.086-0.4062-0.1289-0.8769-0.1289-1.4121v-1.3945c0-0.6719 0.0664-1.2383 0.1992-1.6992 0.1328-0.4649 0.3222-0.8418 0.5683-1.1309 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.043 0.9375 0.1289 0.289 0.0821 0.5469 0.2129 0.7734 0.3926 0.2305 0.1797 0.4258 0.4141 0.586 0.7031 0.164 0.2852 0.289 0.6309 0.375 1.0371 0.0859 0.4024 0.1289 0.8711 0.1289 1.4063zm-1.4121 1.5937v-1.8047c0-0.3398-0.0196-0.6386-0.0586-0.8964-0.0391-0.2618-0.0977-0.4825-0.1758-0.6621-0.0742-0.1836-0.168-0.3321-0.2813-0.4454-0.1132-0.1171-0.2422-0.2011-0.3867-0.2519-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.0429-0.586 0.1289-0.1718 0.082-0.3164 0.2148-0.4335 0.3984-0.1172 0.1836-0.2071 0.4258-0.2696 0.7266-0.0586 0.2968-0.0879 0.6582-0.0879 1.0839v1.8047c0 0.3438 0.0196 0.6465 0.0586 0.9082 0.0391 0.2618 0.0977 0.4864 0.1758 0.6739 0.0781 0.1836 0.1719 0.3359 0.2813 0.457 0.1132 0.1172 0.2421 0.2031 0.3867 0.2578 0.1484 0.0547 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.0429 0.5918-0.1289 0.1719-0.0859 0.3164-0.2226 0.4336-0.4101 0.1172-0.1914 0.2051-0.4395 0.2637-0.7442s0.0879-0.6699 0.0879-1.0957z" fill="#000" fill-opacity=".38"/>
+  <path d="m37.473 116.48v1.125h-5.7188v-0.967l2.7773-3.029c0.3047-0.344 0.545-0.641 0.7208-0.891 0.1757-0.25 0.2988-0.474 0.3691-0.673 0.0742-0.204 0.1113-0.401 0.1113-0.592 0-0.27-0.0508-0.506-0.1523-0.709-0.0977-0.207-0.2422-0.369-0.4336-0.487-0.1914-0.121-0.4238-0.181-0.6973-0.181-0.3164 0-0.582 0.068-0.7969 0.205-0.2148 0.137-0.3769 0.326-0.4863 0.568-0.1094 0.239-0.164 0.512-0.164 0.821h-1.4122c0-0.497 0.1133-0.95 0.3399-1.36 0.2265-0.414 0.5547-0.742 0.9844-0.984 0.4297-0.246 0.9472-0.369 1.5527-0.369 0.5703 0 1.0547 0.095 1.4531 0.287 0.3985 0.191 0.7012 0.463 0.9082 0.814 0.211 0.352 0.3164 0.768 0.3164 1.248 0 0.266-0.0429 0.53-0.1289 0.791-0.0859 0.262-0.209 0.524-0.3691 0.785-0.1563 0.258-0.3418 0.518-0.5567 0.78-0.2148 0.258-0.4511 0.519-0.7089 0.785l-1.8457 2.033zm6.9121-3.855v1.394c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.293-0.541 0.507-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.22-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.642-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.394c0-0.672 0.0664-1.239 0.1992-1.7 0.1328-0.464 0.3222-0.841 0.5683-1.13 0.2461-0.293 0.5391-0.506 0.8789-0.639 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.043 0.9375 0.129 0.289 0.082 0.5469 0.212 0.7734 0.392 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.407zm-1.4121 1.593v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.183-0.168-0.332-0.2813-0.445-0.1132-0.117-0.2422-0.201-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.215-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.297-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.909 0.0391 0.261 0.0977 0.486 0.1758 0.673 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.118 0.2421 0.204 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z" fill="#000" fill-opacity=".38"/>
+  <path d="m44.385 139.02v1.394c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.293-0.541 0.507-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.22-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.643-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.394c0-0.672 0.0664-1.239 0.1992-1.7 0.1328-0.465 0.3222-0.841 0.5683-1.131 0.2461-0.293 0.5391-0.505 0.8789-0.638 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.043 0.9375 0.128 0.289 0.082 0.5469 0.213 0.7734 0.393 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.407zm-1.4121 1.593v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.184-0.168-0.332-0.2813-0.445-0.1132-0.117-0.2422-0.201-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.214-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.296-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.908 0.0391 0.262 0.0977 0.487 0.1758 0.674 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.118 0.2421 0.203 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z" fill="#000" fill-opacity=".38"/>
+  <line x1="52" x2="64" y1="10.5" y2="10.5" stroke="#747474"/>
+  <line x1="58" x2="64" y1="13.136" y2="13.136" stroke="#747474"/>
+  <line x1="58" x2="64" y1="15.772" y2="15.772" stroke="#747474"/>
+  <line x1="58" x2="64" y1="18.408" y2="18.408" stroke="#747474"/>
+  <line x1="58" x2="64" y1="21.044" y2="21.044" stroke="#747474"/>
+  <line x1="58" x2="64" y1="23.68" y2="23.68" stroke="#747474"/>
+  <line x1="58" x2="64" y1="26.316" y2="26.316" stroke="#747474"/>
+  <line x1="58" x2="64" y1="28.952" y2="28.952" stroke="#747474"/>
+  <line x1="58" x2="64" y1="31.588" y2="31.588" stroke="#747474"/>
+  <line x1="58" x2="64" y1="34.224" y2="34.224" stroke="#747474"/>
+  <line x1="58" x2="64" y1="39.496" y2="39.496" stroke="#747474"/>
+  <line x1="52" x2="64" y1="36.86" y2="36.86" stroke="#747474"/>
+  <line x1="58" x2="64" y1="42.132" y2="42.132" stroke="#747474"/>
+  <line x1="58" x2="64" y1="44.768" y2="44.768" stroke="#747474"/>
+  <line x1="58" x2="64" y1="47.404" y2="47.404" stroke="#747474"/>
+  <line x1="58" x2="64" y1="50.04" y2="50.04" stroke="#747474"/>
+  <line x1="58" x2="64" y1="52.676" y2="52.676" stroke="#747474"/>
+  <line x1="58" x2="64" y1="55.312" y2="55.312" stroke="#747474"/>
+  <line x1="58" x2="64" y1="57.948" y2="57.948" stroke="#747474"/>
+  <line x1="58" x2="64" y1="60.584" y2="60.584" stroke="#747474"/>
+  <line x1="58" x2="64" y1="65.856" y2="65.856" stroke="#747474"/>
+  <line x1="52" x2="64" y1="63.22" y2="63.22" stroke="#747474"/>
+  <line x1="58" x2="64" y1="68.492" y2="68.492" stroke="#747474"/>
+  <line x1="58" x2="64" y1="71.128" y2="71.128" stroke="#747474"/>
+  <line x1="58" x2="64" y1="73.764" y2="73.764" stroke="#747474"/>
+  <line x1="58" x2="64" y1="76.4" y2="76.4" stroke="#747474"/>
+  <line x1="58" x2="64" y1="81.672" y2="81.672" stroke="#747474"/>
+  <line x1="58" x2="64" y1="79.036" y2="79.036" stroke="#747474"/>
+  <line x1="58" x2="64" y1="84.308" y2="84.308" stroke="#747474"/>
+  <line x1="52" x2="64" y1="89.58" y2="89.58" stroke="#747474"/>
+  <line x1="58" x2="64" y1="86.944" y2="86.944" stroke="#747474"/>
+  <line x1="58" x2="64" y1="92.216" y2="92.216" stroke="#747474"/>
+  <line x1="58" x2="64" y1="94.852" y2="94.852" stroke="#747474"/>
+  <line x1="58" x2="64" y1="97.488" y2="97.488" stroke="#747474"/>
+  <line x1="58" x2="64" y1="100.12" y2="100.12" stroke="#747474"/>
+  <line x1="58" x2="64" y1="102.76" y2="102.76" stroke="#747474"/>
+  <line x1="58" x2="64" y1="105.4" y2="105.4" stroke="#747474"/>
+  <line x1="58" x2="64" y1="108.03" y2="108.03" stroke="#747474"/>
+  <line x1="58" x2="64" y1="110.67" y2="110.67" stroke="#747474"/>
+  <line x1="52" x2="64" y1="115.94" y2="115.94" stroke="#747474"/>
+  <line x1="58" x2="64" y1="113.3" y2="113.3" stroke="#747474"/>
+  <line x1="58" x2="64" y1="118.58" y2="118.58" stroke="#747474"/>
+  <line x1="58" x2="64" y1="121.21" y2="121.21" stroke="#747474"/>
+  <line x1="58" x2="64" y1="123.85" y2="123.85" stroke="#747474"/>
+  <line x1="58" x2="64" y1="126.48" y2="126.48" stroke="#747474"/>
+  <line x1="58" x2="64" y1="129.12" y2="129.12" stroke="#747474"/>
+  <line x1="58" x2="64" y1="131.76" y2="131.76" stroke="#747474"/>
+  <line x1="58" x2="64" y1="134.39" y2="134.39" stroke="#747474"/>
+  <line x1="58" x2="64" y1="137.03" y2="137.03" stroke="#747474"/>
+  <line x1="52" x2="64" y1="142.5" y2="142.5" stroke="#747474"/>
+  <line x1="58" x2="64" y1="139.66" y2="139.66" stroke="#747474"/>
+  <path d="m63 10v133h1v-133z" fill="#747474"/>
+ </g><g filter="url(#filter0_ii_3742_299961)" tb:tag="value-box">
+  <rect x="22" y="164" width="56" height="28" rx="4" fill="#FFFEFE" fill-opacity=".75" tb:tag="value-box-background"/>
+  <rect x="23" y="165" width="54" height="26" rx="3" stroke="#fff" stroke-width="2"/>
+  <text x="49.853027" y="179.5625" fill="#727171" font-family="Roboto" font-size="14px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan dominant-baseline="middle">37%</tspan></text>
+ </g><g tb:tag="progressBar">
+  <rect x="69" y="10.5" width="6" height="134" ry="1.12" stroke="#cecece" tb:tag="progressBorder"/>
+  <rect transform="scale(1,-1)" x="69" y="-144.5" width="6" height="50" ry="1.12" fill="#4d94e1" stroke="#4d94e1" tb:tag="progressFill"/>
+  <circle cx="72" cy="150" r="7" fill="#4d94e1" tb:tag="progressCircle"/>
+ </g><g transform="translate(0,132)" fill="#1c943e" style="display: none;" tb:tag="progress-indicator">
+  <path d="m64 10.562 10.5 6.062v-12.124z" style=""/>
+ </g><path d="m37.56 0s-25.56 0-25.56 33.5v164.18c0 1.3256 0.68053 2.3202 1.52 2.3202h72.96c0.83942 0 1.52-0.9946 1.52-2.3202v-164.18c0-33.5-25.107-33.5-25.107-33.5h-12.893zm25.487 40.6c-0.48969 0-0.88669 0.6268-0.88669 1.4v150.2c0 0.7732 0.39697 1.4 0.88669 1.4h5.5733c0.48969 0 0.88669-0.6268 0.88669-1.4v-150.2c0-0.7732-0.39697-1.4-0.88669-1.4z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><defs>
+  <filter id="filter0_ii_3742_299961" x="20" y="162" width="60" height="32" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+   <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+   <feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+   <feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+   <feOffset dx="-2" dy="2"/>
+   <feGaussianBlur stdDeviation="3"/>
+   <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic"/>
+   <feColorMatrix values="0 0 0 0 0.445833 0 0 0 0 0.445833 0 0 0 0 0.445833 0 0 0 0.5 0"/>
+   <feBlend in2="shape" result="effect1_innerShadow_3742_299961"/>
+   <feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+   <feOffset dx="2" dy="-2"/>
+   <feGaussianBlur stdDeviation="2"/>
+   <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic"/>
+   <feColorMatrix values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.5 0"/>
+   <feBlend in2="effect1_innerShadow_3742_299961" result="effect2_innerShadow_3742_299961"/>
+  </filter>
+  <linearGradient id="paint0_linear_3742_299961" x1="88" x2="12" y1="100" y2="100.09" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#020202" stop-opacity=".35" offset="0"/>
+   <stop stop-color="#020202" stop-opacity=".12" offset=".02629"/>
+   <stop stop-color="#fff" stop-opacity=".12" offset=".11617"/>
+   <stop stop-color="#fff" stop-opacity=".3" offset=".49829"/>
+   <stop stop-color="#fff" stop-opacity=".12" offset=".88762"/>
+   <stop stop-color="#020202" stop-opacity=".12" offset=".96591"/>
+   <stop stop-color="#020202" stop-opacity=".35" offset="1"/>
+  </linearGradient>
+ </defs>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/small-power-transformer-hp.svg b/application/src/main/data/json/system/scada_symbols/small-power-transformer-hp.svg
new file mode 100644
index 0000000000..049c75ab58
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/small-power-transformer-hp.svg
@@ -0,0 +1,359 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="400" fill="none" version="1.1" viewBox="0 0 400 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Small power transformer",
+  "description": "Small power transformer with various states.",
+  "searchTags": [
+    "power",
+    "energy"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <path d="m67 35.406c0-3.4797 1.5105-6.788 4.1398-9.0673l5.4938-4.7625c5.6366-4.8862 12.846-7.576 20.306-7.576h6.1218c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.7625c2.63 2.2793 4.14 5.5876 4.14 9.0673v2.3965c0 5.0878-3.208 9.6226-8.006 11.316l-2.189 0.7724c-3.955 1.3961-8.119 2.1094-12.314 2.1094h-20.982c-4.1947 0-8.3588-0.7133-12.314-2.1094l-2.1886-0.7724c-4.7978-1.6933-8.0062-6.2281-8.0062-11.316v-2.3965z"/>
+  <path d="m67 73.406c0-3.4797 1.5105-6.788 4.1398-9.0673l5.4938-4.7625c5.6366-4.8862 12.846-7.576 20.306-7.576h6.1218c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.7625c2.63 2.2793 4.14 5.5876 4.14 9.0673v2.3965c0 5.0878-3.208 9.6226-8.006 11.316l-2.189 0.7724c-3.955 1.3961-8.119 2.1094-12.314 2.1094h-20.982c-4.1947 0-8.3588-0.7133-12.314-2.1094l-2.1886-0.7724c-4.7978-1.6933-8.0062-6.2281-8.0062-11.316v-2.3965z"/>
+  <path d="m67 111.41c0-3.48 1.5105-6.788 4.1398-9.068l5.4938-4.762c5.6366-4.8862 12.846-7.576 20.306-7.576h6.1218c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.762c2.63 2.28 4.14 5.588 4.14 9.068v2.396c0 5.088-3.208 9.623-8.006 11.316l-2.189 0.773c-3.955 1.396-8.119 2.109-12.314 2.109h-20.982c-4.1947 0-8.3588-0.713-12.314-2.109l-2.1886-0.773c-4.7978-1.693-8.0062-6.228-8.0062-11.316v-2.396z"/>
+  <rect x="85" y="128" width="30" height="11" rx="1"/>
+  <path d="m267 35.406c0-3.4797 1.51-6.788 4.14-9.0673l5.494-4.7625c5.636-4.8862 12.846-7.576 20.305-7.576h6.122c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.7625c2.63 2.2793 4.14 5.5876 4.14 9.0673v2.3965c0 5.0878-3.208 9.6226-8.006 11.316l-2.189 0.7724c-3.955 1.3961-8.119 2.1094-12.314 2.1094h-20.982c-4.195 0-8.359-0.7133-12.314-2.1094l-2.189-0.7724c-4.798-1.6933-8.006-6.2281-8.006-11.316v-2.3965z"/>
+  <path d="m267 73.406c0-3.4797 1.51-6.788 4.14-9.0673l5.494-4.7625c5.636-4.8862 12.846-7.576 20.305-7.576h6.122c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.7625c2.63 2.2793 4.14 5.5876 4.14 9.0673v2.3965c0 5.0878-3.208 9.6226-8.006 11.316l-2.189 0.7724c-3.955 1.3961-8.119 2.1094-12.314 2.1094h-20.982c-4.195 0-8.359-0.7133-12.314-2.1094l-2.189-0.7724c-4.798-1.6933-8.006-6.2281-8.006-11.316v-2.3965z"/>
+  <path d="m267 111.41c0-3.48 1.51-6.788 4.14-9.068l5.494-4.762c5.636-4.8862 12.846-7.576 20.305-7.576h6.122c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.762c2.63 2.28 4.14 5.588 4.14 9.068v2.396c0 5.088-3.208 9.623-8.006 11.316l-2.189 0.773c-3.955 1.396-8.119 2.109-12.314 2.109h-20.982c-4.195 0-8.359-0.713-12.314-2.109l-2.189-0.773c-4.798-1.693-8.006-6.228-8.006-11.316v-2.396z"/>
+  <rect x="285" y="128" width="30" height="11" rx="1"/>
+  <path d="m167 35.406c0-3.4797 1.51-6.788 4.14-9.0673l5.494-4.7625c5.636-4.8862 12.846-7.576 20.305-7.576h6.122c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.7625c2.63 2.2793 4.14 5.5876 4.14 9.0673v2.3965c0 5.0878-3.208 9.6226-8.006 11.316l-2.189 0.7724c-3.955 1.3961-8.119 2.1094-12.314 2.1094h-20.982c-4.195 0-8.359-0.7133-12.314-2.1094l-2.189-0.7724c-4.798-1.6933-8.006-6.2281-8.006-11.316v-2.3965z"/>
+  <path d="m167 73.406c0-3.4797 1.51-6.788 4.14-9.0673l5.494-4.7625c5.636-4.8862 12.846-7.576 20.305-7.576h6.122c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.7625c2.63 2.2793 4.14 5.5876 4.14 9.0673v2.3965c0 5.0878-3.208 9.6226-8.006 11.316l-2.189 0.7724c-3.955 1.3961-8.119 2.1094-12.314 2.1094h-20.982c-4.195 0-8.359-0.7133-12.314-2.1094l-2.189-0.7724c-4.798-1.6933-8.006-6.2281-8.006-11.316v-2.3965z"/>
+  <path d="m167 111.41c0-3.48 1.51-6.788 4.14-9.068l5.494-4.762c5.636-4.8862 12.846-7.576 20.305-7.576h6.122c7.459 0 14.669 2.6899 20.305 7.576l5.494 4.762c2.63 2.28 4.14 5.588 4.14 9.068v2.396c0 5.088-3.208 9.623-8.006 11.316l-2.189 0.773c-3.955 1.396-8.119 2.109-12.314 2.109h-20.982c-4.195 0-8.359-0.713-12.314-2.109l-2.189-0.773c-4.798-1.693-8.006-6.228-8.006-11.316v-2.396z"/>
+  <rect x="185" y="128" width="30" height="11" rx="1"/>
+  <rect x="17" y="160" width="366" height="217" rx="5"/>
+  <rect x="1" y="138" width="398" height="22" rx="5"/>
+  <rect x="1" y="377" width="398" height="22" rx="5"/>
+ </g><path d="m204.37 266.34-16.841 15.085c-1.041 0.943-0.455 2.682 0.943 2.812l13.151 1.268-7.884 10.989c-0.358 0.504-0.309 1.203 0.13 1.642 0.487 0.488 1.251 0.504 1.755 0.033l16.841-15.086c1.041-0.943 0.455-2.682-0.943-2.812l-13.151-1.268 7.885-10.989c0.357-0.504 0.308-1.203-0.131-1.642-0.487-0.488-1.251-0.504-1.755-0.032z" fill="#1A1A1A"/><path d="m150.82 313.75c-1.541 0-2.503-1.669-1.731-3.002l49.176-84.942c0.771-1.33 2.692-1.33 3.462 0l49.177 84.942c0.772 1.333-0.19 3.002-1.731 3.002h-98.353z" stroke="#1A1A1A" stroke-width="8"/><rect x="90" width="20" height="15" rx="2" fill="#1A1A1A"/><rect x="290" width="20" height="15" rx="2" fill="#1A1A1A"/><rect x="190" width="20" height="15" rx="2" fill="#1A1A1A"/><path d="m134.53 0s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6403 8 4.6403h384c4.418 0 8-1.9892 8-4.6403v-328.36c0-67-132.14-67-132.14-67h-67.86zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 320.94)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/small-right-center.svg b/application/src/main/data/json/system/scada_symbols/small-right-center.svg
new file mode 100644
index 0000000000..de1bee5acd
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/small-right-center.svg
@@ -0,0 +1,717 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="100" height="200" fill="none" version="1.1" viewBox="0 0 100 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "Small right meter",
+  "description": "Small right meter displays the current value with a moving pointer on the scale.",
+  "searchTags": [
+    "scale",
+    "level",
+    "progress",
+    "thermometer"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.backgroundColor});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "progress-indicator",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue, initial) {\n    var clampedValue = Math.max(Math.min(value, Math.max(minValue, maxValue)), Math.min(minValue, maxValue));\n    var normalizedValue = minValue < maxValue\n        ? (clampedValue - minValue) / (maxValue - minValue)\n        : (minValue - clampedValue) / (minValue - maxValue);\n    var offset = initial - (normalizedValue * initial);\n    return offset;\n}\n\nvar valueSet = element.remember('valueSet');\n\nif (ctx.properties.progressArrow && !ctx.properties.progressBar) {\n    element.show();\n    var initial = ctx.properties.valueBox ? 135 : 168;\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.transform({\n            translateY: initial\n        });\n    }\n    \n    var minValue = ctx.properties.minValue;\n    var maxValue = ctx.properties.maxValue;\n    var value = ctx.values.value;\n    \n    var colorProcessor = ctx.properties.progressArrowColor;\n    colorProcessor.update(value);\n    var fill = colorProcessor.color;\n    element.attr({fill: fill});\n    \n    var offset = calculateOffset(value, minValue, maxValue, initial);\n\n    var elementOffset = element.remember('offset');\n    if (offset !== elementOffset) {\n        element.remember('offset', offset);\n        ctx.api.cssAnimate(element, 500).transform({\n            translateY: offset\n        });\n    }\n} else {\n    element.hide();\n    if (valueSet) {\n        element.remember('valueSet', false);\n    }\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressBar",
+      "stateRenderFunction": "if (ctx.properties.progressBar) {\n    element.show();\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressBorder",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    element.attr({'height': 137})\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressCircle",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    element.attr({cy:152});\n}",
+      "actions": null
+    },
+    {
+      "tag": "progressFill",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    element.attr({y:-147});\n}\n\nfunction calculateOffset(value, minValue, maxValue, initial) {\n    var clampedValue = Math.max(Math.min(value, Math.max(minValue, maxValue)), Math.min(minValue, maxValue));\n    var normalizedValue = minValue < maxValue\n        ? (clampedValue - minValue) / (maxValue - minValue)\n        : (minValue - clampedValue) / (minValue - maxValue);\n    var offset = normalizedValue * initial;\n    return offset;\n}\n\nvar valueSet = element.remember('valueSet');\nif (ctx.properties.progressBar) {\n    var initial = ctx.properties.valueBox ? 135: 168;\n    if (!valueSet) {\n        element.remember('valueSet', true);\n        element.attr({height: 2});\n    }\n    \n    var minValue = ctx.properties.minValue;\n    var maxValue = ctx.properties.maxValue;\n    var value = ctx.values.value;\n    \n    var colorProcessor = ctx.properties.progressBarColor;\n    colorProcessor.update(value);\n    var fill = colorProcessor.color;\n    element.attr({fill: fill, stroke: fill});\n    ctx.tags.progressCircle[0].fill(fill);\n    \n    var height = calculateOffset(value, minValue, maxValue, initial);\n\n    var elementHeight = element.remember('height');\n    if (height !== elementHeight) {\n        element.remember('height', height);\n        ctx.api.cssAnimate(element, 500).attr({height: height+2});\n    }\n} else {\n    if (valueSet) {\n        element.remember('valueSet', false);\n    }\n}",
+      "actions": null
+    },
+    {
+      "tag": "scale",
+      "stateRenderFunction": "var scaleSet = element.remember('scaleSet');\nif (!scaleSet) {\n    element.remember('scaleSet', true);\n    element.clear();\n    \n    var majorIntervals = ctx.properties.majorIntervals;\n    var minorIntervals = ctx.properties.minorIntervals;\n    var minValue = ctx.properties.minValue;\n    var maxValue = ctx.properties.maxValue;\n    \n    var start = 11;\n    var end = ctx.properties.valueBox ? 134 : 167;\n    var majorIntervalLength = end / majorIntervals;\n    var minorIntervalLength = majorIntervalLength / minorIntervals;\n    element.add(ctx.svg.line(73, end+11, 73, 11).stroke({ width: 1 }).attr({class: 'majorTick'}));\n    for (var i = 0; i < majorIntervals+1; i++) {\n        var y = start + i * majorIntervalLength;\n        var line = ctx.svg.line(61, y, 73, y).stroke({ width: 1 }).attr({class: 'majorTick'});\n        element.add(line);\n        var majorText = (maxValue - ((maxValue - (minValue)) / (majorIntervals) * i)).toFixed(0);\n        var majorTickText = ctx.svg.text(majorText);\n        majorTickText.attr({x: 55, y: y + 2, 'text-anchor': 'end', class: 'majorTickText'});\n        majorTickText.first().attr({'dominant-baseline': 'middle'});\n        element.add(majorTickText);\n        if (i < majorIntervals) {\n            drawMinorTicks(y, minorIntervals, minorIntervalLength);\n        }\n    }\n}\n\nvar majorFont = ctx.properties.majorFont;\nvar majorColor = ctx.properties.majorColor;\nvar minorColor = ctx.properties.minorColor;\nif (ctx.values.critical) {\n    majorColor = ctx.properties.majorCriticalColor;\n    minorColor = ctx.properties.minorCriticalColor;\n} else if (ctx.values.warning) {\n    majorColor = ctx.properties.minorWarningColor;\n    minorColor = ctx.properties.minorWarningColor;\n}\n\nvar majorTicks = element.find('line.majorTick');\nmajorTicks.forEach(t => t.attr({stroke: majorColor}));\n\nvar majorTicksText = element.find('text.majorTickText');\nctx.api.font(majorTicksText, majorFont, majorColor);\n\nvar minorTicks = element.find('line.minorTick');\nminorTicks.forEach(t => t.attr({stroke: minorColor}));\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\nfunction drawMinorTicks(start, minorIntervals, minorIntervalLength) {\n    for (var i = 1; i < minorIntervals; i++) {\n        var minorY = start + i * minorIntervalLength;\n        var minorLine = ctx.svg.line(67, minorY, 73, minorY).stroke({ width: 1 }).attr({class: 'minorTick'});\n        element.add(minorLine);\n    }\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    element.show();\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box-background",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    var colorProcessor = ctx.properties.valueBoxColor;\n    colorProcessor.update(ctx.values.value);\n    element.attr({fill: colorProcessor.color});\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-text",
+      "stateRenderFunction": "if (ctx.properties.valueBox) {\n    var valueTextFont = ctx.properties.valueTextFont;\n    var valueTextColor = ctx.properties.valueTextColor;\n    var currentVolume = ctx.values.value;\n    var valueText = ctx.api.formatValue(currentVolume, 0, ctx.properties.valueUnits, false);\n    var colorProcessor = ctx.properties.valueTextColor;\n    colorProcessor.update(ctx.values.value);\n    ctx.api.font(element, valueTextFont, colorProcessor.color);\n    ctx.api.text(element, valueText);\n}",
+      "actions": null
+    }
+  ],
+  "behavior": [
+    {
+      "id": "value",
+      "name": "{i18n:scada.symbol.value}",
+      "hint": null,
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "waterLevel"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning-state}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical-state}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "minValue",
+      "name": "{i18n:scada.symbol.min-max-value}",
+      "type": "number",
+      "default": 0,
+      "required": true,
+      "subLabel": "{i18n:scada.symbol.min-value}",
+      "divider": true,
+      "min": -1000,
+      "step": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "maxValue",
+      "name": "{i18n:scada.symbol.min-max-value}",
+      "type": "number",
+      "default": 100,
+      "required": true,
+      "subLabel": "{i18n:scada.symbol.max-value}",
+      "max": 1000,
+      "step": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "backgroundColor",
+      "name": "{i18n:scada.symbol.background-color}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressBar",
+      "name": "{i18n:scada.symbol.progress-bar}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressBarColor",
+      "name": "{i18n:scada.symbol.progress-bar}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#4D94E1",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "progressBar",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressArrow",
+      "name": "{i18n:scada.symbol.progress-arrow}",
+      "type": "switch",
+      "default": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "progressArrowColor",
+      "name": "{i18n:scada.symbol.progress-arrow}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#1C943E",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "progressArrow",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueBox",
+      "name": "{i18n:scada.symbol.value-box}",
+      "type": "switch",
+      "default": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueBoxColor",
+      "name": "{i18n:scada.symbol.value-box}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#F3F3F3",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "valueBox",
+      "disabled": true,
+      "visible": true
+    },
+    {
+      "id": "valueUnits",
+      "name": "{i18n:scada.symbol.value-text}",
+      "type": "units",
+      "default": "%",
+      "subLabel": "{i18n:scada.symbol.units}",
+      "disableOnProperty": "valueBox",
+      "disabled": true,
+      "visible": true
+    },
+    {
+      "id": "valueTextFont",
+      "name": "{i18n:scada.symbol.value-text}",
+      "type": "font",
+      "default": {
+        "size": 14,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "500",
+        "style": "normal"
+      },
+      "disableOnProperty": "valueBox",
+      "disabled": true,
+      "visible": true
+    },
+    {
+      "id": "valueTextColor",
+      "name": "{i18n:scada.symbol.value-text}",
+      "type": "color_settings",
+      "default": {
+        "type": "constant",
+        "color": "#0000008A",
+        "gradient": {
+          "advancedMode": false,
+          "gradient": [
+            "rgba(0, 255, 0, 1)",
+            "rgba(255, 0, 0, 1)"
+          ],
+          "gradientAdvanced": [
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(0, 255, 0, 1)"
+            },
+            {
+              "source": {
+                "type": "constant"
+              },
+              "color": "rgba(255, 0, 0, 1)"
+            }
+          ],
+          "minValue": 0,
+          "maxValue": 100
+        },
+        "rangeList": {
+          "advancedMode": false,
+          "range": [],
+          "rangeAdvanced": []
+        },
+        "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';"
+      },
+      "disableOnProperty": "valueBox",
+      "disabled": true,
+      "visible": true
+    },
+    {
+      "id": "majorIntervals",
+      "name": "{i18n:scada.symbol.major-ticks}",
+      "type": "number",
+      "default": 5,
+      "subLabel": "{i18n:scada.symbol.intervals}",
+      "divider": true,
+      "min": 1,
+      "step": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorFont",
+      "name": "{i18n:scada.symbol.major-ticks}",
+      "type": "font",
+      "default": {
+        "size": 12,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "500",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorColor",
+      "name": "{i18n:scada.symbol.major-ticks-color}",
+      "type": "color",
+      "default": "#747474",
+      "subLabel": "{i18n:scada.symbol.normal}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorWarningColor",
+      "name": "{i18n:scada.symbol.major-ticks-color}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "majorCriticalColor",
+      "name": "{i18n:scada.symbol.major-ticks-color}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorIntervals",
+      "name": "{i18n:scada.symbol.minor-ticks}",
+      "type": "number",
+      "default": 10,
+      "subLabel": "{i18n:scada.symbol.intervals}",
+      "min": 1,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorColor",
+      "name": "{i18n:scada.symbol.minor-ticks-color}",
+      "type": "color",
+      "default": "#747474",
+      "subLabel": "{i18n:scada.symbol.normal}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorWarningColor",
+      "name": "{i18n:scada.symbol.minor-ticks-color}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "minorCriticalColor",
+      "name": "{i18n:scada.symbol.minor-ticks-color}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<path d="m28 200c-2.2091 0-4-1.791-4-4v-192c0-2.2091 1.7909-4 4-4h68c2.2091 0 4 1.7909 4 4v192c0 2.209-1.7909 4-4 4h-68z" fill="#E5E5E5" tb:tag="background"/><path d="m28 200c-2.2091 0-4-1.791-4-4v-192c0-2.2091 1.7909-4 4-4h68c2.2091 0 4 1.7909 4 4v192c0 2.209-1.7909 4-4 4h-68z" fill="url(#paint0_linear_3742_299973)"/><path d="m28 198.5c-1.3807 0-2.5-1.119-2.5-2.5v-192c0-1.3807 1.1193-2.5 2.5-2.5h68c1.3807 0 2.5 1.1193 2.5 2.5v192c0 1.381-1.1193 2.5-2.5 2.5h-68z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><g tb:tag="scale">
+  <g transform="translate(23.965)" fill="#919191">
+   <path d="m14.539 10.088v8.5605h-1.4121v-6.8848l-2.0918 0.709v-1.166l3.3339-1.2187zm8.7754 3.58v1.3946c0 0.6679-0.0665 1.2382-0.1993 1.7109-0.1289 0.4688-0.3164 0.8496-0.5625 1.1426-0.2461 0.2929-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2383 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5468 0.2129 0.7734 0.3925 0.2305 0.1797 0.4258 0.4141 0.5859 0.7032 0.1641 0.2851 0.2891 0.6308 0.375 1.0371 0.086 0.4023 0.129 0.8711 0.129 1.4062zm-1.4122 1.5938v-1.8047c0-0.3398-0.0195-0.6387-0.0585-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1133-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4336 0.3984-0.1171 0.1836-0.207 0.4258-0.2695 0.7266-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0195 0.6465 0.0586 0.9082s0.0977 0.4863 0.1758 0.6738c0.0781 0.1836 0.1719 0.3359 0.2812 0.457 0.1133 0.1172 0.2422 0.2032 0.3868 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2226 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441 0.0585-0.3047 0.0878-0.6699 0.0878-1.0957zm8.4825-1.5938v1.3946c0 0.6679-0.0664 1.2382-0.1993 1.7109-0.1289 0.4688-0.3164 0.8496-0.5625 1.1426-0.246 0.2929-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2383 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5469 0.2129 0.7734 0.3925 0.2305 0.1797 0.4258 0.4141 0.586 0.7032 0.164 0.2851 0.289 0.6308 0.375 1.0371 0.0859 0.4023 0.1289 0.8711 0.1289 1.4062zm-1.4121 1.5938v-1.8047c0-0.3398-0.0196-0.6387-0.0586-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1132-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4335 0.3984-0.1172 0.1836-0.2071 0.4258-0.2696 0.7266-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0196 0.6465 0.0586 0.9082 0.0391 0.2617 0.0977 0.4863 0.1758 0.6738 0.0781 0.1836 0.1719 0.3359 0.2813 0.457 0.1132 0.1172 0.2421 0.2032 0.3867 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441s0.0879-0.6699 0.0879-1.0957z"/>
+   <path d="m23.332 49.374c0 0.5313-0.123 0.9785-0.3691 1.3418s-0.582 0.6387-1.0078 0.8262c-0.4219 0.1836-0.8985 0.2754-1.4297 0.2754-0.5313 0-1.0098-0.0918-1.4356-0.2754-0.4257-0.1875-0.7617-0.4629-1.0078-0.8262s-0.3691-0.8105-0.3691-1.3418c0-0.3515 0.0683-0.6699 0.2051-0.955 0.1367-0.2891 0.33-0.5372 0.58-0.7442 0.254-0.2109 0.5508-0.373 0.8907-0.4863 0.3437-0.1133 0.7187-0.1699 1.125-0.1699 0.539 0 1.0215 0.0996 1.4472 0.2988 0.4258 0.1992 0.7598 0.4746 1.002 0.8262 0.2461 0.3515 0.3691 0.7617 0.3691 1.2304zm-1.4179-0.0703c0-0.2851-0.0586-0.5351-0.1758-0.75-0.1172-0.2148-0.2813-0.3808-0.4922-0.498s-0.4551-0.1758-0.7324-0.1758c-0.2813 0-0.5254 0.0586-0.7325 0.1758-0.207 0.1172-0.3691 0.2832-0.4863 0.498-0.1133 0.2149-0.1699 0.4649-0.1699 0.75 0 0.2891 0.0566 0.5391 0.1699 0.75 0.1133 0.207 0.2754 0.3653 0.4863 0.4746 0.211 0.1094 0.459 0.1641 0.7442 0.1641 0.2851 0 0.5312-0.0547 0.7383-0.1641 0.207-0.1093 0.3672-0.2676 0.4804-0.4746 0.1133-0.2109 0.17-0.4609 0.17-0.75zm1.2246-3.8906c0 0.4258-0.1133 0.8047-0.3399 1.1367-0.2226 0.332-0.5312 0.5938-0.9258 0.7852-0.3945 0.1875-0.8437 0.2812-1.3476 0.2812-0.5078 0-0.9609-0.0937-1.3594-0.2812-0.3945-0.1914-0.7051-0.4532-0.9316-0.7852-0.2227-0.332-0.334-0.7109-0.334-1.1367 0-0.5078 0.1113-0.9356 0.334-1.2832 0.2265-0.3516 0.5371-0.6192 0.9316-0.8027 0.3945-0.1836 0.8457-0.2754 1.3535-0.2754s0.959 0.0918 1.3535 0.2754c0.3946 0.1835 0.7032 0.4511 0.9258 0.8027 0.2266 0.3476 0.3399 0.7754 0.3399 1.2832zm-1.4121 0.0469c0-0.2539-0.0508-0.4766-0.1524-0.668-0.0976-0.1953-0.2363-0.3477-0.416-0.457-0.1797-0.1094-0.3926-0.1641-0.6387-0.1641s-0.459 0.0527-0.6386 0.1582c-0.1797 0.1055-0.3184 0.2539-0.4161 0.4453-0.0976 0.1914-0.1464 0.4199-0.1464 0.6856 0 0.2617 0.0488 0.4902 0.1464 0.6855 0.0977 0.1914 0.2364 0.3418 0.4161 0.4512 0.1836 0.1094 0.3984 0.164 0.6445 0.164s0.459-0.0546 0.6387-0.164 0.3183-0.2598 0.416-0.4512c0.0976-0.1953 0.1465-0.4238 0.1465-0.6855zm8.6582 1.2597v1.3946c0 0.6679-0.0664 1.2382-0.1993 1.7109-0.1289 0.4688-0.3164 0.8496-0.5625 1.1426-0.246 0.2929-0.541 0.5078-0.8847 0.6445-0.3399 0.1367-0.7207 0.2051-1.1426 0.2051-0.3359 0-0.6484-0.043-0.9375-0.1289-0.2852-0.086-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.293-0.2852-0.6426-0.375-1.0488-0.086-0.4063-0.1289-0.877-0.1289-1.4121v-1.3946c0-0.6718 0.0664-1.2382 0.1992-1.6992 0.1328-0.4648 0.3222-0.8418 0.5683-1.1308 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.0429 0.9375 0.1289 0.289 0.082 0.5469 0.2129 0.7734 0.3925 0.2305 0.1797 0.4258 0.4141 0.586 0.7032 0.164 0.2851 0.289 0.6308 0.375 1.0371 0.0859 0.4023 0.1289 0.8711 0.1289 1.4062zm-1.4121 1.5938v-1.8047c0-0.3398-0.0196-0.6387-0.0586-0.8965-0.0391-0.2617-0.0977-0.4824-0.1758-0.6621-0.0742-0.1836-0.168-0.332-0.2813-0.4453-0.1132-0.1172-0.2422-0.2012-0.3867-0.252-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.1289-0.1718 0.082-0.3164 0.2149-0.4335 0.3984-0.1172 0.1836-0.2071 0.4258-0.2696 0.7266-0.0586 0.2969-0.0879 0.6582-0.0879 1.084v1.8047c0 0.3437 0.0196 0.6465 0.0586 0.9082 0.0391 0.2617 0.0977 0.4863 0.1758 0.6738 0.0781 0.1836 0.1719 0.336 0.2813 0.457 0.1132 0.1172 0.2421 0.2032 0.3867 0.2579 0.1484 0.0546 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.1289 0.1719-0.086 0.3164-0.2227 0.4336-0.4102 0.1172-0.1914 0.2051-0.4394 0.2637-0.7441s0.0879-0.6699 0.0879-1.0957z"/>
+   <path d="m22.02 74.016h0.1758v1.1543h-0.0996c-0.5039 0-0.9395 0.0781-1.3066 0.2343-0.3633 0.1563-0.6621 0.3711-0.8965 0.6446-0.2344 0.2734-0.4102 0.5937-0.5274 0.9609-0.1132 0.3633-0.1699 0.75-0.1699 1.1602v1.3418c0 0.3398 0.0371 0.6406 0.1113 0.9023 0.0743 0.2578 0.1778 0.4746 0.3106 0.6504 0.1367 0.1719 0.293 0.3027 0.4687 0.3926 0.1758 0.0898 0.3653 0.1347 0.5684 0.1347 0.2109 0 0.4023-0.0429 0.5742-0.1289 0.1719-0.0898 0.3184-0.2129 0.4395-0.3691 0.1211-0.1563 0.2129-0.3418 0.2754-0.5567 0.0625-0.2148 0.0937-0.4492 0.0937-0.7031 0-0.2422-0.0312-0.4687-0.0937-0.6797-0.0586-0.2148-0.1465-0.4023-0.2637-0.5625-0.1172-0.164-0.2637-0.291-0.4395-0.3808-0.1718-0.0938-0.3711-0.1406-0.5976-0.1406-0.2813 0-0.5371 0.0664-0.7676 0.1992-0.2266 0.1328-0.4102 0.3066-0.5508 0.5215-0.1367 0.2109-0.2109 0.4355-0.2226 0.6738l-0.5391-0.1758c0.0313-0.3633 0.1113-0.6895 0.2402-0.9785 0.1328-0.2891 0.3067-0.5352 0.5215-0.7383 0.2149-0.2031 0.4629-0.3574 0.7442-0.4629 0.2851-0.1094 0.5976-0.164 0.9375-0.164 0.414 0 0.7734 0.0781 1.0781 0.2343 0.3047 0.1563 0.5566 0.3692 0.7558 0.6387 0.2032 0.2656 0.3536 0.5703 0.4512 0.9141 0.1016 0.3398 0.1524 0.6953 0.1524 1.0664 0 0.4101-0.0625 0.7929-0.1875 1.1484-0.125 0.3516-0.3086 0.6602-0.5508 0.9258-0.2383 0.2656-0.5293 0.4726-0.8731 0.6211-0.3398 0.1484-0.7265 0.2226-1.1601 0.2226-0.4571 0-0.8653-0.0879-1.2246-0.2636-0.3555-0.1758-0.6582-0.418-0.9082-0.7266-0.2461-0.3086-0.4336-0.6641-0.5625-1.0664s-0.1934-0.8281-0.1934-1.2773v-0.586c0-0.6484 0.082-1.2598 0.2461-1.834 0.1641-0.5781 0.416-1.0879 0.7559-1.5293 0.3437-0.4414 0.7832-0.7871 1.3183-1.0371 0.5352-0.2539 1.1738-0.3808 1.916-0.3808zm8.3653 3.6035v1.3945c0 0.668-0.0664 1.2383-0.1993 1.7109-0.1289 0.4688-0.3164 0.8497-0.5625 1.1426-0.246 0.293-0.541 0.5078-0.8847 0.6446-0.3399 0.1367-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.0429-0.9375-0.1289-0.2852-0.0859-0.543-0.2207-0.7734-0.4043-0.2305-0.1836-0.4278-0.4199-0.5918-0.709-0.1602-0.2929-0.2852-0.6425-0.375-1.0488-0.086-0.4062-0.1289-0.8769-0.1289-1.4121v-1.3945c0-0.6719 0.0664-1.2383 0.1992-1.6992 0.1328-0.4649 0.3222-0.8418 0.5683-1.1309 0.2461-0.293 0.5391-0.5059 0.8789-0.6387 0.3438-0.1328 0.7266-0.1992 1.1485-0.1992 0.3398 0 0.6523 0.043 0.9375 0.1289 0.289 0.082 0.5469 0.2129 0.7734 0.3926 0.2305 0.1797 0.4258 0.4141 0.586 0.7031 0.164 0.2852 0.289 0.6309 0.375 1.0371 0.0859 0.4024 0.1289 0.8711 0.1289 1.4063zm-1.4121 1.5937v-1.8047c0-0.3398-0.0196-0.6386-0.0586-0.8964-0.0391-0.2618-0.0977-0.4825-0.1758-0.6622-0.0742-0.1835-0.168-0.332-0.2813-0.4453-0.1132-0.1172-0.2422-0.2011-0.3867-0.2519-0.1445-0.0547-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.0429-0.586 0.1289-0.1718 0.082-0.3164 0.2148-0.4335 0.3984-0.1172 0.1836-0.2071 0.4258-0.2696 0.7266-0.0586 0.2968-0.0879 0.6582-0.0879 1.0839v1.8047c0 0.3438 0.0196 0.6465 0.0586 0.9082 0.0391 0.2618 0.0977 0.4864 0.1758 0.6739 0.0781 0.1836 0.1719 0.3359 0.2813 0.457 0.1132 0.1172 0.2421 0.2031 0.3867 0.2578 0.1484 0.0547 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.0429 0.5918-0.1289 0.1719-0.0859 0.3164-0.2226 0.4336-0.4101 0.1172-0.1914 0.2051-0.4395 0.2637-0.7442s0.0879-0.6699 0.0879-1.0957z"/>
+   <path d="m23.631 111.66v1.125h-6.1524l-0.0469-0.85 3.6797-5.765h1.1309l-1.2246 2.097-2.1153 3.393zm-1.0664-5.49v8.531h-1.4122v-8.531zm7.8203 3.55v1.395c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.292-0.541 0.507-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.22-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.643-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.395c0-0.671 0.0664-1.238 0.1992-1.699 0.1328-0.465 0.3222-0.842 0.5683-1.131 0.2461-0.293 0.5391-0.505 0.8789-0.638 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.042 0.9375 0.128 0.289 0.082 0.5469 0.213 0.7734 0.393 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.406zm-1.4121 1.594v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.184-0.168-0.332-0.2813-0.445-0.1132-0.118-0.2422-0.202-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.214-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.296-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.908 0.0391 0.262 0.0977 0.487 0.1758 0.674 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.117 0.2421 0.203 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z"/>
+   <path d="m23.473 145.48v1.125h-5.7188v-0.967l2.7773-3.029c0.3047-0.344 0.545-0.641 0.7208-0.891 0.1757-0.25 0.2988-0.474 0.3691-0.673 0.0742-0.204 0.1113-0.401 0.1113-0.592 0-0.27-0.0508-0.506-0.1523-0.709-0.0977-0.207-0.2422-0.369-0.4336-0.487-0.1914-0.121-0.4238-0.181-0.6973-0.181-0.3164 0-0.582 0.068-0.7969 0.205-0.2148 0.137-0.3769 0.326-0.4863 0.568-0.1094 0.239-0.164 0.512-0.164 0.821h-1.4122c0-0.497 0.1133-0.95 0.3399-1.36 0.2265-0.414 0.5547-0.742 0.9844-0.984 0.4297-0.246 0.9472-0.369 1.5527-0.369 0.5703 0 1.0547 0.095 1.4531 0.287 0.3985 0.191 0.7012 0.463 0.9082 0.814 0.211 0.352 0.3164 0.768 0.3164 1.248 0 0.266-0.0429 0.53-0.1289 0.791-0.0859 0.262-0.209 0.524-0.3691 0.785-0.1563 0.258-0.3418 0.518-0.5567 0.78-0.2148 0.258-0.4511 0.519-0.7089 0.785l-1.8457 2.033zm6.9121-3.855v1.394c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.293-0.541 0.507-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.22-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.642-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.394c0-0.672 0.0664-1.239 0.1992-1.7 0.1328-0.464 0.3222-0.841 0.5683-1.13 0.2461-0.293 0.5391-0.506 0.8789-0.639 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.043 0.9375 0.129 0.289 0.082 0.5469 0.212 0.7734 0.392 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.407zm-1.4121 1.593v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.183-0.168-0.332-0.2813-0.445-0.1132-0.117-0.2422-0.201-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.215-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.297-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.909 0.0391 0.261 0.0977 0.486 0.1758 0.673 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.118 0.2421 0.204 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z"/>
+   <path d="m30.385 173.02v1.394c0 0.668-0.0664 1.238-0.1993 1.711-0.1289 0.469-0.3164 0.85-0.5625 1.143-0.246 0.293-0.541 0.507-0.8847 0.644-0.3399 0.137-0.7207 0.205-1.1426 0.205-0.3359 0-0.6484-0.043-0.9375-0.129-0.2852-0.086-0.543-0.22-0.7734-0.404-0.2305-0.184-0.4278-0.42-0.5918-0.709-0.1602-0.293-0.2852-0.643-0.375-1.049-0.086-0.406-0.1289-0.877-0.1289-1.412v-1.394c0-0.672 0.0664-1.239 0.1992-1.7 0.1328-0.465 0.3222-0.841 0.5683-1.131 0.2461-0.293 0.5391-0.505 0.8789-0.638 0.3438-0.133 0.7266-0.199 1.1485-0.199 0.3398 0 0.6523 0.043 0.9375 0.128 0.289 0.082 0.5469 0.213 0.7734 0.393 0.2305 0.18 0.4258 0.414 0.586 0.703 0.164 0.285 0.289 0.631 0.375 1.037 0.0859 0.403 0.1289 0.871 0.1289 1.407zm-1.4121 1.593v-1.804c0-0.34-0.0196-0.639-0.0586-0.897-0.0391-0.262-0.0977-0.482-0.1758-0.662-0.0742-0.184-0.168-0.332-0.2813-0.445-0.1132-0.117-0.2422-0.201-0.3867-0.252-0.1445-0.055-0.3066-0.082-0.4863-0.082-0.2188 0-0.4141 0.043-0.586 0.129-0.1718 0.082-0.3164 0.214-0.4335 0.398-0.1172 0.184-0.2071 0.426-0.2696 0.727-0.0586 0.296-0.0879 0.658-0.0879 1.084v1.804c0 0.344 0.0196 0.647 0.0586 0.908 0.0391 0.262 0.0977 0.487 0.1758 0.674 0.0781 0.184 0.1719 0.336 0.2813 0.457 0.1132 0.118 0.2421 0.203 0.3867 0.258 0.1484 0.055 0.3105 0.082 0.4863 0.082 0.2227 0 0.4199-0.043 0.5918-0.129s0.3164-0.222 0.4336-0.41c0.1172-0.191 0.2051-0.439 0.2637-0.744s0.0879-0.67 0.0879-1.096z"/>
+  </g>
+  <g transform="matrix(1 0 0 1.0194 24.515 -3.9105)" stroke="#747474">
+   <path d="m50.695 14.031v164.03h0.22794v-164.03z" fill="#747474" stroke-width=".77206"/>
+   <line x1="39" x2="51" y1="14.145" y2="14.145"/>
+   <line x1="45" x2="51" y1="17.76" y2="17.76"/>
+   <line x1="45" x2="51" y1="21.02" y2="21.02"/>
+   <line x1="45" x2="51" y1="24.28" y2="24.28"/>
+   <line x1="45" x2="51" y1="27.54" y2="27.54"/>
+   <line x1="45" x2="51" y1="30.8" y2="30.8"/>
+   <line x1="45" x2="51" y1="34.06" y2="34.06"/>
+   <line x1="45" x2="51" y1="37.32" y2="37.32"/>
+   <line x1="45" x2="51" y1="40.58" y2="40.58"/>
+   <line x1="45" x2="51" y1="43.84" y2="43.84"/>
+   <line x1="39" x2="51" y1="47.1" y2="47.1"/>
+   <line x1="45" x2="51" y1="50.36" y2="50.36"/>
+   <line x1="45" x2="51" y1="53.62" y2="53.62"/>
+   <line x1="45" x2="51" y1="56.88" y2="56.88"/>
+   <line x1="45" x2="51" y1="60.14" y2="60.14"/>
+   <line x1="45" x2="51" y1="63.4" y2="63.4"/>
+   <line x1="45" x2="51" y1="66.66" y2="66.66"/>
+   <line x1="45" x2="51" y1="69.92" y2="69.92"/>
+   <line x1="45" x2="51" y1="73.18" y2="73.18"/>
+   <line x1="45" x2="51" y1="76.44" y2="76.44"/>
+   <line x1="39" x2="51" y1="79.7" y2="79.7"/>
+   <line x1="45" x2="51" y1="82.96" y2="82.96"/>
+   <line x1="45" x2="51" y1="86.22" y2="86.22"/>
+   <line x1="45" x2="51" y1="89.48" y2="89.48"/>
+   <line x1="45" x2="51" y1="92.74" y2="92.74"/>
+   <line x1="45" x2="51" y1="96" y2="96"/>
+   <line x1="45" x2="51" y1="99.26" y2="99.26"/>
+   <line x1="45" x2="51" y1="102.52" y2="102.52"/>
+   <line x1="45" x2="51" y1="105.78" y2="105.78"/>
+   <line x1="45" x2="51" y1="109.04" y2="109.04"/>
+   <line x1="39" x2="51" y1="112.3" y2="112.3"/>
+   <line x1="45" x2="51" y1="115.56" y2="115.56"/>
+   <line x1="45" x2="51" y1="118.82" y2="118.82"/>
+   <line x1="45" x2="51" y1="122.08" y2="122.08"/>
+   <line x1="45" x2="51" y1="125.34" y2="125.34"/>
+   <line x1="45" x2="51" y1="128.6" y2="128.6"/>
+   <line x1="45" x2="51" y1="131.86" y2="131.86"/>
+   <line x1="45" x2="51" y1="135.12" y2="135.12"/>
+   <line x1="45" x2="51" y1="138.38" y2="138.38"/>
+   <line x1="45" x2="51" y1="141.64" y2="141.64"/>
+   <line x1="39" x2="51" y1="144.9" y2="144.9"/>
+   <line x1="45" x2="51" y1="148.16" y2="148.16"/>
+   <line x1="45" x2="51" y1="151.42" y2="151.42"/>
+   <line x1="45" x2="51" y1="154.68" y2="154.68"/>
+   <line x1="45" x2="51" y1="157.94" y2="157.94"/>
+   <line x1="45" x2="51" y1="161.2" y2="161.2"/>
+   <line x1="45" x2="51" y1="164.46" y2="164.46"/>
+   <line x1="45" x2="51" y1="167.72" y2="167.72"/>
+   <line x1="45" x2="51" y1="170.98" y2="170.98"/>
+   <line x1="45" x2="51" y1="174.24" y2="174.24"/>
+   <line x1="38.985" x2="50.985" y1="177.96" y2="177.96"/>
+  </g>
+ </g><g tb:tag="progressBar">
+  <rect x="79.5" y="10.5" width="6" height="169" ry="1.12" stroke="#cecece" tb:tag="progressBorder"/>
+  <rect transform="scale(1,-1)" x="79.5" y="-180" width="6" height="62" ry="1.12" fill="#4d94e1" stroke="#4d94e1" tb:tag="progressFill"/>
+  <circle cx="82.5" cy="185" r="7" fill="#4d94e1" tb:tag="progressCircle"/>
+ </g><g transform="translate(0,167)" fill="#1c943e" style="display: none;" tb:tag="progress-indicator">
+  <path d="m75 10.562 10.5 6.062v-12.124z" style=""/>
+ </g><g transform="translate(12)" filter="url(#filter0_ii_3742_299961)" style="display: none;" tb:tag="value-box">
+  <rect x="22" y="164" width="56" height="28" rx="4" fill="#fffefe" fill-opacity=".75" tb:tag="value-box-background" style=""/>
+  <rect x="23" y="165" width="54" height="26" rx="3" stroke="#fff" stroke-width="2" style=""/>
+  <text x="49.853027" y="179.5625" fill="#727171" font-family="Roboto" font-size="14px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve" style=""><tspan dominant-baseline="middle">37%</tspan></text>
+ </g><path d="m49.56 0s-25.56 0-25.56 33.5v164.18c0 1.3256 0.68053 2.3202 1.52 2.3202h72.96c0.83942 0 1.52-0.9946 1.52-2.3202v-164.18c0-33.5-25.107-33.5-25.107-33.5h-12.893zm25.487 40.6c-0.48969 0-0.88669 0.6268-0.88669 1.4v150.2c0 0.7732 0.39697 1.4 0.88669 1.4h5.5733c0.48969 0 0.88669-0.6268 0.88669-1.4v-150.2c0-0.7732-0.39697-1.4-0.88669-1.4z" fill-opacity="0" tb:tag="clickArea"/><path d="m8 200c2.2091 0 4-1.791 4-4v-192c0-2.2091-1.7909-4-4-4h-4c-2.2091 0-4 1.7909-4 4v192c0 2.209 1.7909 4 4 4h4z" fill="#93979B"/><path d="m8 200c2.2091 0 4-1.791 4-4v-192c0-2.2091-1.7909-4-4-4h-4c-2.2091 0-4 1.7909-4 4v192c0 2.209 1.7909 4 4 4h4z" fill="url(#paint1_linear_3742_299973)"/><path d="m8 198.5c1.3807 0 2.5-1.119 2.5-2.5v-192c0-1.3807-1.1193-2.5-2.5-2.5h-4c-1.3807 0-2.5 1.1193-2.5 2.5v192c0 1.381 1.1193 2.5 2.5 2.5h4z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m12 146c0 2.209 1.7908 4 3.9999 4h4c2.2092 0 4.0001-1.791 4.0001-4v-92c0-2.2091-1.7909-4-4-4h-4c-2.2091 0-4 1.7909-4 4v92z" fill="#647484"/><path d="m12 146c0 2.209 1.7908 4 3.9999 4h4c2.2092 0 4.0001-1.791 4.0001-4v-92c0-2.2091-1.7909-4-4-4h-4c-2.2091 0-4 1.7909-4 4v92z" fill="url(#paint2_linear_3742_299973)"/><path d="m13.5 146c0 1.38 1.1193 2.5 2.4999 2.5h4c1.3808 0 2.5001-1.119 2.5001-2.5v-92c0-1.3807-1.1193-2.5-2.5-2.5h-4c-1.3807 0-2.5 1.1193-2.5 2.5v92z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><defs>
+  <linearGradient id="paint0_linear_3742_299973" x1="100" x2="24" y1="100" y2="100.09" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#020202" stop-opacity=".35" offset="0"/>
+   <stop stop-color="#020202" stop-opacity=".12" offset=".02629"/>
+   <stop stop-color="#fff" stop-opacity=".12" offset=".11617"/>
+   <stop stop-color="#fff" stop-opacity=".3" offset=".49829"/>
+   <stop stop-color="#fff" stop-opacity=".12" offset=".88762"/>
+   <stop stop-color="#020202" stop-opacity=".12" offset=".96591"/>
+   <stop stop-color="#020202" stop-opacity=".35" offset="1"/>
+  </linearGradient>
+  <linearGradient id="paint1_linear_3742_299973" x1="1.9297" x2="46.003" y1="-14.344" y2="205.53" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#020202" stop-opacity=".35" offset="0"/>
+   <stop stop-color="#020202" stop-opacity=".12" offset=".23574"/>
+   <stop stop-color="#fff" stop-opacity=".12" offset=".39937"/>
+   <stop stop-color="#fff" stop-opacity=".3" offset=".49829"/>
+   <stop stop-color="#fff" stop-opacity=".12" offset=".59721"/>
+   <stop stop-color="#020202" stop-opacity=".12" offset=".76303"/>
+   <stop stop-color="#020202" stop-opacity=".35" offset="1"/>
+  </linearGradient>
+  <linearGradient id="paint2_linear_3742_299973" x1="19.045" x2="14.639" y1="53.812" y2="145.03" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#020202" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#020202" stop-opacity=".18" offset=".090959"/>
+   <stop stop-color="#020202" stop-opacity=".1" offset=".1"/>
+   <stop stop-color="#020202" stop-opacity=".08" offset=".20513"/>
+   <stop stop-color="#020202" stop-opacity=".05" offset=".21555"/>
+   <stop stop-color="#020202" stop-opacity=".02" offset=".36962"/>
+   <stop stop-color="#fff" stop-opacity=".01" offset=".37768"/>
+   <stop stop-color="#fff" stop-opacity=".01" offset=".62413"/>
+   <stop stop-color="#020202" stop-opacity=".02" offset=".6313"/>
+   <stop stop-color="#020202" stop-opacity=".05" offset=".77601"/>
+   <stop stop-color="#020202" stop-opacity=".08" offset=".7898"/>
+   <stop stop-color="#020202" stop-opacity=".1" offset=".9"/>
+   <stop stop-color="#020202" stop-opacity=".18" offset=".90846"/>
+   <stop stop-color="#020202" stop-opacity=".2" offset="1"/>
+  </linearGradient>
+  <filter id="filter0_ii_3742_299961" x="20" y="162" width="60" height="32" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+   <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+   <feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+   <feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+   <feOffset dx="-2" dy="2"/>
+   <feGaussianBlur stdDeviation="3"/>
+   <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic"/>
+   <feColorMatrix values="0 0 0 0 0.445833 0 0 0 0 0.445833 0 0 0 0 0.445833 0 0 0 0.5 0"/>
+   <feBlend in2="shape" result="effect1_innerShadow_3742_299961"/>
+   <feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+   <feOffset dx="2" dy="-2"/>
+   <feGaussianBlur stdDeviation="2"/>
+   <feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic"/>
+   <feColorMatrix values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.5 0"/>
+   <feBlend in2="effect1_innerShadow_3742_299961" result="effect2_innerShadow_3742_299961"/>
+  </filter>
+ </defs>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/small-vertical-separator-connector-hp.svg b/application/src/main/data/json/system/scada_symbols/small-vertical-separator-connector-hp.svg
new file mode 100644
index 0000000000..b248996612
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/small-vertical-separator-connector-hp.svg
@@ -0,0 +1,342 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="1000" fill="none" version="1.1" viewBox="0 0 400 1000"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Small vertical separator with connector",
+  "description": "Small vertical separator with connector with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 5,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<path d="m1 260c0-37.263 0.00859-55.699 4.0548-70.799 11.004-41.066 43.08-73.143 84.146-84.146 15.1-4.046 33.536-4.055 70.8-4.055s55.699 9e-3 70.799 4.055c41.066 11.003 73.143 43.08 84.146 84.146 4.046 15.1 4.055 33.536 4.055 70.799v580c0 37.263-9e-3 55.699-4.055 70.799-11.003 41.066-43.08 73.143-84.146 84.146-15.1 4.046-33.536 4.055-70.799 4.055s-55.699-9e-3 -70.8-4.055c-41.066-11.003-73.142-43.08-84.146-84.146-4.0462-15.1-4.0548-33.536-4.0548-70.799v-580z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m400 700h-8c-16.569 0-30-13.431-30-30v-637c0-16.569-13.431-30-30-30h-147c-16.569 0-30 13.432-30 30v67" stroke="#1A1A1A" stroke-width="6"/><path d="m134.4 0s-134.53 0-134.53 167.5v820.9c0 6.628 3.5818 11.601 8 11.601h384c4.418 0 8-4.973 8-11.601v-820.9c0-167.5-132.14-167.5-132.14-167.5h-67.86zm134.14 203c-2.5774 0-4.6664 3.134-4.6664 7v751c0 3.866 2.0894 7 4.6664 7h29.332c2.5774 0 4.6664-3.134 4.6664-7v-751c0-3.866-2.0894-7-4.6664-7z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,916)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 916)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/small-vertical-separator-hp.svg b/application/src/main/data/json/system/scada_symbols/small-vertical-separator-hp.svg
new file mode 100644
index 0000000000..25aec080b3
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/small-vertical-separator-hp.svg
@@ -0,0 +1,342 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="1000" fill="none" version="1.1" viewBox="0 0 400 1000"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Small vertical separator",
+  "description": "Small vertical separator with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 5,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<path d="m1 200c0-37.22 0.00484-55.684 3.0551-71.019 12.546-63.074 61.852-112.38 124.93-124.93 15.335-3.0503 33.799-3.0551 71.019-3.0551 37.22 1e-5 55.684 0.00485 71.019 3.0552 63.074 12.546 112.38 61.852 124.93 124.93 3.05 15.335 3.055 33.799 3.055 71.019v600c0 37.22-5e-3 55.684-3.055 71.019-12.546 63.074-61.852 112.38-124.93 124.93-15.335 3.05-33.799 3.055-71.019 3.055s-55.684-5e-3 -71.019-3.055c-63.074-12.546-112.38-61.852-124.93-124.93-3.0503-15.335-3.0551-33.799-3.0551-71.019v-600z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m134.53 0s-134.53 0-134.53 167.5v820.9c0 6.628 3.5818 11.601 8 11.601h384c4.418 0 8-4.973 8-11.601v-820.9c0-167.5-132.14-167.5-132.14-167.5h-67.86zm134.14 203c-2.5774 0-4.6664 3.134-4.6664 7v751c0 3.866 2.0894 7 4.6664 7h29.332c2.5774 0 4.6664-3.134 4.6664-7v-751c0-3.866-2.0894-7-4.6664-7z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,916)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 916)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/solar-panel-hp.svg b/application/src/main/data/json/system/scada_symbols/solar-panel-hp.svg
new file mode 100644
index 0000000000..b7b7724f89
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/solar-panel-hp.svg
@@ -0,0 +1,353 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="400" fill="none" version="1.1" viewBox="0 0 200 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Solar panel",
+  "description": "Solar panel with various states.",
+  "searchTags": [
+    "energy",
+    "power",
+    "renewable",
+    "generation"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<path d="M21 1H199V359H21V1Z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m65 0v40" stroke="#1A1A1A" stroke-width="2"/><path d="m110 0v40" stroke="#1A1A1A" stroke-width="2"/><path d="m155 0v40" stroke="#1A1A1A" stroke-width="2"/><path d="m180 180h20" stroke="#1A1A1A" stroke-width="2"/><path d="m180 90h20" stroke="#1A1A1A" stroke-width="2"/><path d="m180 270h20" stroke="#1A1A1A" stroke-width="2"/><rect x="1" y="41" width="178" height="358" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m45 40v360" stroke="#1A1A1A" stroke-width="2"/><path d="m90 40v360" stroke="#1A1A1A" stroke-width="2"/><path d="m135 40v360" stroke="#1A1A1A" stroke-width="2"/><path d="m0 220h180" stroke="#1A1A1A" stroke-width="2"/><path d="m0 130h180" stroke="#1A1A1A" stroke-width="2"/><path d="m0 310h180" stroke="#1A1A1A" stroke-width="2"/><path d="m67.265 0s-67.265 0-67.265 67v328.36c0 2.6512 1.7909 4.6404 4 4.6404h192c2.209 0 4-1.9892 4-4.6404v-328.36c0-67-66.07-67-66.07-67h-33.929zm67.07 81.2c-1.2887 0-2.3333 1.2536-2.3333 2.8v300.4c0 1.5464 1.0447 2.8 2.3333 2.8h14.666c1.2887 0 2.3333-1.2536 2.3333-2.8v-300.4c0-1.5464-1.0447-2.8-2.3333-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/stand-solar-panel-hp.svg b/application/src/main/data/json/system/scada_symbols/stand-solar-panel-hp.svg
new file mode 100644
index 0000000000..93e622a021
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/stand-solar-panel-hp.svg
@@ -0,0 +1,357 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="400" fill="none" version="1.1" viewBox="0 0 600 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Stand solar panel",
+  "description": "Stand solar panel with various states.",
+  "searchTags": [
+    "energy",
+    "power",
+    "renewable",
+    "generation"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <path d="m116.44 357 33.471-33h299.17l32.528 33h-365.17z"/>
+  <path d="m1.3942 324 109.32-323h378.57l109.32 323h-597.21z"/>
+  <rect x="56" y="357" width="478" height="42" rx="5"/>
+ </g><path d="M450 324L395 1" stroke="#1A1A1A" stroke-width="2"/><path d="M150 324L205 1" stroke="#1A1A1A" stroke-width="2"/><path d="M300 324V1" stroke="#1A1A1A" stroke-width="2"/><path d="m57 162h486" stroke="#1A1A1A" stroke-width="2"/><path d="m201.8 0s-201.8 0-201.8 67v328.36c0 2.6512 5.3727 4.6404 12 4.6404h576c6.627 0 12-1.9892 12-4.6404v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill="#000" fill-opacity="0" style="stroke-width:1.732" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 320.94)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/three-rate-energy-meter-hp.svg b/application/src/main/data/json/system/scada_symbols/three-rate-energy-meter-hp.svg
new file mode 100644
index 0000000000..f2b7bf4d54
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/three-rate-energy-meter-hp.svg
@@ -0,0 +1,747 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="400" fill="none" version="1.1" viewBox="0 0 600 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Three-rate energy meter",
+  "description": "Three-rate energy meter with various states.",
+  "searchTags": [
+    "power",
+    "energy"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "night-label",
+      "stateRenderFunction": "if (ctx.properties.showNightLabel) {\n    element.show();\n    ctx.api.font(element, ctx.properties.nightLabelFont, ctx.properties.nightLabelColor);\n    ctx.api.text(element, ctx.properties.nightLabel);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "night-rate",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.nightValueFont, ctx.properties.nightValueColor);\nctx.api.text(element, ctx.api.formatValue(ctx.values.nightRate, 0, null, 0));",
+      "actions": null
+    },
+    {
+      "tag": "off-peak-label",
+      "stateRenderFunction": "if (ctx.properties.showOffPeakLabel) {\n    element.show();\n    ctx.api.font(element, ctx.properties.offPeakLabelFont, ctx.properties.offPeakLabelColor);\n    ctx.api.text(element, ctx.properties.offPeakLabel);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "off-peak-rate",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.offPeakValueFont, ctx.properties.offPeakValueColor);\nctx.api.text(element, ctx.api.formatValue(ctx.values.offPeakRate, 0, null, 0));",
+      "actions": null
+    },
+    {
+      "tag": "peak-label",
+      "stateRenderFunction": "if (ctx.properties.showPeakLabel) {\n    element.show();\n    ctx.api.font(element, ctx.properties.peakLabelFont, ctx.properties.peakLabelColor);\n    ctx.api.text(element, ctx.properties.peakLabel);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "peak-rate",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.peakValueFont, ctx.properties.peakValueColor);\nctx.api.text(element, ctx.api.formatValue(ctx.values.peakRate, 0, null, 0));",
+      "actions": null
+    },
+    {
+      "tag": "units",
+      "stateRenderFunction": "if (ctx.properties.showUnits) {\n    element.show();\n    ctx.api.font(element, ctx.properties.unitsFont, ctx.properties.unitsColor);\n    ctx.api.text(element, ctx.properties.units);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box-night",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.nightValueBoxBackground;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "value-box-off-peak",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.offPeakValueBoxBackground;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "value-box-peak",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.peakValueBoxBackground;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "offPeakRate",
+      "name": "{i18n:scada.symbol.off-peak-rate}",
+      "hint": "{i18n:scada.symbol.measured-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "offPeakRate"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "nightRate",
+      "name": "{i18n:scada.symbol.night-rate}",
+      "hint": "{i18n:scada.symbol.measured-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "nightRate"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "peakRate",
+      "name": "{i18n:scada.symbol.peak-rate}",
+      "hint": "{i18n:scada.symbol.measured-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "peakRate"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showOffPeakLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offPeakLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "text",
+      "default": "T1",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offPeakLabelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offPeakLabelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "color",
+      "default": "#000000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offPeakValueFont",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "font",
+      "default": {
+        "size": 48,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offPeakValueColor",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "offPeakValueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "group": "{i18n:scada.symbol.off-peak-rate}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showNightLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "text",
+      "default": "T2",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightLabelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightLabelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightValueFont",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "font",
+      "default": {
+        "size": 48,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightValueColor",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightValueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showPeakLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "peakLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "text",
+      "default": "T3",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "peakLabelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "peakLabelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "peakValueFont",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "font",
+      "default": {
+        "size": 48,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "peakValueColor",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "peakValueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "group": "{i18n:scada.symbol.peak-rate}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showUnits",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "units",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "units",
+      "default": "kWh",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "unitsFont",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "unitsColor",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="598" height="398" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="49" y="81" width="238" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-off-peak"/><rect x="313" y="81" width="238" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-night"/><rect x="181" y="237" width="238" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-peak"/><text x="171.2998" y="58.286133" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="off-peak-label" xml:space="default"><tspan dominant-baseline="start">T1</tspan></text><text x="432.2998" y="58.734375" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="night-label"><tspan dominant-baseline="start">T2</tspan></text><text x="301.61865" y="214.39307" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="peak-label" xml:space="default"><tspan dominant-baseline="start">T3</tspan></text><text x="170.09232" y="139.47266" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="off-peak-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="434.09232" y="139.47266" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="night-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="302.09232" y="295.47266" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="peak-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="299.89453" y="371.67578" fill="#000000" font-family="Roboto" font-size="36px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">kWh</tspan></text><path d="m201.8-2e-4s-201.8 0-201.8 67v328.36c0 2.6512 5.3727 4.6404 12 4.6404h576c6.627 0 12-1.9892 12-4.6404v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/top-flow-meter.svg b/application/src/main/data/json/system/scada_symbols/top-flow-meter.svg
index 619bb48ef8..9c09a6067e 100644
--- a/application/src/main/data/json/system/scada_symbols/top-flow-meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/top-flow-meter.svg
@@ -57,7 +57,7 @@
     },
     {
       "tag": "value",
-      "stateRenderFunction": "var value = ctx.values.value;\nctx.api.text(element, value.toFixed(0));\n",
+      "stateRenderFunction": "var value = ctx.api.formatValue(ctx.values.value, ctx.properties.valueDecimals, '', false);\nctx.api.text(element, value);\n",
       "actions": {
         "click": {
           "actionFunction": "ctx.api.callAction(event, 'displayClick');"
@@ -463,16 +463,20 @@
       "name": "{i18n:scada.symbol.units}",
       "type": "units",
       "default": "m³/hr",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
       "fieldClass": "medium-width",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueDecimals",
+      "name": "{i18n:scada.symbol.decimals}",
+      "type": "number",
+      "default": 0,
+      "fieldClass": "medium-width",
+      "min": 0,
+      "step": 1,
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "defaultBorderColor",
@@ -511,16 +515,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "activeBorderColor",
@@ -559,16 +555,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "warningBorderColor",
@@ -607,16 +595,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "criticalBorderColor",
@@ -655,16 +635,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "backgroundColor",
@@ -703,48 +675,24 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "fluidColor",
       "name": "{i18n:scada.symbol.fluid-color}",
       "type": "color",
       "default": "#1EC1F480",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "pipeColor",
       "name": "{i18n:scada.symbol.pipe-color}",
       "type": "color",
       "default": "#FFFFFF",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     }
   ]
 }]]></tb:metadata>
diff --git a/application/src/main/data/json/system/scada_symbols/top-light-bulb-hp.svg b/application/src/main/data/json/system/scada_symbols/top-light-bulb-hp.svg
new file mode 100644
index 0000000000..ed6855884a
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/top-light-bulb-hp.svg
@@ -0,0 +1,346 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Top light bulb",
+  "description": "Top light bulb with various states.",
+  "searchTags": [
+    "energy"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <path d="m77.22 131 1.6 8h42.36l1.6-8h-45.56z"/>
+  <path d="m77.117 131h45.742c0.108-0.257 0.244-0.505 0.385-0.736 0.342-0.558 0.824-1.187 1.403-1.87 1.16-1.367 2.802-3.062 4.738-5.019 0.519-0.524 1.059-1.069 1.62-1.633 3.641-3.666 8.098-8.154 12.557-13.274 10.326-11.856 20.438-26.862 20.438-42.468 0-21.266-7.121-37.489-18.622-48.4-11.511-10.919-27.5-16.6-45.378-16.6-17.878 0-33.867 5.6814-45.378 16.6-11.502 10.91-18.622 27.134-18.622 48.4 0 15.606 10.106 30.612 20.426 42.468 4.456 5.12 8.9107 9.608 12.55 13.274 0.5601 0.564 1.1009 1.109 1.6194 1.633 1.9344 1.958 3.576 3.652 4.735 5.02 0.5788 0.683 1.0604 1.311 1.4022 1.869 0.1413 0.231 0.2771 0.479 0.3847 0.736z"/>
+  <path d="m80.13 194.02c1.5245 3.049 4.6409 4.975 8.0498 4.975h23.64c3.409 0 6.525-1.926 8.05-4.975l6.18-12.361c0.625-1.249 0.95-2.627 0.95-4.025v-38.639h-54v38.639c0 1.398 0.3253 2.776 0.9502 4.025l6.1803 12.361z"/>
+ </g><path d="m73 147h54" stroke="#1A1A1A" stroke-width="2"/><path d="m73 179h54" stroke="#1A1A1A" stroke-width="2"/><path d="m67.265 0s-67.265 0-67.265 33.5v164.18c0 1.3256 1.7909 2.3202 4 2.3202h192c2.209 0 4-0.9946 4-2.3202v-164.18c0-33.5-66.07-33.5-66.07-33.5h-33.93zm67.07 40.6c-1.2887 0-2.3333 0.6268-2.3333 1.4v150.2c0 0.7732 1.0447 1.4 2.3333 1.4h14.666c1.2887 0 2.3333-0.6268 2.3333-1.4v-150.2c0-0.7732-1.0447-1.4-2.3333-1.4z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/turbine-hp.svg b/application/src/main/data/json/system/scada_symbols/turbine-hp.svg
new file mode 100644
index 0000000000..d798b09477
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/turbine-hp.svg
@@ -0,0 +1,377 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="800" height="400" fill="none" version="1.1" viewBox="0 0 800 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Turbine",
+  "description": "Turbine with various states.",
+  "searchTags": [
+    "extraction"
+  ],
+  "widgetSizeX": 4,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "secondary-background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = '#999';\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background">
+  <path d="m24 7.458c0-1.4928 1.0864-2.743 2.5495-2.9373 7.9591-1.0573 28.201-3.5206 43.95-3.5206s35.991 2.4633 43.95 3.5206c1.464 0.19436 2.55 1.4446 2.55 2.9373v385.06c0 1.501-1.093 2.755-2.564 2.944-8.156 1.05-29.041 3.535-43.936 3.535s-35.78-2.485-43.936-3.535c-1.4708-0.189-2.5641-1.443-2.5641-2.944v-385.06z"/>
+  <path d="M1 16H24V384H1V16Z"/>
+  <path d="m117 36h141.26c0.685 0 1.361 0.1404 1.989 0.4125l38.745 16.796c1.828 0.7925 3.011 2.5949 3.011 4.5875v284.41c0 1.993-1.183 3.795-3.011 4.588l-38.745 16.795c-0.628 0.273-1.304 0.413-1.989 0.413h-141.26v-328z"/>
+  <rect x="302" y="91" width="321" height="218"/>
+  <rect x="334" y="91" width="98" height="218"/>
+  <rect x="623" y="59" width="118" height="282"/>
+  <rect x="741" y="121" width="41" height="158"/>
+  <rect x="782" y="111" width="17" height="178"/>
+ </g><g fill="#999" stroke="#1A1A1A" stroke-width="2" tb:tag="secondary-background">
+  <rect x="578" y="91" width="12" height="218"/>
+  <rect x="540" y="91" width="12" height="218"/>
+  <rect x="502" y="91" width="12" height="218"/>
+  <rect x="251" y="36" width="8" height="328"/>
+  <rect x="215" y="36" width="8" height="328"/>
+  <rect x="179" y="36" width="8" height="328"/>
+  <rect x="464" y="91" width="12" height="218"/>
+  <rect x="143" y="36" width="8" height="328"/>
+  <path d="m196.96 364c-0.419 5.029-4 8.736-9.2 11.449-5.538 2.89-13.138 4.785-21.485 6.04-16.304 2.452-35.811 2.51-49.274 2.511v8.999c15.934-0.021 38.037-0.586 56.285-4.601 9.322-2.05 17.547-4.983 23.419-9.136 5.552-3.927 8.95-8.899 9.271-15.262h-9.016z"/>
+  <path d="m785.99 289c-0.236 12.22-4.835 20.271-12.839 25.225-7.92 4.903-19.041 6.687-32.151 6.772v8.998c15.452-0.143 28.851-3.617 38.42-10.434 9.501-6.77 15.301-16.886 15.57-30.561h-9z"/>
+  <path d="m785.99 111c-0.236-12.22-4.835-20.271-12.839-25.225-7.92-4.9031-19.041-6.6864-32.151-6.7715v-8.9986c15.452 0.1433 28.851 3.6171 38.42 10.435 9.501 6.7698 15.301 16.886 15.57 30.561h-9z"/>
+  <path d="m196.96 36c-0.419-5.0286-4-8.7363-9.2-11.449-5.538-2.8898-13.138-4.7845-21.485-6.0398-16.304-2.4517-35.811-2.5097-49.274-2.5111v-8.9993c15.934 0.02162 38.037 0.58638 56.285 4.6009 9.322 2.0509 17.547 4.9835 23.419 9.1367 5.552 3.9269 8.95 8.8992 9.271 15.262h-9.016z"/>
+ </g><path d="m269.05 0s-269.05 0-269.05 67v328.36c0 2.6512 7.1636 4.6404 16 4.6404h768c8.836 0 16-1.9892 16-4.6404v-328.36c0-67-264.28-67-264.28-67h-135.72zm268.28 81.2c-5.1548 0-9.3332 1.2536-9.3332 2.8v300.4c0 1.5464 4.1788 2.8 9.3332 2.8h58.664c5.1548 0 9.3332-1.2536 9.3332-2.8v-300.4c0-1.5464-4.1788-2.8-9.3332-2.8z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 316)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m38.422 7.1554c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m40.211 8.0498c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 37.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/two-key-switch-hp.svg b/application/src/main/data/json/system/scada_symbols/two-key-switch-hp.svg
new file mode 100644
index 0000000000..40e04a3bf5
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/two-key-switch-hp.svg
@@ -0,0 +1,489 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Two-key switch",
+  "description": "Two-key switch with various states.",
+  "searchTags": [
+    "energy",
+    "power"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.backgroundColor});",
+      "actions": null
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "left-button",
+      "stateRenderFunction": "var color = ctx.properties.disabledColor;\nif (ctx.values.initialStateLeftButton) {\n    color = ctx.properties.enabledColor;\n}\nelement.attr({fill: color});",
+      "actions": {
+        "click": {
+          "actionFunction": "var initial = ctx.values.initialStateLeftButton;\nvar action = initial ? 'offUpdateStateLeftButton' : 'onUpdateStateLeftButton';\n\nctx.api.callAction(event, action, undefined, {\n  next: () => {\n     ctx.api.setValue('initialStateLeftButton', !initial);\n  }\n});"
+        }
+      }
+    },
+    {
+      "tag": "right-button",
+      "stateRenderFunction": "var color = ctx.properties.disabledColor;\nif (ctx.values.initialStateRightButton) {\n    color = ctx.properties.enabledColor;\n}\nelement.attr({fill: color});",
+      "actions": {
+        "click": {
+          "actionFunction": "var initial = ctx.values.initialStateRightButton;\nvar action = initial ? 'offUpdateStateRightButton' : 'onUpdateStateRightButton';\n\nctx.api.callAction(event, action, undefined, {\n  next: () => {\n     ctx.api.setValue('initialStateRightButton', !initial);\n  }\n});"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "initialStateLeftButton",
+      "name": "{i18n:scada.symbol.on-off-state}",
+      "hint": "{i18n:scada.symbol.on-off-state-hint}",
+      "group": "{i18n:scada.symbol.left-button}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": "{i18n:scada.symbol.on}",
+      "falseLabel": "{i18n:scada.symbol.off}",
+      "stateLabel": "",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "leftButton"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "onUpdateStateLeftButton",
+      "name": "{i18n:scada.symbol.on-update-state}",
+      "hint": "{i18n:scada.symbol.on-update-state-hint}",
+      "group": "{i18n:scada.symbol.left-button}",
+      "type": "action",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": {
+        "action": "EXECUTE_RPC",
+        "executeRpc": {
+          "method": "setState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "setAttribute": {
+          "scope": "SERVER_SCOPE",
+          "key": "state"
+        },
+        "putTimeSeries": {
+          "key": "state"
+        },
+        "valueToData": {
+          "type": "CONSTANT",
+          "constantValue": true,
+          "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;"
+        }
+      },
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "offUpdateStateLeftButton",
+      "name": "{i18n:scada.symbol.off-update-state}",
+      "hint": "{i18n:scada.symbol.off-update-state-hint}",
+      "group": "{i18n:scada.symbol.left-button}",
+      "type": "action",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": {
+        "action": "EXECUTE_RPC",
+        "executeRpc": {
+          "method": "setState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "setAttribute": {
+          "key": "state",
+          "scope": "SERVER_SCOPE"
+        },
+        "putTimeSeries": {
+          "key": "state"
+        },
+        "valueToData": {
+          "type": "CONSTANT",
+          "constantValue": false,
+          "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;"
+        }
+      },
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "initialStateRightButton",
+      "name": "{i18n:scada.symbol.on-off-state}",
+      "hint": "{i18n:scada.symbol.on-off-state-hint}",
+      "group": "{i18n:scada.symbol.right-button}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": "{i18n:scada.symbol.on}",
+      "falseLabel": "{i18n:scada.symbol.off}",
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "rightButton"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "onUpdateStateRightButton",
+      "name": "{i18n:scada.symbol.on-update-state}",
+      "hint": "{i18n:scada.symbol.on-update-state-hint}",
+      "group": "{i18n:scada.symbol.right-button}",
+      "type": "action",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": {
+        "action": "EXECUTE_RPC",
+        "executeRpc": {
+          "method": "setState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "setAttribute": {
+          "scope": "SERVER_SCOPE",
+          "key": "state"
+        },
+        "putTimeSeries": {
+          "key": "state"
+        },
+        "valueToData": {
+          "type": "CONSTANT",
+          "constantValue": true,
+          "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;"
+        }
+      },
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "offUpdateStateRightButton",
+      "name": "{i18n:scada.symbol.off-update-state}",
+      "hint": "{i18n:scada.symbol.off-update-state-hint}",
+      "group": "{i18n:scada.symbol.right-button}",
+      "type": "action",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": {
+        "action": "EXECUTE_RPC",
+        "executeRpc": {
+          "method": "setState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "setAttribute": {
+          "key": "state",
+          "scope": "SERVER_SCOPE"
+        },
+        "putTimeSeries": {
+          "key": "state"
+        },
+        "valueToData": {
+          "type": "CONSTANT",
+          "constantValue": false,
+          "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;"
+        }
+      },
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    }
+  ],
+  "properties": [
+    {
+      "id": "backgroundColor",
+      "name": "{i18n:scada.symbol.background-color}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "enabledColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.enabled}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "disabledColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.disabled}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="198" height="198" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><path d="m26 29c0-1.6569 1.3431-3 3-3h64c1.6569 0 3 1.3431 3 3v142c0 1.657-1.3431 3-3 3h-64c-1.6569 0-3-1.343-3-3v-142z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="left-button"/><path d="m104 29c0-1.6569 1.343-3 3-3h64c1.657 0 3 1.3431 3 3v142c0 1.657-1.343 3-3 3h-64c-1.657 0-3-1.343-3-3v-142z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="right-button"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/two-rate-energy-meter-hp.svg b/application/src/main/data/json/system/scada_symbols/two-rate-energy-meter-hp.svg
new file mode 100644
index 0000000000..7adc401836
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/two-rate-energy-meter-hp.svg
@@ -0,0 +1,618 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="400" fill="none" version="1.1" viewBox="0 0 400 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Two-rate energy meter",
+  "description": "Two-rate energy meter with various states.",
+  "searchTags": [
+    "power",
+    "energy"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "day-label",
+      "stateRenderFunction": "if (ctx.properties.showDayLabel) {\n    element.show();\n    ctx.api.font(element, ctx.properties.dayLabelFont, ctx.properties.dayLabelColor);\n    ctx.api.text(element, ctx.properties.dayLabel);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "day-rate",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.dayValueFont, ctx.properties.dayValueColor);\nctx.api.text(element, ctx.api.formatValue(ctx.values.dayRate, 0, null, 0));",
+      "actions": null
+    },
+    {
+      "tag": "night-label",
+      "stateRenderFunction": "if (ctx.properties.showNightLabel) {\n    element.show();\n    ctx.api.font(element, ctx.properties.nightLabelFont, ctx.properties.nightLabelColor);\n    ctx.api.text(element, ctx.properties.nightLabel);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "night-rate",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.nightValueFont, ctx.properties.nightValueColor);\nctx.api.text(element, ctx.api.formatValue(ctx.values.nightRate, 0, null, 0));",
+      "actions": null
+    },
+    {
+      "tag": "units",
+      "stateRenderFunction": "if (ctx.properties.showUnits) {\n    element.show();\n    ctx.api.font(element, ctx.properties.unitsFont, ctx.properties.unitsColor);\n    ctx.api.text(element, ctx.properties.units);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box-day",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.dayValueBoxBackground;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "value-box-night",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.nightValueBoxBackground;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "dayRate",
+      "name": "{i18n:scada.symbol.day-rate}",
+      "hint": "{i18n:scada.symbol.measured-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "dayRate"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "nightRate",
+      "name": "{i18n:scada.symbol.night-rate}",
+      "hint": "{i18n:scada.symbol.measured-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "nightRate"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showDayLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.day-rate}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "dayLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.day-rate}",
+      "type": "text",
+      "default": "T1",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "dayLabelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.day-rate}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "dayLabelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.day-rate}",
+      "type": "color",
+      "default": "#000000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "dayValueFont",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.day-rate}",
+      "type": "font",
+      "default": {
+        "size": 48,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "dayValueColor",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.day-rate}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "dayValueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "group": "{i18n:scada.symbol.day-rate}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showNightLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "text",
+      "default": "T2",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightLabelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightLabelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightValueFont",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "font",
+      "default": {
+        "size": 48,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightValueColor",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "nightValueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "group": "{i18n:scada.symbol.night-rate}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showUnits",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "units",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "units",
+      "default": "kWh",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "unitsFont",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "unitsColor",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="1" y="1" width="398" height="398" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="49" y="237" width="302" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-night"/><rect x="49" y="81" width="302" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-day"/><text x="199.70117" y="58.076347" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="day-label" xml:space="default"><tspan dominant-baseline="start">T1</tspan></text><text x="199.70117" y="214.37646" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="night-label"><tspan dominant-baseline="start">T2</tspan></text><text x="200.33984" y="139.47266" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="day-rate" xml:space="default"><tspan dominant-baseline="start">000023</tspan></text><text x="200.33984" y="295.47266" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="night-rate" xml:space="default"><tspan dominant-baseline="start">000023</tspan></text><text x="199.89453" y="371.67578" fill="#000000" font-family="Roboto" font-size="36px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">kWh</tspan></text><path d="m134.53-2e-4s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6404 8 4.6404h384c4.418 0 8-1.9892 8-4.6404v-328.36c0-67-132.14-67-132.14-67h-67.858zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/vertical-connector-hp.svg b/application/src/main/data/json/system/scada_symbols/vertical-connector-hp.svg
index aea94b0dd2..6ce9336fee 100644
--- a/application/src/main/data/json/system/scada_symbols/vertical-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/vertical-connector-hp.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="200" fill="none" version="1.1" viewBox="0 0 200 200"><tb:metadata xmlns=""><![CDATA[{
   "title": "HP Vertical connector",
-  "description": "Vertical connector",
+  "description": "Vertical connector with an optional directional arrow to visually indicate flow.",
   "widgetSizeX": 1,
   "widgetSizeY": 1,
   "tags": [
diff --git a/application/src/main/data/json/system/scada_symbols/vertical-energy-system-controller-hp.svg b/application/src/main/data/json/system/scada_symbols/vertical-energy-system-controller-hp.svg
new file mode 100644
index 0000000000..cebe949c36
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/vertical-energy-system-controller-hp.svg
@@ -0,0 +1,378 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="600" fill="none" version="1.1" viewBox="0 0 400 600"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Vertical energy systems controller",
+  "description": "Vertical energy systems controller with various states.",
+  "searchTags": [
+    "energy",
+    "power",
+    "monitoring"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 3,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.disconnectedColor;\nif (ctx.values.connected) {\n    color = ctx.properties.connectedColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "indicator",
+      "stateRenderFunction": "var color = ctx.properties.disconnectedIndicatorColor;\nif (ctx.values.connected) {\n    color = ctx.properties.connectedIndicatorColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "label",
+      "stateRenderFunction": "ctx.api.font(element, ctx.properties.labelFont, ctx.properties.labelColor);\n    ctx.api.text(element, ctx.properties.label);",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "connected",
+      "name": "{i18n:scada.symbol.connected}",
+      "hint": "{i18n:scada.symbol.connected-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.connected}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "connected"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "connectedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.connected}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "disconnectedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.disconnected}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "connectedIndicatorColor",
+      "name": "{i18n:scada.symbol.indicator}",
+      "type": "color",
+      "default": "#198038",
+      "subLabel": "{i18n:scada.symbol.connected}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "disconnectedIndicatorColor",
+      "name": "{i18n:scada.symbol.indicator}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "subLabel": "{i18n:scada.symbol.disconnected}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "label",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "text",
+      "default": "Connected",
+      "fieldClass": "medium-width",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "labelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "font",
+      "default": {
+        "size": 30,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "labelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect x="17" y="1" width="366" height="598" rx="5" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect transform="matrix(1 0 0 -1 382 173)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="matrix(1 0 0 -1 0 173)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="matrix(1 0 0 -1 382 373)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="matrix(1 0 0 -1 382 573)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="matrix(1 0 0 -1 0 573)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><circle cx="66" cy="86" r="10" fill="#198038" tb:tag="indicator"/><text x="83.31543" y="89.589844" fill="#000000" font-family="Roboto" font-size="30px" font-weight="400" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="middle">Connected</tspan></text><path d="m134.53 0s-134.53 0-134.53 100.5v492.54c0 3.9768 3.5818 6.9604 8 6.9604h384c4.418 0 8-2.9838 8-6.9604v-492.54c0-100.5-132.14-100.5-132.14-100.5h-67.86zm134.14 121.8c-2.5774 0-4.6666 1.8804-4.6666 4.2v450.6c0 2.3196 2.0894 4.2 4.6666 4.2h29.332c2.5774 0 4.6666-1.8804 4.6666-4.2v-450.6c0-2.3196-2.0894-4.2-4.6666-4.2z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,516)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 520.94)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/vertical-inline-flow-meter.svg b/application/src/main/data/json/system/scada_symbols/vertical-inline-flow-meter.svg
index fff4819e1e..8f9a30e576 100644
--- a/application/src/main/data/json/system/scada_symbols/vertical-inline-flow-meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/vertical-inline-flow-meter.svg
@@ -57,7 +57,7 @@
     },
     {
       "tag": "value",
-      "stateRenderFunction": "var value = ctx.values.value;\nctx.api.text(element, value.toFixed(0));\n",
+      "stateRenderFunction": "var value = ctx.api.formatValue(ctx.values.value, ctx.properties.valueDecimals, '', false);\nctx.api.text(element, value);\n",
       "actions": {
         "click": {
           "actionFunction": "ctx.api.callAction(event, 'displayClick');"
@@ -463,16 +463,20 @@
       "name": "{i18n:scada.symbol.units}",
       "type": "units",
       "default": "m³/hr",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
       "fieldClass": "medium-width",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueDecimals",
+      "name": "{i18n:scada.symbol.decimals}",
+      "type": "number",
+      "default": 0,
+      "fieldClass": "medium-width",
+      "min": 0,
+      "step": 1,
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "defaultBorderColor",
@@ -511,16 +515,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "activeBorderColor",
@@ -559,16 +555,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "warningBorderColor",
@@ -607,16 +595,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "criticalBorderColor",
@@ -655,16 +635,8 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "backgroundColor",
@@ -703,48 +675,24 @@
         },
         "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';"
       },
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "fluidColor",
       "name": "{i18n:scada.symbol.fluid-color}",
       "type": "color",
       "default": "#1EC1F480",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "pipeColor",
       "name": "{i18n:scada.symbol.pipe-color}",
       "type": "color",
       "default": "#FFFFFF",
-      "required": null,
-      "subLabel": null,
-      "divider": null,
-      "fieldSuffix": null,
-      "disableOnProperty": null,
-      "rowClass": "",
-      "fieldClass": "",
-      "min": null,
-      "max": null,
-      "step": null
+      "disabled": false,
+      "visible": true
     }
   ]
 }]]></tb:metadata>
diff --git a/application/src/main/data/json/system/scada_symbols/voltage-relay-hp.svg b/application/src/main/data/json/system/scada_symbols/voltage-relay-hp.svg
new file mode 100644
index 0000000000..eaa0b02455
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/voltage-relay-hp.svg
@@ -0,0 +1,439 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="400" fill="none" version="1.1" viewBox="0 0 200 400"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Voltage relay",
+  "description": "One phase voltage relay with various states.",
+  "searchTags": [
+    "energy",
+    "power",
+    "protection"
+  ],
+  "widgetSizeX": 1,
+  "widgetSizeY": 2,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "units",
+      "stateRenderFunction": "if (ctx.properties.showUnits) {\n    element.show();\n    ctx.api.font(element, ctx.properties.unitsFont, ctx.properties.unitsColor);\n    ctx.api.text(element, ctx.properties.units);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "value",
+      "stateRenderFunction": "if (ctx.values.running) {\n    element.show();\n    ctx.api.font(element, ctx.properties.currentVoltageFont, ctx.properties.currentVoltageColor);\n    ctx.api.text(element, ctx.api.formatValue(ctx.values.voltage, 0, null, 0));\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "value-box",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.valueBoxBackground;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "voltage",
+      "name": "{i18n:scada.symbol.voltage}",
+      "hint": "{i18n:scada.symbol.voltage-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "voltage"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "valueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "currentVoltageFont",
+      "name": "{i18n:scada.symbol.current-voltage-color}",
+      "type": "font",
+      "default": {
+        "size": 32,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "400",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "currentVoltageColor",
+      "name": "{i18n:scada.symbol.current-voltage-color}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showUnits",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "units",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "units",
+      "default": "V",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "unitsFont",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "font",
+      "default": {
+        "size": 24,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "500",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "unitsColor",
+      "name": "{i18n:scada.symbol.units}",
+      "type": "color",
+      "default": "#000000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect width="200" height="400" fill="#fff" tb:tag="background"/><rect x="1" y="1" width="198" height="398" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="100" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="52" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="148" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="100" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="52" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="148" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="36" y="137" width="128" height="80" rx="2" fill="#DEDEDE" tb:tag="value-box"/><rect x="37" y="138" width="126" height="78" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/><text x="99.890625" y="190.70906" fill="#002878" font-family="Roboto" font-size="32px" font-weight="400" text-anchor="middle" tb:tag="value" xml:space="preserve"><tspan dominant-baseline="start">220</tspan></text><text x="99.643097" y="257.79694" fill="black" font-family="Roboto" font-size="28px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">v</tspan></text><path d="m67.265 0s-67.265 0-67.265 67v328.36c0 2.6512 1.7909 4.6404 4 4.6404h192c2.209 0 4-1.9892 4-4.6404v-328.36c0-67-66.07-67-66.07-67h-33.929zm67.07 81.2c-1.2887 0-2.3333 1.2536-2.3333 2.8v300.4c0 1.5464 1.0447 2.8 2.3333 2.8h14.666c1.2887 0 2.3333-1.2536 2.3333-2.8v-300.4c0-1.5464-1.0447-2.8-2.3333-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/voltage-stabilizer-hp.svg b/application/src/main/data/json/system/scada_symbols/voltage-stabilizer-hp.svg
new file mode 100644
index 0000000000..aafc2af5a0
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/voltage-stabilizer-hp.svg
@@ -0,0 +1,584 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="200" fill="none" version="1.1" viewBox="0 0 400 200"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Voltage stabilizer",
+  "description": "Voltage stabilizer with various states.",
+  "searchTags": [
+    "power",
+    "energy",
+    "protection"
+  ],
+  "widgetSizeX": 2,
+  "widgetSizeY": 1,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.operatingMode === 1) {\n    color = ctx.properties.runningColor;\n} else if (ctx.values.operatingMode === 2) {\n    color = ctx.properties.bypassColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "in-label",
+      "stateRenderFunction": "if (ctx.properties.showInputLabel) {\n    element.show();\n    ctx.api.font(element, ctx.properties.inputLabelFont, ctx.properties.inputLabelColor);\n    ctx.api.text(element, ctx.properties.inputLabel);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "in-value",
+      "stateRenderFunction": "if (ctx.values.operatingMode === 1) {\n    element.show();\n    ctx.api.font(element, ctx.properties.inputValutFont, ctx.properties.inputValueColor);\n    ctx.api.text(element, ctx.api.formatValue(ctx.values.inputVoltage, 0, null, 0));\n} else {\n    element.hide();\n}\n",
+      "actions": null
+    },
+    {
+      "tag": "in-value-box",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.operatingMode === 1) {\n    color = ctx.properties.inputValueBoxBackground;\n} else if (ctx.values.operatingMode === 2) {\n    color = ctx.properties.bypassColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "out-label",
+      "stateRenderFunction": "if (ctx.properties.showOutputLabel) {\n    element.show();\n    ctx.api.font(element, ctx.properties.outputLabelFont, ctx.properties.outputLabelColor);\n    ctx.api.text(element, ctx.properties.outputLabel);\n} else {\n    element.hide();\n}",
+      "actions": null
+    },
+    {
+      "tag": "out-value",
+      "stateRenderFunction": "if (ctx.values.operatingMode === 1) {\n    element.show();\n    ctx.api.font(element, ctx.properties.outputValueFont, ctx.properties.outputValueColor);\n    ctx.api.text(element, ctx.api.formatValue(ctx.values.outputVoltage, 0, null, 0));\n} else {\n    element.hide();\n}\n",
+      "actions": null
+    },
+    {
+      "tag": "out-value-box",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.operatingMode === 1) {\n    color = ctx.properties.outputValueBoxBackground;\n} else if (ctx.values.operatingMode === 2) {\n    color = ctx.properties.bypassColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "operatingMode",
+      "name": "{i18n:scada.symbol.operating-mode}",
+      "hint": "{i18n:scada.symbol.operating-mode-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "INTEGER",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "operatingMode"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "inputVoltage",
+      "name": "{i18n:scada.symbol.input-voltage}",
+      "hint": "{i18n:scada.symbol.input-voltage-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "inputVoltage"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "outputVoltage",
+      "name": "{i18n:scada.symbol.output-voltage}",
+      "hint": "{i18n:scada.symbol.output-voltage-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "DOUBLE",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": {
+        "action": "GET_TIME_SERIES",
+        "defaultValue": null,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "outputVoltage"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "bypassColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "subLabel": "{i18n:scada.symbol.bypass-mode}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": false,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showInputLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.input-voltage}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "inputLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.input-voltage}",
+      "type": "text",
+      "default": "in",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "inputLabelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.input-voltage}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "inputLabelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.input-voltage}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "inputValutFont",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.input-voltage}",
+      "type": "font",
+      "default": {
+        "size": 44,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "inputValueColor",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.input-voltage}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "inputValueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "group": "{i18n:scada.symbol.input-voltage}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "showOutputLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.output-voltage}",
+      "type": "switch",
+      "default": true,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "outputLabel",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.output-voltage}",
+      "type": "text",
+      "default": "out",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "outputLabelFont",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.output-voltage}",
+      "type": "font",
+      "default": {
+        "size": 36,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "outputLabelColor",
+      "name": "{i18n:scada.symbol.label}",
+      "group": "{i18n:scada.symbol.output-voltage}",
+      "type": "color",
+      "default": "#000",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "outputValueFont",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.output-voltage}",
+      "type": "font",
+      "default": {
+        "size": 44,
+        "sizeUnit": "px",
+        "family": "Roboto",
+        "weight": "normal",
+        "style": "normal"
+      },
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "outputValueColor",
+      "name": "{i18n:scada.symbol.value}",
+      "group": "{i18n:scada.symbol.output-voltage}",
+      "type": "color",
+      "default": "#002878",
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "outputValueBoxBackground",
+      "name": "{i18n:scada.symbol.value-box-background}",
+      "group": "{i18n:scada.symbol.output-voltage}",
+      "type": "color",
+      "default": "#DEDEDE",
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<rect width="400" height="200" fill="#fff" tb:tag="background"/><rect x="1" y="1" width="398" height="198" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="213" y="81" width="126" height="78" rx="1" fill="#dedede" stroke="#000" stroke-opacity=".87" stroke-width="2" tb:tag="out-value-box"/><text x="275.76855" y="136.65625" fill="#002878" font-family="Roboto" font-size="44px" font-weight="400" text-anchor="middle" tb:tag="out-value" xml:space="default"><tspan dominant-baseline="start">220</tspan></text><rect x="61" y="81" width="126" height="78" rx="1" fill="#dedede" stroke="#000" stroke-opacity=".87" stroke-width="2" tb:tag="in-value-box"/><text x="123.76855" y="136.65625" fill="#002878" font-family="Roboto" font-size="44px" font-weight="400" text-anchor="middle" tb:tag="in-value" xml:space="default"><tspan dominant-baseline="start">230</tspan></text><text x="123.29346" y="57.832031" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="in-label" xml:space="default"><tspan dominant-baseline="start">in</tspan></text><text x="275.96484" y="55.873047" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="out-label" xml:space="default"><tspan dominant-baseline="start">out</tspan></text><path d="m134.53 0s-134.53 0-134.53 33.5v164.18c0 1.3256 3.5818 2.3202 8 2.3202h384c4.418 0 8-0.9946 8-2.3202v-164.18c0-33.5-132.14-33.5-132.14-33.5h-67.858zm134.14 40.6c-2.5774 0-4.6666 0.6268-4.6666 1.4v150.2c0 0.7732 2.0894 1.4 4.6666 1.4h29.332c2.5774 0 4.6666-0.6268 4.6666-1.4v-150.2c0-0.7732-2.0894-1.4-4.6666-1.4z" fill="#000" fill-opacity="0" style="stroke-width:.70711" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/wind-turbine-cluster-hp.svg b/application/src/main/data/json/system/scada_symbols/wind-turbine-cluster-hp.svg
new file mode 100644
index 0000000000..74855dd35a
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/wind-turbine-cluster-hp.svg
@@ -0,0 +1,370 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="800" fill="none" version="1.1" viewBox="0 0 600 800"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Wind turbine cluster",
+  "description": "Wind turbine cluster with various states.",
+  "searchTags": [
+    "energy",
+    "power",
+    "renewable",
+    "generation"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 4,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#1a1a1a" stroke-width="2" tb:tag="background">
+  <path d="m413.82 165.21c0.064-0.16596 0.125-0.32492 0.184-0.47689 0.059 0.15197 0.12 0.31093 0.184 0.47689 0.709 1.8416 1.722 4.5229 2.938 7.8751 2.433 6.7044 5.677 16.091 8.921 26.818 6.495 21.48 12.957 48.231 12.957 69.568 0 21.337-6.462 48.088-12.957 69.568-3.244 10.726-6.488 20.113-8.921 26.818-1.216 3.3522-2.229 6.0336-2.938 7.8751-0.064 0.16596-0.125 0.32493-0.184 0.47689-0.059-0.15196-0.12-0.31093-0.184-0.47689-0.709-1.8416-1.722-4.5229-2.938-7.8751-2.433-6.7044-5.677-16.091-8.921-26.818-6.495-21.48-12.957-48.231-12.957-69.568 0-21.337 6.462-48.088 12.957-69.568 3.244-10.726 6.488-20.113 8.921-26.818 1.216-3.3522 2.229-6.0336 2.938-7.8751z"/>
+  <path d="m186.82 165.21c0.064-0.16596 0.125-0.32492 0.184-0.47689 0.059 0.15197 0.12 0.31093 0.184 0.47689 0.709 1.8416 1.722 4.5229 2.938 7.8751 2.433 6.7044 5.677 16.091 8.921 26.818 6.495 21.48 12.957 48.231 12.957 69.568 0 21.337-6.462 48.088-12.957 69.568-3.244 10.726-6.488 20.113-8.921 26.818-1.216 3.3522-2.229 6.0336-2.938 7.8751-0.064 0.16596-0.125 0.32493-0.184 0.47689-0.059-0.15196-0.12-0.31093-0.184-0.47689-0.709-1.8416-1.722-4.5229-2.938-7.8751-2.433-6.7044-5.677-16.091-8.921-26.818-6.495-21.48-12.957-48.231-12.957-69.568 0-21.337 6.462-48.088 12.957-69.568 3.244-10.726 6.488-20.113 8.921-26.818 1.216-3.3522 2.229-6.0336 2.938-7.8751z"/>
+  <path d="m384.05 799 20.054-421h19.793l20.055 421z"/>
+  <path d="m157.05 799 20.054-421h19.793l20.055 421z"/>
+  <path d="m416.33 379.11c-0.11966-0.14937-0.23334-0.2917-0.34205-0.42803 0.17153 0.0261 0.35203 0.0542 0.53951 0.0831 1.9515 0.30172 4.7826 0.75682 8.2957 1.3713 7.0283 1.229 16.786 3.0904 27.702 5.6266 21.862 5.0772 48.264 12.83 66.722 23.542 18.457 10.713 38.337 29.821 53.642 46.313 7.6426 8.2358 14.125 15.799 18.698 21.302 2.2866 2.7526 4.0945 4.989 5.33 6.5367 0.11867 0.14936 0.23334 0.29171 0.34104 0.42804-0.17151-0.0261-0.35101-0.0542-0.53949-0.0833-1.9515-0.30171-4.7816-0.75782-8.2957-1.3713-7.0283-1.229-16.786-3.0914-27.702-5.6265-21.861-5.0772-48.263-12.83-66.721-23.543-18.458-10.712-38.337-29.82-53.642-46.312-7.6426-8.2358-14.126-15.799-18.699-21.303-2.2856-2.7516-4.0935-4.988-5.329-6.5357z"/>
+  <path d="m189.34 379.12c-0.11967-0.15082-0.23334-0.29458-0.34205-0.43225 0.17154 0.0264 0.35201 0.0546 0.5395 0.084 1.9516 0.30469 4.7827 0.76428 8.2959 1.3848 7.0284 1.2411 16.786 3.1209 27.703 5.682 21.862 5.1272 48.265 12.956 66.723 23.774 18.458 10.818 38.338 30.115 53.644 46.77 7.6427 8.317 14.126 15.955 18.698 21.512 2.2866 2.7797 4.0946 5.0382 5.3302 6.6011 0.11866 0.15082 0.23334 0.29458 0.34105 0.43224-0.17154-0.0264-0.35102-0.0546-0.5395-0.084-1.9516-0.30469-4.7817-0.76528-8.2959-1.3848-7.0284-1.2411-16.786-3.1219-27.703-5.682-21.861-5.1272-48.264-12.956-66.722-23.775-18.459-10.817-38.338-30.114-53.644-46.769-7.6427-8.317-14.127-15.955-18.699-21.513-2.2856-2.7787-4.0936-5.0371-5.3292-6.6001z"/>
+  <path d="m410.21 378.76c0.18845-0.0291 0.36793-0.0562 0.53942-0.0832-0.10768 0.13636-0.22135 0.27974-0.341 0.42913-1.2354 1.548-3.043 3.7849-5.3283 6.5371-4.5726 5.5054-11.055 13.07-18.696 21.308-15.303 16.496-35.181 35.608-53.635 46.322-18.456 10.715-44.854 18.469-66.713 23.547-10.915 2.5356-20.671 4.3985-27.699 5.6267-3.5127 0.61461-6.3434 1.0708-8.2946 1.3726-0.18745 0.0291-0.36793 0.0561-0.53941 0.0832 0.10868-0.13635 0.22234-0.27973 0.34199-0.42912 1.2354-1.548 3.0431-3.7849 5.3284-6.5371 4.5716-5.5054 11.055-13.07 18.696-21.307 15.303-16.497 35.18-35.608 53.635-46.323 18.456-10.715 44.854-18.469 66.712-23.547 10.915-2.5356 20.671-4.3985 27.699-5.6267 3.5137-0.6146 6.3444-1.0708 8.2946-1.3726z"/>
+  <path d="m183.22 378.76c0.18844-0.0291 0.36792-0.0561 0.53942-0.0832-0.10768 0.13634-0.22135 0.27971-0.34101 0.4291-1.2354 1.548-3.0431 3.7849-5.3285 6.537-4.5727 5.5054-11.055 13.07-18.696 21.308-15.303 16.496-35.181 35.608-53.637 46.322-18.456 10.715-44.855 18.469-66.714 23.547-10.915 2.5356-20.672 4.3985-27.699 5.6267-3.5134 0.6146-6.3438 1.0708-8.2948 1.3726-0.18807 0.0291-0.36798 0.0561-0.53953 0.0832 0.10838-0.13634 0.22218-0.27971 0.34129-0.42911 1.2356-1.548 3.0432-3.7849 5.329-6.537 4.5719-5.5054 11.055-13.07 18.696-21.306 15.303-16.497 35.181-35.608 53.637-46.323 18.456-10.715 44.855-18.469 66.713-23.547 10.915-2.5356 20.672-4.3985 27.699-5.6267 3.5138-0.6146 6.3445-1.0708 8.2948-1.3726z"/>
+  <circle cx="414" cy="378" r="27"/>
+  <circle cx="187" cy="378"/>
+  <path d="m299.84 3.9752c0.178-0.45587 0.34-0.87084 0.486-1.2433 0.147 0.37248 0.309 0.78745 0.486 1.2433 0.9 2.3145 2.187 5.6829 3.732 9.8942 3.089 8.4232 7.207 20.216 11.326 33.692 8.245 26.98 16.456 60.603 16.456 87.437s-8.211 60.457-16.456 87.437c-4.119 13.476-8.237 25.269-11.326 33.692-1.545 4.2111-2.832 7.5794-3.732 9.8939-0.177 0.4559-0.339 0.87081-0.486 1.2437-0.146-0.37292-0.308-0.78783-0.486-1.2437-0.9-2.3145-2.187-5.6828-3.731-9.8939-3.089-8.4232-7.208-20.216-11.326-33.692-8.246-26.98-16.457-60.603-16.457-87.437s8.211-60.457 16.457-87.437c4.118-13.476 8.237-25.269 11.326-33.692 1.544-4.2114 2.831-7.5797 3.731-9.8942z"/>
+  <path d="m261.38 799 25.902-528h26.096l25.902 528z"/>
+  <path d="m303.5 272.39c-0.30616-0.38092-0.58532-0.72884-0.83445-1.0418 0.39622 0.059 0.83645 0.12598 1.3207 0.20096 2.4564 0.37792 6.0193 0.94779 10.442 1.7156 8.8458 1.5376 21.127 3.8671 34.866 7.0394 27.508 6.3506 60.756 16.052 84.014 29.469 23.257 13.418 48.289 37.339 67.548 57.967 9.6182 10.304 17.779 19.767 23.534 26.653 2.8766 3.4422 5.1528 6.2406 6.7077 8.1772 0.30717 0.38191 0.58533 0.72984 0.83445 1.0428-0.39521-0.06-0.83645-0.12696-1.3197-0.20095-2.4563-0.37791-6.0203-0.94779-10.443-1.7166-8.8448-1.5367-21.127-3.8671-34.866-7.0384-27.508-6.3516-60.756-16.053-84.013-29.47-23.258-13.417-48.29-37.338-67.548-57.967-9.6192-10.304-17.78-19.766-23.535-26.652-2.8766-3.4432-5.1528-6.2406-6.7077-8.1782z"/>
+  <path d="m296.78 271.55c0.48325-0.075 0.92446-0.14197 1.3207-0.20096-0.25013 0.31293-0.52826 0.66085-0.83442 1.0418-1.5558 1.9366-3.8309 4.7349-6.7084 8.1781-5.7549 6.8864-13.914 16.348-23.533 26.652-19.258 20.629-44.289 44.55-67.545 57.967-23.257 13.417-56.503 23.119-84.01 29.469-13.739 3.1723-26.019 5.5027-34.864 7.0394-4.4223 0.76882-7.9852 1.3387-10.441 1.7166-0.48374 0.074-0.92456 0.14097-1.3206 0.20096 0.24953-0.31294 0.52796-0.66086 0.83442-1.0428 1.5555-1.9366 3.8309-4.7349 6.7081-8.1781 5.7547-6.8854 13.914-16.348 23.533-26.652 19.257-20.629 44.288-44.549 67.545-57.967 23.256-13.417 56.502-23.119 84.009-29.469 13.739-3.1723 26.02-5.5018 34.864-7.0394 4.4232-0.76782 7.986-1.3377 10.442-1.7156z"/>
+  <circle cx="300.33" cy="270" r="33"/>
+  <rect x="136.33" y="777" width="328" height="22" rx="1"/>
+ </g><path d="m201.8-4e-4s-201.8 0-201.8 134v656.72c0 5.3024 5.3727 9.2808 12 9.2808h576c6.627 0 12-3.9784 12-9.2808v-656.72c0-134-198.21-134-198.21-134h-101.79zm201.21 162.4c-3.8661 0-6.9999 2.5072-6.9999 5.6v600.8c0 3.0928 3.1341 5.6 6.9999 5.6h43.998c3.8661 0 6.9999-2.5072 6.9999-5.6v-600.8c0-3.0928-3.1341-5.6-6.9999-5.6z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,716)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0,720.94)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/wind-turbine-hp.svg b/application/src/main/data/json/system/scada_symbols/wind-turbine-hp.svg
new file mode 100644
index 0000000000..a4282c16e7
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/wind-turbine-hp.svg
@@ -0,0 +1,360 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="800" fill="none" version="1.1" viewBox="0 0 600 800"><tb:metadata xmlns=""><![CDATA[{
+  "title": "HP Wind turbine",
+  "description": "Wind turbine with various states.",
+  "searchTags": [
+    "energy",
+    "power",
+    "renewable",
+    "generation"
+  ],
+  "widgetSizeX": 3,
+  "widgetSizeY": 4,
+  "tags": [
+    {
+      "tag": "background",
+      "stateRenderFunction": "var color = ctx.properties.stoppedColor;\nif (ctx.values.running) {\n    color = ctx.properties.runningColor;\n}\nelement.attr({fill: color});",
+      "actions": null
+    },
+    {
+      "tag": "clickArea",
+      "stateRenderFunction": null,
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'click');"
+        }
+      }
+    },
+    {
+      "tag": "critical",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.criticalColor});\nif (ctx.values.critical) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = ctx.values.critical && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'criticalClick');"
+        }
+      }
+    },
+    {
+      "tag": "warning",
+      "stateRenderFunction": "element.attr({fill: ctx.properties.warningColor});\nvar warning = ctx.values.warning && !(ctx.values.warning && ctx.values.critical)\nif (warning) {\n    element.show();\n} else {\n    element.hide();\n}\n\nvar elementCriticalAnimation = element.remember('criticalAnimation');\nvar criticalAnimation = warning && ctx.values.criticalAnimation;\n\nif (elementCriticalAnimation !== criticalAnimation) {\n    element.remember('criticalAnimation', criticalAnimation);\n    if (criticalAnimation) {\n        ctx.api.cssAnimate(element, 500).attr({opacity: 0.15}).loop(0, true);\n    } else {\n        ctx.api.resetCssAnimation(element);\n    }\n}\n",
+      "actions": {
+        "click": {
+          "actionFunction": "ctx.api.callAction(event, 'warningClick');"
+        }
+      }
+    }
+  ],
+  "behavior": [
+    {
+      "id": "running",
+      "name": "{i18n:scada.symbol.running}",
+      "hint": "{i18n:scada.symbol.running-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.running}",
+      "defaultGetValueSettings": {
+        "action": "GET_ATTRIBUTE",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": "SHARED_SCOPE",
+          "key": "running"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warning",
+      "name": "{i18n:scada.symbol.warning}",
+      "hint": "{i18n:scada.symbol.warning-state-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.warning}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "warningClick",
+      "name": "{i18n:scada.symbol.warning-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.warning-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "critical",
+      "name": "{i18n:scada.symbol.critical}",
+      "hint": "{i18n:scada.symbol.critical-state-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.critical}",
+      "defaultGetValueSettings": {
+        "action": "GET_ALARM_STATUS",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "scope": null,
+          "key": "state"
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "getAlarmStatus": {
+          "severityList": [
+            "CRITICAL"
+          ],
+          "typeList": null
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "criticalClick",
+      "name": "{i18n:scada.symbol.critical-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": "{i18n:scada.symbol.critical-state}",
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    },
+    {
+      "id": "criticalAnimation",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
+      "group": null,
+      "type": "value",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": "{i18n:scada.symbol.animation}",
+      "defaultGetValueSettings": {
+        "action": "DO_NOTHING",
+        "defaultValue": false,
+        "executeRpc": {
+          "method": "getState",
+          "requestTimeout": 5000,
+          "requestPersistent": false,
+          "persistentPollingInterval": 1000
+        },
+        "getAttribute": {
+          "key": "state",
+          "scope": null
+        },
+        "getTimeSeries": {
+          "key": "state"
+        },
+        "dataToValue": {
+          "type": "NONE",
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+        }
+      },
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": null
+    },
+    {
+      "id": "click",
+      "name": "{i18n:scada.symbol.on-click}",
+      "hint": "{i18n:scada.symbol.on-click-hint}",
+      "group": null,
+      "type": "widgetAction",
+      "valueType": "BOOLEAN",
+      "trueLabel": null,
+      "falseLabel": null,
+      "stateLabel": null,
+      "defaultGetValueSettings": null,
+      "defaultSetValueSettings": null,
+      "defaultWidgetActionSettings": {
+        "type": "doNothing",
+        "targetDashboardStateId": null,
+        "openRightLayout": false,
+        "setEntityId": false,
+        "stateEntityParamName": null
+      }
+    }
+  ],
+  "properties": [
+    {
+      "id": "runningColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#FFFFFF",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.running}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "stoppedColor",
+      "name": "{i18n:scada.symbol.colors}",
+      "type": "color",
+      "default": "#666666",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.stopped}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "warningColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#FAA405",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.warning}",
+      "divider": true,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    },
+    {
+      "id": "criticalColor",
+      "name": "{i18n:scada.symbol.alarm-colors}",
+      "type": "color",
+      "default": "#D12730",
+      "required": null,
+      "subLabel": "{i18n:scada.symbol.critical}",
+      "divider": null,
+      "fieldSuffix": null,
+      "disableOnProperty": null,
+      "rowClass": "",
+      "fieldClass": "",
+      "min": null,
+      "max": null,
+      "step": null,
+      "disabled": false,
+      "visible": true
+    }
+  ]
+}]]></tb:metadata>
+<g fill="#fff" stroke="#000" tb:tag="background">
+  <path d="m299.54 4.8761c0.168-0.54602 0.322-1.0458 0.462-1.4976 0.14 0.4518 0.294 0.95157 0.462 1.4976 0.90101 2.9339 2.188 7.2028 3.734 12.54 3.09 10.674 7.211 25.619 11.332 42.697 8.247 34.178 16.472 76.822 16.472 110.89s-8.225 76.708-16.472 110.89c-4.121 17.079-8.242 32.023-11.332 42.698-1.546 5.3367-2.833 9.6057-3.734 12.54-0.168 0.54586-0.322 1.0457-0.462 1.4976-0.14-0.45189-0.294-0.95177-0.462-1.4976-0.90101-2.9343-2.188-7.2032-3.734-12.54-3.09-10.674-7.211-25.619-11.332-42.698-8.247-34.178-16.472-76.821-16.472-110.89s8.225-76.708 16.472-110.89c4.121-17.078 8.242-32.023 11.332-42.697 1.546-5.337 2.833-9.606 3.734-12.54z" stroke-width="2"/>
+  <path d="m594.35 510.77c0.38868 0.4189 0.74439 0.80179 1.0651 1.1497-0.46062-0.10497-0.97021-0.22094-1.5268-0.34891-2.9896-0.68682-7.328-1.7065-12.719-3.0372-10.783-2.6613-25.777-6.5663-42.618-11.537-33.703-9.9494-74.721-24.149-104.2-41.181-29.484-17.032-62.284-45.474-87.747-69.704-12.724-12.107-23.6-23.146-31.295-31.16-3.8479-4.0059-6.8994-7.2551-8.9887-9.5015-0.38868-0.4189-0.74439-0.80179-1.0651-1.1497 0.46063 0.10497 0.97021 0.22094 1.5268 0.34891 2.9896 0.68682 7.328 1.7065 12.72 3.0372 10.782 2.6613 25.776 6.5663 42.617 11.537 33.703 9.9494 74.721 24.149 104.21 41.181 29.483 17.032 62.283 45.474 87.746 69.704 12.724 12.107 23.6 23.146 31.295 31.16 3.8479 4.0059 6.8994 7.2551 8.9887 9.5015z" stroke-width="1.9997"/>
+  <path d="m8.8693 513.3c-0.55636 0.12796-1.066 0.24393-1.527 0.3489 0.32108-0.3479 0.67656-0.73081 1.0654-1.1497 2.0893-2.2464 5.1409-5.4956 8.9883-9.5025 7.695-8.0129 18.571-19.052 31.294-31.159 25.462-24.23 58.262-52.672 87.745-69.704 29.484-17.032 70.502-31.232 104.2-41.181 16.841-4.9707 31.835-8.8756 42.617-11.537 5.3916-1.3306 9.73-2.3504 12.72-3.0372 0.55655-0.12797 1.0661-0.24394 1.5267-0.34891-0.32074 0.34791-0.67644 0.73081-1.0651 1.1497-2.0893 2.2464-5.1408 5.4956-8.9886 9.5015-7.6947 8.0139-18.571 19.053-31.294 31.16-25.462 24.23-58.262 52.672-87.746 69.704-29.483 17.032-70.502 31.232-104.2 41.181-16.84 4.9707-31.834 8.8756-42.617 11.537-5.3914 1.3306-9.7295 2.3504-12.719 3.0372z" stroke-width="1.9997"/>
+  <path d="m261.06 799 25.887-456h26.11l25.887 456z" stroke-width="2"/>
+  <circle cx="300" cy="342" r="33" stroke-width="2"/>
+  <rect x="247" y="777" width="106" height="22" rx="1" stroke-width="2"/>
+ </g><path d="m201.8 0s-201.8 0-201.8 134v656.72c0 5.3024 5.3727 9.2808 12 9.2808h576c6.627 0 12-3.9784 12-9.2808v-656.72c0-134-198.21-134-198.21-134h-101.79zm201.21 162.4c-3.8661 0-6.9999 2.5072-6.9999 5.6v600.8c0 3.0928 3.1341 5.6 6.9999 5.6h43.998c3.8661 0 6.9999-2.5072 6.9999-5.6v-600.8c0-3.0928-3.1341-5.6-6.9999-5.6z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,716)" fill="#d12730" style="display: none;" tb:tag="critical">
+  <rect width="84" height="84" rx="4" fill="#fff" style=""/>
+  <rect width="84" height="84" rx="4" style=""/>
+  <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m44.559 27.562-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g><g transform="translate(0 720.94)" fill="#faa405" style="display: none;" tb:tag="warning">
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" fill="#fff" style=""/>
+  <path d="m35.955 2.2112c1.4741-2.9482 5.6813-2.9482 7.1554 0l35.528 71.056c1.3298 2.6596-0.6042 5.7889-3.5777 5.7889h-71.056c-2.9735 0-4.9075-3.1292-3.5777-5.7889z" style=""/>
+  <path d="m37.72 3.1061c0.7371-1.4741 2.8407-1.4741 3.5778-1e-5l35.528 71.056c0.6649 1.3298-0.3021 2.8944-1.7888 2.8944h-71.056c-1.4868 0-2.4538-1.5646-1.7889-2.8944z" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
+  <path d="m42.092 32.618-0.4688 20.059h-4.0234l-0.4883-20.059zm-5.1172 26.211c0-0.7161 0.2344-1.3151 0.7031-1.7968 0.4818-0.4948 1.1459-0.7422 1.9922-0.7422 0.8334 0 1.4909 0.2474 1.9727 0.7422 0.4817 0.4817 0.7226 1.0807 0.7226 1.7968 0 0.6901-0.2409 1.2826-0.7226 1.7774-0.4818 0.4818-1.1393 0.7226-1.9727 0.7226-0.8463 0-1.5104-0.2408-1.9922-0.7226-0.4687-0.4948-0.7031-1.0873-0.7031-1.7774z" fill="#000" fill-opacity=".87" style=""/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_bundles/buttons.json b/application/src/main/data/json/system/widget_bundles/buttons.json
index facca89336..939e583686 100644
--- a/application/src/main/data/json/system/widget_bundles/buttons.json
+++ b/application/src/main/data/json/system/widget_bundles/buttons.json
@@ -12,6 +12,7 @@
     "command_button",
     "toggle_button",
     "two_segment_button",
+    "value_stepper",
     "power_button"
   ]
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_bundles/control_widgets.json b/application/src/main/data/json/system/widget_bundles/control_widgets.json
index c3dc219f5b..71a25df0c2 100644
--- a/application/src/main/data/json/system/widget_bundles/control_widgets.json
+++ b/application/src/main/data/json/system/widget_bundles/control_widgets.json
@@ -12,6 +12,7 @@
     "command_button",
     "toggle_button",
     "two_segment_button",
+    "value_stepper",
     "power_button",
     "slider",
     "control_widgets.switch_control",
diff --git a/application/src/main/data/json/system/widget_bundles/general_high_performance_scada_symbols.json b/application/src/main/data/json/system/widget_bundles/general_high_performance_scada_symbols.json
index ffb0fee835..5fbbd8b066 100644
--- a/application/src/main/data/json/system/widget_bundles/general_high_performance_scada_symbols.json
+++ b/application/src/main/data/json/system/widget_bundles/general_high_performance_scada_symbols.json
@@ -26,6 +26,14 @@
     "hp_bottom_tee_connector",
     "hp_right_tee_connector",
     "hp_left_tee_connector",
-    "hp_top_tee_connector"
+    "hp_top_tee_connector",
+    "hp_drawwork",
+    "hp_crane",
+    "hp_hook",
+    "hp_consumers",
+    "hp_house",
+    "hp_apartments",
+    "hp_manufacture",
+    "hp_electrical_engine"
   ]
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_bundles/high_performance_scada_energy_system.json b/application/src/main/data/json/system/widget_bundles/high_performance_scada_energy_system.json
new file mode 100644
index 0000000000..a06ccc0819
--- /dev/null
+++ b/application/src/main/data/json/system/widget_bundles/high_performance_scada_energy_system.json
@@ -0,0 +1,48 @@
+{
+  "widgetsBundle": {
+    "alias": "high_performance_scada_energy_system",
+    "title": "High-performance SCADA energy system",
+    "image": "tb-image:aHBfc2NhZGFfZW5lcmd5X3N5c3RlbV9idW5kbGVfaW1hZ2UucG5n:IkhpZ2gtcGVyZm9ybWFuY2UgU0NBREEgZW5lcmd5IHN5c3RlbSIgc3lzdGVtIGJ1bmRsZSBpbWFnZQ==:SU1BR0U=;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAAllBMVEXe3t7b29vf398AAADf39/e3t7e3t7////Gxsbj4+OpqanFxcW5ubmtra2xsbGVlZWlpaWhoaHS0tLx8fG2trbU1NTBwcGvr6+MjIybm5twcHC+vr6jo6OYmJizs7Orq6vExMSZmZnCwsKdnZ2ampqRkZE3Nze7u7t+fn6EhIRjY2NVVVVsbGx5eXmJiYlEREQvLy8aGhprAy3xAAAABnRSTlPvIK8Av79l/pT7AAAJyElEQVR42uzVXW/aMBiGYWin57VjmyRmNGFLKOWjQACt/P8/t7yJQVMPrE62KkBcR88ZuokTD56HPwa4dU/D58Hw9jNabcYT7sIdHKve4F5C8Ai5No+Qa/MIuTaPkGvzCLk2QSHKIB6rFAIEhayniCc9fVx2c2ou++OUwi88ZGEtYrHbfZOf9/59r9w2f963Fj7hIUaOK0SSWyKSS8s7461rsOmk3TMNj/CQKVGBOJSiTsJNkpjcACjHxOYWHsEhCyJhEYWW1FkDeKNeDcD0c2LgERpi+McrxFFqIYQeaQCqnshWrQAUL7zFGh7BIVNq5YjDJm1Jnfd7lySrnQLT23aX8AgPWbjTG0VFTHKJyohlXLKZ8xy/wiMwxB3rsUEwd0yZ+ecdyQCs+yk1PAJDMuokiMFmxMZl/9W6PJ2EOlrBIzAkp84IUahym6yOG7D0WCarXQE2Oq6Scm3gERoyJxbrA5wJfiCV4l3zljVPu5R8IW7gERZy+fKPC0SgJu4e+XS0Ss+/FSkkI2eKQJ8vxOx7L8RXcjaI4W3GF2KhAKhU8CXYbTHjrZfwCAz5Tc4LohA/pVy7nbZRqds7IVYaHqEhc3ImFgGKkZM1TVO6XR4Oh9rtX+2uRo4BYodYQY7UCCDofwggdoiRdJYDuOEQYuFXYjEqk68qqwKIHZJHCoGQ9FVSgcUNSe8lxNBFBXarIVrSmQG71ZC/1Jpdc6sgEIbv3AXRIB9VE2OStmN6mpnT8/9/3RlSbGTxzmFC9yYTfV14wrIsRLQk/f4ikHDhM+ANVSD6BSB/VLg39SbDJKCyBxFst1o0tkEOsEP2ID20q/nXEFH2IK+Aai1tVVSUOYgrrnYrsx0VEQ2Zg3A6HVq/rlNRkzlI7U/jouMgutsyKmuQEulpHMYHdKW9X8kapIl//hHcIK2Isgbp4zWDRznr9C3KGuQAzkSQorSf60R0zhnEb9G1WF77K7AvYxETm0HYJ0sEUuko2V6lu/Zax6JhM8j+a58IZIjqkav13uuoaum3gtgJJkwDYqJ6ZARvZ0VFm0Nr4oC3NCBv3teBhJGzHS2I240g3MXVjScBEXTzcVm0S0WHbSBsYsAY+6fTgJDJLtOBdB2wzn0kD62yMYdew2z94dSIbaFFB2T/9Ql6YglA5kh6UxUf7X0cwNu9J/b1VCk5izaB7J1nt470t2TpVwup5pGwc/q1P0Q73ymzBYRPrqF7KzdMMEcYAHK79CpHDaDNUcHDEHFraE0ffLaPKUGJYizqwGldnAQKcyyuNrjO0YotIN3+YX2CEbno0OelKCofRgMLb/WiyLZolBYijqKZy5GakbudyhOkbHXM4Yt2UayQgCxzBMER1jiK2oOskZzb/EDqgvqTi7Kx8SJLRcfcQI60oWLwd16W5Qi+RCR5gYQcwYuSPKgiSxkNXE4glEO3D2cYvi6gBNXKfEAoB17oDv1loZaGkuQCQji0sG/0Pyu+BGFIHjjmASKDNrTr+VmRHmB4GoSchTM+B5CWLSisQOKrYvQwnvtiSy9n/PNBSvUYC/7hO4enWswgofNyd+Je33Hxw2KvzwYpR991I6wG9L44ADNVXYYgqhGSwY8I70/5b+fyuSBKAjDRCaPBmX4HZ8a3ik1dDt/OK7VrEVZEWvB3YQFG9VQQ+b+9c1tuGwTCcI+wIJCEhK26suW2aafpRfv+j9ehIgtZuQk20QRn8t9kRP7Y+5nDamUUDfbzr1AzWT2oDTQ65G+YQfiPYPqmBxD3TU0jh9tnHlo74CgGzHLRH5gKqUJ6xGBSTM6mLxwl1NMNrc1FPdLxexzsZq6iFONegCDBdJxPWgBNzvDgwrVnG5GqDavPBemkIBxM+ewHd4Rq/lEtTYREHLvn2njmJnJQB/Nq64sPtcWhFf34AswXjcd/JkvqrGcAoSey3xR+iauiX4sdjrBwTjwG00RIngGk2vJIdcUwRuMNNecCZDTC9pFJn/w0/kfSwjlqk0Eoh5Cdb67ji7o7AA4IEkwu+AFNgpCsKQpCxsQ0YLvDq9FkcdUCrtoKTTEtM1MGSS4Ijoj5KiJDWceFpmiyyz4Eacm2pzrq3WlVEgrSIQeM97deWayiPGzlffFkBm8Kqs3msRm/AgherIaBvOsco41NNk6I+46aUFVtgKNpJVGQnYOo5bB8xw5wZZWzyUfXyhF6nz0ATm986IysnWnHVhIF+dMcW92xpXxhC7EJws0KejoOf5xJeNMJdXq6GRqWqfydDyDIWRvAcgOdciZYcyrkg2hBzqMdmZOKTb0zFQ5CN2doDwJdbLoSkF5HDf2ySDBzzchWUz6IX3JjECzbqKlskNpvckA1WAJSk2HrKR/kK90c5IKmw61N3BxUGQVBzdmTSis4XApiKUjLvczS9JgU+X4rHQE/RMgDORAQMtwkmlJeDCVU6HhtHtbXLhPkBrNfFAztgGPiBwycT7XXPl7nJH9UQw4IjgZJyHzcxJQCgn+lRQQCKRe38kA0TePqBIjhTscUkPoUCKSA6DyQAUEiMjrcRm9KAWmn7SwAsFsvmSA7HjJAfIyGkDntqEmngPzu+cXqf2eA1HRL2ci9FF3JhhQQyTMkM0C2y4TopalpLBrEcqeJBO00UFN7BSBb0kA6AGZT0SDw34TYLkwlg3RAJzbQ/zCAaUCWDOJvBAVCFncAVr9QNIjAcjAiIx2gPEhVMIgWpBxUgl7qx+pXFA1CT7h1jyBVMF0NSK/jBhq38Q26YJA9TeMmAqGmkkFqWg7uA4imJlMwyFdaDtYcpWn1uy8YxD5w20WzMF0ByCFuoHFLNKWCbCRKcREdrAZyQ9O4XILg/SNtMogA1Ib30cFqIIqm8SNHHRamgoeWpuWg4ihLl+RjwSADBTEcJWn1q9LnyGfUrTtArQWCMZq4gcY9XlFCHEMDStEleSgYZEtXqImjDDWNySC9QPXxgVg9j0xx0DRue/byC59Qkm8+Ba0Oso3zCI0b7kwFDy2gSy1w1LQwlQuCFbqKG0gHAKyYEDfKKlB9Jkio0CEOmsQNAk1PDvJ9RpAiF0TgjtWogcStEKR6ahDZI1AeiBakHNQxSEfKeJEAouQZ+o7939+6Y3U5CP26T5N9xdiWBGL5eUKOsDtXZYL0OjTQuA0tfk8LnelC8DAk9WUge1rXNjGIWpoeVqXhLH2KmMBJmeoCkP1u90Pe6dfOCRtCGzG17FE1QogmeYrSpf0CkJZfoG0CCNb7yVUE/1JdN0jV4s3nhYIYlkiigHMx/mQ5IKa5QIYlvTBLVqUbxU7p9Rk9heoVpDS9gpSmV5DS9ApSml7Mg3XffGAvQu9ezkO037+9/sdov/n49v1fKIFpFaO3gooAAAAASUVORK5CYII=",
+    "scada": true,
+    "description": "Bundle with high-performance SCADA symbols for energy system",
+    "order": 9410,
+    "name": "High-performance SCADA energy system"
+  },
+  "widgetTypeFqns": [
+    "hp_solar_panel",
+    "hp_stand_solar_panel",
+    "hp_wind_turbine",
+    "hp_wind_turbine_cluster",
+    "hp_fuel_generator",
+    "hp_industrial_fuel_generator",
+    "hp_circuit_breaker2",
+    "hp_horizontal_circuit_breaker",
+    "hp_voltage_relay",
+    "hp_3_phase_voltage_relay",
+    "hp_voltage_stabilizer",
+    "hp_energy_meter",
+    "hp_two_rate_energy_meter",
+    "hp_three_rate_energy_meter",
+    "hp_four_rate_energy_meter",
+    "hp_electrical_distribution_board",
+    "hp_power_socket",
+    "hp_single_key_switch",
+    "hp_two_key_switch",
+    "hp_top_light_bulb",
+    "hp_bottom_light_bulb",
+    "hp_battery",
+    "hp_inverter",
+    "hp_large_inverter",
+    "hp_horizontal_energy_systems_controller",
+    "hp_vertical_energy_systems_controller",
+    "hp_small_power_transformer",
+    "hp_power_transformer",
+    "hp_low_voltage_transformer_tower",
+    "hp_low_voltage_tower",
+    "hp_high_voltage_tower",
+    "hp_consumers",
+    "hp_house",
+    "hp_apartments",
+    "hp_manufacture"
+  ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_bundles/high_performance_scada_fluid_system.json b/application/src/main/data/json/system/widget_bundles/high_performance_scada_fluid_system.json
index 1e41b22446..29a0571dfa 100644
--- a/application/src/main/data/json/system/widget_bundles/high_performance_scada_fluid_system.json
+++ b/application/src/main/data/json/system/widget_bundles/high_performance_scada_fluid_system.json
@@ -5,7 +5,7 @@
     "image": "tb-image:aHBfc2NhZGFfZmx1aWRfc3lzdGVtX2J1bmRsZV9pbWFnZS5wbmc=:IkhpZ2gtcGVyZm9ybWFuY2UgU0NBREEgZmx1aWQgc3lzdGVtIiBzeXN0ZW0gYnVuZGxlIGltYWdl:SU1BR0U=;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAABNVBMVEXe3t7f39/X19cAAADf39/e3t7f39/e3t7e3t7////I3/fr6+vHx8esrKzj4+OcrsHT0tKVlZWvr6/Kysrx8fF0dHT9/f24uLjBwcHc29v39/etra27u7ubm5vt7e2/v7/Dw8OysrKqqqq+1ev6+vrE2/Lh4eHV1dWoqKiQkJCmpqa1yt+2trbu7e2YmJi/1eyurq7B2O9ycXFlZWXT09Ojo6PMzMzIyMjm5eWBgYGenp78/Py0tLSTk5OLi4uwxdq6z+Wous6ioqKGhoZjY2OgoKBoaGheXl5WVlasv9SorrR/fn7R0dGlpaVSUlKhrr13d3evuseTpLWWoq+fn59sbGw+Pj6rv9Tv8veitci4uryAk7vf5O7P1+WQocRgeasvLy8hISG/yd2frsx/k7tvhrNAXZmZOz+XAAAACHRSTlPvICAAv7Cvv9cI9yEAAAzySURBVHja7JttT9pQGIaNe8lTejg9dDRqJEElwFxNN1lIZNko3RrRuoAvUaOf/P+/YkecPq0v0PY5lZZ48dUvV06vm54Ylt4tv1+CovNx+d3ScvE1JFLjAywE8R6rNcg9SzNEama36/R/raxLVmazsfrTrMFcmCYiNrdAb7VX6ht6u91e0+MhdkwGBNSLdDd0ZK/V0mOzYwIBxSLiJ+hhEc71+EBdAAGVIuKzTuIzwUSpyKoeZa/FE5oAAXUijo609D0UiQ+hE3UiTOhIvf5Jb0kSimwIoEIX2dTDIp9wfpOwCXGpHHyfwqiSXgSHNzy/mR1J5RtMYT29SE1HEseOmHMX+aIroT53kdVnToTvJRbZmbtINJE1+bl9tAooYpTCGIZbakhKSTFyJnLlHZZs2x4UXmRC8+vXRRHZXQwRyWKILMCJNO2GvRAiJds7VDy/XZqImVLEHaie35s/LCrSX59CPyrChhe5mV+LW1ZYhVUi+H4lAgNEHPWqVm5itzSN+87LybwcRd9nmmblZn4tTbJ1YCYVMc9XNEmuTuSW7WOWRIQNt6saRWTQcKXIblO5iMatIzZbBOPQNJLIlYHzq1REwg+ceCLObRxEEdt2cX7VikxSqc0WMc+3NMTKz/xqYbb32XQRti/j+E8uY9cwlSki4qjDtRC5m98wbUzlsYjTmcRRiBO5S4U9J2IOMQ6yiDvwshfRqg+poAg7xjhUiGQ4v09TQRFx5GMcKkQuB3amIgg7cFCkG42jAPMbSWXI7kTM4Q/tnkLFfg+XqVQq4tE3R2HmNwzvXYwmcRT7RKSI3+v1MhFxB/YriOAKi8lLCVcu0jyV8zuwbfs1RH4MzfvLR1n5iTQbrza/nS7+kTPKZn53s3u0MA4BYXoWL2DsVbz4Rt7fiza/ZRnHM7BRuVAnwjoOPAJTaSubX9vNVoR3MI6nCEyFKpLp/OL7O/I0FTUijUGG81s+N2EmtVE5540w34FYOCOeY5FqD+OYBZOp5HR+q9tDBnHAi28uT6SGccTFHJVJV91LT70I8/uQAsfn6UUOPeXzi3EkhVkWTytiN1XP7wXGkRz25+a1G/HgBUwg0Y0tMi49It3/R04gW2aLnJSUcAY06CLf1Dxa10CDLiK8yPy6V6lEPCBCF4Egslqul2p+AyBCF4keSVN+Usyvy4AKXQQCeiMVoEMXgbOnIjne3iki4ow4vX+BAF0EEScYRTPpF2JjTPWgiyDB+OHSnvDR8n4DGboIwoKxO9nfRPPbOAsIx6FWBLkOxieeYRinEmM243EQXMNcWIgfuL6J5JE3kX/tneeu0zAUgEEsH8mx3MY0o0naRIiEqK0Q6oDS3h8gJCRA4gcgJJaY7/8I2Bk9GaVJKKOMD6Gbyy3H/myfeKSFU+O/yKnxj4nw/uzBIjY0yY07Dx9eXWuHwHOn1cigPwt/3lWEznyNQRFhrNchfBONZMyn8BOZrjqJPPEp7CNcU9Ek4sNPZdRehJ+5Ar4J1dhhEQo/Fae1iB8LOAilv1OEthSh9xk0wW6wkxd5EkEbAu3ERbCpG2BrccIifCugNWvWKEL38QtE+Ay6ELAGkRXsQYQ/UQQ9jjCpi9D9FfnpIlvoSiBOUWTfJCiCReDOegs36E8Y1Fn/aBERjkeSMRXfLfKE1YJGwU1Odty8Y9Zf4vxIEToynbxAZ9MPv0uEbqp1dM84qdA7q6pQ2kbk7ds3r941icwnlfKk13eIONWXu0nYobudbYLI37oPku/9auy1aBZ5+eHdS3h1WOR6psEN3/dHw8wp9rqKzBiUmDkq6MRl4N2GBBb0VAh6j1WyqFkE3nyCj68PivRp0prBZumAIlxqwySW3lEkKtfuPpcaQVrkLpTJHBXELZsYorlHvrx6/flQjogg0RipUHwKKSvfT2rGuoj4rBT3hgqbu9lzSOEAgVs3oUcnO1NRaV8ANlz6NaZqeLEOIuVM36raziHHyr6ogKxuEoruInUPf1eeZUOCqX4UYys3idQzJOayro91LMgqtJTo8erUuT5SZKIG0AQkaCDh6RSgfijaiiygQECTNvfQhKfxsb94/ANF/KSqnlkRsTzYmTgtRSgtzR+E9JjKDRUQ+2JqFTLoJgNE0GNEGE3TAE0sq9huIiaE83YipfaN08kxM8HGMSBjeuMmIfehgEYVd2oiId2xWtEcBiVcQugU6g3HIWOywho2iCwAYT4hdwBKJrYuf1tYTF92CS3VpQSFDpgqm3fFoYju5e3G1bGJ2UaEG+XAONI8fRcZPTwQi3K+U7pfhF2XvyTXQwbXc+ZiUDnc8fcUhwPATAZJ3EakzwCRCXADv7PSaX2FGTJnAKpLFgKQJ3tFBtg188G4cA1ISIutfZtnItgh6mKCWXJQxAWE3ZTfr1Y611M7007Hq14qit4kfALIep/IoCBy/S6KjAdooppkONRNa5pVe5rlZC5nKiHhELJqIfKsfE9/wLIq65ZKjzS+hR5ZVtwDZNbUI3URHFkaqAzUzUTCSEXyDsk2DiuVx80ii/Kk7gKOWWt6ezq7f3b/eRpQqqXcI+SsqL+3R+4mF04ick2KCMaYkCJ3YYD7GRxZti7DexaEdNTPytFZ5k4IZ00imEjY1IhlPTWXkhtMleQVat4DRPu2yNX3N3IR9uL9C6ZEsEsoITzEOJ6hjx2RnwbYppf7qkxqFgkAmWVeaGYuN+tgubwDlr4rzzyjZMhgh0P3iVyTF/Tq1athJgLsIVPNe21QHFlDKOKNpICdDDEsz7YiQkbNIhogvcwLRZb9W7duPVk+mHhZUH1uAXMIDWv333qP5CiRDCUyqN98cQVq3LolNYYGyy24afuEOEeKnC23UuTRcnJPl8xlSmY3N0qbRK7tEykPLT1taYTC9JaEwcaTWCtT1201lI8SsT2+4jeWaxl4uwywA9qK3G0WCasiI/CUiAWxxbk1tUHSWsQAZJFuFr2VPuf6bds2by2Xs0f3zWW2uMKaDxuH1mBOM5zJtcfjnMe1oZXdf2V36w8A4lu3eri07CISlyd2Vw6hbHNzW7fZ2VKhjaGIIacb0XTXGly7Zmdcu3b32u5yUBLpA9N1k6czoe456eqXQolRq2SfAfIA76vZ7ZY9DZabO2fGFMod5wISVETQJOPu3bvXdqCHmiDo0MrLM+QVc0DiLKGIuCnDNosMAYlwFTU1IcHUYip0sOa8tCZ5AIj/DZHB3UGKvM5c7qo/Km1GJvnqx0yL1YaU+oybhZabq+mmWSQqD35OS6sR3bO8dKniWTqfZrmuykee1UWQpNpKJQcK4H1Vz8ozwEzXvNzUp7gic9osUQQgZ8mmCT2mLN1XWdM8J7m+imQ3sqa1VkVnv8hKVlFkq+p8tWvmu0RbupiWZytdret+xE/3sVMd8gYCj+3WwbiLXAMSOs0iWbdABc4J2aBHUu4K18GS2xbv4c7qoAjxK+v4e+iRDSsF6m4ooQEgwRE7xE1y17QK7QYcKg3nYhUPi7hQ4J468tMho3AOYJvl3TDy7Mit7mbXbrqHxfV3L+Etd4ikTwFhMrO2Aj0kenknuiblDmGLI0TUMHUmUOgQmNupiYHt5rM2IpWF24bjIYkBeWQ0iWllqT8mx4hwjidwlpcYlBtObXRNaCfiisqJKe9hYDxBkaGVR/XM9P5RIuAQvAUXv2RHXSFGbBbhQfUslm9FIaKBk/2aVk4rgNLjRESc/51pLmLnJoa9wmPsBpF6uuNJNa+cKwNTzxucMexN9e4imAQkYjiEbX0nqWao1RRai/CgbnLzbOSBAg+wXRV3MYEiGj1GBE10E0wsLuXxSHlc7/TESpRD3+BE/bNEIaRwO3uoiM8bcL18tAiwmEjcZ3hSgA8V/Wm3Z4g+lIkfEInj3otoyBjdLtybSSW3AkpE9FgRhUh3/X6fpuFNMR/FPBkqrOvD0GrxTMVWcOfm7jKovWpGjhFBTJ8k3BxNJuNJ5PDsIXX35+xxTT281+ME4cMtBQQf0h0tgioIPlTsKoIbDEQY99wHQ2M8HvbkGNsT1SXHiyCm5nCSwZ1gggV2EuEx7IWFNGSwl4g2iHSGjkYOpY4zDo94Uw2NoAN1j9N54xmNunqcqAihbjePkxUhfMugHWJGyQmLEOI2VQOn/tMWIdQV0EjkEHLqIqQXOE2h1i4/EGADP5XHLUVcIceNBg3vjd8eEIkF/ESE3yyC7whkgcH2h9Eo2y30u+fZ8cw3pJUIjbDhjWp9Qk2jIr/uH/wETQPumO7FeNJvgLf93/dKFTccQ9ZdoRmBpoVQYEPJd4J7pTrXV6SBBpF4lBBpddY3JFqdaJRwg3QEPZpNuoss4HsZk248mUwieoBgMknT+dRFaNvP7PwFIph93UUi7Xs5I92IaCMRac25v+UTlecukr+CS+fO/xVdIjUunL9M/nTOXTl/4St0s1h4GZ5DIgAAAABJRU5ErkJggg==",
     "scada": true,
     "description": "Bundle with high-performance SCADA symbols for fluid system",
-    "order": 9350,
+    "order": 9415,
     "name": "High-performance SCADA fluid system"
   },
   "widgetTypeFqns": [
diff --git a/application/src/main/data/json/system/widget_bundles/high_performance_scada_oil_gas.json b/application/src/main/data/json/system/widget_bundles/high_performance_scada_oil_gas.json
new file mode 100644
index 0000000000..21ee5d7f05
--- /dev/null
+++ b/application/src/main/data/json/system/widget_bundles/high_performance_scada_oil_gas.json
@@ -0,0 +1,34 @@
+{
+  "widgetsBundle": {
+    "alias": "high_performance_scada_oil_gas",
+    "title": "High-performance SCADA oil & gas",
+    "image": "tb-image:aHBfc2NhZGFfb2lsX2dhc19zeXN0ZW1fYnVuZGxlX2ltYWdlLnBuZw==:IkhpZ2gtcGVyZm9ybWFuY2UgU0NBREEgb2lsICYgZ2FzIiBzeXN0ZW0gYnVuZGxlIGltYWdl:SU1BR0U=;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAAflBMVEXe3t7b29vf398AAADf39/e3t7e3t7////Gxsapqam5ubnR0NDj4+Otra2hoaHS0tLi4uK4uLjx8fGYmJikpKSdnZ2VlZWWlpbU1NS1tbWnp6eKioqysrLLy8uampra2tqvr6/X19eRkZF+fn7Dw8N1dXW/vr6FhYViYmJwcHCzXr36AAAABnRSTlPvIK8Av79l/pT7AAAI0UlEQVR42uza23LaMBSF4Z5msbyFpOFMAXcg0HT6/i/YGqvdNhBiYXtipf0v7CRX+UaSbWQ+fP745QNS79PHzx8+ps8A8JvxCe+idzCtwpC8Fwj+Q4bWvw0R7oQiJIbTAxAvwOmAIsFgiodYXxxPODecMYmGeD4fAOQoGtCYxEIMgcMQJbEQD5wlCvEYRLEQoig/wCBkMIgiIYKyE+claTBzKxJClO0AegDI8x0GUTREz5NTbvJUR0RwzjjAn1GpQlgcDif4nfiDAZAqBAIc8nBjNyY3ef6MQRR/HzlI7ZI7lCfHaIg5oA5Bu5bZzZaIKh6Cha9BHFq2HN2sb4gjra84rHAreCDKcjUr+n4b8n1WtHKW0LqDSGGwyFFmaOBMLGRv57uM4+moSWNONvuF7RrC8vhsBTBSEJwBEdfXUXRfux+RADIiJM4OSIIQVs8sHUmOiKlBSgd8pGS/2M8zrhutkemY2XyZ7TuGeKlBXHAJ4qN1q9mP+4ofs5WTXq5agipkqePzYLP7kBkiioIQIRrAifouSggCOsN0IaIQxyorJiOrb4uy5StrZFG2WVnTF8QZkAh5NjW4ebbKxqPo1pPdk2paQ7xHaGsAWMTMreXW7ibTUYum3DxtXBcQHRA5H6PmVjbqpKxLCEE9FUliEP49Uc9FNjGIBIdCwHSnFm8cwKQg9PqPXxgEr3ZkB4zp+tgBxNSWif7cDAJx3542nLa4+NrtkugAItefR3TxN4x2tthN1uPQ6G7jP01W2dyxszu7BXELAkIQk7Gh433I0ZaJ6fZZi8RtCEiPagN/aHS4hNSN2rAhwpch1qLasCEEX4JYCuIy4lbfXn+M36ycGHQMEby02K0aG27QbSbjadM7Bzfzhe0YAtYg6oAASGU7iLi8IaoD9OlAJBAUog5AkoHI1cBQHVEQu3nabyacNlsi2W6ebdkhRBe6QtQBIjKxDV4rzB0NtE4goiSFSI131SBf9ChEP+qKwV3IIF+9GWgsIRUHPNFDPUC8oJItDq7iePvX7U0hgmokIALt7b9L9yAEFENo6YwIL34TIk2IQPu796ulOrXC3q/29pethhDvoYV3PBzU3GoIEVRypr73W/TmcysaUjiqe7+hVCBE6OwIkPrfLTqvzxEpHApRSSojEiDBcXv/2qPv2kPoURQcNYhKBH3XHmJQFhw1COSsTAMixUEddQhcKSH6rj3EAlDHBaSUpDEiBCqOS0iQ0KPbeppa6riGBAn6rD3kynENKSWCfmsP4YXjGlJIHoYcs4t+ekQUARF1XENUQjyUrEcXrYmIYiDquIao5Fd797rcJgxEAbjX1UogBBRfErupm16mff8XbO2RWYuDqyCBx+30/EiMmTb6ugtSgYwtJcW2Q0hbUSSJkJ04ECJZO0rJRkE2hJkF4l4EYUMp0Qh5IswMEEPGvQDClAZ5RoglzAwQJpFch3DqRLK/WWsZEslVCFMqRE+4H5ILCSWWDf+OYQu0hDhGCDNh8iEFhRIbvhCCS5HYEiG1IUguRIZn+Cok55crqwm3R/IgRlrq/J3ZXLZW1u2exwnPCmRDROJj4PGB5Io8T3i+LA/CNJQUXFBRyf4syGEM0hFkvoqIpCJyFhxzttaeILNBRGKJ2BEVFsbupktcMwZpHEFyIc7RQGL8Y4GOxZHUW7KIjy3k8yE4NsvGT/bE4kjuraoFBS7kF4GQXR/fNcaRYcqGbJSKH+05EBwbnoUr3EVToxUGF/JLVETmePcCdco0ggv5hSDM67Wxds1MEEcTs79VaxkcWsU+6yg7sbVwIZ8PKQhi5UU2hFmpCeffnIpMg0z9+bYch9SWJEtBmC3z6UtuRar1D30lP9YVQXIgfPXNEcfEK9mdL0ezC868jS+KSJaoiBDYMmX1Fu/9iJvgiNeN9z06yoLEHb4iZPN6a3UugWpacbSstN98pvkgPPqWh4gkBdKVZ4falgKpWbXavzzQghXBhzNRPqWxjo1UbwXCx+1GmmshCD4uC39gSmP5MdccQI46aa5lWotDDUqcm9pYYxClW2muBSoy/kh5Ukm+6VO++Hm8d/jjpf3p9ydD4g6BiGQ6pPPnWqmCHOyyQ3UzQRi3QghKOAHSBPPIEhBLkqIigIhkIoR3/ajbAeTpEvKFZ28tcQhEJNMghWbuIY0uw5m91rqHMAslB1KEDoSgxMV/sOmUuoAoHa61tuoColTH+RDH6BBIIBayiToeVAhRtRaHLlUIUQ8mG2LAARCQRHuLH9UAIlO5nwp1K5CjhLMh4AAISKIV2akAwuW5DnLyrTmAqEMuhMEBEJDEIPsygPgRw7cA0la5FQEHQFDCsStyoxBuL9cqTQhRXT5EHAhBSfy0ZcsBpJHp4wgYh9Q2C+IcOBCCEhO/iyCQmi8ndN2vHEOI+pAFMehACEpc/MqiQJp2DNI2A4jNg6ADISjh+JVFgWjlcxKx8tEDSJcFYXQgBCU2slgEiPzPkHvWrBCDDoSghJMgzWnzGuSQBbEVRSDTJXoA2fbNFKzn6wFklQMxa0qBUGGi04hAlEBgc67WKigNQuYFV60bfcpOha3V9mtgfUrjPZxVkVQIT3xkQ2b2VqvRVHRzSHRGtFuFkUVWG7k2nwLhFEj8SvbTHxyqHd27o2UrktZbrhtxlP0/fqMgmyILYigJEl/JM0iai3bbNuBgyoLwUhByq1JdpNXBZv3UBpvPUo+bV4QpkvWu7BkffsAh8bWntN2B6I4hRHa1b5ibx9WmYK/qx87UrR6ZWW+0JclNWivpSjaz75oPD+L4+sFPxzIJ3q4i+Xepv5yXJKuCIFkQHAtLrP9yTpEKkXBX6YfDLsJIgcBf+bG8mo9YstTMD4HD7JO6mk80iKGFkt9aUyD3VRForSkQlyiZHYJn0EmQxN5aAIIjmQi5n4oMIX9tRUaer66vZkunfCafe4LISKAU8cLcU2tV3Odj+cJ85z7mBpL/H+x41/kPubf8Mx+s++od/RN58+98iPbb13//x2i/ev/67S8YXTU9MiU8PgAAAABJRU5ErkJggg==",
+    "scada": true,
+    "description": "Bundle with high-performance SCADA symbols for oil and gas system",
+    "order": 9405,
+    "name": "High-performance SCADA oil & gas"
+  },
+  "widgetTypeFqns": [
+    "hp_drilling_rig",
+    "hp_hook",
+    "hp_rotor",
+    "hp_preventer",
+    "hp_drill",
+    "hp_drilling_line",
+    "hp_platform",
+    "hp_electrical_engine",
+    "hp_oil_pump",
+    "hp_gas_wellhead",
+    "hp_gas_preventer",
+    "hp_heat_exchanger",
+    "hp_turbine",
+    "hp_large_vertical_separator",
+    "hp_large_vertical_separator_with_connector",
+    "hp_large_horizontal_separator",
+    "hp_large_horizontal_separator_with_connector",
+    "hp_small_vertical_separator",
+    "hp_small_vertical_separator_with_connector",
+    "hp_small_horizontal_separator",
+    "hp_small_horizontal_separator_with_connector"
+  ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_bundles/scada_fluid_system.json b/application/src/main/data/json/system/widget_bundles/scada_fluid_system.json
index 9aa3b299a8..e6f1e6a876 100644
--- a/application/src/main/data/json/system/widget_bundles/scada_fluid_system.json
+++ b/application/src/main/data/json/system/widget_bundles/scada_fluid_system.json
@@ -42,6 +42,10 @@
     "vertical_inline_flow_meter",
     "left_analog_water_level_meter",
     "right_analog_water_level_meter",
+    "meter",
+    "small_meter",
+    "small_right_meter",
+    "small_left_meter",
     "leak_sensor",
     "centrifugal_pump",
     "small_right_motor_pump",
diff --git a/application/src/main/data/json/system/widget_types/value_stepper.json b/application/src/main/data/json/system/widget_types/value_stepper.json
new file mode 100644
index 0000000000..dea2406539
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/value_stepper.json
@@ -0,0 +1,51 @@
+{
+  "fqn": "value_stepper",
+  "name": "Value stepper",
+  "deprecated": false,
+  "image": "tb-image;/api/images/system/value-stepper-widget.svg",
+  "description": "Allows users to click the buttons to send commands to devices or update attributes/time series data. Configurable settings let users define how to retrieve the initial state and specify actions for each button.",
+  "descriptor": {
+    "type": "rpc",
+    "sizeX": 3.5,
+    "sizeY": 2,
+    "resources": [],
+    "templateHtml": "<tb-value-stepper-widget\n    [ctx]='ctx'\n    [widgetTitlePanel]=\"widgetTitlePanel\">\n</tb-value-stepper-widget>",
+    "templateCss": "",
+    "controllerScript": "self.onInit = function() {\n    self.ctx.$scope.actionWidget.onInit();\n}\n\nself.typeParameters = function() {\n    return {\n        previewWidth: '230px',\n        previewHeight: '110px',\n        embedTitlePanel: true,\n        displayRpcMessageToast: false\n    };\n};\n\nself.onDestroy = function() {\n}\n",
+    "dataKeySettingsForm": [],
+    "settingsDirective": "tb-value-stepper-widget-settings",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-value-stepper-basic-config",
+    "defaultConfig": "{\"showTitle\":true,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"initialState\":{\"action\":\"EXECUTE_RPC\",\"defaultValue\":0,\"executeRpc\":{\"method\":\"getState\",\"requestTimeout\":5000,\"requestPersistent\":false,\"persistentPollingInterval\":1000},\"getAttribute\":{\"key\":\"state\",\"scope\":null},\"getTimeSeries\":{\"key\":\"state\"},\"getAlarmStatus\":{\"severityList\":null,\"typeList\":null},\"dataToValue\":{\"type\":\"NONE\",\"compareToValue\":true,\"dataToValueFunction\":\"/* Should return integer value */\\nreturn data;\"}},\"disabledState\":{\"action\":\"DO_NOTHING\",\"defaultValue\":false,\"getAttribute\":{\"key\":\"state\",\"scope\":null},\"getTimeSeries\":{\"key\":\"state\"},\"getAlarmStatus\":{\"severityList\":null,\"typeList\":null},\"dataToValue\":{\"type\":\"NONE\",\"compareToValue\":true,\"dataToValueFunction\":\"/* Should return boolean value */\\nreturn data;\"}},\"leftButtonClick\":{\"action\":\"EXECUTE_RPC\",\"executeRpc\":{\"method\":\"setState\",\"requestTimeout\":5000,\"requestPersistent\":false,\"persistentPollingInterval\":1000},\"setAttribute\":{\"key\":\"state\",\"scope\":\"SERVER_SCOPE\"},\"putTimeSeries\":{\"key\":\"state\"},\"valueToData\":{\"type\":\"VALUE\",\"constantValue\":0,\"valueToDataFunction\":\"/* Convert input integer value to RPC parameters or attribute/time-series value */\\nreturn value;\"}},\"rightButtonClick\":{\"action\":\"EXECUTE_RPC\",\"executeRpc\":{\"method\":\"setState\",\"requestTimeout\":5000,\"requestPersistent\":false,\"persistentPollingInterval\":1000},\"setAttribute\":{\"key\":\"state\",\"scope\":\"SERVER_SCOPE\"},\"putTimeSeries\":{\"key\":\"state\"},\"valueToData\":{\"type\":\"VALUE\",\"constantValue\":0,\"valueToDataFunction\":\"/* Convert input integer value to RPC parameters or attribute/time-series value */\\nreturn value;\"}},\"appearance\":{\"type\":\"simplified\",\"autoScale\":true,\"minValueRange\":-100,\"maxValueRange\":100,\"valueStep\":0.5,\"showValueBox\":true,\"valueUnits\":\"\",\"valueDecimals\":1,\"valueFont\":{\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"size\":16,\"sizeUnit\":\"px\",\"lineHeight\":\"24px\"},\"valueColor\":\"#000\",\"valueBoxBackground\":\"rgba(0, 0, 0, 0.04)\",\"showBorder\":true,\"borderWidth\":1,\"borderColor\":\"#305680\"},\"buttonAppearance\":{\"leftButton\":{\"showButton\":true,\"icon\":\"arrow_back_ios_new\",\"iconSize\":24,\"iconSizeUnit\":\"px\",\"mainColorOn\":\"#3F52DD\",\"backgroundColorOn\":\"#FFFFFF\",\"mainColorDisabled\":\"rgba(0,0,0,0.12)\",\"backgroundColorDisabled\":\"#FFFFFF\",\"customStyle\":{\"enabled\":null,\"hovered\":null,\"pressed\":null,\"activated\":null,\"disabled\":null}},\"rightButton\":{\"showButton\":true,\"icon\":\"arrow_forward_ios\",\"iconSize\":24,\"iconSizeUnit\":\"px\",\"mainColorOn\":\"#3F52DD\",\"backgroundColorOn\":\"#FFFFFF\",\"mainColorDisabled\":\"rgba(0,0,0,0.12)\",\"backgroundColorDisabled\":\"#FFFFFF\",\"customStyle\":{\"enabled\":null,\"hovered\":null,\"pressed\":null,\"activated\":null,\"disabled\":null}}},\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"padding\":\"12px\"},\"title\":\"Value stepper\",\"dropShadow\":true,\"enableFullscreen\":false,\"widgetStyle\":{},\"actions\":{},\"widgetCss\":\"\",\"noDataDisplayMessage\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":null,\"weight\":\"500\",\"style\":null,\"lineHeight\":\"24px\"},\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"pageSize\":1024,\"titleIcon\":\"\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"14px\",\"configMode\":\"basic\",\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"datasources\":null,\"borderRadius\":null}"
+  },
+  "resources": [
+    {
+      "link": "/api/images/system/value-stepper-widget.svg",
+      "title": "\"Value stepper\" system widget image",
+      "type": "IMAGE",
+      "subType": "IMAGE",
+      "fileName": "value-stepper-widget.svg",
+      "publicResourceKey": "s0UKoqbiMCcKVn0pD55XZzPUR89XlXAO",
+      "mediaType": "image/svg+xml",
+      "data": "PHN2ZyB3aWR0aD0iMjE0IiBoZWlnaHQ9Ijc2IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxnIGZpbHRlcj0idXJsKCNhKSI+PHJlY3QgeD0iOC41IiB5PSI0LjUiIHdpZHRoPSIxOTciIGhlaWdodD0iNTkiIHJ4PSI0IiBmaWxsPSIjZmZmIiBzaGFwZS1yZW5kZXJpbmc9ImNyaXNwRWRnZXMiLz48cmVjdCB4PSI5IiB5PSI1IiB3aWR0aD0iMTk2IiBoZWlnaHQ9IjU4IiByeD0iMy41IiBzdHJva2U9IiMzMDU2ODAiIHNoYXBlLXJlbmRlcmluZz0iY3Jpc3BFZGdlcyIvPjxyZWN0IHg9IjIwLjUiIHk9IjE4IiB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIHJ4PSIxNiIgZmlsbD0iIzMwNTY4MCIvPjxwYXRoIGQ9Im0zOC41IDQwIDEuNDEtMS40MUwzNS4zMyAzNGw0LjU4LTQuNTlMMzguNSAyOGwtNiA2IDYgNloiIGZpbGw9IiNmZmYiLz48cmVjdCB4PSI2NSIgeT0iMTguNSIgd2lkdGg9Ijg0IiBoZWlnaHQ9IjMxIiByeD0iMy41IiBmaWxsPSIjMzA1NjgwIiBmaWxsLW9wYWNpdHk9Ii4wNCIvPjxyZWN0IHg9IjY1IiB5PSIxOC41IiB3aWR0aD0iODQiIGhlaWdodD0iMzEiIHJ4PSIzLjUiIHN0cm9rZT0iIzMwNTY4MCIvPjxwYXRoIGQ9Ik04OC41OSAzNy41VjM5aC03LjYzdi0xLjI5bDMuNy00LjA0Yy40MS0uNDYuNzMtLjg1Ljk3LTEuMTkuMjMtLjMzLjQtLjYzLjQ5LS45YTIuMyAyLjMgMCAwIDAtLjA2LTEuNzNjLS4xMy0uMjctLjMyLS41LS41OC0uNjVhMS43IDEuNyAwIDAgMC0uOTMtLjI0Yy0uNDIgMC0uNzcuMS0xLjA2LjI3LS4yOC4xOS0uNS40NC0uNjUuNzZhMi42IDIuNiAwIDAgMC0uMjIgMS4xaC0xLjg4YzAtLjY3LjE1LTEuMjcuNDYtMS44Mi4zLS41NS43My0uOTkgMS4zLTEuM2E0LjEgNC4xIDAgMCAxIDIuMDgtLjVjLjc2IDAgMS40LjEzIDEuOTQuMzguNTMuMjYuOTMuNjIgMS4yIDEuMDlhMy4zNiAzLjM2IDAgMCAxIC4yNSAyLjcyIDUgNSAwIDAgMS0uNDkgMS4wNCA5IDkgMCAwIDEtLjc0IDEuMDRjLS4yOC4zNS0uNi43LS45NCAxLjA1bC0yLjQ2IDIuNzFoNS4yNVptOS4yNy05Ljg4djEuMDRMOTMuMyAzOWgtMS45OGw0LjU0LTkuODhoLTUuOXYtMS41aDcuODlabTEuOTggMTAuNDRjMC0uMjkuMS0uNTMuMy0uNzMuMi0uMi40Ni0uMy44LS4zcy42LjEuOC4zYy4yLjIuMy40NC4zLjczYTEgMSAwIDAgMS0uMy43NGMtLjIuMi0uNDYuMy0uOC4zcy0uNi0uMS0uOC0uM2ExIDEgMCAwIDEtLjMtLjc0Wm02LjQ5LTQuMzUtMS41LS4zNy42MS01LjcyaDYuMTR2MS42SDEwN2wtLjMyIDIuNzlhMy42NyAzLjY3IDAgMCAxIDEuODEtLjQ2Yy41NCAwIDEuMDIuMDkgMS40NC4yNi40Mi4xNy43OS40MyAxLjA4Ljc2LjMuMzMuNTMuNzMuNjggMS4yYTUgNSAwIDAgMSAwIDMuMDcgMy4xNyAzLjE3IDAgMCAxLTEuODUgMi4wM2MtLjQ2LjE5LTEuMDEuMjktMS42NS4yOWE0LjYgNC42IDAgMCAxLTEuMzYtLjIgMy43MyAzLjczIDAgMCAxLTEuMTctLjYyIDMuMTQgMy4xNCAwIDAgMS0xLjE5LTIuNDJoMS44NWMuMDUuMzcuMTUuNjkuMy45NS4xNi4yNS4zOC40NS42NC41OGEyIDIgMCAwIDAgLjkyLjJjLjMyIDAgLjYtLjA1LjgzLS4xNi4yMy0uMTEuNDItLjI3LjU3LS40OC4xNS0uMjIuMjctLjQ3LjM0LS43NWEzLjYyIDMuNjIgMCAwIDAtLjAyLTEuODcgMS45OCAxLjk4IDAgMCAwLS4zOC0uNzJjLS4xNy0uMi0uMzgtLjM2LS42My0uNDdhMi4xMyAyLjEzIDAgMCAwLS44OC0uMTdjLS40NSAwLS44LjA3LTEuMDQuMi0uMjMuMTMtLjQ1LjI5LS42NS40OFptMTEuNzUtNC4xNmMwLS4zOC4xLS43Mi4yOC0xLjA0LjE5LS4zMi40NC0uNTcuNzUtLjc2YTEuOTYgMS45NiAwIDAgMSAyLjA1IDBjLjMxLjE5LjU2LjQ0Ljc0Ljc2LjE5LjMyLjI4LjY2LjI4IDEuMDRzLS4xLjczLS4yOCAxLjA1Yy0uMTguMzEtLjQzLjU2LS43NC43NGEyLjA0IDIuMDQgMCAwIDEtMi44LS43NCAyLjAzIDIuMDMgMCAwIDEtLjI4LTEuMDVabTEuMDUgMGExIDEgMCAwIDAgMSAxIC45Ny45NyAwIDAgMCAuOTgtMSAxIDEgMCAwIDAtLjI3LS43Mi45My45MyAwIDAgMC0uNy0uM2MtLjI4IDAtLjUxLjEtLjcxLjMtLjIuMi0uMy40My0uMy43MlptMTIuMTkgNS43NWgxLjk1YTQuNSA0LjUgMCAwIDEtLjYyIDEuOTkgMy43MiAzLjcyIDAgMCAxLTEuNSAxLjM3IDUgNSAwIDAgMS0yLjMzLjUgNC4xNSA0LjE1IDAgMCAxLTMuMzQtMS40NWMtLjQtLjQ4LS43MS0xLjA0LS45Mi0xLjctLjIxLS42Ni0uMzItMS40LS4zMi0yLjIydi0uOTVjMC0uODEuMS0xLjU1LjMyLTIuMjIuMjItLjY2LjUzLTEuMjIuOTQtMS42OS40LS40Ny45LS44NCAxLjQ2LTEuMDlhNC43OCA0Ljc4IDAgMCAxIDEuOTMtLjM3Yy45IDAgMS42Ny4xNyAyLjMuNS42Mi4zMyAxLjEuOCAxLjQ1IDEuMzguMzUuNTkuNTYgMS4yNi42NCAyLjAyaC0xLjk1Yy0uMDUtLjQ4LS4xNy0uOS0uMzUtMS4yNWExLjc3IDEuNzcgMCAwIDAtLjc2LS44IDIuNzMgMi43MyAwIDAgMC0xLjMzLS4yOGMtLjQ1IDAtLjg0LjA4LTEuMTcuMjVhMi4yIDIuMiAwIDAgMC0uODQuNzNjLS4yMi4zMy0uMzkuNzItLjUgMS4yLS4xMS40Ny0uMTcgMS0uMTcgMS42di45N2MwIC41Ny4wNSAxLjEuMTUgMS41Ni4xLjQ3LjI2Ljg2LjQ3IDEuMi4yMS4zMy40OC41OS44MS43Ny4zMy4xOC43Mi4yNyAxLjE4LjI3LjU2IDAgMS0uMDggMS4zNS0uMjYuMzUtLjE4LjYxLS40NC44LS43OC4xNy0uMzQuMy0uNzYuMzUtMS4yNVoiIGZpbGw9IiMwMDAiIGZpbGwtb3BhY2l0eT0iLjg3Ii8+PHJlY3QgeD0iMTYxLjUiIHk9IjE4IiB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIHJ4PSIxNiIgZmlsbD0iIzMwNTY4MCIvPjxwYXRoIGQ9Im0xNzUuNSAyOC0xLjQxIDEuNDEgNC41OCA0LjU5LTQuNTggNC41OUwxNzUuNSA0MGw2LTYtNi02WiIgZmlsbD0iI2ZmZiIvPjwvZz48ZGVmcz48ZmlsdGVyIGlkPSJhIiB4PSIuNSIgeT0iLjUiIHdpZHRoPSIyMTMiIGhlaWdodD0iNzUiIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj48ZmVGbG9vZCBmbG9vZC1vcGFjaXR5PSIwIiByZXN1bHQ9IkJhY2tncm91bmRJbWFnZUZpeCIvPjxmZUNvbG9yTWF0cml4IGluPSJTb3VyY2VBbHBoYSIgdmFsdWVzPSIwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAxMjcgMCIgcmVzdWx0PSJoYXJkQWxwaGEiLz48ZmVPZmZzZXQgZHk9IjQiLz48ZmVHYXVzc2lhbkJsdXIgc3RkRGV2aWF0aW9uPSI0Ii8+PGZlQ29tcG9zaXRlIGluMj0iaGFyZEFscGhhIiBvcGVyYXRvcj0ib3V0Ii8+PGZlQ29sb3JNYXRyaXggdmFsdWVzPSIwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwLjA0IDAiLz48ZmVCbGVuZCBpbjI9IkJhY2tncm91bmRJbWFnZUZpeCIgcmVzdWx0PSJlZmZlY3QxX2Ryb3BTaGFkb3dfNTY2OV8xNjA3MDUiLz48ZmVCbGVuZCBpbj0iU291cmNlR3JhcGhpYyIgaW4yPSJlZmZlY3QxX2Ryb3BTaGFkb3dfNTY2OV8xNjA3MDUiIHJlc3VsdD0ic2hhcGUiLz48L2ZpbHRlcj48L2RlZnM+PC9zdmc+",
+      "public": true
+    }
+  ],
+  "scada": false,
+  "tags": [
+    "command",
+    "downlink",
+    "device configuration",
+    "device control",
+    "invocation",
+    "remote method",
+    "remote function",
+    "interface",
+    "subroutine call",
+    "inter-process communication",
+    "server request",
+    "update attribute",
+    "set attribute",
+    "add time-series"
+  ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/tenant/device_profile/rule_chain_template.json b/application/src/main/data/json/tenant/device_profile/rule_chain_template.json
index bce88d62b0..0f2473cde6 100644
--- a/application/src/main/data/json/tenant/device_profile/rule_chain_template.json
+++ b/application/src/main/data/json/tenant/device_profile/rule_chain_template.json
@@ -19,8 +19,13 @@
         },
         "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
         "name": "Save Timeseries",
+        "configurationVersion": 1,
         "configuration": {
-          "defaultTTL": 0
+          "defaultTTL": 0,
+          "useServerTs": false,
+          "processingSettings": {
+            "type": "ON_EVERY_MESSAGE"
+          }
         }
       },
       {
@@ -134,4 +139,4 @@
     ],
     "ruleChainConnections": null
   }
-}
\ No newline at end of file
+}
diff --git a/application/src/main/data/json/tenant/rule_chains/root_rule_chain.json b/application/src/main/data/json/tenant/rule_chains/root_rule_chain.json
index ee38849c1b..8efda98c5b 100644
--- a/application/src/main/data/json/tenant/rule_chains/root_rule_chain.json
+++ b/application/src/main/data/json/tenant/rule_chains/root_rule_chain.json
@@ -18,8 +18,13 @@
         },
         "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
         "name": "Save Timeseries",
+        "configurationVersion": 1,
         "configuration": {
-          "defaultTTL": 0
+          "defaultTTL": 0,
+          "useServerTs": false,
+          "processingSettings": {
+            "type": "ON_EVERY_MESSAGE"
+          }
         }
       },
       {
diff --git a/application/src/main/data/upgrade/basic/schema_update.sql b/application/src/main/data/upgrade/basic/schema_update.sql
index 64bbbaca05..eccc510f42 100644
--- a/application/src/main/data/upgrade/basic/schema_update.sql
+++ b/application/src/main/data/upgrade/basic/schema_update.sql
@@ -14,198 +14,50 @@
 -- limitations under the License.
 --
 
-ALTER TABLE user_credentials ADD COLUMN IF NOT EXISTS last_login_ts BIGINT;
-UPDATE user_credentials c SET last_login_ts = (SELECT (additional_info::json ->> 'lastLoginTs')::bigint FROM tb_user u WHERE u.id = c.user_id)
-  WHERE last_login_ts IS NULL;
+-- UPDATE SAVE TIME SERIES NODES START
 
-ALTER TABLE user_credentials ADD COLUMN IF NOT EXISTS failed_login_attempts INT;
-UPDATE user_credentials c SET failed_login_attempts = (SELECT (additional_info::json ->> 'failedLoginAttempts')::int FROM tb_user u WHERE u.id = c.user_id)
-  WHERE failed_login_attempts IS NULL;
-
-UPDATE tb_user SET additional_info = (additional_info::jsonb - 'lastLoginTs' - 'failedLoginAttempts' - 'userCredentialsEnabled')::text
-  WHERE additional_info IS NOT NULL AND additional_info != 'null' AND jsonb_typeof(additional_info::jsonb) = 'object';
-
--- UPDATE RULE NODE DEBUG MODE TO DEBUG STRATEGY START
-
-ALTER TABLE rule_node ADD COLUMN IF NOT EXISTS debug_settings varchar(1024) DEFAULT null;
-DO
-$$
-    BEGIN
-        IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'rule_node' AND column_name = 'debug_mode')
-            THEN
-                UPDATE rule_node SET debug_settings = '{"failuresEnabled": true, "allEnabledUntil": ' || cast((extract(epoch from now()) + 900) * 1000 as bigint) || '}' WHERE debug_mode = true; -- 15 minutes according to thingsboard.yml default settings.
-                ALTER TABLE rule_node DROP COLUMN debug_mode;
-        END IF;
-    END
-$$;
-
--- UPDATE RULE NODE DEBUG MODE TO DEBUG STRATEGY END
-
-
--- CREATE MOBILE APP BUNDLES FROM EXISTING APPS
-
-CREATE TABLE IF NOT EXISTS mobile_app_bundle (
-    id uuid NOT NULL CONSTRAINT mobile_app_bundle_pkey PRIMARY KEY,
-    created_time bigint NOT NULL,
-    tenant_id uuid,
-    title varchar(255),
-    description varchar(1024),
-    android_app_id uuid UNIQUE,
-    ios_app_id uuid UNIQUE,
-    layout_config varchar(16384),
-    oauth2_enabled boolean,
-    CONSTRAINT fk_android_app_id FOREIGN KEY (android_app_id) REFERENCES mobile_app(id) ON DELETE SET NULL,
-    CONSTRAINT fk_ios_app_id FOREIGN KEY (ios_app_id) REFERENCES mobile_app(id) ON DELETE SET NULL
-);
-CREATE INDEX IF NOT EXISTS mobile_app_bundle_tenant_id ON mobile_app_bundle(tenant_id);
-
-ALTER TABLE mobile_app ADD COLUMN IF NOT EXISTS platform_type varchar(32),
-    ADD COLUMN IF NOT EXISTS status varchar(32),
-    ADD COLUMN IF NOT EXISTS version_info varchar(100000),
-    ADD COLUMN IF NOT EXISTS store_info varchar(16384),
-    DROP CONSTRAINT IF EXISTS mobile_app_pkg_name_key,
-    DROP CONSTRAINT IF EXISTS mobile_app_unq_key;
-
--- rename mobile_app_oauth2_client to mobile_app_bundle_oauth2_client
-DO
-$$
-    BEGIN
-        -- in case of running the upgrade script a second time
-        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'mobile_app_oauth2_client') THEN
-            ALTER TABLE mobile_app_oauth2_client RENAME TO mobile_app_bundle_oauth2_client;
-            ALTER TABLE mobile_app_bundle_oauth2_client DROP CONSTRAINT IF EXISTS fk_domain;
-            ALTER TABLE mobile_app_bundle_oauth2_client RENAME COLUMN mobile_app_id TO mobile_app_bundle_id;
-        END IF;
-    END;
-$$;
-
-
-CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
-
--- duplicate each mobile app and create mobile app bundle for the pair of android and ios app
-DO
-$$
-    DECLARE
-        generatedBundleId uuid;
-        iosAppId uuid;
-        mobileAppRecord RECORD;
+DO $$
     BEGIN
-        -- in case of running the upgrade script a second time
-        IF EXISTS(SELECT 1 FROM information_schema.columns WHERE table_name = 'mobile_app' and column_name = 'oauth2_enabled') THEN
-            UPDATE mobile_app SET platform_type = 'ANDROID' WHERE platform_type IS NULL;
-            UPDATE mobile_app SET status = 'DRAFT' WHERE mobile_app.status IS NULL;
-            FOR mobileAppRecord IN SELECT * FROM mobile_app
-            LOOP
-                -- duplicate app for iOS platform type
-                iosAppId := uuid_generate_v4();
-                INSERT INTO mobile_app(id, created_time, tenant_id, pkg_name, app_secret, platform_type, status)
-                VALUES (iosAppId, mobileAppRecord.created_time, mobileAppRecord.tenant_id, mobileAppRecord.pkg_name, mobileAppRecord.app_secret, 'IOS', mobileAppRecord.status)
-                ON CONFLICT DO NOTHING;
-                -- create bundle for android and iOS app
-                generatedBundleId := uuid_generate_v4();
-                INSERT INTO mobile_app_bundle(id, created_time, tenant_id, title, android_app_id, ios_app_id, oauth2_enabled)
-                VALUES (generatedBundleId, mobileAppRecord.created_time, mobileAppRecord.tenant_id,
-                        mobileAppRecord.pkg_name || ' (autogenerated)', mobileAppRecord.id, iosAppId, mobileAppRecord.oauth2_enabled)
-                ON CONFLICT DO NOTHING;
-                UPDATE mobile_app_bundle_oauth2_client SET mobile_app_bundle_id = generatedBundleId WHERE mobile_app_bundle_id = mobileAppRecord.id;
-            END LOOP;
-        END IF;
-        IF NOT EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'fk_mobile_app_bundle_oauth2_client_bundle_id') THEN
-            ALTER TABLE mobile_app_bundle_oauth2_client ADD CONSTRAINT fk_mobile_app_bundle_oauth2_client_bundle_id
-                FOREIGN KEY (mobile_app_bundle_id) REFERENCES mobile_app_bundle(id) ON DELETE CASCADE;
-        END IF;
-        ALTER TABLE mobile_app DROP COLUMN IF EXISTS oauth2_enabled;
-        IF NOT EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'mobile_app_pkg_name_platform_unq_key') THEN
-            ALTER TABLE mobile_app ADD CONSTRAINT mobile_app_pkg_name_platform_unq_key UNIQUE (pkg_name, platform_type);
-        END IF;
-    END;
-$$;
+        -- Check if the rule_node table exists
+        IF EXISTS (
+            SELECT 1
+            FROM information_schema.tables
+            WHERE table_name = 'rule_node'
+        ) THEN
+
+            UPDATE rule_node
+            SET configuration = (
+                (configuration::jsonb - 'skipLatestPersistence')
+                    || jsonb_build_object(
+                        'processingSettings', jsonb_build_object(
+                                'type',       'ADVANCED',
+                                'timeseries', jsonb_build_object('type', 'ON_EVERY_MESSAGE'),
+                                'latest',     jsonb_build_object('type', 'SKIP'),
+                                'webSockets', jsonb_build_object('type', 'ON_EVERY_MESSAGE')
+                                               )
+                       )
+                )::text,
+                configuration_version = 1
+            WHERE type = 'org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode'
+              AND configuration_version = 0
+              AND configuration::jsonb ->> 'skipLatestPersistence' = 'true';
+
+            UPDATE rule_node
+            SET configuration = (
+                (configuration::jsonb - 'skipLatestPersistence')
+                    || jsonb_build_object(
+                        'processingSettings', jsonb_build_object(
+                                'type', 'ON_EVERY_MESSAGE'
+                                               )
+                       )
+                )::text,
+                configuration_version = 1
+            WHERE type = 'org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode'
+              AND configuration_version = 0
+              AND (configuration::jsonb ->> 'skipLatestPersistence' != 'true' OR configuration::jsonb ->> 'skipLatestPersistence' IS NULL);
 
-ALTER TABLE IF EXISTS mobile_app_settings RENAME TO qr_code_settings;
-ALTER TABLE qr_code_settings ADD COLUMN IF NOT EXISTS mobile_app_bundle_id uuid,
-    ADD COLUMN IF NOT EXISTS android_enabled boolean,
-    ADD COLUMN IF NOT EXISTS ios_enabled boolean;
-
--- migrate mobile apps from qr code settings to mobile_app, create mobile app bundle for the pair of apps
-DO
-$$
-    DECLARE
-        androidPkgName varchar;
-        iosPkgName varchar;
-        androidAppId uuid;
-        iosAppId uuid;
-        generatedBundleId uuid;
-        qrCodeRecord RECORD;
-    BEGIN
-        -- in case of running the upgrade script a second time
-        IF EXISTS(SELECT 1 FROM information_schema.columns WHERE table_name = 'qr_code_settings' AND column_name = 'android_config') THEN
-            FOR qrCodeRecord IN SELECT * FROM qr_code_settings
-            LOOP
-                generatedBundleId := NULL;
-                -- migrate android config
-                IF (qrCodeRecord.android_config::jsonb ->> 'appPackage' IS NOT NULL) THEN
-                    androidPkgName := qrCodeRecord.android_config::jsonb ->> 'appPackage';
-                    SELECT id into androidAppId FROM mobile_app WHERE pkg_name = androidPkgName AND platform_type = 'ANDROID';
-                    IF androidAppId IS NULL THEN
-                        androidAppId := uuid_generate_v4();
-                        INSERT INTO mobile_app(id, created_time, tenant_id, pkg_name, platform_type, status, store_info)
-                        VALUES (androidAppId, (extract(epoch from now()) * 1000), qrCodeRecord.tenant_id,
-                                androidPkgName, 'ANDROID', 'DRAFT', qrCodeRecord.android_config::jsonb - 'appPackage' - 'enabled');
-                        generatedBundleId := uuid_generate_v4();
-                        INSERT INTO mobile_app_bundle(id, created_time, tenant_id, title, android_app_id)
-                        VALUES (generatedBundleId, (extract(epoch from now()) * 1000), qrCodeRecord.tenant_id, androidPkgName || ' (autogenerated)', androidAppId);
-                        UPDATE qr_code_settings SET mobile_app_bundle_id = generatedBundleId;
-                    ELSE
-                        UPDATE mobile_app SET store_info = qrCodeRecord.android_config::jsonb - 'appPackage' - 'enabled' WHERE id = androidAppId;
-                        UPDATE qr_code_settings SET mobile_app_bundle_id = (SELECT id FROM mobile_app_bundle WHERE mobile_app_bundle.android_app_id = androidAppId);
-                    END IF;
-                END IF;
-                UPDATE qr_code_settings SET android_enabled = (qrCodeRecord.android_config::jsonb ->> 'enabled')::boolean WHERE id = qrCodeRecord.id;
-
-                -- migrate ios config
-                IF (qrCodeRecord.ios_config::jsonb ->> 'appId' IS NOT NULL) THEN
-                    iosPkgName := substring(qrCodeRecord.ios_config::jsonb ->> 'appId', strpos(qrCodeRecord.ios_config::jsonb ->> 'appId', '.') + 1);
-                    SELECT id INTO iosAppId FROM mobile_app WHERE pkg_name = iosPkgName AND platform_type = 'IOS';
-                    IF iosAppId IS NULL THEN
-                        iosAppId := uuid_generate_v4();
-                        INSERT INTO mobile_app(id, created_time, tenant_id, pkg_name, platform_type, status, store_info)
-                        VALUES (iosAppId, (extract(epoch from now()) * 1000), qrCodeRecord.tenant_id,
-                                iosPkgName, 'IOS', 'DRAFT', qrCodeRecord.ios_config::jsonb - 'enabled');
-                        IF generatedBundleId IS NULL THEN
-                            generatedBundleId := uuid_generate_v4();
-                            INSERT INTO mobile_app_bundle(id, created_time, tenant_id, title, ios_app_id)
-                            VALUES (generatedBundleId, (extract(epoch from now()) * 1000), qrCodeRecord.tenant_id, iosPkgName || ' (autogenerated)', iosAppId);
-                            UPDATE qr_code_settings SET mobile_app_bundle_id = generatedBundleId;
-                        ELSE
-                            UPDATE mobile_app_bundle SET ios_app_id = iosAppId WHERE id = generatedBundleId;
-                        END IF;
-                    ELSE
-                        UPDATE qr_code_settings SET mobile_app_bundle_id = (SELECT id FROM mobile_app_bundle WHERE mobile_app_bundle.ios_app_id = iosAppId);
-                        UPDATE mobile_app SET store_info = qrCodeRecord.ios_config::jsonb - 'enabled' WHERE id = iosAppId;
-                    END IF;
-                END IF;
-                UPDATE qr_code_settings SET ios_enabled = (qrCodeRecord.ios_config::jsonb -> 'enabled')::boolean WHERE id = qrCodeRecord.id;
-            END LOOP;
-            ALTER TABLE qr_code_settings RENAME CONSTRAINT mobile_app_settings_tenant_id_unq_key TO qr_code_settings_tenant_id_unq_key;
-            ALTER TABLE qr_code_settings RENAME CONSTRAINT mobile_app_settings_pkey TO qr_code_settings_pkey;
-        END IF;
-        ALTER TABLE qr_code_settings DROP COLUMN IF EXISTS android_config, DROP COLUMN IF EXISTS ios_config;
-    END;
-$$;
-
--- update constraint name
-DO
-$$
-    BEGIN
-        ALTER TABLE domain DROP CONSTRAINT IF EXISTS domain_unq_key;
-        IF NOT EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'domain_name_key') THEN
-            ALTER TABLE domain ADD CONSTRAINT domain_name_key UNIQUE (name);
         END IF;
     END;
 $$;
 
--- UPDATE RESOURCE JS_MODULE SUB TYPE START
-
-UPDATE resource SET resource_sub_type = 'EXTENSION' WHERE resource_type = 'JS_MODULE' AND resource_sub_type IS NULL;
-
--- UPDATE RESOURCE JS_MODULE SUB TYPE END
+-- UPDATE SAVE TIME SERIES NODES END
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 0070eba4a1..c3c524b2bb 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
@@ -173,7 +173,10 @@ public class DefaultTbContext implements TbContext {
         if (!msg.isValid()) {
             return;
         }
-        TbMsg tbMsg = msg.copyWithRuleChainId(ruleChainId);
+        TbMsg tbMsg = msg.copy()
+                .ruleChainId(ruleChainId)
+                .resetRuleNodeId()
+                .build();
         tbMsg.pushToStack(nodeCtx.getSelf().getRuleChainId(), nodeCtx.getSelf().getId());
         TopicPartitionInfo tpi = mainCtx.resolve(ServiceType.TB_RULE_ENGINE, getQueueName(), getTenantId(), tbMsg.getOriginator());
         doEnqueue(tpi, tbMsg, new SimpleTbQueueCallback(md -> ack(msg), t -> tellFailure(msg, t)));
@@ -361,19 +364,28 @@ public class DefaultTbContext implements TbContext {
         nodeCtx.setSelf(self);
     }
 
-    @Override
-    public TbMsg newMsg(String queueName, String type, EntityId originator, TbMsgMetaData metaData, String data) {
-        return newMsg(queueName, type, originator, null, metaData, data);
-    }
-
     @Override
     public TbMsg newMsg(String queueName, String type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, String data) {
-        return TbMsg.newMsg(queueName, type, originator, customerId, metaData, data, nodeCtx.getSelf().getRuleChainId(), nodeCtx.getSelf().getId());
+        return TbMsg.newMsg()
+                .queueName(queueName)
+                .type(type)
+                .originator(originator)
+                .customerId(customerId)
+                .copyMetaData(metaData)
+                .data(data)
+                .ruleChainId(nodeCtx.getSelf().getRuleChainId())
+                .ruleNodeId(nodeCtx.getSelf().getId())
+                .build();
     }
 
     @Override
     public TbMsg transformMsg(TbMsg origMsg, String type, EntityId originator, TbMsgMetaData metaData, String data) {
-        return TbMsg.transformMsg(origMsg, type, originator, metaData, data);
+        return origMsg.transform()
+                .type(type)
+                .originator(originator)
+                .metaData(metaData)
+                .data(data)
+                .build();
     }
 
     @Override
@@ -383,22 +395,41 @@ public class DefaultTbContext implements TbContext {
 
     @Override
     public TbMsg newMsg(String queueName, TbMsgType type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, String data) {
-        return TbMsg.newMsg(queueName, type, originator, customerId, metaData, data, nodeCtx.getSelf().getRuleChainId(), nodeCtx.getSelf().getId());
+        return TbMsg.newMsg()
+                .queueName(queueName)
+                .type(type)
+                .originator(originator)
+                .customerId(customerId)
+                .copyMetaData(metaData)
+                .data(data)
+                .ruleChainId(nodeCtx.getSelf().getRuleChainId())
+                .ruleNodeId(nodeCtx.getSelf().getId())
+                .build();
     }
 
     @Override
     public TbMsg transformMsg(TbMsg origMsg, TbMsgType type, EntityId originator, TbMsgMetaData metaData, String data) {
-        return TbMsg.transformMsg(origMsg, type, originator, metaData, data);
+        return origMsg.transform()
+                .type(type)
+                .originator(originator)
+                .metaData(metaData)
+                .data(data)
+                .build();
     }
 
     @Override
     public TbMsg transformMsg(TbMsg origMsg, TbMsgMetaData metaData, String data) {
-        return TbMsg.transformMsg(origMsg, metaData, data);
+        return origMsg.transform()
+                .metaData(metaData)
+                .data(data)
+                .build();
     }
 
     @Override
     public TbMsg transformMsgOriginator(TbMsg origMsg, EntityId originator) {
-        return TbMsg.transformMsgOriginator(origMsg, originator);
+        return origMsg.transform()
+                .originator(originator)
+                .build();
     }
 
     @Override
@@ -497,7 +528,14 @@ public class DefaultTbContext implements TbContext {
             defaultQueueName = profile.getDefaultQueueName();
             defaultRuleChainId = profile.getDefaultRuleChainId();
         }
-        return TbMsg.newMsg(defaultQueueName, action, id, msgMetaData, msgData, defaultRuleChainId, null);
+        return TbMsg.newMsg()
+                .queueName(defaultQueueName)
+                .type(action)
+                .originator(id)
+                .copyMetaData(msgMetaData)
+                .data(msgData)
+                .ruleChainId(defaultRuleChainId)
+                .build();
     }
 
     public <E, I extends EntityId, K extends HasRuleEngineProfile> TbMsg entityActionMsg(E entity, I id, RuleNodeId ruleNodeId, TbMsgType actionMsgType, K profile) {
@@ -515,7 +553,14 @@ public class DefaultTbContext implements TbContext {
             defaultQueueName = profile.getDefaultQueueName();
             defaultRuleChainId = profile.getDefaultRuleChainId();
         }
-        return TbMsg.newMsg(defaultQueueName, actionMsgType, id, msgMetaData, msgData, defaultRuleChainId, null);
+        return TbMsg.newMsg()
+                .queueName(defaultQueueName)
+                .type(actionMsgType)
+                .originator(id)
+                .copyMetaData(msgMetaData)
+                .data(msgData)
+                .ruleChainId(defaultRuleChainId)
+                .build();
     }
 
     @Override
diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java
index 460da228c3..be0812795d 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.actors.ruleChain;
 
 import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.DebugModeUtil;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.TbActorCtx;
 import org.thingsboard.server.actors.TbActorRef;
@@ -35,7 +36,6 @@ import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.common.data.rule.RuleNode;
-import org.thingsboard.common.util.DebugModeUtil;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.common.msg.plugin.RuleNodeUpdatedMsg;
@@ -217,7 +217,10 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
             RuleNodeCtx targetCtx;
             if (targetId == null) {
                 targetCtx = firstNode;
-                msg = msg.copyWithRuleChainId(entityId);
+                msg = msg.copy()
+                        .ruleChainId(entityId)
+                        .resetRuleNodeId()
+                        .build();
             } else {
                 targetCtx = nodeActors.get(targetId);
             }
@@ -343,10 +346,18 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
     private void putToQueue(TopicPartitionInfo tpi, TbMsg msg, TbQueueCallback callbackWrapper, EntityId target) {
         switch (target.getEntityType()) {
             case RULE_NODE:
-                putToQueue(tpi, msg.copyWithRuleNodeId(entityId, new RuleNodeId(target.getId()), UUID.randomUUID()), callbackWrapper);
+                putToQueue(tpi, msg.copy()
+                        .id(UUID.randomUUID())
+                        .ruleChainId(entityId)
+                        .ruleNodeId(new RuleNodeId(target.getId()))
+                        .build(), callbackWrapper);
                 break;
             case RULE_CHAIN:
-                putToQueue(tpi, msg.copyWithRuleChainId(new RuleChainId(target.getId()), UUID.randomUUID()), callbackWrapper);
+                putToQueue(tpi, msg.copy()
+                        .id(UUID.randomUUID())
+                        .ruleChainId(new RuleChainId(target.getId()))
+                        .resetRuleNodeId()
+                        .build(), callbackWrapper);
                 break;
         }
     }
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 c32533bd04..0f3f529cb7 100644
--- a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
@@ -84,6 +84,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 public class SwaggerConfiguration {
 
     public static final String LOGIN_ENDPOINT = "/api/auth/login";
+    public static final String REFRESH_TOKEN_ENDPOINT = "/api/auth/token";
 
     private static final ApiResponses loginResponses = loginResponses();
     private static final ApiResponses defaultErrorResponses = defaultErrorResponses(false);
@@ -150,6 +151,7 @@ public class SwaggerConfiguration {
                 .info(info);
         addDefaultSchemas(openApi);
         addLoginOperation(openApi);
+        addRefreshTokenOperation(openApi);
         return openApi;
     }
 
@@ -210,6 +212,29 @@ public class SwaggerConfiguration {
         openAPI.path(LOGIN_ENDPOINT, pathItem);
     }
 
+    private void addRefreshTokenOperation(OpenAPI openAPI) {
+        var operation = new Operation();
+        operation.summary("Refresh user JWT token data");
+        operation.description("""
+            Method to refresh JWT token. Provide a valid refresh token to get a new JWT token.
+            
+            The response contains a new token that can be used for authorization.
+            
+            `X-Authorization: Bearer $JWT_TOKEN_VALUE`""");
+
+        var requestBody = new RequestBody().description("Refresh token request")
+                .content(new Content().addMediaType(APPLICATION_JSON_VALUE,
+                        new MediaType().schema(new Schema<JsonNode>().addProperty("refreshToken", new Schema<>().type("string")))));
+
+        operation.requestBody(requestBody);
+
+        operation.responses(loginResponses);
+
+        operation.addTagsItem("login-endpoint");
+        var pathItem = new PathItem().post(operation);
+        openAPI.path(REFRESH_TOKEN_ENDPOINT, pathItem);
+    }
+
     @Bean
     public GroupedOpenApi groupedApi(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
         return GroupedOpenApi.builder()
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 dbe430ba18..2b248e57b3 100644
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
@@ -125,6 +125,7 @@ import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.util.ThrowingBiFunction;
 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.alarm.AlarmCommentService;
 import org.thingsboard.server.dao.asset.AssetProfileService;
@@ -759,6 +760,10 @@ public abstract class BaseController {
         return checkEntityId(widgetTypeId, widgetTypeService::findWidgetTypeDetailsById, operation);
     }
 
+    WidgetTypeInfo checkWidgetTypeInfoId(WidgetTypeId widgetTypeId, Operation operation) throws ThingsboardException {
+        return checkEntityId(widgetTypeId, widgetTypeService::findWidgetTypeInfoById, operation);
+    }
+
     Dashboard checkDashboardId(DashboardId dashboardId, Operation operation) throws ThingsboardException {
         return checkEntityId(dashboardId, dashboardService::findDashboardById, operation);
     }
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 67ff1b3fc5..e8c53ff5a3 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RpcV2Controller.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RpcV2Controller.java
@@ -239,7 +239,12 @@ public class RpcV2Controller extends AbstractRpcController {
             rpcService.deleteRpc(getTenantId(), rpcId);
             rpc.setStatus(RpcStatus.DELETED);
 
-            TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_DELETED, rpc.getDeviceId(), TbMsgMetaData.EMPTY, JacksonUtil.toString(rpc));
+            TbMsg msg = TbMsg.newMsg()
+                    .type(TbMsgType.RPC_DELETED)
+                    .originator(rpc.getDeviceId())
+                    .copyMetaData(TbMsgMetaData.EMPTY)
+                    .data(JacksonUtil.toString(rpc))
+                    .build();
             tbClusterService.pushMsgToRuleEngine(getTenantId(), rpc.getDeviceId(), msg, null);
         }
     }
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 63a435e6f1..d8d1a83998 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
@@ -384,7 +384,12 @@ public class RuleChainController extends BaseController {
                 }
                 engine = new RuleNodeTbelScriptEngine(getTenantId(), tbelInvokeService, script, argNames);
             }
-            TbMsg inMsg = TbMsg.newMsg(msgType, null, new TbMsgMetaData(metadata), TbMsgDataType.JSON, data);
+            TbMsg inMsg = TbMsg.newMsg()
+                    .type(msgType)
+                    .copyMetaData(new TbMsgMetaData(metadata))
+                    .dataType(TbMsgDataType.JSON)
+                    .data(data)
+                    .build();
             switch (scriptType) {
                 case "update":
                     output = msgToOutput(engine.executeUpdateAsync(inMsg).get(TIMEOUT, TimeUnit.SECONDS));
diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleEngineController.java b/application/src/main/java/org/thingsboard/server/controller/RuleEngineController.java
index 8cda3d2212..f1a272ac14 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RuleEngineController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RuleEngineController.java
@@ -169,7 +169,14 @@ public class RuleEngineController extends BaseController {
                     metaData.put("serviceId", serviceInfoProvider.getServiceId());
                     metaData.put("requestUUID", requestId.toString());
                     metaData.put("expirationTime", Long.toString(expTime));
-                    TbMsg msg = TbMsg.newMsg(queueName, TbMsgType.REST_API_REQUEST, entityId, currentUser.getCustomerId(), new TbMsgMetaData(metaData), requestBody);
+                    TbMsg msg = TbMsg.newMsg()
+                            .queueName(queueName)
+                            .type(TbMsgType.REST_API_REQUEST)
+                            .originator(entityId)
+                            .customerId(currentUser.getCustomerId())
+                            .copyMetaData(new TbMsgMetaData(metaData))
+                            .data(requestBody)
+                            .build();
                     ruleEngineCallService.processRestApiCallToRuleEngine(currentUser.getTenantId(), requestId, msg, queueName != null,
                             reply -> reply(new LocalRequestMetaData(msg, currentUser, result), reply));
                 }
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 b1733a9af0..fa69c99245 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
@@ -47,6 +47,10 @@ 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.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.TimeseriesDeleteRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
@@ -399,7 +403,7 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityAttributesV2(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope")AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope") AttributeScope scope,
             @io.swagger.v3.oas.annotations.parameters.RequestBody(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return saveAttributes(getTenantId(), entityId, scope, request);
@@ -423,8 +427,8 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityTelemetry(
             @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 {
+            @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);
     }
@@ -447,9 +451,9 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityTelemetryWithTTL(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = TELEMETRY_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = "ANY")) @PathVariable("scope")String scope,
-                    @Parameter(description = "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 {
+            @Parameter(description = TELEMETRY_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = "ANY")) @PathVariable("scope") String 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);
     }
@@ -518,19 +522,25 @@ public class TelemetryController extends BaseController {
             for (String key : keys) {
                 deleteTsKvQueries.add(new BaseDeleteTsKvQuery(key, deleteFromTs, deleteToTs, rewriteLatestIfDeleted, deleteLatest));
             }
-            tsSubService.deleteTimeseriesAndNotify(tenantId, entityId, keys, deleteTsKvQueries, new FutureCallback<>() {
-                @Override
-                public void onSuccess(@Nullable Void tmp) {
-                    logTimeseriesDeleted(user, entityId, keys, deleteFromTs, deleteToTs, null);
-                    result.setResult(new ResponseEntity<>(HttpStatus.OK));
-                }
-
-                @Override
-                public void onFailure(Throwable t) {
-                    logTimeseriesDeleted(user, entityId, keys, deleteFromTs, deleteToTs, t);
-                    result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
-                }
-            });
+            tsSubService.deleteTimeseries(TimeseriesDeleteRequest.builder()
+                    .tenantId(tenantId)
+                    .entityId(entityId)
+                    .keys(keys)
+                    .deleteHistoryQueries(deleteTsKvQueries)
+                    .callback(new FutureCallback<>() {
+                        @Override
+                        public void onSuccess(@Nullable List<String> tmp) {
+                            logTimeseriesDeleted(user, entityId, keys, deleteFromTs, deleteToTs, null);
+                            result.setResult(new ResponseEntity<>(HttpStatus.OK));
+                        }
+
+                        @Override
+                        public void onFailure(Throwable t) {
+                            logTimeseriesDeleted(user, entityId, keys, deleteFromTs, deleteToTs, t);
+                            result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
+                        }
+                    })
+                    .build());
         });
     }
 
@@ -550,8 +560,8 @@ public class TelemetryController extends BaseController {
     @ResponseBody
     public DeferredResult<ResponseEntity> deleteDeviceAttributes(
             @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable(DEVICE_ID) String deviceIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope")AttributeScope scope,
-                    @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION, required = true)@RequestParam(name = "keys")String keysStr) throws ThingsboardException {
+            @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);
     }
@@ -573,8 +583,8 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> deleteEntityAttributes(
             @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 {
+            @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);
     }
@@ -587,24 +597,30 @@ public class TelemetryController extends BaseController {
         SecurityUser user = getCurrentUser();
 
         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));
-                }
-            });
+            tsSubService.deleteAttributes(AttributesDeleteRequest.builder()
+                    .tenantId(tenantId)
+                    .entityId(entityId)
+                    .scope(scope)
+                    .keys(keys)
+                    .callback(new FutureCallback<>() {
+                        @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));
+                        }
+                    })
+                    .build());
         });
     }
 
@@ -624,19 +640,25 @@ public class TelemetryController extends BaseController {
             }
             SecurityUser user = getCurrentUser();
             return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.WRITE_ATTRIBUTES, entityIdSrc, (result, tenantId, entityId) -> {
-                tsSubService.saveAndNotify(tenantId, entityId, scope, attributes, new FutureCallback<Void>() {
-                    @Override
-                    public void onSuccess(@Nullable Void tmp) {
-                        logAttributesUpdated(user, entityId, scope, attributes, null);
-                        result.setResult(new ResponseEntity(HttpStatus.OK));
-                    }
-
-                    @Override
-                    public void onFailure(Throwable t) {
-                        logAttributesUpdated(user, entityId, scope, attributes, t);
-                        AccessValidator.handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR);
-                    }
-                });
+                tsSubService.saveAttributes(AttributesSaveRequest.builder()
+                        .tenantId(tenantId)
+                        .entityId(entityId)
+                        .scope(scope)
+                        .entries(attributes)
+                        .callback(new FutureCallback<>() {
+                            @Override
+                            public void onSuccess(@Nullable Void tmp) {
+                                logAttributesUpdated(user, entityId, scope, attributes, null);
+                                result.setResult(new ResponseEntity(HttpStatus.OK));
+                            }
+
+                            @Override
+                            public void onFailure(Throwable t) {
+                                logAttributesUpdated(user, entityId, scope, attributes, t);
+                                AccessValidator.handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR);
+                            }
+                        })
+                        .build());
             });
         } else {
             return getImmediateDeferredResult("Request is not a JSON object", HttpStatus.BAD_REQUEST);
@@ -672,19 +694,26 @@ public class TelemetryController extends BaseController {
                 TenantProfile tenantProfile = tenantProfileCache.get(tenantId);
                 tenantTtl = TimeUnit.DAYS.toSeconds(((DefaultTenantProfileConfiguration) tenantProfile.getProfileData().getConfiguration()).getDefaultStorageTtlDays());
             }
-            tsSubService.saveAndNotify(tenantId, user.getCustomerId(), entityId, entries, tenantTtl, new FutureCallback<Void>() {
-                @Override
-                public void onSuccess(@Nullable Void tmp) {
-                    logTelemetryUpdated(user, entityId, entries, null);
-                    result.setResult(new ResponseEntity(HttpStatus.OK));
-                }
-
-                @Override
-                public void onFailure(Throwable t) {
-                    logTelemetryUpdated(user, entityId, entries, t);
-                    AccessValidator.handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR);
-                }
-            });
+            tsSubService.saveTimeseries(TimeseriesSaveRequest.builder()
+                    .tenantId(tenantId)
+                    .customerId(user.getCustomerId())
+                    .entityId(entityId)
+                    .entries(entries)
+                    .ttl(tenantTtl)
+                    .callback(new FutureCallback<Void>() {
+                        @Override
+                        public void onSuccess(@Nullable Void tmp) {
+                            logTelemetryUpdated(user, entityId, entries, null);
+                            result.setResult(new ResponseEntity(HttpStatus.OK));
+                        }
+
+                        @Override
+                        public void onFailure(Throwable t) {
+                            logTelemetryUpdated(user, entityId, entries, t);
+                            AccessValidator.handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR);
+                        }
+                    })
+                    .build());
         });
     }
 
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 e4973a71c3..2c61ecac79 100644
--- a/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
@@ -118,7 +118,7 @@ public class WidgetTypeController extends AutoCommitController {
             @PathVariable("widgetTypeId") String strWidgetTypeId) throws ThingsboardException {
         checkParameter("widgetTypeId", strWidgetTypeId);
         WidgetTypeId widgetTypeId = new WidgetTypeId(toUUID(strWidgetTypeId));
-        return new WidgetTypeInfo(checkWidgetTypeId(widgetTypeId, Operation.READ));
+        return checkWidgetTypeInfoId(widgetTypeId, Operation.READ);
     }
 
     @ApiOperation(value = "Create Or Update Widget Type (saveWidgetType)",
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 622c0ab2dc..ea4c059222 100644
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -35,8 +35,6 @@ import org.thingsboard.server.service.install.migrate.TsLatestMigrateService;
 import org.thingsboard.server.service.install.update.CacheCleanupService;
 import org.thingsboard.server.service.install.update.DataUpdateService;
 
-import static org.thingsboard.server.service.install.update.DefaultDataUpdateService.getEnv;
-
 @Service
 @Profile("install")
 @Slf4j
@@ -99,8 +97,6 @@ public class ThingsboardInstallService {
                 if ("cassandra-latest-to-postgres".equals(upgradeFromVersion)) {
                     log.info("Migrating ThingsBoard latest timeseries data from cassandra to SQL database ...");
                     latestMigrateService.migrate();
-                } else if (upgradeFromVersion.equals("3.9.0-resources")) {
-                    installScripts.updateResourcesUsage();
                 } else {
                     // TODO DON'T FORGET to update SUPPORTED_VERSIONS_FROM in DefaultDatabaseSchemaSettingsService
                     databaseSchemaVersionService.validateSchemaSettings();
@@ -118,25 +114,16 @@ public class ThingsboardInstallService {
                     entityDatabaseSchemaService.createOrUpdateDeviceInfoView(persistToTelemetry);
                     // Creates missing indexes.
                     entityDatabaseSchemaService.createDatabaseIndexes();
-                    // Runs upgrade scripts that are not possible in plain SQL.
+
                     // TODO: cleanup update code after each release
-                    if (!getEnv("SKIP_RESOURCES_USAGE_MIGRATION", false)) {
-                        installScripts.setUpdateResourcesUsage(true);
-                    } else {
-                        log.info("Skipping resources usage migration. Run the upgrade with fromVersion as '3.9.0-resources' to migrate");
-                    }
-                    if (installScripts.isUpdateResourcesUsage()) {
-                        installScripts.updateResourcesUsage();
-                    }
+
+                    // Runs upgrade scripts that are not possible in plain SQL.
                     dataUpdateService.updateData();
                     log.info("Updating system data...");
                     dataUpdateService.upgradeRuleNodes();
                     systemDataLoaderService.loadSystemWidgets();
                     installScripts.loadSystemLwm2mResources();
                     installScripts.loadSystemImagesAndResources();
-                    if (installScripts.isUpdateImages()) {
-                        installScripts.updateImages();
-                    }
                     databaseSchemaVersionService.updateSchemaVersion();
                 }
                 log.info("Upgrade finished successfully!");
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 ab6d32fb44..868adf645a 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
@@ -172,7 +172,14 @@ public class EntityActionService {
                 if (tenantId != null && !tenantId.isSysTenantId()) {
                     processNotificationRules(tenantId, entityId, entity, actionType, user, additionalInfo);
                 }
-                TbMsg tbMsg = TbMsg.newMsg(msgType.get(), entityId, customerId, metaData, TbMsgDataType.JSON, JacksonUtil.toString(entityNode));
+                TbMsg tbMsg = TbMsg.newMsg()
+                        .type(msgType.get())
+                        .originator(entityId)
+                        .customerId(customerId)
+                        .copyMetaData(metaData)
+                        .dataType(TbMsgDataType.JSON)
+                        .data(JacksonUtil.toString(entityNode))
+                        .build();
                 tbClusterService.pushMsgToRuleEngine(tenantId, entityId, tbMsg, null);
             } catch (Exception e) {
                 log.warn("[{}] Failed to push entity action to rule engine: {}", entityId, actionType, e);
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 60bf529ace..3a351528e4 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
@@ -27,6 +27,7 @@ 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.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.ApiFeature;
 import org.thingsboard.server.common.data.ApiUsageRecordKey;
 import org.thingsboard.server.common.data.ApiUsageRecordState;
@@ -91,9 +92,9 @@ import java.util.stream.Collectors;
 public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService<EntityId> implements TbApiUsageStateService {
 
     public static final String HOURLY = "Hourly";
-    public static final FutureCallback<Integer> VOID_CALLBACK = new FutureCallback<Integer>() {
+    public static final FutureCallback<Void> VOID_CALLBACK = new FutureCallback<Void>() {
         @Override
-        public void onSuccess(@Nullable Integer result) {
+        public void onSuccess(@Nullable Void result) {
         }
 
         @Override
@@ -214,7 +215,12 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
             updateLock.unlock();
         }
         log.trace("[{}][{}] Saving new stats: {}", tenantId, ownerId, updatedEntries);
-        tsWsService.saveAndNotifyInternal(tenantId, usageState.getApiUsageState().getId(), updatedEntries, VOID_CALLBACK);
+        tsWsService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                .tenantId(tenantId)
+                .entityId(usageState.getApiUsageState().getId())
+                .entries(updatedEntries)
+                .callback(VOID_CALLBACK)
+                .build());
         if (!result.isEmpty()) {
             persistAndNotify(usageState, result);
         }
@@ -321,7 +327,12 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
             }
         }
         if (!profileThresholds.isEmpty()) {
-            tsWsService.saveAndNotifyInternal(tenantId, id, profileThresholds, VOID_CALLBACK);
+            tsWsService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                    .tenantId(tenantId)
+                    .entityId(id)
+                    .entries(profileThresholds)
+                    .callback(VOID_CALLBACK)
+                    .build());
         }
     }
 
@@ -348,7 +359,12 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
         long ts = System.currentTimeMillis();
         List<TsKvEntry> stateTelemetry = new ArrayList<>();
         result.forEach((apiFeature, aState) -> stateTelemetry.add(new BasicTsKvEntry(ts, new StringDataEntry(apiFeature.getApiStateKey(), aState.name()))));
-        tsWsService.saveAndNotifyInternal(state.getTenantId(), state.getApiUsageState().getId(), stateTelemetry, VOID_CALLBACK);
+        tsWsService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                .tenantId(state.getTenantId())
+                .entityId(state.getApiUsageState().getId())
+                .entries(stateTelemetry)
+                .callback(VOID_CALLBACK)
+                .build());
 
         if (state.getEntityType() == EntityType.TENANT && !state.getEntityId().equals(TenantId.SYS_TENANT_ID)) {
             String email = tenantService.findTenantById(state.getTenantId()).getEmail();
@@ -436,7 +452,12 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
                 .map(key -> new BasicTsKvEntry(state.getCurrentCycleTs(), new LongDataEntry(key.getApiCountKey(), 0L)))
                 .collect(Collectors.toList());
 
-        tsWsService.saveAndNotifyInternal(state.getTenantId(), state.getApiUsageState().getId(), counts, VOID_CALLBACK);
+        tsWsService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                .tenantId(state.getTenantId())
+                .entityId(state.getApiUsageState().getId())
+                .entries(counts)
+                .callback(VOID_CALLBACK)
+                .build());
     }
 
     BaseApiUsageState getOrFetchState(TenantId tenantId, EntityId ownerId) {
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 a77b7d0874..f82f4c74d5 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
@@ -28,6 +28,8 @@ import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
@@ -37,7 +39,6 @@ import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
-import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BooleanDataEntry;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.customer.CustomerService;
@@ -178,11 +179,12 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
                 return Futures.immediateFuture(new ReclaimResult(unassignedCustomer));
             }
             SettableFuture<ReclaimResult> result = SettableFuture.create();
-            telemetryService.saveAndNotify(
-                    tenantId, savedDevice.getId(), AttributeScope.SERVER_SCOPE, List.of(
-                            new BaseAttributeKvEntry(new BooleanDataEntry(CLAIM_ATTRIBUTE_NAME, true), System.currentTimeMillis())
-                    ),
-                    new FutureCallback<>() {
+            telemetryService.saveAttributes(AttributesSaveRequest.builder()
+                    .tenantId(tenantId)
+                    .entityId(savedDevice.getId())
+                    .scope(AttributeScope.SERVER_SCOPE)
+                    .entry(new BooleanDataEntry(CLAIM_ATTRIBUTE_NAME, true))
+                    .callback(new FutureCallback<>() {
                         @Override
                         public void onSuccess(@Nullable Void tmp) {
                             result.set(new ReclaimResult(unassignedCustomer));
@@ -192,7 +194,8 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
                         public void onFailure(Throwable t) {
                             result.setException(t);
                         }
-                    });
+                    })
+                    .build());
             return result;
         }
         cacheEviction(device.getId());
@@ -221,18 +224,13 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
             cache.evict(data.getKey());
         }
         SettableFuture<Void> result = SettableFuture.create();
-        telemetryService.deleteAndNotify(device.getTenantId(),
-                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);
-                    }
-
-                    @Override
-                    public void onFailure(Throwable t) {
-                        result.setException(t);
-                    }
-                });
+        telemetryService.deleteAttributes(AttributesDeleteRequest.builder()
+                .tenantId(device.getTenantId())
+                .entityId(device.getId())
+                .scope(AttributeScope.SERVER_SCOPE)
+                .keys(Arrays.asList(CLAIM_ATTRIBUTE_NAME, CLAIM_DATA_ATTRIBUTE_NAME))
+                .future(result)
+                .build());
         return result;
     }
 
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 f5b6411bf7..0fddcff793 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
@@ -253,7 +253,13 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
     private void pushProvisionEventToRuleEngine(ProvisionRequest request, Device device, TbMsgType type) {
         try {
             JsonNode entityNode = JacksonUtil.valueToTree(request);
-            TbMsg msg = TbMsg.newMsg(type, device.getId(), device.getCustomerId(), createTbMsgMetaData(device), JacksonUtil.toString(entityNode));
+            TbMsg msg = TbMsg.newMsg()
+                    .type(type)
+                    .originator(device.getId())
+                    .customerId(device.getCustomerId())
+                    .copyMetaData(createTbMsgMetaData(device))
+                    .data(JacksonUtil.toString(entityNode))
+                    .build();
             sendToRuleEngine(device.getTenantId(), msg, null);
         } catch (IllegalArgumentException e) {
             log.warn("[{}] Failed to push device action to rule engine: {}", device.getId(), type, e);
@@ -263,7 +269,13 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
     private void pushDeviceCreatedEventToRuleEngine(Device device) {
         try {
             ObjectNode entityNode = JacksonUtil.OBJECT_MAPPER.valueToTree(device);
-            TbMsg msg = TbMsg.newMsg(TbMsgType.ENTITY_CREATED, device.getId(), device.getCustomerId(), createTbMsgMetaData(device), JacksonUtil.OBJECT_MAPPER.writeValueAsString(entityNode));
+            TbMsg msg = TbMsg.newMsg()
+                    .type(TbMsgType.ENTITY_CREATED)
+                    .originator(device.getId())
+                    .customerId(device.getCustomerId())
+                    .copyMetaData(createTbMsgMetaData(device))
+                    .data(JacksonUtil.OBJECT_MAPPER.writeValueAsString(entityNode))
+                    .build();
             sendToRuleEngine(device.getTenantId(), msg, null);
         } catch (JsonProcessingException | IllegalArgumentException e) {
             log.warn("[{}] Failed to push device action to rule engine: {}", device.getId(), TbMsgType.ENTITY_CREATED.name(), e);
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 471c47dafc..9f7ace9df8 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
@@ -32,6 +32,8 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.cache.TbTransactionalCache;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.AttributeScope;
@@ -41,7 +43,6 @@ import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
 import org.thingsboard.server.common.data.kv.BooleanDataEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
 import org.thingsboard.server.common.data.msg.TbMsgType;
@@ -68,7 +69,6 @@ import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -509,24 +509,40 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
     private void save(TenantId tenantId, EdgeId edgeId, String key, long value) {
         log.debug("[{}][{}] Updating long edge telemetry [{}] [{}]", tenantId, edgeId, key, value);
         if (persistToTelemetry) {
-            tsSubService.saveAndNotify(
-                    tenantId, edgeId,
-                    Collections.singletonList(new BasicTsKvEntry(System.currentTimeMillis(), new LongDataEntry(key, value))),
-                    new AttributeSaveCallback(tenantId, edgeId, key, value));
+            tsSubService.saveTimeseries(TimeseriesSaveRequest.builder()
+                    .tenantId(tenantId)
+                    .entityId(edgeId)
+                    .entry(new LongDataEntry(key, value))
+                    .callback(new AttributeSaveCallback(tenantId, edgeId, key, value))
+                    .build());
         } else {
-            tsSubService.saveAttrAndNotify(tenantId, edgeId, AttributeScope.SERVER_SCOPE, key, value, new AttributeSaveCallback(tenantId, edgeId, key, value));
+            tsSubService.saveAttributes(AttributesSaveRequest.builder()
+                    .tenantId(tenantId)
+                    .entityId(edgeId)
+                    .scope(AttributeScope.SERVER_SCOPE)
+                    .entry(new LongDataEntry(key, value))
+                    .callback(new AttributeSaveCallback(tenantId, edgeId, key, value))
+                    .build());
         }
     }
 
     private void save(TenantId tenantId, EdgeId edgeId, String key, boolean value) {
         log.debug("[{}][{}] Updating boolean edge telemetry [{}] [{}]", tenantId, edgeId, key, value);
         if (persistToTelemetry) {
-            tsSubService.saveAndNotify(
-                    tenantId, edgeId,
-                    Collections.singletonList(new BasicTsKvEntry(System.currentTimeMillis(), new BooleanDataEntry(key, value))),
-                    new AttributeSaveCallback(tenantId, edgeId, key, value));
+            tsSubService.saveTimeseries(TimeseriesSaveRequest.builder()
+                    .tenantId(tenantId)
+                    .entityId(edgeId)
+                    .entry(new BooleanDataEntry(key, value))
+                    .callback(new AttributeSaveCallback(tenantId, edgeId, key, value))
+                    .build());
         } else {
-            tsSubService.saveAttrAndNotify(tenantId, edgeId, AttributeScope.SERVER_SCOPE, key, value, new AttributeSaveCallback(tenantId, edgeId, key, value));
+            tsSubService.saveAttributes(AttributesSaveRequest.builder()
+                    .tenantId(tenantId)
+                    .entityId(edgeId)
+                    .scope(AttributeScope.SERVER_SCOPE)
+                    .entry(new BooleanDataEntry(key, value))
+                    .callback(new AttributeSaveCallback(tenantId, edgeId, key, value))
+                    .build());
         }
     }
 
@@ -581,7 +597,13 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
                 md.putValue("edgeName", edge.getName());
                 md.putValue("edgeType", edge.getType());
             }
-            TbMsg tbMsg = TbMsg.newMsg(msgType, edgeId, md, TbMsgDataType.JSON, data);
+            TbMsg tbMsg = TbMsg.newMsg()
+                    .type(msgType)
+                    .originator(edgeId)
+                    .copyMetaData(md)
+                    .dataType(TbMsgDataType.JSON)
+                    .data(data)
+                    .build();
             clusterService.pushMsgToRuleEngine(tenantId, edgeId, tbMsg, null);
         } catch (Exception e) {
             log.warn("[{}][{}] Failed to push {}", tenantId, edge.getId(), msgType, e);
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 7426207a56..7fab0094b4 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
@@ -87,6 +87,7 @@ public class EdgeSyncCursor {
             fetchers.add(new SystemWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
             fetchers.add(new TenantWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
             fetchers.add(new OtaPackagesEdgeEventFetcher(ctx.getOtaPackageService()));
+            fetchers.add(new DeviceProfilesEdgeEventFetcher(ctx.getDeviceProfileService()));
             fetchers.add(new TenantResourcesEdgeEventFetcher(ctx.getResourceService()));
             fetchers.add(new OAuth2EdgeEventFetcher(ctx.getDomainService()));
         }
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 e448fbd937..50229f9440 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
@@ -120,7 +120,7 @@ public abstract class BaseEdgeProcessor {
     private boolean doSaveIfEdgeIsOffline(EdgeEventType type, EdgeEventActionType action) {
         return switch (action) {
             case TIMESERIES_UPDATED, ALARM_ACK, ALARM_CLEAR, ALARM_ASSIGNED, ALARM_UNASSIGNED, ADDED_COMMENT,
-                 UPDATED_COMMENT -> true;
+                 UPDATED_COMMENT, DELETED -> 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,
@@ -343,7 +343,14 @@ public abstract class BaseEdgeProcessor {
 
     protected void pushEntityEventToRuleEngine(TenantId tenantId, EntityId entityId, CustomerId customerId,
                                                TbMsgType msgType, String msgData, TbMsgMetaData metaData) {
-        TbMsg tbMsg = TbMsg.newMsg(msgType, entityId, customerId, metaData, TbMsgDataType.JSON, msgData);
+        TbMsg tbMsg = TbMsg.newMsg()
+                .type(msgType)
+                .originator(entityId)
+                .customerId(customerId)
+                .copyMetaData(metaData)
+                .dataType(TbMsgDataType.JSON)
+                .data(msgData)
+                .build();
         edgeCtx.getClusterService().pushMsgToRuleEngine(tenantId, entityId, tbMsg, new TbQueueCallback() {
             @Override
             public void onSuccess(TbQueueMsgMetadata metadata) {
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 e453cbc26f..c4a57e4a74 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
@@ -190,8 +190,13 @@ public abstract class DeviceEdgeProcessor extends BaseDeviceProcessor implements
             ObjectNode data = JacksonUtil.newObjectNode();
             data.put("method", deviceRpcCallMsg.getRequestMsg().getMethod());
             data.put("params", deviceRpcCallMsg.getRequestMsg().getParams());
-            TbMsg tbMsg = TbMsg.newMsg(TbMsgType.TO_SERVER_RPC_REQUEST, deviceId, null, metaData,
-                    TbMsgDataType.JSON, JacksonUtil.toString(data));
+            TbMsg tbMsg = TbMsg.newMsg()
+                    .type(TbMsgType.TO_SERVER_RPC_REQUEST)
+                    .originator(deviceId)
+                    .copyMetaData(metaData)
+                    .dataType(TbMsgDataType.JSON)
+                    .data(JacksonUtil.toString(data))
+                    .build();
             edgeCtx.getClusterService().pushMsgToRuleEngine(tenantId, deviceId, tbMsg, new TbQueueCallback() {
                 @Override
                 public void onSuccess(TbQueueMsgMetadata metadata) {
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 d94d4d8939..488fc3d8b9 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
@@ -31,6 +31,7 @@ import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
@@ -208,7 +209,15 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
             JsonObject json = JsonUtils.getJsonObject(tsKv.getKvList());
             metaData.putValue("ts", tsKv.getTs() + "");
             var defaultQueueAndRuleChain = getDefaultQueueNameAndRuleChainId(tenantId, entityId);
-            TbMsg tbMsg = TbMsg.newMsg(defaultQueueAndRuleChain.getKey(), TbMsgType.POST_TELEMETRY_REQUEST, entityId, customerId, metaData, gson.toJson(json), defaultQueueAndRuleChain.getValue(), null);
+            TbMsg tbMsg = TbMsg.newMsg()
+                    .queueName(defaultQueueAndRuleChain.getKey())
+                    .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                    .originator(entityId)
+                    .customerId(customerId)
+                    .copyMetaData(metaData)
+                    .data(gson.toJson(json))
+                    .ruleChainId(defaultQueueAndRuleChain.getValue())
+                    .build();
             edgeCtx.getClusterService().pushMsgToRuleEngine(tenantId, tbMsg.getOriginator(), tbMsg, new TbQueueCallback() {
                 @Override
                 public void onSuccess(TbQueueMsgMetadata metadata) {
@@ -252,7 +261,15 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
         SettableFuture<Void> futureToSet = SettableFuture.create();
         JsonObject json = JsonUtils.getJsonObject(msg.getKvList());
         var defaultQueueAndRuleChain = getDefaultQueueNameAndRuleChainId(tenantId, entityId);
-        TbMsg tbMsg = TbMsg.newMsg(defaultQueueAndRuleChain.getKey(), TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, customerId, metaData, gson.toJson(json), defaultQueueAndRuleChain.getValue(), null);
+        TbMsg tbMsg = TbMsg.newMsg()
+                .queueName(defaultQueueAndRuleChain.getKey())
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .customerId(customerId)
+                .copyMetaData(metaData)
+                .data(gson.toJson(json))
+                .ruleChainId(defaultQueueAndRuleChain.getValue())
+                .build();
         edgeCtx.getClusterService().pushMsgToRuleEngine(tenantId, tbMsg.getOriginator(), tbMsg, new TbQueueCallback() {
             @Override
             public void onSuccess(TbQueueMsgMetadata metadata) {
@@ -277,16 +294,36 @@ 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, AttributeScope.valueOf(scope), attributes, new FutureCallback<Void>() {
-            @Override
-            public void onSuccess(@Nullable Void tmp) {
-                var defaultQueueAndRuleChain = getDefaultQueueNameAndRuleChainId(tenantId, entityId);
-                TbMsg tbMsg = TbMsg.newMsg(defaultQueueAndRuleChain.getKey(), TbMsgType.ATTRIBUTES_UPDATED, entityId,
-                        customerId, metaData, gson.toJson(json), defaultQueueAndRuleChain.getValue(), null);
-                edgeCtx.getClusterService().pushMsgToRuleEngine(tenantId, tbMsg.getOriginator(), tbMsg, new TbQueueCallback() {
+        tsSubService.saveAttributes(AttributesSaveRequest.builder()
+                .tenantId(tenantId)
+                .entityId(entityId)
+                .scope(AttributeScope.valueOf(scope))
+                .entries(attributes)
+                .callback(new FutureCallback<>() {
                     @Override
-                    public void onSuccess(TbQueueMsgMetadata metadata) {
-                        futureToSet.set(null);
+                    public void onSuccess(@Nullable Void tmp) {
+                        var defaultQueueAndRuleChain = getDefaultQueueNameAndRuleChainId(tenantId, entityId);
+                        TbMsg tbMsg = TbMsg.newMsg()
+                                .queueName(defaultQueueAndRuleChain.getKey())
+                                .type(TbMsgType.ATTRIBUTES_UPDATED)
+                                .originator(entityId)
+                                .customerId(customerId)
+                                .copyMetaData(metaData)
+                                .data(gson.toJson(json))
+                                .ruleChainId(defaultQueueAndRuleChain.getValue())
+                                .build();
+                        edgeCtx.getClusterService().pushMsgToRuleEngine(tenantId, tbMsg.getOriginator(), tbMsg, new TbQueueCallback() {
+                            @Override
+                            public void onSuccess(TbQueueMsgMetadata metadata) {
+                                futureToSet.set(null);
+                            }
+
+                            @Override
+                            public void onFailure(Throwable t) {
+                                log.error("[{}] Can't process attributes update [{}]", tenantId, msg, t);
+                                futureToSet.setException(t);
+                            }
+                        });
                     }
 
                     @Override
@@ -294,15 +331,8 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
                         log.error("[{}] Can't process attributes update [{}]", tenantId, msg, t);
                         futureToSet.setException(t);
                     }
-                });
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                log.error("[{}] Can't process attributes update [{}]", tenantId, msg, t);
-                futureToSet.setException(t);
-            }
-        });
+                })
+                .build());
         return futureToSet;
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java b/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
index bce599c0e3..80368c085f 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
@@ -250,8 +250,14 @@ public class EntityStateSourcingListener {
     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);
+            TbMsg tbMsg = TbMsg.newMsg()
+                    .type(TbMsgType.ENTITY_ASSIGNED_FROM_TENANT)
+                    .originator(assignedDevice.getId())
+                    .customerId(assignedDevice.getCustomerId())
+                    .copyMetaData(getMetaDataForAssignedFrom(currentTenant))
+                    .dataType(TbMsgDataType.JSON)
+                    .data(data)
+                    .build();
             tbClusterService.pushMsgToRuleEngine(newTenantId, assignedDevice.getId(), tbMsg, null);
         }
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/dashboard/DashboardSyncService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/dashboard/DashboardSyncService.java
index 21eec71388..2adb6822dc 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/dashboard/DashboardSyncService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/dashboard/DashboardSyncService.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.service.entitiy.dashboard;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
@@ -30,6 +31,7 @@ import org.thingsboard.server.dao.widget.WidgetsBundleService;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.util.AfterStartUp;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.install.ProjectInfo;
 import org.thingsboard.server.service.sync.GitSyncService;
 import org.thingsboard.server.service.sync.vc.GitRepository.FileType;
 import org.thingsboard.server.service.sync.vc.GitRepository.RepoFile;
@@ -51,10 +53,11 @@ public class DashboardSyncService {
     private final ImageService imageService;
     private final WidgetsBundleService widgetsBundleService;
     private final PartitionService partitionService;
+    private final ProjectInfo projectInfo;
 
     @Value("${transport.gateway.dashboard.sync.repository_url:}")
     private String repoUrl;
-    @Value("${transport.gateway.dashboard.sync.branch:main}")
+    @Value("${transport.gateway.dashboard.sync.branch:}")
     private String branch;
     @Value("${transport.gateway.dashboard.sync.fetch_frequency:24}")
     private int fetchFrequencyHours;
@@ -64,6 +67,9 @@ public class DashboardSyncService {
 
     @AfterStartUp(order = AfterStartUp.REGULAR_SERVICE)
     public void init() throws Exception {
+        if (StringUtils.isBlank(branch)) {
+            branch = "release/" + projectInfo.getProjectVersion();
+        }
         gitSyncService.registerSync(REPO_KEY, repoUrl, branch, TimeUnit.HOURS.toMillis(fetchFrequencyHours), this::update);
     }
 
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 82877283cd..2c384aa493 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
@@ -25,6 +25,10 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ConcurrentReferenceHashMap;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.TimeseriesDeleteRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.EntityType;
@@ -55,6 +59,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
@@ -273,36 +278,41 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
             return Futures.transform(getAttrFuture, attributeKvEntries -> {
                 List<AttributeKvEntry> attributes;
                 if (attributeKvEntries != null && !attributeKvEntries.isEmpty()) {
-                    attributes =
-                            attributeKvEntries.stream()
-                                    .filter(attributeKvEntry -> {
-                                        long startTime = entityView.getStartTimeMs();
-                                        long endTime = entityView.getEndTimeMs();
-                                        long lastUpdateTs = attributeKvEntry.getLastUpdateTs();
-                                        return startTime == 0 && endTime == 0 ||
-                                                (endTime == 0 && startTime < lastUpdateTs) ||
-                                                (startTime == 0 && endTime > lastUpdateTs) ||
-                                                (startTime < lastUpdateTs && endTime > lastUpdateTs);
-                                    }).collect(Collectors.toList());
-                    tsSubService.saveAndNotify(entityView.getTenantId(), entityId, scope, attributes, new FutureCallback<Void>() {
-                        @Override
-                        public void onSuccess(@Nullable Void tmp) {
-                            try {
-                                logAttributesUpdated(entityView.getTenantId(), user, entityId, scope, attributes, null);
-                            } catch (ThingsboardException e) {
-                                log.error("Failed to log attribute updates", e);
-                            }
-                        }
-
-                        @Override
-                        public void onFailure(Throwable t) {
-                            try {
-                                logAttributesUpdated(entityView.getTenantId(), user, entityId, scope, attributes, t);
-                            } catch (ThingsboardException e) {
-                                log.error("Failed to log attribute updates", e);
-                            }
-                        }
-                    });
+                    attributes = attributeKvEntries.stream()
+                            .filter(attributeKvEntry -> {
+                                long startTime = entityView.getStartTimeMs();
+                                long endTime = entityView.getEndTimeMs();
+                                long lastUpdateTs = attributeKvEntry.getLastUpdateTs();
+                                return startTime == 0 && endTime == 0 ||
+                                        (endTime == 0 && startTime < lastUpdateTs) ||
+                                        (startTime == 0 && endTime > lastUpdateTs) ||
+                                        (startTime < lastUpdateTs && endTime > lastUpdateTs);
+                            }).collect(Collectors.toList());
+                    tsSubService.saveAttributes(AttributesSaveRequest.builder()
+                            .tenantId(entityView.getTenantId())
+                            .entityId(entityId)
+                            .scope(scope)
+                            .entries(attributes)
+                            .callback(new FutureCallback<>() {
+                                @Override
+                                public void onSuccess(@Nullable Void tmp) {
+                                    try {
+                                        logAttributesUpdated(entityView.getTenantId(), user, entityId, scope, attributes, null);
+                                    } catch (ThingsboardException e) {
+                                        log.error("Failed to log attribute updates", e);
+                                    }
+                                }
+
+                                @Override
+                                public void onFailure(Throwable t) {
+                                    try {
+                                        logAttributesUpdated(entityView.getTenantId(), user, entityId, scope, attributes, t);
+                                    } catch (ThingsboardException e) {
+                                        log.error("Failed to log attribute updates", e);
+                                    }
+                                }
+                            })
+                            .build());
                 }
                 return null;
             }, MoreExecutors.directExecutor());
@@ -334,15 +344,22 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         }, MoreExecutors.directExecutor());
         return Futures.transform(latestFuture, latestValues -> {
             if (latestValues != null && !latestValues.isEmpty()) {
-                tsSubService.saveLatestAndNotify(entityView.getTenantId(), entityId, latestValues, new FutureCallback<Void>() {
-                    @Override
-                    public void onSuccess(@Nullable Void tmp) {
-                    }
+                tsSubService.saveTimeseries(TimeseriesSaveRequest.builder()
+                        .tenantId(entityView.getTenantId())
+                        .entityId(entityId)
+                        .entries(latestValues)
+                        .strategy(TimeseriesSaveRequest.Strategy.LATEST_AND_WS)
+                        .callback(new FutureCallback<Void>() {
+                            @Override
+                            public void onSuccess(@Nullable Void tmp) {
+                            }
 
-                    @Override
-                    public void onFailure(Throwable t) {
-                    }
-                });
+                            @Override
+                            public void onFailure(Throwable t) {
+                                log.error("[{}][{}] Failed to save entity view latest timeseries: {}", tenantId, entityView.getId(), latestValues, t);
+                            }
+                        })
+                        .build());
             }
             return null;
         }, MoreExecutors.directExecutor());
@@ -352,27 +369,33 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         EntityViewId entityId = entityView.getId();
         SettableFuture<Void> resultFuture = SettableFuture.create();
         if (keys != null && !keys.isEmpty()) {
-            tsSubService.deleteAndNotify(entityView.getTenantId(), entityId, scope, keys, new FutureCallback<Void>() {
-                @Override
-                public void onSuccess(@Nullable Void tmp) {
-                    try {
-                        logAttributesDeleted(entityView.getTenantId(), user, entityId, scope, keys, null);
-                    } catch (ThingsboardException e) {
-                        log.error("Failed to log attribute delete", e);
-                    }
-                    resultFuture.set(tmp);
-                }
+            tsSubService.deleteAttributes(AttributesDeleteRequest.builder()
+                    .tenantId(entityView.getTenantId())
+                    .entityId(entityId)
+                    .scope(scope)
+                    .keys(keys)
+                    .callback(new FutureCallback<>() {
+                        @Override
+                        public void onSuccess(@Nullable Void tmp) {
+                            try {
+                                logAttributesDeleted(entityView.getTenantId(), user, entityId, scope, keys, null);
+                            } catch (ThingsboardException e) {
+                                log.error("Failed to log attribute delete", e);
+                            }
+                            resultFuture.set(tmp);
+                        }
 
-                @Override
-                public void onFailure(Throwable t) {
-                    try {
-                        logAttributesDeleted(entityView.getTenantId(), user, entityId, scope, keys, t);
-                    } catch (ThingsboardException e) {
-                        log.error("Failed to log attribute delete", e);
-                    }
-                    resultFuture.setException(t);
-                }
-            });
+                        @Override
+                        public void onFailure(Throwable t) {
+                            try {
+                                logAttributesDeleted(entityView.getTenantId(), user, entityId, scope, keys, t);
+                            } catch (ThingsboardException e) {
+                                log.error("Failed to log attribute delete", e);
+                            }
+                            resultFuture.setException(t);
+                        }
+                    })
+                    .build());
         } else {
             resultFuture.set(null);
         }
@@ -382,51 +405,32 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
     private ListenableFuture<Void> deleteLatestFromEntityView(EntityView entityView, List<String> keys, User user) {
         EntityViewId entityId = entityView.getId();
         SettableFuture<Void> resultFuture = SettableFuture.create();
-        if (keys != null && !keys.isEmpty()) {
-            tsSubService.deleteLatest(entityView.getTenantId(), entityId, keys, new FutureCallback<Void>() {
-                @Override
-                public void onSuccess(@Nullable Void tmp) {
-                    try {
-                        logTimeseriesDeleted(entityView.getTenantId(), user, entityId, keys, null);
-                    } catch (ThingsboardException e) {
-                        log.error("Failed to log timeseries delete", e);
-                    }
-                    resultFuture.set(tmp);
-                }
-
-                @Override
-                public void onFailure(Throwable t) {
-                    try {
-                        logTimeseriesDeleted(entityView.getTenantId(), user, entityId, keys, t);
-                    } catch (ThingsboardException e) {
-                        log.error("Failed to log timeseries delete", e);
-                    }
-                    resultFuture.setException(t);
-                }
-            });
-        } else {
-            tsSubService.deleteAllLatest(entityView.getTenantId(), entityId, new FutureCallback<Collection<String>>() {
-                @Override
-                public void onSuccess(@Nullable Collection<String> keys) {
-                    try {
-                        logTimeseriesDeleted(entityView.getTenantId(), user, entityId, new ArrayList<>(keys), null);
-                    } catch (ThingsboardException e) {
-                        log.error("Failed to log timeseries delete", e);
+        tsSubService.deleteTimeseries(TimeseriesDeleteRequest.builder()
+                .tenantId(entityView.getTenantId())
+                .entityId(entityId)
+                .keys(keys)
+                .callback(new FutureCallback<>() {
+                    @Override
+                    public void onSuccess(@Nullable List<String> result) {
+                        try {
+                            logTimeseriesDeleted(entityView.getTenantId(), user, entityId, result, null);
+                        } catch (ThingsboardException e) {
+                            log.error("Failed to log timeseries delete", e);
+                        }
+                        resultFuture.set(null);
                     }
-                    resultFuture.set(null);
-                }
 
-                @Override
-                public void onFailure(Throwable t) {
-                    try {
-                        logTimeseriesDeleted(entityView.getTenantId(), user, entityId, Collections.emptyList(), t);
-                    } catch (ThingsboardException e) {
-                        log.error("Failed to log timeseries delete", e);
+                    @Override
+                    public void onFailure(Throwable t) {
+                        try {
+                            logTimeseriesDeleted(entityView.getTenantId(), user, entityId, Optional.ofNullable(keys).orElse(Collections.emptyList()), t);
+                        } catch (ThingsboardException e) {
+                            log.error("Failed to log timeseries delete", e);
+                        }
+                        resultFuture.setException(t);
                     }
-                    resultFuture.setException(t);
-                }
-            });
-        }
+                })
+                .build());
         return resultFuture;
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/install/DefaultDatabaseSchemaSettingsService.java b/application/src/main/java/org/thingsboard/server/service/install/DefaultDatabaseSchemaSettingsService.java
index f1d9259e91..3b21685d22 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/DefaultDatabaseSchemaSettingsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultDatabaseSchemaSettingsService.java
@@ -17,9 +17,6 @@ package org.thingsboard.server.service.install;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.info.BuildProperties;
 import org.springframework.context.annotation.Profile;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -33,37 +30,29 @@ import java.util.List;
 @RequiredArgsConstructor
 public class DefaultDatabaseSchemaSettingsService implements DatabaseSchemaSettingsService {
 
-    private static final String CURRENT_PRODUCT = "CE";
     // This list should include all versions which are compatible for the upgrade.
     // The compatibility cycle usually breaks when we have some scripts written in Java that may not work after new release.
-    private static final List<String> SUPPORTED_VERSIONS_FOR_UPGRADE = List.of("3.8.0", "3.8.1");
+    private static final List<String> SUPPORTED_VERSIONS_FOR_UPGRADE = List.of("3.9.0");
 
-    private final BuildProperties buildProperties;
+    private final ProjectInfo projectInfo;
     private final JdbcTemplate jdbcTemplate;
 
-    @Value("${install.upgrade.from_version:}")
-    private String upgradeFromVersion;
-
     private String packageSchemaVersion;
     private String schemaVersionFromDb;
 
     @Override
     public void validateSchemaSettings() {
-        //TODO: remove after release (3.9.0)
-        createProductIfNotExists();
-
-        String dbSchemaVersion = getDbSchemaVersion();
-
         if (DefaultDataUpdateService.getEnv("SKIP_SCHEMA_VERSION_CHECK", false)) {
             log.info("Skipped DB schema version check due to SKIP_SCHEMA_VERSION_CHECK set to 'true'.");
             return;
         }
 
         String product = getProductFromDb();
-        if (!CURRENT_PRODUCT.equals(product)) {
-            onSchemaSettingsError(String.format("Upgrade failed: can't upgrade ThingsBoard %s database using ThingsBoard %s.", product, CURRENT_PRODUCT));
+        if (!projectInfo.getProductType().equals(product)) {
+            onSchemaSettingsError(String.format("Upgrade failed: can't upgrade ThingsBoard %s database using ThingsBoard %s.", product, projectInfo.getProductType()));
         }
 
+        String dbSchemaVersion = getDbSchemaVersion();
         if (dbSchemaVersion.equals(getPackageSchemaVersion())) {
             onSchemaSettingsError("Upgrade failed: database already upgraded to current version. You can set SKIP_SCHEMA_VERSION_CHECK to 'true' if force re-upgrade needed.");
         }
@@ -75,19 +64,11 @@ public class DefaultDatabaseSchemaSettingsService implements DatabaseSchemaSetti
         }
     }
 
-    @Deprecated(forRemoval = true, since = "3.9.0")
-    private void createProductIfNotExists() {
-        boolean isCommunityEdition = jdbcTemplate.queryForList(
-                "SELECT 1 FROM information_schema.tables WHERE table_name = 'integration'", Integer.class).isEmpty();
-        String product = isCommunityEdition ? "CE" : "PE";
-        jdbcTemplate.execute("ALTER TABLE tb_schema_settings ADD COLUMN IF NOT EXISTS product varchar(2) DEFAULT '" + product + "'");
-    }
-
     @Override
     public void createSchemaSettings() {
         Long schemaVersion = getSchemaVersionFromDb();
         if (schemaVersion == null) {
-            jdbcTemplate.execute("INSERT INTO tb_schema_settings (schema_version, product) VALUES (" + getPackageSchemaVersionForDb() + ", '" + CURRENT_PRODUCT + "')");
+            jdbcTemplate.execute("INSERT INTO tb_schema_settings (schema_version, product) VALUES (" + getPackageSchemaVersionForDb() + ", '" + projectInfo.getProductType() + "')");
         }
     }
 
@@ -99,7 +80,7 @@ public class DefaultDatabaseSchemaSettingsService implements DatabaseSchemaSetti
     @Override
     public String getPackageSchemaVersion() {
         if (packageSchemaVersion == null) {
-            packageSchemaVersion = buildProperties.getVersion().replaceAll("[^\\d.]", "");
+            packageSchemaVersion = projectInfo.getProjectVersion();
         }
         return packageSchemaVersion;
     }
@@ -107,15 +88,6 @@ public class DefaultDatabaseSchemaSettingsService implements DatabaseSchemaSetti
     @Override
     public String getDbSchemaVersion() {
         if (schemaVersionFromDb == null) {
-            if (StringUtils.isNotBlank(upgradeFromVersion)) {
-                /*
-                * TODO - Remove after the release of 3.9.0:
-                *  This a temporary workaround due to the issue that schema version in the
-                *  tb_schema_settings was set as 3.6.4 during the install of 3.8.1.
-                * */
-                schemaVersionFromDb = upgradeFromVersion;
-                return schemaVersionFromDb;
-            }
             Long version = getSchemaVersionFromDb();
             if (version == null) {
                 onSchemaSettingsError("Upgrade failed: the database schema version is missing.");
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 a6ccb85e11..b230be0d57 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
@@ -17,8 +17,6 @@ package org.thingsboard.server.service.install;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import lombok.Getter;
-import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -120,11 +118,6 @@ public class InstallScripts {
 
     @Autowired
     private ResourcesUpdater resourcesUpdater;
-    @Getter @Setter
-    private boolean updateImages = false;
-
-    @Getter @Setter
-    private boolean updateResourcesUsage = false;
 
     @Autowired
     private ImageService imageService;
@@ -395,14 +388,6 @@ public class InstallScripts {
         }
     }
 
-    public void updateImages() {
-        resourcesUpdater.updateWidgetsBundlesImages();
-        resourcesUpdater.updateWidgetTypesImages();
-        resourcesUpdater.updateDashboardsImages();
-        resourcesUpdater.updateDeviceProfilesImages();
-        resourcesUpdater.updateAssetProfilesImages();
-    }
-
     public void loadSystemImagesAndResources() {
         log.info("Loading system images and resources...");
         Stream<Path> dashboardsFiles = Stream.concat(listDir(Paths.get(getDataDir(), JSON_DIR, DEMO_DIR, DASHBOARDS_DIR)),
@@ -512,11 +497,6 @@ public class InstallScripts {
         }
     }
 
-    public void updateResourcesUsage() {
-        resourcesUpdater.updateDashboardsResources();
-        resourcesUpdater.updateWidgetsResources();
-    }
-
     private void loadSystemResources(Path dir, ResourceType resourceType, ResourceSubType resourceSubType) {
         listDir(dir).forEach(resourceFile -> {
             String resourceKey = resourceFile.getFileName().toString();
diff --git a/application/src/main/java/org/thingsboard/server/service/install/ProjectInfo.java b/application/src/main/java/org/thingsboard/server/service/install/ProjectInfo.java
new file mode 100644
index 0000000000..eddd4c8ccf
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/install/ProjectInfo.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.install;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.info.BuildProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class ProjectInfo {
+
+    private final BuildProperties buildProperties;
+
+    public String getProjectVersion() {
+        return buildProperties.getVersion().replaceAll("[^\\d.]", "");
+    }
+
+    public String getProductType() {
+        return "CE";
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
index e8622fae37..cea938bce9 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
@@ -34,7 +34,6 @@ import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.sql.JpaExecutorService;
 import org.thingsboard.server.service.component.ComponentDiscoveryService;
 import org.thingsboard.server.service.component.RuleNodeClassInfo;
-import org.thingsboard.server.service.install.InstallScripts;
 import org.thingsboard.server.utils.TbNodeUpgradeUtils;
 
 import java.util.ArrayList;
@@ -58,9 +57,6 @@ public class DefaultDataUpdateService implements DataUpdateService {
     @Autowired
     JpaExecutorService jpaExecutorService;
 
-    @Autowired
-    private InstallScripts installScripts;
-
     @Override
     public void updateData() throws Exception {
         log.info("Updating data ...");
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 54ca38ad78..3aedad3ddb 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,7 +20,10 @@ import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
@@ -54,7 +57,6 @@ import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
 import org.thingsboard.server.queue.provider.TbRuleEngineQueueFactory;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -128,7 +130,7 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
                     // Device was updated and new firmware is different from previous firmware.
                     send(device.getTenantId(), device.getId(), newFirmwareId, System.currentTimeMillis(), FIRMWARE);
                 }
-            } else if (oldFirmwareId != null){
+            } else if (oldFirmwareId != null) {
                 // Device was updated and new firmware is not set.
                 remove(device, FIRMWARE);
             }
@@ -155,7 +157,7 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
                     // Device was updated and new firmware is different from previous firmware.
                     send(device.getTenantId(), device.getId(), newSoftwareId, System.currentTimeMillis(), SOFTWARE);
                 }
-            } else if (oldSoftwareId != null){
+            } else if (oldSoftwareId != null) {
                 // Device was updated and new firmware is not set.
                 remove(device, SOFTWARE);
             }
@@ -261,17 +263,22 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
         telemetry.add(new BasicTsKvEntry(ts, new LongDataEntry(getTargetTelemetryKey(firmware.getType(), TS), ts)));
         telemetry.add(new BasicTsKvEntry(ts, new StringDataEntry(getTelemetryKey(firmware.getType(), STATE), OtaPackageUpdateStatus.QUEUED.name())));
 
-        telemetryService.saveAndNotify(tenantId, deviceId, telemetry, new FutureCallback<>() {
-            @Override
-            public void onSuccess(@Nullable Void tmp) {
-                log.trace("[{}] Success save firmware status!", deviceId);
-            }
+        telemetryService.saveTimeseries(TimeseriesSaveRequest.builder()
+                .tenantId(tenantId)
+                .entityId(deviceId)
+                .entries(telemetry)
+                .callback(new FutureCallback<Void>() {
+                    @Override
+                    public void onSuccess(@Nullable Void tmp) {
+                        log.trace("[{}] Success save firmware status!", deviceId);
+                    }
 
-            @Override
-            public void onFailure(Throwable t) {
-                log.error("[{}] Failed to save firmware status!", deviceId, t);
-            }
-        });
+                    @Override
+                    public void onFailure(Throwable t) {
+                        log.error("[{}] Failed to save firmware status!", deviceId, t);
+                    }
+                })
+                .build());
     }
 
 
@@ -282,19 +289,24 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
 
         BasicTsKvEntry status = new BasicTsKvEntry(System.currentTimeMillis(), new StringDataEntry(getTelemetryKey(otaPackageType, STATE), OtaPackageUpdateStatus.INITIATED.name()));
 
-        telemetryService.saveAndNotify(tenantId, deviceId, Collections.singletonList(status), new FutureCallback<>() {
-            @Override
-            public void onSuccess(@Nullable Void tmp) {
-                log.trace("[{}] Success save telemetry with target {} for device!", deviceId, otaPackage);
-                updateAttributes(device, otaPackage, ts, tenantId, deviceId, otaPackageType);
-            }
+        telemetryService.saveTimeseries(TimeseriesSaveRequest.builder()
+                .tenantId(tenantId)
+                .entityId(deviceId)
+                .entry(status)
+                .callback(new FutureCallback<>() {
+                    @Override
+                    public void onSuccess(@Nullable Void tmp) {
+                        log.trace("[{}] Success save telemetry with target {} for device!", deviceId, otaPackage);
+                        updateAttributes(device, otaPackage, ts, tenantId, deviceId, otaPackageType);
+                    }
 
-            @Override
-            public void onFailure(Throwable t) {
-                log.error("[{}] Failed to save telemetry with target {} for device!", deviceId, otaPackage, t);
-                updateAttributes(device, otaPackage, ts, tenantId, deviceId, otaPackageType);
-            }
-        });
+                    @Override
+                    public void onFailure(Throwable t) {
+                        log.error("[{}] Failed to save telemetry with target {} for device!", deviceId, otaPackage, t);
+                        updateAttributes(device, otaPackage, ts, tenantId, deviceId, otaPackageType);
+                    }
+                })
+                .build());
     }
 
     private void updateAttributes(Device device, OtaPackageInfo otaPackage, long ts, TenantId tenantId, DeviceId deviceId, OtaPackageType otaPackageType) {
@@ -336,17 +348,23 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
 
         remove(device, otaPackageType, attrToRemove);
 
-        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);
-            }
+        telemetryService.saveAttributes(AttributesSaveRequest.builder()
+                .tenantId(tenantId)
+                .entityId(deviceId)
+                .scope(AttributeScope.SHARED_SCOPE)
+                .entries(attributes)
+                .callback(new FutureCallback<>() {
+                    @Override
+                    public void onSuccess(@Nullable Void tmp) {
+                        log.trace("[{}] Success save attributes with target firmware!", deviceId);
+                    }
 
-            @Override
-            public void onFailure(Throwable t) {
-                log.error("[{}] Failed to save attributes with target firmware!", deviceId, t);
-            }
-        });
+                    @Override
+                    public void onFailure(Throwable t) {
+                        log.error("[{}] Failed to save attributes with target firmware!", deviceId, t);
+                    }
+                })
+                .build());
     }
 
     private void remove(Device device, OtaPackageType otaPackageType) {
@@ -354,8 +372,12 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
     }
 
     private void remove(Device device, OtaPackageType otaPackageType, List<String> attributesKeys) {
-        telemetryService.deleteAndNotify(device.getTenantId(), device.getId(), AttributeScope.SHARED_SCOPE, attributesKeys,
-                new FutureCallback<>() {
+        telemetryService.deleteAttributes(AttributesDeleteRequest.builder()
+                .tenantId(device.getTenantId())
+                .entityId(device.getId())
+                .scope(AttributeScope.SHARED_SCOPE)
+                .keys(attributesKeys)
+                .callback(new FutureCallback<>() {
                     @Override
                     public void onSuccess(@Nullable Void tmp) {
                         log.trace("[{}] Success remove target {} attributes!", device.getId(), otaPackageType);
@@ -366,6 +388,8 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
                     public void onFailure(Throwable t) {
                         log.error("[{}] Failed to remove target {} attributes!", device.getId(), otaPackageType, t);
                     }
-                });
+                })
+                .build());
     }
+
 }
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 301f8e8838..92ad0e446a 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
@@ -290,11 +290,16 @@ public class DefaultTbClusterService implements TbClusterService {
             boolean isQueueTransform = targetQueueName != null && !targetQueueName.equals(tbMsg.getQueueName());
 
             if (isRuleChainTransform && isQueueTransform) {
-                tbMsg = TbMsg.transformMsg(tbMsg, targetRuleChainId, targetQueueName);
+                tbMsg = tbMsg.transform()
+                        .queueName(targetQueueName)
+                        .ruleChainId(targetRuleChainId)
+                        .build();
             } else if (isRuleChainTransform) {
-                tbMsg = TbMsg.transformMsgRuleChainId(tbMsg, targetRuleChainId);
+                tbMsg = tbMsg.transform()
+                        .ruleChainId(targetRuleChainId)
+                        .build();
             } else if (isQueueTransform) {
-                tbMsg = TbMsg.transformMsgQueueName(tbMsg, targetQueueName);
+                tbMsg = tbMsg.transform(targetQueueName);
             }
         }
         return tbMsg;
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 e8cce43aa2..5ee741fd1f 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
@@ -183,7 +183,14 @@ public class DefaultTbCoreDeviceRpcService implements TbCoreDeviceRpcService {
         entityNode.put(DataConstants.ADDITIONAL_INFO, msg.getAdditionalInfo());
 
         try {
-            TbMsg tbMsg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, msg.getDeviceId(), Optional.ofNullable(currentUser).map(User::getCustomerId).orElse(null), metaData, TbMsgDataType.JSON, JacksonUtil.toString(entityNode));
+            TbMsg tbMsg = TbMsg.newMsg()
+                    .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                    .originator(msg.getDeviceId())
+                    .customerId(Optional.ofNullable(currentUser).map(User::getCustomerId).orElse(null))
+                    .copyMetaData(metaData)
+                    .dataType(TbMsgDataType.JSON)
+                    .data(JacksonUtil.toString(entityNode))
+                    .build();
             clusterService.pushMsgToRuleEngine(msg.getTenantId(), msg.getDeviceId(), tbMsg, null);
         } catch (IllegalArgumentException e) {
             throw new RuntimeException(e);
diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/TbRpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/TbRpcService.java
index 133818592e..8b4941323f 100644
--- a/application/src/main/java/org/thingsboard/server/service/rpc/TbRpcService.java
+++ b/application/src/main/java/org/thingsboard/server/service/rpc/TbRpcService.java
@@ -63,7 +63,12 @@ public class TbRpcService {
     }
 
     private void pushRpcMsgToRuleEngine(TenantId tenantId, Rpc rpc) {
-        TbMsg msg = TbMsg.newMsg(TbMsgType.valueOf("RPC_" + rpc.getStatus().name()), rpc.getDeviceId(), TbMsgMetaData.EMPTY, JacksonUtil.toString(rpc));
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.valueOf("RPC_" + rpc.getStatus().name()))
+                .originator(rpc.getDeviceId())
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.toString(rpc))
+                .build();
         tbClusterService.pushMsgToRuleEngine(tenantId, rpc.getDeviceId(), msg, null);
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/script/RuleNodeJsScriptEngine.java b/application/src/main/java/org/thingsboard/server/service/script/RuleNodeJsScriptEngine.java
index a022d6a5b1..c756e50de4 100644
--- a/application/src/main/java/org/thingsboard/server/service/script/RuleNodeJsScriptEngine.java
+++ b/application/src/main/java/org/thingsboard/server/service/script/RuleNodeJsScriptEngine.java
@@ -147,6 +147,10 @@ public class RuleNodeJsScriptEngine extends RuleNodeScriptEngine<JsInvokeService
         String newData = data != null ? data : msg.getData();
         TbMsgMetaData newMetadata = metadata != null ? new TbMsgMetaData(metadata) : msg.getMetaData().copy();
         String newMessageType = !StringUtils.isEmpty(messageType) ? messageType : msg.getType();
-        return TbMsg.transformMsg(msg, newMessageType, msg.getOriginator(), newMetadata, newData);
+        return msg.transform()
+                .type(newMessageType)
+                .metaData(newMetadata)
+                .data(newData)
+                .build();
     }
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/script/RuleNodeTbelScriptEngine.java b/application/src/main/java/org/thingsboard/server/service/script/RuleNodeTbelScriptEngine.java
index 39b2b3bc07..25f29a3374 100644
--- a/application/src/main/java/org/thingsboard/server/service/script/RuleNodeTbelScriptEngine.java
+++ b/application/src/main/java/org/thingsboard/server/service/script/RuleNodeTbelScriptEngine.java
@@ -156,7 +156,11 @@ public class RuleNodeTbelScriptEngine extends RuleNodeScriptEngine<TbelInvokeSer
         String newData = data != null ? data : msg.getData();
         TbMsgMetaData newMetadata = metadata != null ? new TbMsgMetaData(metadata) : msg.getMetaData().copy();
         String newMessageType = !StringUtils.isEmpty(messageType) ? messageType : msg.getType();
-        return TbMsg.transformMsg(msg, newMessageType, msg.getOriginator(), newMetadata, newData);
+        return msg.transform()
+                .type(newMessageType)
+                .metaData(newMetadata)
+                .data(newData)
+                .build();
     }
 
     private static <T> ListenableFuture<T> wrongResultType(Object result) {
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 6025e874b9..c58cb4fd5a 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
@@ -38,6 +38,8 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.ApiUsageRecordKey;
 import org.thingsboard.server.common.data.AttributeScope;
@@ -51,6 +53,7 @@ import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UUIDBased;
 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.KvEntry;
@@ -857,7 +860,14 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
             if (!persistToTelemetry) {
                 md.putValue(SCOPE, SERVER_SCOPE);
             }
-            TbMsg tbMsg = TbMsg.newMsg(msgType, stateData.getDeviceId(), stateData.getCustomerId(), md, TbMsgDataType.JSON, data);
+            TbMsg tbMsg = TbMsg.newMsg()
+                    .type(msgType)
+                    .originator(stateData.getDeviceId())
+                    .customerId(stateData.getCustomerId())
+                    .copyMetaData(md)
+                    .dataType(TbMsgDataType.JSON)
+                    .data(data)
+                    .build();
             clusterService.pushMsgToRuleEngine(stateData.getTenantId(), stateData.getDeviceId(), tbMsg, null);
         } catch (Exception e) {
             log.warn("[{}] Failed to push inactivity alarm: {}", stateData.getDeviceId(), state, e);
@@ -865,24 +875,30 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
     }
 
     private void save(DeviceId deviceId, String key, long value) {
-        if (persistToTelemetry) {
-            tsSubService.saveAndNotifyInternal(
-                    TenantId.SYS_TENANT_ID, deviceId,
-                    Collections.singletonList(new BasicTsKvEntry(getCurrentTimeMillis(), new LongDataEntry(key, value))),
-                    telemetryTtl, new TelemetrySaveCallback<>(deviceId, key, value));
-        } else {
-            tsSubService.saveAttrAndNotify(TenantId.SYS_TENANT_ID, deviceId, AttributeScope.SERVER_SCOPE, key, value, new TelemetrySaveCallback<>(deviceId, key, value));
-        }
+        save(deviceId, new LongDataEntry(key, value), getCurrentTimeMillis());
     }
 
     private void save(DeviceId deviceId, String key, boolean value) {
+        save(deviceId, new BooleanDataEntry(key, value), getCurrentTimeMillis());
+    }
+
+    private void save(DeviceId deviceId, KvEntry kvEntry, long ts) {
         if (persistToTelemetry) {
-            tsSubService.saveAndNotifyInternal(
-                    TenantId.SYS_TENANT_ID, deviceId,
-                    Collections.singletonList(new BasicTsKvEntry(getCurrentTimeMillis(), new BooleanDataEntry(key, value))),
-                    telemetryTtl, new TelemetrySaveCallback<>(deviceId, key, value));
+            tsSubService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                    .tenantId(TenantId.SYS_TENANT_ID)
+                    .entityId(deviceId)
+                    .entry(new BasicTsKvEntry(ts, kvEntry))
+                    .ttl(telemetryTtl)
+                    .callback(new TelemetrySaveCallback<>(deviceId, kvEntry))
+                    .build());
         } else {
-            tsSubService.saveAttrAndNotify(TenantId.SYS_TENANT_ID, deviceId, AttributeScope.SERVER_SCOPE, key, value, new TelemetrySaveCallback<>(deviceId, key, value));
+            tsSubService.saveAttributes(AttributesSaveRequest.builder()
+                    .tenantId(TenantId.SYS_TENANT_ID)
+                    .entityId(deviceId)
+                    .scope(AttributeScope.SERVER_SCOPE)
+                    .entry(new BaseAttributeKvEntry(ts, kvEntry))
+                    .callback(new TelemetrySaveCallback<>(deviceId, kvEntry))
+                    .build());
         }
     }
 
@@ -892,23 +908,21 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
 
     private static class TelemetrySaveCallback<T> implements FutureCallback<T> {
         private final DeviceId deviceId;
-        private final String key;
-        private final Object value;
+        private final KvEntry kvEntry;
 
-        TelemetrySaveCallback(DeviceId deviceId, String key, Object value) {
+        TelemetrySaveCallback(DeviceId deviceId, KvEntry kvEntry) {
             this.deviceId = deviceId;
-            this.key = key;
-            this.value = value;
+            this.kvEntry = kvEntry;
         }
 
         @Override
         public void onSuccess(@Nullable T result) {
-            log.trace("[{}] Successfully updated attribute [{}] with value [{}]", deviceId, key, value);
+            log.trace("[{}] Successfully updated entry {}", deviceId, kvEntry);
         }
 
         @Override
         public void onFailure(Throwable t) {
-            log.warn("[{}] Failed to update attribute [{}] with value [{}]", deviceId, key, value, t);
+            log.warn("[{}] Failed to update entry {}", deviceId, kvEntry, t);
         }
     }
 }
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 e0c78e0afa..91766c0f5d 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
@@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.id.QueueStatsId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
@@ -37,7 +38,6 @@ import org.thingsboard.server.queue.util.TbRuleEngineComponent;
 import org.thingsboard.server.service.queue.TbRuleEngineConsumerStats;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -53,9 +53,9 @@ import java.util.stream.Collectors;
 public class DefaultRuleEngineStatisticsService implements RuleEngineStatisticsService {
 
     public static final String RULE_ENGINE_EXCEPTION = "ruleEngineException";
-    public static final FutureCallback<Integer> CALLBACK = new FutureCallback<Integer>() {
+    public static final FutureCallback<Void> CALLBACK = new FutureCallback<Void>() {
         @Override
-        public void onSuccess(@Nullable Integer result) {
+        public void onSuccess(@Nullable Void result) {
 
         }
 
@@ -89,7 +89,13 @@ public class DefaultRuleEngineStatisticsService implements RuleEngineStatisticsS
                     if (!tsList.isEmpty()) {
                         long ttl = apiLimitService.getLimit(tenantId, DefaultTenantProfileConfiguration::getQueueStatsTtlDays);
                         ttl = TimeUnit.DAYS.toSeconds(ttl);
-                        tsService.saveAndNotifyInternal(tenantId, queueStatsId, tsList, ttl, CALLBACK);
+                        tsService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                                .tenantId(tenantId)
+                                .entityId(queueStatsId)
+                                .entries(tsList)
+                                .ttl(ttl)
+                                .callback(CALLBACK)
+                                .build());
                     }
                 }
             } catch (Exception e) {
@@ -103,7 +109,13 @@ 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, getQueueStatsId(tenantId, queueName), Collections.singletonList(tsKv), ttl, CALLBACK);
+                tsService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                        .tenantId(tenantId)
+                        .entityId(getQueueStatsId(tenantId, queueName))
+                        .entry(tsKv)
+                        .ttl(ttl)
+                        .callback(CALLBACK)
+                        .build());
             } catch (Exception e2) {
                 if (!"Asset is referencing to non-existent tenant!".equalsIgnoreCase(e2.getMessage())) {
                     log.debug("[{}] Failed to store the statistics", tenantId, e2);
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 50d8b9c371..3edb7c9be0 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
@@ -32,6 +32,8 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.thingsboard.common.util.DonAsynchron;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
@@ -206,20 +208,27 @@ public abstract class AbstractBulkImportService<E extends HasId<? extends Entity
         accessValidator.validateEntityAndCallback(user, Operation.WRITE_TELEMETRY, entity.getId(), (result, tenantId, entityId) -> {
             TenantProfile tenantProfile = tenantProfileCache.get(tenantId);
             long tenantTtl = TimeUnit.DAYS.toSeconds(((DefaultTenantProfileConfiguration) tenantProfile.getProfileData().getConfiguration()).getDefaultStorageTtlDays());
-            tsSubscriptionService.saveAndNotify(tenantId, user.getCustomerId(), entityId, timeseries, tenantTtl, new FutureCallback<Void>() {
-                @Override
-                public void onSuccess(@Nullable Void tmp) {
-                    entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null, null,
-                            ActionType.TIMESERIES_UPDATED, null, timeseries);
-                }
-
-                @Override
-                public void onFailure(Throwable t) {
-                    entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null, null,
-                            ActionType.TIMESERIES_UPDATED, BaseController.toException(t), timeseries);
-                    throw new RuntimeException(t);
-                }
-            });
+            tsSubscriptionService.saveTimeseries(TimeseriesSaveRequest.builder()
+                    .tenantId(tenantId)
+                    .customerId(user.getCustomerId())
+                    .entityId(entityId)
+                    .entries(timeseries)
+                    .ttl(tenantTtl)
+                    .callback(new FutureCallback<>() {
+                        @Override
+                        public void onSuccess(@Nullable Void tmp) {
+                            entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null, null,
+                                    ActionType.TIMESERIES_UPDATED, null, timeseries);
+                        }
+
+                        @Override
+                        public void onFailure(Throwable t) {
+                            entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null, null,
+                                    ActionType.TIMESERIES_UPDATED, BaseController.toException(t), timeseries);
+                            throw new RuntimeException(t);
+                        }
+                    })
+                    .build());
         });
     }
 
@@ -229,23 +238,27 @@ 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, AttributeScope.valueOf(scope), attributes, new FutureCallback<>() {
-
-                @Override
-                public void onSuccess(Void unused) {
-                    entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null,
-                            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),
-                            AttributeScope.valueOf(scope), attributes);
-                    throw new RuntimeException(throwable);
-                }
-
-            });
+            tsSubscriptionService.saveAttributes(AttributesSaveRequest.builder()
+                    .tenantId(tenantId)
+                    .entityId(entityId)
+                    .scope(AttributeScope.valueOf(scope))
+                    .entries(attributes)
+                    .callback(new FutureCallback<>() {
+                        @Override
+                        public void onSuccess(Void unused) {
+                            entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null,
+                                    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),
+                                    AttributeScope.valueOf(scope), attributes);
+                            throw new RuntimeException(throwable);
+                        }
+                    })
+                    .build());
         });
     }
 
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 f88844bd09..0d9c67823a 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
@@ -24,6 +24,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.ExportableEntity;
@@ -257,16 +258,22 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
                         })
                         .collect(Collectors.toList());
                 // fixme: attributes are saved outside the transaction
-                tsSubService.saveAndNotify(user.getTenantId(), entity.getId(), scope, attributeKvEntries, new FutureCallback<Void>() {
-                    @Override
-                    public void onSuccess(@Nullable Void unused) {
-                    }
+                tsSubService.saveAttributes(AttributesSaveRequest.builder()
+                        .tenantId(user.getTenantId())
+                        .entityId(entity.getId())
+                        .scope(scope)
+                        .entries(attributeKvEntries)
+                        .callback(new FutureCallback<>() {
+                            @Override
+                            public void onSuccess(@Nullable Void unused) {
+                            }
 
-                    @Override
-                    public void onFailure(Throwable thr) {
-                        log.error("Failed to import attributes for {} {}", entity.getId().getEntityType(), entity.getId(), thr);
-                    }
-                });
+                            @Override
+                            public void onFailure(Throwable thr) {
+                                log.error("Failed to import attributes for {} {}", entity.getId().getEntityType(), entity.getId(), thr);
+                            }
+                        })
+                        .build());
             });
         });
     }
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 4016352f2d..42d468575a 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
@@ -27,6 +27,7 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.rule.engine.api.SmsService;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.FeaturesInfo;
@@ -71,9 +72,9 @@ import static org.thingsboard.common.util.SystemUtil.getTotalMemory;
 @Slf4j
 public class DefaultSystemInfoService extends TbApplicationEventListener<PartitionChangeEvent> implements SystemInfoService {
 
-    public static final FutureCallback<Integer> CALLBACK = new FutureCallback<>() {
+    public static final FutureCallback<Void> CALLBACK = new FutureCallback<>() {
         @Override
-        public void onSuccess(@Nullable Integer result) {
+        public void onSuccess(@Nullable Void result) {
         }
 
         @Override
@@ -200,7 +201,13 @@ public class DefaultSystemInfoService extends TbApplicationEventListener<Partiti
 
     private void doSave(List<TsKvEntry> telemetry) {
         ApiUsageState apiUsageState = apiUsageStateClient.getApiUsageState(TenantId.SYS_TENANT_ID);
-        telemetryService.saveAndNotifyInternal(TenantId.SYS_TENANT_ID, apiUsageState.getId(), telemetry, systemInfoTtlSeconds, CALLBACK);
+        telemetryService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                .tenantId(TenantId.SYS_TENANT_ID)
+                .entityId(apiUsageState.getId())
+                .entries(telemetry)
+                .ttl(systemInfoTtlSeconds)
+                .callback(CALLBACK)
+                .build());
     }
 
     private List<SystemInfoData> getSystemData(ServiceInfo serviceInfo) {
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 5513c41929..cab2f18dc7 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
@@ -19,29 +19,28 @@ 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 com.google.common.util.concurrent.SettableFuture;
 import jakarta.annotation.Nullable;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.DonAsynchron;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
+import org.thingsboard.rule.engine.api.TimeseriesDeleteRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 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;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
-import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
-import org.thingsboard.server.common.data.kv.BooleanDataEntry;
-import org.thingsboard.server.common.data.kv.DeleteTsKvQuery;
-import org.thingsboard.server.common.data.kv.DoubleDataEntry;
-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.kv.TsKvLatestRemovingResult;
 import org.thingsboard.server.common.msg.queue.TbCallback;
@@ -54,8 +53,6 @@ import org.thingsboard.server.service.entitiy.entityview.TbEntityViewService;
 import org.thingsboard.server.service.subscription.TbSubscriptionUtils;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -64,13 +61,14 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.function.Consumer;
 
 /**
  * Created by ashvayka on 27.03.18.
  */
 @Service
 @Slf4j
-public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionService implements TelemetrySubscriptionService {
+public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionService implements TelemetrySubscriptionService, RuleEngineTelemetryService {
 
     private final AttributesService attrService;
     private final TimeseriesService tsService;
@@ -115,79 +113,100 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
     }
 
     @Override
-    public ListenableFuture<Void> saveAndNotify(TenantId tenantId, EntityId entityId, TsKvEntry ts) {
-        SettableFuture<Void> future = SettableFuture.create();
-        saveAndNotify(tenantId, entityId, Collections.singletonList(ts), new VoidFutureCallback(future));
-        return future;
+    public void saveTimeseries(TimeseriesSaveRequest request) {
+        TenantId tenantId = request.getTenantId();
+        EntityId entityId = request.getEntityId();
+        checkInternalEntity(entityId);
+        boolean sysTenant = TenantId.SYS_TENANT_ID.equals(tenantId) || tenantId == null;
+        if (sysTenant || !request.getStrategy().saveTimeseries() || apiUsageStateService.getApiUsageState(tenantId).isDbStorageEnabled()) {
+            KvUtils.validate(request.getEntries(), valueNoXssValidation);
+            ListenableFuture<Integer> future = saveTimeseriesInternal(request);
+            if (request.getStrategy().saveTimeseries()) {
+                FutureCallback<Integer> callback = getApiUsageCallback(tenantId, request.getCustomerId(), sysTenant, request.getCallback());
+                Futures.addCallback(future, callback, tsCallBackExecutor);
+            }
+        } else {
+            request.getCallback().onFailure(new RuntimeException("DB storage writes are disabled due to API limits!"));
+        }
     }
 
     @Override
-    public void saveAndNotify(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Void> callback) {
-        saveAndNotify(tenantId, null, entityId, ts, 0L, callback);
-    }
+    public ListenableFuture<Integer> saveTimeseriesInternal(TimeseriesSaveRequest request) {
+        TenantId tenantId = request.getTenantId();
+        EntityId entityId = request.getEntityId();
+        TimeseriesSaveRequest.Strategy strategy = request.getStrategy();
+        ListenableFuture<Integer> saveFuture;
+        if (strategy.saveTimeseries() && strategy.saveLatest()) {
+            saveFuture = tsService.save(tenantId, entityId, request.getEntries(), request.getTtl());
+        } else if (strategy.saveLatest()) {
+            saveFuture = Futures.transform(tsService.saveLatest(tenantId, entityId, request.getEntries()), result -> 0, MoreExecutors.directExecutor());
+        } else if (strategy.saveTimeseries()) {
+            saveFuture = tsService.saveWithoutLatest(tenantId, entityId, request.getEntries(), request.getTtl());
+        } else {
+            saveFuture = Futures.immediateFuture(0);
+        }
 
-    @Override
-    public void saveAndNotify(TenantId tenantId, CustomerId customerId, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Void> callback) {
-        doSaveAndNotify(tenantId, customerId, entityId, ts, ttl, callback, true);
+        addMainCallback(saveFuture, request.getCallback());
+        if (strategy.sendWsUpdate()) {
+            addWsCallback(saveFuture, success -> onTimeSeriesUpdate(tenantId, entityId, request.getEntries()));
+        }
+        if (strategy.saveLatest()) {
+            copyLatestToEntityViews(tenantId, entityId, request.getEntries());
+        }
+        return saveFuture;
     }
 
     @Override
-    public void saveWithoutLatestAndNotify(TenantId tenantId, CustomerId customerId, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Void> callback) {
-        doSaveAndNotify(tenantId, customerId, entityId, ts, ttl, callback, false);
+    public void saveAttributes(AttributesSaveRequest request) {
+        checkInternalEntity(request.getEntityId());
+        saveAttributesInternal(request);
     }
 
-    private void doSaveAndNotify(TenantId tenantId, CustomerId customerId, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Void> callback, boolean saveLatest) {
-        checkInternalEntity(entityId);
-        boolean sysTenant = TenantId.SYS_TENANT_ID.equals(tenantId) || tenantId == null;
-        if (sysTenant || apiUsageStateService.getApiUsageState(tenantId).isDbStorageEnabled()) {
-            KvUtils.validate(ts, valueNoXssValidation);
-            if (saveLatest) {
-                saveAndNotifyInternal(tenantId, entityId, ts, ttl, getCallback(tenantId, customerId, sysTenant, callback));
-            } else {
-                saveWithoutLatestAndNotifyInternal(tenantId, entityId, ts, ttl, getCallback(tenantId, customerId, sysTenant, callback));
-            }
-        } else {
-            callback.onFailure(new RuntimeException("DB storage writes are disabled due to API limits!"));
-        }
+    @Override
+    public void saveAttributesInternal(AttributesSaveRequest request) {
+        log.trace("Executing saveInternal [{}]", request);
+        ListenableFuture<List<Long>> saveFuture = attrService.save(request.getTenantId(), request.getEntityId(), request.getScope(), request.getEntries());
+        addMainCallback(saveFuture, request.getCallback());
+        addWsCallback(saveFuture, success -> onAttributesUpdate(request.getTenantId(), request.getEntityId(), request.getScope().name(), request.getEntries(), request.isNotifyDevice()));
     }
 
-    private FutureCallback<Integer> getCallback(TenantId tenantId, CustomerId customerId, boolean sysTenant, FutureCallback<Void> callback) {
-        return new FutureCallback<>() {
-            @Override
-            public void onSuccess(Integer result) {
-                if (!sysTenant && result != null && result > 0) {
-                    apiUsageClient.report(tenantId, customerId, ApiUsageRecordKey.STORAGE_DP_COUNT, result);
-                }
-                callback.onSuccess(null);
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                callback.onFailure(t);
-            }
-        };
+    @Override
+    public void deleteAttributes(AttributesDeleteRequest request) {
+        checkInternalEntity(request.getEntityId());
+        deleteAttributesInternal(request);
     }
 
     @Override
-    public void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Integer> callback) {
-        saveAndNotifyInternal(tenantId, entityId, ts, 0L, callback);
+    public void deleteAttributesInternal(AttributesDeleteRequest request) {
+        ListenableFuture<List<String>> deleteFuture = attrService.removeAll(request.getTenantId(), request.getEntityId(), request.getScope(), request.getKeys());
+        addMainCallback(deleteFuture, request.getCallback());
+        addWsCallback(deleteFuture, success -> onAttributesDelete(request.getTenantId(), request.getEntityId(), request.getScope().name(), request.getKeys(), request.isNotifyDevice()));
     }
 
     @Override
-    public void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Integer> callback) {
-        ListenableFuture<Integer> saveFuture = tsService.save(tenantId, entityId, ts, ttl);
-        addMainCallback(saveFuture, callback);
-        addWsCallback(saveFuture, success -> onTimeSeriesUpdate(tenantId, entityId, ts));
-        addEntityViewCallback(tenantId, entityId, ts);
+    public void deleteTimeseries(TimeseriesDeleteRequest request) {
+        checkInternalEntity(request.getEntityId());
+        deleteTimeseriesInternal(request);
     }
 
-    private void saveWithoutLatestAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Integer> callback) {
-        ListenableFuture<Integer> saveFuture = tsService.saveWithoutLatest(tenantId, entityId, ts, ttl);
-        addMainCallback(saveFuture, callback);
-        addWsCallback(saveFuture, success -> onTimeSeriesUpdate(tenantId, entityId, ts));
+    @Override
+    public void deleteTimeseriesInternal(TimeseriesDeleteRequest request) {
+        if (CollectionUtils.isNotEmpty(request.getKeys())) {
+            ListenableFuture<List<TsKvLatestRemovingResult>> deleteFuture;
+            if (request.getDeleteHistoryQueries() == null) {
+                deleteFuture = tsService.removeLatest(request.getTenantId(), request.getEntityId(), request.getKeys());
+            } else {
+                deleteFuture = tsService.remove(request.getTenantId(), request.getEntityId(), request.getDeleteHistoryQueries());
+                addWsCallback(deleteFuture, result -> onTimeSeriesDelete(request.getTenantId(), request.getEntityId(), request.getKeys(), result));
+            }
+            addMainCallback(deleteFuture, __ -> request.getCallback().onSuccess(request.getKeys()), request.getCallback()::onFailure);
+        } else {
+            ListenableFuture<List<String>> deleteFuture = tsService.removeAllLatest(request.getTenantId(), request.getEntityId());
+            addMainCallback(deleteFuture, request.getCallback()::onSuccess, request.getCallback()::onFailure);
+        }
     }
 
-    private void addEntityViewCallback(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts) {
+    private void copyLatestToEntityViews(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts) {
         if (EntityType.DEVICE.equals(entityId.getEntityType()) || EntityType.ASSET.equals(entityId.getEntityType())) {
             Futures.addCallback(this.tbEntityViewService.findEntityViewsByTenantIdAndEntityIdAsync(tenantId, entityId),
                     new FutureCallback<>() {
@@ -214,15 +233,21 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
                                         }
                                     }
                                     if (!entityViewLatest.isEmpty()) {
-                                        saveLatestAndNotify(tenantId, entityView.getId(), entityViewLatest, new FutureCallback<>() {
-                                            @Override
-                                            public void onSuccess(@Nullable Void tmp) {
-                                            }
-
-                                            @Override
-                                            public void onFailure(Throwable t) {
-                                            }
-                                        });
+                                        saveTimeseries(TimeseriesSaveRequest.builder()
+                                                .tenantId(tenantId)
+                                                .entityId(entityView.getId())
+                                                .entries(entityViewLatest)
+                                                .strategy(TimeseriesSaveRequest.Strategy.LATEST_AND_WS)
+                                                .callback(new FutureCallback<>() {
+                                                    @Override
+                                                    public void onSuccess(@Nullable Void tmp) {}
+
+                                                    @Override
+                                                    public void onFailure(Throwable t) {
+                                                        log.error("[{}][{}] Failed to save entity view latest timeseries: {}", tenantId, entityView.getId(), entityViewLatest, t);
+                                                    }
+                                                })
+                                                .build());
                                     }
                                 }
                             }
@@ -236,233 +261,6 @@ 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<Long>> saveFuture = attrService.save(tenantId, entityId, scope, attributes);
-        addVoidCallback(saveFuture, callback);
-        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<Long>> 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);
-        saveLatestAndNotifyInternal(tenantId, entityId, ts, callback);
-    }
-
-    @Override
-    public void saveLatestAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Void> callback) {
-        ListenableFuture<List<Long>> saveFuture = tsService.saveLatest(tenantId, entityId, ts);
-        addVoidCallback(saveFuture, callback);
-        addWsCallback(saveFuture, success -> onTimeSeriesUpdate(tenantId, entityId, ts));
-    }
-
-    @Override
-    public void deleteAndNotify(TenantId tenantId, EntityId entityId, String scope, List<String> keys, FutureCallback<Void> callback) {
-        checkInternalEntity(entityId);
-        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);
-        addVoidCallback(deleteFuture, callback);
-        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);
-        deleteLatestInternal(tenantId, entityId, keys, callback);
-    }
-
-    @Override
-    public void deleteLatestInternal(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback) {
-        ListenableFuture<List<TsKvLatestRemovingResult>> deleteFuture = tsService.removeLatest(tenantId, entityId, keys);
-        addVoidCallback(deleteFuture, callback);
-    }
-
-    @Override
-    public void deleteAllLatest(TenantId tenantId, EntityId entityId, FutureCallback<Collection<String>> callback) {
-        ListenableFuture<Collection<String>> deleteFuture = tsService.removeAllLatest(tenantId, entityId);
-        Futures.addCallback(deleteFuture, new FutureCallback<Collection<String>>() {
-            @Override
-            public void onSuccess(@Nullable Collection<String> result) {
-                callback.onSuccess(result);
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                callback.onFailure(t);
-            }
-        }, tsCallBackExecutor);
-    }
-
-    @Override
-    public void deleteTimeseriesAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, List<DeleteTsKvQuery> deleteTsKvQueries, FutureCallback<Void> callback) {
-        ListenableFuture<List<TsKvLatestRemovingResult>> deleteFuture = tsService.remove(tenantId, entityId, deleteTsKvQueries);
-        addVoidCallback(deleteFuture, callback);
-        addWsCallback(deleteFuture, list -> onTimeSeriesDelete(tenantId, entityId, keys, list));
-    }
-
-    @Override
-    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String 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, 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();
-        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
-        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();
-        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
-        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();
-        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
-        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();
-        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
-        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);
@@ -509,33 +307,13 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         });
     }
 
-    private <S> void addVoidCallback(ListenableFuture<S> saveFuture, final FutureCallback<Void> callback) {
+    private <S> void addMainCallback(ListenableFuture<S> saveFuture, final FutureCallback<Void> callback) {
         if (callback == null) return;
-        Futures.addCallback(saveFuture, new FutureCallback<S>() {
-            @Override
-            public void onSuccess(@Nullable S result) {
-                callback.onSuccess(null);
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                callback.onFailure(t);
-            }
-        }, tsCallBackExecutor);
+        addMainCallback(saveFuture, result -> callback.onSuccess(null), callback::onFailure);
     }
 
-    private <S> void addMainCallback(ListenableFuture<S> saveFuture, final FutureCallback<S> callback) {
-        Futures.addCallback(saveFuture, new FutureCallback<S>() {
-            @Override
-            public void onSuccess(@Nullable S result) {
-                callback.onSuccess(result);
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                callback.onFailure(t);
-            }
-        }, tsCallBackExecutor);
+    private <S> void addMainCallback(ListenableFuture<S> saveFuture, Consumer<S> onSuccess, Consumer<Throwable> onFailure) {
+        DonAsynchron.withCallback(saveFuture, onSuccess, onFailure, tsCallBackExecutor);
     }
 
     private void checkInternalEntity(EntityId entityId) {
@@ -544,22 +322,21 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         }
     }
 
-    private static class VoidFutureCallback implements FutureCallback<Void> {
-        private final SettableFuture<Void> future;
-
-        public VoidFutureCallback(SettableFuture<Void> future) {
-            this.future = future;
-        }
-
-        @Override
-        public void onSuccess(Void result) {
-            future.set(null);
-        }
+    private FutureCallback<Integer> getApiUsageCallback(TenantId tenantId, CustomerId customerId, boolean sysTenant, FutureCallback<Void> callback) {
+        return new FutureCallback<>() {
+            @Override
+            public void onSuccess(Integer result) {
+                if (!sysTenant && result != null && result > 0) {
+                    apiUsageClient.report(tenantId, customerId, ApiUsageRecordKey.STORAGE_DP_COUNT, result);
+                }
+                callback.onSuccess(null);
+            }
 
-        @Override
-        public void onFailure(Throwable t) {
-            future.setException(t);
-        }
+            @Override
+            public void onFailure(Throwable t) {
+                callback.onFailure(t);
+            }
+        };
     }
 
 }
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 a6dc6d1aae..8e45b84a75 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
@@ -15,37 +15,24 @@
  */
 package org.thingsboard.server.service.telemetry;
 
-import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.ListenableFuture;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 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;
-import org.thingsboard.server.common.data.kv.TsKvEntry;
-
-import java.util.List;
+import org.thingsboard.rule.engine.api.TimeseriesDeleteRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 
 /**
  * Created by ashvayka on 27.03.18.
  */
 public interface InternalTelemetryService extends RuleEngineTelemetryService {
 
-    void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Integer> callback);
-
-    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);
+    ListenableFuture<Integer> saveTimeseriesInternal(TimeseriesSaveRequest request);
 
-    @Deprecated(since = "3.7.0")
-    void deleteAndNotifyInternal(TenantId tenantId, EntityId entityId, String scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback);
+    void saveAttributesInternal(AttributesSaveRequest request);
 
-    void deleteAndNotifyInternal(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback);
+    void deleteTimeseriesInternal(TimeseriesDeleteRequest request);
 
-    void deleteLatestInternal(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback);
+    void deleteAttributesInternal(AttributesDeleteRequest request);
 
 }
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 51d37e291a..09fc1be1c8 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
@@ -362,7 +362,14 @@ public class DefaultTransportApiService implements TransportApiService {
 
                 DeviceId deviceId = device.getId();
                 JsonNode entityNode = JacksonUtil.valueToTree(device);
-                TbMsg tbMsg = TbMsg.newMsg(TbMsgType.ENTITY_CREATED, deviceId, customerId, metaData, TbMsgDataType.JSON, JacksonUtil.toString(entityNode));
+                TbMsg tbMsg = TbMsg.newMsg()
+                        .type(TbMsgType.ENTITY_CREATED)
+                        .originator(deviceId)
+                        .customerId(customerId)
+                        .copyMetaData(metaData)
+                        .dataType(TbMsgDataType.JSON)
+                        .data(JacksonUtil.toString(entityNode))
+                        .build();
                 tbClusterService.pushMsgToRuleEngine(tenantId, deviceId, tbMsg, null);
             } else {
                 JsonNode deviceAdditionalInfo = device.getAdditionalInfo();
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 dd80eba6bc..75a459c283 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
@@ -17,6 +17,7 @@ package org.thingsboard.server.service.ttl;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -66,7 +67,7 @@ public class AlarmsCleanUpService {
             try {
                 cleanUp(tenantId);
             } catch (Exception e) {
-                log.warn("Failed to clean up alarms by ttl for tenant {}", tenantId, e);
+                getLogger().warn("Failed to clean up alarms by ttl for tenant {}", tenantId, e);
             }
         }
     }
@@ -105,8 +106,13 @@ public class AlarmsCleanUpService {
         alarmService.delAlarmTypes(tenantId, typesToRemove);
 
         if (totalRemoved > 0) {
-            log.info("Removed {} outdated alarm(s) for tenant {} older than {}", totalRemoved, tenantId, new Date(expirationTime));
+            getLogger().info("Removed {} outdated alarm(s) for tenant {} older than {}", totalRemoved, tenantId, new Date(expirationTime));
         }
     }
 
+    // wrapper for tests to spy on static logger
+    Logger getLogger() {
+        return log;
+    }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/update/DeprecationService.java b/application/src/main/java/org/thingsboard/server/service/update/DeprecationService.java
deleted file mode 100644
index ff1f013953..0000000000
--- a/application/src/main/java/org/thingsboard/server/service/update/DeprecationService.java
+++ /dev/null
@@ -1,90 +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.update;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.thingsboard.rule.engine.api.NotificationCenter;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.notification.info.GeneralNotificationInfo;
-import org.thingsboard.server.common.data.notification.targets.platform.SystemAdministratorsFilter;
-import org.thingsboard.server.dao.notification.DefaultNotifications;
-import org.thingsboard.server.dao.notification.DefaultNotifications.DefaultNotification;
-import org.thingsboard.server.queue.util.AfterStartUp;
-
-import java.util.Map;
-
-@Service
-@Slf4j
-@RequiredArgsConstructor
-public class DeprecationService {
-
-    private final NotificationCenter notificationCenter;
-
-    @Value("${queue.type}")
-    private String queueType;
-
-    @Value("${database.ts.type}")
-    private String tsType;
-
-    @Value("${database.ts_latest.type}")
-    private String tsLatestType;
-
-    @AfterStartUp(order = Integer.MAX_VALUE)
-    public void checkDeprecation() {
-        checkQueueTypeDeprecation();
-        checkDatabaseTypeDeprecation();
-    }
-
-    private void checkQueueTypeDeprecation() {
-        String queueTypeName;
-        switch (queueType) {
-            case "aws-sqs" -> queueTypeName = "AWS SQS";
-            case "pubsub" -> queueTypeName = "PubSub";
-            case "service-bus" -> queueTypeName = "Azure Service Bus";
-            case "rabbitmq" -> queueTypeName = "RabbitMQ";
-            default -> {
-                return;
-            }
-        }
-
-        log.warn("WARNING: Starting with ThingsBoard 4.0, {} will no longer be supported as a message queue for microservices. " +
-                "Please migrate to Apache Kafka. This change will not impact any rule nodes", queueTypeName);
-        sendNotification(DefaultNotifications.queueTypeDeprecation, Map.of(
-                "queueType", queueTypeName
-        ));
-    }
-
-    private void checkDatabaseTypeDeprecation() {
-        String deprecatedDatabaseType = "Timescale";
-        if (StringUtils.equalsAnyIgnoreCase(deprecatedDatabaseType, tsType, tsLatestType)) {
-            log.warn("WARNING: Starting with ThingsBoard 4.0, {} will no longer be supported as a storage provider. " +
-                    "Please migrate to Cassandra or PostgreSQL.", deprecatedDatabaseType);
-            sendNotification(DefaultNotifications.databaseTypeDeprecation, Map.of(
-                    "databaseType", deprecatedDatabaseType
-            ));
-        }
-    }
-
-    private void sendNotification(DefaultNotification notification, Map<String, String> info) {
-        notificationCenter.sendGeneralWebNotification(TenantId.SYS_TENANT_ID, new SystemAdministratorsFilter(),
-                notification.toTemplate(), new GeneralNotificationInfo(info));
-    }
-
-}
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 507024ae0f..a88ace58ae 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -206,7 +206,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.9}"
+    base-url: "${UI_HELP_BASE_URL:https://raw.githubusercontent.com/thingsboard/thingsboard-ui-help/release-4.0}"
 
 # Database telemetry parameters
 database:
@@ -600,7 +600,7 @@ cache:
       maxSize: "${CACHE_SPECS_EDGE_SESSIONS_MAX_SIZE:10000}" # 0 means the cache is disabled
     relatedEdges:
       timeToLiveInMinutes: "${CACHE_SPECS_RELATED_EDGES_TTL:1440}" # Related Edges cache TTL
-      maxSize: "${CACHE_SPECS_RELATED_EDGES_MAX_SIZE:0}" # 0 means the cache is disabled
+      maxSize: "${CACHE_SPECS_RELATED_EDGES_MAX_SIZE:10000}" # 0 means the cache is disabled
     repositorySettings:
       timeToLiveInMinutes: "${CACHE_SPECS_REPOSITORY_SETTINGS_TTL:1440}" # Repository settings cache TTL
       maxSize: "${CACHE_SPECS_REPOSITORY_SETTINGS_MAX_SIZE:10000}" # 0 means the cache is disabled
@@ -1242,8 +1242,10 @@ transport:
   snmp:
     # Enable/disable SNMP transport protocol
     enabled: "${SNMP_ENABLED:true}"
-    # Snmp bind port
-    bind_port: "${SNMP_BIND_PORT:1620}"
+    # SNMP bind address
+    bind_address: "${SNMP_BIND_ADDRESS:0.0.0.0}"
+    # SNMP bind port. Zero (random) by default. When using SNMP TRAPs - make sure to specify some static value, e.g. 1620
+    bind_port: "${SNMP_BIND_PORT:0}"
     response_processing:
       # parallelism level for executor (workStealingPool) that is responsible for handling responses from SNMP devices
       parallelism_level: "${SNMP_RESPONSE_PROCESSING_PARALLELISM_LEVEL:4}"
@@ -1271,7 +1273,7 @@ transport:
         # URL of gateways dashboard repository
         repository_url: "${TB_GATEWAY_DASHBOARD_SYNC_REPOSITORY_URL:https://github.com/thingsboard/gateway-management-extensions-dist.git}"
         # Branch of gateways dashboard repository to work with
-        branch: "${TB_GATEWAY_DASHBOARD_SYNC_BRANCH:main}"
+        branch: "${TB_GATEWAY_DASHBOARD_SYNC_BRANCH:}"
         # Fetch frequency in hours for gateways dashboard repository
         fetch_frequency: "${TB_GATEWAY_DASHBOARD_SYNC_FETCH_FREQUENCY:24}"
 
@@ -1493,9 +1495,7 @@ swagger:
 
 # Queue configuration parameters
 queue:
-  # in-memory or kafka (Apache Kafka). The following queue types are deprecated and will no longer be supported in ThingsBoard 4.0:
-  # aws-sqs (AWS SQS), pubsub (PubSub), service-bus (Azure Service Bus), rabbitmq (RabbitMQ)
-  type: "${TB_QUEUE_TYPE:in-memory}"
+  type: "${TB_QUEUE_TYPE:in-memory}" # in-memory or kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka).
   in_memory:
     stats:
@@ -1624,122 +1624,6 @@ queue:
       print-interval-ms: "${TB_QUEUE_KAFKA_CONSUMER_STATS_MIN_PRINT_INTERVAL_MS:60000}"
       # Time to wait for the stats-loading requests to Kafka to finish
       kafka-response-timeout-ms: "${TB_QUEUE_KAFKA_CONSUMER_STATS_RESPONSE_TIMEOUT_MS:1000}"
-  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}"
-    # Access key ID from AWS IAM user
-    access_key_id: "${TB_QUEUE_AWS_SQS_ACCESS_KEY_ID:YOUR_KEY}"
-    # Secret access key from AWS IAM user
-    secret_access_key: "${TB_QUEUE_AWS_SQS_SECRET_ACCESS_KEY:YOUR_SECRET}"
-    # Region from AWS account
-    region: "${TB_QUEUE_AWS_SQS_REGION:YOUR_REGION}"
-    # Number of threads per each AWS SQS queue in consumer
-    threads_per_topic: "${TB_QUEUE_AWS_SQS_THREADS_PER_TOPIC:1}"
-    # Thread pool size for aws_sqs queue producer executor provider. Default value equals to AmazonSQSAsyncClient.DEFAULT_THREAD_POOL_SIZE
-    producer_thread_pool_size: "${TB_QUEUE_AWS_SQS_EXECUTOR_THREAD_POOL_SIZE:50}"
-    queue-properties:
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      rule-engine: "${TB_QUEUE_AWS_SQS_RE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      core: "${TB_QUEUE_AWS_SQS_CORE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      transport-api: "${TB_QUEUE_AWS_SQS_TA_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      notifications: "${TB_QUEUE_AWS_SQS_NOTIFICATIONS_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800
-      js-executor: "${TB_QUEUE_AWS_SQS_JE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      ota-updates: "${TB_QUEUE_AWS_SQS_OTA_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      version-control: "${TB_QUEUE_AWS_SQS_VC_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      edge: "${TB_QUEUE_AWS_SQS_EDGE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-  pubsub:
-    # Project ID from Google Cloud
-    project_id: "${TB_QUEUE_PUBSUB_PROJECT_ID:YOUR_PROJECT_ID}"
-    # API Credentials in JSON format
-    service_account: "${TB_QUEUE_PUBSUB_SERVICE_ACCOUNT:YOUR_SERVICE_ACCOUNT}"
-    # Message size for PubSub queue.Value in bytes
-    max_msg_size: "${TB_QUEUE_PUBSUB_MAX_MSG_SIZE:1048576}"
-    # Number of messages per consumer
-    max_messages: "${TB_QUEUE_PUBSUB_MAX_MESSAGES:1000}"
-    # Thread pool size for pubsub queue executor provider. If set to 0 - default pubsub executor provider value will be used (5 * number of available processors)
-    executor_thread_pool_size: "${TB_QUEUE_PUBSUB_EXECUTOR_THREAD_POOL_SIZE:0}"
-    queue-properties:
-      # Pub/Sub properties for Rule Engine subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      rule-engine: "${TB_QUEUE_PUBSUB_RE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Core subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      core: "${TB_QUEUE_PUBSUB_CORE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Transport API subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      transport-api: "${TB_QUEUE_PUBSUB_TA_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Version Control subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      notifications: "${TB_QUEUE_PUBSUB_NOTIFICATIONS_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # PubSub queue properties
-      js-executor: "${TB_QUEUE_PUBSUB_JE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Transport Api subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      version-control: "${TB_QUEUE_PUBSUB_VC_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Edge subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      edge: "${TB_QUEUE_PUBSUB_EDGE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-  service_bus:
-    # Azure namespace
-    namespace_name: "${TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME:YOUR_NAMESPACE_NAME}"
-    # Azure Service Bus Shared Access Signatures key name
-    sas_key_name: "${TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME:YOUR_SAS_KEY_NAME}"
-    # Azure Service Bus Shared Access Signatures key
-    sas_key: "${TB_QUEUE_SERVICE_BUS_SAS_KEY:YOUR_SAS_KEY}"
-    # Number of messages per a consumer
-    max_messages: "${TB_QUEUE_SERVICE_BUS_MAX_MESSAGES:1000}"
-    queue-properties:
-      # Azure Service Bus properties for Rule Engine queues
-      rule-engine: "${TB_QUEUE_SERVICE_BUS_RE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Core queues
-      core: "${TB_QUEUE_SERVICE_BUS_CORE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Transport Api queues
-      transport-api: "${TB_QUEUE_SERVICE_BUS_TA_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Notification queues
-      notifications: "${TB_QUEUE_SERVICE_BUS_NOTIFICATIONS_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus queue properties
-      js-executor: "${TB_QUEUE_SERVICE_BUS_JE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Version Control queues
-      version-control: "${TB_QUEUE_SERVICE_BUS_VC_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Edge queues
-      edge: "${TB_QUEUE_SERVICE_BUS_EDGE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-  rabbitmq:
-    # By default empty
-    exchange_name: "${TB_QUEUE_RABBIT_MQ_EXCHANGE_NAME:}"
-    # RabbitMQ host used to establish connection
-    host: "${TB_QUEUE_RABBIT_MQ_HOST:localhost}"
-    # RabbitMQ host used to establish a connection
-    port: "${TB_QUEUE_RABBIT_MQ_PORT:5672}"
-    # Virtual hosts provide logical grouping and separation of resources
-    virtual_host: "${TB_QUEUE_RABBIT_MQ_VIRTUAL_HOST:/}"
-    # Username for RabbitMQ user account
-    username: "${TB_QUEUE_RABBIT_MQ_USERNAME:YOUR_USERNAME}"
-    # User password for RabbitMQ user account
-    password: "${TB_QUEUE_RABBIT_MQ_PASSWORD:YOUR_PASSWORD}"
-    # Network connection between clients and RabbitMQ nodes can fail. RabbitMQ Java client supports automatic recovery of connections and topology (queues, exchanges, bindings, and consumers)
-    automatic_recovery_enabled: "${TB_QUEUE_RABBIT_MQ_AUTOMATIC_RECOVERY_ENABLED:false}"
-    # The connection timeout for the RabbitMQ connection factory
-    connection_timeout: "${TB_QUEUE_RABBIT_MQ_CONNECTION_TIMEOUT:60000}"
-    # RabbitMQ has a timeout for connection handshake. When clients run in heavily constrained environments, it may be necessary to increase the timeout
-    handshake_timeout: "${TB_QUEUE_RABBIT_MQ_HANDSHAKE_TIMEOUT:10000}"
-    # The maximum number of messages returned in a single call of doPoll() method
-    max_poll_messages: "${TB_QUEUE_RABBIT_MQ_MAX_POLL_MESSAGES:1}"
-    queue-properties:
-      # RabbitMQ properties for Rule Engine queues
-      rule-engine: "${TB_QUEUE_RABBIT_MQ_RE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Core queues
-      core: "${TB_QUEUE_RABBIT_MQ_CORE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Transport API queues
-      transport-api: "${TB_QUEUE_RABBIT_MQ_TA_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Notification queues
-      notifications: "${TB_QUEUE_RABBIT_MQ_NOTIFICATIONS_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ queue properties
-      js-executor: "${TB_QUEUE_RABBIT_MQ_JE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Version Control queues
-      version-control: "${TB_QUEUE_RABBIT_MQ_VC_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Edge queues
-      edge: "${TB_QUEUE_RABBIT_MQ_EDGE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
   partitions:
     hash_function_name: "${TB_QUEUE_PARTITIONS_HASH_FUNCTION_NAME:murmur3_128}" # murmur3_32, murmur3_128 or sha256
   transport_api:
@@ -1760,7 +1644,7 @@ queue:
     # Interval in milliseconds to poll api response from transport microservices
     response_poll_interval: "${TB_QUEUE_TRANSPORT_RESPONSE_POLL_INTERVAL_MS:25}"
   core:
-    # Default topic name of Kafka, RabbitMQ, etc. queue
+    # Default topic name
     topic: "${TB_QUEUE_CORE_TOPIC:tb_core}"
     # Interval in milliseconds to poll messages by Core microservices
     poll-interval: "${TB_QUEUE_CORE_POLL_INTERVAL_MS:25}"
@@ -1777,7 +1661,7 @@ queue:
       pack-interval-ms: "${TB_QUEUE_CORE_OTA_PACK_INTERVAL_MS:60000}"
       # The size of OTA updates notifications fetched from the queue. The queue stores pairs of firmware and device ids
       pack-size: "${TB_QUEUE_CORE_OTA_PACK_SIZE:100}"
-    # Stats topic name for queue Kafka, RabbitMQ, etc.
+    # Stats topic name
     usage-stats-topic: "${TB_QUEUE_US_TOPIC:tb_usage_stats}"
     stats:
       # Enable/disable statistics for Core microservices
@@ -1808,7 +1692,7 @@ queue:
         print-interval-ms: "${TB_HOUSEKEEPER_STATS_PRINT_INTERVAL_MS:60000}"
 
   vc:
-    # Default topic name for Kafka, RabbitMQ, etc.
+    # Default topic name
     topic: "${TB_QUEUE_VC_TOPIC:tb_version_control}"
     # Number of partitions to associate with this queue. Used for scaling the number of messages that can be processed in parallel
     partitions: "${TB_QUEUE_VC_PARTITIONS:10}"
@@ -1818,7 +1702,7 @@ queue:
     pack-processing-timeout: "${TB_QUEUE_VC_PACK_PROCESSING_TIMEOUT_MS:180000}"
     # Timeout for a request to VC-executor (for a request for the version of the entity, for a commit charge, etc.)
     request-timeout: "${TB_QUEUE_VC_REQUEST_TIMEOUT:180000}"
-    # Queue settings for Kafka, RabbitMQ, etc. Limit for single message size
+    # Limit for single queue message size
     msg-chunk-size: "${TB_QUEUE_VC_MSG_CHUNK_SIZE:250000}"
   js:
     # JS Eval request topic
@@ -1859,7 +1743,7 @@ queue:
     # Interval in milliseconds to poll messages
     poll_interval: "${TB_QUEUE_TRANSPORT_NOTIFICATIONS_POLL_INTERVAL_MS:25}"
   edge:
-    # Default topic name for Kafka, RabbitMQ, etc.
+    # Default topic name
     topic: "${TB_QUEUE_EDGE_TOPIC:tb_edge}"
     # Amount of partitions used by Edge services
     partitions: "${TB_QUEUE_EDGE_PARTITIONS:10}"
diff --git a/application/src/test/java/org/thingsboard/server/actors/rule/DefaultTbContextTest.java b/application/src/test/java/org/thingsboard/server/actors/rule/DefaultTbContextTest.java
index 21a4a45c6f..29d96347ea 100644
--- a/application/src/test/java/org/thingsboard/server/actors/rule/DefaultTbContextTest.java
+++ b/application/src/test/java/org/thingsboard/server/actors/rule/DefaultTbContextTest.java
@@ -928,15 +928,32 @@ class DefaultTbContextTest {
     }
 
     private TbMsg getTbMsgWithCallback(TbMsgCallback callback) {
-        return TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TENANT_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING, callback);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(TENANT_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .callback(callback)
+                .build();
     }
 
     private TbMsg getTbMsgWithQueueName() {
-        return TbMsg.newMsg(DataConstants.MAIN_QUEUE_NAME, TbMsgType.POST_TELEMETRY_REQUEST, TENANT_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
+        return TbMsg.newMsg()
+                .queueName(DataConstants.MAIN_QUEUE_NAME)
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(TENANT_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
     }
 
     private TbMsg getTbMsg() {
-        return TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TENANT_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(TENANT_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
     }
 
     private static long getUntilTime() {
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 aef4772053..5649caee5a 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -149,10 +149,6 @@ import org.thingsboard.server.service.security.auth.rest.LoginRequest;
 import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
 
 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.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -1053,33 +1049,6 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         throw new AssertionError("Unexpected status " + mvcResult.getResponse().getStatus());
     }
 
-    protected static <T> T getFieldValue(Object target, String fieldName) throws Exception {
-        Field field = target.getClass().getDeclaredField(fieldName);
-        field.setAccessible(true);
-        return (T) field.get(target);
-    }
-
-    protected static void setStaticFieldValue(Class<?> targetCls, String fieldName, Object value) throws Exception {
-        Field field = targetCls.getDeclaredField(fieldName);
-        field.setAccessible(true);
-        field.set(null, value);
-    }
-
-    protected static void setStaticFinalFieldValue(Class<?> targetCls, String fieldName, Object value) throws Exception {
-        Field field = targetCls.getDeclaredField(fieldName);
-        field.setAccessible(true);
-        // 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);
-    }
-
     protected int getDeviceActorSubscriptionCount(DeviceId deviceId, FeatureType featureType) {
         DeviceActorMessageProcessor processor = getDeviceActorProcessor(deviceId);
         Map<UUID, SessionInfo> subscriptions = (Map<UUID, SessionInfo>) ReflectionTestUtils.getField(processor, getMapName(featureType));
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 4d38934dcb..0ffdbe8e60 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
@@ -897,7 +897,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
         edgeImitator.ignoreType(OAuth2ClientUpdateMsg.class);
         edgeImitator.ignoreType(OAuth2DomainUpdateMsg.class);
 
-        edgeImitator.expectMessageAmount(26);
+        edgeImitator.expectMessageAmount(27);
         edgeImitator.connect();
         waitForMessages(edgeImitator);
 
@@ -1003,6 +1003,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
         Assert.assertTrue(popAdminSettingsMsg(edgeImitator.getDownlinkMsgs(), "connectivity"));
         Assert.assertTrue(popAdminSettingsMsg(edgeImitator.getDownlinkMsgs(), "jwt"));
         Assert.assertTrue(popDeviceProfileMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "default"));
+        Assert.assertTrue(popDeviceProfileMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "default"));
         Assert.assertTrue(popAssetProfileMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "default"));
         Assert.assertTrue(popDeviceProfileMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "default"));
         Assert.assertTrue(popAssetProfileMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "default"));
diff --git a/application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
index 9c9322dc38..91dbb9714d 100644
--- a/application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
@@ -62,7 +62,12 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
     @Test
     public void testHandleRuleEngineRequestWithMsgOriginatorUser() throws Exception {
         loginSysAdmin();
-        TbMsg responseMsg = TbMsg.newMsg(TbMsgType.REST_API_REQUEST, currentUserId, TbMsgMetaData.EMPTY, RESPONSE_BODY);
+        TbMsg responseMsg = TbMsg.newMsg()
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(currentUserId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(RESPONSE_BODY)
+                .build();
         mockRestApiCallToRuleEngine(responseMsg);
 
         JsonNode apiResponse = doPostAsyncWithTypedResponse("/api/rule-engine/", REQUEST_BODY, new TypeReference<>() {
@@ -86,7 +91,12 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
         loginTenantAdmin();
         Device device = createDevice("Test", "123");
         DeviceId deviceId = device.getId();
-        TbMsg responseMsg = TbMsg.newMsg(TbMsgType.REST_API_REQUEST, deviceId, TbMsgMetaData.EMPTY, RESPONSE_BODY);
+        TbMsg responseMsg = TbMsg.newMsg()
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(RESPONSE_BODY)
+                .build();
         mockRestApiCallToRuleEngine(responseMsg);
 
         JsonNode apiResponse = doPostAsyncWithTypedResponse("/api/rule-engine/DEVICE/" + deviceId.getId(), REQUEST_BODY, new TypeReference<>() {
@@ -110,7 +120,12 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
         loginTenantAdmin();
         Device device = createDevice("Test", "123");
         DeviceId deviceId = device.getId();
-        TbMsg responseMsg = TbMsg.newMsg(TbMsgType.REST_API_REQUEST, deviceId, TbMsgMetaData.EMPTY, RESPONSE_BODY);
+        TbMsg responseMsg = TbMsg.newMsg()
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(RESPONSE_BODY)
+                .build();
         mockRestApiCallToRuleEngine(responseMsg);
 
         JsonNode apiResponse = doPostAsyncWithTypedResponse("/api/rule-engine/DEVICE/" + deviceId.getId() + "/15000", REQUEST_BODY, new TypeReference<>() {
@@ -156,7 +171,13 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
         loginTenantAdmin();
         Device device = createDevice("Test", "123");
         DeviceId deviceId = device.getId();
-        TbMsg responseMsg = TbMsg.newMsg(DataConstants.HP_QUEUE_NAME, TbMsgType.REST_API_REQUEST, deviceId, TbMsgMetaData.EMPTY, RESPONSE_BODY);
+        TbMsg responseMsg = TbMsg.newMsg()
+                .queueName(DataConstants.HP_QUEUE_NAME)
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(RESPONSE_BODY)
+                .build();
         mockRestApiCallToRuleEngine(responseMsg);
 
         JsonNode apiResponse = doPostAsyncWithTypedResponse("/api/rule-engine/DEVICE/" + deviceId.getId() + "/HighPriority/1000", REQUEST_BODY, new TypeReference<>() {
@@ -195,7 +216,13 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
         assignDeviceToCustomer(deviceId, customerId);
         loginCustomerUser();
 
-        TbMsg responseMsg = TbMsg.newMsg(TbMsgType.REST_API_REQUEST, deviceId, customerId, TbMsgMetaData.EMPTY, RESPONSE_BODY);
+        TbMsg responseMsg = TbMsg.newMsg()
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(deviceId)
+                .customerId(customerId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(RESPONSE_BODY)
+                .build();
         mockRestApiCallToRuleEngine(responseMsg);
 
         JsonNode apiResponse = doPostAsyncWithTypedResponse("/api/rule-engine/DEVICE/" + deviceId.getId(), REQUEST_BODY, new TypeReference<>() {
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 c8cc72c5b5..e78cd67ba3 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
@@ -743,7 +743,12 @@ public class TenantControllerTest extends AbstractControllerTest {
     }
 
     private TbMsg publishTbMsg(TenantId tenantId, TopicPartitionInfo tpi) {
-        TbMsg tbMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, tenantId, TbMsgMetaData.EMPTY, "{\"test\":1}");
+        TbMsg tbMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(tenantId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data("{\"test\":1}")
+                .build();
         TransportProtos.ToRuleEngineMsg msg = TransportProtos.ToRuleEngineMsg.newBuilder()
                 .setTenantIdMSB(tenantId.getId().getMostSignificantBits())
                 .setTenantIdLSB(tenantId.getId().getLeastSignificantBits())
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 e3695d7efb..b64c87ccbd 100644
--- a/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
@@ -29,6 +29,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 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.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
@@ -804,19 +806,24 @@ public class WebsocketApiTest extends AbstractControllerTest {
 
     private void sendTelemetry(Device device, List<TsKvEntry> tsData) throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
-        tsService.saveAndNotify(device.getTenantId(), null, device.getId(), tsData, 0, new FutureCallback<Void>() {
-            @Override
-            public void onSuccess(@Nullable Void result) {
-                log.debug("sendTelemetry callback onSuccess");
-                latch.countDown();
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                log.error("Failed to send telemetry", t);
-                latch.countDown();
-            }
-        });
+        tsService.saveTimeseries(TimeseriesSaveRequest.builder()
+                .tenantId(device.getTenantId())
+                .entityId(device.getId())
+                .entries(tsData)
+                .callback(new FutureCallback<Void>() {
+                    @Override
+                    public void onSuccess(@Nullable Void result) {
+                        log.debug("sendTelemetry callback onSuccess");
+                        latch.countDown();
+                    }
+
+                    @Override
+                    public void onFailure(Throwable t) {
+                        log.error("Failed to send telemetry", t);
+                        latch.countDown();
+                    }
+                })
+                .build());
         assertThat(latch.await(TIMEOUT, TimeUnit.SECONDS)).as("await sendTelemetry callback");
     }
 
@@ -826,19 +833,26 @@ 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.getAttributeScope(), attrData, new FutureCallback<Void>() {
-            @Override
-            public void onSuccess(@Nullable Void result) {
-                log.debug("sendAttributes callback onSuccess");
-                latch.countDown();
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                log.error("Failed to sendAttributes", t);
-                latch.countDown();
-            }
-        });
+        tsService.saveAttributes(AttributesSaveRequest.builder()
+                .tenantId(tenantId)
+                .entityId(entityId)
+                .scope(scope.getAttributeScope())
+                .entries(attrData)
+                .callback(new FutureCallback<>() {
+                    @Override
+                    public void onSuccess(@Nullable Void result) {
+                        log.debug("sendAttributes callback onSuccess");
+                        latch.countDown();
+                    }
+
+                    @Override
+                    public void onFailure(Throwable t) {
+                        log.error("Failed to sendAttributes", t);
+                        latch.countDown();
+                    }
+                })
+                .build());
         assertThat(latch.await(TIMEOUT, TimeUnit.SECONDS)).as("await sendAttributes callback").isTrue();
     }
+
 }
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 03506af95c..ee2fe1dae0 100644
--- a/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java
@@ -95,7 +95,7 @@ public class WidgetsBundleControllerTest extends AbstractControllerTest {
         Assert.assertEquals(widgetsBundle.getTitle(), savedWidgetsBundle.getTitle());
 
         savedWidgetsBundle.setTitle("My new widgets bundle");
-        doPost("/api/widgetsBundle", savedWidgetsBundle, WidgetsBundle.class);
+        savedWidgetsBundle = doPost("/api/widgetsBundle", savedWidgetsBundle, WidgetsBundle.class);
 
         WidgetsBundle foundWidgetsBundle = doGet("/api/widgetsBundle/" + savedWidgetsBundle.getId().getId().toString(), WidgetsBundle.class);
         Assert.assertEquals(foundWidgetsBundle.getTitle(), savedWidgetsBundle.getTitle());
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 10db03a6c2..afc0f72081 100644
--- a/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
@@ -144,7 +144,7 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
         edgeImitator = new EdgeImitator("localhost", 7070, edge.getRoutingKey(), edge.getSecret());
         edgeImitator.ignoreType(OAuth2ClientUpdateMsg.class);
         edgeImitator.ignoreType(OAuth2DomainUpdateMsg.class);
-        edgeImitator.expectMessageAmount(24);
+        edgeImitator.expectMessageAmount(26);
         edgeImitator.connect();
 
         requestEdgeRuleChainMetadata();
@@ -265,10 +265,10 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
 
         // 4 messages
         // - 1 from default profile fetcher
-        // - 2 from device profile fetcher (default and thermostat)
+        // - 4 from device profile fetcher (2 * (default and thermostat) before and after ota packages fetcher
         // - 1 from device fetcher
-        validateMsgsCnt(DeviceProfileUpdateMsg.class, 4);
-        validateDeviceProfiles(4);
+        validateMsgsCnt(DeviceProfileUpdateMsg.class, 6);
+        validateDeviceProfiles(6);
 
         // 3 messages
         // - 1 from default profile fetcher
@@ -656,7 +656,7 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
     }
 
     protected RuleChainId createEdgeRuleChainAndAssignToEdge(String ruleChainName) throws Exception {
-        edgeImitator.expectMessageAmount(1);
+        edgeImitator.expectMessageAmount(2);
         RuleChain ruleChain = new RuleChain();
         ruleChain.setName(ruleChainName);
         ruleChain.setType(RuleChainType.EDGE);
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 a085f3a821..c0b4fbdd61 100644
--- a/application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java
@@ -126,6 +126,45 @@ public class DeviceProfileEdgeTest extends AbstractEdgeTest {
         unAssignFromEdgeAndDeleteDashboard(thermostatsDashboardId);
     }
 
+    @Test
+    public void testDeleteDeviceProfilesWhenEdgeIsOffline() throws Exception {
+        RuleChainId thermostatsRuleChainId = createEdgeRuleChainAndAssignToEdge("Thermostats Rule Chain");
+
+        // create device profile
+        DeviceProfile deviceProfile = this.createDeviceProfile("ONE_MORE_DEVICE_PROFILE", null);
+        deviceProfile.setDefaultEdgeRuleChainId(thermostatsRuleChainId);
+        extendDeviceProfileData(deviceProfile);
+        edgeImitator.expectMessageAmount(1);
+        deviceProfile = doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        AbstractMessage latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof DeviceProfileUpdateMsg);
+        DeviceProfileUpdateMsg deviceProfileUpdateMsg = (DeviceProfileUpdateMsg) latestMessage;
+        DeviceProfile deviceProfileMsg = JacksonUtil.fromString(deviceProfileUpdateMsg.getEntity(), DeviceProfile.class, true);
+        Assert.assertNotNull(deviceProfileMsg);
+        Assert.assertEquals(deviceProfile, deviceProfileMsg);
+        Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, deviceProfileUpdateMsg.getMsgType());
+
+        // delete profile when edge is offline
+        edgeImitator.disconnect();
+        doDelete("/api/deviceProfile/" + deviceProfile.getUuidId())
+                .andExpect(status().isOk());
+        edgeImitator.connect();
+        // 27 sync message
+        // + 1 delete message
+        edgeImitator.expectMessageAmount(28);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof DeviceProfileUpdateMsg);
+        deviceProfileUpdateMsg = (DeviceProfileUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE, deviceProfileUpdateMsg.getMsgType());
+        Assert.assertEquals(deviceProfile.getUuidId().getMostSignificantBits(), deviceProfileUpdateMsg.getIdMSB());
+        Assert.assertEquals(deviceProfile.getUuidId().getLeastSignificantBits(), deviceProfileUpdateMsg.getIdLSB());
+
+        unAssignFromEdgeAndDeleteRuleChain(thermostatsRuleChainId);
+    }
+
     @Test
     public void testDeviceProfiles_snmp() throws Exception {
         DeviceProfile deviceProfile = createDeviceProfileAndDoBasicAssert("SNMP", createSnmpDeviceProfileTransportConfiguration());
@@ -359,7 +398,7 @@ public class DeviceProfileEdgeTest extends AbstractEdgeTest {
         transportConfiguration.setBootstrapServerUpdateEnable(true);
 
         TelemetryMappingConfiguration observeAttrConfiguration =
-                JacksonUtil.fromString(AbstractLwM2MIntegrationTest.OBSERVE_ATTRIBUTES_WITH_PARAMS, TelemetryMappingConfiguration.class);
+                JacksonUtil.fromString(AbstractLwM2MIntegrationTest.TELEMETRY_WITHOUT_OBSERVE, TelemetryMappingConfiguration.class);
         transportConfiguration.setObserveAttr(observeAttrConfiguration);
 
         List<LwM2MBootstrapServerCredential> bootstrap = new ArrayList<>();
@@ -449,4 +488,5 @@ public class DeviceProfileEdgeTest extends AbstractEdgeTest {
         deviceProfile.setProfileData(createProfileData());
         return deviceProfile;
     }
+
 }
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 fba5f2187f..1ec1ed4fb6 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
@@ -184,7 +184,13 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule
 
         TbMsgCallback tbMsgCallback = Mockito.mock(TbMsgCallback.class);
         Mockito.when(tbMsgCallback.isMsgValid()).thenReturn(true);
-        TbMsg tbMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, device.getId(), TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT, tbMsgCallback);
+        TbMsg tbMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(device.getId())
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .callback(tbMsgCallback)
+                .build();
         QueueToRuleEngineMsg qMsg = new QueueToRuleEngineMsg(savedTenant.getId(), tbMsg, null, null);
         // Pushing Message to the system
         actorSystem.tell(qMsg);
@@ -309,7 +315,13 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule
 
         TbMsgCallback tbMsgCallback = Mockito.mock(TbMsgCallback.class);
         Mockito.when(tbMsgCallback.isMsgValid()).thenReturn(true);
-        TbMsg tbMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, device.getId(), TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT, tbMsgCallback);
+        TbMsg tbMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(device.getId())
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .callback(tbMsgCallback)
+                .build();
         QueueToRuleEngineMsg qMsg = new QueueToRuleEngineMsg(savedTenant.getId(), tbMsg, null, null);
         // Pushing Message to the system
         actorSystem.tell(qMsg);
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 d8bd02ec7f..1c67689814 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
@@ -142,7 +142,13 @@ public abstract class AbstractRuleEngineLifecycleIntegrationTest extends Abstrac
         log.warn("attr updated");
         TbMsgCallback tbMsgCallback = Mockito.mock(TbMsgCallback.class);
         Mockito.when(tbMsgCallback.isMsgValid()).thenReturn(true);
-        TbMsg tbMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, device.getId(), TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT, tbMsgCallback);
+        TbMsg tbMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(device.getId())
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .callback(tbMsgCallback)
+                .build();
         QueueToRuleEngineMsg qMsg = new QueueToRuleEngineMsg(tenantId, tbMsg, null, null);
         // Pushing Message to the system
         log.warn("before tell tbMsgCallback");
diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewServiceTest.java
new file mode 100644
index 0000000000..aa6bfde935
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewServiceTest.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.entityview;
+
+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.jupiter.MockitoExtension;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
+import org.thingsboard.server.common.data.EntityView;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.EntityViewId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.DoubleDataEntry;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.common.data.objects.AttributesEntityView;
+import org.thingsboard.server.common.data.objects.TelemetryEntityView;
+import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.dao.entityview.EntityViewService;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
+
+import java.util.List;
+import java.util.UUID;
+
+import static com.google.common.util.concurrent.Futures.immediateFuture;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
+
+@ExtendWith(MockitoExtension.class)
+class DefaultTbEntityViewServiceTest {
+
+    final TenantId tenantId = TenantId.fromUUID(UUID.fromString("f09c8180-686c-11ef-9471-a71d33080e9c"));
+    final EntityId entityId = DeviceId.fromString("782aaab0-c7a8-11ef-a668-79582e785d5f");
+
+    @Mock
+    EntityViewService entityViewService;
+    @Mock
+    AttributesService attributesService;
+    @Mock
+    TelemetrySubscriptionService tsSubService;
+    @Mock
+    TimeseriesService tsService;
+
+    DefaultTbEntityViewService defaultTbEntityViewService;
+
+    @BeforeEach
+    void setup() {
+        defaultTbEntityViewService = new DefaultTbEntityViewService(entityViewService, attributesService, tsSubService, tsService);
+    }
+
+    @Test
+    void shouldNotSaveTimeseriesWhenCopyingLatestToEntityView() throws Exception {
+        // GIVEN
+        var entityView = new EntityView(new EntityViewId(UUID.randomUUID()));
+        entityView.setTenantId(tenantId);
+        entityView.setEntityId(entityId);
+        entityView.setKeys(new TelemetryEntityView(List.of("temperature"), new AttributesEntityView()));
+
+        List<TsKvEntry> latest = List.of(new BasicTsKvEntry(123L, new DoubleDataEntry("temperature", 22.3)));
+
+        given(tsService.findAll(eq(tenantId), eq(entityId), anyList())).willReturn(immediateFuture(latest));
+
+        // WHEN
+        defaultTbEntityViewService.updateEntityViewAttributes(tenantId, entityView, null, null);
+
+        // THEN
+        var captor = ArgumentCaptor.forClass(TimeseriesSaveRequest.class);
+        then(tsSubService).should().saveTimeseries(captor.capture());
+
+        var expectedCopyLatestRequest = TimeseriesSaveRequest.builder()
+                .tenantId(tenantId)
+                .entityId(entityView.getId())
+                .entries(latest)
+                .ttl(0L)
+                .strategy(TimeseriesSaveRequest.Strategy.LATEST_AND_WS)
+                .build();
+
+        var actualCopyLatestRequest = captor.getValue();
+
+        assertThat(actualCopyLatestRequest)
+                .usingRecursiveComparison()
+                .ignoringFields("callback")
+                .isEqualTo(expectedCopyLatestRequest);
+    }
+
+}
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 25fe589a08..4dae5a6427 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
@@ -291,7 +291,13 @@ public class DefaultTbClusterServiceTest {
         TbQueueCallback callback = mock(TbQueueCallback.class);
 
         TenantId tenantId = TenantId.fromUUID(UUID.fromString("3c8bd350-1239-4a3b-b9c3-4dd76f8e20f1"));
-        TbMsg requestMsg = TbMsg.newMsg(DataConstants.HP_QUEUE_NAME, TbMsgType.REST_API_REQUEST, tenantId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg requestMsg = TbMsg.newMsg()
+                .queueName(DataConstants.HP_QUEUE_NAME)
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(tenantId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         when(producerProvider.getRuleEngineMsgProducer()).thenReturn(tbREQueueProducer);
 
@@ -305,7 +311,12 @@ public class DefaultTbClusterServiceTest {
     public void testPushMsgToRuleEngineWithTenantIdIsNullUuidAndEntityIsDevice() {
         TenantId tenantId = TenantId.SYS_TENANT_ID;
         DeviceId deviceId = new DeviceId(UUID.fromString("aa6d112d-2914-4a22-a9e3-bee33edbdb14"));
-        TbMsg requestMsg = TbMsg.newMsg(TbMsgType.REST_API_REQUEST, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg requestMsg = TbMsg.newMsg()
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         TbQueueCallback callback = mock(TbQueueCallback.class);
 
         clusterService.pushMsgToRuleEngine(tenantId, deviceId, requestMsg, false, callback);
@@ -321,7 +332,13 @@ public class DefaultTbClusterServiceTest {
         TenantId tenantId = TenantId.fromUUID(UUID.fromString("3c8bd350-1239-4a3b-b9c3-4dd76f8e20f1"));
         DeviceId deviceId = new DeviceId(UUID.fromString("adbb9d41-3367-40fd-9e74-7dd7cc5d30cf"));
         DeviceProfile deviceProfile = new DeviceProfile(new DeviceProfileId(UUID.fromString("552f5d6d-0b2b-43e1-a7d2-a51cb2a96927")));
-        TbMsg requestMsg = TbMsg.newMsg(DataConstants.HP_QUEUE_NAME, TbMsgType.REST_API_REQUEST, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg requestMsg = TbMsg.newMsg()
+                .queueName(DataConstants.HP_QUEUE_NAME)
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         when(deviceProfileCache.get(any(TenantId.class), any(DeviceId.class))).thenReturn(deviceProfile);
         when(producerProvider.getRuleEngineMsgProducer()).thenReturn(tbREQueueProducer);
@@ -341,7 +358,12 @@ public class DefaultTbClusterServiceTest {
         DeviceId deviceId = new DeviceId(UUID.fromString("016c2abb-f46f-49f9-a83d-4d28b803cfe6"));
         DeviceProfile deviceProfile = new DeviceProfile(new DeviceProfileId(UUID.fromString("dc5766e2-1a32-4022-859b-743050097ab7")));
         deviceProfile.setDefaultQueueName(DataConstants.MAIN_QUEUE_NAME);
-        TbMsg requestMsg = TbMsg.newMsg(TbMsgType.REST_API_REQUEST, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg requestMsg = TbMsg.newMsg()
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         when(deviceProfileCache.get(any(TenantId.class), any(DeviceId.class))).thenReturn(deviceProfile);
         when(producerProvider.getRuleEngineMsgProducer()).thenReturn(tbREQueueProducer);
@@ -349,7 +371,7 @@ public class DefaultTbClusterServiceTest {
         clusterService.pushMsgToRuleEngine(tenantId, deviceId, requestMsg, false, callback);
 
         verify(producerProvider).getRuleEngineMsgProducer();
-        TbMsg expectedMsg = TbMsg.transformMsgQueueName(requestMsg, DataConstants.MAIN_QUEUE_NAME);
+        TbMsg expectedMsg = requestMsg.transform(DataConstants.MAIN_QUEUE_NAME);
         ArgumentCaptor<TbMsg> actualMsg = ArgumentCaptor.forClass(TbMsg.class);
         verify(ruleEngineProducerService).sendToRuleEngine(eq(tbREQueueProducer), eq(tenantId), actualMsg.capture(), eq(callback));
         assertThat(actualMsg.getValue()).usingRecursiveComparison().ignoringFields("ctx").isEqualTo(expectedMsg);
@@ -375,12 +397,12 @@ public class DefaultTbClusterServiceTest {
         device.setDeviceProfileId(deviceProfileId);
 
         // device updated
-        TbMsg tbMsg = TbMsg.builder().internalType(TbMsgType.ENTITY_UPDATED).build();
+        TbMsg tbMsg = TbMsg.newMsg().type(TbMsgType.ENTITY_UPDATED).build();
         ((DefaultTbClusterService) clusterService).getRuleEngineProfileForEntityOrElseNull(tenantId, deviceId, tbMsg);
         verify(deviceProfileCache, times(1)).get(tenantId, deviceId);
 
         // device deleted
-        tbMsg = TbMsg.builder().internalType(TbMsgType.ENTITY_DELETED).data(JacksonUtil.toString(device)).build();
+        tbMsg = TbMsg.newMsg().type(TbMsgType.ENTITY_DELETED).data(JacksonUtil.toString(device)).build();
         ((DefaultTbClusterService) clusterService).getRuleEngineProfileForEntityOrElseNull(tenantId, deviceId, tbMsg);
         verify(deviceProfileCache, times(1)).get(tenantId, deviceProfileId);
     }
@@ -395,12 +417,12 @@ public class DefaultTbClusterServiceTest {
         asset.setAssetProfileId(assetProfileId);
 
         // asset updated
-        TbMsg tbMsg = TbMsg.builder().internalType(TbMsgType.ENTITY_UPDATED).build();
+        TbMsg tbMsg = TbMsg.newMsg().type(TbMsgType.ENTITY_UPDATED).build();
         ((DefaultTbClusterService) clusterService).getRuleEngineProfileForEntityOrElseNull(tenantId, assetId, tbMsg);
         verify(assetProfileCache, times(1)).get(tenantId, assetId);
 
         // asset deleted
-        tbMsg = TbMsg.builder().internalType(TbMsgType.ENTITY_DELETED).data(JacksonUtil.toString(asset)).build();
+        tbMsg = TbMsg.newMsg().type(TbMsgType.ENTITY_DELETED).data(JacksonUtil.toString(asset)).build();
         ((DefaultTbClusterService) clusterService).getRuleEngineProfileForEntityOrElseNull(tenantId, assetId, tbMsg);
         verify(assetProfileCache, times(1)).get(tenantId, assetProfileId);
     }
diff --git a/application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManagerTest.java b/application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManagerTest.java
index 66e3de13d1..0b6e70b84c 100644
--- a/application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManagerTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManagerTest.java
@@ -782,7 +782,12 @@ public class TbRuleEngineQueueConsumerManagerTest {
         }
 
         public void setUpTestMsg() {
-            testMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, new DeviceId(UUID.randomUUID()), new TbMsgMetaData(), "{}");
+            testMsg = TbMsg.newMsg()
+                    .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                    .originator(new DeviceId(UUID.randomUUID()))
+                    .copyMetaData(new TbMsgMetaData())
+                    .data("{}")
+                    .build();
         }
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineStrategyTest.java b/application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineStrategyTest.java
index 098c622e31..a24582099e 100644
--- a/application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineStrategyTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineStrategyTest.java
@@ -248,7 +248,7 @@ public class TbRuleEngineStrategyTest {
     }
 
     private static TbMsg createRandomMsg() {
-        return TbMsg.builder()
+        return TbMsg.newMsg()
                 .id(UUID.randomUUID())
                 .type("test type")
                 .originator(deviceId)
diff --git a/application/src/test/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcServiceTest.java b/application/src/test/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcServiceTest.java
index 2cab5f991a..be079017c3 100644
--- a/application/src/test/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcServiceTest.java
@@ -46,7 +46,12 @@ class DefaultTbRuleEngineRpcServiceTest {
         String serviceId = "tb-core-0";
         UUID requestId = UUID.fromString("f64a20df-eb1e-46a3-ba6f-0b3ae053ee0a");
         DeviceId deviceId = new DeviceId(UUID.fromString("1d9f771a-7cdc-4ac7-838c-ba193d05a012"));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.REST_API_REQUEST, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         var restApiCallResponseMsgProto = TransportProtos.RestApiCallResponseMsgProto.newBuilder()
                 .setRequestIdMSB(requestId.getMostSignificantBits())
                 .setRequestIdLSB(requestId.getLeastSignificantBits())
diff --git a/application/src/test/java/org/thingsboard/server/service/ruleengine/DefaultRuleEngineCallServiceTest.java b/application/src/test/java/org/thingsboard/server/service/ruleengine/DefaultRuleEngineCallServiceTest.java
index c49149bd07..a4112ef8d6 100644
--- a/application/src/test/java/org/thingsboard/server/service/ruleengine/DefaultRuleEngineCallServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/ruleengine/DefaultRuleEngineCallServiceTest.java
@@ -85,7 +85,13 @@ public class DefaultRuleEngineCallServiceTest {
         metaData.put("serviceId", "core");
         metaData.put("requestUUID", requestId.toString());
         metaData.put("expirationTime", Long.toString(expTime));
-        TbMsg msg = TbMsg.newMsg(DataConstants.MAIN_QUEUE_NAME, TbMsgType.REST_API_REQUEST, TENANT_ID, new TbMsgMetaData(metaData), "{\"key\":\"value\"}");
+        TbMsg msg = TbMsg.newMsg()
+                .queueName(DataConstants.MAIN_QUEUE_NAME)
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(TENANT_ID)
+                .copyMetaData(new TbMsgMetaData(metaData))
+                .data("{\"key\":\"value\"}")
+                .build();
 
         Consumer<TbMsg> anyConsumer = TbMsg::getData;
         doAnswer(invocation -> {
@@ -113,7 +119,13 @@ public class DefaultRuleEngineCallServiceTest {
         metaData.put("serviceId", "core");
         metaData.put("requestUUID", requestId.toString());
         metaData.put("expirationTime", Long.toString(expTime));
-        TbMsg msg = TbMsg.newMsg(DataConstants.MAIN_QUEUE_NAME, TbMsgType.REST_API_REQUEST, TENANT_ID, new TbMsgMetaData(metaData), "{\"key\":\"value\"}");
+        TbMsg msg = TbMsg.newMsg()
+                .queueName(DataConstants.MAIN_QUEUE_NAME)
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(TENANT_ID)
+                .copyMetaData(new TbMsgMetaData(metaData))
+                .data("{\"key\":\"value\"}")
+                .build();
 
         Consumer<TbMsg> anyConsumer = TbMsg::getData;
         doAnswer(invocation -> {
diff --git a/application/src/test/java/org/thingsboard/server/service/script/AbstractTbelInvokeTest.java b/application/src/test/java/org/thingsboard/server/service/script/AbstractTbelInvokeTest.java
index 11b61f64c4..dcd73bac50 100644
--- a/application/src/test/java/org/thingsboard/server/service/script/AbstractTbelInvokeTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/script/AbstractTbelInvokeTest.java
@@ -16,8 +16,10 @@
 package org.thingsboard.server.service.script;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.script.api.ScriptType;
+import org.thingsboard.script.api.tbel.DefaultTbelInvokeService;
 import org.thingsboard.script.api.tbel.TbelInvokeService;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.controller.AbstractControllerTest;
@@ -28,7 +30,8 @@ import java.util.concurrent.ExecutionException;
 
 import static org.thingsboard.server.common.data.msg.TbMsgType.POST_TELEMETRY_REQUEST;
 
-public abstract class AbstractTbelInvokeTest extends AbstractControllerTest {
+@SpringBootTest(classes = DefaultTbelInvokeService.class)
+public abstract class AbstractTbelInvokeTest {
 
     @Autowired
     protected TbelInvokeService invokeService;
diff --git a/application/src/test/java/org/thingsboard/server/service/script/TbelInvokeDocsIoTest.java b/application/src/test/java/org/thingsboard/server/service/script/TbelInvokeDocsIoTest.java
index d72dd87992..91eae788c3 100644
--- a/application/src/test/java/org/thingsboard/server/service/script/TbelInvokeDocsIoTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/script/TbelInvokeDocsIoTest.java
@@ -18,7 +18,6 @@ package org.thingsboard.server.service.script;
 import org.junit.jupiter.api.Test;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.script.api.tbel.TbDate;
-import org.thingsboard.server.dao.service.DaoSqlTest;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -34,7 +33,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@DaoSqlTest
 class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
 
     private String decoderStr;
@@ -1469,6 +1467,26 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
         assertEquals(expected, actual);
     }
 
+    // hexToBytes List or Array
+    @Test
+    public void hexToBytes_Test() throws ExecutionException, InterruptedException {
+        msgStr = "{}";
+        decoderStr = """
+                    var validInputList = "0x01752B0367FA000500010488FFFFFFFFFFFFFFFF33";
+                    var validInputArray = "AABBCCDDEE";
+                    return {
+                        "hexToBytes": hexToBytes(validInputList),
+                        "hexToBytesArray": hexToBytesArray(validInputArray),
+                    }
+                """;
+        Object actual = invokeScript(evalScript(decoderStr), msgStr);
+        LinkedHashMap<String, Object> expected = new LinkedHashMap<>();
+        expected.put("hexToBytes", bytesToList(new byte[]{1, 117, 43, 3, 103, -6, 0, 5, 0, 1, 4, -120, -1, -1, -1, -1, -1, -1, -1, -1, 51}));
+        // [-86, -69, -52, -35, -18] == new byte[]{(byte) 0xAA, (byte) 0xBB, (byte) 0xCC, (byte) 0xDD, (byte) 0xEE}
+        expected.put("hexToBytesArray", bytesToList(new byte[]{(byte) 0xAA, (byte) 0xBB, (byte) 0xCC, (byte) 0xDD, (byte) 0xEE}));
+        assertEquals( expected, actual);
+    }
+
     // parseBinaryArray
     @Test
     public void parseBinaryArray_Test() throws ExecutionException, InterruptedException {
@@ -1761,13 +1779,15 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
                     return {
                         "base64ToHex": base64ToHex("Kkk="),
                         "bytesToBase64": bytesToBase64([42, 73]),
-                        "base64ToBytes": base64ToBytes("Kkk=")                    
+                        "base64ToBytes": base64ToBytes("Kkk="),                   
+                        "base64ToBytesList": base64ToBytesList("AQIDBAU=")                    
                     }
                 """;
         LinkedHashMap<String, Object> expected = new LinkedHashMap<>();
         expected.put("base64ToHex", "2A49");
         expected.put("bytesToBase64", "Kkk=");
         expected.put("base64ToBytes", bytesToList(new byte[]{42, 73}));
+        expected.put("base64ToBytesList", bytesToList(new byte[]{1, 2, 3, 4, 5}));
         Object actual = invokeScript(evalScript(decoderStr), msgStr);
         assertEquals(expected, actual);
     }
diff --git a/application/src/test/java/org/thingsboard/server/service/script/TbelInvokeServiceTest.java b/application/src/test/java/org/thingsboard/server/service/script/TbelInvokeServiceTest.java
index 071fdf77fc..62170236e0 100644
--- a/application/src/test/java/org/thingsboard/server/service/script/TbelInvokeServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/script/TbelInvokeServiceTest.java
@@ -22,9 +22,9 @@ import org.junit.Ignore;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.script.api.tbel.TbelScript;
-import org.thingsboard.server.dao.service.DaoSqlTest;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -38,7 +38,6 @@ import java.util.concurrent.TimeUnit;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-@DaoSqlTest
 @TestPropertySource(properties = {
         "tbel.max_script_body_size=100",
         "tbel.max_total_args_size=50",
@@ -120,9 +119,9 @@ class TbelInvokeServiceTest extends AbstractTbelInvokeTest {
             scriptsIds.add(scriptId);
         }
 
-        Map<UUID, String> scriptIdToHash = getFieldValue(invokeService, "scriptIdToHash");
-        Map<String, TbelScript> scriptMap = getFieldValue(invokeService, "scriptMap");
-        Cache<String, Serializable> compiledScriptsCache = getFieldValue(invokeService, "compiledScriptsCache");
+        Map<UUID, String> scriptIdToHash = (Map<UUID, String>) ReflectionTestUtils.getField(invokeService, "scriptIdToHash");
+        Map<String, TbelScript> scriptMap = (Map<String, TbelScript>) ReflectionTestUtils.getField(invokeService, "scriptMap");
+        Cache<String, Serializable> compiledScriptsCache = (Cache<String, Serializable>) ReflectionTestUtils.getField(invokeService, "compiledScriptsCache");
 
         String scriptHash = scriptIdToHash.get(scriptsIds.get(0));
 
@@ -140,9 +139,9 @@ class TbelInvokeServiceTest extends AbstractTbelInvokeTest {
             scriptsIds.add(scriptId);
         }
 
-        Map<UUID, String> scriptIdToHash = getFieldValue(invokeService, "scriptIdToHash");
-        Map<String, TbelScript> scriptMap = getFieldValue(invokeService, "scriptMap");
-        Cache<String, Serializable> compiledScriptsCache = getFieldValue(invokeService, "compiledScriptsCache");
+        Map<UUID, String> scriptIdToHash = (Map<UUID, String>) ReflectionTestUtils.getField(invokeService, "scriptIdToHash");
+        Map<String, TbelScript> scriptMap = (Map<String, TbelScript>) ReflectionTestUtils.getField(invokeService, "scriptMap");
+        Cache<String, Serializable> compiledScriptsCache = (Cache<String, Serializable>) ReflectionTestUtils.getField(invokeService, "compiledScriptsCache");
 
         String scriptHash = scriptIdToHash.get(scriptsIds.get(0));
         for (int i = 0; i < 9; i++) {
@@ -163,8 +162,8 @@ class TbelInvokeServiceTest extends AbstractTbelInvokeTest {
     @Ignore("This test is based on assumption that Caffeine cache is LRU based but in fact it is based on " +
             "Tiny LFU which is the cause that the tests fail sometime: https://arxiv.org/pdf/1512.00727.pdf")
     public void whenCompiledScriptsCacheIsTooBig_thenRemoveRarelyUsedScripts() throws Exception {
-        Map<UUID, String> scriptIdToHash = getFieldValue(invokeService, "scriptIdToHash");
-        Cache<String, Serializable> compiledScriptsCache = getFieldValue(invokeService, "compiledScriptsCache");
+        Map<UUID, String> scriptIdToHash = (Map<UUID, String>) ReflectionTestUtils.getField(invokeService, "scriptIdToHash");
+        Cache<String, Serializable> compiledScriptsCache = (Cache<String, Serializable>) ReflectionTestUtils.getField(invokeService, "compiledScriptsCache");
 
         List<UUID> scriptsIds = new ArrayList<>();
         for (int i = 0; i < 110; i++) { // tbel.compiled_scripts_cache_size = 100
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 02281abac3..079bf8e1e2 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
@@ -131,11 +131,13 @@ public class SequentialTimeseriesPersistenceTest extends AbstractControllerTest
 
     void saveLatestTsForAssetAndDevice(List<Device> devices, Asset asset, int idx) throws ExecutionException, InterruptedException, TimeoutException {
         for (Device device : devices) {
-            TbMsg tbMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST,
-                    device.getId(),
-                    getTbMsgMetadata(device.getName(), ts.get(idx)),
-                    TbMsgDataType.JSON,
-                    getTbMsgData(msgValue.get(idx)));
+            TbMsg tbMsg = TbMsg.newMsg()
+                    .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                    .originator(device.getId())
+                    .copyMetaData(getTbMsgMetadata(device.getName(), ts.get(idx)))
+                    .dataType(TbMsgDataType.JSON)
+                    .data(getTbMsgData(msgValue.get(idx)))
+                    .build();
             saveDeviceTsEntry(device.getId(), tbMsg, msgValue.get(idx));
             saveAssetTsEntry(asset, device.getName(), msgValue.get(idx), TbMsgTimeseriesNode.computeTs(tbMsg, configuration.isUseServerTs()));
             idx++;
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 296191d61b..b58d19e0e5 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
@@ -27,6 +27,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.util.ReflectionTestUtils;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Device;
@@ -72,7 +73,7 @@ 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.anyList;
-import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.then;
@@ -82,6 +83,7 @@ import static org.mockito.Mockito.doReturn;
 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.when;
 import static org.thingsboard.server.service.state.DefaultDeviceStateService.ACTIVITY_STATE;
@@ -208,9 +210,12 @@ public class DefaultDeviceStateServiceTest {
         service.onDeviceConnect(tenantId, deviceId, lastConnectTime);
 
         // THEN
-        then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(LAST_CONNECT_TIME), eq(lastConnectTime), any()
-        );
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
+                        request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
+                        request.getEntries().get(0).getKey().equals(LAST_CONNECT_TIME) &&
+                        request.getEntries().get(0).getValue().equals(lastConnectTime)
+        ));
 
         var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         then(clusterService).should().pushMsgToRuleEngine(eq(tenantId), eq(deviceId), msgCaptor.capture(), any());
@@ -292,10 +297,12 @@ public class DefaultDeviceStateServiceTest {
         service.onDeviceDisconnect(tenantId, deviceId, lastDisconnectTime);
 
         // THEN
-        then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
-                eq(LAST_DISCONNECT_TIME), eq(lastDisconnectTime), any()
-        );
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
+                        request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
+                        request.getEntries().get(0).getKey().equals(LAST_DISCONNECT_TIME) &&
+                        request.getEntries().get(0).getValue().equals(lastDisconnectTime)
+        ));
 
         var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         then(clusterService).should().pushMsgToRuleEngine(eq(tenantId), eq(deviceId), msgCaptor.capture(), any());
@@ -413,14 +420,18 @@ public class DefaultDeviceStateServiceTest {
         service.onDeviceInactivity(tenantId, deviceId, lastInactivityTime);
 
         // THEN
-        then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                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(AttributeScope.SERVER_SCOPE),
-                eq(ACTIVITY_STATE), eq(false), any()
-        );
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
+                        request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
+                        request.getEntries().get(0).getKey().equals(INACTIVITY_ALARM_TIME) &&
+                        request.getEntries().get(0).getValue().equals(lastInactivityTime)
+        ));
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
+                        request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
+                        request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                        request.getEntries().get(0).getValue().equals(false)
+        ));
 
         var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         then(clusterService).should()
@@ -453,14 +464,17 @@ public class DefaultDeviceStateServiceTest {
         service.updateInactivityStateIfExpired(System.currentTimeMillis(), deviceId, deviceStateData);
 
         // THEN
-        then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                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(AttributeScope.SERVER_SCOPE),
-                eq(ACTIVITY_STATE), eq(false), any()
-        );
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
+                        request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
+                        request.getEntries().get(0).getKey().equals(INACTIVITY_ALARM_TIME)
+        ));
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
+                        request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
+                        request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                        request.getEntries().get(0).getValue().equals(false)
+        ));
 
         var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         then(clusterService).should()
@@ -612,7 +626,9 @@ public class DefaultDeviceStateServiceTest {
         long newTimeout = System.currentTimeMillis() - deviceState.getLastActivityTime() + increase;
 
         service.onDeviceInactivityTimeoutUpdate(tenantId, deviceId, newTimeout);
-        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), any(), any());
+        verify(telemetrySubscriptionService, never()).saveAttributes(argThat(request ->
+                request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE)
+        ));
         Thread.sleep(defaultTimeout + increase);
         service.checkStates();
         activityVerify(false);
@@ -651,7 +667,9 @@ public class DefaultDeviceStateServiceTest {
 
         long newTimeout = 1;
         Thread.sleep(newTimeout);
-        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), any(), any());
+        verify(telemetrySubscriptionService, never()).saveAttributes(argThat(request ->
+                request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE)
+        ));
     }
 
     @Test
@@ -672,8 +690,6 @@ public class DefaultDeviceStateServiceTest {
         service.onDeviceActivity(tenantId, deviceId, System.currentTimeMillis());
         activityVerify(true);
 
-        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), any(), any());
-
         long newTimeout = 1;
         Thread.sleep(newTimeout);
 
@@ -713,11 +729,17 @@ public class DefaultDeviceStateServiceTest {
         long newTimeout = 1;
 
         service.onDeviceInactivityTimeoutUpdate(tenantId, deviceId, newTimeout);
-        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), any(), any());
+        verify(telemetrySubscriptionService, never()).saveAttributes(argThat(request ->
+                request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE)
+        ));
     }
 
     private void activityVerify(boolean isActive) {
-        verify(telemetrySubscriptionService).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), eq(isActive), any());
+        verify(telemetrySubscriptionService).saveAttributes(argThat(request ->
+                request.getEntityId().equals(deviceId) &&
+                        request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                        request.getEntries().get(0).getValue().equals(isActive)
+        ));
     }
 
     @Test
@@ -763,21 +785,27 @@ public class DefaultDeviceStateServiceTest {
         // THEN
         assertThat(deviceState.isActive()).isEqualTo(true);
         assertThat(deviceState.getLastActivityTime()).isEqualTo(lastReportedActivity);
-        then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                any(), eq(deviceId), any(AttributeScope.class), eq(LAST_ACTIVITY_TIME), eq(lastReportedActivity), any()
-        );
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                request.getEntityId().equals(deviceId) &&
+                        request.getEntries().get(0).getKey().equals(LAST_ACTIVITY_TIME) &&
+                        request.getEntries().get(0).getValue().equals(lastReportedActivity)
+        ));
 
         assertThat(deviceState.getLastInactivityAlarmTime()).isEqualTo(expectedInactivityAlarmTime);
         if (shouldSetInactivityAlarmTimeToZero) {
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                    any(), eq(deviceId), any(AttributeScope.class), eq(INACTIVITY_ALARM_TIME), eq(0L), any()
-            );
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                    request.getEntityId().equals(deviceId) &&
+                            request.getEntries().get(0).getKey().equals(INACTIVITY_ALARM_TIME) &&
+                            request.getEntries().get(0).getValue().equals(0L)
+            ));
         }
 
         if (shouldUpdateActivityStateToActive) {
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                    eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(ACTIVITY_STATE), eq(true), any()
-            );
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                    request.getEntityId().equals(deviceId) &&
+                            request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                            request.getEntries().get(0).getValue().equals(true)
+            ));
 
             var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
             then(clusterService).should().pushMsgToRuleEngine(eq(tenantId), eq(deviceId), msgCaptor.capture(), any());
@@ -796,28 +824,28 @@ public class DefaultDeviceStateServiceTest {
 
     private static Stream<Arguments> provideParametersForUpdateActivityState() {
         return Stream.of(
-                Arguments.of(true,  100, 120, 80,  80,  false, false),
+                Arguments.of(true, 100, 120, 80, 80, false, false),
 
-                Arguments.of(true,  100, 120, 100, 100, false, false),
+                Arguments.of(true, 100, 120, 100, 100, false, false),
 
                 Arguments.of(false, 100, 120, 110, 110, false, true),
 
 
-                Arguments.of(true,  100, 100, 80,  80,  false, false),
+                Arguments.of(true, 100, 100, 80, 80, false, false),
 
-                Arguments.of(true,  100, 100, 100, 100, false, false),
+                Arguments.of(true, 100, 100, 100, 100, false, false),
 
-                Arguments.of(false, 100, 100, 110, 0,   true,  true),
+                Arguments.of(false, 100, 100, 110, 0, true, true),
 
 
-                Arguments.of(false, 100, 110, 110, 0,   true,  true),
+                Arguments.of(false, 100, 110, 110, 0, true, true),
 
-                Arguments.of(false, 100, 110, 120, 0,   true,  true),
+                Arguments.of(false, 100, 110, 120, 0, true, true),
 
 
-                Arguments.of(true,  0,   0,   0,   0,   false, false),
+                Arguments.of(true, 0, 0, 0, 0, false, false),
 
-                Arguments.of(false, 0,   0,   0,   0,   true,  true)
+                Arguments.of(false, 0, 0, 0, 0, true, true)
         );
     }
 
@@ -857,9 +885,10 @@ public class DefaultDeviceStateServiceTest {
         assertThat(deviceState.getInactivityTimeout()).isEqualTo(newInactivityTimeout);
         assertThat(deviceState.isActive()).isEqualTo(expectedActivityState);
         if (activityState && !expectedActivityState) {
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                    any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), eq(false), any()
-            );
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                    request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                            request.getEntries().get(0).getValue().equals(false)
+            ));
         }
     }
 
@@ -954,9 +983,10 @@ public class DefaultDeviceStateServiceTest {
         assertThat(state.getLastInactivityAlarmTime()).isEqualTo(expectedLastInactivityAlarmTime);
 
         if (shouldUpdateActivityStateToInactive) {
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                    eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(ACTIVITY_STATE), eq(false), any()
-            );
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                    request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                            request.getEntries().get(0).getValue().equals(false)
+            ));
 
             var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
             then(clusterService).should().pushMsgToRuleEngine(eq(tenantId), eq(deviceId), msgCaptor.capture(), any());
@@ -971,72 +1001,74 @@ public class DefaultDeviceStateServiceTest {
             assertThat(actualNotification.getDeviceId()).isEqualTo(deviceId);
             assertThat(actualNotification.isActive()).isFalse();
 
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                    eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
-                    eq(INACTIVITY_ALARM_TIME), eq(expectedLastInactivityAlarmTime), any()
-            );
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                    request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
+                            request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
+                            request.getEntries().get(0).getKey().equals(INACTIVITY_ALARM_TIME) &&
+                            request.getEntries().get(0).getValue().equals(expectedLastInactivityAlarmTime)
+            ));
         }
     }
 
     private static Stream<Arguments> provideParametersForUpdateInactivityStateIfExpired() {
         return Stream.of(
-                Arguments.of(false, 100, 70,  90,  70,  60,  false, 90,  false),
+                Arguments.of(false, 100, 70, 90, 70, 60, false, 90, false),
 
-                Arguments.of(false, 100, 40,  50,  70,  10,  false, 50,  false),
+                Arguments.of(false, 100, 40, 50, 70, 10, false, 50, false),
 
-                Arguments.of(false, 100, 25,  60,  75,  25,  false, 60,  false),
+                Arguments.of(false, 100, 25, 60, 75, 25, false, 60, false),
 
-                Arguments.of(false, 100, 60,  70,  10,  50,  false, 70,  false),
+                Arguments.of(false, 100, 60, 70, 10, 50, false, 70, false),
 
-                Arguments.of(false, 100, 10,  15,  90,  10,  false, 15,  false),
+                Arguments.of(false, 100, 10, 15, 90, 10, false, 15, false),
 
-                Arguments.of(false, 100, 0,   40,  75,  0,   false, 40,  false),
+                Arguments.of(false, 100, 0, 40, 75, 0, false, 40, false),
 
-                Arguments.of(true,  100, 90,  80,  80,  50,  true,  80,  false),
+                Arguments.of(true, 100, 90, 80, 80, 50, true, 80, false),
 
-                Arguments.of(true,  100, 95,  90,  10,  50,  true,  90,  false),
+                Arguments.of(true, 100, 95, 90, 10, 50, true, 90, false),
 
-                Arguments.of(true,  100, 10,  10,  90,  10,  false, 100, true),
+                Arguments.of(true, 100, 10, 10, 90, 10, false, 100, true),
 
-                Arguments.of(true,  100, 10,  10,  90,  11,  true,  10,  false),
+                Arguments.of(true, 100, 10, 10, 90, 11, true, 10, false),
 
-                Arguments.of(true,  100, 15,  10,  85,  5,   false, 100, true),
+                Arguments.of(true, 100, 15, 10, 85, 5, false, 100, true),
 
-                Arguments.of(true,  100, 15,  10,  75,  5,   false, 100, true),
+                Arguments.of(true, 100, 15, 10, 75, 5, false, 100, true),
 
-                Arguments.of(true,  100, 95,  90,  5,   50,  false, 100, true),
+                Arguments.of(true, 100, 95, 90, 5, 50, false, 100, true),
 
-                Arguments.of(true,  100, 0,   0,   101, 0,   true,  0,   false),
+                Arguments.of(true, 100, 0, 0, 101, 0, true, 0, false),
 
-                Arguments.of(true,  100, 0,   0,   100, 0,   false, 100, true),
+                Arguments.of(true, 100, 0, 0, 100, 0, false, 100, true),
 
-                Arguments.of(true,  100, 0,   0,   99,  0,   false, 100, true),
+                Arguments.of(true, 100, 0, 0, 99, 0, false, 100, true),
 
-                Arguments.of(true,  100, 0,   0,   120, 10,  true,  0,   false),
+                Arguments.of(true, 100, 0, 0, 120, 10, true, 0, false),
 
-                Arguments.of(true,  100, 50,  0,   100, 0,   true,  0,   false),
+                Arguments.of(true, 100, 50, 0, 100, 0, true, 0, false),
 
-                Arguments.of(true,  100, 10,  0,   91,  0,   true,  0,   false),
+                Arguments.of(true, 100, 10, 0, 91, 0, true, 0, false),
 
-                Arguments.of(true,  100, 90,  0,   10,  0,   false, 100, true),
+                Arguments.of(true, 100, 90, 0, 10, 0, false, 100, true),
 
-                Arguments.of(true,  100, 100, 100, 1,   0,   true,  100, false),
+                Arguments.of(true, 100, 100, 100, 1, 0, true, 100, false),
 
-                Arguments.of(true,  100, 100, 100, 100, 100, true,  100, false),
+                Arguments.of(true, 100, 100, 100, 100, 100, true, 100, false),
 
-                Arguments.of(false, 100, 59,  60,  30,  10,  false, 60,  false),
+                Arguments.of(false, 100, 59, 60, 30, 10, false, 60, false),
 
-                Arguments.of(true,  100, 60,  60,  30,  10,  false, 100, true),
+                Arguments.of(true, 100, 60, 60, 30, 10, false, 100, true),
 
-                Arguments.of(true,  100, 61,  60,  30,  10,  false, 100, true),
+                Arguments.of(true, 100, 61, 60, 30, 10, false, 100, true),
 
-                Arguments.of(true,  0,   0,   0,   1,   0,   true,  0,   false),
+                Arguments.of(true, 0, 0, 0, 1, 0, true, 0, false),
 
-                Arguments.of(true,  0,   0,   0,   0,   0,   false, 0,   true),
+                Arguments.of(true, 0, 0, 0, 0, 0, false, 0, true),
 
-                Arguments.of(true,  100, 90,  80,  20,  70,  true,  80,  false),
+                Arguments.of(true, 100, 90, 80, 20, 70, true, 80, false),
 
-                Arguments.of(true,  100, 80,  90,  30,  70,  true,  90,  false)
+                Arguments.of(true, 100, 80, 90, 30, 70, true, 90, false)
         );
     }
 
@@ -1100,7 +1132,10 @@ public class DefaultDeviceStateServiceTest {
         // THEN
         await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(service.deviceStates.get(deviceId).getState().isActive()).isEqualTo(false);
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(ACTIVITY_STATE), eq(false), any());
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                    request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                            request.getEntries().get(0).getValue().equals(false)
+            ));
         });
     }
 
@@ -1127,10 +1162,31 @@ public class DefaultDeviceStateServiceTest {
         service.onDeviceActivity(tenantId, deviceId, currentTime);
 
         // THEN
+        ArgumentCaptor<AttributesSaveRequest> attributeRequestCaptor = ArgumentCaptor.forClass(AttributesSaveRequest.class);
+        then(telemetrySubscriptionService).should(times(2)).saveAttributes(attributeRequestCaptor.capture());
+
         await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(service.deviceStates.get(deviceId).getState().isActive()).isEqualTo(true);
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(LAST_ACTIVITY_TIME), eq(currentTime), any());
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(ACTIVITY_STATE), eq(true), any());
+
+            assertThat(attributeRequestCaptor.getAllValues()).hasSize(2)
+                    .anySatisfy(request -> {
+                        assertThat(request.getTenantId()).isEqualTo(TenantId.SYS_TENANT_ID);
+                        assertThat(request.getEntityId()).isEqualTo(deviceId);
+                        assertThat(request.getScope()).isEqualTo(AttributeScope.SERVER_SCOPE);
+                        assertThat(request.getEntries()).singleElement().satisfies(attributeKvEntry -> {
+                            assertThat(attributeKvEntry.getKey()).isEqualTo(LAST_ACTIVITY_TIME);
+                            assertThat(attributeKvEntry.getLongValue()).hasValue(currentTime);
+                        });
+                    })
+                    .anySatisfy(request -> {
+                        assertThat(request.getTenantId()).isEqualTo(TenantId.SYS_TENANT_ID);
+                        assertThat(request.getEntityId()).isEqualTo(deviceId);
+                        assertThat(request.getScope()).isEqualTo(AttributeScope.SERVER_SCOPE);
+                        assertThat(request.getEntries()).singleElement().satisfies(attributeKvEntry -> {
+                            assertThat(attributeKvEntry.getKey()).isEqualTo(ACTIVITY_STATE);
+                            assertThat(attributeKvEntry.getBooleanValue()).hasValue(true);
+                        });
+                    });
         });
     }
 
@@ -1174,7 +1230,10 @@ public class DefaultDeviceStateServiceTest {
         // THEN
         await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(service.deviceStates.get(deviceId).getState().isActive()).isEqualTo(true);
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(ACTIVITY_STATE), eq(true), any());
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                    request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                            request.getEntries().get(0).getValue().equals(true)
+            ));
         });
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionServiceTest.java b/application/src/test/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionServiceTest.java
new file mode 100644
index 0000000000..10fdd85504
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionServiceTest.java
@@ -0,0 +1,373 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.telemetry;
+
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.SettableFuture;
+import org.checkerframework.checker.nullness.qual.NonNull;
+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.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
+import org.thingsboard.server.cluster.TbClusterService;
+import org.thingsboard.server.common.data.ApiUsageRecordKey;
+import org.thingsboard.server.common.data.ApiUsageState;
+import org.thingsboard.server.common.data.ApiUsageStateValue;
+import org.thingsboard.server.common.data.EntityView;
+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.EntityViewId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.DoubleDataEntry;
+import org.thingsboard.server.common.data.kv.KvEntry;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.common.data.objects.AttributesEntityView;
+import org.thingsboard.server.common.data.objects.TelemetryEntityView;
+import org.thingsboard.server.common.msg.queue.ServiceType;
+import org.thingsboard.server.common.msg.queue.TbCallback;
+import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
+import org.thingsboard.server.common.stats.TbApiUsageReportClient;
+import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.queue.discovery.PartitionService;
+import org.thingsboard.server.queue.discovery.QueueKey;
+import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
+import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
+import org.thingsboard.server.service.entitiy.entityview.TbEntityViewService;
+import org.thingsboard.server.service.subscription.SubscriptionManagerService;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.stream.LongStream;
+import java.util.stream.Stream;
+
+import static com.google.common.util.concurrent.Futures.immediateFuture;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
+import static org.mockito.Mockito.lenient;
+
+@ExtendWith(MockitoExtension.class)
+class DefaultTelemetrySubscriptionServiceTest {
+
+    final TenantId tenantId = TenantId.fromUUID(UUID.fromString("a00ec470-c6b4-11ef-8c88-63b5533fb5bc"));
+    final CustomerId customerId = new CustomerId(UUID.fromString("7bdc9750-c775-11ef-8e03-ff69ed8da327"));
+    final EntityId entityId = DeviceId.fromString("cc51e450-53e1-11ee-883e-e56b48fd2088");
+
+    final long sampleTtl = 10_000L;
+
+    final List<TsKvEntry> sampleTelemetry = List.of(
+            new BasicTsKvEntry(100L, new DoubleDataEntry("temperature", 65.2)),
+            new BasicTsKvEntry(100L, new DoubleDataEntry("humidity", 33.1))
+    );
+
+    ApiUsageState apiUsageState;
+
+    final TopicPartitionInfo tpi = TopicPartitionInfo.builder()
+            .tenantId(tenantId)
+            .myPartition(true)
+            .build();
+
+    final FutureCallback<Void> emptyCallback = new FutureCallback<>() {
+        @Override
+        public void onSuccess(Void result) {}
+
+        @Override
+        public void onFailure(@NonNull Throwable t) {}
+    };
+
+    ExecutorService wsCallBackExecutor;
+    ExecutorService tsCallBackExecutor;
+
+    @Mock
+    TbClusterService clusterService;
+    @Mock
+    PartitionService partitionService;
+    @Mock
+    SubscriptionManagerService subscriptionManagerService;
+    @Mock
+    AttributesService attrService;
+    @Mock
+    TimeseriesService tsService;
+    @Mock
+    TbEntityViewService tbEntityViewService;
+    @Mock
+    TbApiUsageReportClient apiUsageClient;
+    @Mock
+    TbApiUsageStateService apiUsageStateService;
+
+    DefaultTelemetrySubscriptionService telemetryService;
+
+    @BeforeEach
+    void setup() {
+        telemetryService = new DefaultTelemetrySubscriptionService(attrService, tsService, tbEntityViewService, apiUsageClient, apiUsageStateService);
+        ReflectionTestUtils.setField(telemetryService, "clusterService", clusterService);
+        ReflectionTestUtils.setField(telemetryService, "partitionService", partitionService);
+        ReflectionTestUtils.setField(telemetryService, "subscriptionManagerService", Optional.of(subscriptionManagerService));
+
+        wsCallBackExecutor = MoreExecutors.newDirectExecutorService();
+        ReflectionTestUtils.setField(telemetryService, "wsCallBackExecutor", wsCallBackExecutor);
+
+        tsCallBackExecutor = MoreExecutors.newDirectExecutorService();
+        ReflectionTestUtils.setField(telemetryService, "tsCallBackExecutor", tsCallBackExecutor);
+
+        apiUsageState = new ApiUsageState();
+        apiUsageState.setDbStorageState(ApiUsageStateValue.ENABLED);
+        lenient().when(apiUsageStateService.getApiUsageState(tenantId)).thenReturn(apiUsageState);
+
+        lenient().when(partitionService.resolve(ServiceType.TB_CORE, tenantId, entityId)).thenReturn(tpi);
+
+        lenient().when(tsService.save(tenantId, entityId, sampleTelemetry, sampleTtl)).thenReturn(immediateFuture(sampleTelemetry.size()));
+        lenient().when(tsService.saveWithoutLatest(tenantId, entityId, sampleTelemetry, sampleTtl)).thenReturn(immediateFuture(sampleTelemetry.size()));
+        lenient().when(tsService.saveLatest(tenantId, entityId, sampleTelemetry)).thenReturn(immediateFuture(listOfNNumbers(sampleTelemetry.size())));
+
+        // mock no entity views
+        lenient().when(tbEntityViewService.findEntityViewsByTenantIdAndEntityIdAsync(tenantId, entityId)).thenReturn(immediateFuture(Collections.emptyList()));
+
+        // send partition change event so currentPartitions set is populated
+        telemetryService.onTbApplicationEvent(new PartitionChangeEvent(this, ServiceType.TB_CORE, Map.of(new QueueKey(ServiceType.TB_CORE), Set.of(tpi))));
+    }
+
+    @AfterEach
+    void cleanup() {
+        wsCallBackExecutor.shutdownNow();
+        tsCallBackExecutor.shutdownNow();
+    }
+
+    @Test
+    void shouldReportStorageDataPointsApiUsageWhenTimeSeriesIsSaved() {
+        // GIVEN
+        var request = TimeseriesSaveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(customerId)
+                .entityId(entityId)
+                .entries(sampleTelemetry)
+                .ttl(sampleTtl)
+                .strategy(new TimeseriesSaveRequest.Strategy(true, false, false))
+                .callback(emptyCallback)
+                .build();
+
+        // WHEN
+        telemetryService.saveTimeseries(request);
+
+        // THEN
+        then(apiUsageClient).should().report(tenantId, customerId, ApiUsageRecordKey.STORAGE_DP_COUNT, sampleTelemetry.size());
+    }
+
+    @Test
+    void shouldNotReportStorageDataPointsApiUsageWhenTimeSeriesIsNotSaved() {
+        // GIVEN
+        var request = TimeseriesSaveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(customerId)
+                .entityId(entityId)
+                .entries(sampleTelemetry)
+                .ttl(sampleTtl)
+                .strategy(TimeseriesSaveRequest.Strategy.LATEST_AND_WS)
+                .callback(emptyCallback)
+                .build();
+
+        // WHEN
+        telemetryService.saveTimeseries(request);
+
+        // THEN
+        then(apiUsageClient).shouldHaveNoInteractions();
+    }
+
+    @Test
+    void shouldThrowStorageDisabledWhenTimeSeriesIsSavedAndStorageIsDisabled() {
+        // GIVEN
+        apiUsageState.setDbStorageState(ApiUsageStateValue.DISABLED);
+
+        SettableFuture<Void> future = SettableFuture.create();
+        var request = TimeseriesSaveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(customerId)
+                .entityId(entityId)
+                .entries(sampleTelemetry)
+                .ttl(sampleTtl)
+                .strategy(TimeseriesSaveRequest.Strategy.SAVE_ALL)
+                .future(future)
+                .build();
+
+        // WHEN
+        telemetryService.saveTimeseries(request);
+
+        // THEN
+        assertThat(future).failsWithin(Duration.ofSeconds(5))
+                .withThrowableOfType(ExecutionException.class)
+                .withCauseInstanceOf(RuntimeException.class)
+                .withMessageContaining("DB storage writes are disabled due to API limits!");
+    }
+
+    @Test
+    void shouldNotThrowStorageDisabledWhenTimeSeriesIsNotSavedAndStorageIsDisabled() {
+        // GIVEN
+        apiUsageState.setDbStorageState(ApiUsageStateValue.DISABLED);
+
+        SettableFuture<Void> future = SettableFuture.create();
+        var request = TimeseriesSaveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(customerId)
+                .entityId(entityId)
+                .entries(sampleTelemetry)
+                .ttl(sampleTtl)
+                .strategy(TimeseriesSaveRequest.Strategy.LATEST_AND_WS)
+                .future(future)
+                .build();
+
+        // WHEN
+        telemetryService.saveTimeseries(request);
+
+        // THEN
+        assertThat(future).succeedsWithin(Duration.ofSeconds(5));
+    }
+
+    @Test
+    void shouldCopyLatestToEntityViewWhenLatestIsSavedOnMainEntity() {
+        // GIVEN
+        var entityView = new EntityView(new EntityViewId(UUID.randomUUID()));
+        entityView.setTenantId(tenantId);
+        entityView.setCustomerId(customerId);
+        entityView.setEntityId(entityId);
+        entityView.setKeys(new TelemetryEntityView(sampleTelemetry.stream().map(KvEntry::getKey).toList(), new AttributesEntityView()));
+
+        // mock that there is one entity view
+        given(tbEntityViewService.findEntityViewsByTenantIdAndEntityIdAsync(tenantId, entityId)).willReturn(immediateFuture(List.of(entityView)));
+        // mock that save latest call for entity view is successful
+        given(tsService.saveLatest(tenantId, entityView.getId(), sampleTelemetry)).willReturn(immediateFuture(listOfNNumbers(sampleTelemetry.size())));
+        // mock TPI for entity view
+        given(partitionService.resolve(ServiceType.TB_CORE, tenantId, entityView.getId())).willReturn(tpi);
+
+        var request = TimeseriesSaveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(customerId)
+                .entityId(entityId)
+                .entries(sampleTelemetry)
+                .ttl(sampleTtl)
+                .strategy(new TimeseriesSaveRequest.Strategy(false, true, false))
+                .callback(emptyCallback)
+                .build();
+
+        // WHEN
+        telemetryService.saveTimeseries(request);
+
+        // THEN
+        // should save latest to both the main entity and it's entity view
+        then(tsService).should().saveLatest(tenantId, entityId, sampleTelemetry);
+        then(tsService).should().saveLatest(tenantId, entityView.getId(), sampleTelemetry);
+        then(tsService).shouldHaveNoMoreInteractions();
+
+        // should send WS update only for entity view (WS update for the main entity is disabled in the save request)
+        then(subscriptionManagerService).should().onTimeSeriesUpdate(tenantId, entityView.getId(), sampleTelemetry, TbCallback.EMPTY);
+        then(subscriptionManagerService).shouldHaveNoMoreInteractions();
+    }
+
+    @Test
+    void shouldNotCopyLatestToEntityViewWhenLatestIsNotSavedOnMainEntity() {
+        // GIVEN
+        var request = TimeseriesSaveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(customerId)
+                .entityId(entityId)
+                .entries(sampleTelemetry)
+                .ttl(sampleTtl)
+                .strategy(new TimeseriesSaveRequest.Strategy(true, false, false))
+                .callback(emptyCallback)
+                .build();
+
+        // WHEN
+        telemetryService.saveTimeseries(request);
+
+        // THEN
+        // should save only time series for the main entity
+        then(tsService).should().saveWithoutLatest(tenantId, entityId, sampleTelemetry, sampleTtl);
+        then(tsService).shouldHaveNoMoreInteractions();
+
+        // should not send any WS updates
+        then(subscriptionManagerService).shouldHaveNoInteractions();
+    }
+
+    @ParameterizedTest
+    @MethodSource("booleanCombinations")
+    void shouldCallCorrectApiBasedOnBooleanFlagsInTheSaveRequest(boolean saveTimeseries, boolean saveLatest, boolean sendWsUpdate) {
+        // GIVEN
+        var request = TimeseriesSaveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(customerId)
+                .entityId(entityId)
+                .entries(sampleTelemetry)
+                .ttl(sampleTtl)
+                .strategy(new TimeseriesSaveRequest.Strategy(saveTimeseries, saveLatest, sendWsUpdate))
+                .callback(emptyCallback)
+                .build();
+
+        // WHEN
+        telemetryService.saveTimeseries(request);
+
+        // THEN
+        if (saveTimeseries && saveLatest) {
+            then(tsService).should().save(tenantId, entityId, sampleTelemetry, sampleTtl);
+        } else if (saveLatest) {
+            then(tsService).should().saveLatest(tenantId, entityId, sampleTelemetry);
+        } else if (saveTimeseries) {
+            then(tsService).should().saveWithoutLatest(tenantId, entityId, sampleTelemetry, sampleTtl);
+        }
+        then(tsService).shouldHaveNoMoreInteractions();
+
+        if (sendWsUpdate) {
+            then(subscriptionManagerService).should().onTimeSeriesUpdate(tenantId, entityId, sampleTelemetry, TbCallback.EMPTY);
+        } else {
+            then(subscriptionManagerService).shouldHaveNoInteractions();
+        }
+    }
+
+    private static Stream<Arguments> booleanCombinations() {
+        return Stream.of(
+                Arguments.of(true, true, true),
+                Arguments.of(true, true, false),
+                Arguments.of(true, false, true),
+                Arguments.of(true, false, false),
+                Arguments.of(false, true, true),
+                Arguments.of(false, true, false),
+                Arguments.of(false, false, true),
+                Arguments.of(false, false, false)
+        );
+    }
+
+    // used to emulate sequence numbers returned by save latest API
+    private static List<Long> listOfNNumbers(int N) {
+        return LongStream.range(0, N).boxed().toList();
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java b/application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java
index 7b9cb0ed4d..6206523d4d 100644
--- a/application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.service.ttl;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
@@ -40,6 +40,7 @@ import java.util.concurrent.TimeUnit;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.startsWith;
+import static org.mockito.BDDMockito.willReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
@@ -49,19 +50,19 @@ import static org.mockito.Mockito.verify;
 })
 public class AlarmsCleanUpServiceTest extends AbstractControllerTest {
 
-    @Autowired
+    @SpyBean
     private AlarmsCleanUpService alarmsCleanUpService;
     @SpyBean
     private AlarmService alarmService;
     @Autowired
     private AlarmDao alarmDao;
 
-    private static Logger cleanUpServiceLogger;
+    private Logger cleanUpServiceLoggerSpy;
 
-    @BeforeClass
-    public static void before() throws Exception {
-        cleanUpServiceLogger = Mockito.spy(LoggerFactory.getLogger(AlarmsCleanUpService.class));
-        setStaticFinalFieldValue(AlarmsCleanUpService.class, "log", cleanUpServiceLogger);
+    @Before
+    public void beforeEach() throws Exception {
+        cleanUpServiceLoggerSpy = Mockito.spy(LoggerFactory.getLogger(AlarmsCleanUpService.class));
+        willReturn(cleanUpServiceLoggerSpy).given(alarmsCleanUpService).getLogger();
     }
 
     @Test
@@ -110,7 +111,7 @@ public class AlarmsCleanUpServiceTest extends AbstractControllerTest {
             verify(alarmService, never()).delAlarm(eq(tenantId), eq(freshAlarm), eq(false));
         }
 
-        verify(cleanUpServiceLogger).info(startsWith("Removed {} outdated alarm"), eq((long) count), eq(tenantId), any());
+        verify(cleanUpServiceLoggerSpy).info(startsWith("Removed {} outdated alarm"), eq((long) count), eq(tenantId), any());
     }
 
 }
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/AbstractCoapIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/AbstractCoapIntegrationTest.java
index 33c83b5623..2b0d87527b 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/AbstractCoapIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/AbstractCoapIntegrationTest.java
@@ -54,6 +54,14 @@ public abstract class AbstractCoapIntegrationTest extends AbstractTransportInteg
 
     protected final byte[] EMPTY_PAYLOAD = new byte[0];
     protected CoapTestClient client;
+    protected static final String PAYLOAD_VALUES_STR = "{\"key1\":\"value1\", \"key2\":true, \"key3\": 3.0, \"key4\": 4," +
+            " \"key5\": {\"someNumber\": 42, \"someArray\": [1,2,3], \"someNestedObject\": {\"key\": \"value\"}}}";
+    protected static final String PAYLOAD_VALUES_STR_01 = "{\"key2\":\"value2\", \"key3\":false, \"key4\": 4.0, \"key5\": 5," +
+            " \"key6\": {\"someNumber_02\": 52, \"someArray_02\": [1,2,3,4], \"someNestedObject_02\": {\"key_02\": \"value_02\"}}}";
+
+    protected void processBeforeTest() throws Exception {
+        loginTenantAdmin();
+    }
 
     protected void processAfterTest() throws Exception {
         if (client != null) {
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 112d3e6aa5..534c83bd40 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
@@ -63,8 +63,6 @@ import static org.thingsboard.server.common.data.query.EntityKeyType.SHARED_ATTR
 @DaoSqlTest
 public class CoapClientIntegrationTest extends AbstractCoapIntegrationTest {
 
-    private static final String PAYLOAD_VALUES_STR = "{\"key1\":\"value1\", \"key2\":true, \"key3\": 3.0, \"key4\": 4," +
-            " \"key5\": {\"someNumber\": 42, \"someArray\": [1,2,3], \"someNestedObject\": {\"key\": \"value\"}}}";
     private static final List<String> EXPECTED_KEYS = Arrays.asList("key1", "key2", "key3", "key4", "key5");
     private static final String DEVICE_RESPONSE = "{\"value1\":\"A\",\"value2\":\"B\"}";
 
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/security/AbstractCoapSecurityIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/security/AbstractCoapSecurityIntegrationTest.java
new file mode 100644
index 0000000000..8413c6f32b
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/security/AbstractCoapSecurityIntegrationTest.java
@@ -0,0 +1,291 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.security;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.core.CoapResponse;
+import org.eclipse.californium.core.coap.CoAP;
+import org.junit.Assert;
+import org.springframework.test.context.TestPropertySource;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.CoapDeviceType;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.SaveDeviceWithCredentialsRequest;
+import org.thingsboard.server.common.data.TransportPayloadType;
+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.data.security.DeviceCredentialsType;
+import org.thingsboard.server.common.msg.session.FeatureType;
+import org.thingsboard.server.transport.coap.AbstractCoapIntegrationTest;
+import org.thingsboard.server.transport.coap.x509.CertPrivateKey;
+import org.thingsboard.server.transport.coap.x509.CoapClientX509Test;
+import org.thingsboard.server.transport.coap.CoapTestConfigProperties;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.ServerSocket;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static org.awaitility.Awaitility.await;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Slf4j
+@TestPropertySource(properties = {
+        "coap.enabled=true",
+        "coap.dtls.enabled=true",
+        "coap.dtls.credentials.pem.cert_file=coap/credentials/server/cert.pem",
+        "device.connectivity.coaps.enabled=true",
+        "service.integrations.supported=ALL",
+        "transport.coap.enabled=true",
+})
+public abstract class AbstractCoapSecurityIntegrationTest extends AbstractCoapIntegrationTest {
+    private static final String COAPS_BASE_URL = "coaps://localhost:5684/api/v1/";
+    protected final String CREDENTIALS_PATH = "coap/credentials/";
+    protected final String CREDENTIALS_PATH_CLIENT = CREDENTIALS_PATH + "client/";
+    protected final String CREDENTIALS_PATH_CLIENT_CERT_PEM = CREDENTIALS_PATH_CLIENT + "cert.pem";
+    protected final String CREDENTIALS_PATH_CLIENT_KEY_PEM = CREDENTIALS_PATH_CLIENT + "key.pem";
+    protected final X509Certificate clientX509CertTrustNo;                                      // client certificate signed by intermediate, rootCA with a good CN ("host name")
+    protected final PrivateKey clientPrivateKeyFromCertTrustNo;
+
+    protected static final String CLIENT_JKS_FOR_TEST = "coapclientTest";
+    protected static final String CLIENT_STORE_PWD = "client_ks_password";
+    protected static final String CLIENT_ALIAS_CERT_TRUST_NO = "client_alias_trust_no";
+
+    protected AbstractCoapSecurityIntegrationTest() {
+
+        try {
+            // Get certificates from key store
+            char[] clientKeyStorePwd = CLIENT_STORE_PWD.toCharArray();
+            KeyStore clientKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+            try (InputStream clientKeyStoreFile =
+                         this.getClass().getClassLoader().
+                                 getResourceAsStream(CREDENTIALS_PATH + CLIENT_JKS_FOR_TEST + ".jks")) {
+                clientKeyStore.load(clientKeyStoreFile, clientKeyStorePwd);
+            }
+            // No trust
+            clientPrivateKeyFromCertTrustNo = (PrivateKey) clientKeyStore.getKey(CLIENT_ALIAS_CERT_TRUST_NO, clientKeyStorePwd);
+            clientX509CertTrustNo = (X509Certificate) clientKeyStore.getCertificate(CLIENT_ALIAS_CERT_TRUST_NO);
+        } catch (GeneralSecurityException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected Device createDeviceWithX509(String deviceName, DeviceProfileId deviceProfileId, X509Certificate clientX509Cert) throws Exception {
+        Device device = new Device();
+        device.setName(deviceName);
+        device.setType(deviceName);
+        device.setDeviceProfileId(deviceProfileId);
+
+        DeviceCredentials deviceCredentials = new DeviceCredentials();
+        deviceCredentials.setCredentialsType(DeviceCredentialsType.X509_CERTIFICATE);
+        String pemFormatCert = CertPrivateKey.convertCertToPEM(clientX509Cert);
+        deviceCredentials.setCredentialsValue(pemFormatCert);
+
+        SaveDeviceWithCredentialsRequest saveRequest = new SaveDeviceWithCredentialsRequest(device, deviceCredentials);
+        Device deviceX509 = readResponse(doPost("/api/device-with-credentials", saveRequest)
+                .andExpect(status().isOk()), Device.class);
+        DeviceCredentials savedDeviceCredentials =
+                doGet("/api/device/" + deviceX509.getId().getId() + "/credentials", DeviceCredentials.class);
+        Assert.assertNotNull(savedDeviceCredentials);
+        Assert.assertNotNull(savedDeviceCredentials.getId());
+        Assert.assertEquals(deviceX509.getId(), savedDeviceCredentials.getDeviceId());
+        Assert.assertEquals(DeviceCredentialsType.X509_CERTIFICATE, savedDeviceCredentials.getCredentialsType());
+        accessToken = savedDeviceCredentials.getCredentialsId();
+        assertNotNull(accessToken);
+        return deviceX509;
+    }
+
+    protected void clientX509FromJksUpdateAttributesTest() throws Exception {
+        CertPrivateKey certPrivateKey = new CertPrivateKey(clientX509CertTrustNo, clientPrivateKeyFromCertTrustNo);
+        CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
+                .coapDeviceType(CoapDeviceType.DEFAULT)
+                .transportPayloadType(TransportPayloadType.JSON)
+                .build();
+        DeviceProfile deviceProfile = createCoapDeviceProfile(configProperties);
+        assertNotNull(deviceProfile);
+        CoapClientX509Test clientX509 = clientX509UpdateTest(FeatureType.ATTRIBUTES, certPrivateKey,
+                "CoapX509TrustNo_" + FeatureType.ATTRIBUTES.name(), deviceProfile.getId(), null);
+        clientX509.disconnect();
+    }
+
+    protected void clientX509FromPathUpdateFeatureTypeTest(FeatureType featureType) throws Exception {
+        CertPrivateKey certPrivateKey = new CertPrivateKey(CREDENTIALS_PATH_CLIENT_CERT_PEM, CREDENTIALS_PATH_CLIENT_KEY_PEM);
+        CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
+                .coapDeviceType(CoapDeviceType.DEFAULT)
+                .transportPayloadType(TransportPayloadType.JSON)
+                .build();
+        DeviceProfile deviceProfile = createCoapDeviceProfile(configProperties);
+        assertNotNull(deviceProfile);
+        CoapClientX509Test clientX509 = clientX509UpdateTest(featureType, certPrivateKey,
+                "CoapX509TrustNo_" + featureType.name(), deviceProfile.getId(), null);
+        clientX509.disconnect();
+    }
+    protected void twoClientWithSamePortX509FromPathConnectTest() throws Exception {
+        CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
+                .coapDeviceType(CoapDeviceType.DEFAULT)
+                .transportPayloadType(TransportPayloadType.JSON)
+                .build();
+        DeviceProfile deviceProfile = createCoapDeviceProfile(configProperties);
+        CertPrivateKey certPrivateKey = new CertPrivateKey(CREDENTIALS_PATH_CLIENT_CERT_PEM, CREDENTIALS_PATH_CLIENT_KEY_PEM);
+        CertPrivateKey certPrivateKey_01 = new CertPrivateKey(CREDENTIALS_PATH_CLIENT + "cert_01.pem",
+                CREDENTIALS_PATH_CLIENT + "key_01.pem");
+        Integer fixedPort =  getFreePort();
+        CoapClientX509Test clientX509 = clientX509UpdateTest(FeatureType.ATTRIBUTES, certPrivateKey,
+                "CoapX509TrustNo_" + FeatureType.TELEMETRY.name(), deviceProfile.getId(), fixedPort);
+        clientX509.disconnect();
+        await("Need to make port " + fixedPort + " free")
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> isPortAvailable(fixedPort));
+        CoapClientX509Test clientX509_01 = clientX509UpdateTest(FeatureType.ATTRIBUTES, certPrivateKey_01,
+                "CoapX509TrustNo_" + FeatureType.TELEMETRY.name() + "_01", deviceProfile.getId(),
+                fixedPort, PAYLOAD_VALUES_STR_01);
+        clientX509_01.disconnect();
+    }
+
+    private CoapClientX509Test clientX509UpdateTest(FeatureType featureType, CertPrivateKey certPrivateKey,
+                            String deviceName, DeviceProfileId deviceProfileId, Integer fixedPort) throws Exception {
+        return clientX509UpdateTest(featureType, certPrivateKey, deviceName, deviceProfileId, fixedPort, null);
+    }
+
+    private CoapClientX509Test clientX509UpdateTest(FeatureType featureType, CertPrivateKey certPrivateKey,
+              String deviceName, DeviceProfileId deviceProfileId, Integer fixedPort, String payload) throws Exception {
+        String payloadValuesStr = payload == null ? PAYLOAD_VALUES_STR : payload;
+        Device deviceX509 = createDeviceWithX509(deviceName, deviceProfileId, certPrivateKey.getCert());
+        CoapClientX509Test clientX509 = new CoapClientX509Test(certPrivateKey, featureType, COAPS_BASE_URL, fixedPort);
+        CoapResponse coapResponseX509 = clientX509.postMethod(payloadValuesStr);
+        assertNotNull(coapResponseX509);
+        assertEquals(CoAP.ResponseCode.CREATED, coapResponseX509.getCode());
+
+        if (FeatureType.ATTRIBUTES.equals(featureType)) {
+            DeviceId deviceId = deviceX509.getId();
+            JsonNode expectedNode = JacksonUtil.toJsonNode(payloadValuesStr);
+            List<String> expectedKeys = getKeysFromNode(expectedNode);
+            List<String> actualKeys = getActualKeysList(deviceId, expectedKeys, "attributes/CLIENT_SCOPE");
+            assertNotNull(actualKeys);
+
+            Set<String> actualKeySet = new HashSet<>(actualKeys);
+            Set<String> expectedKeySet = new HashSet<>(expectedKeys);
+            assertEquals(expectedKeySet, actualKeySet);
+
+            String getAttributesValuesUrl = getAttributesValuesUrl(deviceId, actualKeySet, "attributes/CLIENT_SCOPE");
+            List<Map<String, Object>> actualValues = doGetAsyncTyped(getAttributesValuesUrl, new TypeReference<>() {
+            });
+            assertValuesList(actualValues, expectedNode);
+        }
+        return clientX509;
+    }
+
+    private List<String> getActualKeysList(DeviceId deviceId, List<String> expectedKeys, String apiSuffix) throws Exception {
+        long start = System.currentTimeMillis();
+        long end = System.currentTimeMillis() + 5000;
+
+        List<String> actualKeys = null;
+        while (start <= end) {
+            actualKeys = doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + deviceId + "/keys/" + apiSuffix, new TypeReference<>() {
+            });
+            if (actualKeys.size() == expectedKeys.size()) {
+                break;
+            }
+            Thread.sleep(100);
+            start += 100;
+        }
+        return actualKeys;
+    }
+
+    private String getAttributesValuesUrl(DeviceId deviceId, Set<String> actualKeySet, String apiSuffix) {
+        return "/api/plugins/telemetry/DEVICE/" + deviceId + "/values/" + apiSuffix + "?keys=" + String.join(",", actualKeySet);
+    }
+
+    private List getKeysFromNode(JsonNode jNode) {
+        List<String> jKeys = new ArrayList<>();
+        Iterator<String> fieldNames = jNode.fieldNames();
+        while (fieldNames.hasNext()) {
+            jKeys.add(fieldNames.next());
+        }
+        return jKeys;
+    }
+
+    protected void assertValuesList(List<Map<String, Object>> actualValues, JsonNode expectedValues) {
+        assertTrue(actualValues.size() > 0);
+        assertEquals(expectedValues.size(), actualValues.size());
+        for (Map<String, Object> map : actualValues) {
+            String key = (String) map.get("key");
+            Object actualValue = map.get("value");
+            assertTrue(expectedValues.has(key));
+            JsonNode expectedValue = expectedValues.get(key);
+            assertExpectedActualValue(expectedValue, actualValue);
+        }
+    }
+
+    protected void assertExpectedActualValue(JsonNode expectedValue, Object actualValue) {
+        switch (expectedValue.getNodeType()) {
+            case STRING:
+                assertEquals(expectedValue.asText(), actualValue);
+                break;
+            case NUMBER:
+                if (expectedValue.isInt()) {
+                    assertEquals(expectedValue.asInt(), actualValue);
+                } else if (expectedValue.isLong()) {
+                    assertEquals(expectedValue.asLong(), actualValue);
+                } else if (expectedValue.isFloat() || expectedValue.isDouble()) {
+                    assertEquals(expectedValue.asDouble(), actualValue);
+                }
+                break;
+            case BOOLEAN:
+                assertEquals(expectedValue.asBoolean(), actualValue);
+                break;
+            case ARRAY:
+            case OBJECT:
+                expectedValue.toString().equals(JacksonUtil.toString(actualValue));
+                break;
+            default:
+                break;
+        }
+    }
+
+    private static int getFreePort() throws IOException {
+        try (ServerSocket socket = new ServerSocket(0)) {
+            return socket.getLocalPort();
+        }
+    }
+
+    private static boolean isPortAvailable(int port) {
+        try (ServerSocket serverSocket = new ServerSocket(port)) {
+            serverSocket.setReuseAddress(true);
+            return true;
+        } catch (IOException e) {
+            return false;
+        }
+    }
+}
+
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/security/sql/CoapClientX509SecurityJksIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/security/sql/CoapClientX509SecurityJksIntegrationTest.java
new file mode 100644
index 0000000000..12f373948b
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/security/sql/CoapClientX509SecurityJksIntegrationTest.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.transport.coap.security.sql;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.test.context.TestPropertySource;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.transport.coap.security.AbstractCoapSecurityIntegrationTest;
+
+@Slf4j
+@DaoSqlTest
+@TestPropertySource(properties = {
+        "coap.dtls.credentials.type=KEYSTORE",
+        "coap.dtls.credentials.keystore.store_file=coap/credentials/coapserverTest.jks",
+        "coap.dtls.credentials.keystore.key_password=server_ks_password",
+        "coap.dtls.credentials.keystore.key_alias=server",
+})
+public class CoapClientX509SecurityJksIntegrationTest extends AbstractCoapSecurityIntegrationTest {
+
+    @Before
+    public void beforeTest() throws Exception {
+        processBeforeTest();
+    }
+
+    @Test
+    public void testX509NoTrustFromJksConnectCoapSuccessUpdateAttributesSuccess() throws Exception {
+        clientX509FromJksUpdateAttributesTest();
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/security/sql/CoapClientX509SecurityPemIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/security/sql/CoapClientX509SecurityPemIntegrationTest.java
new file mode 100644
index 0000000000..9e65943622
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/security/sql/CoapClientX509SecurityPemIntegrationTest.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.transport.coap.security.sql;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.common.msg.session.FeatureType;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.transport.coap.security.AbstractCoapSecurityIntegrationTest;
+
+@Slf4j
+@DaoSqlTest
+public class CoapClientX509SecurityPemIntegrationTest extends AbstractCoapSecurityIntegrationTest {
+    @Before
+    public void beforeTest() throws Exception {
+        processBeforeTest();
+    }
+
+    @Test
+    public void testX509NoTrustFromPathConnectCoapSuccessUpdateAttributesSuccess() throws Exception {
+        clientX509FromPathUpdateFeatureTypeTest(FeatureType.ATTRIBUTES);
+    }
+    @Test
+    public void testX509NoTrustFromPathConnectCoapSuccessUpdateTelemetrySuccess() throws Exception {
+        clientX509FromPathUpdateFeatureTypeTest(FeatureType.TELEMETRY);
+    }    @Test
+    public void testTwoDevicesWithSamePortX509NoTrustFromPathConnectCoapSuccess() throws Exception {
+        twoClientWithSamePortX509FromPathConnectTest();
+    }
+}
\ No newline at end of file
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/telemetry/attributes/CoapAttributesIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/telemetry/attributes/CoapAttributesIntegrationTest.java
index 292fae3456..4c8b9094f0 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/telemetry/attributes/CoapAttributesIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/telemetry/attributes/CoapAttributesIntegrationTest.java
@@ -44,9 +44,6 @@ import static org.junit.Assert.assertTrue;
 @DaoSqlTest
 public class CoapAttributesIntegrationTest extends AbstractCoapIntegrationTest {
 
-    private static final String PAYLOAD_VALUES_STR = "{\"key1\":\"value1\", \"key2\":true, \"key3\": 3.0, \"key4\": 4," +
-            " \"key5\": {\"someNumber\": 42, \"someArray\": [1,2,3], \"someNestedObject\": {\"key\": \"value\"}}}";
-
     @Before
     public void beforeTest() throws Exception {
         CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/telemetry/timeseries/AbstractCoapTimeseriesIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/telemetry/timeseries/AbstractCoapTimeseriesIntegrationTest.java
index b02a97bbfa..8cbff6c105 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/telemetry/timeseries/AbstractCoapTimeseriesIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/telemetry/timeseries/AbstractCoapTimeseriesIntegrationTest.java
@@ -40,9 +40,6 @@ import static org.junit.Assert.assertNotNull;
 @Slf4j
 public abstract class AbstractCoapTimeseriesIntegrationTest extends AbstractCoapIntegrationTest {
 
-    private static final String PAYLOAD_VALUES_STR = "{\"key1\":\"value1\", \"key2\":true, \"key3\": 3.0, \"key4\": 4," +
-            " \"key5\": {\"someNumber\": 42, \"someArray\": [1,2,3], \"someNestedObject\": {\"key\": \"value\"}}}";
-
     @Before
     public void beforeTest() throws Exception {
         CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/x509/CertPrivateKey.java b/application/src/test/java/org/thingsboard/server/transport/coap/x509/CertPrivateKey.java
new file mode 100644
index 0000000000..8fce5b7e79
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/x509/CertPrivateKey.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.coap.x509;
+
+import org.apache.commons.io.FileUtils;
+import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
+import org.thingsboard.common.util.SslUtil;
+import java.io.File;
+import java.io.IOException;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import java.security.interfaces.ECPrivateKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Base64;
+import java.util.List;
+
+public class CertPrivateKey {
+    private final X509Certificate cert;
+    private PrivateKey privateKey;
+
+    public CertPrivateKey(String certFilePathPem, String keyFilePathPem) throws Exception {
+        List<X509Certificate> certs = SslUtil.readCertFile(fileRead(certFilePathPem));
+        this.cert = certs.get(0);
+        this.privateKey = SslUtil.readPrivateKey(fileRead(keyFilePathPem), null);
+        if (this.privateKey instanceof BCECPrivateKey) {
+            PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(this.privateKey.getEncoded());
+            KeyFactory keyFactory = KeyFactory.getInstance("EC");
+            this.privateKey = keyFactory.generatePrivate(keySpec);
+        }
+        if (!(this.privateKey instanceof ECPrivateKey)) {
+            throw new RuntimeException("Private key generation must be of type java.security.interfaces.ECPrivateKey, which is used in the standard Java API!");
+        }
+    }
+
+    public CertPrivateKey(X509Certificate cert, PrivateKey privateKey) {
+        this.cert = cert;
+        this.privateKey = privateKey;
+    }
+
+    public X509Certificate getCert() {
+        return this.cert;
+    }
+
+    public PrivateKey getPrivateKey() {
+        return this.privateKey;
+    }
+
+    private String fileRead(String fileName) throws IOException {
+        ClassLoader classLoader = getClass().getClassLoader();
+        File file = new File(classLoader.getResource(fileName).getFile());
+        return FileUtils.readFileToString(file, "UTF-8");
+    }
+
+    public static String convertCertToPEM(X509Certificate certificate) throws Exception {
+        StringBuilder pemBuilder = new StringBuilder();
+        pemBuilder.append("-----BEGIN CERTIFICATE-----\n");
+        // Copy cert to Base64
+        String base64EncodedCert = Base64.getEncoder().encodeToString(certificate.getEncoded());
+        int index = 0;
+        while (index < base64EncodedCert.length()) {
+            pemBuilder.append(base64EncodedCert, index, Math.min(index + 64, base64EncodedCert.length()));
+            pemBuilder.append("\n");
+            index += 64;
+        }
+        pemBuilder.append("-----END CERTIFICATE-----\n");
+        return pemBuilder.toString();
+    }
+}
\ No newline at end of file
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/x509/CoapClientX509Test.java b/application/src/test/java/org/thingsboard/server/transport/coap/x509/CoapClientX509Test.java
new file mode 100644
index 0000000000..d13380b19c
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/x509/CoapClientX509Test.java
@@ -0,0 +1,239 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.x509;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+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.core.config.CoapConfig;
+import org.eclipse.californium.core.network.CoapEndpoint;
+import org.eclipse.californium.elements.config.Configuration;
+import org.eclipse.californium.elements.config.ValueException;
+import org.eclipse.californium.elements.exception.ConnectorException;
+import org.eclipse.californium.scandium.DTLSConnector;
+import org.eclipse.californium.scandium.config.DtlsConfig.SignatureAndHashAlgorithmsDefinition;
+import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
+import org.eclipse.californium.scandium.dtls.CertificateType;
+import org.eclipse.californium.scandium.dtls.SignatureAndHashAlgorithm;
+import org.eclipse.californium.scandium.dtls.SignatureAndHashAlgorithm.HashAlgorithm;
+import org.eclipse.californium.scandium.dtls.SignatureAndHashAlgorithm.SignatureAlgorithm;
+import org.eclipse.californium.scandium.dtls.cipher.CipherSuite;
+import org.eclipse.californium.scandium.dtls.x509.CertificateProvider;
+import org.eclipse.californium.scandium.dtls.x509.SingleCertificateProvider;
+import org.thingsboard.server.common.msg.session.FeatureType;
+import org.thingsboard.server.transport.coap.CoapTestCallback;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.eclipse.californium.core.config.CoapConfig.DEFAULT_BLOCKWISE_STATUS_LIFETIME_IN_SECONDS;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_AUTO_HANDSHAKE_TIMEOUT;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CIPHER_SUITES;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_MAX_FRAGMENTED_HANDSHAKE_MESSAGE_LENGTH;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_MAX_PENDING_HANDSHAKE_RESULT_JOBS;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_MAX_RETRANSMISSIONS;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_MAX_RETRANSMISSION_TIMEOUT;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RECEIVE_BUFFER_SIZE;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_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.DTLS_SIGNATURE_AND_HASH_ALGORITHMS;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_USE_HELLO_VERIFY_REQUEST;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_USE_MULTI_HANDSHAKE_MESSAGE_RECORDS;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_VERIFY_SERVER_CERTIFICATES_SUBJECT;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DtlsRole.CLIENT_ONLY;
+import static org.eclipse.californium.scandium.config.DtlsConfig.MODULE;
+import static org.eclipse.californium.scandium.dtls.SignatureAndHashAlgorithm.SHA256_WITH_ECDSA;
+import static org.eclipse.californium.scandium.dtls.SignatureAndHashAlgorithm.SHA256_WITH_RSA;
+import static org.eclipse.californium.scandium.dtls.SignatureAndHashAlgorithm.SHA384_WITH_ECDSA;
+
+@Slf4j
+public class CoapClientX509Test {
+
+    private static final long CLIENT_REQUEST_TIMEOUT = 60000L;
+
+    private final CoapClient clientX509;
+    private final DTLSConnector dtlsConnector;
+    private final Configuration config;
+    private final CertPrivateKey certPrivateKey;
+    private final String coapsBaseUrl;
+
+    @Getter
+    private CoAP.Type type = CoAP.Type.CON;
+
+    public CoapClientX509Test(CertPrivateKey certPrivateKey, FeatureType featureType, String coapsBaseUrl, Integer fixedPort) {
+        this.certPrivateKey = certPrivateKey;
+        this.coapsBaseUrl = coapsBaseUrl;
+        this.config = createConfiguration();
+        this.dtlsConnector = createDTLSConnector(fixedPort);
+        this.clientX509 = createClient(getFeatureTokenUrl(featureType));
+    }
+    public void disconnect() {
+        if (clientX509 != null) {
+            clientX509.shutdown();
+        }
+    }
+
+    public CoapResponse postMethod(String requestBody) throws ConnectorException, IOException {
+        return this.postMethod(requestBody.getBytes());
+    }
+
+    public CoapResponse postMethod(byte[] requestBodyBytes) throws ConnectorException, IOException {
+        return clientX509.setTimeout(CLIENT_REQUEST_TIMEOUT).post(requestBodyBytes, MediaTypeRegistry.APPLICATION_JSON);
+    }
+
+    public void postMethod(CoapHandler handler, String payload, int format) {
+        clientX509.setTimeout(CLIENT_REQUEST_TIMEOUT).post(handler, payload, format);
+    }
+
+    public void postMethod(CoapHandler handler, byte[] payload) {
+        clientX509.setTimeout(CLIENT_REQUEST_TIMEOUT).post(handler, payload,  MediaTypeRegistry.APPLICATION_JSON);
+    }
+    public void postMethod(CoapHandler handler, byte[] payload, int format) {
+        clientX509.setTimeout(CLIENT_REQUEST_TIMEOUT).post(handler, payload, format);
+    }
+
+    public CoapResponse getMethod() throws ConnectorException, IOException {
+        return clientX509.setTimeout(CLIENT_REQUEST_TIMEOUT).get();
+    }
+
+    public CoapObserveRelation getObserveRelation(CoapTestCallback callback) {
+        return getObserveRelation(callback, true);
+    }
+
+    public CoapObserveRelation getObserveRelation(CoapTestCallback callback, boolean confirmable) {
+        Request request = Request.newGet().setObserve();
+        request.setType(confirmable ? CoAP.Type.CON : CoAP.Type.NON);
+        return clientX509.observe(request, callback);
+    }
+
+    public void setURI(String featureTokenUrl) {
+        if (clientX509 == null) {
+            throw new RuntimeException("Failed to connect! CoapClient is not initialized!");
+        }
+        clientX509.setURI(featureTokenUrl);
+    }
+
+    public void setURI(String accessToken, FeatureType featureType) {
+        if (featureType == null) {
+            featureType = FeatureType.ATTRIBUTES;
+        }
+        setURI(getFeatureTokenUrl(accessToken, featureType));
+    }
+
+    public void useCONs() {
+        if (clientX509 == null) {
+            throw new RuntimeException("Failed to connect! CoapClient is not initialized!");
+        }
+        type = CoAP.Type.CON;
+        clientX509.useCONs();
+    }
+
+    public void useNONs() {
+        if (clientX509 == null) {
+            throw new RuntimeException("Failed to connect! CoapClient is not initialized!");
+        }
+        type = CoAP.Type.NON;
+        clientX509.useNONs();
+    }
+
+    private Configuration createConfiguration() {
+        Configuration clientCoapConfig = new Configuration();
+        clientCoapConfig.set(CoapConfig.BLOCKWISE_STRICT_BLOCK2_OPTION, true);
+        clientCoapConfig.set(CoapConfig.BLOCKWISE_ENTITY_TOO_LARGE_AUTO_FAILOVER, true);
+        clientCoapConfig.set(CoapConfig.BLOCKWISE_STATUS_LIFETIME, DEFAULT_BLOCKWISE_STATUS_LIFETIME_IN_SECONDS, TimeUnit.SECONDS);
+        clientCoapConfig.set(CoapConfig.MAX_RESOURCE_BODY_SIZE, 256 * 1024 * 1024);
+        clientCoapConfig.set(CoapConfig.RESPONSE_MATCHING, CoapConfig.MatcherMode.RELAXED);
+        clientCoapConfig.set(CoapConfig.PREFERRED_BLOCK_SIZE, 1024);
+        clientCoapConfig.set(CoapConfig.MAX_MESSAGE_SIZE, 1024);
+        clientCoapConfig.set(DTLS_ROLE, CLIENT_ONLY);
+        clientCoapConfig.set(DTLS_MAX_RETRANSMISSIONS, 2);
+        clientCoapConfig.set(DTLS_RETRANSMISSION_TIMEOUT, 5000, MILLISECONDS);
+        clientCoapConfig.set(DTLS_MAX_RETRANSMISSION_TIMEOUT, 60000, TimeUnit.MILLISECONDS);
+        clientCoapConfig.set(DTLS_USE_HELLO_VERIFY_REQUEST, false);
+        clientCoapConfig.set(DTLS_VERIFY_SERVER_CERTIFICATES_SUBJECT, false);
+        clientCoapConfig.set(DTLS_MAX_FRAGMENTED_HANDSHAKE_MESSAGE_LENGTH, 22490);
+        clientCoapConfig.set(DTLS_AUTO_HANDSHAKE_TIMEOUT, 100000,  TimeUnit.MILLISECONDS);
+        clientCoapConfig.set(DTLS_MAX_PENDING_HANDSHAKE_RESULT_JOBS, 64);
+        clientCoapConfig.set(DTLS_USE_MULTI_HANDSHAKE_MESSAGE_RECORDS, false);
+        clientCoapConfig.set(DTLS_RECEIVE_BUFFER_SIZE, 8192);
+        clientCoapConfig.setTransient(DTLS_RECOMMENDED_CIPHER_SUITES_ONLY);
+        SignatureAndHashAlgorithmsDefinition algorithmsDefinition = new SignatureAndHashAlgorithmsDefinition(MODULE + "SIGNATURE_AND_HASH_ALGORITHMS", "List of DTLS signature- and hash-algorithms.\nValues e.g SHA256withECDSA or ED25519.");
+        SignatureAndHashAlgorithm SHA384_WITH_RSA = new SignatureAndHashAlgorithm(HashAlgorithm.SHA384,
+                SignatureAlgorithm.RSA);
+        List<SignatureAndHashAlgorithm> algorithms = null;
+        try {
+            algorithms = algorithmsDefinition.checkValue(Arrays.asList(SHA256_WITH_ECDSA, SHA256_WITH_RSA, SHA384_WITH_ECDSA, SHA384_WITH_RSA));
+        } catch (ValueException e) {
+            throw new RuntimeException(e);
+        }
+        clientCoapConfig.setTransient(DTLS_SIGNATURE_AND_HASH_ALGORITHMS);
+        clientCoapConfig.set(DTLS_SIGNATURE_AND_HASH_ALGORITHMS, algorithms);
+        clientCoapConfig.setTransient(DTLS_CIPHER_SUITES);
+        clientCoapConfig.set(DTLS_CIPHER_SUITES, Arrays.asList(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256));
+        clientCoapConfig.setTransient(DTLS_VERIFY_SERVER_CERTIFICATES_SUBJECT);
+        clientCoapConfig.set(DTLS_VERIFY_SERVER_CERTIFICATES_SUBJECT, false);
+        return clientCoapConfig;
+    }
+
+    private DTLSConnector createDTLSConnector(Integer fixedPort) {
+        try {
+            // Create DTLS config client
+            DtlsConnectorConfig.Builder configBuilder = new DtlsConnectorConfig.Builder(this.config);
+            configBuilder.setAdvancedCertificateVerifier(new TbAdvancedCertificateVerifier());
+            X509Certificate[] certificateChainClient = new X509Certificate[]{this.certPrivateKey.getCert()};
+            CertificateProvider certificateProvider = new SingleCertificateProvider(this.certPrivateKey.getPrivateKey(), certificateChainClient, Collections.singletonList(CertificateType.X_509));
+            configBuilder.setCertificateIdentityProvider(certificateProvider);
+            if (fixedPort != null) {
+                InetSocketAddress localAddress = new InetSocketAddress("0.0.0.0", fixedPort);
+                configBuilder.setAddress(localAddress);
+                configBuilder.setReuseAddress(true);
+            }
+            return new DTLSConnector(configBuilder.build());
+        } catch (Exception e) {
+            throw new RuntimeException("", e);
+        }
+    }
+
+    private CoapClient createClient(String featureTokenUrl) {
+        CoapClient client = new CoapClient(featureTokenUrl);
+        CoapEndpoint.Builder builder = new CoapEndpoint.Builder();
+        builder.setConnector(dtlsConnector);
+        client.setEndpoint(builder.build());
+        return client;
+    }
+
+    public String getFeatureTokenUrl(FeatureType featureType) {
+        return this.coapsBaseUrl + featureType.name().toLowerCase();
+    }
+
+    public String getFeatureTokenUrl(String token, FeatureType featureType) {
+        return this.coapsBaseUrl + token + "/" + featureType.name().toLowerCase();
+    }
+}
+
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/x509/TbAdvancedCertificateVerifier.java b/application/src/test/java/org/thingsboard/server/transport/coap/x509/TbAdvancedCertificateVerifier.java
new file mode 100644
index 0000000000..a08746eefa
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/x509/TbAdvancedCertificateVerifier.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.transport.coap.x509;
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.scandium.dtls.AlertMessage;
+import org.eclipse.californium.scandium.dtls.AlertMessage.AlertDescription;
+import org.eclipse.californium.scandium.dtls.AlertMessage.AlertLevel;
+import org.eclipse.californium.scandium.dtls.CertificateMessage;
+import org.eclipse.californium.scandium.dtls.CertificateType;
+import org.eclipse.californium.scandium.dtls.CertificateVerificationResult;
+import org.eclipse.californium.scandium.dtls.ConnectionId;
+import org.eclipse.californium.scandium.dtls.HandshakeException;
+import org.eclipse.californium.scandium.dtls.HandshakeResultHandler;
+import org.eclipse.californium.scandium.dtls.x509.NewAdvancedCertificateVerifier;
+import org.eclipse.californium.scandium.util.ServerNames;
+
+import javax.security.auth.x500.X500Principal;
+import java.net.InetSocketAddress;
+import java.security.PublicKey;
+import java.security.cert.CertPath;
+import java.util.Arrays;
+import java.util.List;
+
+@Slf4j
+public class TbAdvancedCertificateVerifier implements NewAdvancedCertificateVerifier {
+
+    private HandshakeResultHandler resultHandler;
+    /**
+     * Get the list of supported certificate types in order of preference.
+     *
+     * @return the list of supported certificate types.
+     * @since 3.0 (renamed from getSupportedCertificateType)
+     */
+    @Override
+    public List<CertificateType> getSupportedCertificateTypes() {
+        return Arrays.asList(CertificateType.X_509, CertificateType.RAW_PUBLIC_KEY);
+    }
+
+    /**
+     * Validates the certificate provided by the the peer as part of the
+     * certificate message.
+     * <p>
+     * If a x509 certificate chain is provided in the certificate message,
+     * validate the chain and key usage. If a RawPublicKey certificate is
+     * provided, check, if this public key is trusted.
+     *
+     * @param cid                     connection ID
+     * @param serverName              indicated server names. May be {@code null}, if not
+     *                                available or SNI is not enabled.
+     * @param remotePeer              socket address of remote peer
+     * @param clientUsage             indicator to check certificate usage. {@code true},
+     *                                check key usage for client, {@code false} for server.
+     * @param verifySubject           {@code true} to verify the certificate's subjects,
+     *                                {@code false}, if not.
+     * @param truncateCertificatePath {@code true} truncate certificate path at
+     *                                a trusted certificate before validation.
+     * @param message                 certificate message to be validated
+     * @return certificate verification result, or {@code null}, if result is
+     * provided asynchronous.
+     * @since 3.0 (removed DTLSSession session, added remotePeer and
+     * verifySubject)
+     */
+    @Override
+    public CertificateVerificationResult verifyCertificate(ConnectionId cid, ServerNames serverName, InetSocketAddress remotePeer,
+                                                           boolean clientUsage, boolean verifySubject, boolean truncateCertificatePath,
+                                                           CertificateMessage message) {
+        CertPath certChain = message.getCertificateChain();
+        CertificateVerificationResult result;
+
+        if (certChain == null) {
+            PublicKey publicKey = message.getPublicKey();
+            result = new CertificateVerificationResult(cid, publicKey, null);
+        } else {
+            if (message.getCertificateChain().getCertificates().isEmpty()) {
+                result = new CertificateVerificationResult(cid, new HandshakeException("Empty certificate chain",
+                        new AlertMessage(AlertLevel.FATAL, AlertDescription.BAD_CERTIFICATE)), null);
+            } else {
+                result = new CertificateVerificationResult(cid, certChain, null);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Return an list of certificate authorities which are trusted
+     * for authenticating peers.
+     *
+     * @return a non-null (possibly empty) list of accepted CA issuers.
+     */
+    @Override
+    public List<X500Principal> getAcceptedIssuers() {
+        log.trace("getAcceptedIssuers: return null");
+        return null;
+    }
+
+    /**
+     * Set the handler for asynchronous handshake results.
+     * <p>
+     * Called during initialization of the {link DTLSConnector}. Synchronous
+     * implementations may just ignore this using an empty implementation.
+     *
+     * @param resultHandler handler for asynchronous master secret results. This
+     *                      handler MUST NOT be called from the thread calling
+     *                      {@link #verifyCertificate(ConnectionId, ServerNames, InetSocketAddress, boolean, boolean, boolean, CertificateMessage)},
+     *                      instead just return the result there.
+     */
+    @Override
+    public void setResultHandler(HandshakeResultHandler resultHandler) {
+        if (this.resultHandler != null && resultHandler != null && this.resultHandler != resultHandler) {
+            throw new IllegalStateException("handshake result handler already set!");
+        }
+        this.resultHandler = resultHandler;
+    }
+}
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 a1fb723681..2caa8f1e90 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
@@ -89,6 +89,7 @@ import static org.awaitility.Awaitility.await;
 import static org.eclipse.leshan.client.object.Security.noSec;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -147,8 +148,7 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
                     "    \"telemetry\": [],\n" +
                     "    \"attributeLwm2m\": {}\n" +
                     "  }";
-    public static  String OBSERVE_ATTRIBUTES_WITH_PARAMS =
-
+    public static  String TELEMETRY_WITHOUT_OBSERVE =
             "    {\n" +
                     "    \"keyName\": {\n" +
                     "      \"/3_1.2/0/9\": \"batteryLevel\"\n" +
@@ -161,6 +161,39 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
                     "    ],\n" +
                     "    \"attributeLwm2m\": {}\n" +
                     "  }";
+    public static  String TELEMETRY_WITH_ONE_OBSERVE =
+            "    {\n" +
+                    "    \"keyName\": {\n" +
+                    "      \"/3_1.2/0/9\": \"batteryLevel\"\n" +
+                    "    },\n" +
+                    "    \"observe\": [\n" +
+                    "      \"/3_1.2/0/9\"\n" +
+                    "    ],\n" +
+                    "    \"attribute\": [\n" +
+                    "    ],\n" +
+                    "    \"telemetry\": [\n" +
+                    "      \"/3_1.2/0/9\"\n" +
+                    "    ],\n" +
+                    "    \"attributeLwm2m\": {}\n" +
+                    "  }";
+
+    public static  String TELEMETRY_WITH_MANY_OBSERVE =
+               "    {\n" +
+                       "    \"keyName\": {\n" +
+                       "      \"/3_1.2/0/9\": \"batteryLevel\",\n" +
+                       "      \"/3_1.2/0/20\": \"batteryStatus\"\n" +
+                       "    },\n" +
+                       "    \"observe\": [\n" +
+                       "      \"/3_1.2/0/9\",\n" +
+                       "      \"/3_1.2/0/20\"\n" +
+                       "    ],\n" +
+                       "    \"attribute\": [],\n" +
+                       "    \"telemetry\": [\n" +
+                       "      \"/3_1.2/0/9\",\n" +
+                       "      \"/3_1.2/0/20\"\n" +
+                       "    ],\n" +
+                       "    \"attributeLwm2m\": {}\n" +
+                       "  }";
 
     public static final String CLIENT_LWM2M_SETTINGS =
             "     {\n" +
@@ -217,7 +250,7 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
                                                     LwM2MDeviceCredentials deviceCredentials,
                                                     String endpoint,
                                                     boolean queueMode) throws Exception {
-        Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITH_PARAMS, getBootstrapServerCredentialsNoSec(NONE));
+        Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(TELEMETRY_WITHOUT_OBSERVE, getBootstrapServerCredentialsNoSec(NONE));
         DeviceProfile deviceProfile = createLwm2mDeviceProfile("profileFor" + endpoint, transportConfiguration);
         Device device = createLwm2mDevice(deviceCredentials, endpoint, deviceProfile.getId());
 
@@ -314,7 +347,7 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
     public void createNewClient(Security security, Security securityBs, boolean isRpc,
                                 String endpoint, Integer clientDtlsCidLength, boolean queueMode, String deviceIdStr) throws Exception {
         this.clientDestroy(false);
-        lwM2MTestClient = new LwM2MTestClient(this.executor, endpoint);
+        lwM2MTestClient = new LwM2MTestClient(this.executor, endpoint, resources);
 
         try (ServerSocket socket = new ServerSocket(0)) {
             int clientPort = socket.getLocalPort();
@@ -327,7 +360,7 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
 
     private void clientDestroy(boolean isAfter) {
         try {
-            if (lwM2MTestClient != null) {
+            if (lwM2MTestClient != null && lwM2MTestClient.getLeshanClient() != null) {
                 if (isAfter) {
                     sendObserveCancelAllWithAwait(lwM2MTestClient.getDeviceIdStr());
                     awaitDeleteDevice(lwM2MTestClient.getDeviceIdStr());
@@ -425,9 +458,15 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
         assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
         return rpcActualResult.get("value").asText();
     }
+    protected void sendRpcObserveWithContainsLwM2mSingleResource(String params) throws Exception {
+        String rpcActualResult = sendRpcObserveOkWithResultValue("Observe", params);
+        assertTrue(rpcActualResult.contains("LwM2mSingleResource") || rpcActualResult.contains("LwM2mMultipleResource"));
+    }
+
     protected String sendRpcObserveOk(String method, String params) throws Exception {
         return sendObserveOK(method, params, lwM2MTestClient.getDeviceIdStr());
     }
+
     protected String sendObserveOK(String method, String params, String deviceIdStr) throws Exception {
         String sendRpcRequest;
         if (params == null) {
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 4aa47eddf5..a40c937de8 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
@@ -17,8 +17,9 @@ package org.thingsboard.server.transport.lwm2m;
 
 public class Lwm2mTestHelper {
 
+    public static final String[] lwm2mClientResources = new String[]{"3.xml", "5.xml", "6.xml", "9.xml", "19.xml", "3303.xml"};
+
     // Models
-    public static final String[] resources = new String[]{"0.xml", "1.xml", "2.xml", "3.xml", "5.xml", "6.xml", "9.xml", "19.xml", "3303.xml"};
     public static final int BINARY_APP_DATA_CONTAINER = 19;
     public static final int TEMPERATURE_SENSOR = 3303;
 
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 387085c511..ed846bc375 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
@@ -116,7 +116,7 @@ import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.OBJECT_INST
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.OBJECT_INSTANCE_ID_1;
 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.Lwm2mTestHelper.lwm2mClientResources;
 import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.setDtlsConnectorConfigCidLength;
 
 
@@ -126,6 +126,7 @@ public class LwM2MTestClient {
 
     private final ScheduledExecutorService executor;
     private final String endpoint;
+    private final String[] modelResources;
     private LeshanClient leshanClient;
     private SimpleLwM2MDevice lwM2MDevice;
     private FwLwM2MDevice fwLwM2MDevice;
@@ -147,10 +148,24 @@ public class LwM2MTestClient {
         Assert.assertNull("client already initialized", leshanClient);
         this.defaultLwM2mUplinkMsgHandlerTest = defaultLwM2mUplinkMsgHandler;
         this.clientContext = clientContext;
-        List<ObjectModel> models = new ArrayList<>();
-        for (String resourceName : resources) {
+
+        List<ObjectModel> models = ObjectLoader.loadAllDefault();
+        for (String resourceName : lwm2mClientResources) {
             models.addAll(ObjectLoader.loadDdfFile(LwM2MTestClient.class.getClassLoader().getResourceAsStream("lwm2m/" + resourceName), resourceName));
         }
+        if (this.modelResources != null) {
+            List<ObjectModel> modelsRes = new ArrayList<>();
+            for (String resourceName : this.modelResources) {
+                modelsRes.addAll(ObjectLoader.loadDdfFile(LwM2MTestClient.class.getClassLoader().getResourceAsStream("lwm2m/" + resourceName), resourceName));
+            }
+            Set<Integer> idsToRemove = new HashSet<>();
+            for (ObjectModel model : modelsRes) {
+                idsToRemove.add(model.id);
+            }
+            models.removeIf(model -> idsToRemove.contains(model.id));
+            models.addAll(modelsRes);
+        }
+
         LwM2mModel model = new StaticModel(models);
         ObjectsInitializer initializer = new ObjectsInitializer(model);
         if (securityBs != null && security != null) {
@@ -458,6 +473,12 @@ public class LwM2MTestClient {
         }
     }
 
+    public void stop(boolean deregister) {
+        if (leshanClient != null) {
+            leshanClient.stop(deregister);
+        }
+    }
+
     private void awaitClientAfterStartConnectLw() {
         LwM2mClient lwM2MClient = this.clientContext.getClientByEndpoint(endpoint);
         Mockito.doAnswer(invocationOnMock -> null).when(defaultLwM2mUplinkMsgHandlerTest).initAttributes(lwM2MClient, true);
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 a6a850a897..e94a6b4822 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
@@ -93,6 +93,7 @@ public class SimpleLwM2MDevice extends BaseInstanceEnabler implements Destroyabl
         try {
             executorService.scheduleWithFixedDelay(() -> {
                         fireResourceChange(9);
+                        fireResourceChange(20);
                     }
                     , 1, 1, TimeUnit.SECONDS); // 2 sec
 //                    , 1800000, 1800000, TimeUnit.MILLISECONDS); // 30 MIN
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/Ota5LwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/Ota5LwM2MIntegrationTest.java
index a50f7df6a2..4ed06b99f2 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/Ota5LwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/Ota5LwM2MIntegrationTest.java
@@ -51,7 +51,7 @@ public class Ota5LwM2MIntegrationTest extends AbstractOtaLwM2MIntegrationTest {
 
     @Test
     public void testFirmwareUpdateWithClientWithoutFirmwareOtaInfoFromProfile_IsNotSupported() throws Exception {
-        Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITH_PARAMS, getBootstrapServerCredentialsNoSec(NONE));
+        Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(TELEMETRY_WITHOUT_OBSERVE, getBootstrapServerCredentialsNoSec(NONE));
         DeviceProfile deviceProfile = createLwm2mDeviceProfile("profileFor" + this.CLIENT_ENDPOINT_WITHOUT_FW_INFO, transportConfiguration);
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(this.CLIENT_ENDPOINT_WITHOUT_FW_INFO));
         final Device device = createLwm2mDevice(deviceCredentials, this.CLIENT_ENDPOINT_WITHOUT_FW_INFO, deviceProfile.getId());
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
deleted file mode 100644
index 7195b0d229..0000000000
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserveTest.java
+++ /dev/null
@@ -1,33 +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;
-
-import org.thingsboard.server.dao.service.DaoSqlTest;
-import static org.junit.Assert.assertTrue;
-
-@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);
-    }
-
-    protected void sendRpcObserveWithContainsLwM2mSingleResource(String params) throws Exception {
-        String rpcActualResult = sendRpcObserveOkWithResultValue("Observe", params);
-        assertTrue(rpcActualResult.contains("LwM2mSingleResource") || rpcActualResult.contains("LwM2mMultipleResource"));
-    }
-}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserve_Ver_1_0_Test.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserve_Ver_1_0_Test.java
new file mode 100644
index 0000000000..0b7faafd7b
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserve_Ver_1_0_Test.java
@@ -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.
+ */
+package org.thingsboard.server.transport.lwm2m.rpc;
+
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+@DaoSqlTest
+public abstract class AbstractRpcLwM2MIntegrationObserve_Ver_1_0_Test extends AbstractRpcLwM2MIntegrationTest{
+
+    public AbstractRpcLwM2MIntegrationObserve_Ver_1_0_Test() {
+        String[] RESOURCES_RPC_VER_1_1 = new String[]{"3-1_0.xml", "5.xml", "6.xml", "9.xml", "19.xml"};
+        setResources(RESOURCES_RPC_VER_1_1);
+    }
+}
+
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserve_Ver_1_1_Test.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserve_Ver_1_1_Test.java
new file mode 100644
index 0000000000..0a9290b0c4
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserve_Ver_1_1_Test.java
@@ -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.
+ */
+package org.thingsboard.server.transport.lwm2m.rpc;
+
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+@DaoSqlTest
+public abstract class AbstractRpcLwM2MIntegrationObserve_Ver_1_1_Test extends AbstractRpcLwM2MIntegrationTest{
+
+    public AbstractRpcLwM2MIntegrationObserve_Ver_1_1_Test() {
+        String[] RESOURCES_RPC_VER_1_1 = new String[]{"3-1_1.xml", "5.xml", "6.xml", "9.xml", "19.xml"};
+        setResources(RESOURCES_RPC_VER_1_1);
+    }
+}
+
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserve_Ver_1_2_Test.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserve_Ver_1_2_Test.java
new file mode 100644
index 0000000000..e52ca15634
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserve_Ver_1_2_Test.java
@@ -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.
+ */
+package org.thingsboard.server.transport.lwm2m.rpc;
+
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+@DaoSqlTest
+public abstract class AbstractRpcLwM2MIntegrationObserve_Ver_1_2_Test extends AbstractRpcLwM2MIntegrationTest{
+
+    public AbstractRpcLwM2MIntegrationObserve_Ver_1_2_Test() {
+        String[] RESOURCES_RPC_VER_1_1 = new String[]{"3.xml", "5.xml", "6.xml", "9.xml", "19.xml"};
+        setResources(RESOURCES_RPC_VER_1_1);
+    }
+}
+
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 d5c9683c39..de4845a220 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
@@ -63,7 +63,7 @@ import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID
 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.TEMPERATURE_SENSOR;
-import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.resources;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.lwm2mClientResources;
 import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.fromVersionedIdToObjectId;
 
 @Slf4j
@@ -102,7 +102,7 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg
     protected LwM2mTransportServerHelper lwM2mTransportServerHelperTest;
 
     public AbstractRpcLwM2MIntegrationTest() {
-        setResources(resources);
+        setResources(lwm2mClientResources);
     }
 
     @Before
@@ -110,7 +110,7 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg
         if (this.getClass().getSimpleName().equals("RpcLwm2mIntegrationWriteCborTest")) {
             supportFormatOnly_SenMLJSON_SenMLCBOR = true;
         }
-        if (this.getClass().getSimpleName().equals("RpcLwm2mIntegrationObserveTest")) {
+        if (this.getClass().getSimpleName().contains("RpcLwm2mIntegrationObserve")) {
             initRpc(0);
         } else if (this.getClass().getSimpleName().equals("RpcLwm2mIntegrationReadCollectedValueTest")) {
             initRpc(3303);
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
index 56de08e66d..aa05b8073c 100644
--- 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
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 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 org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationTest;
 
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
@@ -50,7 +50,7 @@ import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_IN
 import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.fromVersionedIdToObjectId;
 
 @Slf4j
-public class RpcLwm2MIntegrationObserveCompositeTest extends AbstractRpcLwM2MIntegrationObserveTest {
+public class RpcLwm2MIntegrationObserveCompositeTest extends AbstractRpcLwM2MIntegrationTest {
 
     /**
      *  ObserveComposite {"ids":["5/0/7", "5/0/5", "5/0/3", "3/0/9", "19/1/0/0"]} - Ok
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 57213e08cd..425c7a3d6b 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
@@ -24,7 +24,7 @@ import org.eclipse.leshan.server.registration.Registration;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationObserveTest;
+import org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationTest;
 
 import static org.eclipse.leshan.core.LwM2mId.ACCESS_CONTROL;
 import static org.junit.Assert.assertEquals;
@@ -41,7 +41,7 @@ import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID
 import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.fromVersionedIdToObjectId;
 
 @Slf4j
-public class RpcLwm2mIntegrationObserveTest extends AbstractRpcLwM2MIntegrationObserveTest {
+public class RpcLwm2mIntegrationObserveTest extends AbstractRpcLwM2MIntegrationTest {
 
     @Before
     public void setupObserveTest() throws Exception {
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserve_Ver_1_0_Test.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserve_Ver_1_0_Test.java
new file mode 100644
index 0000000000..9c2fbd3313
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserve_Ver_1_0_Test.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.rpc.sql;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationObserve_Ver_1_0_Test;
+import org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationObserve_Ver_1_1_Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_NAME_3_9;
+
+@Slf4j
+public class RpcLwm2mIntegrationObserve_Ver_1_0_Test extends AbstractRpcLwM2MIntegrationObserve_Ver_1_0_Test {
+
+    @Before
+    public void setupObserveTest() throws Exception {
+        awaitObserveReadAll(4,lwM2MTestClient.getDeviceIdStr());
+    }
+
+    /**
+     * Observe "3_1.0/0/9"
+     * @throws Exception
+     */
+    @Test
+    public void testObserveOneResource_Result_CONTENT_Value_Count_3_After_Cancel_Count_2() throws Exception {
+        long initSendTelemetryAtCount = countSendParametersOnThingsboardTelemetryResource(RESOURCE_ID_NAME_3_9);
+        sendObserveCancelAllWithAwait(lwM2MTestClient.getDeviceIdStr());
+        sendRpcObserveWithContainsLwM2mSingleResource(idVer_3_0_9);
+        updateRegAtLeastOnceAfterAction();
+        long lastSendTelemetryAtCount = countSendParametersOnThingsboardTelemetryResource(RESOURCE_ID_NAME_3_9);
+        assertTrue(lastSendTelemetryAtCount > initSendTelemetryAtCount);
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserve_Ver_1_1_Test.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserve_Ver_1_1_Test.java
new file mode 100644
index 0000000000..79d09721e9
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserve_Ver_1_1_Test.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 lombok.extern.slf4j.Slf4j;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationObserve_Ver_1_1_Test;
+import static org.junit.Assert.assertTrue;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_NAME_3_9;
+
+@Slf4j
+public class RpcLwm2mIntegrationObserve_Ver_1_1_Test extends AbstractRpcLwM2MIntegrationObserve_Ver_1_1_Test {
+
+    @Before
+    public void setupObserveTest() throws Exception {
+        awaitObserveReadAll(4,lwM2MTestClient.getDeviceIdStr());
+    }
+
+    /**
+     * Observe "3_1.1/0/9"
+     * @throws Exception
+     */
+    @Test
+    public void testObserveOneResource_Result_CONTENT_Value_Count_3_After_Cancel_Count_2() throws Exception {
+        long initSendTelemetryAtCount = countSendParametersOnThingsboardTelemetryResource(RESOURCE_ID_NAME_3_9);
+        sendObserveCancelAllWithAwait(lwM2MTestClient.getDeviceIdStr());
+        sendRpcObserveWithContainsLwM2mSingleResource(idVer_3_0_9);
+        updateRegAtLeastOnceAfterAction();
+        long lastSendTelemetryAtCount = countSendParametersOnThingsboardTelemetryResource(RESOURCE_ID_NAME_3_9);
+        assertTrue(lastSendTelemetryAtCount > initSendTelemetryAtCount);
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserve_Ver_1_2_Test.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserve_Ver_1_2_Test.java
new file mode 100644
index 0000000000..ec45c2beac
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserve_Ver_1_2_Test.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.rpc.sql;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationObserve_Ver_1_0_Test;
+import org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationObserve_Ver_1_2_Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_NAME_3_9;
+
+@Slf4j
+public class RpcLwm2mIntegrationObserve_Ver_1_2_Test extends AbstractRpcLwM2MIntegrationObserve_Ver_1_2_Test {
+
+    @Before
+    public void setupObserveTest() throws Exception {
+        awaitObserveReadAll(4,lwM2MTestClient.getDeviceIdStr());
+    }
+
+    /**
+     * Observe "3_1.2/0/9"
+     * @throws Exception
+     */
+    @Test
+    public void testObserveOneResource_Result_CONTENT_Value_Count_3_After_Cancel_Count_2() throws Exception {
+        long initSendTelemetryAtCount = countSendParametersOnThingsboardTelemetryResource(RESOURCE_ID_NAME_3_9);
+        sendObserveCancelAllWithAwait(lwM2MTestClient.getDeviceIdStr());
+        sendRpcObserveWithContainsLwM2mSingleResource(idVer_3_0_9);
+        updateRegAtLeastOnceAfterAction();
+        long lastSendTelemetryAtCount = countSendParametersOnThingsboardTelemetryResource(RESOURCE_ID_NAME_3_9);
+        assertTrue(lastSendTelemetryAtCount > initSendTelemetryAtCount);
+    }
+}
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 eaade683d8..3f43c59068 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
@@ -196,7 +196,7 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
                 false);
     }
 
-    protected void basicTestConnection(Security security, Security securityBs,
+    protected Device basicTestConnection(Security security, Security securityBs,
                                        LwM2MDeviceCredentials deviceCredentials,
                                        String endpoint,
                                        Lwm2mDeviceProfileTransportConfiguration transportConfiguration,
@@ -227,6 +227,7 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
                     return lwM2MTestClient.getClientStates().contains(finishState) || lwM2MTestClient.getClientStates().contains(ON_UPDATE_SUCCESS);
                 });
         Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatuses));
+        return device;
     }
 
 
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 ac1c0866de..42014a4a75 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
@@ -16,10 +16,13 @@
 package org.thingsboard.server.transport.lwm2m.security.sql;
 
 import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.client.object.Security;
 import org.eclipse.leshan.core.util.Hex;
+import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.test.web.servlet.MvcResult;
+import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MDeviceCredentials;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.PSKClientCredential;
@@ -27,7 +30,6 @@ import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTrans
 import org.thingsboard.server.transport.lwm2m.security.AbstractSecurityLwM2MIntegrationTest;
 
 import java.nio.charset.StandardCharsets;
-
 import static org.eclipse.leshan.client.object.Security.psk;
 import static org.eclipse.leshan.client.object.Security.pskBootstrap;
 import static org.junit.Assert.assertEquals;
@@ -37,6 +39,7 @@ import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClient
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.BOTH;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE;
 
+@Slf4j
 public class PskLwm2mIntegrationTest extends AbstractSecurityLwM2MIntegrationTest {
 
     //Lwm2m only
@@ -66,6 +69,82 @@ public class PskLwm2mIntegrationTest extends AbstractSecurityLwM2MIntegrationTes
                 ON_REGISTRATION_SUCCESS,
                 true);
     }
+    @Test
+    public void testWithPskConnectLwm2mOneObserveSuccessUpdateProfileManyObserveUpdateRegistrationSuccess() 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()));
+        Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(TELEMETRY_WITH_ONE_OBSERVE, getBootstrapServerCredentialsSecure(PSK, NONE));
+        LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsSecure(clientCredentials, null, null, PSK, false);
+        String awaitAlias = "await on client state (Psk_Lwm2m)";
+        Device lwm2mDevice = this.basicTestConnection(security,
+                null,
+                deviceCredentials,
+                clientEndpoint,
+                transportConfiguration,
+                awaitAlias,
+                expectedStatusesRegistrationLwm2mSuccess,
+                false,
+                ON_REGISTRATION_SUCCESS,
+                true);
+
+        awaitObserveReadAll(1, lwm2mDevice.getId().getId().toString());
+        DeviceProfile foundDeviceProfile = doGet("/api/deviceProfile/" + lwm2mDevice.getDeviceProfileId().getId().toString(), DeviceProfile.class);
+        transportConfiguration = getTransportConfiguration(TELEMETRY_WITH_MANY_OBSERVE, getBootstrapServerCredentialsSecure(PSK, NONE));
+        foundDeviceProfile.getProfileData().setTransportConfiguration(transportConfiguration);
+        DeviceProfile lwm2mDeviceProfileManyParams = doPost("/api/deviceProfile", foundDeviceProfile, DeviceProfile.class);
+        Assert.assertNotNull(lwm2mDeviceProfileManyParams);
+        awaitObserveReadAll(2, lwm2mDevice.getId().getId().toString());
+        awaitUpdateReg(3);
+    }
+    @Test
+    public void testWithPskConnectLwm2mSuccessObserveSuccessUnRegClientUpdateProfileObserveConnectLwm2mSuccessOWithNewObserve() 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()));
+        Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(TELEMETRY_WITH_ONE_OBSERVE, getBootstrapServerCredentialsSecure(PSK, NONE));
+        LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsSecure(clientCredentials, null, null, PSK, false);
+        String awaitAlias = "await on client state (Psk_Lwm2m)";
+        Device lwm2mDevice = this.basicTestConnection(security,
+                null,
+                deviceCredentials,
+                clientEndpoint,
+                transportConfiguration,
+                awaitAlias,
+                expectedStatusesRegistrationLwm2mSuccess,
+                false,
+                ON_REGISTRATION_SUCCESS,
+                true);
+
+        awaitObserveReadAll(1, lwm2mDevice.getId().getId().toString());
+        lwM2MTestClient.stop(true);
+
+        DeviceProfile foundDeviceProfile = doGet("/api/deviceProfile/" + lwm2mDevice.getDeviceProfileId().getId().toString(), DeviceProfile.class);
+        transportConfiguration = getTransportConfiguration(TELEMETRY_WITH_MANY_OBSERVE, getBootstrapServerCredentialsSecure(PSK, NONE));
+        foundDeviceProfile.getProfileData().setTransportConfiguration(transportConfiguration);
+        DeviceProfile lwm2mDeviceProfileManyParams = doPost("/api/deviceProfile", foundDeviceProfile, DeviceProfile.class);
+        Assert.assertNotNull(lwm2mDeviceProfileManyParams);
+
+        lwM2MTestClient.start(true);
+        awaitObserveReadAll(2, lwm2mDevice.getId().getId().toString());
+        awaitUpdateReg(3);
+    }
 
     @Test
     public void testWithPskConnectLwm2mBadPskKeyByLength_BAD_REQUEST() throws Exception {
diff --git a/application/src/test/resources/coap/credentials/client/cert.pem b/application/src/test/resources/coap/credentials/client/cert.pem
new file mode 100644
index 0000000000..4d385a588f
--- /dev/null
+++ b/application/src/test/resources/coap/credentials/client/cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB/TCCAaOgAwIBAgIIVNrVgKT9OE8wCgYIKoZIzj0EAwIwWjEOMAwGA1UEAxMF
+Y2YtY2ExFDASBgNVBAsTC0NhbGlmb3JuaXVtMRQwEgYDVQQKEwtFY2xpcHNlIElv
+VDEPMA0GA1UEBxMGT3R0YXdhMQswCQYDVQQGEwJDQTAeFw0yMzEwMjYwODA4MjJa
+Fw0yNTEwMjUwODA4MjJaMF4xEjAQBgNVBAMTCWNmLWNsaWVudDEUMBIGA1UECxML
+Q2FsaWZvcm5pdW0xFDASBgNVBAoTC0VjbGlwc2UgSW9UMQ8wDQYDVQQHEwZPdHRh
+d2ExCzAJBgNVBAYTAkNBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEQxYO5/M5
+ie6+3QPOaAy5MD6CkFILZwIb2rOBCX/EWPaocX1H+eynUnaEEbmqxeN6rnI/pH19
+j4PtsegfHLrzzaNPME0wHQYDVR0OBBYEFKwEDLTJ+5cQoZfbjWN1vJ2ssgK+MAsG
+A1UdDwQEAwIHgDAfBgNVHSMEGDAWgBSxVzoI1TL87++hsUb9vQwqODzgUTAKBggq
+hkjOPQQDAgNIADBFAiA2KCOw3n2AK9Vm8u2u1bQREIEs3tKAU7eFjpNFn929NwIh
+AInhBGoEwS2Xlu5bdZSfWnujoRrEQiIiQpStmLxVcIsH
+-----END CERTIFICATE-----
diff --git a/application/src/test/resources/coap/credentials/client/cert_01.pem b/application/src/test/resources/coap/credentials/client/cert_01.pem
new file mode 100644
index 0000000000..3b97ab4aad
--- /dev/null
+++ b/application/src/test/resources/coap/credentials/client/cert_01.pem
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICIzCCAcmgAwIBAgIUZZCGYm65c9vU0Xfvd/pAnLVDouUwCgYIKoZIzj0EAwIw
+ZzELMAkGA1UEBhMCVUExDTALBgNVBAgMBEtpeXYxDTALBgNVBAcMBEtpeXYxFDAS
+BgNVBAoMC1RoaW5nc2JvYXJkMRIwEAYDVQQLDAlkZXZlbG9wZXIxEDAOBgNVBAMM
+B2NlcnRfMDEwHhcNMjQxMjE4MTU1NjE1WhcNMjUxMjE4MTU1NjE1WjBnMQswCQYD
+VQQGEwJVQTENMAsGA1UECAwES2l5djENMAsGA1UEBwwES2l5djEUMBIGA1UECgwL
+VGhpbmdzYm9hcmQxEjAQBgNVBAsMCWRldmVsb3BlcjEQMA4GA1UEAwwHY2VydF8w
+MTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNU1tE6o/QpqJJqpy+m+UoPuQe5g
+eTgS4M3x0iQS6pzNEJBhzbnOp/BysGMB4wKiAWTRuKdH/gcRXDBTjLd/d7ijUzBR
+MB0GA1UdDgQWBBSiao1iNWYzlsrSbxYqbda116HG1jAfBgNVHSMEGDAWgBSiao1i
+NWYzlsrSbxYqbda116HG1jAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0gA
+MEUCIB2aCM/nvDqic9NkoSX/71GwksLiAKiFNkt2BZQykrcHAiEAr2h5IMdkyurN
+Jy/idx2y44CP0tMq/3QV0QLCQFJIi6s=
+-----END CERTIFICATE-----
diff --git a/application/src/test/resources/coap/credentials/client/key.pem b/application/src/test/resources/coap/credentials/client/key.pem
new file mode 100644
index 0000000000..02ca740c93
--- /dev/null
+++ b/application/src/test/resources/coap/credentials/client/key.pem
@@ -0,0 +1,4 @@
+-----BEGIN PRIVATE KEY-----
+MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCDn0+4CuLeX7xwBs0ts
+UUEDB3+HRwRKdIPeJlIbKuvvEQ==
+-----END PRIVATE KEY-----
\ No newline at end of file
diff --git a/application/src/test/resources/coap/credentials/client/key_01.pem b/application/src/test/resources/coap/credentials/client/key_01.pem
new file mode 100644
index 0000000000..d5918e8181
--- /dev/null
+++ b/application/src/test/resources/coap/credentials/client/key_01.pem
@@ -0,0 +1,8 @@
+-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJldU1MBuJUJnNHa9Ob5NGlXc/Os6put9eh1TlIbuScnoAoGCCqGSM49
+AwEHoUQDQgAE1TW0Tqj9CmokmqnL6b5Sg+5B7mB5OBLgzfHSJBLqnM0QkGHNuc6n
+8HKwYwHjAqIBZNG4p0f+BxFcMFOMt393uA==
+-----END EC PRIVATE KEY-----
diff --git a/application/src/test/resources/coap/credentials/coapclientTest.jks b/application/src/test/resources/coap/credentials/coapclientTest.jks
new file mode 100644
index 0000000000..ca8c8ed1d7
Binary files /dev/null and b/application/src/test/resources/coap/credentials/coapclientTest.jks differ
diff --git a/application/src/test/resources/coap/credentials/coapserverTest.jks b/application/src/test/resources/coap/credentials/coapserverTest.jks
new file mode 100644
index 0000000000..4adf1f4f89
Binary files /dev/null and b/application/src/test/resources/coap/credentials/coapserverTest.jks differ
diff --git a/application/src/test/resources/coap/credentials/server/cert.pem b/application/src/test/resources/coap/credentials/server/cert.pem
new file mode 100644
index 0000000000..03eb9e372e
--- /dev/null
+++ b/application/src/test/resources/coap/credentials/server/cert.pem
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIBaDCCAQ2gAwIBAgIUCY+goBAOhowBs7BHs/qXdAX8XFgwCgYIKoZIzj0EAwIw
+ETEPMA0GA1UEAwwGUm9vdENBMB4XDTI0MTIxOTEzNTY1OFoXDTM0MTIxNzEzNTY1
+OFowETEPMA0GA1UEAwwGU2VydmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
+/qief3Kjnz0FpkQVaKRqJq3kHmCqqs+y1EGYLEZZAqLFvxmv7xoL6muG4Mj8tzqk
+Ll94JJuz97hG1FiEZsq7O6NDMEEwCwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoGCCsG
+AQUFBwMBMB0GA1UdDgQWBBTK/UPsN0I2ErVPILWKMRV6TSeAmTAKBggqhkjOPQQD
+AgNJADBGAiEA8EhlOwvTbwGlxo55UIOJp9LBbCp0BEIWojlu8PzOVSsCIQDlV24S
+3BUJVCuMRujO5lTfJLxaSKkOEIgRANwIGi88WA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIBGzCBwgIUP/PGQOKa5EyvsIXNgvv9PNietyEwCgYIKoZIzj0EAwMwEDEOMAwG
+A1UEAwwFVFJVU1QwHhcNMjQxMjE5MTM1NjU4WhcNMzQxMjE3MTM1NjU4WjARMQ8w
+DQYDVQQDDAZSb290Q0EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT+qJ5/cqOf
+PQWmRBVopGomreQeYKqqz7LUQZgsRlkCosW/Ga/vGgvqa4bgyPy3OqQuX3gkm7P3
+uEbUWIRmyrs7MAoGCCqGSM49BAMDA0gAMEUCIQD2DY3UDXbzaIBKrsCtohKlEunH
+ip9LkSeYfSKCnfm23gIgA8AEJdunpRmPkilxgy6wZSLLROqDpGDnhnyv8dsR8cc=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIBLTCB1AIUcsuauXAqvIS2RQcNPYysETJUAvwwCgYIKoZIzj0EAwMwIzEhMB8G
+A1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTI0MTIxOTEzNTY1OFoX
+DTM0MTIxNzEzNTY1OFowEDEOMAwGA1UEAwwFVFJVU1QwWTATBgcqhkjOPQIBBggq
+hkjOPQMBBwNCAAT+qJ5/cqOfPQWmRBVopGomreQeYKqqz7LUQZgsRlkCosW/Ga/v
+Ggvqa4bgyPy3OqQuX3gkm7P3uEbUWIRmyrs7MAoGCCqGSM49BAMDA0gAMEUCIQCM
+DV8sfoArfWiXAUF2LNS3kkHD7sgb91jr2+poEHgBBgIgXf9VeJp3K5jHX6lJwtE8
+nd+jW7T9nhTc/5njHg7xons=
+-----END CERTIFICATE-----
+-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIB+Z69so6HqCCWo5VOFxGsLXOlTWIYijOtzt+SeNGrgPoAoGCCqGSM49
+AwEHoUQDQgAE/qief3Kjnz0FpkQVaKRqJq3kHmCqqs+y1EGYLEZZAqLFvxmv7xoL
+6muG4Mj8tzqkLl94JJuz97hG1FiEZsq7Ow==
+-----END EC PRIVATE KEY-----
diff --git a/application/src/test/resources/lwm2m/3-1_0.xml b/application/src/test/resources/lwm2m/3-1_0.xml
new file mode 100644
index 0000000000..4f5261d263
--- /dev/null
+++ b/application/src/test/resources/lwm2m/3-1_0.xml
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_LWM2M_Device-V1_0_3-20180710-A
+   Type: xml
+   Date: 2018-07-10
+
+Public Reachable Information
+   Path: http://www.openmobilealliance.org/tech/profiles
+   Name: LWM2M_Device-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
+
+  This is available at http://www.openmobilealliance.org/
+
+  Send comments to https://github.com/OpenMobileAlliance/OMA_LwM2M_for_Developers/issues
+
+LEGAL DISCLAIMER
+
+  Copyright 2018 Open Mobile Alliance All rights reserved.
+
+  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:
+  http://www.openmobilealliance.org/ipr.html
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.openmobilealliance.org/tech/profiles/LWM2M.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</ObjectURN>
+		<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
+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>mV</Units>
+				<Description><![CDATA[Present voltage for each Available Power Sources Resource Instance.]]></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>mA</Units>
+        <Description><![CDATA[Present current for each Available Power Source.]]></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>%</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>KB</Units>
+        <Description><![CDATA[Estimated current available amount of storage space which can store data and software in the LwM2M Device (expressed in kilobytes).]]></Description>
+	  </Item>
+      <Item ID="11">
+        <Name>Error Code</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Multiple</MultipleInstances>
+        <Mandatory>Mandatory</Mandatory>
+        <Type>Integer</Type>
+        <RangeEnumeration>0-8</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
+
+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.]]></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).]]></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/application/src/test/resources/lwm2m/3-1_1.xml b/application/src/test/resources/lwm2m/3-1_1.xml
new file mode 100644
index 0000000000..01151a57b7
--- /dev/null
+++ b/application/src/test/resources/lwm2m/3-1_1.xml
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_LWM2M_Device-V1_1-20170617-A
+   Type: xml
+   Date: 2019-Jun-17
+
+Public Reachable Information
+   Path: http://www.openmobilealliance.org/tech/profiles
+   Name: LWM2M_Device-v1_1.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-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.1</ObjectURN>
+		<LWM2MVersion>1.1</LWM2MVersion>
+		<ObjectVersion>1.1</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>%</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).]]></Description>
+	  </Item>
+      <Item ID="11">
+        <Name>Error Code</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Multiple</MultipleInstances>
+        <Mandatory>Mandatory</Mandatory>
+        <Type>Integer</Type>
+        <RangeEnumeration>0..8</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
+
+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.]]></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).]]></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/common/actor/pom.xml b/common/actor/pom.xml
index cbbce12336..9b0053e0b6 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/cache/pom.xml b/common/cache/pom.xml
index a4f7dd4f7b..fd9802a689 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
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 8ee58ab8eb..379f08af37 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
@@ -19,9 +19,11 @@ import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.support.NullValue;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.RedisStringCommands;
+import org.springframework.data.redis.connection.ReturnType;
 import org.springframework.data.redis.connection.jedis.JedisClusterConnection;
 import org.springframework.data.redis.connection.jedis.JedisConnection;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
@@ -269,4 +271,24 @@ public abstract class RedisTbTransactionalCache<K extends Serializable, V extend
         connection.stringCommands().set(rawKey, rawValue, this.cacheTtl, setOption);
     }
 
+    protected void executeScript(RedisConnection connection, byte[] scriptSha, byte[] luaScript, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
+        try {
+            connection.scriptingCommands().evalSha(scriptSha, returnType, numKeys, keysAndArgs);
+        } catch (InvalidDataAccessApiUsageException ignored) {
+            log.debug("Loading LUA with expected SHA [{}], connection [{}]", new String(scriptSha), connection.getNativeConnection());
+            String actualSha = connection.scriptingCommands().scriptLoad(luaScript);
+            if (!Arrays.equals(scriptSha, StringRedisSerializer.UTF_8.serialize(actualSha))) {
+                String message = String.format("SHA for LUA script wrong! Expected [%s], but actual [%s], connection [%s]",
+                        new String(scriptSha), actualSha, connection.getNativeConnection());
+                throw new IllegalStateException(message);
+            }
+            try {
+                connection.scriptingCommands().evalSha(scriptSha, returnType, numKeys, keysAndArgs);
+            } catch (InvalidDataAccessApiUsageException exception) {
+                log.warn("Slowly executing eval instead of fast evalSha", exception);
+                connection.scriptingCommands().eval(luaScript, returnType, numKeys, keysAndArgs);
+            }
+        }
+    }
+
 }
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/VersionedRedisTbCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/VersionedRedisTbCache.java
index e9b64822e9..b73bd49762 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/VersionedRedisTbCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/VersionedRedisTbCache.java
@@ -15,10 +15,8 @@
  */
 package org.thingsboard.server.cache;
 
-import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.NotImplementedException;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.ReturnType;
@@ -27,7 +25,6 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.thingsboard.server.common.data.HasVersion;
 
 import java.io.Serializable;
-import java.util.Arrays;
 
 @Slf4j
 public abstract class VersionedRedisTbCache<K extends VersionedCacheKey, V extends Serializable & HasVersion> extends RedisTbTransactionalCache<K, V> implements VersionedTbCache<K, V> {
@@ -65,19 +62,6 @@ public abstract class VersionedRedisTbCache<K extends VersionedCacheKey, V exten
         super(cacheName, cacheSpecsMap, connectionFactory, configuration, valueSerializer);
     }
 
-    @PostConstruct
-    public void init() {
-        try (var connection = getConnection(SET_VERSIONED_VALUE_SHA)) {
-            log.debug("Loading LUA with expected SHA[{}], connection [{}]", new String(SET_VERSIONED_VALUE_SHA), connection.getNativeConnection());
-            String sha = connection.scriptingCommands().scriptLoad(SET_VERSIONED_VALUE_LUA_SCRIPT);
-            if (!Arrays.equals(SET_VERSIONED_VALUE_SHA, StringRedisSerializer.UTF_8.serialize(sha))) {
-                log.error("SHA for SET_VERSIONED_VALUE_LUA_SCRIPT wrong! Expected [{}], but actual [{}], connection [{}]", new String(SET_VERSIONED_VALUE_SHA), sha, connection.getNativeConnection());
-            }
-        } catch (Throwable t) {
-            log.error("Error on Redis versioned cache init", t);
-        }
-    }
-
     @Override
     protected byte[] doGet(K key, RedisConnection connection) {
         if (!key.isVersioned()) {
@@ -129,21 +113,7 @@ public abstract class VersionedRedisTbCache<K extends VersionedCacheKey, V exten
         byte[] rawValue = getRawValue(value);
         byte[] rawVersion = StringRedisSerializer.UTF_8.serialize(String.valueOf(version));
         byte[] rawExpiration = StringRedisSerializer.UTF_8.serialize(String.valueOf(expiration.getExpirationTimeInSeconds()));
-        try {
-            connection.scriptingCommands().evalSha(SET_VERSIONED_VALUE_SHA, ReturnType.VALUE, 1, rawKey, rawValue, rawVersion, rawExpiration);
-        } catch (InvalidDataAccessApiUsageException e) {
-            log.debug("loading LUA [{}]", connection.getNativeConnection());
-            String sha = connection.scriptingCommands().scriptLoad(SET_VERSIONED_VALUE_LUA_SCRIPT);
-            if (!Arrays.equals(SET_VERSIONED_VALUE_SHA, StringRedisSerializer.UTF_8.serialize(sha))) {
-                log.error("SHA for SET_VERSIONED_VALUE_LUA_SCRIPT wrong! Expected [{}], but actual [{}]", new String(SET_VERSIONED_VALUE_SHA), sha);
-            }
-            try {
-                connection.scriptingCommands().evalSha(SET_VERSIONED_VALUE_SHA, ReturnType.VALUE, 1, rawKey, rawValue, rawVersion, rawExpiration);
-            } catch (InvalidDataAccessApiUsageException ignored) {
-                log.debug("Slowly executing eval instead of fast evalsha");
-                connection.scriptingCommands().eval(SET_VERSIONED_VALUE_LUA_SCRIPT, ReturnType.VALUE, 1, rawKey, rawValue, rawVersion, rawExpiration);
-            }
-        }
+        executeScript(connection, SET_VERSIONED_VALUE_SHA, SET_VERSIONED_VALUE_LUA_SCRIPT, ReturnType.VALUE, 1, rawKey, rawValue, rawVersion, rawExpiration);
     }
 
     @Override
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/edge/RelatedEdgesCacheKey.java b/common/cache/src/main/java/org/thingsboard/server/cache/edge/RelatedEdgesCacheKey.java
index 7fbf24bb40..afeecff0e8 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/edge/RelatedEdgesCacheKey.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/edge/RelatedEdgesCacheKey.java
@@ -39,7 +39,7 @@ public class RelatedEdgesCacheKey implements Serializable {
 
     @Override
     public String toString() {
-        return tenantId + "_" + entityId;
+        return "{" + tenantId + "}" + entityId;
     }
 
 }
diff --git a/common/cluster-api/pom.xml b/common/cluster-api/pom.xml
index 4bbe65d99f..d53ac4904d 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/coap-server/pom.xml b/common/coap-server/pom.xml
index 32da47ca08..30001c929d 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/CoapServerService.java b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/CoapServerService.java
index 0b1ba35709..5f4f1d152b 100644
--- a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/CoapServerService.java
+++ b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/CoapServerService.java
@@ -17,7 +17,6 @@ package org.thingsboard.server.coapserver;
 
 import org.eclipse.californium.core.CoapServer;
 
-import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.util.concurrent.ConcurrentMap;
 
@@ -25,5 +24,5 @@ public interface CoapServerService {
 
     CoapServer getCoapServer() throws UnknownHostException;
 
-    ConcurrentMap<InetSocketAddress, TbCoapDtlsSessionInfo> getDtlsSessionsMap();
+    ConcurrentMap<TbCoapDtlsSessionKey, TbCoapDtlsSessionInfo> getDtlsSessionsMap();
 }
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 f3d30bfea4..41b10b31a3 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
@@ -78,7 +78,7 @@ public class DefaultCoapServerService implements CoapServerService {
     }
 
     @Override
-    public ConcurrentMap<InetSocketAddress, TbCoapDtlsSessionInfo> getDtlsSessionsMap() {
+    public ConcurrentMap<TbCoapDtlsSessionKey, TbCoapDtlsSessionInfo> getDtlsSessionsMap() {
         return tbDtlsCertificateVerifier != null ? tbDtlsCertificateVerifier.getTbCoapDtlsSessionsMap() : null;
     }
 
diff --git a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsCertificateVerifier.java b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsCertificateVerifier.java
index cc7dcad77c..d61d7f279c 100644
--- a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsCertificateVerifier.java
+++ b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsCertificateVerifier.java
@@ -109,7 +109,8 @@ public class TbCoapDtlsCertificateVerifier implements NewAdvancedCertificateVeri
                     if (msg != null && strCert.equals(msg.getCredentials())) {
                         DeviceProfile deviceProfile = msg.getDeviceProfile();
                         if (msg.hasDeviceInfo() && deviceProfile != null) {
-                            tbCoapDtlsSessionInMemoryStorage.put(remotePeer, new TbCoapDtlsSessionInfo(msg, deviceProfile));
+                            TbCoapDtlsSessionKey tbCoapDtlsSessionKey = new TbCoapDtlsSessionKey(remotePeer, msg.getCredentials());
+                            tbCoapDtlsSessionInMemoryStorage.put(tbCoapDtlsSessionKey, new TbCoapDtlsSessionInfo(msg, deviceProfile));
                         }
                         break;
                     }
@@ -138,7 +139,7 @@ public class TbCoapDtlsCertificateVerifier implements NewAdvancedCertificateVeri
     public void setResultHandler(HandshakeResultHandler resultHandler) {
     }
 
-    public ConcurrentMap<InetSocketAddress, TbCoapDtlsSessionInfo> getTbCoapDtlsSessionsMap() {
+    public ConcurrentMap<TbCoapDtlsSessionKey, TbCoapDtlsSessionInfo> getTbCoapDtlsSessionsMap() {
         return tbCoapDtlsSessionInMemoryStorage.getDtlsSessionsMap();
     }
 
diff --git a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSessionInMemoryStorage.java b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSessionInMemoryStorage.java
index b4101f1763..5ff44561d8 100644
--- a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSessionInMemoryStorage.java
+++ b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSessionInMemoryStorage.java
@@ -18,7 +18,6 @@ package org.thingsboard.server.coapserver;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
-import java.net.InetSocketAddress;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -26,7 +25,7 @@ import java.util.concurrent.ConcurrentMap;
 @Data
 public class TbCoapDtlsSessionInMemoryStorage {
 
-    private final ConcurrentMap<InetSocketAddress, TbCoapDtlsSessionInfo> dtlsSessionsMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<TbCoapDtlsSessionKey, TbCoapDtlsSessionInfo> dtlsSessionsMap = new ConcurrentHashMap<>();
     private long dtlsSessionInactivityTimeout;
     private long dtlsSessionReportTimeout;
 
@@ -36,9 +35,9 @@ public class TbCoapDtlsSessionInMemoryStorage {
         this.dtlsSessionReportTimeout = dtlsSessionReportTimeout;
     }
 
-    public void put(InetSocketAddress remotePeer, TbCoapDtlsSessionInfo dtlsSessionInfo) {
-        log.trace("DTLS session added to in-memory store: [{}] timestamp: [{}]", remotePeer, dtlsSessionInfo.getLastActivityTime());
-        dtlsSessionsMap.putIfAbsent(remotePeer, dtlsSessionInfo);
+    public void put(TbCoapDtlsSessionKey tbCoapDtlsSessionKey, TbCoapDtlsSessionInfo dtlsSessionInfo) {
+        log.trace("DTLS session added to in-memory store: [{}] timestamp: [{}]", tbCoapDtlsSessionKey, dtlsSessionInfo.getLastActivityTime());
+        dtlsSessionsMap.putIfAbsent(tbCoapDtlsSessionKey, dtlsSessionInfo);
     }
 
     public void evictTimeoutSessions() {
diff --git a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSessionKey.java b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSessionKey.java
new file mode 100644
index 0000000000..cf3e0b4fec
--- /dev/null
+++ b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSessionKey.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.coapserver;
+
+import java.net.InetSocketAddress;
+import java.util.Objects;
+
+public record TbCoapDtlsSessionKey(InetSocketAddress peerAddress, String credentials) {
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        TbCoapDtlsSessionKey that = (TbCoapDtlsSessionKey) o;
+        return Objects.equals(peerAddress, that.peerAddress) &&
+                Objects.equals(credentials, that.credentials);
+    }
+}
+
diff --git a/common/dao-api/pom.xml b/common/dao-api/pom.xml
index 7d48a63903..0bd0f476ec 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
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 a205ee9b84..8668551fbb 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
@@ -37,16 +37,10 @@ public interface AttributesService {
 
     ListenableFuture<List<AttributeKvEntry>> findAll(TenantId tenantId, EntityId entityId, AttributeScope scope);
 
-    @Deprecated(since = "3.7.0")
-    ListenableFuture<List<Long>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes);
-
     ListenableFuture<List<Long>> save(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes);
 
     ListenableFuture<Long> 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);
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 eaba144042..49918f3823 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
@@ -56,7 +56,7 @@ public interface TimeseriesService {
 
     ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys);
 
-    ListenableFuture<Collection<String>> removeAllLatest(TenantId tenantId, EntityId entityId);
+    ListenableFuture<List<String>> removeAllLatest(TenantId tenantId, EntityId entityId);
 
     List<String> findAllKeysByDeviceProfileId(TenantId tenantId, DeviceProfileId deviceProfileId);
 
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java
index 9cad249787..c592777142 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java
@@ -35,6 +35,8 @@ public interface WidgetTypeService extends EntityDaoService {
 
     WidgetTypeDetails findWidgetTypeDetailsById(TenantId tenantId, WidgetTypeId widgetTypeId);
 
+    WidgetTypeInfo findWidgetTypeInfoById(TenantId tenantId, WidgetTypeId widgetTypeId);
+
     boolean widgetTypeExistsByTenantIdAndWidgetTypeId(TenantId tenantId, WidgetTypeId widgetTypeId);
 
     WidgetTypeDetails saveWidgetType(WidgetTypeDetails widgetType);
diff --git a/common/data/pom.xml b/common/data/pom.xml
index e6eca1aa93..f7c559c728 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetBundleInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetBundleInfo.java
new file mode 100644
index 0000000000..f7e43fdad0
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetBundleInfo.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.widget;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.thingsboard.server.common.data.EntityInfo;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.id.EntityIdFactory;
+
+import java.io.Serial;
+import java.util.UUID;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class WidgetBundleInfo extends EntityInfo {
+
+    @Serial
+    private static final long serialVersionUID = 2132305394634509820L;
+
+    public WidgetBundleInfo(@JsonProperty("id") UUID uuid, @JsonProperty("name") String name) {
+        super(EntityIdFactory.getByTypeAndUuid(EntityType.WIDGETS_BUNDLE, uuid), name);
+    }
+
+}
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 1ce8ad6ddc..f7260052a9 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
@@ -16,13 +16,21 @@
 package org.thingsboard.server.common.data.widget;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.Valid;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
 import org.thingsboard.server.common.data.validation.NoXss;
 
+import java.io.Serial;
+import java.util.Collections;
+import java.util.List;
+
 @Data
 public class WidgetTypeInfo extends BaseWidgetType {
 
+    @Serial
+    private static final long serialVersionUID = 1343617007959780969L;
+
     @Schema(description = "Base64 encoded widget thumbnail", accessMode = Schema.AccessMode.READ_ONLY)
     private String image;
     @NoXss
@@ -34,6 +42,9 @@ public class WidgetTypeInfo extends BaseWidgetType {
     @NoXss
     @Schema(description = "Type of the widget (timeseries, latest, control, alarm or static)", accessMode = Schema.AccessMode.READ_ONLY)
     private String widgetType;
+    @Valid
+    @Schema(description = "Bundles", accessMode = Schema.AccessMode.READ_ONLY)
+    private List<WidgetBundleInfo> bundles;
 
     public WidgetTypeInfo() {
         super();
@@ -48,14 +59,23 @@ public class WidgetTypeInfo extends BaseWidgetType {
     }
 
     public WidgetTypeInfo(WidgetTypeInfo widgetTypeInfo) {
+        this(widgetTypeInfo, Collections.emptyList());
+    }
+
+    public WidgetTypeInfo(WidgetTypeInfo widgetTypeInfo, List<WidgetBundleInfo> bundles) {
         super(widgetTypeInfo);
         this.image = widgetTypeInfo.getImage();
         this.description = widgetTypeInfo.getDescription();
         this.tags = widgetTypeInfo.getTags();
         this.widgetType = widgetTypeInfo.getWidgetType();
+        this.bundles = bundles;
     }
 
     public WidgetTypeInfo(WidgetTypeDetails widgetTypeDetails) {
+        this(widgetTypeDetails, Collections.emptyList());
+    }
+
+    public WidgetTypeInfo(WidgetTypeDetails widgetTypeDetails, List<WidgetBundleInfo> bundles) {
         super(widgetTypeDetails);
         this.image = widgetTypeDetails.getImage();
         this.description = widgetTypeDetails.getDescription();
@@ -65,5 +85,7 @@ public class WidgetTypeInfo extends BaseWidgetType {
         } else {
             this.widgetType = "";
         }
+        this.bundles = bundles;
     }
+
 }
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 005e4ca252..82ba041040 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
@@ -17,9 +17,9 @@ package org.thingsboard.server.common.data.widget;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.ToString;
 import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.HasImage;
@@ -32,58 +32,45 @@ import org.thingsboard.server.common.data.id.WidgetsBundleId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
+import java.io.Serial;
+
 @Schema
+@Data
 @EqualsAndHashCode(callSuper = true)
 public class WidgetsBundle extends BaseData<WidgetsBundleId> implements HasName, HasTenantId, ExportableEntity<WidgetsBundleId>, HasTitle, HasImage, HasVersion {
 
+    @Serial
     private static final long serialVersionUID = -7627368878362410489L;
 
-    @Getter
-    @Setter
     @Schema(description = "JSON object with Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
 
     @NoXss
     @Length(fieldName = "alias")
-    @Getter
-    @Setter
     @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
     @Schema(description = "Title used in search and UI", accessMode = Schema.AccessMode.READ_ONLY)
     private String title;
 
-    @Getter
-    @Setter
     @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)
+    @ToString.Exclude
     private String image;
 
-    @Getter
-    @Setter
     @Schema(description = "Whether widgets bundle contains SCADA symbol widget types.", accessMode = Schema.AccessMode.READ_ONLY)
     private boolean scada;
 
     @NoXss
     @Length(fieldName = "description", max = 1024)
-    @Getter
-    @Setter
     @Schema(description = "Description", accessMode = Schema.AccessMode.READ_ONLY)
     private String description;
 
-    @Getter
-    @Setter
     @Schema(description = "Order", accessMode = Schema.AccessMode.READ_ONLY)
     private Integer order;
 
-    @Getter
-    @Setter
     private WidgetsBundleId externalId;
-    @Getter
-    @Setter
     private Long version;
 
     public WidgetsBundle() {
@@ -128,16 +115,4 @@ public class WidgetsBundle extends BaseData<WidgetsBundleId> implements HasName,
     public String getName() {
         return title;
     }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("WidgetsBundle{");
-        sb.append("tenantId=").append(tenantId);
-        sb.append(", alias='").append(alias).append('\'');
-        sb.append(", title='").append(title).append('\'');
-        sb.append(", description='").append(description).append('\'');
-        sb.append('}');
-        return sb.toString();
-    }
-
 }
diff --git a/common/edge-api/pom.xml b/common/edge-api/pom.xml
index 68e647642d..4f0fe5aac0 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.9.0-RC</version>
+        <version>4.0.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 fcef33b968..3936b3ee63 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
@@ -136,7 +136,7 @@ public class EdgeGrpcClient implements EdgeRpcClient {
                 .setConnectRequestMsg(ConnectRequestMsg.newBuilder()
                         .setEdgeRoutingKey(edgeKey)
                         .setEdgeSecret(edgeSecret)
-                        .setEdgeVersion(EdgeVersion.V_3_9_0)
+                        .setEdgeVersion(EdgeVersion.V_4_0_0)
                         .setMaxInboundMessageSize(maxInboundMessageSize)
                         .build())
                 .build());
diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
index 4dc762e14c..50ecc31c1a 100644
--- a/common/edge-api/src/main/proto/edge.proto
+++ b/common/edge-api/src/main/proto/edge.proto
@@ -41,6 +41,7 @@ enum EdgeVersion {
   V_3_7_0 = 7;
   V_3_8_0 = 8;
   V_3_9_0 = 9;
+  V_4_0_0 = 10;
 }
 
 /**
diff --git a/common/message/pom.xml b/common/message/pom.xml
index 0614c94bc4..0e290d1e01 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
index 47fb80c90e..64e05770fe 100644
--- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
@@ -19,8 +19,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -44,8 +42,6 @@ import java.util.UUID;
  */
 @Data
 @Slf4j
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-@Builder(toBuilder = true)
 public final class TbMsg implements Serializable {
 
     public static final String EMPTY_JSON_OBJECT = "{}";
@@ -77,279 +73,55 @@ public final class TbMsg implements Serializable {
     @JsonIgnore
     transient private final TbMsgCallback callback;
 
-    public int getAndIncrementRuleNodeCounter() {
-        return ctx.getAndIncrementRuleNodeCounter();
-    }
-
-    @Deprecated(since = "3.6.0", forRemoval = true)
-    public static TbMsg newMsg(String queueName, String type, EntityId originator, TbMsgMetaData metaData, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
-        return newMsg(queueName, type, originator, null, metaData, data, ruleChainId, ruleNodeId);
-    }
-
-    /**
-     * Creates a new TbMsg instance with the specified parameters.
-     *
-     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.6.0 and should only be used when you need to
-     * specify a custom message type that doesn't exist in the {@link TbMsgType} enum. For standard message types,
-     * it is recommended to use the {@link #newMsg(String, TbMsgType, EntityId, CustomerId, TbMsgMetaData, String, RuleChainId, RuleNodeId)}
-     * method instead.</p>
-     *
-     * @param queueName   the name of the queue where the message will be sent
-     * @param type        the type of the message
-     * @param originator  the originator of the message
-     * @param customerId  the ID of the customer associated with the message
-     * @param metaData    the metadata of the message
-     * @param data        the data of the message
-     * @param ruleChainId the ID of the rule chain associated with the message
-     * @param ruleNodeId  the ID of the rule node associated with the message
-     * @return new TbMsg instance
-     */
-    @Deprecated(since = "3.6.0")
-    public static TbMsg newMsg(String queueName, String type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
-        return new TbMsg(queueName, UUID.randomUUID(), System.currentTimeMillis(), null, type, originator, customerId,
-                metaData.copy(), TbMsgDataType.JSON, data, ruleChainId, ruleNodeId, null, TbMsgCallback.EMPTY);
-    }
-
-    @Deprecated(since = "3.6.0", forRemoval = true)
-    public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, String data) {
-        return newMsg(type, originator, null, metaData, data);
-    }
-
-    @Deprecated(since = "3.6.0", forRemoval = true)
-    public static TbMsg newMsg(String type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, String data) {
-        return new TbMsg(null, UUID.randomUUID(), System.currentTimeMillis(), null, type, originator, customerId,
-                metaData.copy(), TbMsgDataType.JSON, data, null, null, null, TbMsgCallback.EMPTY);
-    }
-
-    public static TbMsg newMsg(String queueName, TbMsgType type, EntityId originator, TbMsgMetaData metaData, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
-        return newMsg(queueName, type, originator, null, metaData, data, ruleChainId, ruleNodeId);
-    }
-
-    public static TbMsg newMsg(String queueName, TbMsgType type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
-        return new TbMsg(queueName, UUID.randomUUID(), System.currentTimeMillis(), type, originator, customerId,
-                metaData.copy(), TbMsgDataType.JSON, data, ruleChainId, ruleNodeId, null, TbMsgCallback.EMPTY);
-    }
-
-    public static TbMsg newMsg(TbMsgType type, EntityId originator, TbMsgMetaData metaData, String data) {
-        return newMsg(type, originator, null, metaData, data);
-    }
-
-    public static TbMsg newMsg(TbMsgType type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, String data) {
-        return new TbMsg(null, UUID.randomUUID(), System.currentTimeMillis(), type, originator, customerId,
-                metaData.copy(), TbMsgDataType.JSON, data, null, null, null, TbMsgCallback.EMPTY);
-    }
-
-    public static TbMsg newMsg(TbMsgType type, EntityId originator, TbMsgMetaData metaData, String data, long ts) {
-        return new TbMsg(null, UUID.randomUUID(), ts, type, originator, null,
-                metaData.copy(), TbMsgDataType.JSON, data, null, null, null, TbMsgCallback.EMPTY);
-    }
-
-    // REALLY NEW MSG
-
-    /**
-     * Creates a new TbMsg instance with the specified parameters.
-     *
-     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.6.0 and should only be used when you need to
-     * specify a custom message type that doesn't exist in the {@link TbMsgType} enum. For standard message types,
-     * it is recommended to use the {@link #newMsg(String, TbMsgType, EntityId, TbMsgMetaData, String)}
-     * method instead.</p>
-     *
-     * @param queueName   the name of the queue where the message will be sent
-     * @param type        the type of the message
-     * @param originator  the originator of the message
-     * @param metaData    the metadata of the message
-     * @param data        the data of the message
-     * @return new TbMsg instance
-     */
-    @Deprecated(since = "3.6.0")
-    public static TbMsg newMsg(String queueName, String type, EntityId originator, TbMsgMetaData metaData, String data) {
-        return newMsg(queueName, type, originator, null, metaData, data);
-    }
-
-    /**
-     * Creates a new TbMsg instance with the specified parameters.
-     *
-     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.6.0 and should only be used when you need to
-     * specify a custom message type that doesn't exist in the {@link TbMsgType} enum. For standard message types,
-     * it is recommended to use the {@link #newMsg(String, TbMsgType, EntityId, CustomerId, TbMsgMetaData, String)}
-     * method instead.</p>
-     *
-     * @param queueName   the name of the queue where the message will be sent
-     * @param type        the type of the message
-     * @param originator  the originator of the message
-     * @param customerId  the ID of the customer associated with the message
-     * @param metaData    the metadata of the message
-     * @param data        the data of the message
-     * @return new TbMsg instance
-     */
-    @Deprecated(since = "3.6.0")
-    public static TbMsg newMsg(String queueName, String type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, String data) {
-        return new TbMsg(queueName, UUID.randomUUID(), System.currentTimeMillis(), null, type, originator, customerId,
-                metaData.copy(), TbMsgDataType.JSON, data, null, null, null, TbMsgCallback.EMPTY);
-    }
-
-    @Deprecated(since = "3.6.0", forRemoval = true)
-    public static TbMsg newMsg(String type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, TbMsgDataType dataType, String data) {
-        return new TbMsg(null, UUID.randomUUID(), System.currentTimeMillis(), null, type, originator, customerId,
-                metaData.copy(), dataType, data, null, null, null, TbMsgCallback.EMPTY);
-    }
-
-    /**
-     * Creates a new TbMsg instance with the specified parameters.
-     *
-     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.6.0 and should only be used when you need to
-     * specify a custom message type that doesn't exist in the {@link TbMsgType} enum. For standard message types,
-     * it is recommended to use the {@link #newMsg(TbMsgType, EntityId, TbMsgMetaData, TbMsgDataType, String)}
-     * method instead.</p>
-     *
-     * @param type        the type of the message
-     * @param originator  the originator of the message
-     * @param metaData    the metadata of the message
-     * @param dataType    the dataType of the message
-     * @param data        the data of the message
-     * @return new TbMsg instance
-     */
-    @Deprecated(since = "3.6.0")
-    public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, TbMsgDataType dataType, String data) {
-        return newMsg(type, originator, null, metaData, dataType, data);
-    }
-
-    public static TbMsg newMsg(String queueName, TbMsgType type, EntityId originator, TbMsgMetaData metaData, String data) {
-        return newMsg(queueName, type, originator, null, metaData, data);
-    }
-
-    public static TbMsg newMsg(String queueName, TbMsgType type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, String data) {
-        return new TbMsg(queueName, UUID.randomUUID(), System.currentTimeMillis(), type, originator, customerId,
-                metaData.copy(), TbMsgDataType.JSON, data, null, null, null, TbMsgCallback.EMPTY);
-    }
-
-    public static TbMsg newMsg(TbMsgType type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, TbMsgDataType dataType, String data) {
-        return new TbMsg(null, UUID.randomUUID(), System.currentTimeMillis(), type, originator, customerId,
-                metaData.copy(), dataType, data, null, null, null, TbMsgCallback.EMPTY);
-    }
-
-    public static TbMsg newMsg(TbMsgType type, EntityId originator, TbMsgMetaData metaData, TbMsgDataType dataType, String data) {
-        return newMsg(type, originator, null, metaData, dataType, data);
-    }
-
-    // For Tests only
-
-    @Deprecated(since = "3.6.0", forRemoval = true)
-    public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, TbMsgDataType dataType, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
-        return new TbMsg(null, UUID.randomUUID(), System.currentTimeMillis(), null, type, originator, null,
-                metaData.copy(), dataType, data, ruleChainId, ruleNodeId, null, TbMsgCallback.EMPTY);
-    }
-
-    @Deprecated(since = "3.6.0", forRemoval = true)
-    public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, String data, TbMsgCallback callback) {
-        return new TbMsg(null, UUID.randomUUID(), System.currentTimeMillis(), null, type, originator, null,
-                metaData.copy(), TbMsgDataType.JSON, data, null, null, null, callback);
-    }
-
-    /**
-     * Transforms an existing TbMsg instance by changing its message type, originator, metadata, and data.
-     *
-     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.6.0 and should only be used when you need to
-     * specify a custom message type that doesn't exist in the {@link TbMsgType} enum. For standard message types,
-     * it is recommended to use the {@link #transformMsg(TbMsg, TbMsgType, EntityId, TbMsgMetaData, String)}
-     * method instead.</p>
-     *
-     *
-     * @param tbMsg      the TbMsg instance to transform
-     * @param type       the new message type
-     * @param originator the new originator
-     * @param metaData   the new metadata
-     * @param data       the new data
-     * @return the transformed TbMsg instance
-     */
-    @Deprecated(since = "3.6.0")
-    public static TbMsg transformMsg(TbMsg tbMsg, String type, EntityId originator, TbMsgMetaData metaData, String data) {
-        return new TbMsg(tbMsg.queueName, tbMsg.id, tbMsg.ts, null, type, originator, tbMsg.customerId, metaData.copy(), tbMsg.dataType,
-                data, tbMsg.ruleChainId, tbMsg.ruleNodeId, tbMsg.correlationId, tbMsg.partition, tbMsg.ctx.copy(), tbMsg.callback);
+    public static TbMsgBuilder newMsg() {
+        return new TbMsgBuilder();
     }
 
-    public static TbMsg newMsg(TbMsgType type, EntityId originator, TbMsgMetaData metaData, TbMsgDataType dataType, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
-        return new TbMsg(null, UUID.randomUUID(), System.currentTimeMillis(), type, originator, null,
-                metaData.copy(), dataType, data, ruleChainId, ruleNodeId, null, TbMsgCallback.EMPTY);
+    public TbMsgBuilder transform() {
+        return new TbMsgTransformer(this);
     }
 
-    public static TbMsg newMsg(TbMsgType type, EntityId originator, TbMsgMetaData metaData, String data, TbMsgCallback callback) {
-        return new TbMsg(null, UUID.randomUUID(), System.currentTimeMillis(), type, originator, null,
-                metaData.copy(), TbMsgDataType.JSON, data, null, null, null, callback);
+    public TbMsgBuilder copy() {
+        return new TbMsgBuilder(this);
     }
 
-    public static TbMsg transformMsg(TbMsg tbMsg, TbMsgType type, EntityId originator, TbMsgMetaData metaData, String data) {
-        return new TbMsg(tbMsg.queueName, tbMsg.id, tbMsg.ts, type, type.name(), originator, tbMsg.customerId, metaData.copy(), tbMsg.dataType,
-                data, tbMsg.ruleChainId, tbMsg.ruleNodeId, tbMsg.correlationId, tbMsg.partition, tbMsg.ctx.copy(), tbMsg.callback);
+    public TbMsg transform(String queueName) {
+        return transform()
+                .queueName(queueName)
+                .resetRuleNodeId()
+                .build();
     }
 
-    public static TbMsg transformMsgOriginator(TbMsg tbMsg, EntityId originatorId) {
-        return new TbMsg(tbMsg.queueName, tbMsg.id, tbMsg.ts, tbMsg.internalType, tbMsg.type, originatorId, tbMsg.getCustomerId(), tbMsg.metaData, tbMsg.dataType,
-                tbMsg.data, tbMsg.ruleChainId, tbMsg.ruleNodeId, tbMsg.correlationId, tbMsg.partition, tbMsg.ctx.copy(), tbMsg.getCallback());
-    }
-
-    public static TbMsg transformMsgData(TbMsg tbMsg, String data) {
-        return new TbMsg(tbMsg.queueName, tbMsg.id, tbMsg.ts, tbMsg.internalType, tbMsg.type, tbMsg.originator, tbMsg.customerId, tbMsg.metaData, tbMsg.dataType,
-                data, tbMsg.ruleChainId, tbMsg.ruleNodeId, tbMsg.correlationId, tbMsg.partition, tbMsg.ctx.copy(), tbMsg.getCallback());
-    }
-
-    public static TbMsg transformMsgMetadata(TbMsg tbMsg, TbMsgMetaData metadata) {
-        return new TbMsg(tbMsg.queueName, tbMsg.id, tbMsg.ts, tbMsg.internalType, tbMsg.type, tbMsg.originator, tbMsg.customerId, metadata.copy(), tbMsg.dataType,
-                tbMsg.data, tbMsg.ruleChainId, tbMsg.ruleNodeId, tbMsg.correlationId, tbMsg.partition, tbMsg.ctx.copy(), tbMsg.getCallback());
-    }
-
-    public static TbMsg transformMsg(TbMsg tbMsg, TbMsgMetaData metadata, String data) {
-        return new TbMsg(tbMsg.queueName, tbMsg.id, tbMsg.ts, tbMsg.internalType, tbMsg.type, tbMsg.originator, tbMsg.customerId, metadata, tbMsg.dataType,
-                data, tbMsg.ruleChainId, tbMsg.ruleNodeId, tbMsg.correlationId, tbMsg.partition, tbMsg.ctx.copy(), tbMsg.getCallback());
-    }
-
-    public static TbMsg transformMsgCustomerId(TbMsg tbMsg, CustomerId customerId) {
-        return new TbMsg(tbMsg.queueName, tbMsg.id, tbMsg.ts, tbMsg.internalType, tbMsg.type, tbMsg.originator, customerId, tbMsg.metaData, tbMsg.dataType,
-                tbMsg.data, tbMsg.ruleChainId, tbMsg.ruleNodeId, tbMsg.correlationId, tbMsg.partition, tbMsg.ctx.copy(), tbMsg.getCallback());
-    }
-
-    public static TbMsg transformMsgRuleChainId(TbMsg tbMsg, RuleChainId ruleChainId) {
-        return new TbMsg(tbMsg.queueName, tbMsg.id, tbMsg.ts, tbMsg.internalType, tbMsg.type, tbMsg.originator, tbMsg.customerId, tbMsg.metaData, tbMsg.dataType,
-                tbMsg.data, ruleChainId, null, tbMsg.correlationId, tbMsg.partition, tbMsg.ctx.copy(), tbMsg.getCallback());
-    }
-
-    public static TbMsg transformMsgQueueName(TbMsg tbMsg, String queueName) {
-        return new TbMsg(queueName, tbMsg.id, tbMsg.ts, tbMsg.internalType, tbMsg.type, tbMsg.originator, tbMsg.customerId, tbMsg.metaData, tbMsg.dataType,
-                tbMsg.data, tbMsg.getRuleChainId(), null, tbMsg.correlationId, tbMsg.partition, tbMsg.ctx.copy(), tbMsg.getCallback());
-    }
-
-    public static TbMsg transformMsg(TbMsg tbMsg, RuleChainId ruleChainId, String queueName) {
-        return new TbMsg(queueName, tbMsg.id, tbMsg.ts, tbMsg.internalType, tbMsg.type, tbMsg.originator, tbMsg.customerId, tbMsg.metaData, tbMsg.dataType,
-                tbMsg.data, ruleChainId, null, tbMsg.correlationId, tbMsg.partition, tbMsg.ctx.copy(), tbMsg.getCallback());
-    }
-
-    //used for enqueueForTellNext
+    // used for enqueueForTellNext
     public static TbMsg newMsg(TbMsg tbMsg, String queueName, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
-        return new TbMsg(queueName, UUID.randomUUID(), tbMsg.getTs(), tbMsg.getInternalType(), tbMsg.getType(), tbMsg.getOriginator(), tbMsg.customerId, tbMsg.getMetaData().copy(),
-                tbMsg.getDataType(), tbMsg.getData(), ruleChainId, ruleNodeId, tbMsg.correlationId, tbMsg.partition, tbMsg.ctx.copy(), TbMsgCallback.EMPTY);
-    }
-
-    private TbMsg(String queueName, UUID id, long ts, TbMsgType internalType, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, TbMsgDataType dataType, String data,
-                  RuleChainId ruleChainId, RuleNodeId ruleNodeId, TbMsgProcessingCtx ctx, TbMsgCallback callback) {
-        this(queueName, id, ts, internalType, internalType.name(), originator, customerId, metaData, dataType, data, ruleChainId, ruleNodeId, ctx, callback);
+        return tbMsg.transform()
+                .id(UUID.randomUUID())
+                .queueName(queueName)
+                .metaData(tbMsg.getMetaData())
+                .ruleChainId(ruleChainId)
+                .ruleNodeId(ruleNodeId)
+                .callback(TbMsgCallback.EMPTY)
+                .build();
     }
 
-    private TbMsg(String queueName, UUID id, long ts, TbMsgType internalType, String type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, TbMsgDataType dataType, String data,
-                  RuleChainId ruleChainId, RuleNodeId ruleNodeId, TbMsgProcessingCtx ctx, TbMsgCallback callback) {
-        this(queueName, id, ts, internalType, type, originator, customerId, metaData, dataType, data, ruleChainId, ruleNodeId, null, null, ctx, callback);
+    public TbMsg copyWithNewCtx() {
+        return copy()
+                .ctx(ctx.copy())
+                .callback(TbMsgCallback.EMPTY)
+                .build();
     }
 
     private TbMsg(String queueName, UUID id, long ts, TbMsgType internalType, String type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, TbMsgDataType dataType, String data,
                   RuleChainId ruleChainId, RuleNodeId ruleNodeId, UUID correlationId, Integer partition, TbMsgProcessingCtx ctx, TbMsgCallback callback) {
-        this.id = id;
+        this.id = id != null ? id : UUID.randomUUID();
         this.queueName = queueName;
         if (ts > 0) {
             this.ts = ts;
         } else {
             this.ts = System.currentTimeMillis();
         }
-        this.type = type;
         this.internalType = internalType != null ? internalType : getInternalType(type);
+        this.type = type != null ? type : this.internalType.name();
         this.originator = originator;
         if (customerId == null || customerId.isNullUid()) {
             if (originator != null && originator.getEntityType() == EntityType.CUSTOMER) {
@@ -361,7 +133,7 @@ public final class TbMsg implements Serializable {
             this.customerId = customerId;
         }
         this.metaData = metaData;
-        this.dataType = dataType;
+        this.dataType = dataType != null ? dataType : TbMsgDataType.JSON;
         this.data = data;
         this.ruleChainId = ruleChainId;
         this.ruleNodeId = ruleNodeId;
@@ -458,23 +230,8 @@ public final class TbMsg implements Serializable {
         }
     }
 
-    public TbMsg copyWithRuleChainId(RuleChainId ruleChainId) {
-        return copyWithRuleChainId(ruleChainId, this.id);
-    }
-
-    public TbMsg copyWithRuleChainId(RuleChainId ruleChainId, UUID msgId) {
-        return new TbMsg(this.queueName, msgId, this.ts, this.internalType, this.type, this.originator, this.customerId,
-                this.metaData, this.dataType, this.data, ruleChainId, null, this.correlationId, this.partition, this.ctx, callback);
-    }
-
-    public TbMsg copyWithRuleNodeId(RuleChainId ruleChainId, RuleNodeId ruleNodeId, UUID msgId) {
-        return new TbMsg(this.queueName, msgId, this.ts, this.internalType, this.type, this.originator, this.customerId,
-                this.metaData, this.dataType, this.data, ruleChainId, ruleNodeId, this.correlationId, this.partition, this.ctx, callback);
-    }
-
-    public TbMsg copyWithNewCtx() {
-        return new TbMsg(this.queueName, this.id, this.ts, this.internalType, this.type, this.originator, this.customerId,
-                this.metaData, this.dataType, this.data, ruleChainId, ruleNodeId, this.correlationId, this.partition, this.ctx.copy(), TbMsgCallback.EMPTY);
+    public int getAndIncrementRuleNodeCounter() {
+        return ctx.getAndIncrementRuleNodeCounter();
     }
 
     public TbMsgCallback getCallback() {
@@ -510,11 +267,13 @@ public final class TbMsg implements Serializable {
     }
 
     private TbMsgType getInternalType(String type) {
-        try {
-            return TbMsgType.valueOf(type);
-        } catch (IllegalArgumentException e) {
-            return TbMsgType.NA;
+        if (type != null) {
+            try {
+                return TbMsgType.valueOf(type);
+            } catch (IllegalArgumentException ignored) {
+            }
         }
+        return TbMsgType.NA;
     }
 
     public boolean isTypeOf(TbMsgType tbMsgType) {
@@ -530,4 +289,194 @@ public final class TbMsg implements Serializable {
         return false;
     }
 
+    public static class TbMsgTransformer extends TbMsgBuilder {
+
+        TbMsgTransformer(TbMsg tbMsg) {
+            super(tbMsg);
+        }
+
+        /*
+         * metadata is only copied if specified explicitly during transform
+         * */
+        @Override
+        public TbMsgTransformer metaData(TbMsgMetaData metaData) {
+            this.metaData = metaData.copy();
+            return this;
+        }
+
+        /*
+         * setting ruleNodeId to null when updating ruleChainId
+         * */
+        @Override
+        public TbMsgBuilder ruleChainId(RuleChainId ruleChainId) {
+            this.ruleChainId = ruleChainId;
+            this.ruleNodeId = null;
+            return this;
+        }
+
+        @Override
+        public TbMsg build() {
+            /*
+             * always copying ctx when transforming
+             * */
+            if (this.ctx != null) {
+                this.ctx = this.ctx.copy();
+            }
+            return super.build();
+        }
+
+    }
+
+    public static class TbMsgBuilder {
+
+        protected String queueName;
+        protected UUID id;
+        protected long ts;
+        protected String type;
+        protected TbMsgType internalType;
+        protected EntityId originator;
+        protected CustomerId customerId;
+        protected TbMsgMetaData metaData;
+        protected TbMsgDataType dataType;
+        protected String data;
+        protected RuleChainId ruleChainId;
+        protected RuleNodeId ruleNodeId;
+        protected UUID correlationId;
+        protected Integer partition;
+        protected TbMsgProcessingCtx ctx;
+        protected TbMsgCallback callback;
+
+        TbMsgBuilder() {}
+
+        TbMsgBuilder(TbMsg tbMsg) {
+            this.queueName = tbMsg.queueName;
+            this.id = tbMsg.id;
+            this.ts = tbMsg.ts;
+            this.type = tbMsg.type;
+            this.internalType = tbMsg.internalType;
+            this.originator = tbMsg.originator;
+            this.customerId = tbMsg.customerId;
+            this.metaData = tbMsg.metaData;
+            this.dataType = tbMsg.dataType;
+            this.data = tbMsg.data;
+            this.ruleChainId = tbMsg.ruleChainId;
+            this.ruleNodeId = tbMsg.ruleNodeId;
+            this.correlationId = tbMsg.correlationId;
+            this.partition = tbMsg.partition;
+            this.ctx = tbMsg.ctx;
+            this.callback = tbMsg.callback;
+        }
+
+        public TbMsgBuilder queueName(String queueName) {
+            this.queueName = queueName;
+            return this;
+        }
+
+        public TbMsgBuilder id(UUID id) {
+            this.id = id;
+            return this;
+        }
+
+        public TbMsgBuilder ts(long ts) {
+            this.ts = ts;
+            return this;
+        }
+
+        /**
+         * <p><strong>Deprecated:</strong> This should only be used when you need to specify a custom message type that doesn't exist in the {@link TbMsgType} enum.
+         * Prefer using {@link #type(TbMsgType)} instead.
+         *
+         * */
+        @Deprecated
+        public TbMsgBuilder type(String type) {
+            this.type = type;
+            this.internalType = null;
+            return this;
+        }
+
+        public TbMsgBuilder type(TbMsgType internalType) {
+            this.internalType = internalType;
+            this.type = internalType.name();
+            return this;
+        }
+
+        public TbMsgBuilder originator(EntityId originator) {
+            this.originator = originator;
+            return this;
+        }
+
+        public TbMsgBuilder customerId(CustomerId customerId) {
+            this.customerId = customerId;
+            return this;
+        }
+
+        public TbMsgBuilder metaData(TbMsgMetaData metaData) {
+            this.metaData = metaData;
+            return this;
+        }
+
+        public TbMsgBuilder copyMetaData(TbMsgMetaData metaData) {
+            this.metaData = metaData.copy();
+            return this;
+        }
+
+        public TbMsgBuilder dataType(TbMsgDataType dataType) {
+            this.dataType = dataType;
+            return this;
+        }
+
+        public TbMsgBuilder data(String data) {
+            this.data = data;
+            return this;
+        }
+
+        public TbMsgBuilder ruleChainId(RuleChainId ruleChainId) {
+            this.ruleChainId = ruleChainId;
+            return this;
+        }
+
+        public TbMsgBuilder ruleNodeId(RuleNodeId ruleNodeId) {
+            this.ruleNodeId = ruleNodeId;
+            return this;
+        }
+
+        public TbMsgBuilder resetRuleNodeId() {
+            return ruleNodeId(null);
+        }
+
+        public TbMsgBuilder correlationId(UUID correlationId) {
+            this.correlationId = correlationId;
+            return this;
+        }
+
+        public TbMsgBuilder partition(Integer partition) {
+            this.partition = partition;
+            return this;
+        }
+
+        public TbMsgBuilder ctx(TbMsgProcessingCtx ctx) {
+            this.ctx = ctx;
+            return this;
+        }
+
+        public TbMsgBuilder callback(TbMsgCallback callback) {
+            this.callback = callback;
+            return this;
+        }
+
+        public TbMsg build() {
+            return new TbMsg(queueName, id, ts, internalType, type, originator, customerId, metaData, dataType, data, ruleChainId, ruleNodeId, correlationId, partition, ctx, callback);
+        }
+
+        public String toString() {
+            return "TbMsg.TbMsgBuilder(queueName=" + this.queueName + ", id=" + this.id + ", ts=" + this.ts +
+                    ", type=" + this.type + ", internalType=" + this.internalType + ", originator=" + this.originator +
+                    ", customerId=" + this.customerId + ", metaData=" + this.metaData + ", dataType=" + this.dataType +
+                    ", data=" + this.data + ", ruleChainId=" + this.ruleChainId + ", ruleNodeId=" + this.ruleNodeId +
+                    ", correlationId=" + this.correlationId + ", partition=" + this.partition + ", ctx=" + this.ctx +
+                    ", callback=" + this.callback + ")";
+        }
+
+    }
+
 }
diff --git a/common/pom.xml b/common/pom.xml
index 8bd1904d72..4c8f56cbce 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>common</artifactId>
diff --git a/common/proto/pom.xml b/common/proto/pom.xml
index fded7298e4..9a9b262d82 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/queue/pom.xml b/common/queue/pom.xml
index fab4ff3989..44e2239e05 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -64,18 +64,10 @@
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-sqs</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-pubsub</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-servicebus</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.rabbitmq</groupId>
             <artifactId>amqp-client</artifactId>
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/RuleEngineTbQueueAdminFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/RuleEngineTbQueueAdminFactory.java
index 87ad934c63..057351a449 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/RuleEngineTbQueueAdminFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/RuleEngineTbQueueAdminFactory.java
@@ -19,21 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusAdmin;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusQueueConfigs;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusSettings;
 import org.thingsboard.server.queue.kafka.TbKafkaAdmin;
 import org.thingsboard.server.queue.kafka.TbKafkaSettings;
 import org.thingsboard.server.queue.kafka.TbKafkaTopicConfigs;
-import org.thingsboard.server.queue.pubsub.TbPubSubAdmin;
-import org.thingsboard.server.queue.pubsub.TbPubSubSettings;
-import org.thingsboard.server.queue.pubsub.TbPubSubSubscriptionSettings;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqAdmin;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqQueueArguments;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqSettings;
-import org.thingsboard.server.queue.sqs.TbAwsSqsAdmin;
-import org.thingsboard.server.queue.sqs.TbAwsSqsQueueAttributes;
-import org.thingsboard.server.queue.sqs.TbAwsSqsSettings;
 
 @Configuration
 public class RuleEngineTbQueueAdminFactory {
@@ -43,56 +31,12 @@ public class RuleEngineTbQueueAdminFactory {
     @Autowired(required = false)
     private TbKafkaSettings kafkaSettings;
 
-    @Autowired(required = false)
-    private TbAwsSqsQueueAttributes awsSqsQueueAttributes;
-    @Autowired(required = false)
-    private TbAwsSqsSettings awsSqsSettings;
-
-    @Autowired(required = false)
-    private TbPubSubSubscriptionSettings pubSubSubscriptionSettings;
-    @Autowired(required = false)
-    private TbPubSubSettings pubSubSettings;
-
-    @Autowired(required = false)
-    private TbRabbitMqQueueArguments rabbitMqQueueArguments;
-    @Autowired(required = false)
-    private TbRabbitMqSettings rabbitMqSettings;
-
-    @Autowired(required = false)
-    private TbServiceBusQueueConfigs serviceBusQueueConfigs;
-    @Autowired(required = false)
-    private TbServiceBusSettings serviceBusSettings;
-
     @ConditionalOnExpression("'${queue.type:null}'=='kafka'")
     @Bean
     public TbQueueAdmin createKafkaAdmin() {
         return new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getRuleEngineConfigs());
     }
 
-    @ConditionalOnExpression("'${queue.type:null}'=='aws-sqs'")
-    @Bean
-    public TbQueueAdmin createAwsSqsAdmin() {
-        return new TbAwsSqsAdmin(awsSqsSettings, awsSqsQueueAttributes.getRuleEngineAttributes());
-    }
-
-    @ConditionalOnExpression("'${queue.type:null}'=='pubsub'")
-    @Bean
-    public TbQueueAdmin createPubSubAdmin() {
-        return new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getRuleEngineSettings());
-    }
-
-    @ConditionalOnExpression("'${queue.type:null}'=='rabbitmq'")
-    @Bean
-    public TbQueueAdmin createRabbitMqAdmin() {
-        return new TbRabbitMqAdmin(rabbitMqSettings, rabbitMqQueueArguments.getRuleEngineArgs());
-    }
-
-    @ConditionalOnExpression("'${queue.type:null}'=='service-bus'")
-    @Bean
-    public TbQueueAdmin createServiceBusAdmin() {
-        return new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getRuleEngineConfigs());
-    }
-
     @ConditionalOnExpression("'${queue.type:null}'=='in-memory'")
     @Bean
     public TbQueueAdmin createInMemoryAdmin() {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusAdmin.java b/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusAdmin.java
deleted file mode 100644
index 3f920778e6..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusAdmin.java
+++ /dev/null
@@ -1,137 +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.azure.servicebus;
-
-import com.microsoft.azure.servicebus.management.ManagementClient;
-import com.microsoft.azure.servicebus.management.QueueDescription;
-import com.microsoft.azure.servicebus.primitives.ConnectionStringBuilder;
-import com.microsoft.azure.servicebus.primitives.MessagingEntityAlreadyExistsException;
-import com.microsoft.azure.servicebus.primitives.ServiceBusException;
-import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.util.PropertyUtils;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Slf4j
-@Deprecated(forRemoval = true, since = "3.9") // for removal in 4.0
-public class TbServiceBusAdmin implements TbQueueAdmin {
-    private final String MAX_SIZE = "maxSizeInMb";
-    private final String MESSAGE_TIME_TO_LIVE = "messageTimeToLiveInSec";
-    private final String LOCK_DURATION = "lockDurationInSec";
-
-    private final Map<String, String> queueConfigs;
-    private final Set<String> queues = ConcurrentHashMap.newKeySet();
-
-    private final ManagementClient client;
-
-    public TbServiceBusAdmin(TbServiceBusSettings serviceBusSettings, Map<String, String> queueConfigs) {
-        this.queueConfigs = queueConfigs;
-
-        ConnectionStringBuilder builder = new ConnectionStringBuilder(
-                serviceBusSettings.getNamespaceName(),
-                "queues",
-                serviceBusSettings.getSasKeyName(),
-                serviceBusSettings.getSasKey());
-
-        client = new ManagementClient(builder);
-
-        try {
-            client.getQueues().forEach(queueDescription -> queues.add(queueDescription.getPath()));
-        } catch (ServiceBusException | InterruptedException e) {
-            log.error("Failed to get queues.", e);
-            throw new RuntimeException("Failed to get queues.", e);
-        }
-    }
-
-    @Override
-    public void createTopicIfNotExists(String topic, String properties) {
-        if (queues.contains(topic)) {
-            return;
-        }
-
-        try {
-            QueueDescription queueDescription = new QueueDescription(topic);
-            queueDescription.setRequiresDuplicateDetection(false);
-            setQueueConfigs(queueDescription, PropertyUtils.getProps(queueConfigs, properties));
-
-            client.createQueue(queueDescription);
-            queues.add(topic);
-        } catch (ServiceBusException | InterruptedException e) {
-            if (e instanceof MessagingEntityAlreadyExistsException) {
-                queues.add(topic);
-                log.info("[{}] queue already exists.", topic);
-            } else {
-                log.error("Failed to create queue: [{}]", topic, e);
-            }
-        }
-    }
-
-    @Override
-    public void deleteTopic(String topic) {
-        if (queues.contains(topic)) {
-            doDelete(topic);
-        } else {
-            try {
-                if (client.getQueue(topic) != null) {
-                    doDelete(topic);
-                } else {
-                    log.warn("Azure Service Bus Queue [{}] is not exist.", topic);
-                }
-            } catch (ServiceBusException | InterruptedException e) {
-                log.error("Failed to delete Azure Service Bus queue [{}]", topic, e);
-            }
-        }
-    }
-
-    private void doDelete(String topic) {
-        try {
-            client.deleteTopic(topic);
-        } catch (ServiceBusException | InterruptedException e) {
-            log.error("Failed to delete Azure Service Bus queue [{}]", topic, e);
-        }
-    }
-
-    private void setQueueConfigs(QueueDescription queueDescription, Map<String, String> queueConfigs) {
-        queueConfigs.forEach((confKey, confValue) -> {
-            switch (confKey) {
-                case MAX_SIZE:
-                    queueDescription.setMaxSizeInMB(Long.parseLong(confValue));
-                    break;
-                case MESSAGE_TIME_TO_LIVE:
-                    queueDescription.setDefaultMessageTimeToLive(Duration.ofSeconds(Long.parseLong(confValue)));
-                    break;
-                case LOCK_DURATION:
-                    queueDescription.setLockDuration(Duration.ofSeconds(Long.parseLong(confValue)));
-                    break;
-                default:
-                    log.error("Unknown config: [{}]", confKey);
-            }
-        });
-    }
-
-    public void destroy() {
-        try {
-            client.close();
-        } catch (IOException e) {
-            log.error("Failed to close ManagementClient.");
-        }
-    }
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusConsumerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusConsumerTemplate.java
deleted file mode 100644
index 8e2b32aab5..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusConsumerTemplate.java
+++ /dev/null
@@ -1,175 +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.azure.servicebus;
-
-import com.google.gson.Gson;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.microsoft.azure.servicebus.TransactionContext;
-import com.microsoft.azure.servicebus.primitives.ConnectionStringBuilder;
-import com.microsoft.azure.servicebus.primitives.CoreMessageReceiver;
-import com.microsoft.azure.servicebus.primitives.MessageWithDeliveryTag;
-import com.microsoft.azure.servicebus.primitives.MessagingEntityType;
-import com.microsoft.azure.servicebus.primitives.MessagingFactory;
-import com.microsoft.azure.servicebus.primitives.SettleModePair;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.qpid.proton.amqp.messaging.Data;
-import org.apache.qpid.proton.amqp.transport.ReceiverSettleMode;
-import org.apache.qpid.proton.amqp.transport.SenderSettleMode;
-import org.springframework.util.CollectionUtils;
-import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueMsg;
-import org.thingsboard.server.queue.TbQueueMsgDecoder;
-import org.thingsboard.server.queue.common.AbstractTbQueueConsumerTemplate;
-import org.thingsboard.server.queue.common.DefaultTbQueueMsg;
-
-import java.time.Duration;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@Slf4j
-public class TbServiceBusConsumerTemplate<T extends TbQueueMsg> extends AbstractTbQueueConsumerTemplate<MessageWithDeliveryTag, T> {
-    private final TbQueueAdmin admin;
-    private final TbQueueMsgDecoder<T> decoder;
-    private final TbServiceBusSettings serviceBusSettings;
-
-    private final Gson gson = new Gson();
-
-    private Set<CoreMessageReceiver> receivers;
-    private final Map<CoreMessageReceiver, Collection<MessageWithDeliveryTag>> pendingMessages = new ConcurrentHashMap<>();
-    private volatile int messagesPerQueue;
-
-    public TbServiceBusConsumerTemplate(TbQueueAdmin admin, TbServiceBusSettings serviceBusSettings, String topic, TbQueueMsgDecoder<T> decoder) {
-        super(topic);
-        this.admin = admin;
-        this.decoder = decoder;
-        this.serviceBusSettings = serviceBusSettings;
-    }
-
-    @Override
-    protected List<MessageWithDeliveryTag> doPoll(long durationInMillis) {
-        List<CompletableFuture<Collection<MessageWithDeliveryTag>>> messageFutures =
-                receivers.stream()
-                        .map(receiver -> receiver
-                                .receiveAsync(messagesPerQueue, Duration.ofMillis(durationInMillis))
-                                .whenComplete((messages, err) -> {
-                                    if (!CollectionUtils.isEmpty(messages)) {
-                                        pendingMessages.put(receiver, messages);
-                                    } else if (err != null) {
-                                        log.error("Failed to receive messages.", err);
-                                    }
-                                }))
-                        .collect(Collectors.toList());
-        try {
-            return fromList(messageFutures)
-                    .get()
-                    .stream()
-                    .flatMap(messages -> CollectionUtils.isEmpty(messages) ? Stream.empty() : messages.stream())
-                    .collect(Collectors.toList());
-        } catch (InterruptedException | ExecutionException e) {
-            if (stopped) {
-                log.info("[{}] Service Bus consumer is stopped.", getTopic());
-            } else {
-                log.error("Failed to receive messages", e);
-            }
-            return Collections.emptyList();
-        }
-    }
-
-    @Override
-    protected void doSubscribe(List<String> topicNames) {
-        createReceivers();
-        messagesPerQueue = receivers.size() / Math.max(partitions.size(), 1);
-    }
-
-    @Override
-    protected void doCommit() {
-        pendingMessages.forEach((receiver, msgs) ->
-                msgs.forEach(msg -> receiver.completeMessageAsync(msg.getDeliveryTag(), TransactionContext.NULL_TXN)));
-        pendingMessages.clear();
-    }
-
-    @Override
-    protected void doUnsubscribe() {
-        receivers.forEach(CoreMessageReceiver::closeAsync);
-    }
-
-    private void createReceivers() {
-        List<CompletableFuture<CoreMessageReceiver>> receiverFutures = partitions.stream()
-                .map(TopicPartitionInfo::getFullTopicName)
-                .map(queue -> {
-                    MessagingFactory factory;
-                    try {
-                        factory = MessagingFactory.createFromConnectionStringBuilder(createConnection(queue));
-                    } catch (InterruptedException | ExecutionException e) {
-                        log.error("Failed to create factory for the queue [{}]", queue);
-                        throw new RuntimeException("Failed to create the factory", e);
-                    }
-
-                    return CoreMessageReceiver.create(factory, queue, queue, 0,
-                            new SettleModePair(SenderSettleMode.UNSETTLED, ReceiverSettleMode.SECOND),
-                            MessagingEntityType.QUEUE);
-                }).collect(Collectors.toList());
-
-        try {
-            receivers = new HashSet<>(fromList(receiverFutures).get());
-        } catch (InterruptedException | ExecutionException e) {
-            if (stopped) {
-                log.info("[{}] Service Bus consumer is stopped.", getTopic());
-            } else {
-                log.error("Failed to create receivers", e);
-            }
-        }
-    }
-
-    private ConnectionStringBuilder createConnection(String queue) {
-        admin.createTopicIfNotExists(queue);
-        return new ConnectionStringBuilder(
-                serviceBusSettings.getNamespaceName(),
-                queue,
-                serviceBusSettings.getSasKeyName(),
-                serviceBusSettings.getSasKey());
-    }
-
-    private <V> CompletableFuture<List<V>> fromList(List<CompletableFuture<V>> futures) {
-        @SuppressWarnings("unchecked")
-        CompletableFuture<Collection<V>>[] arrayFuture = new CompletableFuture[futures.size()];
-        futures.toArray(arrayFuture);
-
-        return CompletableFuture
-                .allOf(arrayFuture)
-                .thenApply(v -> futures
-                        .stream()
-                        .map(CompletableFuture::join)
-                        .collect(Collectors.toList()));
-    }
-
-    @Override
-    protected T decode(MessageWithDeliveryTag data) throws InvalidProtocolBufferException {
-        DefaultTbQueueMsg msg = gson.fromJson(new String(((Data) data.getMessage().getBody()).getValue().getArray()), DefaultTbQueueMsg.class);
-        return decoder.decode(msg);
-    }
-
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusProducerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusProducerTemplate.java
deleted file mode 100644
index 119f28079b..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusProducerTemplate.java
+++ /dev/null
@@ -1,110 +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.azure.servicebus;
-
-import com.google.gson.Gson;
-import com.microsoft.azure.servicebus.IMessage;
-import com.microsoft.azure.servicebus.Message;
-import com.microsoft.azure.servicebus.QueueClient;
-import com.microsoft.azure.servicebus.ReceiveMode;
-import com.microsoft.azure.servicebus.primitives.ConnectionStringBuilder;
-import com.microsoft.azure.servicebus.primitives.ServiceBusException;
-import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueCallback;
-import org.thingsboard.server.queue.TbQueueMsg;
-import org.thingsboard.server.queue.TbQueueProducer;
-import org.thingsboard.server.queue.common.DefaultTbQueueMsg;
-
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-@Slf4j
-public class TbServiceBusProducerTemplate<T extends TbQueueMsg> implements TbQueueProducer<T> {
-    private final String defaultTopic;
-    private final Gson gson = new Gson();
-    private final TbQueueAdmin admin;
-    private final TbServiceBusSettings serviceBusSettings;
-    private final Map<String, QueueClient> clients = new ConcurrentHashMap<>();
-    private final ExecutorService executorService;
-
-    public TbServiceBusProducerTemplate(TbQueueAdmin admin, TbServiceBusSettings serviceBusSettings, String defaultTopic) {
-        this.admin = admin;
-        this.defaultTopic = defaultTopic;
-        this.serviceBusSettings = serviceBusSettings;
-        executorService = Executors.newCachedThreadPool();
-    }
-
-    @Override
-    public void init() {
-
-    }
-
-    @Override
-    public String getDefaultTopic() {
-        return defaultTopic;
-    }
-
-    @Override
-    public void send(TopicPartitionInfo tpi, T msg, TbQueueCallback callback) {
-        IMessage message = new Message(gson.toJson(new DefaultTbQueueMsg(msg)));
-        CompletableFuture<Void> future = getClient(tpi.getFullTopicName()).sendAsync(message);
-        future.whenCompleteAsync((success, err) -> {
-            if (err != null) {
-                callback.onFailure(err);
-            } else {
-                callback.onSuccess(null);
-            }
-        }, executorService);
-    }
-
-    @Override
-    public void stop() {
-        clients.forEach((t, client) -> {
-            try {
-                client.close();
-            } catch (ServiceBusException e) {
-                log.error("Failed to close QueueClient.", e);
-            }
-        });
-
-        if (executorService != null) {
-            executorService.shutdownNow();
-        }
-    }
-
-    private QueueClient getClient(String topic) {
-        return clients.computeIfAbsent(topic, k -> {
-            admin.createTopicIfNotExists(topic);
-            ConnectionStringBuilder builder =
-                    new ConnectionStringBuilder(
-                            serviceBusSettings.getNamespaceName(),
-                            topic,
-                            serviceBusSettings.getSasKeyName(),
-                            serviceBusSettings.getSasKey());
-            try {
-                return new QueueClient(builder, ReceiveMode.PEEKLOCK);
-            } catch (InterruptedException | ServiceBusException e) {
-                log.error("Failed to create new client for the Queue: [{}]", topic, e);
-                throw new RuntimeException("Failed to create new client for the Queue", e);
-            }
-        });
-    }
-}
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
deleted file mode 100644
index 80da7846ea..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusQueueConfigs.java
+++ /dev/null
@@ -1,72 +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.azure.servicebus;
-
-import jakarta.annotation.PostConstruct;
-import lombok.Getter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.queue.util.PropertyUtils;
-
-import java.util.Map;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='service-bus'")
-public class TbServiceBusQueueConfigs {
-
-    @Value("${queue.service-bus.queue-properties.core:}")
-    private String coreProperties;
-    @Value("${queue.service-bus.queue-properties.rule-engine:}")
-    private String ruleEngineProperties;
-    @Value("${queue.service-bus.queue-properties.transport-api:}")
-    private String transportApiProperties;
-    @Value("${queue.service-bus.queue-properties.notifications:}")
-    private String notificationsProperties;
-    @Value("${queue.service-bus.queue-properties.js-executor:}")
-    private String jsExecutorProperties;
-    @Value("${queue.service-bus.queue-properties.version-control:}")
-    private String vcProperties;
-    @Value("${queue.service-bus.queue-properties.edge:}")
-    private String edgeProperties;
-
-    @Getter
-    private Map<String, String> coreConfigs;
-    @Getter
-    private Map<String, String> ruleEngineConfigs;
-    @Getter
-    private Map<String, String> transportApiConfigs;
-    @Getter
-    private Map<String, String> notificationsConfigs;
-    @Getter
-    private Map<String, String> jsExecutorConfigs;
-    @Getter
-    private Map<String, String> vcConfigs;
-    @Getter
-    private Map<String, String> edgeConfigs;
-
-    @PostConstruct
-    private void init() {
-        coreConfigs = PropertyUtils.getProps(coreProperties);
-        ruleEngineConfigs = PropertyUtils.getProps(ruleEngineProperties);
-        transportApiConfigs = PropertyUtils.getProps(transportApiProperties);
-        notificationsConfigs = PropertyUtils.getProps(notificationsProperties);
-        jsExecutorConfigs = PropertyUtils.getProps(jsExecutorProperties);
-        vcConfigs = PropertyUtils.getProps(vcProperties);
-        edgeConfigs = PropertyUtils.getProps(edgeProperties);
-    }
-
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusSettings.java b/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusSettings.java
deleted file mode 100644
index 98bb11a839..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusSettings.java
+++ /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.
- */
-package org.thingsboard.server.queue.azure.servicebus;
-
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@ConditionalOnExpression("'${queue.type:null}'=='service-bus'")
-@Component
-@Data
-public class TbServiceBusSettings {
-    @Value("${queue.service_bus.namespace_name}")
-    private String namespaceName;
-    @Value("${queue.service_bus.sas_key_name}")
-    private String sasKeyName;
-    @Value("${queue.service_bus.sas_key}")
-    private String sasKey;
-    @Value("${queue.service_bus.max_messages}")
-    private int maxMessages;
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/common/TbRuleEngineProducerService.java b/common/queue/src/main/java/org/thingsboard/server/queue/common/TbRuleEngineProducerService.java
index 49b40e3a6d..09f1f4608d 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/common/TbRuleEngineProducerService.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/common/TbRuleEngineProducerService.java
@@ -47,7 +47,7 @@ public class TbRuleEngineProducerService {
                 Integer partition = tpi.getPartition().orElse(null);
                 UUID id = i > 0 ? UUID.randomUUID() : tbMsg.getId();
 
-                tbMsg = tbMsg.toBuilder()
+                tbMsg = tbMsg.transform()
                         .id(id)
                         .correlationId(correlationId)
                         .partition(partition)
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
deleted file mode 100644
index 310cc1d1c5..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsMonolithQueueFactory.java
+++ /dev/null
@@ -1,317 +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.provider;
-
-import com.google.protobuf.util.JsonFormat;
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.queue.Queue;
-import org.thingsboard.server.common.msg.queue.ServiceType;
-import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsRequest;
-import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
-import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeEventNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeNotificationMsg;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToVersionControlServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-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.TbServiceInfoProvider;
-import org.thingsboard.server.queue.discovery.TopicService;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueEdgeSettings;
-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 org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
-import org.thingsboard.server.queue.sqs.TbAwsSqsAdmin;
-import org.thingsboard.server.queue.sqs.TbAwsSqsConsumerTemplate;
-import org.thingsboard.server.queue.sqs.TbAwsSqsProducerTemplate;
-import org.thingsboard.server.queue.sqs.TbAwsSqsQueueAttributes;
-import org.thingsboard.server.queue.sqs.TbAwsSqsSettings;
-
-import java.nio.charset.StandardCharsets;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='aws-sqs' && '${service.type:null}'=='monolith'")
-public class AwsSqsMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngineQueueFactory, TbVersionControlQueueFactory {
-
-    private final TopicService topicService;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TbQueueTransportApiSettings transportApiSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbAwsSqsSettings sqsSettings;
-    private final TbQueueVersionControlSettings vcSettings;
-    private final TbQueueEdgeSettings edgeSettings;
-    private final TbQueueRemoteJsInvokeSettings jsInvokeSettings;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin jsExecutorAdmin;
-    private final TbQueueAdmin transportApiAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin otaAdmin;
-    private final TbQueueAdmin vcAdmin;
-    private final TbQueueAdmin edgeAdmin;
-
-    public AwsSqsMonolithQueueFactory(TopicService topicService, TbQueueCoreSettings coreSettings,
-                                      TbQueueRuleEngineSettings ruleEngineSettings,
-                                      TbServiceInfoProvider serviceInfoProvider,
-                                      TbQueueTransportApiSettings transportApiSettings,
-                                      TbQueueTransportNotificationSettings transportNotificationSettings,
-                                      TbAwsSqsSettings sqsSettings,
-                                      TbQueueVersionControlSettings vcSettings,
-                                      TbQueueEdgeSettings edgeSettings,
-                                      TbAwsSqsQueueAttributes sqsQueueAttributes,
-                                      TbQueueRemoteJsInvokeSettings jsInvokeSettings) {
-        this.topicService = topicService;
-        this.coreSettings = coreSettings;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.transportApiSettings = transportApiSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.sqsSettings = sqsSettings;
-        this.vcSettings = vcSettings;
-        this.edgeSettings = edgeSettings;
-        this.jsInvokeSettings = jsInvokeSettings;
-
-        this.coreAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getCoreAttributes());
-        this.ruleEngineAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getRuleEngineAttributes());
-        this.jsExecutorAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getJsExecutorAttributes());
-        this.transportApiAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getTransportApiAttributes());
-        this.notificationAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getNotificationsAttributes());
-        this.otaAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getOtaAttributes());
-        this.vcAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getVcAttributes());
-        this.edgeAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getEdgeAttributes());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(ruleEngineAdmin, sqsSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createToVersionControlMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(vcAdmin, sqsSettings, topicService.buildTopicName(vcSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToVersionControlServiceMsg.parseFrom(msg.getData()), msg.getHeaders())
-        );
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> createToRuleEngineMsgConsumer(Queue configuration) {
-        return new TbAwsSqsConsumerTemplate<>(ruleEngineAdmin, sqsSettings, topicService.buildTopicName(configuration.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createToRuleEngineNotificationsMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(notificationAdmin, sqsSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_RULE_ENGINE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreMsg>> createToCoreMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreNotificationMsg>> createToCoreNotificationsMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(notificationAdmin, sqsSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportApiRequestMsg>> createTransportApiRequestConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(transportApiAdmin, sqsSettings, topicService.buildTopicName(transportApiSettings.getRequestsTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiRequestMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiResponseProducer() {
-        return new TbAwsSqsProducerTemplate<>(transportApiAdmin, sqsSettings, topicService.buildTopicName(transportApiSettings.getResponsesTopic()));
-    }
-
-    @Override
-    @Bean
-    public TbQueueRequestTemplate<TbProtoJsQueueMsg<RemoteJsRequest>, TbProtoQueueMsg<RemoteJsResponse>> createRemoteJsRequestTemplate() {
-        TbQueueProducer<TbProtoJsQueueMsg<RemoteJsRequest>> producer = new TbAwsSqsProducerTemplate<>(jsExecutorAdmin, sqsSettings, jsInvokeSettings.getRequestTopic());
-        TbQueueConsumer<TbProtoQueueMsg<RemoteJsResponse>> consumer = new TbAwsSqsConsumerTemplate<>(jsExecutorAdmin, sqsSettings,
-                jsInvokeSettings.getResponseTopic() + "_" + serviceInfoProvider.getServiceId(),
-                msg -> {
-                    RemoteJsResponse.Builder builder = RemoteJsResponse.newBuilder();
-                    JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
-                    return new TbProtoQueueMsg<>(msg.getKey(), builder.build(), msg.getHeaders());
-                });
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoJsQueueMsg<RemoteJsRequest>, TbProtoQueueMsg<RemoteJsResponse>> builder = DefaultTbQueueRequestTemplate.builder();
-        builder.queueAdmin(jsExecutorAdmin);
-        builder.requestTemplate(producer);
-        builder.responseTemplate(consumer);
-        builder.maxPendingRequests(jsInvokeSettings.getMaxPendingRequests());
-        builder.maxRequestTimeout(jsInvokeSettings.getMaxRequestsTimeout());
-        builder.pollInterval(jsInvokeSettings.getResponsePollInterval());
-        return builder.build();
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToUsageStatsServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(otaAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(otaAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createVersionControlMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(vcAdmin, sqsSettings, topicService.buildTopicName(vcSettings.getTopic()));
-    }
-
-    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()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(edgeAdmin, sqsSettings, topicService.buildTopicName(edgeSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(edgeAdmin, sqsSettings, topicService.buildTopicName(edgeSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createToEdgeNotificationsMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(notificationAdmin, sqsSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createEdgeNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeEventNotificationMsg>> createEdgeEventMsgProducer() {
-        return null;
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (jsExecutorAdmin != null) {
-            jsExecutorAdmin.destroy();
-        }
-        if (transportApiAdmin != null) {
-            transportApiAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (otaAdmin != null) {
-            otaAdmin.destroy();
-        }
-        if (vcAdmin != null) {
-            vcAdmin.destroy();
-        }
-        if (edgeAdmin != null) {
-            edgeAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 515c1bba44..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbCoreQueueFactory.java
+++ /dev/null
@@ -1,291 +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.provider;
-
-import com.google.protobuf.util.JsonFormat;
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-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.ToEdgeMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeNotificationMsg;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToVersionControlServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-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.TbServiceInfoProvider;
-import org.thingsboard.server.queue.discovery.TopicService;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueEdgeSettings;
-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 org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
-import org.thingsboard.server.queue.sqs.TbAwsSqsAdmin;
-import org.thingsboard.server.queue.sqs.TbAwsSqsConsumerTemplate;
-import org.thingsboard.server.queue.sqs.TbAwsSqsProducerTemplate;
-import org.thingsboard.server.queue.sqs.TbAwsSqsQueueAttributes;
-import org.thingsboard.server.queue.sqs.TbAwsSqsSettings;
-
-import java.nio.charset.StandardCharsets;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='aws-sqs' && '${service.type:null}'=='tb-core'")
-public class AwsSqsTbCoreQueueFactory implements TbCoreQueueFactory {
-
-    private final TbAwsSqsSettings sqsSettings;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueTransportApiSettings transportApiSettings;
-    private final TopicService topicService;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRemoteJsInvokeSettings jsInvokeSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbQueueVersionControlSettings vcSettings;
-    private final TbQueueEdgeSettings edgeSettings;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin jsExecutorAdmin;
-    private final TbQueueAdmin transportApiAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin otaAdmin;
-    private final TbQueueAdmin vcAdmin;
-    private final TbQueueAdmin edgeAdmin;
-
-    public AwsSqsTbCoreQueueFactory(TbAwsSqsSettings sqsSettings,
-                                    TbQueueCoreSettings coreSettings,
-                                    TbQueueTransportApiSettings transportApiSettings,
-                                    TbQueueRuleEngineSettings ruleEngineSettings,
-                                    TopicService topicService,
-                                    TbQueueVersionControlSettings vcSettings,
-                                    TbQueueEdgeSettings edgeSettings,
-                                    TbServiceInfoProvider serviceInfoProvider,
-                                    TbQueueRemoteJsInvokeSettings jsInvokeSettings,
-                                    TbAwsSqsQueueAttributes sqsQueueAttributes,
-                                    TbQueueTransportNotificationSettings transportNotificationSettings) {
-        this.sqsSettings = sqsSettings;
-        this.coreSettings = coreSettings;
-        this.transportApiSettings = transportApiSettings;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.edgeSettings = edgeSettings;
-        this.topicService = topicService;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.jsInvokeSettings = jsInvokeSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.vcSettings = vcSettings;
-
-        this.coreAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getCoreAttributes());
-        this.ruleEngineAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getRuleEngineAttributes());
-        this.jsExecutorAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getJsExecutorAttributes());
-        this.transportApiAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getTransportApiAttributes());
-        this.notificationAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getNotificationsAttributes());
-        this.otaAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getOtaAttributes());
-        this.vcAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getVcAttributes());
-        this.edgeAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getEdgeAttributes());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreMsg>> createToCoreMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreNotificationMsg>> createToCoreNotificationsMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(notificationAdmin, sqsSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportApiRequestMsg>> createTransportApiRequestConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(transportApiAdmin, sqsSettings, topicService.buildTopicName(transportApiSettings.getRequestsTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiRequestMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiResponseProducer() {
-        return new TbAwsSqsProducerTemplate<>(transportApiAdmin, sqsSettings, topicService.buildTopicName(transportApiSettings.getResponsesTopic()));
-    }
-
-    @Override
-    @Bean
-    public TbQueueRequestTemplate<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> createRemoteJsRequestTemplate() {
-        TbQueueProducer<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>> producer = new TbAwsSqsProducerTemplate<>(jsExecutorAdmin, sqsSettings, jsInvokeSettings.getRequestTopic());
-        TbQueueConsumer<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> consumer = new TbAwsSqsConsumerTemplate<>(jsExecutorAdmin, sqsSettings,
-                jsInvokeSettings.getResponseTopic() + "_" + serviceInfoProvider.getServiceId(),
-                msg -> {
-                    JsInvokeProtos.RemoteJsResponse.Builder builder = JsInvokeProtos.RemoteJsResponse.newBuilder();
-                    JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
-                    return new TbProtoQueueMsg<>(msg.getKey(), builder.build(), msg.getHeaders());
-                });
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> builder = DefaultTbQueueRequestTemplate.builder();
-        builder.queueAdmin(jsExecutorAdmin);
-        builder.requestTemplate(producer);
-        builder.responseTemplate(consumer);
-        builder.maxPendingRequests(jsInvokeSettings.getMaxPendingRequests());
-        builder.maxRequestTimeout(jsInvokeSettings.getMaxRequestsTimeout());
-        builder.pollInterval(jsInvokeSettings.getResponsePollInterval());
-        return builder.build();
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToUsageStatsServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(otaAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(otaAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createVersionControlMsgProducer() {
-        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()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(edgeAdmin, sqsSettings, topicService.buildTopicName(edgeSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(edgeAdmin, sqsSettings, topicService.buildTopicName(edgeSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createToEdgeNotificationsMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(notificationAdmin, sqsSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createEdgeNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (jsExecutorAdmin != null) {
-            jsExecutorAdmin.destroy();
-        }
-        if (transportApiAdmin != null) {
-            transportApiAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (otaAdmin != null) {
-            otaAdmin.destroy();
-        }
-        if (vcAdmin != null) {
-            vcAdmin.destroy();
-        }
-        if (edgeAdmin != null) {
-            edgeAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index a93aba2764..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbRuleEngineQueueFactory.java
+++ /dev/null
@@ -1,208 +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.provider;
-
-import com.google.protobuf.util.JsonFormat;
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.queue.Queue;
-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.ToEdgeMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeNotificationMsg;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-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.TbServiceInfoProvider;
-import org.thingsboard.server.queue.discovery.TopicService;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueEdgeSettings;
-import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
-import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
-import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
-import org.thingsboard.server.queue.sqs.TbAwsSqsAdmin;
-import org.thingsboard.server.queue.sqs.TbAwsSqsConsumerTemplate;
-import org.thingsboard.server.queue.sqs.TbAwsSqsProducerTemplate;
-import org.thingsboard.server.queue.sqs.TbAwsSqsQueueAttributes;
-import org.thingsboard.server.queue.sqs.TbAwsSqsSettings;
-
-import java.nio.charset.StandardCharsets;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='aws-sqs' && '${service.type:null}'=='tb-rule-engine'")
-public class AwsSqsTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
-
-    private final TopicService topicService;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TbAwsSqsSettings sqsSettings;
-    private final TbQueueRemoteJsInvokeSettings jsInvokeSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbQueueEdgeSettings edgeSettings;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin jsExecutorAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin otaAdmin;
-    private final TbQueueAdmin edgeAdmin;
-
-    public AwsSqsTbRuleEngineQueueFactory(TopicService topicService, TbQueueCoreSettings coreSettings,
-                                          TbQueueRuleEngineSettings ruleEngineSettings,
-                                          TbServiceInfoProvider serviceInfoProvider,
-                                          TbAwsSqsSettings sqsSettings,
-                                          TbAwsSqsQueueAttributes sqsQueueAttributes,
-                                          TbQueueRemoteJsInvokeSettings jsInvokeSettings,
-                                          TbQueueTransportNotificationSettings transportNotificationSettings,
-                                          TbQueueEdgeSettings edgeSettings) {
-        this.topicService = topicService;
-        this.coreSettings = coreSettings;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.sqsSettings = sqsSettings;
-        this.jsInvokeSettings = jsInvokeSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.edgeSettings = edgeSettings;
-
-        this.coreAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getCoreAttributes());
-        this.ruleEngineAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getRuleEngineAttributes());
-        this.jsExecutorAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getJsExecutorAttributes());
-        this.notificationAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getNotificationsAttributes());
-        this.otaAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getOtaAttributes());
-        this.edgeAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getEdgeAttributes());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(ruleEngineAdmin, sqsSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(edgeAdmin, sqsSettings, topicService.buildTopicName(edgeSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createEdgeNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings, topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> createToRuleEngineMsgConsumer(Queue configuration) {
-        return new TbAwsSqsConsumerTemplate<>(ruleEngineAdmin, sqsSettings, topicService.buildTopicName(configuration.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createToRuleEngineNotificationsMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(notificationAdmin, sqsSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_RULE_ENGINE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    @Bean
-    public TbQueueRequestTemplate<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> createRemoteJsRequestTemplate() {
-        TbQueueProducer<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>> producer = new TbAwsSqsProducerTemplate<>(jsExecutorAdmin, sqsSettings, jsInvokeSettings.getRequestTopic());
-        TbQueueConsumer<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> consumer = new TbAwsSqsConsumerTemplate<>(jsExecutorAdmin, sqsSettings,
-                jsInvokeSettings.getResponseTopic() + "_" + serviceInfoProvider.getServiceId(),
-                msg -> {
-                    JsInvokeProtos.RemoteJsResponse.Builder builder = JsInvokeProtos.RemoteJsResponse.newBuilder();
-                    JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
-                    return new TbProtoQueueMsg<>(msg.getKey(), builder.build(), msg.getHeaders());
-                });
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> builder = DefaultTbQueueRequestTemplate.builder();
-        builder.queueAdmin(jsExecutorAdmin);
-        builder.requestTemplate(producer);
-        builder.responseTemplate(consumer);
-        builder.maxPendingRequests(jsInvokeSettings.getMaxPendingRequests());
-        builder.maxRequestTimeout(jsInvokeSettings.getMaxRequestsTimeout());
-        builder.pollInterval(jsInvokeSettings.getResponsePollInterval());
-        return builder.build();
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(otaAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (jsExecutorAdmin != null) {
-            jsExecutorAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (otaAdmin != null) {
-            otaAdmin.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
deleted file mode 100644
index 67ff0393bd..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbVersionControlQueueFactory.java
+++ /dev/null
@@ -1,98 +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.provider;
-
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.queue.TbQueueAdmin;
-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.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
-import org.thingsboard.server.queue.sqs.TbAwsSqsAdmin;
-import org.thingsboard.server.queue.sqs.TbAwsSqsConsumerTemplate;
-import org.thingsboard.server.queue.sqs.TbAwsSqsProducerTemplate;
-import org.thingsboard.server.queue.sqs.TbAwsSqsQueueAttributes;
-import org.thingsboard.server.queue.sqs.TbAwsSqsSettings;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='aws-sqs' && '${service.type:null}'=='tb-vc-executor'")
-public class AwsSqsTbVersionControlQueueFactory implements TbVersionControlQueueFactory {
-
-    private final TbAwsSqsSettings sqsSettings;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueVersionControlSettings vcSettings;
-    private final TopicService topicService;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin vcAdmin;
-
-    public AwsSqsTbVersionControlQueueFactory(TbAwsSqsSettings sqsSettings,
-                                              TbQueueCoreSettings coreSettings,
-                                              TbQueueVersionControlSettings vcSettings,
-                                              TbAwsSqsQueueAttributes sqsQueueAttributes,
-                                              TopicService topicService
-    ) {
-        this.sqsSettings = sqsSettings;
-        this.coreSettings = coreSettings;
-        this.vcSettings = vcSettings;
-        this.topicService = topicService;
-
-        this.coreAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getCoreAttributes());
-        this.notificationAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getNotificationsAttributes());
-        this.vcAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getVcAttributes());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToVersionControlServiceMsg>> createToVersionControlMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(vcAdmin, sqsSettings, topicService.buildTopicName(vcSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportProtos.ToVersionControlServiceMsg.parseFrom(msg.getData()), msg.getHeaders())
-        );
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (vcAdmin != null) {
-            vcAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 407ef86a99..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTransportQueueFactory.java
+++ /dev/null
@@ -1,153 +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.provider;
-
-import jakarta.annotation.PreDestroy;
-import lombok.extern.slf4j.Slf4j;
-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.ToCoreMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-import org.thingsboard.server.queue.TbQueueRequestTemplate;
-import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
-import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-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.TbQueueRuleEngineSettings;
-import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
-import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
-import org.thingsboard.server.queue.sqs.TbAwsSqsAdmin;
-import org.thingsboard.server.queue.sqs.TbAwsSqsConsumerTemplate;
-import org.thingsboard.server.queue.sqs.TbAwsSqsProducerTemplate;
-import org.thingsboard.server.queue.sqs.TbAwsSqsQueueAttributes;
-import org.thingsboard.server.queue.sqs.TbAwsSqsSettings;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='aws-sqs' && (('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true') || '${service.type:null}'=='tb-transport')")
-@Slf4j
-public class AwsSqsTransportQueueFactory implements TbTransportQueueFactory {
-    private final TbQueueTransportApiSettings transportApiSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbAwsSqsSettings sqsSettings;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TopicService topicService;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin transportApiAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-
-    public AwsSqsTransportQueueFactory(TbQueueTransportApiSettings transportApiSettings,
-                                       TbQueueTransportNotificationSettings transportNotificationSettings,
-                                       TbAwsSqsSettings sqsSettings,
-                                       TbServiceInfoProvider serviceInfoProvider,
-                                       TbQueueCoreSettings coreSettings,
-                                       TbAwsSqsQueueAttributes sqsQueueAttributes,
-                                       TbQueueRuleEngineSettings ruleEngineSettings,
-                                       TopicService topicService) {
-        this.transportApiSettings = transportApiSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.sqsSettings = sqsSettings;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.coreSettings = coreSettings;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.topicService = topicService;
-
-        this.coreAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getCoreAttributes());
-        this.transportApiAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getTransportApiAttributes());
-        this.notificationAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getNotificationsAttributes());
-        this.ruleEngineAdmin = new TbAwsSqsAdmin(sqsSettings, sqsQueueAttributes.getRuleEngineAttributes());
-    }
-
-    @Override
-    public TbQueueRequestTemplate<TbProtoQueueMsg<TransportApiRequestMsg>, TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiRequestTemplate() {
-        TbQueueProducer<TbProtoQueueMsg<TransportApiRequestMsg>> producerTemplate =
-                new TbAwsSqsProducerTemplate<>(transportApiAdmin, sqsSettings, topicService.buildTopicName(transportApiSettings.getRequestsTopic()));
-
-        TbQueueConsumer<TbProtoQueueMsg<TransportApiResponseMsg>> consumerTemplate =
-                new TbAwsSqsConsumerTemplate<>(transportApiAdmin, sqsSettings,
-                        topicService.buildTopicName(transportApiSettings.getResponsesTopic() + "_" + serviceInfoProvider.getServiceId()),
-                        msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiResponseMsg.parseFrom(msg.getData()), msg.getHeaders()));
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoQueueMsg<TransportApiRequestMsg>, TbProtoQueueMsg<TransportApiResponseMsg>> templateBuilder = DefaultTbQueueRequestTemplate.builder();
-        templateBuilder.queueAdmin(transportApiAdmin);
-        templateBuilder.requestTemplate(producerTemplate);
-        templateBuilder.responseTemplate(consumerTemplate);
-        templateBuilder.maxPendingRequests(transportApiSettings.getMaxPendingRequests());
-        templateBuilder.maxRequestTimeout(transportApiSettings.getMaxRequestsTimeout());
-        templateBuilder.pollInterval(transportApiSettings.getResponsePollInterval());
-        return templateBuilder.build();
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(ruleEngineAdmin, sqsSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(notificationAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(notificationAdmin, sqsSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic() + "_" + serviceInfoProvider.getServiceId()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToTransportMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        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) {
-            coreAdmin.destroy();
-        }
-        if (transportApiAdmin != null) {
-            transportApiAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 05bef819b7..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubMonolithQueueFactory.java
+++ /dev/null
@@ -1,315 +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.provider;
-
-import com.google.protobuf.util.JsonFormat;
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.queue.Queue;
-import org.thingsboard.server.common.msg.queue.ServiceType;
-import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsRequest;
-import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
-import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeEventNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeNotificationMsg;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToVersionControlServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-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.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;
-import org.thingsboard.server.queue.pubsub.TbPubSubSettings;
-import org.thingsboard.server.queue.pubsub.TbPubSubSubscriptionSettings;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueEdgeSettings;
-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 org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
-
-import java.nio.charset.StandardCharsets;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='pubsub' && '${service.type:null}'=='monolith'")
-public class PubSubMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngineQueueFactory, TbVersionControlQueueFactory {
-
-    private final TbPubSubSettings pubSubSettings;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TbQueueTransportApiSettings transportApiSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TopicService topicService;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRemoteJsInvokeSettings jsInvokeSettings;
-    private final TbQueueVersionControlSettings vcSettings;
-    private final TbQueueEdgeSettings edgeSettings;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin jsExecutorAdmin;
-    private final TbQueueAdmin transportApiAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin vcAdmin;
-    private final TbQueueAdmin edgeAdmin;
-
-    public PubSubMonolithQueueFactory(TbPubSubSettings pubSubSettings,
-                                      TbQueueCoreSettings coreSettings,
-                                      TbQueueRuleEngineSettings ruleEngineSettings,
-                                      TbQueueTransportApiSettings transportApiSettings,
-                                      TbQueueTransportNotificationSettings transportNotificationSettings,
-                                      TopicService topicService,
-                                      TbServiceInfoProvider serviceInfoProvider,
-                                      TbPubSubSubscriptionSettings pubSubSubscriptionSettings,
-                                      TbQueueRemoteJsInvokeSettings jsInvokeSettings,
-                                      TbQueueVersionControlSettings vcSettings,
-                                      TbQueueEdgeSettings edgeSettings) {
-        this.pubSubSettings = pubSubSettings;
-        this.coreSettings = coreSettings;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.transportApiSettings = transportApiSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.topicService = topicService;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.vcSettings = vcSettings;
-        this.edgeSettings = edgeSettings;
-
-        this.coreAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getCoreSettings());
-        this.ruleEngineAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getRuleEngineSettings());
-        this.jsExecutorAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getJsExecutorSettings());
-        this.transportApiAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getTransportApiSettings());
-        this.notificationAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getNotificationsSettings());
-        this.vcAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getVcSettings());
-        this.edgeAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getEdgeSettings());
-
-        this.jsInvokeSettings = jsInvokeSettings;
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbPubSubProducerTemplate<>(ruleEngineAdmin, pubSubSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createToVersionControlMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(vcAdmin, pubSubSettings, topicService.buildTopicName(vcSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToVersionControlServiceMsg.parseFrom(msg.getData()), msg.getHeaders())
-        );
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> createToRuleEngineMsgConsumer(Queue configuration) {
-        return new TbPubSubConsumerTemplate<>(ruleEngineAdmin, pubSubSettings, topicService.buildTopicName(configuration.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createToRuleEngineNotificationsMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(notificationAdmin, pubSubSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_RULE_ENGINE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreMsg>> createToCoreMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreNotificationMsg>> createToCoreNotificationsMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(notificationAdmin, pubSubSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportApiRequestMsg>> createTransportApiRequestConsumer() {
-        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, topicService.buildTopicName(transportApiSettings.getResponsesTopic()));
-    }
-
-    @Override
-    @Bean
-    public TbQueueRequestTemplate<TbProtoJsQueueMsg<RemoteJsRequest>, TbProtoQueueMsg<RemoteJsResponse>> createRemoteJsRequestTemplate() {
-        TbQueueProducer<TbProtoJsQueueMsg<RemoteJsRequest>> producer = new TbPubSubProducerTemplate<>(jsExecutorAdmin, pubSubSettings, jsInvokeSettings.getRequestTopic());
-        TbQueueConsumer<TbProtoQueueMsg<RemoteJsResponse>> consumer = new TbPubSubConsumerTemplate<>(jsExecutorAdmin, pubSubSettings,
-                jsInvokeSettings.getResponseTopic() + "." + serviceInfoProvider.getServiceId(),
-                msg -> {
-                    RemoteJsResponse.Builder builder = RemoteJsResponse.newBuilder();
-                    JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
-                    return new TbProtoQueueMsg<>(msg.getKey(), builder.build(), msg.getHeaders());
-                });
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoJsQueueMsg<RemoteJsRequest>, TbProtoQueueMsg<RemoteJsResponse>> builder = DefaultTbQueueRequestTemplate.builder();
-        builder.queueAdmin(jsExecutorAdmin);
-        builder.requestTemplate(producer);
-        builder.responseTemplate(consumer);
-        builder.maxPendingRequests(jsInvokeSettings.getMaxPendingRequests());
-        builder.maxRequestTimeout(jsInvokeSettings.getMaxRequestsTimeout());
-        builder.pollInterval(jsInvokeSettings.getResponsePollInterval());
-        return builder.build();
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgConsumer() {
-        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, 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, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createVersionControlMsgProducer() {
-        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()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgProducer() {
-        return new TbPubSubProducerTemplate<>(edgeAdmin, pubSubSettings, topicService.buildTopicName(edgeSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(edgeAdmin, pubSubSettings, topicService.buildTopicName(edgeSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createToEdgeNotificationsMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(notificationAdmin, pubSubSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createEdgeNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeEventNotificationMsg>> createEdgeEventMsgProducer() {
-        return null;
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (jsExecutorAdmin != null) {
-            jsExecutorAdmin.destroy();
-        }
-        if (transportApiAdmin != null) {
-            transportApiAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (vcAdmin != null) {
-            vcAdmin.destroy();
-        }
-        if (edgeAdmin != null) {
-            edgeAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 919d895a97..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbCoreQueueFactory.java
+++ /dev/null
@@ -1,278 +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.provider;
-
-import com.google.protobuf.util.JsonFormat;
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-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.ToEdgeMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeNotificationMsg;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToVersionControlServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-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.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;
-import org.thingsboard.server.queue.pubsub.TbPubSubSettings;
-import org.thingsboard.server.queue.pubsub.TbPubSubSubscriptionSettings;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueEdgeSettings;
-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 java.nio.charset.StandardCharsets;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='pubsub' && '${service.type:null}'=='tb-core'")
-public class PubSubTbCoreQueueFactory implements TbCoreQueueFactory {
-
-    private final TbPubSubSettings pubSubSettings;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueTransportApiSettings transportApiSettings;
-    private final TopicService topicService;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRemoteJsInvokeSettings jsInvokeSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TbQueueEdgeSettings edgeSettings;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin jsExecutorAdmin;
-    private final TbQueueAdmin transportApiAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin edgeAdmin;
-
-    public PubSubTbCoreQueueFactory(TbPubSubSettings pubSubSettings,
-                                    TbQueueCoreSettings coreSettings,
-                                    TbQueueTransportApiSettings transportApiSettings,
-                                    TopicService topicService,
-                                    TbServiceInfoProvider serviceInfoProvider,
-                                    TbQueueRemoteJsInvokeSettings jsInvokeSettings,
-                                    TbQueueTransportNotificationSettings transportNotificationSettings,
-                                    TbQueueRuleEngineSettings ruleEngineSettings,
-                                    TbQueueEdgeSettings edgeSettings,
-                                    TbPubSubSubscriptionSettings pubSubSubscriptionSettings) {
-        this.pubSubSettings = pubSubSettings;
-        this.coreSettings = coreSettings;
-        this.transportApiSettings = transportApiSettings;
-        this.topicService = topicService;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.jsInvokeSettings = jsInvokeSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.edgeSettings = edgeSettings;
-
-        this.coreAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getCoreSettings());
-        this.jsExecutorAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getJsExecutorSettings());
-        this.transportApiAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getTransportApiSettings());
-        this.notificationAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getNotificationsSettings());
-        this.ruleEngineAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getRuleEngineSettings());
-        this.edgeAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getEdgeSettings());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreMsg>> createToCoreMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreNotificationMsg>> createToCoreNotificationsMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(notificationAdmin, pubSubSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportApiRequestMsg>> createTransportApiRequestConsumer() {
-        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, topicService.buildTopicName(transportApiSettings.getResponsesTopic()));
-    }
-
-    @Override
-    @Bean
-    public TbQueueRequestTemplate<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> createRemoteJsRequestTemplate() {
-        TbQueueProducer<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>> producer = new TbPubSubProducerTemplate<>(jsExecutorAdmin, pubSubSettings, jsInvokeSettings.getRequestTopic());
-        TbQueueConsumer<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> consumer = new TbPubSubConsumerTemplate<>(jsExecutorAdmin, pubSubSettings,
-                jsInvokeSettings.getResponseTopic() + "." + serviceInfoProvider.getServiceId(),
-                msg -> {
-                    JsInvokeProtos.RemoteJsResponse.Builder builder = JsInvokeProtos.RemoteJsResponse.newBuilder();
-                    JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
-                    return new TbProtoQueueMsg<>(msg.getKey(), builder.build(), msg.getHeaders());
-                });
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> builder = DefaultTbQueueRequestTemplate.builder();
-        builder.queueAdmin(jsExecutorAdmin);
-        builder.requestTemplate(producer);
-        builder.responseTemplate(consumer);
-        builder.maxPendingRequests(jsInvokeSettings.getMaxPendingRequests());
-        builder.maxRequestTimeout(jsInvokeSettings.getMaxRequestsTimeout());
-        builder.pollInterval(jsInvokeSettings.getResponsePollInterval());
-        return builder.build();
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgConsumer() {
-        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, 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, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createVersionControlMsgProducer() {
-        //TODO: version-control
-        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()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(edgeAdmin, pubSubSettings, topicService.buildTopicName(edgeSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgProducer() {
-        return new TbPubSubProducerTemplate<>(edgeAdmin, pubSubSettings, topicService.buildTopicName(edgeSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createToEdgeNotificationsMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(notificationAdmin, pubSubSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createEdgeNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (jsExecutorAdmin != null) {
-            jsExecutorAdmin.destroy();
-        }
-        if (transportApiAdmin != null) {
-            transportApiAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (edgeAdmin != null) {
-            edgeAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 671da15f20..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbRuleEngineQueueFactory.java
+++ /dev/null
@@ -1,209 +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.provider;
-
-import com.google.protobuf.util.JsonFormat;
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.queue.Queue;
-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.ToEdgeEventNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeNotificationMsg;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-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.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;
-import org.thingsboard.server.queue.pubsub.TbPubSubSettings;
-import org.thingsboard.server.queue.pubsub.TbPubSubSubscriptionSettings;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueEdgeSettings;
-import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
-import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
-import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
-
-import java.nio.charset.StandardCharsets;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='pubsub' && '${service.type:null}'=='tb-rule-engine'")
-public class PubSubTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
-
-    private final TbPubSubSettings pubSubSettings;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TopicService topicService;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRemoteJsInvokeSettings jsInvokeSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbQueueEdgeSettings edgeSettings;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin jsExecutorAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin edgeAdmin;
-
-    public PubSubTbRuleEngineQueueFactory(TbPubSubSettings pubSubSettings,
-                                          TbQueueCoreSettings coreSettings,
-                                          TbQueueRuleEngineSettings ruleEngineSettings,
-                                          TopicService topicService,
-                                          TbServiceInfoProvider serviceInfoProvider,
-                                          TbQueueRemoteJsInvokeSettings jsInvokeSettings,
-                                          TbQueueTransportNotificationSettings transportNotificationSettings,
-                                          TbPubSubSubscriptionSettings pubSubSubscriptionSettings,
-                                          TbQueueEdgeSettings edgeSettings) {
-        this.pubSubSettings = pubSubSettings;
-        this.coreSettings = coreSettings;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.topicService = topicService;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.jsInvokeSettings = jsInvokeSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.edgeSettings = edgeSettings;
-
-        this.coreAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getCoreSettings());
-        this.ruleEngineAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getRuleEngineSettings());
-        this.jsExecutorAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getJsExecutorSettings());
-        this.notificationAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getNotificationsSettings());
-        this.edgeAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getEdgeSettings());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbPubSubProducerTemplate<>(ruleEngineAdmin, pubSubSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgProducer() {
-        return new TbPubSubProducerTemplate<>(edgeAdmin, pubSubSettings, topicService.buildTopicName(edgeSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createEdgeNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeEventNotificationMsg>> createEdgeEventMsgProducer() {
-        return null;
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> createToRuleEngineMsgConsumer(Queue configuration) {
-        return new TbPubSubConsumerTemplate<>(ruleEngineAdmin, pubSubSettings, topicService.buildTopicName(configuration.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createToRuleEngineNotificationsMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(notificationAdmin, pubSubSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_RULE_ENGINE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    @Bean
-    public TbQueueRequestTemplate<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> createRemoteJsRequestTemplate() {
-        TbQueueProducer<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>> producer = new TbPubSubProducerTemplate<>(jsExecutorAdmin, pubSubSettings, jsInvokeSettings.getRequestTopic());
-        TbQueueConsumer<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> consumer = new TbPubSubConsumerTemplate<>(jsExecutorAdmin, pubSubSettings,
-                jsInvokeSettings.getResponseTopic() + "." + serviceInfoProvider.getServiceId(),
-                msg -> {
-                    JsInvokeProtos.RemoteJsResponse.Builder builder = JsInvokeProtos.RemoteJsResponse.newBuilder();
-                    JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
-                    return new TbProtoQueueMsg<>(msg.getKey(), builder.build(), msg.getHeaders());
-                });
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> builder = DefaultTbQueueRequestTemplate.builder();
-        builder.queueAdmin(jsExecutorAdmin);
-        builder.requestTemplate(producer);
-        builder.responseTemplate(consumer);
-        builder.maxPendingRequests(jsInvokeSettings.getMaxPendingRequests());
-        builder.maxRequestTimeout(jsInvokeSettings.getMaxRequestsTimeout());
-        builder.pollInterval(jsInvokeSettings.getResponsePollInterval());
-        return builder.build();
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    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) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (jsExecutorAdmin != null) {
-            jsExecutorAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index b6da4e2973..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbVersionControlQueueFactory.java
+++ /dev/null
@@ -1,98 +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.provider;
-
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.queue.TbQueueAdmin;
-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.pubsub.TbPubSubAdmin;
-import org.thingsboard.server.queue.pubsub.TbPubSubConsumerTemplate;
-import org.thingsboard.server.queue.pubsub.TbPubSubProducerTemplate;
-import org.thingsboard.server.queue.pubsub.TbPubSubSettings;
-import org.thingsboard.server.queue.pubsub.TbPubSubSubscriptionSettings;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='pubsub' && '${service.type:null}'=='tb-vc-executor'")
-public class PubSubTbVersionControlQueueFactory implements TbVersionControlQueueFactory {
-
-    private final TbPubSubSettings pubSubSettings;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueVersionControlSettings vcSettings;
-    private final TopicService topicService;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin vcAdmin;
-
-    public PubSubTbVersionControlQueueFactory(TbPubSubSettings pubSubSettings,
-                                              TbQueueCoreSettings coreSettings,
-                                              TbQueueVersionControlSettings vcSettings,
-                                              TbPubSubSubscriptionSettings pubSubSubscriptionSettings,
-                                              TopicService topicService
-    ) {
-        this.pubSubSettings = pubSubSettings;
-        this.coreSettings = coreSettings;
-        this.vcSettings = vcSettings;
-        this.topicService = topicService;
-
-        this.coreAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getCoreSettings());
-        this.notificationAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getNotificationsSettings());
-        this.vcAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getVcSettings());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToVersionControlServiceMsg>> createToVersionControlMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(vcAdmin, pubSubSettings, topicService.buildTopicName(vcSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportProtos.ToVersionControlServiceMsg.parseFrom(msg.getData()), msg.getHeaders())
-        );
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (vcAdmin != null) {
-            vcAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index a7500d2083..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTransportQueueFactory.java
+++ /dev/null
@@ -1,153 +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.provider;
-
-import jakarta.annotation.PreDestroy;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-import org.thingsboard.server.queue.TbQueueRequestTemplate;
-import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
-import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-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;
-import org.thingsboard.server.queue.pubsub.TbPubSubSettings;
-import org.thingsboard.server.queue.pubsub.TbPubSubSubscriptionSettings;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
-import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
-import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='pubsub' && (('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true') || '${service.type:null}'=='tb-transport')")
-@Slf4j
-public class PubSubTransportQueueFactory implements TbTransportQueueFactory {
-
-    private final TbPubSubSettings pubSubSettings;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TbQueueTransportApiSettings transportApiSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TopicService topicService;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin transportApiAdmin;
-    private final TbQueueAdmin notificationAdmin;
-
-    public PubSubTransportQueueFactory(TbPubSubSettings pubSubSettings,
-                                       TbServiceInfoProvider serviceInfoProvider,
-                                       TbQueueCoreSettings coreSettings,
-                                       TbQueueRuleEngineSettings ruleEngineSettings,
-                                       TbQueueTransportApiSettings transportApiSettings,
-                                       TbQueueTransportNotificationSettings transportNotificationSettings,
-                                       TbPubSubSubscriptionSettings pubSubSubscriptionSettings,
-                                       TopicService topicService) {
-        this.pubSubSettings = pubSubSettings;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.coreSettings = coreSettings;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.transportApiSettings = transportApiSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.topicService = topicService;
-
-        this.coreAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getCoreSettings());
-        this.ruleEngineAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getRuleEngineSettings());
-        this.transportApiAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getTransportApiSettings());
-        this.notificationAdmin = new TbPubSubAdmin(pubSubSettings, pubSubSubscriptionSettings.getNotificationsSettings());
-    }
-
-    @Override
-    public TbQueueRequestTemplate<TbProtoQueueMsg<TransportApiRequestMsg>, TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiRequestTemplate() {
-        TbQueueProducer<TbProtoQueueMsg<TransportApiRequestMsg>> producer = new TbPubSubProducerTemplate<>(transportApiAdmin, pubSubSettings, topicService.buildTopicName(transportApiSettings.getRequestsTopic()));
-        TbQueueConsumer<TbProtoQueueMsg<TransportApiResponseMsg>> consumer = new TbPubSubConsumerTemplate<>(transportApiAdmin, pubSubSettings,
-                topicService.buildTopicName(transportApiSettings.getResponsesTopic() + "." + serviceInfoProvider.getServiceId()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiResponseMsg.parseFrom(msg.getData()), msg.getHeaders()));
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoQueueMsg<TransportApiRequestMsg>, TbProtoQueueMsg<TransportApiResponseMsg>> templateBuilder = DefaultTbQueueRequestTemplate.builder();
-        templateBuilder.queueAdmin(transportApiAdmin);
-        templateBuilder.requestTemplate(producer);
-        templateBuilder.responseTemplate(consumer);
-        templateBuilder.maxPendingRequests(transportApiSettings.getMaxPendingRequests());
-        templateBuilder.maxRequestTimeout(transportApiSettings.getMaxRequestsTimeout());
-        templateBuilder.pollInterval(transportApiSettings.getResponsePollInterval());
-        return templateBuilder.build();
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbPubSubProducerTemplate<>(ruleEngineAdmin, pubSubSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsConsumer() {
-        return new TbPubSubConsumerTemplate<>(notificationAdmin, pubSubSettings,
-                topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic() + "." + serviceInfoProvider.getServiceId()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToTransportMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        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) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (transportApiAdmin != null) {
-            transportApiAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 3c59923def..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqMonolithQueueFactory.java
+++ /dev/null
@@ -1,313 +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.provider;
-
-import com.google.protobuf.util.JsonFormat;
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.queue.Queue;
-import org.thingsboard.server.common.msg.queue.ServiceType;
-import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsRequest;
-import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
-import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeEventNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeNotificationMsg;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToVersionControlServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-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.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;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqQueueArguments;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqSettings;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueEdgeSettings;
-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 org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
-
-import java.nio.charset.StandardCharsets;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='rabbitmq' && '${service.type:null}'=='monolith'")
-public class RabbitMqMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngineQueueFactory, TbVersionControlQueueFactory {
-
-    private final TopicService topicService;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TbQueueTransportApiSettings transportApiSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbRabbitMqSettings rabbitMqSettings;
-    private final TbQueueRemoteJsInvokeSettings jsInvokeSettings;
-    private final TbQueueVersionControlSettings vcSettings;
-    private final TbQueueEdgeSettings edgeSettings;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin jsExecutorAdmin;
-    private final TbQueueAdmin transportApiAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin vcAdmin;
-    private final TbQueueAdmin edgeAdmin;
-
-    public RabbitMqMonolithQueueFactory(TopicService topicService, TbQueueCoreSettings coreSettings,
-                                        TbQueueRuleEngineSettings ruleEngineSettings,
-                                        TbServiceInfoProvider serviceInfoProvider,
-                                        TbQueueTransportApiSettings transportApiSettings,
-                                        TbQueueTransportNotificationSettings transportNotificationSettings,
-                                        TbRabbitMqSettings rabbitMqSettings,
-                                        TbRabbitMqQueueArguments queueArguments,
-                                        TbQueueRemoteJsInvokeSettings jsInvokeSettings,
-                                        TbQueueVersionControlSettings vcSettings,
-                                        TbQueueEdgeSettings edgeSettings) {
-        this.topicService = topicService;
-        this.coreSettings = coreSettings;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.transportApiSettings = transportApiSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.rabbitMqSettings = rabbitMqSettings;
-        this.jsInvokeSettings = jsInvokeSettings;
-        this.vcSettings = vcSettings;
-        this.edgeSettings = edgeSettings;
-
-        this.coreAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getCoreArgs());
-        this.ruleEngineAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getRuleEngineArgs());
-        this.jsExecutorAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getJsExecutorArgs());
-        this.transportApiAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getTransportApiArgs());
-        this.notificationAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getNotificationsArgs());
-        this.vcAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getVcArgs());
-        this.edgeAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getEdgeArgs());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(ruleEngineAdmin, rabbitMqSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createToVersionControlMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(vcAdmin, rabbitMqSettings, topicService.buildTopicName(vcSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToVersionControlServiceMsg.parseFrom(msg.getData()), msg.getHeaders())
-        );
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> createToRuleEngineMsgConsumer(Queue configuration) {
-        return new TbRabbitMqConsumerTemplate<>(ruleEngineAdmin, rabbitMqSettings, topicService.buildTopicName(configuration.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createToRuleEngineNotificationsMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(notificationAdmin, rabbitMqSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_RULE_ENGINE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreMsg>> createToCoreMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreNotificationMsg>> createToCoreNotificationsMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(notificationAdmin, rabbitMqSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportApiRequestMsg>> createTransportApiRequestConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(transportApiAdmin, rabbitMqSettings, topicService.buildTopicName(transportApiSettings.getRequestsTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiRequestMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiResponseProducer() {
-        return new TbRabbitMqProducerTemplate<>(transportApiAdmin, rabbitMqSettings, topicService.buildTopicName(transportApiSettings.getResponsesTopic()));
-    }
-
-    @Override
-    @Bean
-    public TbQueueRequestTemplate<TbProtoJsQueueMsg<RemoteJsRequest>, TbProtoQueueMsg<RemoteJsResponse>> createRemoteJsRequestTemplate() {
-        TbQueueProducer<TbProtoJsQueueMsg<RemoteJsRequest>> producer = new TbRabbitMqProducerTemplate<>(jsExecutorAdmin, rabbitMqSettings, jsInvokeSettings.getRequestTopic());
-        TbQueueConsumer<TbProtoQueueMsg<RemoteJsResponse>> consumer = new TbRabbitMqConsumerTemplate<>(jsExecutorAdmin, rabbitMqSettings,
-                jsInvokeSettings.getResponseTopic() + "." + serviceInfoProvider.getServiceId(),
-                msg -> {
-                    RemoteJsResponse.Builder builder = RemoteJsResponse.newBuilder();
-                    JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
-                    return new TbProtoQueueMsg<>(msg.getKey(), builder.build(), msg.getHeaders());
-                });
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoJsQueueMsg<RemoteJsRequest>, TbProtoQueueMsg<RemoteJsResponse>> builder = DefaultTbQueueRequestTemplate.builder();
-        builder.queueAdmin(jsExecutorAdmin);
-        builder.requestTemplate(producer);
-        builder.responseTemplate(consumer);
-        builder.maxPendingRequests(jsInvokeSettings.getMaxPendingRequests());
-        builder.maxRequestTimeout(jsInvokeSettings.getMaxRequestsTimeout());
-        builder.pollInterval(jsInvokeSettings.getResponsePollInterval());
-        return builder.build();
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToUsageStatsServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createVersionControlMsgProducer() {
-        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()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(edgeAdmin, rabbitMqSettings, topicService.buildTopicName(edgeSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(edgeAdmin, rabbitMqSettings, topicService.buildTopicName(edgeSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createToEdgeNotificationsMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(notificationAdmin, rabbitMqSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createEdgeNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeEventNotificationMsg>> createEdgeEventMsgProducer() {
-        return null;
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (jsExecutorAdmin != null) {
-            jsExecutorAdmin.destroy();
-        }
-        if (transportApiAdmin != null) {
-            transportApiAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (vcAdmin != null) {
-            vcAdmin.destroy();
-        }
-        if (edgeAdmin != null) {
-            edgeAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 16f9838384..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbCoreQueueFactory.java
+++ /dev/null
@@ -1,278 +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.provider;
-
-import com.google.protobuf.util.JsonFormat;
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-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.ToEdgeMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeNotificationMsg;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToVersionControlServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-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.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;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqQueueArguments;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqSettings;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueEdgeSettings;
-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 java.nio.charset.StandardCharsets;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='rabbitmq' && '${service.type:null}'=='tb-core'")
-public class RabbitMqTbCoreQueueFactory implements TbCoreQueueFactory {
-
-    private final TbRabbitMqSettings rabbitMqSettings;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueTransportApiSettings transportApiSettings;
-    private final TopicService topicService;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRemoteJsInvokeSettings jsInvokeSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbQueueEdgeSettings edgeSettings;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin jsExecutorAdmin;
-    private final TbQueueAdmin transportApiAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin edgeAdmin;
-
-    public RabbitMqTbCoreQueueFactory(TbRabbitMqSettings rabbitMqSettings,
-                                      TbQueueCoreSettings coreSettings,
-                                      TbQueueTransportApiSettings transportApiSettings,
-                                      TbQueueRuleEngineSettings ruleEngineSettings,
-                                      TopicService topicService,
-                                      TbServiceInfoProvider serviceInfoProvider,
-                                      TbQueueRemoteJsInvokeSettings jsInvokeSettings,
-                                      TbQueueTransportNotificationSettings transportNotificationSettings,
-                                      TbQueueEdgeSettings edgeSettings,
-                                      TbRabbitMqQueueArguments queueArguments) {
-        this.rabbitMqSettings = rabbitMqSettings;
-        this.coreSettings = coreSettings;
-        this.transportApiSettings = transportApiSettings;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.topicService = topicService;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.jsInvokeSettings = jsInvokeSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.edgeSettings = edgeSettings;
-
-        this.coreAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getCoreArgs());
-        this.ruleEngineAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getRuleEngineArgs());
-        this.jsExecutorAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getJsExecutorArgs());
-        this.transportApiAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getTransportApiArgs());
-        this.notificationAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getNotificationsArgs());
-        this.edgeAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getEdgeArgs());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreMsg>> createToCoreMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreNotificationMsg>> createToCoreNotificationsMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(notificationAdmin, rabbitMqSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(edgeAdmin, rabbitMqSettings, topicService.buildTopicName(edgeSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(edgeAdmin, rabbitMqSettings, topicService.buildTopicName(edgeSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createToEdgeNotificationsMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(notificationAdmin, rabbitMqSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createEdgeNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportApiRequestMsg>> createTransportApiRequestConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(transportApiAdmin, rabbitMqSettings, topicService.buildTopicName(transportApiSettings.getRequestsTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiRequestMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiResponseProducer() {
-        return new TbRabbitMqProducerTemplate<>(transportApiAdmin, rabbitMqSettings, topicService.buildTopicName(transportApiSettings.getResponsesTopic()));
-    }
-
-    @Override
-    @Bean
-    public TbQueueRequestTemplate<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> createRemoteJsRequestTemplate() {
-        TbQueueProducer<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>> producer = new TbRabbitMqProducerTemplate<>(jsExecutorAdmin, rabbitMqSettings, jsInvokeSettings.getRequestTopic());
-        TbQueueConsumer<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> consumer = new TbRabbitMqConsumerTemplate<>(jsExecutorAdmin, rabbitMqSettings,
-                jsInvokeSettings.getResponseTopic() + "." + serviceInfoProvider.getServiceId(),
-                msg -> {
-                    JsInvokeProtos.RemoteJsResponse.Builder builder = JsInvokeProtos.RemoteJsResponse.newBuilder();
-                    JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
-                    return new TbProtoQueueMsg<>(msg.getKey(), builder.build(), msg.getHeaders());
-                });
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> builder = DefaultTbQueueRequestTemplate.builder();
-        builder.queueAdmin(jsExecutorAdmin);
-        builder.requestTemplate(producer);
-        builder.responseTemplate(consumer);
-        builder.maxPendingRequests(jsInvokeSettings.getMaxPendingRequests());
-        builder.maxRequestTimeout(jsInvokeSettings.getMaxRequestsTimeout());
-        builder.pollInterval(jsInvokeSettings.getResponsePollInterval());
-        return builder.build();
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createVersionControlMsgProducer() {
-        //TODO: version-control
-        return null;
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToUsageStatsServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @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) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (jsExecutorAdmin != null) {
-            jsExecutorAdmin.destroy();
-        }
-        if (transportApiAdmin != null) {
-            transportApiAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (edgeAdmin != null) {
-            edgeAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index a7af729e1f..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbRuleEngineQueueFactory.java
+++ /dev/null
@@ -1,202 +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.provider;
-
-import com.google.protobuf.util.JsonFormat;
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.queue.Queue;
-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.ToEdgeMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeNotificationMsg;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-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.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;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqQueueArguments;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqSettings;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueEdgeSettings;
-import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
-import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
-import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
-
-import java.nio.charset.StandardCharsets;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='rabbitmq' && '${service.type:null}'=='tb-rule-engine'")
-public class RabbitMqTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
-
-    private final TopicService topicService;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TbRabbitMqSettings rabbitMqSettings;
-    private final TbQueueRemoteJsInvokeSettings jsInvokeSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbQueueEdgeSettings edgeSettings;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin jsExecutorAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin edgeAdmin;
-
-    public RabbitMqTbRuleEngineQueueFactory(TopicService topicService, TbQueueCoreSettings coreSettings,
-                                            TbQueueRuleEngineSettings ruleEngineSettings,
-                                            TbServiceInfoProvider serviceInfoProvider,
-                                            TbRabbitMqSettings rabbitMqSettings,
-                                            TbQueueRemoteJsInvokeSettings jsInvokeSettings,
-                                            TbQueueTransportNotificationSettings transportNotificationSettings,
-                                            TbQueueEdgeSettings edgeSettings,
-                                            TbRabbitMqQueueArguments queueArguments) {
-        this.topicService = topicService;
-        this.coreSettings = coreSettings;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.rabbitMqSettings = rabbitMqSettings;
-        this.jsInvokeSettings = jsInvokeSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.edgeSettings = edgeSettings;
-
-        this.coreAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getCoreArgs());
-        this.ruleEngineAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getRuleEngineArgs());
-        this.jsExecutorAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getJsExecutorArgs());
-        this.notificationAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getNotificationsArgs());
-        this.edgeAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getEdgeArgs());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(ruleEngineAdmin, rabbitMqSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(edgeAdmin, rabbitMqSettings, topicService.buildTopicName(edgeSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createEdgeNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings, topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> createToRuleEngineMsgConsumer(Queue configuration) {
-        return new TbRabbitMqConsumerTemplate<>(ruleEngineAdmin, rabbitMqSettings, topicService.buildTopicName(configuration.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createToRuleEngineNotificationsMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(notificationAdmin, rabbitMqSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_RULE_ENGINE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    @Bean
-    public TbQueueRequestTemplate<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> createRemoteJsRequestTemplate() {
-        TbQueueProducer<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>> producer = new TbRabbitMqProducerTemplate<>(jsExecutorAdmin, rabbitMqSettings, jsInvokeSettings.getRequestTopic());
-        TbQueueConsumer<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> consumer = new TbRabbitMqConsumerTemplate<>(jsExecutorAdmin, rabbitMqSettings,
-                jsInvokeSettings.getResponseTopic() + "." + serviceInfoProvider.getServiceId(),
-                msg -> {
-                    JsInvokeProtos.RemoteJsResponse.Builder builder = JsInvokeProtos.RemoteJsResponse.newBuilder();
-                    JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
-                    return new TbProtoQueueMsg<>(msg.getKey(), builder.build(), msg.getHeaders());
-                });
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> builder = DefaultTbQueueRequestTemplate.builder();
-        builder.queueAdmin(jsExecutorAdmin);
-        builder.requestTemplate(producer);
-        builder.responseTemplate(consumer);
-        builder.maxPendingRequests(jsInvokeSettings.getMaxPendingRequests());
-        builder.maxRequestTimeout(jsInvokeSettings.getMaxRequestsTimeout());
-        builder.pollInterval(jsInvokeSettings.getResponsePollInterval());
-        return builder.build();
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (jsExecutorAdmin != null) {
-            jsExecutorAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 604955be2c..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbVersionControlQueueFactory.java
+++ /dev/null
@@ -1,98 +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.provider;
-
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.queue.TbQueueAdmin;
-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.rabbitmq.TbRabbitMqAdmin;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqConsumerTemplate;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqProducerTemplate;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqQueueArguments;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqSettings;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='rabbitmq' && '${service.type:null}'=='tb-vc-executor'")
-public class RabbitMqTbVersionControlQueueFactory implements TbVersionControlQueueFactory {
-
-    private final TbRabbitMqSettings rabbitMqSettings;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueVersionControlSettings vcSettings;
-    private final TopicService topicService;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin vcAdmin;
-
-    public RabbitMqTbVersionControlQueueFactory(TbRabbitMqSettings rabbitMqSettings,
-                                                TbQueueCoreSettings coreSettings,
-                                                TbQueueVersionControlSettings vcSettings,
-                                                TbRabbitMqQueueArguments queueArguments,
-                                                TopicService topicService
-    ) {
-        this.rabbitMqSettings = rabbitMqSettings;
-        this.coreSettings = coreSettings;
-        this.vcSettings = vcSettings;
-        this.topicService = topicService;
-
-        this.coreAdmin = new TbRabbitMqAdmin(this.rabbitMqSettings, queueArguments.getCoreArgs());
-        this.notificationAdmin = new TbRabbitMqAdmin(this.rabbitMqSettings, queueArguments.getNotificationsArgs());
-        this.vcAdmin = new TbRabbitMqAdmin(this.rabbitMqSettings, queueArguments.getVcArgs());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToVersionControlServiceMsg>> createToVersionControlMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(vcAdmin, rabbitMqSettings, topicService.buildTopicName(vcSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportProtos.ToVersionControlServiceMsg.parseFrom(msg.getData()), msg.getHeaders())
-        );
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (vcAdmin != null) {
-            vcAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index ea922557bd..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTransportQueueFactory.java
+++ /dev/null
@@ -1,154 +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.provider;
-
-import jakarta.annotation.PreDestroy;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-import org.thingsboard.server.queue.TbQueueRequestTemplate;
-import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
-import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-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;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqQueueArguments;
-import org.thingsboard.server.queue.rabbitmq.TbRabbitMqSettings;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
-import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
-import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='rabbitmq' && (('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true') || '${service.type:null}'=='tb-transport')")
-@Slf4j
-public class RabbitMqTransportQueueFactory implements TbTransportQueueFactory {
-    private final TbQueueTransportApiSettings transportApiSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbRabbitMqSettings rabbitMqSettings;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TopicService topicService;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin transportApiAdmin;
-    private final TbQueueAdmin notificationAdmin;
-
-    public RabbitMqTransportQueueFactory(TbQueueTransportApiSettings transportApiSettings,
-                                         TbQueueTransportNotificationSettings transportNotificationSettings,
-                                         TbRabbitMqSettings rabbitMqSettings,
-                                         TbServiceInfoProvider serviceInfoProvider,
-                                         TbQueueCoreSettings coreSettings,
-                                         TbQueueRuleEngineSettings ruleEngineSettings,
-                                         TbRabbitMqQueueArguments queueArguments,
-                                         TopicService topicService) {
-        this.transportApiSettings = transportApiSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.rabbitMqSettings = rabbitMqSettings;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.coreSettings = coreSettings;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.topicService = topicService;
-
-        this.coreAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getCoreArgs());
-        this.ruleEngineAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getRuleEngineArgs());
-        this.transportApiAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getTransportApiArgs());
-        this.notificationAdmin = new TbRabbitMqAdmin(rabbitMqSettings, queueArguments.getNotificationsArgs());
-    }
-
-    @Override
-    public TbQueueRequestTemplate<TbProtoQueueMsg<TransportApiRequestMsg>, TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiRequestTemplate() {
-        TbQueueProducer<TbProtoQueueMsg<TransportApiRequestMsg>> producerTemplate =
-                new TbRabbitMqProducerTemplate<>(transportApiAdmin, rabbitMqSettings, topicService.buildTopicName(transportApiSettings.getRequestsTopic()));
-
-        TbQueueConsumer<TbProtoQueueMsg<TransportApiResponseMsg>> consumerTemplate =
-                new TbRabbitMqConsumerTemplate<>(transportApiAdmin, rabbitMqSettings,
-                        topicService.buildTopicName(transportApiSettings.getResponsesTopic() + "." + serviceInfoProvider.getServiceId()),
-                        msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiResponseMsg.parseFrom(msg.getData()), msg.getHeaders()));
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoQueueMsg<TransportApiRequestMsg>, TbProtoQueueMsg<TransportApiResponseMsg>> templateBuilder = DefaultTbQueueRequestTemplate.builder();
-        templateBuilder.queueAdmin(transportApiAdmin);
-        templateBuilder.requestTemplate(producerTemplate);
-        templateBuilder.responseTemplate(consumerTemplate);
-        templateBuilder.maxPendingRequests(transportApiSettings.getMaxPendingRequests());
-        templateBuilder.maxRequestTimeout(transportApiSettings.getMaxRequestsTimeout());
-        templateBuilder.pollInterval(transportApiSettings.getResponsePollInterval());
-        return templateBuilder.build();
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(ruleEngineAdmin, rabbitMqSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(notificationAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(notificationAdmin, rabbitMqSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic() + "." + serviceInfoProvider.getServiceId()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToTransportMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (transportApiAdmin != null) {
-            transportApiAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 932bbd21e5..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusMonolithQueueFactory.java
+++ /dev/null
@@ -1,312 +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.provider;
-
-import com.google.protobuf.util.JsonFormat;
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.queue.Queue;
-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.ToEdgeEventNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeNotificationMsg;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToVersionControlServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-import org.thingsboard.server.queue.TbQueueRequestTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusAdmin;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusConsumerTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusProducerTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusQueueConfigs;
-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.TbServiceInfoProvider;
-import org.thingsboard.server.queue.discovery.TopicService;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueEdgeSettings;
-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 org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
-
-import java.nio.charset.StandardCharsets;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='service-bus' && '${service.type:null}'=='monolith'")
-public class ServiceBusMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngineQueueFactory, TbVersionControlQueueFactory {
-
-    private final TopicService topicService;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TbQueueTransportApiSettings transportApiSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbServiceBusSettings serviceBusSettings;
-    private final TbQueueRemoteJsInvokeSettings jsInvokeSettings;
-    private final TbQueueVersionControlSettings vcSettings;
-    private final TbQueueEdgeSettings edgeSettings;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin jsExecutorAdmin;
-    private final TbQueueAdmin transportApiAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin vcAdmin;
-    private final TbQueueAdmin edgeAdmin;
-
-    public ServiceBusMonolithQueueFactory(TopicService topicService, TbQueueCoreSettings coreSettings,
-                                          TbQueueRuleEngineSettings ruleEngineSettings,
-                                          TbServiceInfoProvider serviceInfoProvider,
-                                          TbQueueTransportApiSettings transportApiSettings,
-                                          TbQueueTransportNotificationSettings transportNotificationSettings,
-                                          TbServiceBusSettings serviceBusSettings,
-                                          TbQueueRemoteJsInvokeSettings jsInvokeSettings,
-                                          TbQueueVersionControlSettings vcSettings,
-                                          TbQueueEdgeSettings edgeSettings,
-                                          TbServiceBusQueueConfigs serviceBusQueueConfigs) {
-        this.topicService = topicService;
-        this.coreSettings = coreSettings;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.transportApiSettings = transportApiSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.serviceBusSettings = serviceBusSettings;
-        this.jsInvokeSettings = jsInvokeSettings;
-        this.vcSettings = vcSettings;
-        this.edgeSettings = edgeSettings;
-
-        this.coreAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getCoreConfigs());
-        this.ruleEngineAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getRuleEngineConfigs());
-        this.jsExecutorAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getJsExecutorConfigs());
-        this.transportApiAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getTransportApiConfigs());
-        this.notificationAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getNotificationsConfigs());
-        this.vcAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getVcConfigs());
-        this.edgeAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getEdgeConfigs());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(ruleEngineAdmin, serviceBusSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createToVersionControlMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(vcAdmin, serviceBusSettings, topicService.buildTopicName(vcSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToVersionControlServiceMsg.parseFrom(msg.getData()), msg.getHeaders())
-        );
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> createToRuleEngineMsgConsumer(Queue configuration) {
-        return new TbServiceBusConsumerTemplate<>(ruleEngineAdmin, serviceBusSettings, configuration.getTopic(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createToRuleEngineNotificationsMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(notificationAdmin, serviceBusSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_RULE_ENGINE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreMsg>> createToCoreMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreNotificationMsg>> createToCoreNotificationsMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(notificationAdmin, serviceBusSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportApiRequestMsg>> createTransportApiRequestConsumer() {
-        return new TbServiceBusConsumerTemplate<>(transportApiAdmin, serviceBusSettings, topicService.buildTopicName(transportApiSettings.getRequestsTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiRequestMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiResponseProducer() {
-        return new TbServiceBusProducerTemplate<>(transportApiAdmin, serviceBusSettings, topicService.buildTopicName(transportApiSettings.getResponsesTopic()));
-    }
-
-    @Override
-    @Bean
-    public TbQueueRequestTemplate<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> createRemoteJsRequestTemplate() {
-        TbQueueProducer<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>> producer = new TbServiceBusProducerTemplate<>(jsExecutorAdmin, serviceBusSettings, jsInvokeSettings.getRequestTopic());
-        TbQueueConsumer<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> consumer = new TbServiceBusConsumerTemplate<>(jsExecutorAdmin, serviceBusSettings,
-                jsInvokeSettings.getResponseTopic() + "." + serviceInfoProvider.getServiceId(),
-                msg -> {
-                    JsInvokeProtos.RemoteJsResponse.Builder builder = JsInvokeProtos.RemoteJsResponse.newBuilder();
-                    JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
-                    return new TbProtoQueueMsg<>(msg.getKey(), builder.build(), msg.getHeaders());
-                });
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> builder = DefaultTbQueueRequestTemplate.builder();
-        builder.queueAdmin(jsExecutorAdmin);
-        builder.requestTemplate(producer);
-        builder.responseTemplate(consumer);
-        builder.maxPendingRequests(jsInvokeSettings.getMaxPendingRequests());
-        builder.maxRequestTimeout(jsInvokeSettings.getMaxRequestsTimeout());
-        builder.pollInterval(jsInvokeSettings.getResponsePollInterval());
-        return builder.build();
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToUsageStatsServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createVersionControlMsgProducer() {
-        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()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(edgeAdmin, serviceBusSettings, topicService.buildTopicName(edgeSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(edgeAdmin, serviceBusSettings, topicService.buildTopicName(edgeSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createToEdgeNotificationsMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(notificationAdmin, serviceBusSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createEdgeNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeEventNotificationMsg>> createEdgeEventMsgProducer() {
-        return null;
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (jsExecutorAdmin != null) {
-            jsExecutorAdmin.destroy();
-        }
-        if (transportApiAdmin != null) {
-            transportApiAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (vcAdmin != null) {
-            vcAdmin.destroy();
-        }
-        if (edgeAdmin != null) {
-            edgeAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 71a7efe50b..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbCoreQueueFactory.java
+++ /dev/null
@@ -1,278 +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.provider;
-
-import com.google.protobuf.util.JsonFormat;
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-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.ToEdgeMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeNotificationMsg;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToVersionControlServiceMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-import org.thingsboard.server.queue.TbQueueRequestTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusAdmin;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusConsumerTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusProducerTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusQueueConfigs;
-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.TbServiceInfoProvider;
-import org.thingsboard.server.queue.discovery.TopicService;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueEdgeSettings;
-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 java.nio.charset.StandardCharsets;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='service-bus' && '${service.type:null}'=='tb-core'")
-public class ServiceBusTbCoreQueueFactory implements TbCoreQueueFactory {
-
-    private final TbServiceBusSettings serviceBusSettings;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueTransportApiSettings transportApiSettings;
-    private final TopicService topicService;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRemoteJsInvokeSettings jsInvokeSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbQueueEdgeSettings edgeSettings;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin jsExecutorAdmin;
-    private final TbQueueAdmin transportApiAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin edgeAdmin;
-
-    public ServiceBusTbCoreQueueFactory(TbServiceBusSettings serviceBusSettings,
-                                        TbQueueCoreSettings coreSettings,
-                                        TbQueueTransportApiSettings transportApiSettings,
-                                        TbQueueRuleEngineSettings ruleEngineSettings,
-                                        TopicService topicService,
-                                        TbServiceInfoProvider serviceInfoProvider,
-                                        TbQueueRemoteJsInvokeSettings jsInvokeSettings,
-                                        TbQueueTransportNotificationSettings transportNotificationSettings,
-                                        TbQueueEdgeSettings edgeSettings,
-                                        TbServiceBusQueueConfigs serviceBusQueueConfigs) {
-        this.serviceBusSettings = serviceBusSettings;
-        this.coreSettings = coreSettings;
-        this.transportApiSettings = transportApiSettings;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.topicService = topicService;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.jsInvokeSettings = jsInvokeSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.edgeSettings = edgeSettings;
-
-        this.coreAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getCoreConfigs());
-        this.ruleEngineAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getRuleEngineConfigs());
-        this.jsExecutorAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getJsExecutorConfigs());
-        this.transportApiAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getTransportApiConfigs());
-        this.notificationAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getNotificationsConfigs());
-        this.edgeAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getEdgeConfigs());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreMsg>> createToCoreMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToCoreNotificationMsg>> createToCoreNotificationsMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(notificationAdmin, serviceBusSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportApiRequestMsg>> createTransportApiRequestConsumer() {
-        return new TbServiceBusConsumerTemplate<>(transportApiAdmin, serviceBusSettings, topicService.buildTopicName(transportApiSettings.getRequestsTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiRequestMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiResponseProducer() {
-        return new TbServiceBusProducerTemplate<>(transportApiAdmin, serviceBusSettings, topicService.buildTopicName(transportApiSettings.getResponsesTopic()));
-    }
-
-    @Override
-    @Bean
-    public TbQueueRequestTemplate<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> createRemoteJsRequestTemplate() {
-        TbQueueProducer<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>> producer = new TbServiceBusProducerTemplate<>(jsExecutorAdmin, serviceBusSettings, jsInvokeSettings.getRequestTopic());
-        TbQueueConsumer<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> consumer = new TbServiceBusConsumerTemplate<>(jsExecutorAdmin, serviceBusSettings,
-                jsInvokeSettings.getResponseTopic() + "." + serviceInfoProvider.getServiceId(),
-                msg -> {
-                    JsInvokeProtos.RemoteJsResponse.Builder builder = JsInvokeProtos.RemoteJsResponse.newBuilder();
-                    JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
-                    return new TbProtoQueueMsg<>(msg.getKey(), builder.build(), msg.getHeaders());
-                });
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> builder = DefaultTbQueueRequestTemplate.builder();
-        builder.queueAdmin(jsExecutorAdmin);
-        builder.requestTemplate(producer);
-        builder.responseTemplate(consumer);
-        builder.maxPendingRequests(jsInvokeSettings.getMaxPendingRequests());
-        builder.maxRequestTimeout(jsInvokeSettings.getMaxRequestsTimeout());
-        builder.pollInterval(jsInvokeSettings.getResponsePollInterval());
-        return builder.build();
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToUsageStatsServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createVersionControlMsgProducer() {
-        //TODO: version-control
-        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()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(edgeAdmin, serviceBusSettings, topicService.buildTopicName(edgeSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(edgeAdmin, serviceBusSettings, topicService.buildTopicName(edgeSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createToEdgeNotificationsMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(notificationAdmin, serviceBusSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToEdgeNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createEdgeNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings,
-                topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (jsExecutorAdmin != null) {
-            jsExecutorAdmin.destroy();
-        }
-        if (transportApiAdmin != null) {
-            transportApiAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (edgeAdmin != null) {
-            edgeAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 54661f695c..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbRuleEngineQueueFactory.java
+++ /dev/null
@@ -1,202 +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.provider;
-
-import com.google.protobuf.util.JsonFormat;
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.queue.Queue;
-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.ToEdgeMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToEdgeNotificationMsg;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-import org.thingsboard.server.queue.TbQueueRequestTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusAdmin;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusConsumerTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusProducerTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusQueueConfigs;
-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.TbServiceInfoProvider;
-import org.thingsboard.server.queue.discovery.TopicService;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueEdgeSettings;
-import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
-import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
-import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
-
-import java.nio.charset.StandardCharsets;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='service-bus' && '${service.type:null}'=='tb-rule-engine'")
-public class ServiceBusTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
-
-    private final TopicService topicService;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TbServiceBusSettings serviceBusSettings;
-    private final TbQueueRemoteJsInvokeSettings jsInvokeSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbQueueEdgeSettings edgeSettings;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-    private final TbQueueAdmin jsExecutorAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin edgeAdmin;
-
-    public ServiceBusTbRuleEngineQueueFactory(TopicService topicService, TbQueueCoreSettings coreSettings,
-                                              TbQueueRuleEngineSettings ruleEngineSettings,
-                                              TbServiceInfoProvider serviceInfoProvider,
-                                              TbServiceBusSettings serviceBusSettings,
-                                              TbQueueRemoteJsInvokeSettings jsInvokeSettings,
-                                              TbQueueTransportNotificationSettings transportNotificationSettings,
-                                              TbQueueEdgeSettings edgeSettings,
-                                              TbServiceBusQueueConfigs serviceBusQueueConfigs) {
-        this.topicService = topicService;
-        this.coreSettings = coreSettings;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.serviceBusSettings = serviceBusSettings;
-        this.jsInvokeSettings = jsInvokeSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.edgeSettings = edgeSettings;
-
-        this.coreAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getCoreConfigs());
-        this.ruleEngineAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getRuleEngineConfigs());
-        this.jsExecutorAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getJsExecutorConfigs());
-        this.notificationAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getNotificationsConfigs());
-        this.edgeAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getEdgeConfigs());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(ruleEngineAdmin, serviceBusSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeMsg>> createEdgeMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(edgeAdmin, serviceBusSettings, topicService.buildTopicName(edgeSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToEdgeNotificationMsg>> createEdgeNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings, topicService.getEdgeNotificationsTopic(serviceInfoProvider.getServiceId()).getFullTopicName());
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> createToRuleEngineMsgConsumer(Queue configuration) {
-        return new TbServiceBusConsumerTemplate<>(ruleEngineAdmin, serviceBusSettings, topicService.buildTopicName(configuration.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createToRuleEngineNotificationsMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(notificationAdmin, serviceBusSettings,
-                topicService.getNotificationsTopic(ServiceType.TB_RULE_ENGINE, serviceInfoProvider.getServiceId()).getFullTopicName(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineNotificationMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    @Bean
-    public TbQueueRequestTemplate<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> createRemoteJsRequestTemplate() {
-        TbQueueProducer<TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>> producer = new TbServiceBusProducerTemplate<>(jsExecutorAdmin, serviceBusSettings, jsInvokeSettings.getRequestTopic());
-        TbQueueConsumer<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> consumer = new TbServiceBusConsumerTemplate<>(jsExecutorAdmin, serviceBusSettings,
-                jsInvokeSettings.getResponseTopic() + "." + serviceInfoProvider.getServiceId(),
-                msg -> {
-                    JsInvokeProtos.RemoteJsResponse.Builder builder = JsInvokeProtos.RemoteJsResponse.newBuilder();
-                    JsonFormat.parser().ignoringUnknownFields().merge(new String(msg.getData(), StandardCharsets.UTF_8), builder);
-                    return new TbProtoQueueMsg<>(msg.getKey(), builder.build(), msg.getHeaders());
-                });
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoJsQueueMsg<JsInvokeProtos.RemoteJsRequest>, TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> builder = DefaultTbQueueRequestTemplate.builder();
-        builder.queueAdmin(jsExecutorAdmin);
-        builder.requestTemplate(producer);
-        builder.responseTemplate(consumer);
-        builder.maxPendingRequests(jsInvokeSettings.getMaxPendingRequests());
-        builder.maxRequestTimeout(jsInvokeSettings.getMaxRequestsTimeout());
-        builder.pollInterval(jsInvokeSettings.getResponsePollInterval());
-        return builder.build();
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-        if (jsExecutorAdmin != null) {
-            jsExecutorAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 0c363488ce..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbVersionControlQueueFactory.java
+++ /dev/null
@@ -1,98 +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.provider;
-
-import jakarta.annotation.PreDestroy;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusAdmin;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusConsumerTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusProducerTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusQueueConfigs;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusSettings;
-import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
-import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
-import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='service-bus' && '${service.type:null}'=='tb-vc-executor'")
-public class ServiceBusTbVersionControlQueueFactory implements TbVersionControlQueueFactory {
-
-    private final TbServiceBusSettings serviceBusSettings;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueVersionControlSettings vcSettings;
-    private final TopicService topicService;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin vcAdmin;
-
-    public ServiceBusTbVersionControlQueueFactory(TbServiceBusSettings serviceBusSettings,
-                                                  TbQueueCoreSettings coreSettings,
-                                                  TbQueueVersionControlSettings vcSettings,
-                                                  TbServiceBusQueueConfigs serviceBusQueueConfigs,
-                                                  TopicService topicService
-    ) {
-        this.serviceBusSettings = serviceBusSettings;
-        this.coreSettings = coreSettings;
-        this.vcSettings = vcSettings;
-        this.topicService = topicService;
-
-        this.coreAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getCoreConfigs());
-        this.notificationAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getNotificationsConfigs());
-        this.vcAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getVcConfigs());
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToVersionControlServiceMsg>> createToVersionControlMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(vcAdmin, serviceBusSettings, topicService.buildTopicName(vcSettings.getTopic()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportProtos.ToVersionControlServiceMsg.parseFrom(msg.getData()), msg.getHeaders())
-        );
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (vcAdmin != null) {
-            vcAdmin.destroy();
-        }
-    }
-}
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
deleted file mode 100644
index 7f3e246eec..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTransportQueueFactory.java
+++ /dev/null
@@ -1,155 +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.provider;
-
-import jakarta.annotation.PreDestroy;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-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;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueConsumer;
-import org.thingsboard.server.queue.TbQueueProducer;
-import org.thingsboard.server.queue.TbQueueRequestTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusAdmin;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusConsumerTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusProducerTemplate;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusQueueConfigs;
-import org.thingsboard.server.queue.azure.servicebus.TbServiceBusSettings;
-import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
-import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-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.TbQueueRuleEngineSettings;
-import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
-import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='service-bus' && (('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true') || '${service.type:null}'=='tb-transport')")
-@Slf4j
-public class ServiceBusTransportQueueFactory implements TbTransportQueueFactory {
-    private final TbQueueTransportApiSettings transportApiSettings;
-    private final TbQueueTransportNotificationSettings transportNotificationSettings;
-    private final TbServiceBusSettings serviceBusSettings;
-    private final TbServiceInfoProvider serviceInfoProvider;
-    private final TbQueueCoreSettings coreSettings;
-    private final TbQueueRuleEngineSettings ruleEngineSettings;
-    private final TopicService topicService;
-
-    private final TbQueueAdmin coreAdmin;
-    private final TbQueueAdmin transportApiAdmin;
-    private final TbQueueAdmin notificationAdmin;
-    private final TbQueueAdmin ruleEngineAdmin;
-
-    public ServiceBusTransportQueueFactory(TbQueueTransportApiSettings transportApiSettings,
-                                           TbQueueTransportNotificationSettings transportNotificationSettings,
-                                           TbServiceBusSettings serviceBusSettings,
-                                           TbQueueRuleEngineSettings ruleEngineSettings,
-                                           TbServiceInfoProvider serviceInfoProvider,
-                                           TbQueueCoreSettings coreSettings,
-                                           TbServiceBusQueueConfigs serviceBusQueueConfigs,
-                                           TopicService topicService) {
-        this.transportApiSettings = transportApiSettings;
-        this.transportNotificationSettings = transportNotificationSettings;
-        this.serviceBusSettings = serviceBusSettings;
-        this.serviceInfoProvider = serviceInfoProvider;
-        this.coreSettings = coreSettings;
-        this.ruleEngineSettings = ruleEngineSettings;
-        this.topicService = topicService;
-
-        this.coreAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getCoreConfigs());
-        this.transportApiAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getTransportApiConfigs());
-        this.notificationAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getNotificationsConfigs());
-        this.ruleEngineAdmin = new TbServiceBusAdmin(serviceBusSettings, serviceBusQueueConfigs.getRuleEngineConfigs());
-    }
-
-    @Override
-    public TbQueueRequestTemplate<TbProtoQueueMsg<TransportApiRequestMsg>, TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiRequestTemplate() {
-        TbQueueProducer<TbProtoQueueMsg<TransportApiRequestMsg>> producerTemplate =
-                new TbServiceBusProducerTemplate<>(transportApiAdmin, serviceBusSettings, topicService.buildTopicName(transportApiSettings.getRequestsTopic()));
-
-        TbQueueConsumer<TbProtoQueueMsg<TransportApiResponseMsg>> consumerTemplate =
-                new TbServiceBusConsumerTemplate<>(transportApiAdmin, serviceBusSettings,
-                        topicService.buildTopicName(transportApiSettings.getResponsesTopic() + "." + serviceInfoProvider.getServiceId()),
-                        msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiResponseMsg.parseFrom(msg.getData()), msg.getHeaders()));
-
-        DefaultTbQueueRequestTemplate.DefaultTbQueueRequestTemplateBuilder
-                <TbProtoQueueMsg<TransportApiRequestMsg>, TbProtoQueueMsg<TransportApiResponseMsg>> templateBuilder = DefaultTbQueueRequestTemplate.builder();
-        templateBuilder.queueAdmin(transportApiAdmin);
-        templateBuilder.requestTemplate(producerTemplate);
-        templateBuilder.responseTemplate(consumerTemplate);
-        templateBuilder.maxPendingRequests(transportApiSettings.getMaxPendingRequests());
-        templateBuilder.maxRequestTimeout(transportApiSettings.getMaxRequestsTimeout());
-        templateBuilder.pollInterval(transportApiSettings.getResponsePollInterval());
-        return templateBuilder.build();
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(ruleEngineAdmin, serviceBusSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(notificationAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getTopic()));
-    }
-
-    @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsConsumer() {
-        return new TbServiceBusConsumerTemplate<>(notificationAdmin, serviceBusSettings,
-                topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic() + "." + serviceInfoProvider.getServiceId()),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToTransportMsg.parseFrom(msg.getData()), msg.getHeaders()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
-    }
-
-    @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (coreAdmin != null) {
-            coreAdmin.destroy();
-        }
-        if (transportApiAdmin != null) {
-            transportApiAdmin.destroy();
-        }
-        if (notificationAdmin != null) {
-            notificationAdmin.destroy();
-        }
-        if (ruleEngineAdmin != null) {
-            ruleEngineAdmin.destroy();
-        }
-    }
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubAdmin.java b/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubAdmin.java
deleted file mode 100644
index bbae199c4a..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubAdmin.java
+++ /dev/null
@@ -1,232 +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.pubsub;
-
-import com.google.api.gax.rpc.AlreadyExistsException;
-import com.google.cloud.pubsub.v1.SubscriptionAdminClient;
-import com.google.cloud.pubsub.v1.SubscriptionAdminSettings;
-import com.google.cloud.pubsub.v1.TopicAdminClient;
-import com.google.cloud.pubsub.v1.TopicAdminSettings;
-import com.google.protobuf.Duration;
-import com.google.pubsub.v1.ListSubscriptionsRequest;
-import com.google.pubsub.v1.ListTopicsRequest;
-import com.google.pubsub.v1.ProjectName;
-import com.google.pubsub.v1.ProjectSubscriptionName;
-import com.google.pubsub.v1.Subscription;
-import com.google.pubsub.v1.Topic;
-import com.google.pubsub.v1.TopicName;
-import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.server.queue.TbQueueAdmin;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Slf4j
-@Deprecated(forRemoval = true, since = "3.9") // for removal in 4.0
-public class TbPubSubAdmin implements TbQueueAdmin {
-    private static final String ACK_DEADLINE = "ackDeadlineInSec";
-    private static final String MESSAGE_RETENTION = "messageRetentionInSec";
-
-    private final TopicAdminClient topicAdminClient;
-    private final SubscriptionAdminClient subscriptionAdminClient;
-
-    private final TbPubSubSettings pubSubSettings;
-    private final Set<String> topicSet = ConcurrentHashMap.newKeySet();
-    private final Set<String> subscriptionSet = ConcurrentHashMap.newKeySet();
-    private final Map<String, String> subscriptionProperties;
-
-    public TbPubSubAdmin(TbPubSubSettings pubSubSettings, Map<String, String> subscriptionSettings) {
-        this.pubSubSettings = pubSubSettings;
-        this.subscriptionProperties = subscriptionSettings;
-
-        TopicAdminSettings topicAdminSettings;
-        try {
-            topicAdminSettings = TopicAdminSettings.newBuilder().setCredentialsProvider(pubSubSettings.getCredentialsProvider()).build();
-        } catch (IOException e) {
-            log.error("Failed to create TopicAdminSettings");
-            throw new RuntimeException("Failed to create TopicAdminSettings.");
-        }
-
-        SubscriptionAdminSettings subscriptionAdminSettings;
-        try {
-            subscriptionAdminSettings = SubscriptionAdminSettings.newBuilder().setCredentialsProvider(pubSubSettings.getCredentialsProvider()).build();
-        } catch (IOException e) {
-            log.error("Failed to create SubscriptionAdminSettings");
-            throw new RuntimeException("Failed to create SubscriptionAdminSettings.");
-        }
-
-        try {
-            topicAdminClient = TopicAdminClient.create(topicAdminSettings);
-
-            ListTopicsRequest listTopicsRequest =
-                    ListTopicsRequest.newBuilder().setProject(ProjectName.format(pubSubSettings.getProjectId())).build();
-            TopicAdminClient.ListTopicsPagedResponse response = topicAdminClient.listTopics(listTopicsRequest);
-            for (Topic topic : response.iterateAll()) {
-                topicSet.add(topic.getName());
-            }
-        } catch (IOException e) {
-            log.error("Failed to get topics.", e);
-            throw new RuntimeException("Failed to get topics.", e);
-        }
-
-        try {
-            subscriptionAdminClient = SubscriptionAdminClient.create(subscriptionAdminSettings);
-
-            ListSubscriptionsRequest listSubscriptionsRequest =
-                    ListSubscriptionsRequest.newBuilder()
-                            .setProject(ProjectName.of(pubSubSettings.getProjectId()).toString())
-                            .build();
-            SubscriptionAdminClient.ListSubscriptionsPagedResponse response =
-                    subscriptionAdminClient.listSubscriptions(listSubscriptionsRequest);
-
-            for (Subscription subscription : response.iterateAll()) {
-                subscriptionSet.add(subscription.getName());
-            }
-        } catch (IOException e) {
-            log.error("Failed to get subscriptions.", e);
-            throw new RuntimeException("Failed to get subscriptions.", e);
-        }
-    }
-
-    @Override
-    public void createTopicIfNotExists(String partition, String properties) {
-        TopicName topicName = TopicName.newBuilder()
-                .setTopic(partition)
-                .setProject(pubSubSettings.getProjectId())
-                .build();
-
-        if (topicSet.contains(topicName.toString())) {
-            createSubscriptionIfNotExists(partition, topicName);
-            return;
-        }
-
-        ListTopicsRequest listTopicsRequest =
-                ListTopicsRequest.newBuilder().setProject(ProjectName.format(pubSubSettings.getProjectId())).build();
-        TopicAdminClient.ListTopicsPagedResponse response = topicAdminClient.listTopics(listTopicsRequest);
-        for (Topic topic : response.iterateAll()) {
-            if (topic.getName().contains(topicName.toString())) {
-                topicSet.add(topic.getName());
-                createSubscriptionIfNotExists(partition, topicName);
-                return;
-            }
-        }
-
-        try {
-            topicAdminClient.createTopic(topicName);
-            log.info("Created new topic: [{}]", topicName.toString());
-        } catch (AlreadyExistsException e) {
-            log.info("[{}] Topic already exist.", topicName.toString());
-        } finally {
-            topicSet.add(topicName.toString());
-        }
-        createSubscriptionIfNotExists(partition, topicName);
-    }
-
-    @Override
-    public void deleteTopic(String topic) {
-        TopicName topicName = TopicName.newBuilder()
-                .setTopic(topic)
-                .setProject(pubSubSettings.getProjectId())
-                .build();
-
-        ProjectSubscriptionName subscriptionName =
-                ProjectSubscriptionName.of(pubSubSettings.getProjectId(), topic);
-
-        if (topicSet.contains(topicName.toString())) {
-            topicAdminClient.deleteTopic(topicName);
-        } else {
-            if (topicAdminClient.getTopic(topicName) != null) {
-                topicAdminClient.deleteTopic(topicName);
-            } else {
-                log.warn("PubSub topic [{}] does not exist.", topic);
-            }
-        }
-
-        if (subscriptionSet.contains(subscriptionName.toString())) {
-            subscriptionAdminClient.deleteSubscription(subscriptionName);
-        } else {
-            if (subscriptionAdminClient.getSubscription(subscriptionName) != null) {
-                subscriptionAdminClient.deleteSubscription(subscriptionName);
-            } else {
-                log.warn("PubSub subscription [{}] does not exist.", topic);
-            }
-        }
-    }
-
-    private void createSubscriptionIfNotExists(String partition, TopicName topicName) {
-        ProjectSubscriptionName subscriptionName =
-                ProjectSubscriptionName.of(pubSubSettings.getProjectId(), partition);
-
-        if (subscriptionSet.contains(subscriptionName.toString())) {
-            return;
-        }
-
-        ListSubscriptionsRequest listSubscriptionsRequest =
-                ListSubscriptionsRequest.newBuilder().setProject(ProjectName.of(pubSubSettings.getProjectId()).toString()).build();
-        SubscriptionAdminClient.ListSubscriptionsPagedResponse response = subscriptionAdminClient.listSubscriptions(listSubscriptionsRequest);
-        for (Subscription subscription : response.iterateAll()) {
-            if (subscription.getName().equals(subscriptionName.toString())) {
-                subscriptionSet.add(subscription.getName());
-                return;
-            }
-        }
-
-        Subscription.Builder subscriptionBuilder = Subscription
-                .newBuilder()
-                .setName(subscriptionName.toString())
-                .setTopic(topicName.toString());
-
-        setAckDeadline(subscriptionBuilder);
-        setMessageRetention(subscriptionBuilder);
-
-        try {
-            subscriptionAdminClient.createSubscription(subscriptionBuilder.build());
-            log.info("Created new subscription: [{}]", subscriptionName.toString());
-        } catch (AlreadyExistsException e) {
-            log.info("[{}] Subscription already exist.", subscriptionName.toString());
-        } finally {
-            subscriptionSet.add(subscriptionName.toString());
-        }
-    }
-
-    private void setAckDeadline(Subscription.Builder builder) {
-        if (subscriptionProperties.containsKey(ACK_DEADLINE)) {
-            builder.setAckDeadlineSeconds(Integer.parseInt(subscriptionProperties.get(ACK_DEADLINE)));
-        }
-    }
-
-    private void setMessageRetention(Subscription.Builder builder) {
-        if (subscriptionProperties.containsKey(MESSAGE_RETENTION)) {
-            Duration duration = Duration
-                    .newBuilder()
-                    .setSeconds(Long.parseLong(subscriptionProperties.get(MESSAGE_RETENTION)))
-                    .build();
-            builder.setMessageRetentionDuration(duration);
-        }
-    }
-
-    @Override
-    public void destroy() {
-        if (topicAdminClient != null) {
-            topicAdminClient.close();
-        }
-        if (subscriptionAdminClient != null) {
-            subscriptionAdminClient.close();
-        }
-    }
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubConsumerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubConsumerTemplate.java
deleted file mode 100644
index 8a2ba90096..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubConsumerTemplate.java
+++ /dev/null
@@ -1,175 +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.pubsub;
-
-import com.google.api.core.ApiFuture;
-import com.google.api.core.ApiFutures;
-import com.google.cloud.pubsub.v1.stub.GrpcSubscriberStub;
-import com.google.cloud.pubsub.v1.stub.SubscriberStub;
-import com.google.cloud.pubsub.v1.stub.SubscriberStubSettings;
-import com.google.gson.Gson;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.pubsub.v1.AcknowledgeRequest;
-import com.google.pubsub.v1.ProjectSubscriptionName;
-import com.google.pubsub.v1.PubsubMessage;
-import com.google.pubsub.v1.PullRequest;
-import com.google.pubsub.v1.PullResponse;
-import com.google.pubsub.v1.ReceivedMessage;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.CollectionUtils;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueMsg;
-import org.thingsboard.server.queue.TbQueueMsgDecoder;
-import org.thingsboard.server.queue.common.AbstractParallelTbQueueConsumerTemplate;
-import org.thingsboard.server.queue.common.DefaultTbQueueMsg;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-
-@Slf4j
-public class TbPubSubConsumerTemplate<T extends TbQueueMsg> extends AbstractParallelTbQueueConsumerTemplate<PubsubMessage, T> {
-
-    private final Gson gson = new Gson();
-    private final TbQueueAdmin admin;
-    private final String topic;
-    private final TbQueueMsgDecoder<T> decoder;
-    private final TbPubSubSettings pubSubSettings;
-
-    private volatile Set<String> subscriptionNames;
-    private final List<AcknowledgeRequest> acknowledgeRequests = new CopyOnWriteArrayList<>();
-
-    private final SubscriberStub subscriber;
-    private volatile int messagesPerTopic;
-
-    public TbPubSubConsumerTemplate(TbQueueAdmin admin, TbPubSubSettings pubSubSettings, String topic, TbQueueMsgDecoder<T> decoder) {
-        super(topic);
-        this.admin = admin;
-        this.pubSubSettings = pubSubSettings;
-        this.topic = topic;
-        this.decoder = decoder;
-        try {
-            SubscriberStubSettings subscriberStubSettings =
-                    SubscriberStubSettings.newBuilder()
-                            .setCredentialsProvider(pubSubSettings.getCredentialsProvider())
-                            .setTransportChannelProvider(
-                                    SubscriberStubSettings.defaultGrpcTransportProviderBuilder()
-                                            .setMaxInboundMessageSize(pubSubSettings.getMaxMsgSize())
-                                            .build())
-                            .setExecutorProvider(pubSubSettings.getExecutorProvider())
-                            .build();
-            this.subscriber = GrpcSubscriberStub.create(subscriberStubSettings);
-        } catch (IOException e) {
-            log.error("Failed to create subscriber.", e);
-            throw new RuntimeException("Failed to create subscriber.", e);
-        }
-    }
-
-    @Override
-    protected List<PubsubMessage> doPoll(long durationInMillis) {
-        try {
-            List<ReceivedMessage> messages = receiveMessages();
-            if (!messages.isEmpty()) {
-                return messages.stream().map(ReceivedMessage::getMessage).collect(Collectors.toList());
-            }
-        } catch (ExecutionException | InterruptedException e) {
-            if (stopped) {
-                log.info("[{}] Pub/Sub consumer is stopped.", topic);
-            } else {
-                log.error("Failed to receive messages", e);
-            }
-        }
-        return Collections.emptyList();
-    }
-
-    @Override
-    protected void doSubscribe(List<String> topicNames) {
-        subscriptionNames = new LinkedHashSet<>(topicNames);
-        subscriptionNames.forEach(admin::createTopicIfNotExists);
-        initNewExecutor(subscriptionNames.size() + 1);
-        messagesPerTopic = pubSubSettings.getMaxMessages() / Math.max(subscriptionNames.size(), 1);
-    }
-
-    @Override
-    protected void doCommit() {
-        acknowledgeRequests.forEach(subscriber.acknowledgeCallable()::futureCall);
-        acknowledgeRequests.clear();
-    }
-
-    @Override
-    protected void doUnsubscribe() {
-        if (subscriber != null) {
-            subscriber.close();
-        }
-        shutdownExecutor();
-    }
-
-    private List<ReceivedMessage> receiveMessages() throws ExecutionException, InterruptedException {
-        List<ApiFuture<List<ReceivedMessage>>> result = subscriptionNames.stream().map(subscriptionId -> {
-            String subscriptionName = ProjectSubscriptionName.format(pubSubSettings.getProjectId(), subscriptionId);
-            PullRequest pullRequest =
-                    PullRequest.newBuilder()
-                            .setMaxMessages(messagesPerTopic)
-//                            .setReturnImmediately(false) // return immediately if messages are not available
-                            .setSubscription(subscriptionName)
-                            .build();
-
-            ApiFuture<PullResponse> pullResponseApiFuture = subscriber.pullCallable().futureCall(pullRequest);
-
-            return ApiFutures.transform(pullResponseApiFuture, pullResponse -> {
-                if (pullResponse != null && !pullResponse.getReceivedMessagesList().isEmpty()) {
-                    List<String> ackIds = new ArrayList<>();
-                    for (ReceivedMessage message : pullResponse.getReceivedMessagesList()) {
-                        ackIds.add(message.getAckId());
-                    }
-                    AcknowledgeRequest acknowledgeRequest =
-                            AcknowledgeRequest.newBuilder()
-                                    .setSubscription(subscriptionName)
-                                    .addAllAckIds(ackIds)
-                                    .build();
-
-                    acknowledgeRequests.add(acknowledgeRequest);
-                    return pullResponse.getReceivedMessagesList();
-                }
-                return null;
-            }, consumerExecutor);
-
-        }).collect(Collectors.toList());
-
-        ApiFuture<List<ReceivedMessage>> transform = ApiFutures.transform(ApiFutures.allAsList(result), listMessages -> {
-            if (!CollectionUtils.isEmpty(listMessages)) {
-                return listMessages.stream().filter(Objects::nonNull).flatMap(List::stream).collect(Collectors.toList());
-            }
-            return Collections.emptyList();
-        }, consumerExecutor);
-
-        return transform.get();
-    }
-
-    @Override
-    public T decode(PubsubMessage message) throws InvalidProtocolBufferException {
-        DefaultTbQueueMsg msg = gson.fromJson(message.getData().toStringUtf8(), DefaultTbQueueMsg.class);
-        return decoder.decode(msg);
-    }
-
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubProducerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubProducerTemplate.java
deleted file mode 100644
index bb1d4e8976..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubProducerTemplate.java
+++ /dev/null
@@ -1,137 +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.pubsub;
-
-import com.google.api.core.ApiFuture;
-import com.google.api.core.ApiFutureCallback;
-import com.google.api.core.ApiFutures;
-import com.google.cloud.pubsub.v1.Publisher;
-import com.google.gson.Gson;
-import com.google.protobuf.ByteString;
-import com.google.pubsub.v1.ProjectTopicName;
-import com.google.pubsub.v1.PubsubMessage;
-import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueCallback;
-import org.thingsboard.server.queue.TbQueueMsg;
-import org.thingsboard.server.queue.TbQueueProducer;
-import org.thingsboard.server.queue.common.DefaultTbQueueMsg;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-@Slf4j
-public class TbPubSubProducerTemplate<T extends TbQueueMsg> implements TbQueueProducer<T> {
-
-    private final Gson gson = new Gson();
-
-    private final String defaultTopic;
-    private final TbQueueAdmin admin;
-    private final TbPubSubSettings pubSubSettings;
-
-    private final Map<String, Publisher> publisherMap = new ConcurrentHashMap<>();
-
-    private final ExecutorService pubExecutor = Executors.newCachedThreadPool();
-
-    public TbPubSubProducerTemplate(TbQueueAdmin admin, TbPubSubSettings pubSubSettings, String defaultTopic) {
-        this.defaultTopic = defaultTopic;
-        this.admin = admin;
-        this.pubSubSettings = pubSubSettings;
-    }
-
-    @Override
-    public void init() {
-
-    }
-
-    @Override
-    public String getDefaultTopic() {
-        return defaultTopic;
-    }
-
-    @Override
-    public void send(TopicPartitionInfo tpi, T msg, TbQueueCallback callback) {
-        PubsubMessage.Builder pubsubMessageBuilder = PubsubMessage.newBuilder();
-        pubsubMessageBuilder.setData(getMsg(msg));
-
-        Publisher publisher = getOrCreatePublisher(tpi.getFullTopicName());
-        ApiFuture<String> future = publisher.publish(pubsubMessageBuilder.build());
-
-        ApiFutures.addCallback(future, new ApiFutureCallback<String>() {
-            public void onSuccess(String messageId) {
-                if (callback != null) {
-                    callback.onSuccess(null);
-                }
-            }
-
-            public void onFailure(Throwable t) {
-                if (callback != null) {
-                    callback.onFailure(t);
-                }
-            }
-        }, pubExecutor);
-    }
-
-    @Override
-    public void stop() {
-        publisherMap.forEach((k, v) -> {
-            if (v != null) {
-                try {
-                    v.shutdown();
-                    v.awaitTermination(1, TimeUnit.SECONDS);
-                } catch (Exception e) {
-                    log.error("Failed to shutdown PubSub client during destroy()", e);
-                }
-            }
-        });
-
-        if (pubExecutor != null) {
-            pubExecutor.shutdownNow();
-        }
-    }
-
-    private ByteString getMsg(T msg) {
-        String json = gson.toJson(new DefaultTbQueueMsg(msg));
-        return ByteString.copyFrom(json.getBytes());
-    }
-
-    private Publisher getOrCreatePublisher(String topic) {
-        if (publisherMap.containsKey(topic)) {
-            return publisherMap.get(topic);
-        } else {
-            try {
-                admin.createTopicIfNotExists(topic);
-                ProjectTopicName topicName = ProjectTopicName.of(pubSubSettings.getProjectId(), topic);
-                Publisher publisher = Publisher.newBuilder(topicName)
-                        .setCredentialsProvider(pubSubSettings.getCredentialsProvider())
-                        .setExecutorProvider(pubSubSettings.getExecutorProvider())
-                        .build();
-                publisherMap.put(topic, publisher);
-                return publisher;
-            } catch (IOException e) {
-                log.error("Failed to create Publisher for the topic [{}].", topic, e);
-                throw new RuntimeException("Failed to create Publisher for the topic.", e);
-            }
-        }
-
-    }
-
-}
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
deleted file mode 100644
index 4794739925..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubSettings.java
+++ /dev/null
@@ -1,82 +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.pubsub;
-
-import com.google.api.gax.core.CredentialsProvider;
-import com.google.api.gax.core.FixedCredentialsProvider;
-import com.google.api.gax.core.FixedExecutorProvider;
-import com.google.auth.oauth2.ServiceAccountCredentials;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-import org.thingsboard.common.util.ThingsBoardExecutors;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-@Slf4j
-@ConditionalOnExpression("'${queue.type:null}'=='pubsub'")
-@Component
-@Data
-public class TbPubSubSettings {
-
-    @Value("${queue.pubsub.project_id}")
-    private String projectId;
-
-    @Value("${queue.pubsub.service_account}")
-    private String serviceAccount;
-
-    @Value("${queue.pubsub.max_msg_size}")
-    private int maxMsgSize;
-
-    @Value("${queue.pubsub.max_messages}")
-    private int maxMessages;
-
-    @Value("${queue.pubsub.executor_thread_pool_size:0}")
-    private int threadPoolSize;
-
-    /**
-     * Refers to com.google.cloud.pubsub.v1.Publisher default executor configuration
-     */
-    private static final int THREADS_PER_CPU = 5;
-
-    private FixedExecutorProvider executorProvider;
-
-    private CredentialsProvider credentialsProvider;
-
-    @PostConstruct
-    private void init() throws IOException {
-        ServiceAccountCredentials credentials = ServiceAccountCredentials.fromStream(
-                new ByteArrayInputStream(serviceAccount.getBytes()));
-        credentialsProvider = FixedCredentialsProvider.create(credentials);
-        if (threadPoolSize == 0) {
-            threadPoolSize = THREADS_PER_CPU * Runtime.getRuntime().availableProcessors();
-        }
-        executorProvider = FixedExecutorProvider
-                .create(ThingsBoardExecutors.newScheduledThreadPool(threadPoolSize, "pubsub-queue-executor"));
-    }
-
-    @PreDestroy
-    private void destroy() {
-        if (executorProvider != null) {
-            executorProvider.getExecutor().shutdownNow();
-        }
-    }
-}
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
deleted file mode 100644
index 14aa67a4f0..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubSubscriptionSettings.java
+++ /dev/null
@@ -1,72 +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.pubsub;
-
-import jakarta.annotation.PostConstruct;
-import lombok.Getter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.queue.util.PropertyUtils;
-
-import java.util.Map;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='pubsub'")
-public class TbPubSubSubscriptionSettings {
-
-    @Value("${queue.pubsub.queue-properties.core:}")
-    private String coreProperties;
-    @Value("${queue.pubsub.queue-properties.rule-engine:}")
-    private String ruleEngineProperties;
-    @Value("${queue.pubsub.queue-properties.transport-api:}")
-    private String transportApiProperties;
-    @Value("${queue.pubsub.queue-properties.notifications:}")
-    private String notificationsProperties;
-    @Value("${queue.pubsub.queue-properties.js-executor:}")
-    private String jsExecutorProperties;
-    @Value("${queue.pubsub.queue-properties.version-control:}")
-    private String vcProperties;
-    @Value("${queue.pubsub.queue-properties.edge:}")
-    private String edgeProperties;
-
-    @Getter
-    private Map<String, String> coreSettings;
-    @Getter
-    private Map<String, String> ruleEngineSettings;
-    @Getter
-    private Map<String, String> transportApiSettings;
-    @Getter
-    private Map<String, String> notificationsSettings;
-    @Getter
-    private Map<String, String> jsExecutorSettings;
-    @Getter
-    private Map<String, String> vcSettings;
-    @Getter
-    private Map<String, String> edgeSettings;
-
-    @PostConstruct
-    private void init() {
-        coreSettings = PropertyUtils.getProps(coreProperties);
-        ruleEngineSettings = PropertyUtils.getProps(ruleEngineProperties);
-        transportApiSettings = PropertyUtils.getProps(transportApiProperties);
-        notificationsSettings = PropertyUtils.getProps(notificationsProperties);
-        jsExecutorSettings = PropertyUtils.getProps(jsExecutorProperties);
-        vcSettings = PropertyUtils.getProps(vcProperties);
-        edgeSettings = PropertyUtils.getProps(edgeProperties);
-    }
-
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqAdmin.java b/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqAdmin.java
deleted file mode 100644
index aad3c1c8cc..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqAdmin.java
+++ /dev/null
@@ -1,95 +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.rabbitmq;
-
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.thingsboard.server.queue.TbQueueAdmin;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeoutException;
-
-@Slf4j
-@Deprecated(forRemoval = true, since = "3.9") // for removal in 4.0
-public class TbRabbitMqAdmin implements TbQueueAdmin {
-
-    private final Channel channel;
-    private final Connection connection;
-    private final Map<String, Object> arguments;
-
-    public TbRabbitMqAdmin(TbRabbitMqSettings rabbitMqSettings, Map<String, Object> arguments) {
-        this.arguments = arguments;
-
-        try {
-            connection = rabbitMqSettings.getConnectionFactory().newConnection();
-        } catch (IOException | TimeoutException e) {
-            log.error("Failed to create connection.", e);
-            throw new RuntimeException("Failed to create connection.", e);
-        }
-
-        try {
-            channel = connection.createChannel();
-        } catch (IOException e) {
-            log.error("Failed to create chanel.", e);
-            throw new RuntimeException("Failed to create chanel.", e);
-        }
-    }
-
-    @Override
-    public void createTopicIfNotExists(String topic, String properties) {
-        Map<String, Object> arguments = this.arguments;
-        if (StringUtils.isNotBlank(properties)) {
-            arguments = new HashMap<>(arguments);
-            arguments.putAll(TbRabbitMqQueueArguments.getArgs(properties));
-        }
-        try {
-            channel.queueDeclare(topic, false, false, false, arguments);
-        } catch (IOException e) {
-            log.error("Failed to bind queue: [{}]", topic, e);
-        }
-    }
-
-    @Override
-    public void deleteTopic(String topic) {
-        try {
-            channel.queueDelete(topic);
-        } catch (IOException e) {
-            log.error("Failed to delete RabbitMq queue [{}].", topic);
-        }
-    }
-
-    @Override
-    public void destroy() {
-        if (channel != null) {
-            try {
-                channel.close();
-            } catch (IOException | TimeoutException e) {
-                log.error("Failed to close Chanel.", e);
-            }
-        }
-        if (connection != null) {
-            try {
-                connection.close();
-            } catch (IOException e) {
-                log.error("Failed to close Connection.", e);
-            }
-        }
-    }
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqConsumerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqConsumerTemplate.java
deleted file mode 100644
index e50afabb5d..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqConsumerTemplate.java
+++ /dev/null
@@ -1,144 +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.rabbitmq;
-
-import com.google.gson.Gson;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.GetResponse;
-import java.util.ArrayList;
-import java.util.Collection;
-import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueMsg;
-import org.thingsboard.server.queue.TbQueueMsgDecoder;
-import org.thingsboard.server.queue.common.AbstractTbQueueConsumerTemplate;
-import org.thingsboard.server.queue.common.DefaultTbQueueMsg;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeoutException;
-import java.util.stream.Collectors;
-
-@Slf4j
-public class TbRabbitMqConsumerTemplate<T extends TbQueueMsg> extends AbstractTbQueueConsumerTemplate<GetResponse, T> {
-
-    private final Gson gson = new Gson();
-    private final TbQueueAdmin admin;
-    private final TbQueueMsgDecoder<T> decoder;
-    private final Channel channel;
-    private final Connection connection;
-    private final int maxPollMessages;
-
-    private volatile Set<String> queues;
-
-    public TbRabbitMqConsumerTemplate(TbQueueAdmin admin, TbRabbitMqSettings rabbitMqSettings, String topic, TbQueueMsgDecoder<T> decoder) {
-        super(topic);
-        this.admin = admin;
-        this.decoder = decoder;
-        this.maxPollMessages = rabbitMqSettings.getMaxPollMessages();
-        try {
-            connection = rabbitMqSettings.getConnectionFactory().newConnection();
-        } catch (IOException | TimeoutException e) {
-            log.error("Failed to create connection.", e);
-            throw new RuntimeException("Failed to create connection.", e);
-        }
-        try {
-            channel = connection.createChannel();
-        } catch (IOException e) {
-            log.error("Failed to create chanel.", e);
-            throw new RuntimeException("Failed to create chanel.", e);
-        }
-        stopped = false;
-    }
-
-    @Override
-    protected List<GetResponse> doPoll(long durationInMillis) {
-        List<GetResponse> result = queues.stream()
-                .map(queue -> {
-                    List<GetResponse> messages = new ArrayList<>();
-                    for (int i = 0; i < maxPollMessages; i++) {
-                        GetResponse response = doQueuePoll(queue);
-                        if (response == null) {
-                            break;
-                        }
-                        messages.add(response);
-                    }
-                    return messages;
-                })
-                .filter(r -> !r.isEmpty())
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-        if (result.size() > 0) {
-            return result;
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    protected GetResponse doQueuePoll(String queue) {
-        try {
-            return channel.basicGet(queue, false);
-        } catch (IOException e) {
-            log.error("Failed to get messages from queue: [{}]", queue);
-            throw new RuntimeException("Failed to get messages from queue.", e);
-        }
-    }
-
-    @Override
-    protected void doSubscribe(List<String> topicNames) {
-        queues = partitions.stream()
-                .map(TopicPartitionInfo::getFullTopicName)
-                .collect(Collectors.toSet());
-        queues.forEach(admin::createTopicIfNotExists);
-    }
-
-    @Override
-    protected void doCommit() {
-        try {
-            channel.basicAck(0, true);
-        } catch (IOException e) {
-            log.error("Failed to ack messages.", e);
-        }
-    }
-
-    @Override
-    protected void doUnsubscribe() {
-        if (channel != null) {
-            try {
-                channel.close();
-            } catch (IOException | TimeoutException e) {
-                log.error("Failed to close the channel.");
-            }
-        }
-        if (connection != null) {
-            try {
-                connection.close();
-            } catch (IOException e) {
-                log.error("Failed to close the connection.");
-            }
-        }
-    }
-
-    public T decode(GetResponse message) throws InvalidProtocolBufferException {
-        DefaultTbQueueMsg msg = gson.fromJson(new String(message.getBody()), DefaultTbQueueMsg.class);
-        return decoder.decode(msg);
-    }
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqProducerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqProducerTemplate.java
deleted file mode 100644
index 696fcccce2..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqProducerTemplate.java
+++ /dev/null
@@ -1,125 +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.rabbitmq;
-
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.gson.Gson;
-import com.rabbitmq.client.AMQP;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueCallback;
-import org.thingsboard.server.queue.TbQueueMsg;
-import org.thingsboard.server.queue.TbQueueProducer;
-import org.thingsboard.server.queue.common.DefaultTbQueueMsg;
-
-import java.io.IOException;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeoutException;
-
-@Slf4j
-public class TbRabbitMqProducerTemplate<T extends TbQueueMsg> implements TbQueueProducer<T> {
-    private final String defaultTopic;
-    private final Gson gson = new Gson();
-    private final TbQueueAdmin admin;
-    private final TbRabbitMqSettings rabbitMqSettings;
-    private final ListeningExecutorService producerExecutor;
-    private final Channel channel;
-    private final Connection connection;
-
-    private final Set<TopicPartitionInfo> topics = ConcurrentHashMap.newKeySet();
-
-    public TbRabbitMqProducerTemplate(TbQueueAdmin admin, TbRabbitMqSettings rabbitMqSettings, String defaultTopic) {
-        this.admin = admin;
-        this.defaultTopic = defaultTopic;
-        this.rabbitMqSettings = rabbitMqSettings;
-        producerExecutor = MoreExecutors.listeningDecorator(Executors.newCachedThreadPool());
-        try {
-            connection = rabbitMqSettings.getConnectionFactory().newConnection();
-        } catch (IOException | TimeoutException e) {
-            log.error("Failed to create connection.", e);
-            throw new RuntimeException("Failed to create connection.", e);
-        }
-
-        try {
-            channel = connection.createChannel();
-        } catch (IOException e) {
-            log.error("Failed to create chanel.", e);
-            throw new RuntimeException("Failed to create chanel.", e);
-        }
-    }
-
-    @Override
-    public void init() {
-
-    }
-
-    @Override
-    public String getDefaultTopic() {
-        return defaultTopic;
-    }
-
-    @Override
-    public void send(TopicPartitionInfo tpi, T msg, TbQueueCallback callback) {
-        createTopicIfNotExist(tpi);
-        AMQP.BasicProperties properties = new AMQP.BasicProperties();
-        try {
-            channel.basicPublish(rabbitMqSettings.getExchangeName(), tpi.getFullTopicName(), properties, gson.toJson(new DefaultTbQueueMsg(msg)).getBytes());
-            if (callback != null) {
-                callback.onSuccess(null);
-            }
-        } catch (IOException e) {
-            log.error("Failed publish message: [{}].", msg, e);
-            if (callback != null) {
-                callback.onFailure(e);
-            }
-        }
-    }
-
-    @Override
-    public void stop() {
-        if (producerExecutor != null) {
-            producerExecutor.shutdownNow();
-        }
-        if (channel != null) {
-            try {
-                channel.close();
-            } catch (IOException | TimeoutException e) {
-                log.error("Failed to close the channel.");
-            }
-        }
-        if (connection != null) {
-            try {
-                connection.close();
-            } catch (IOException e) {
-                log.error("Failed to close the connection.");
-            }
-        }
-    }
-
-    private void createTopicIfNotExist(TopicPartitionInfo tpi) {
-        if (topics.contains(tpi)) {
-            return;
-        }
-        admin.createTopicIfNotExists(tpi.getFullTopicName());
-        topics.add(tpi);
-    }
-}
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
deleted file mode 100644
index 06613d5617..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqQueueArguments.java
+++ /dev/null
@@ -1,111 +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.rabbitmq;
-
-import jakarta.annotation.PostConstruct;
-import lombok.Getter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.StringUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='rabbitmq'")
-public class TbRabbitMqQueueArguments {
-    @Value("${queue.rabbitmq.queue-properties.core:}")
-    private String coreProperties;
-    @Value("${queue.rabbitmq.queue-properties.rule-engine:}")
-    private String ruleEngineProperties;
-    @Value("${queue.rabbitmq.queue-properties.transport-api:}")
-    private String transportApiProperties;
-    @Value("${queue.rabbitmq.queue-properties.notifications:}")
-    private String notificationsProperties;
-    @Value("${queue.rabbitmq.queue-properties.js-executor:}")
-    private String jsExecutorProperties;
-    @Value("${queue.rabbitmq.queue-properties.version-control:}")
-    private String vcProperties;
-    @Value("${queue.rabbitmq.queue-properties.edge:}")
-    private String edgeProperties;
-
-    @Getter
-    private Map<String, Object> coreArgs;
-    @Getter
-    private Map<String, Object> ruleEngineArgs;
-    @Getter
-    private Map<String, Object> transportApiArgs;
-    @Getter
-    private Map<String, Object> notificationsArgs;
-    @Getter
-    private Map<String, Object> jsExecutorArgs;
-    @Getter
-    private Map<String, Object> vcArgs;
-    @Getter
-    private Map<String, Object> edgeArgs;
-
-    @PostConstruct
-    private void init() {
-        coreArgs = getArgs(coreProperties);
-        ruleEngineArgs = getArgs(ruleEngineProperties);
-        transportApiArgs = getArgs(transportApiProperties);
-        notificationsArgs = getArgs(notificationsProperties);
-        jsExecutorArgs = getArgs(jsExecutorProperties);
-        vcArgs = getArgs(vcProperties);
-        edgeArgs = getArgs(edgeProperties);
-    }
-
-    public static Map<String, Object> getArgs(String properties) {
-        Map<String, Object> configs = new HashMap<>();
-        if (StringUtils.isNotEmpty(properties)) {
-            for (String property : properties.split(";")) {
-                int delimiterPosition = property.indexOf(":");
-                String key = property.substring(0, delimiterPosition);
-                String strValue = property.substring(delimiterPosition + 1);
-                configs.put(key, getObjectValue(strValue));
-            }
-        }
-        return configs;
-    }
-
-    private static Object getObjectValue(String str) {
-        if (str.equalsIgnoreCase("true") || str.equalsIgnoreCase("false")) {
-            return Boolean.valueOf(str);
-        } else if (isNumeric(str)) {
-            return getNumericValue(str);
-        }
-        return str;
-    }
-
-    private static Object getNumericValue(String str) {
-        if (str.contains(".")) {
-            return Double.valueOf(str);
-        } else {
-            return Long.valueOf(str);
-        }
-    }
-
-    private static final Pattern PATTERN = Pattern.compile("-?\\d+(\\.\\d+)?");
-
-    private static boolean isNumeric(String strNum) {
-        if (strNum == null) {
-            return false;
-        }
-        return PATTERN.matcher(strNum).matches();
-    }
-}
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
deleted file mode 100644
index c0a2912f23..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqSettings.java
+++ /dev/null
@@ -1,66 +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.rabbitmq;
-
-import com.rabbitmq.client.ConnectionFactory;
-import jakarta.annotation.PostConstruct;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@ConditionalOnExpression("'${queue.type:null}'=='rabbitmq'")
-@Component
-@Data
-public class TbRabbitMqSettings {
-    @Value("${queue.rabbitmq.exchange_name:}")
-    private String exchangeName;
-    @Value("${queue.rabbitmq.host:}")
-    private String host;
-    @Value("${queue.rabbitmq.port:}")
-    private int port;
-    @Value("${queue.rabbitmq.virtual_host:}")
-    private String virtualHost;
-    @Value("${queue.rabbitmq.username:}")
-    private String username;
-    @Value("${queue.rabbitmq.password:}")
-    private String password;
-    @Value("${queue.rabbitmq.automatic_recovery_enabled:}")
-    private boolean automaticRecoveryEnabled;
-    @Value("${queue.rabbitmq.connection_timeout:}")
-    private int connectionTimeout;
-    @Value("${queue.rabbitmq.handshake_timeout:}")
-    private int handshakeTimeout;
-    @Value("${queue.rabbitmq.max_poll_messages:1}")
-    private int maxPollMessages;
-
-    private ConnectionFactory connectionFactory;
-
-    @PostConstruct
-    private void init() {
-        connectionFactory = new ConnectionFactory();
-        connectionFactory.setHost(host);
-        connectionFactory.setPort(port);
-        connectionFactory.setVirtualHost(virtualHost);
-        connectionFactory.setUsername(username);
-        connectionFactory.setPassword(password);
-        connectionFactory.setAutomaticRecoveryEnabled(automaticRecoveryEnabled);
-        connectionFactory.setConnectionTimeout(connectionTimeout);
-        connectionFactory.setHandshakeTimeout(handshakeTimeout);
-    }
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsAdmin.java b/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsAdmin.java
deleted file mode 100644
index 6aa1ec4dad..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsAdmin.java
+++ /dev/null
@@ -1,118 +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.sqs;
-
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
-import com.amazonaws.services.sqs.model.CreateQueueRequest;
-import com.amazonaws.services.sqs.model.GetQueueUrlResult;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.common.util.ThingsBoardExecutors;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.util.PropertyUtils;
-
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Deprecated(forRemoval = true, since = "3.9") // for removal in 4.0
-public class TbAwsSqsAdmin implements TbQueueAdmin {
-
-    private final Map<String, String> attributes;
-    private final AmazonSQS sqsClient;
-    private final Map<String, String> queues;
-    @Getter
-    private final ExecutorService producerExecutor;
-
-    public TbAwsSqsAdmin(TbAwsSqsSettings sqsSettings, Map<String, String> attributes) {
-        this.attributes = attributes;
-
-        AWSCredentialsProvider credentialsProvider;
-        if (sqsSettings.getUseDefaultCredentialProviderChain()) {
-            credentialsProvider = new DefaultAWSCredentialsProviderChain();
-        } else {
-            AWSCredentials awsCredentials = new BasicAWSCredentials(sqsSettings.getAccessKeyId(), sqsSettings.getSecretAccessKey());
-            credentialsProvider = new AWSStaticCredentialsProvider(awsCredentials);
-        }
-        producerExecutor = ThingsBoardExecutors.newWorkStealingPool(sqsSettings.getThreadPoolSize(), "aws-sqs-queue-executor");
-
-        sqsClient = AmazonSQSClientBuilder.standard()
-                .withCredentials(credentialsProvider)
-                .withRegion(sqsSettings.getRegion())
-                .build();
-
-        queues = sqsClient
-                .listQueues()
-                .getQueueUrls()
-                .stream()
-                .map(this::getQueueNameFromUrl)
-                .collect(Collectors.toMap(this::convertTopicToQueueName, Function.identity()));
-    }
-
-    @Override
-    public void createTopicIfNotExists(String topic, String properties) {
-        String queueName = convertTopicToQueueName(topic);
-        if (queues.containsKey(queueName)) {
-            return;
-        }
-        Map<String, String> attributes = PropertyUtils.getProps(this.attributes, properties, TbAwsSqsQueueAttributes::toConfigs);
-        final CreateQueueRequest createQueueRequest = new CreateQueueRequest(queueName).withAttributes(attributes);
-        String queueUrl = sqsClient.createQueue(createQueueRequest).getQueueUrl();
-        queues.put(getQueueNameFromUrl(queueUrl), queueUrl);
-    }
-
-    private String convertTopicToQueueName(String topic) {
-        return topic.replaceAll("\\.", "_") + ".fifo";
-    }
-
-    @Override
-    public void deleteTopic(String topic) {
-        String queueName = convertTopicToQueueName(topic);
-        if (queues.containsKey(queueName)) {
-            sqsClient.deleteQueue(queues.get(queueName));
-        } else {
-            GetQueueUrlResult queueUrl = sqsClient.getQueueUrl(queueName);
-            if (queueUrl != null) {
-                sqsClient.deleteQueue(queueUrl.getQueueUrl());
-            } else {
-                log.warn("Aws SQS queue [{}] does not exist!", queueName);
-            }
-        }
-    }
-
-    private String getQueueNameFromUrl(String queueUrl) {
-        int delimiterIndex = queueUrl.lastIndexOf("/");
-        return queueUrl.substring(delimiterIndex + 1);
-    }
-
-    @Override
-    public void destroy() {
-        if (sqsClient != null) {
-            sqsClient.shutdown();
-        }
-        if (producerExecutor != null) {
-            producerExecutor.shutdownNow();
-        }
-    }
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsConsumerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsConsumerTemplate.java
deleted file mode 100644
index a3087e9d11..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsConsumerTemplate.java
+++ /dev/null
@@ -1,188 +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.sqs;
-
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
-import com.amazonaws.services.sqs.model.DeleteMessageBatchRequestEntry;
-import com.amazonaws.services.sqs.model.Message;
-import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.gson.Gson;
-import com.google.protobuf.InvalidProtocolBufferException;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.CollectionUtils;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueMsg;
-import org.thingsboard.server.queue.TbQueueMsgDecoder;
-import org.thingsboard.server.queue.common.AbstractParallelTbQueueConsumerTemplate;
-import org.thingsboard.server.queue.common.DefaultTbQueueMsg;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@Slf4j
-public class TbAwsSqsConsumerTemplate<T extends TbQueueMsg> extends AbstractParallelTbQueueConsumerTemplate<Message, T> {
-
-    private static final int MAX_NUM_MSGS = 10;
-
-    private final Gson gson = new Gson();
-    private final TbQueueAdmin admin;
-    private final AmazonSQS sqsClient;
-    private final TbQueueMsgDecoder<T> decoder;
-    private final TbAwsSqsSettings sqsSettings;
-
-    private final List<AwsSqsMsgWrapper> pendingMessages = new CopyOnWriteArrayList<>();
-    private volatile Set<String> queueUrls;
-
-    public TbAwsSqsConsumerTemplate(TbQueueAdmin admin, TbAwsSqsSettings sqsSettings, String topic, TbQueueMsgDecoder<T> decoder) {
-        super(topic);
-        this.admin = admin;
-        this.decoder = decoder;
-        this.sqsSettings = sqsSettings;
-
-        AWSCredentialsProvider credentialsProvider;
-        if (sqsSettings.getUseDefaultCredentialProviderChain()) {
-            credentialsProvider = new DefaultAWSCredentialsProviderChain();
-        } else {
-            AWSCredentials awsCredentials = new BasicAWSCredentials(sqsSettings.getAccessKeyId(), sqsSettings.getSecretAccessKey());
-            credentialsProvider = new AWSStaticCredentialsProvider(awsCredentials);
-        }
-
-        sqsClient = AmazonSQSClientBuilder.standard()
-                .withCredentials(credentialsProvider)
-                .withRegion(sqsSettings.getRegion())
-                .build();
-
-    }
-
-    @Override
-    protected void doSubscribe(List<String> topicNames) {
-        queueUrls = topicNames.stream().map(this::getQueueUrl).collect(Collectors.toSet());
-        initNewExecutor(queueUrls.size() * sqsSettings.getThreadsPerTopic() + 1);
-    }
-
-    @Override
-    protected List<Message> doPoll(long durationInMillis) {
-        int duration = (int) TimeUnit.MILLISECONDS.toSeconds(durationInMillis);
-        List<ListenableFuture<List<Message>>> futureList = queueUrls
-                .stream()
-                .map(url -> poll(url, duration))
-                .collect(Collectors.toList());
-        ListenableFuture<List<List<Message>>> futureResult = Futures.allAsList(futureList);
-        try {
-            return futureResult.get().stream()
-                    .flatMap(List::stream)
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
-        } catch (InterruptedException | ExecutionException e) {
-            if (stopped) {
-                log.info("[{}] Aws SQS consumer is stopped.", getTopic());
-            } else {
-                log.error("Failed to pool messages.", e);
-            }
-            return Collections.emptyList();
-        }
-    }
-
-    @Override
-    public T decode(Message message) throws InvalidProtocolBufferException {
-        DefaultTbQueueMsg msg = gson.fromJson(message.getBody(), DefaultTbQueueMsg.class);
-        return decoder.decode(msg);
-    }
-
-    @Override
-    protected void doCommit() {
-        pendingMessages.forEach(msg ->
-                consumerExecutor.submit(() -> {
-                    List<DeleteMessageBatchRequestEntry> entries = msg.getMessages()
-                            .stream()
-                            .map(message -> new DeleteMessageBatchRequestEntry(message.getMessageId(), message.getReceiptHandle()))
-                            .collect(Collectors.toList());
-                    sqsClient.deleteMessageBatch(msg.getUrl(), entries);
-                }));
-        pendingMessages.clear();
-    }
-
-    @Override
-    protected void doUnsubscribe() {
-        stopped = true;
-        if (sqsClient != null) {
-            sqsClient.shutdown();
-        }
-        shutdownExecutor();
-    }
-
-    private ListenableFuture<List<Message>> poll(String url, int waitTimeSeconds) {
-        List<ListenableFuture<List<Message>>> result = new ArrayList<>();
-
-        for (int i = 0; i < sqsSettings.getThreadsPerTopic(); i++) {
-            result.add(consumerExecutor.submit(() -> {
-                ReceiveMessageRequest request = new ReceiveMessageRequest();
-                request
-                        .withWaitTimeSeconds(waitTimeSeconds)
-                        .withQueueUrl(url)
-                        .withMaxNumberOfMessages(MAX_NUM_MSGS);
-                return sqsClient.receiveMessage(request).getMessages();
-            }));
-        }
-        return Futures.transform(Futures.allAsList(result), list -> {
-            if (!CollectionUtils.isEmpty(list)) {
-                return list.stream()
-                        .flatMap(messageList -> {
-                            if (!messageList.isEmpty()) {
-                                this.pendingMessages.add(new AwsSqsMsgWrapper(url, messageList));
-                                return messageList.stream();
-                            }
-                            return Stream.empty();
-                        })
-                        .collect(Collectors.toList());
-            }
-            return Collections.emptyList();
-        }, consumerExecutor);
-    }
-
-    @Data
-    private static class AwsSqsMsgWrapper {
-        private final String url;
-        private final List<Message> messages;
-
-        public AwsSqsMsgWrapper(String url, List<Message> messages) {
-            this.url = url;
-            this.messages = messages;
-        }
-    }
-
-    private String getQueueUrl(String topic) {
-        admin.createTopicIfNotExists(topic);
-        return sqsClient.getQueueUrl(topic.replaceAll("\\.", "_") + ".fifo").getQueueUrl();
-    }
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsProducerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsProducerTemplate.java
deleted file mode 100644
index d8d4a5d2e8..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsProducerTemplate.java
+++ /dev/null
@@ -1,117 +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.sqs;
-
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
-import com.amazonaws.handlers.AsyncHandler;
-import com.amazonaws.services.sqs.AmazonSQSAsync;
-import com.amazonaws.services.sqs.AmazonSQSAsyncClientBuilder;
-import com.amazonaws.services.sqs.model.SendMessageRequest;
-import com.amazonaws.services.sqs.model.SendMessageResult;
-import com.google.gson.Gson;
-import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueCallback;
-import org.thingsboard.server.queue.TbQueueMsg;
-import org.thingsboard.server.queue.TbQueueProducer;
-import org.thingsboard.server.queue.common.DefaultTbQueueMsg;
-
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Slf4j
-public class TbAwsSqsProducerTemplate<T extends TbQueueMsg> implements TbQueueProducer<T> {
-    private final String defaultTopic;
-    private final AmazonSQSAsync sqsClient;
-    private final Gson gson = new Gson();
-    private final Map<String, String> queueUrlMap = new ConcurrentHashMap<>();
-    private final TbAwsSqsAdmin admin;
-
-    public TbAwsSqsProducerTemplate(TbQueueAdmin admin, TbAwsSqsSettings sqsSettings, String defaultTopic) {
-        this.admin = (TbAwsSqsAdmin) admin;
-        this.defaultTopic = defaultTopic;
-
-        AWSCredentialsProvider credentialsProvider;
-        if (sqsSettings.getUseDefaultCredentialProviderChain()) {
-            credentialsProvider = new DefaultAWSCredentialsProviderChain();
-        } else {
-            AWSCredentials awsCredentials = new BasicAWSCredentials(sqsSettings.getAccessKeyId(), sqsSettings.getSecretAccessKey());
-            credentialsProvider = new AWSStaticCredentialsProvider(awsCredentials);
-        }
-
-        sqsClient = AmazonSQSAsyncClientBuilder.standard()
-                .withCredentials(credentialsProvider)
-                .withRegion(sqsSettings.getRegion())
-                .withExecutorFactory(this.admin::getProducerExecutor)
-                .build();
-    }
-
-    @Override
-    public void init() {
-
-    }
-
-    @Override
-    public String getDefaultTopic() {
-        return defaultTopic;
-    }
-
-    @Override
-    public void send(TopicPartitionInfo tpi, T msg, TbQueueCallback callback) {
-        SendMessageRequest sendMsgRequest = new SendMessageRequest();
-        sendMsgRequest.withQueueUrl(getQueueUrl(tpi.getFullTopicName()));
-        sendMsgRequest.withMessageBody(gson.toJson(new DefaultTbQueueMsg(msg)));
-
-        String sqsMsgId = UUID.randomUUID().toString();
-        sendMsgRequest.withMessageGroupId(sqsMsgId);
-        sendMsgRequest.withMessageDeduplicationId(sqsMsgId);
-
-        sqsClient.sendMessageAsync(sendMsgRequest, new AsyncHandler<SendMessageRequest, SendMessageResult>() {
-            @Override public void onError(Exception e) {
-                if (callback != null) {
-                    callback.onFailure(e);
-                }
-            }
-
-            @Override public void onSuccess(SendMessageRequest request,
-                                            SendMessageResult sendMessageResult) {
-                if (callback != null) {
-                    callback.onSuccess(new AwsSqsTbQueueMsgMetadata(sendMessageResult.getSdkHttpMetadata()));
-                }
-            }
-        });
-    }
-
-    @Override
-    public void stop() {
-        if (sqsClient != null) {
-            sqsClient.shutdown();
-        }
-    }
-
-    private String getQueueUrl(String topic) {
-        return queueUrlMap.computeIfAbsent(topic, k -> {
-            admin.createTopicIfNotExists(topic);
-            return sqsClient.getQueueUrl(topic.replaceAll("\\.", "_") + ".fifo").getQueueUrl();
-        });
-    }
-}
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
deleted file mode 100644
index 2c1b8793eb..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsQueueAttributes.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.queue.sqs;
-
-import com.amazonaws.services.sqs.model.QueueAttributeName;
-import jakarta.annotation.PostConstruct;
-import lombok.Getter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.StringUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Component
-@ConditionalOnExpression("'${queue.type:null}'=='aws-sqs'")
-public class TbAwsSqsQueueAttributes {
-    @Value("${queue.aws-sqs.queue-properties.core:}")
-    private String coreProperties;
-    @Value("${queue.aws-sqs.queue-properties.rule-engine:}")
-    private String ruleEngineProperties;
-    @Value("${queue.aws-sqs.queue-properties.transport-api:}")
-    private String transportApiProperties;
-    @Value("${queue.aws-sqs.queue-properties.notifications:}")
-    private String notificationsProperties;
-    @Value("${queue.aws-sqs.queue-properties.js-executor:}")
-    private String jsExecutorProperties;
-    @Value("${queue.aws-sqs.queue-properties.ota-updates:}")
-    private String otaProperties;
-    @Value("${queue.aws-sqs.queue-properties.version-control:}")
-    private String vcProperties;
-    @Value("${queue.aws-sqs.queue-properties.edge:}")
-    private String edgeProperties;
-
-    @Getter
-    private Map<String, String> coreAttributes;
-    @Getter
-    private Map<String, String> ruleEngineAttributes;
-    @Getter
-    private Map<String, String> transportApiAttributes;
-    @Getter
-    private Map<String, String> notificationsAttributes;
-    @Getter
-    private Map<String, String> jsExecutorAttributes;
-    @Getter
-    private Map<String, String> otaAttributes;
-    @Getter
-    private Map<String, String> vcAttributes;
-    @Getter
-    private Map<String, String> edgeAttributes;
-
-    private final Map<String, String> defaultAttributes = new HashMap<>();
-
-    @PostConstruct
-    private void init() {
-        defaultAttributes.put(QueueAttributeName.FifoQueue.toString(), "true");
-
-        coreAttributes = getConfigs(coreProperties);
-        ruleEngineAttributes = getConfigs(ruleEngineProperties);
-        transportApiAttributes = getConfigs(transportApiProperties);
-        notificationsAttributes = getConfigs(notificationsProperties);
-        jsExecutorAttributes = getConfigs(jsExecutorProperties);
-        otaAttributes = getConfigs(otaProperties);
-        vcAttributes = getConfigs(vcProperties);
-        edgeAttributes = getConfigs(edgeProperties);
-    }
-
-    private Map<String, String> getConfigs(String properties) {
-        Map<String, String> configs = new HashMap<>(defaultAttributes);
-       configs.putAll(toConfigs(properties));
-        return configs;
-    }
-
-    public static Map<String, String> toConfigs(String properties) {
-        Map<String, String> configs = new HashMap<>();
-        if (StringUtils.isNotEmpty(properties)) {
-            for (String property : properties.split(";")) {
-                int delimiterPosition = property.indexOf(":");
-                String key = property.substring(0, delimiterPosition);
-                String value = property.substring(delimiterPosition + 1);
-                validateAttributeName(key);
-                configs.put(key, value);
-            }
-        }
-        return configs;
-    }
-
-    private static void validateAttributeName(String key) {
-        QueueAttributeName.fromValue(key);
-    }
-}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsSettings.java b/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsSettings.java
deleted file mode 100644
index 122d5f0780..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsSettings.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.queue.sqs;
-
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@ConditionalOnExpression("'${queue.type:null}'=='aws-sqs'")
-@Component
-@Data
-public class TbAwsSqsSettings {
-
-    @Value("${queue.aws_sqs.use_default_credential_provider_chain}")
-    private Boolean useDefaultCredentialProviderChain;
-
-    @Value("${queue.aws_sqs.access_key_id}")
-    private String accessKeyId;
-
-    @Value("${queue.aws_sqs.secret_access_key}")
-    private String secretAccessKey;
-
-    @Value("${queue.aws_sqs.region}")
-    private String region;
-
-    @Value("${queue.aws_sqs.threads_per_topic}")
-    private int threadsPerTopic;
-
-    @Value("${queue.aws_sqs.producer_thread_pool_size:50}")
-    private int threadPoolSize;
-
-}
diff --git a/common/queue/src/test/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqConsumerTemplateTest.java b/common/queue/src/test/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqConsumerTemplateTest.java
deleted file mode 100644
index 2d6a50cea4..0000000000
--- a/common/queue/src/test/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqConsumerTemplateTest.java
+++ /dev/null
@@ -1,128 +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.rabbitmq;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
-import com.rabbitmq.client.GetResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Set;
-import java.util.UUID;
-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.thingsboard.server.common.msg.queue.TopicPartitionInfo;
-import org.thingsboard.server.queue.TbQueueAdmin;
-import org.thingsboard.server.queue.TbQueueMsgDecoder;
-import org.thingsboard.server.queue.common.DefaultTbQueueMsg;
-
-@ExtendWith(MockitoExtension.class)
-class TbRabbitMqConsumerTemplateTest {
-
-  private static final String TOPIC = "some-topic";
-
-  @Mock
-  private TbQueueAdmin admin;
-
-  @Mock
-  private ConnectionFactory connectionFactory;
-
-  @Mock
-  private TbQueueMsgDecoder<DefaultTbQueueMsg> decoder;
-
-  @Mock
-  private Connection connection;
-
-  @Mock
-  private Channel channel;
-
-  @Mock
-  private TopicPartitionInfo partition;
-
-  @Mock
-  private GetResponse getResponse;
-
-  private TbRabbitMqConsumerTemplate<DefaultTbQueueMsg> consumer;
-
-  private void setUpConsumerWithMaxPollMessages(int maxPollMessages) throws Exception {
-    when(connectionFactory.newConnection()).thenReturn(connection);
-    when(connection.createChannel()).thenReturn(channel);
-    TbRabbitMqSettings settings = new TbRabbitMqSettings();
-    settings.setMaxPollMessages(maxPollMessages);
-    settings.setConnectionFactory(connectionFactory);
-
-    consumer = new TbRabbitMqConsumerTemplate<>(admin, settings, TOPIC, decoder);
-    when(partition.getFullTopicName()).thenReturn(TOPIC);
-    consumer.subscribe(Set.of(partition));
-  }
-
-  @Test
-  void pollWithMax5PollMessagesReturnsEmptyListIfNoMessages() throws Exception {
-    setUpConsumerWithMaxPollMessages(5);
-    when(channel.basicGet(anyString(), anyBoolean())).thenReturn(null);
-
-    assertThat(consumer.poll(0L)).isEmpty();
-
-    verify(channel).basicGet(anyString(), anyBoolean());
-  }
-
-  @Test
-  void pollWithMax5PollMessagesReturns5MessagesIfQueueContains5() throws Exception {
-    setUpConsumerWithMaxPollMessages(5);
-    when(getResponse.getBody()).thenReturn(newMessageBody());
-    when(channel.basicGet(anyString(), anyBoolean())).thenReturn(getResponse);
-
-    assertThat(consumer.poll(0L)).hasSize(5);
-
-    verify(channel, times(5)).basicGet(anyString(), anyBoolean());
-  }
-
-  @Test
-  void pollWithMax1PollMessageReturns1MessageIfQueueContainsMore() throws Exception {
-    setUpConsumerWithMaxPollMessages(1);
-    when(getResponse.getBody()).thenReturn(newMessageBody());
-    when(channel.basicGet(anyString(), anyBoolean())).thenReturn(getResponse);
-
-    assertThat(consumer.poll(0L)).hasSize(1);
-
-    verify(channel).basicGet(anyString(), anyBoolean());
-  }
-
-  @Test
-  void pollWithMax3PollMessagesReturns2MessagesIfQueueContains2() throws Exception {
-    setUpConsumerWithMaxPollMessages(3);
-    when(getResponse.getBody()).thenReturn(newMessageBody());
-    when(channel.basicGet(anyString(), anyBoolean())).thenReturn(getResponse, getResponse, null);
-
-    assertThat(consumer.poll(0L)).hasSize(2);
-
-    verify(channel, times(3)).basicGet(anyString(), anyBoolean());
-  }
-
-  private byte[] newMessageBody() {
-    return ("{\"key\": \"" + UUID.randomUUID() + "\"}").getBytes(StandardCharsets.UTF_8);
-  }
-
-}
\ No newline at end of file
diff --git a/common/script/pom.xml b/common/script/pom.xml
index 1aad1dd39e..8c4ea360cf 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.9.0-RC</version>
+        <version>4.0.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 38a14cd8f3..2b780bf489 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>script</artifactId>
     </parent>
     <groupId>org.thingsboard.common.script</groupId>
diff --git a/common/script/script-api/pom.xml b/common/script/script-api/pom.xml
index 4210f1f528..ed93701513 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>script</artifactId>
     </parent>
     <groupId>org.thingsboard.common.script</groupId>
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 6b321a3570..fae91d14ca 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
@@ -257,6 +257,8 @@ public class TbUtils {
                 float.class, int.class)));
         parserConfig.addImport("hexToBytes", new MethodStub(TbUtils.class.getMethod("hexToBytes",
                 ExecutionContext.class, String.class)));
+        parserConfig.addImport("hexToBytesArray", new MethodStub(TbUtils.class.getMethod("hexToBytesArray",
+                String.class)));
         parserConfig.addImport("intToHex", new MethodStub(TbUtils.class.getMethod("intToHex",
                 Integer.class)));
         parserConfig.addImport("intToHex", new MethodStub(TbUtils.class.getMethod("intToHex",
@@ -297,6 +299,8 @@ public class TbUtils {
                 String.class)));
         parserConfig.addImport("base64ToBytes", new MethodStub(TbUtils.class.getMethod("base64ToBytes",
                 String.class)));
+        parserConfig.addImport("base64ToBytesList", new MethodStub(TbUtils.class.getMethod("base64ToBytesList",
+                ExecutionContext.class, String.class)));
         parserConfig.addImport("bytesToBase64", new MethodStub(TbUtils.class.getMethod("bytesToBase64",
                 byte[].class)));
         parserConfig.addImport("bytesToHex", new MethodStub(TbUtils.class.getMethod("bytesToHex",
@@ -335,7 +339,7 @@ public class TbUtils {
                 byte.class)));
         parserConfig.addImport("parseByteToBinaryArray", new MethodStub(TbUtils.class.getMethod("parseByteToBinaryArray",
                 byte.class, int.class)));
-         parserConfig.addImport("parseByteToBinaryArray", new MethodStub(TbUtils.class.getMethod("parseByteToBinaryArray",
+        parserConfig.addImport("parseByteToBinaryArray", new MethodStub(TbUtils.class.getMethod("parseByteToBinaryArray",
                 byte.class, int.class, boolean.class)));
         parserConfig.addImport("parseBytesToBinaryArray", new MethodStub(TbUtils.class.getMethod("parseBytesToBinaryArray",
                 List.class)));
@@ -664,23 +668,16 @@ public class TbUtils {
     }
 
     public static ExecutionArrayList<Byte> hexToBytes(ExecutionContext ctx, String value) {
-        String hex = prepareNumberString(value, true);
-        if (hex == null) {
-            throw new IllegalArgumentException("Hex string must be not empty!");
-        }
-        int len = hex.length();
-        if (len % 2 > 0) {
-            throw new IllegalArgumentException("Hex string must be even-length.");
-        }
-        int radix = isHexadecimal(value);
-        if (radix != HEX_RADIX) {
-            throw new NumberFormatException("Value: \"" + value + "\" is not numeric or hexDecimal format!");
-        }
-
-        byte [] data = hexToBytes(hex);
+        String hex = validateAndPrepareHex(value);
+        byte[] data = hexToBytes(hex);
         return bytesToExecutionArrayList(ctx, data);
     }
 
+    public static byte[] hexToBytesArray(String value) {
+        String hex = validateAndPrepareHex(value);
+        return hexToBytes(hex);
+    }
+
     public static List<Integer> printUnsignedBytes(ExecutionContext ctx, List<Byte> byteArray) {
         ExecutionArrayList<Integer> data = new ExecutionArrayList<>(ctx);
         for (Byte b : byteArray) {
@@ -839,6 +836,11 @@ public class TbUtils {
         return Base64.getDecoder().decode(input);
     }
 
+    public static ExecutionArrayList<Byte> base64ToBytesList(ExecutionContext ctx, String input) {
+        byte[] bytes = Base64.getDecoder().decode(input);
+        return bytesToExecutionArrayList(ctx, bytes);
+    }
+
     public static int parseBytesToInt(List<Byte> data) {
         return parseBytesToInt(data, 0);
     }
@@ -879,6 +881,48 @@ public class TbUtils {
         return bb.getInt();
     }
 
+    public static long parseBytesToUnsignedInt(byte[] data) {
+        return parseBytesToUnsignedInt(data, 0);
+    }
+
+    public static long parseBytesToUnsignedInt(byte[] data, int offset) {
+        return parseBytesToUnsignedInt(data, offset, validateLength(data.length, offset, BYTES_LEN_INT_MAX));
+    }
+
+    public static long parseBytesToUnsignedInt(byte[] data, int offset, int length) {
+        return parseBytesToUnsignedInt(data, offset, length, true);
+    }
+
+    public static long parseBytesToUnsignedInt(byte[] data, int offset, int length, boolean bigEndian) {
+        validationNumberByLength(data, offset, length, BYTES_LEN_INT_MAX);
+
+        ByteBuffer bb = ByteBuffer.allocate(8);
+        if (!bigEndian) {
+            bb.order(ByteOrder.LITTLE_ENDIAN);
+        }
+        bb.position(bigEndian ? 8 - length : 0);
+        bb.put(data, offset, length);
+        bb.position(0);
+
+        return bb.getLong();
+    }
+
+    public static long parseBytesToUnsignedInt(List<Byte> data) {
+        return parseBytesToUnsignedInt(data, 0);
+    }
+
+    public static long parseBytesToUnsignedInt(List<Byte> data, int offset) {
+        return parseBytesToUnsignedInt(data, offset, validateLength(data.size(), offset, BYTES_LEN_INT_MAX));
+    }
+
+    public static long parseBytesToUnsignedInt(List<Byte> data, int offset, int length) {
+        return parseBytesToUnsignedInt(data, offset, length, true);
+    }
+
+    public static long parseBytesToUnsignedInt(List<Byte> data, int offset, int length, boolean bigEndian) {
+        return parseBytesToUnsignedInt(Bytes.toArray(data), offset, length, bigEndian);
+    }
+
     public static long parseBytesToLong(List<Byte> data) {
         return parseBytesToLong(data, 0);
     }
@@ -1304,7 +1348,7 @@ public class TbUtils {
     public static byte[] parseByteToBinaryArray(byte byteValue, int binLength, boolean bigEndian) {
         byte[] bins = new byte[binLength];
         for (int i = 0; i < binLength; i++) {
-            if(bigEndian) {
+            if (bigEndian) {
                 bins[binLength - 1 - i] = (byte) ((byteValue >> i) & 1);
             } else {
                 bins[i] = (byte) ((byteValue >> i) & 1);
@@ -1435,16 +1479,32 @@ public class TbUtils {
     }
 
     private static byte[] hexToBytes(String hex) {
-        byte [] data = new byte[hex.length()/2];
+        byte[] data = new byte[hex.length() / 2];
         for (int i = 0; i < hex.length(); i += 2) {
             // Extract two characters from the hex string
             String byteString = hex.substring(i, i + 2);
             // Parse the hex string to a byte
             byte byteValue = (byte) Integer.parseInt(byteString, HEX_RADIX);
             // Add the byte to the ArrayList
-            data[i/2] = byteValue;
+            data[i / 2] = byteValue;
         }
         return data;
     }
+
+    private static String validateAndPrepareHex(String value) {
+        String hex = prepareNumberString(value, true);
+        if (hex == null) {
+            throw new IllegalArgumentException("Hex string must be not empty!");
+        }
+        int len = hex.length();
+        if (len % 2 > 0) {
+            throw new IllegalArgumentException("Hex string must be even-length.");
+        }
+        int radix = isHexadecimal(value);
+        if (radix != HEX_RADIX) {
+            throw new NumberFormatException("Value: \"" + value + "\" is not numeric or hexDecimal format!");
+        }
+        return hex;
+    }
 }
 
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 1c5a1a2e1a..21ee8538a0 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
@@ -19,7 +19,6 @@ import com.google.common.collect.Lists;
 import com.google.common.primitives.Bytes;
 import com.google.common.primitives.Ints;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -36,6 +35,7 @@ import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
@@ -787,8 +787,12 @@ public class TbUtilsTest {
     public void hexToBytes_Test() {
         String input = "0x01752B0367FA000500010488FFFFFFFFFFFFFFFF33";
         byte[] expected = {1, 117, 43, 3, 103, -6, 0, 5, 0, 1, 4, -120, -1, -1, -1, -1, -1, -1, -1, -1, 51};
-        List<Byte> actual = TbUtils.hexToBytes(ctx, input);
-        Assertions.assertEquals(toList(expected), actual);
+        List<Byte> actualList = TbUtils.hexToBytes(ctx, input);
+        Assertions.assertEquals(toList(expected), actualList);
+        String validInput = "AABBCCDDEE";
+        expected = new byte[]{(byte) 0xAA, (byte) 0xBB, (byte) 0xCC, (byte) 0xDD, (byte) 0xEE};
+        byte[] actualBytes = TbUtils.hexToBytesArray(validInput);
+        Assertions.assertArrayEquals(expected, actualBytes);
         try {
             input = "0x01752B0367FA000500010488FFFFFFFFFFFFFFFF3";
             TbUtils.hexToBytes(ctx, input);
@@ -807,6 +811,12 @@ public class TbUtilsTest {
         } catch (IllegalArgumentException e) {
             Assertions.assertTrue(e.getMessage().contains("Hex string must be not empty"));
         }
+        try {
+            input = null;
+            TbUtils.hexToBytes(ctx, input);
+        } catch (IllegalArgumentException e) {
+            Assertions.assertTrue(e.getMessage().contains("Hex string must be not empty"));
+        }
     }
 
     @Test
@@ -1086,6 +1096,26 @@ public class TbUtilsTest {
         String actual = TbUtils.hexToBase64(hex);
         Assertions.assertEquals(expected, actual);
     }
+
+    @Test
+    void base64ToBytesList_Test() {
+        String validInput = Base64.getEncoder().encodeToString(new byte[]{1, 2, 3, 4, 5});
+        ExecutionArrayList<Byte> actual = TbUtils.base64ToBytesList(ctx, validInput);
+        ExecutionArrayList<Byte> expected = new ExecutionArrayList<>(ctx);
+        expected.addAll(List.of((byte) 1, (byte)2, (byte)3, (byte)4, (byte)5));
+        Assertions.assertEquals(expected, actual);
+
+        String emptyInput = Base64.getEncoder().encodeToString(new byte[]{});
+        actual = TbUtils.base64ToBytesList(ctx, emptyInput);
+        Assertions.assertTrue(actual.isEmpty());
+        String invalidInput = "NotAValidBase64String";
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            TbUtils.base64ToBytesList(ctx, invalidInput);
+        });
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            TbUtils.base64ToBytesList(ctx, null);
+        });
+    }
     @Test
     public void bytesToHex_Test() {
         byte[] bb = {(byte) 0xBB, (byte) 0xAA};
diff --git a/common/stats/pom.xml b/common/stats/pom.xml
index 231811144a..7cc67d5821 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/transport/coap/pom.xml b/common/transport/coap/pom.xml
index 0bd4c0d6e3..86459e9821 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
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 67ae1b9ae7..f151283d37 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
@@ -24,7 +24,10 @@ import org.eclipse.californium.core.observe.ObserveRelation;
 import org.eclipse.californium.core.server.resources.CoapExchange;
 import org.eclipse.californium.core.server.resources.Resource;
 import org.eclipse.californium.core.server.resources.ResourceObserver;
+import org.eclipse.californium.elements.EndpointContext;
+import org.eclipse.californium.elements.auth.X509CertPath;
 import org.thingsboard.server.coapserver.CoapServerService;
+import org.thingsboard.server.coapserver.TbCoapDtlsSessionKey;
 import org.thingsboard.server.coapserver.TbCoapDtlsSessionInfo;
 import org.thingsboard.server.common.adaptor.AdaptorException;
 import org.thingsboard.server.common.adaptor.JsonConverter;
@@ -47,12 +50,14 @@ import org.thingsboard.server.transport.coap.client.CoapClientContext;
 import org.thingsboard.server.transport.coap.client.TbCoapClientState;
 
 import java.net.InetSocketAddress;
+import java.util.Base64;
 import java.util.List;
 import java.util.Optional;
 import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
+import java.security.cert.X509Certificate;
 
 import static org.eclipse.californium.elements.DtlsEndpointContext.KEY_SESSION_ID;
 
@@ -65,7 +70,7 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
     private static final int FEATURE_TYPE_POSITION_CERTIFICATE_REQUEST = 3;
     private static final int REQUEST_ID_POSITION_CERTIFICATE_REQUEST = 4;
 
-    private final ConcurrentMap<InetSocketAddress, TbCoapDtlsSessionInfo> dtlsSessionsMap;
+    private final ConcurrentMap<TbCoapDtlsSessionKey, TbCoapDtlsSessionInfo> dtlsSessionsMap;
     private final long timeout;
     private final long piggybackTimeout;
     private final CoapClientContext clients;
@@ -177,11 +182,7 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
 
         var dtlsSessionId = request.getSourceContext().get(KEY_SESSION_ID);
         if (dtlsSessionsMap != null && dtlsSessionId != null && !dtlsSessionId.isEmpty()) {
-            TbCoapDtlsSessionInfo tbCoapDtlsSessionInfo = dtlsSessionsMap
-                    .computeIfPresent(request.getSourceContext().getPeerAddress(), (dtlsSessionIdStr, dtlsSessionInfo) -> {
-                        dtlsSessionInfo.setLastActivityTime(System.currentTimeMillis());
-                        return dtlsSessionInfo;
-                    });
+            TbCoapDtlsSessionInfo tbCoapDtlsSessionInfo = this.getCoapDtlsSessionInfo(request.getSourceContext());
             if (tbCoapDtlsSessionInfo != null) {
                 processRequest(exchange, type, request, tbCoapDtlsSessionInfo.getMsg(), tbCoapDtlsSessionInfo.getDeviceProfile());
             } else {
@@ -251,7 +252,7 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         TransportProtos.SessionInfoProto sessionInfo = clients.getNewSyncSession(clientState);
         UUID sessionId = toSessionId(sessionInfo);
         transportService.process(sessionInfo, clientState.getAdaptor().convertToPostAttributes(sessionId, request,
-                clientState.getConfiguration().getAttributesMsgDescriptor()),
+                        clientState.getConfiguration().getAttributesMsgDescriptor()),
                 new CoapResponseCodeCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
     }
 
@@ -259,7 +260,7 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         TransportProtos.SessionInfoProto sessionInfo = clients.getNewSyncSession(clientState);
         UUID sessionId = toSessionId(sessionInfo);
         transportService.process(sessionInfo, clientState.getAdaptor().convertToPostTelemetry(sessionId, request,
-                clientState.getConfiguration().getTelemetryMsgDescriptor()),
+                        clientState.getConfiguration().getTelemetryMsgDescriptor()),
                 new CoapResponseCodeCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
     }
 
@@ -458,5 +459,32 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         }
     }
 
+    private TbCoapDtlsSessionInfo getCoapDtlsSessionInfo(EndpointContext endpointContext) {
+        InetSocketAddress peerAddress = endpointContext.getPeerAddress();
+        String certPemStr = getCertPem(endpointContext);
+        TbCoapDtlsSessionKey tbCoapDtlsSessionKey = StringUtils.isNotBlank(certPemStr) ? new TbCoapDtlsSessionKey(peerAddress, certPemStr) : null;
+        TbCoapDtlsSessionInfo tbCoapDtlsSessionInfo;
+        if (tbCoapDtlsSessionKey != null) {
+            tbCoapDtlsSessionInfo = dtlsSessionsMap
+                    .computeIfPresent(tbCoapDtlsSessionKey, (dtlsSessionIdStr, dtlsSessionInfo) -> {
+                        dtlsSessionInfo.setLastActivityTime(System.currentTimeMillis());
+                        return dtlsSessionInfo;
+                    });
+        } else {
+            tbCoapDtlsSessionInfo = null;
+        }
+        return tbCoapDtlsSessionInfo;
+    }
 
+    private String getCertPem(EndpointContext endpointContext) {
+        try {
+            X509CertPath certPath = (X509CertPath) endpointContext.getPeerIdentity();
+            X509Certificate x509Certificate = (X509Certificate) certPath.getPath().getCertificates().get(0);
+            return Base64.getEncoder().encodeToString(x509Certificate.getEncoded());
+        } catch (Exception e) {
+            log.error("Failed to get cert PEM: [{}]", endpointContext.getPeerAddress(), e);
+            return null;
+        }
+    }
 }
+
diff --git a/common/transport/http/pom.xml b/common/transport/http/pom.xml
index 5a0dd9e4ff..8ab2243ceb 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
diff --git a/common/transport/lwm2m/pom.xml b/common/transport/lwm2m/pom.xml
index ddb9d7a399..a6e7209f21 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
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 713d5b9fa8..3146eba95b 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
@@ -24,6 +24,9 @@ import org.eclipse.leshan.core.LwM2m;
 import org.eclipse.leshan.core.LwM2m.Version;
 import org.eclipse.leshan.core.link.Link;
 import org.eclipse.leshan.core.link.attributes.Attribute;
+import org.eclipse.leshan.core.link.lwm2m.MixedLwM2mLink;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttribute;
+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;
@@ -453,22 +456,33 @@ public class LwM2mClient {
     }
 
     private void setSupportedClientObjects(){
-        this.supportedClientObjects = new ConcurrentHashMap<>();
-        for (Link link: this.registration.getSortedObjectLinks()) {
-            LwM2mPath lwM2mPath = new LwM2mPath(link.getUriReference());
-            if (lwM2mPath.isObject()) {
-                LwM2m.Version ver;
-                if (link.getAttributes().get("ver")!= null) {
-                    ver = new LwM2m.Version(link.getAttributes().get("ver").getValue().toString());
-                } else {
-                    ver = getDefaultObjectIDVer();
+        if (this.registration.getSupportedObject() != null && this.registration.getSupportedObject().size() > 0) {
+            this.supportedClientObjects = this.registration.getSupportedObject();
+        } else {
+            this.supportedClientObjects = new ConcurrentHashMap<>();
+            for (Link link :  this.registration.getSortedObjectLinks()) {
+                if (link instanceof MixedLwM2mLink) {
+                    LwM2mPath path = ((MixedLwM2mLink) link).getPath();
+                    // add supported objects
+                    if (path.isObject() || path.isObjectInstance()) {
+                        int objectId = path.getObjectId();
+                        LwM2mAttribute<Version> versionParamValue = link.getAttributes().get(LwM2mAttributes.OBJECT_VERSION);
+                        if (versionParamValue != null) {
+                            // if there is a version attribute then use it as version for this object
+                            this.supportedClientObjects.put(objectId, versionParamValue.getValue());
+                        } else {
+                            // there is no version attribute attached.
+                            // In this case we use the DEFAULT_VERSION only if this object stored as supported object.
+                            Version currentVersion = this.supportedClientObjects.get(objectId);
+                            if (currentVersion == null) {
+                                this.supportedClientObjects.put(objectId, getDefaultObjectIDVer());
+                            }
+                        }
+                    }
                 }
-                this.supportedClientObjects.put(lwM2mPath.getObjectId(), ver);
-            } else if (lwM2mPath.getObjectId() != null && this.supportedClientObjects.get(lwM2mPath.getObjectId()) == null){
-                this.supportedClientObjects.put(lwM2mPath.getObjectId(), getDefaultObjectIDVer());
             }
         }
     }
-
 }
 
+
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 a79ed43784..d415b8c22a 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
@@ -279,6 +279,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
             clientContext.unregister(client, registration);
             SessionInfoProto sessionInfo = client.getSession();
             if (sessionInfo != null) {
+                securityStore.remove(client.getEndpoint(), client.getRegistration().getId());
                 sessionManager.deregister(sessionInfo);
                 sessionStore.remove(registration.getEndpoint());
                 log.info("Client close session: [{}] unReg [{}] name  [{}] profile ", registration.getId(), registration.getEndpoint(), sessionInfo.getDeviceType());
@@ -401,7 +402,6 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
                     .stream().filter(e -> e.getProfileId() != null)
                     .filter(e -> e.getProfileId().equals(deviceProfile.getUuidId())).collect(Collectors.toList());
             clients.forEach(client -> {
-                this.securityStore.remove(client.getEndpoint(), client.getRegistration().getId());
                 client.onDeviceProfileUpdate(deviceProfile);
             });
             if (clients.size() > 0) {
diff --git a/common/transport/mqtt/pom.xml b/common/transport/mqtt/pom.xml
index 45d228f225..d074afc6b5 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
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 33448b58ec..e6efcf8206 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
@@ -94,6 +94,7 @@ import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugTopic;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -109,7 +110,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.amazonaws.util.StringUtils.UTF8;
 import static io.netty.handler.codec.mqtt.MqttMessageType.CONNECT;
 import static io.netty.handler.codec.mqtt.MqttMessageType.PINGRESP;
 import static io.netty.handler.codec.mqtt.MqttMessageType.SUBACK;
@@ -606,7 +606,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     }
 
     private void getOtaPackageCallback(ChannelHandlerContext ctx, MqttPublishMessage mqttMsg, int msgId, Matcher fwMatcher, OtaPackageType type) {
-        String payload = mqttMsg.content().toString(UTF8);
+        String payload = mqttMsg.content().toString(StandardCharsets.UTF_8);
         int chunkSize = StringUtils.isNotEmpty(payload) ? Integer.parseInt(payload) : 0;
         String requestId = fwMatcher.group("requestId");
         int chunk = Integer.parseInt(fwMatcher.group("chunk"));
diff --git a/common/transport/pom.xml b/common/transport/pom.xml
index 6c4310151d..fdd3ad21d5 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.9.0-RC</version>
+        <version>4.0.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 a2b9dd7c84..5d4d37547f 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
 
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 04f113b918..66c14ca8ee 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
@@ -67,6 +67,7 @@ import org.thingsboard.server.transport.snmp.session.DeviceSessionContext;
 import org.thingsboard.server.transport.snmp.session.ScheduledTask;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -97,8 +98,10 @@ public class SnmpTransportService implements TbTransportService, CommandResponde
     private final Map<SnmpCommunicationSpec, ResponseDataMapper> responseDataMappers = new EnumMap<>(SnmpCommunicationSpec.class);
     private final Map<SnmpCommunicationSpec, ResponseProcessor> responseProcessors = new EnumMap<>(SnmpCommunicationSpec.class);
 
-    @Value("${transport.snmp.bind_port:1620}")
+    @Value("${transport.snmp.bind_port:0}")
     private Integer snmpBindPort;
+    @Value("${transport.snmp.bind_address:0.0.0.0}")
+    private String snmpBindAddress;
     @Value("${transport.snmp.response_processing.parallelism_level:4}")
     private int responseProcessingThreadPoolSize;
     @Value("${transport.snmp.scheduler_thread_pool_size:4}")
@@ -134,10 +137,10 @@ public class SnmpTransportService implements TbTransportService, CommandResponde
         TransportMapping<?> transportMapping;
         switch (snmpUnderlyingProtocol) {
             case "udp":
-                transportMapping = new DefaultUdpTransportMapping(new UdpAddress(snmpBindPort));
+                transportMapping = new DefaultUdpTransportMapping(new UdpAddress(InetAddress.getByName(snmpBindAddress), snmpBindPort));
                 break;
             case "tcp":
-                transportMapping = new DefaultTcpTransportMapping(new TcpAddress(snmpBindPort));
+                transportMapping = new DefaultTcpTransportMapping(new TcpAddress(InetAddress.getByName(snmpBindAddress), snmpBindPort));
                 break;
             default:
                 throw new IllegalArgumentException("Underlying protocol " + snmpUnderlyingProtocol + " for SNMP is not supported");
diff --git a/common/transport/transport-api/pom.xml b/common/transport/transport-api/pom.xml
index 8f01cab08b..e2f03b060a 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
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 be29592635..547eab6172 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
@@ -45,7 +45,6 @@ import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.device.data.PowerMode;
-import org.thingsboard.server.common.data.exception.TenantNotFoundException;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -1141,7 +1140,15 @@ public class DefaultTransportService extends TransportActivityManager implements
             queueName = deviceProfile.getDefaultQueueName();
         }
 
-        TbMsg tbMsg = TbMsg.newMsg(queueName, tbMsgType, deviceId, customerId, metaData, gson.toJson(json), ruleChainId, null);
+        TbMsg tbMsg = TbMsg.newMsg()
+                .queueName(queueName)
+                .type(tbMsgType)
+                .originator(deviceId)
+                .customerId(customerId)
+                .copyMetaData(metaData)
+                .data(gson.toJson(json))
+                .ruleChainId(ruleChainId)
+                .build();
         ruleEngineProducerService.sendToRuleEngine(ruleEngineMsgProducer, tenantId, tbMsg, new StatsCallback(callback, ruleEngineProducerStats));
         ruleEngineProducerStats.incrementTotal();
     }
diff --git a/common/util/pom.xml b/common/util/pom.xml
index 194724b70f..dc75047267 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/version-control/pom.xml b/common/version-control/pom.xml
index 8e3fceff99..ea568dfcd9 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
index 4841f05471..365fe23079 100644
--- a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
+++ b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
@@ -450,7 +450,7 @@ public class GitRepository {
         }
         ObjectId result = git.getRepository().resolve(rev);
         if (result == null) {
-            throw new IllegalArgumentException("Failed to parse git revision string: \"" + rev + "\"");
+            throw new IllegalArgumentException("Failed to resolve '" + rev + "'");
         }
         return result;
     }
diff --git a/dao/pom.xml b/dao/pom.xml
index c1f5a1f62b..5021742154 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>dao</artifactId>
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 88d6757de3..0694178540 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
@@ -101,14 +101,6 @@ public class BaseAttributesService implements AttributesService {
         return attributesDao.save(tenantId, entityId, scope, attribute);
     }
 
-    @Override
-    public ListenableFuture<List<Long>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes) {
-        validate(entityId, scope);
-        AttributeUtils.validate(attributes, valueNoXssValidation);
-        List<ListenableFuture<Long>> saveFutures = attributes.stream().map(attribute -> attributesDao.save(tenantId, entityId, AttributeScope.valueOf(scope), attribute)).collect(Collectors.toList());
-        return Futures.allAsList(saveFutures);
-    }
-
     @Override
     public ListenableFuture<List<Long>> save(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes) {
         validate(entityId, scope);
@@ -117,12 +109,6 @@ public class BaseAttributesService implements AttributesService {
         return Futures.allAsList(saveFutures);
     }
 
-    @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);
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 3de90355ed..1ebd5c0ba4 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
@@ -222,11 +222,6 @@ public class CachedAttributesService implements AttributesService {
         return doSave(tenantId, entityId, scope, attribute);
     }
 
-    @Override
-    public ListenableFuture<List<Long>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes) {
-        return save(tenantId, entityId, AttributeScope.valueOf(scope), attributes);
-    }
-
     @Override
     public ListenableFuture<List<Long>> save(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes) {
         validate(entityId, scope);
@@ -255,11 +250,6 @@ public class CachedAttributesService implements AttributesService {
         log.trace("[{}][{}][{}] after cache put.", entityId, scope, key);
     }
 
-    @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);
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 d404c3128c..9628935b55 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
@@ -312,6 +312,7 @@ public class ModelConstants {
     public static final String WIDGETS_BUNDLE_SCADA_PROPERTY = "scada";
     public static final String WIDGETS_BUNDLE_DESCRIPTION = "description";
     public static final String WIDGETS_BUNDLE_ORDER = "widgets_bundle_order";
+    public static final String WIDGET_BUNDLES_PROPERTY = "bundles";
 
     /**
      * Widget_type constants.
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 7a9e7f35bc..d718e5613d 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
@@ -15,17 +15,22 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+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.Immutable;
 import org.hibernate.annotations.Type;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.widget.BaseWidgetType;
 import org.thingsboard.server.common.data.widget.WidgetTypeInfo;
 import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -58,6 +63,10 @@ public class WidgetTypeInfoEntity extends AbstractWidgetTypeEntity<WidgetTypeInf
     @Column(name = ModelConstants.WIDGET_TYPE_WIDGET_TYPE_PROPERTY)
     private String widgetType;
 
+    @Convert(converter = JsonConverter.class)
+    @Column(name = ModelConstants.WIDGET_BUNDLES_PROPERTY)
+    private JsonNode bundles;
+
     public WidgetTypeInfoEntity() {
         super();
     }
@@ -70,6 +79,7 @@ public class WidgetTypeInfoEntity extends AbstractWidgetTypeEntity<WidgetTypeInf
         widgetTypeInfo.setDescription(description);
         widgetTypeInfo.setTags(tags);
         widgetTypeInfo.setWidgetType(widgetType);
+        widgetTypeInfo.setBundles(JacksonUtil.convertValue(bundles, new TypeReference<>() {}));
         return widgetTypeInfo;
     }
 
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 16088e83c9..1a4c3ffab2 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
@@ -372,25 +372,6 @@ public class DefaultNotifications {
                     .build())
             .build();
 
-    public static final DefaultNotification queueTypeDeprecation = DefaultNotification.builder()
-            .name("Queue type deprecation")
-            .type(NotificationType.GENERAL)
-            .subject("WARNING: ${queueType} deprecation")
-            .text("Starting with ThingsBoard 4.0, ${queueType} will no longer be supported as a message queue for microservices. " +
-                    "Please migrate to Apache Kafka. This change will not impact any rule nodes.")
-            .icon("warning").color(RED_COLOR)
-            .build();
-
-    public static final DefaultNotification databaseTypeDeprecation = DefaultNotification.builder()
-            .name("Database type deprecation")
-            .type(NotificationType.GENERAL)
-            .subject("WARNING: ${databaseType} deprecation")
-            .text("Starting with ThingsBoard 4.0, ${databaseType} will no longer be supported as a storage provider. " +
-                    "Please migrate to Cassandra or PostgreSQL.")
-            .icon("warning")
-            .color(RED_COLOR)
-            .build();
-
     private final NotificationTemplateService templateService;
     private final NotificationRuleService ruleService;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java
index 6220d9b717..4a656c3374 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java
@@ -84,6 +84,11 @@ public class JpaWidgetTypeDao extends JpaAbstractDao<WidgetTypeDetailsEntity, Wi
         return widgetTypeRepository.existsByTenantIdAndId(tenantId.getId(), widgetTypeId);
     }
 
+    @Override
+    public WidgetTypeInfo findWidgetTypeInfoById(TenantId tenantId, UUID widgetTypeId) {
+        return DaoUtil.getData(widgetTypeInfoRepository.findById(widgetTypeId));
+    }
+
     @Override
     public PageData<WidgetTypeInfo> findSystemWidgetTypes(WidgetTypeFilter widgetTypeFilter, PageLink pageLink) {
         boolean deprecatedFilterEnabled = !DeprecatedFilter.ALL.equals(widgetTypeFilter.getDeprecatedFilter());
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 f9c4218d64..756b73d88b 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
@@ -254,11 +254,11 @@ public class BaseTimeseriesService implements TimeseriesService {
     }
 
     @Override
-    public ListenableFuture<Collection<String>> removeAllLatest(TenantId tenantId, EntityId entityId) {
+    public ListenableFuture<List<String>> removeAllLatest(TenantId tenantId, EntityId entityId) {
         validate(entityId);
         return Futures.transformAsync(this.findAllLatest(tenantId, entityId), latest -> {
             if (latest != null && !latest.isEmpty()) {
-                Collection<String> keys = latest.stream().map(TsKvEntry::getKey).collect(Collectors.toList());
+                List<String> keys = latest.stream().map(TsKvEntry::getKey).collect(Collectors.toList());
                 return Futures.transform(this.removeLatest(tenantId, entityId, keys), res -> keys, MoreExecutors.directExecutor());
             } else {
                 return Futures.immediateFuture(Collections.emptyList());
diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDao.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDao.java
index d5876bbbd9..e61976b6dd 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDao.java
@@ -56,6 +56,8 @@ public interface WidgetTypeDao extends Dao<WidgetTypeDetails>, ExportableEntityD
 
     boolean existsByTenantIdAndId(TenantId tenantId, UUID widgetTypeId);
 
+    WidgetTypeInfo findWidgetTypeInfoById(TenantId tenantId, UUID widgetTypeId);
+
     PageData<WidgetTypeInfo> findSystemWidgetTypes(WidgetTypeFilter widgetTypeFilter, PageLink pageLink);
 
     PageData<WidgetTypeInfo> findAllTenantWidgetTypesByTenantId(WidgetTypeFilter widgetTypeFilter, PageLink pageLink);
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 a1e241073f..1b0ecb33a4 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
@@ -87,6 +87,13 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
         return widgetTypeDao.findById(tenantId, widgetTypeId.getId());
     }
 
+    @Override
+    public WidgetTypeInfo findWidgetTypeInfoById(TenantId tenantId, WidgetTypeId widgetTypeId) {
+        log.trace("Executing findWidgetTypeInfoById [{}]", widgetTypeId);
+        Validator.validateId(widgetTypeId, id -> "Incorrect widgetTypeId " + id);
+        return widgetTypeDao.findWidgetTypeInfoById(tenantId, widgetTypeId.getId());
+    }
+
     @Override
     public boolean widgetTypeExistsByTenantIdAndWidgetTypeId(TenantId tenantId, WidgetTypeId widgetTypeId) {
         log.trace("Executing widgetTypeExistsByTenantIdAndWidgetTypeId, tenantId [{}],  widgetTypeId [{}]", tenantId, widgetTypeId);
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 31219ced18..b394742bcd 100644
--- a/dao/src/main/resources/sql/schema-views-and-functions.sql
+++ b/dao/src/main/resources/sql/schema-views-and-functions.sql
@@ -288,8 +288,15 @@ $$;
 
 DROP VIEW IF EXISTS widget_type_info_view CASCADE;
 CREATE OR REPLACE VIEW widget_type_info_view AS
-SELECT t.*
-     , COALESCE((t.descriptor::json->>'type')::text, '') as widget_type
+SELECT t.*,
+       COALESCE((t.descriptor::json->>'type')::text, '') as widget_type,
+       array_to_json(ARRAY(
+           SELECT json_build_object('id', wb.widgets_bundle_id, 'name', b.title)
+           FROM widgets_bundle_widget wb
+           JOIN widgets_bundle b ON wb.widgets_bundle_id = b.id
+           WHERE wb.widget_type_id = t.id
+           ORDER BY b.title
+       )) AS bundles
 FROM widget_type t;
 
 CREATE OR REPLACE PROCEDURE cleanup_timeseries_by_ttl(IN null_uuid uuid,
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 8010eab4cd..27376964f5 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
@@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.SortOrder;
 import org.thingsboard.server.common.data.widget.BaseWidgetType;
 import org.thingsboard.server.common.data.widget.DeprecatedFilter;
+import org.thingsboard.server.common.data.widget.WidgetBundleInfo;
 import org.thingsboard.server.common.data.widget.WidgetType;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
 import org.thingsboard.server.common.data.widget.WidgetTypeFilter;
@@ -49,11 +50,10 @@ import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
-/**
- * Created by Valerii Sosliuk on 4/30/2017.
- */
 public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
 
     // given search text should find a widget with tags, when searching by tags
@@ -78,7 +78,7 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
 
     final String BUNDLE_ALIAS = "BUNDLE_ALIAS";
     final int WIDGET_TYPE_COUNT = 3;
-    List<WidgetTypeDetails> widgetTypeList;
+    List<WidgetTypeInfo> widgetTypeList;
     WidgetsBundle widgetsBundle;
 
     @Autowired
@@ -107,7 +107,7 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
         widgetTypeList.sort(Comparator.comparing(BaseWidgetType::getName));
     }
 
-    WidgetTypeDetails createAndSaveWidgetType(TenantId tenantId, int number) {
+    WidgetTypeInfo createAndSaveWidgetType(TenantId tenantId, int number) {
         WidgetTypeDetails widgetType = new WidgetTypeDetails();
         widgetType.setTenantId(tenantId);
         widgetType.setName("WIDGET_TYPE_" + number);
@@ -117,9 +117,12 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
         var descriptor = JacksonUtil.newObjectNode();
         descriptor.put("type", number % 2 == 0 ? "latest" : "static");
         widgetType.setDescriptor(descriptor);
-        String[] tags = new String[]{"Tag1_"+number, "Tag2_"+number, "TEST_"+number};
+        String[] tags = new String[]{"Tag1_" + number, "Tag2_" + number, "TEST_" + number};
         widgetType.setTags(tags);
-        return widgetTypeDao.save(TenantId.SYS_TENANT_ID, widgetType);
+        WidgetTypeDetails saved = widgetTypeDao.save(TenantId.SYS_TENANT_ID, widgetType);
+        List<WidgetBundleInfo> bundles = new ArrayList<>();
+        bundles.add(new WidgetBundleInfo(widgetsBundle.getUuidId(), widgetsBundle.getName()));
+        return new WidgetTypeInfo(saved, bundles);
     }
 
     WidgetTypeDetails createAndSaveWidgetType(TenantId tenantId, int number, String[] tags) {
@@ -139,7 +142,7 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
     @After
     public void tearDown() {
         widgetsBundleDao.removeById(TenantId.SYS_TENANT_ID, widgetsBundle.getUuidId());
-        for (WidgetType widgetType : widgetTypeList) {
+        for (WidgetTypeInfo widgetType : widgetTypeList) {
             widgetTypeDao.removeById(TenantId.SYS_TENANT_ID, widgetType.getUuidId());
         }
     }
@@ -160,7 +163,7 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
                         .widgetTypes(Collections.singletonList("static")).build(),
                 new PageLink(1024, 0, "TYPE_DESCRIPTION", new SortOrder("createdTime")));
         assertEquals(1, widgetTypes.getData().size());
-        assertEquals(new WidgetTypeInfo(widgetTypeList.get(1)), widgetTypes.getData().get(0));
+        assertEquals(widgetTypeList.get(1), widgetTypes.getData().get(0));
 
         widgetTypes = widgetTypeDao.findSystemWidgetTypes(
                 WidgetTypeFilter.builder()
@@ -170,7 +173,7 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
                         .widgetTypes(Collections.emptyList()).build(),
                 new PageLink(1024, 0, "hfgfd tag2_2 ghg", new SortOrder("createdTime")));
         assertEquals(1, widgetTypes.getData().size());
-        assertEquals(new WidgetTypeInfo(widgetTypeList.get(2)), widgetTypes.getData().get(0));
+        assertEquals(widgetTypeList.get(2), widgetTypes.getData().get(0));
     }
 
     @Test
@@ -181,17 +184,17 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
             Thread.sleep(2);
             var widgetType = saveWidgetType(TenantId.SYS_TENANT_ID, "widgetName");
             sameNameList.add(widgetType);
-            widgetTypeList.add(widgetType);
+            widgetTypeList.add(new WidgetTypeInfo(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(
                 WidgetTypeFilter.builder()
-                    .tenantId(TenantId.SYS_TENANT_ID)
-                    .fullSearch(true)
-                    .deprecatedFilter(DeprecatedFilter.ALL)
-                    .widgetTypes(Collections.singletonList("static")).build(),
+                        .tenantId(TenantId.SYS_TENANT_ID)
+                        .fullSearch(true)
+                        .deprecatedFilter(DeprecatedFilter.ALL)
+                        .widgetTypes(Collections.singletonList("static")).build(),
                 new PageLink(10, 0, null, new SortOrder("name")));
         assertEquals(10, widgetTypesFirstPage.getData().size());
         assertThat(widgetTypesFirstPage.getData()).containsExactlyElementsOf(expected.subList(0, 10));
@@ -216,10 +219,10 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
 
             PageData<WidgetTypeInfo> widgetTypes = widgetTypeDao.findSystemWidgetTypes(
                     WidgetTypeFilter.builder()
-                        .tenantId(TenantId.SYS_TENANT_ID)
-                        .fullSearch(true)
-                        .deprecatedFilter(DeprecatedFilter.ALL)
-                        .widgetTypes(null).build(),
+                            .tenantId(TenantId.SYS_TENANT_ID)
+                            .fullSearch(true)
+                            .deprecatedFilter(DeprecatedFilter.ALL)
+                            .widgetTypes(null).build(),
                     new PageLink(10, 0, searchText)
             );
 
@@ -254,12 +257,12 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
     public void testFindTenantWidgetTypesByTenantId() {
         UUID tenantId = Uuids.timeBased();
         for (int i = 0; i < WIDGET_TYPE_COUNT; i++) {
-            var widgetType = createAndSaveWidgetType(new TenantId(tenantId), i);
+            var widgetType = createAndSaveWidgetType(TenantId.fromUUID(tenantId), i);
             widgetTypeList.add(widgetType);
         }
         PageData<WidgetTypeInfo> widgetTypes = widgetTypeDao.findTenantWidgetTypesByTenantId(
                 WidgetTypeFilter.builder()
-                        .tenantId(new TenantId(tenantId))
+                        .tenantId(TenantId.fromUUID(tenantId))
                         .fullSearch(true)
                         .deprecatedFilter(DeprecatedFilter.ALL)
                         .widgetTypes(null).build(),
@@ -360,16 +363,16 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
 
     @Test
     public void testFindByWidgetTypeInfosByBundleId() {
-        PageData<WidgetTypeInfo> widgetTypes = widgetTypeDao.findWidgetTypesInfosByWidgetsBundleId(TenantId.SYS_TENANT_ID.getId(), widgetsBundle.getUuidId(),true, DeprecatedFilter.ALL, Collections.singletonList("latest"),
+        PageData<WidgetTypeInfo> widgetTypes = widgetTypeDao.findWidgetTypesInfosByWidgetsBundleId(TenantId.SYS_TENANT_ID.getId(), widgetsBundle.getUuidId(), true, DeprecatedFilter.ALL, Collections.singletonList("latest"),
                 new PageLink(1024, 0, "TYPE_DESCRIPTION", new SortOrder("createdTime")));
         assertEquals(2, widgetTypes.getData().size());
-        assertEquals(new WidgetTypeInfo(widgetTypeList.get(0)), widgetTypes.getData().get(0));
-        assertEquals(new WidgetTypeInfo(widgetTypeList.get(2)), widgetTypes.getData().get(1));
+        assertEquals(widgetTypeList.get(0), widgetTypes.getData().get(0));
+        assertEquals(widgetTypeList.get(2), widgetTypes.getData().get(1));
 
         widgetTypes = widgetTypeDao.findWidgetTypesInfosByWidgetsBundleId(TenantId.SYS_TENANT_ID.getId(), widgetsBundle.getUuidId(), true, DeprecatedFilter.ALL, Collections.emptyList(),
                 new PageLink(1024, 0, "hfgfd TEST_0 ghg", new SortOrder("createdTime")));
         assertEquals(1, widgetTypes.getData().size());
-        assertEquals(new WidgetTypeInfo(widgetTypeList.get(0)), widgetTypes.getData().get(0));
+        assertEquals(widgetTypeList.get(0), widgetTypes.getData().get(0));
     }
 
     @Test
@@ -410,7 +413,7 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
 
     @Test
     public void testFindByTenantIdAndFqn() {
-        WidgetType result = widgetTypeList.get(0);
+        WidgetTypeInfo result = widgetTypeList.get(0);
         assertNotNull(result);
         WidgetType widgetType = widgetTypeDao.findByTenantIdAndFqn(TenantId.SYS_TENANT_ID.getId(), "FQN_0");
         assertEquals(result.getId(), widgetType.getId());
@@ -426,7 +429,7 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
 
     @Test
     public void testFindByImageLink() {
-        TenantId tenantId = new TenantId(UUID.randomUUID());
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
         WidgetTypeDetails details = createAndSaveWidgetType(tenantId, 0, new String[]{"a"});
         details.setDescriptor(JacksonUtil.newObjectNode().put("bg", "/image/tenant/widget.png"));
         widgetTypeDao.save(tenantId, details);
@@ -437,14 +440,82 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
         widgetTypeDao.removeById(tenantId, details.getUuidId());
     }
 
+    @Test
+    public void testFindWidgetTypesWithBundles() {
+        PageData<WidgetTypeInfo> widgetTypes = widgetTypeDao.findWidgetTypesInfosByWidgetsBundleId(
+                TenantId.SYS_TENANT_ID.getId(),
+                widgetsBundle.getUuidId(),
+                true,
+                DeprecatedFilter.ALL,
+                Collections.singletonList("latest"),
+                new PageLink(1024, 0, "TYPE_DESCRIPTION", new SortOrder("createdTime"))
+        );
+
+        assertEquals(2, widgetTypes.getData().size());
+        for (var widgetType : widgetTypes.getData()) {
+            assertFalse("Bundles should not be empty", widgetType.getBundles().isEmpty());
+            assertEquals(BUNDLE_ALIAS, widgetType.getBundles().get(0).getName());
+        }
+    }
+
+    @Test
+    public void testAddWidgetTypeToNewBundleAndVerifyBundles() {
+        String newBundleTitle = "New Bundle Title";
+        WidgetsBundle newWidgetsBundle = new WidgetsBundle();
+        newWidgetsBundle.setAlias("NewBundle");
+        newWidgetsBundle.setTitle(newBundleTitle);
+        newWidgetsBundle.setId(new WidgetsBundleId(UUID.randomUUID()));
+        newWidgetsBundle.setTenantId(TenantId.SYS_TENANT_ID);
+        newWidgetsBundle = widgetsBundleDao.save(TenantId.SYS_TENANT_ID, newWidgetsBundle);
+
+        for (int i = 0; i < widgetTypeList.size(); i++) {
+            WidgetTypeInfo widgetType = widgetTypeList.get(i);
+            widgetTypeDao.saveWidgetsBundleWidget(new WidgetsBundleWidget(newWidgetsBundle.getId(), widgetType.getId(), i));
+        }
+
+        PageData<WidgetTypeInfo> widgetTypes = widgetTypeDao.findWidgetTypesInfosByWidgetsBundleId(
+                TenantId.SYS_TENANT_ID.getId(),
+                newWidgetsBundle.getUuidId(),
+                true,
+                DeprecatedFilter.ALL,
+                Collections.singletonList("latest"),
+                new PageLink(1024, 0, "TYPE_DESCRIPTION", new SortOrder("createdTime"))
+        );
+
+        assertEquals(2, widgetTypes.getData().size());
+        WidgetTypeInfo widgetTypeInfo1 = widgetTypes.getData().get(0);
+        WidgetTypeInfo widgetTypeInfo2 = widgetTypes.getData().get(1);
+
+        assertEquals(2, widgetTypeInfo1.getBundles().size());
+        assertTrue("Bundles should contain 'BUNDLE_ALIAS'", widgetTypeInfo1.getBundles().stream().anyMatch(bundle -> BUNDLE_ALIAS.equals(bundle.getName())));
+        assertTrue("Bundles should contain 'New Bundle Title'", widgetTypeInfo1.getBundles().stream().anyMatch(bundle -> newBundleTitle.equals(bundle.getName())));
+
+        assertEquals(2, widgetTypeInfo2.getBundles().size());
+        assertTrue("Bundles should contain 'BUNDLE_ALIAS'", widgetTypeInfo2.getBundles().stream().anyMatch(bundle -> "BUNDLE_ALIAS".equals(bundle.getName())));
+        assertTrue("Bundles should contain 'New Bundle Title'", widgetTypeInfo2.getBundles().stream().anyMatch(bundle -> newBundleTitle.equals(bundle.getName())));
+
+        // cleanup and verify
+        widgetsBundleDao.removeById(newWidgetsBundle.getTenantId(), newWidgetsBundle.getUuidId());
+        widgetTypes = widgetTypeDao.findWidgetTypesInfosByWidgetsBundleId(
+                TenantId.SYS_TENANT_ID.getId(),
+                newWidgetsBundle.getUuidId(),
+                true,
+                DeprecatedFilter.ALL,
+                Collections.singletonList("latest"),
+                new PageLink(1024, 0, "TYPE_DESCRIPTION", new SortOrder("createdTime"))
+        );
+        widgetTypes.getData().forEach(widgetTypeInfo -> assertEquals(1, widgetTypeInfo.getBundles().size()));
+    }
+
     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");
+        descriptor.put("type", "static");
         widgetType.setDescriptor(descriptor);
         return widgetTypeDao.save(TenantId.SYS_TENANT_ID, widgetType);
     }
+
 }
diff --git a/docker/docker-compose.prometheus-grafana.yml b/docker/docker-compose.prometheus-grafana.yml
index 311d96bd86..f6a5f7fb6d 100644
--- a/docker/docker-compose.prometheus-grafana.yml
+++ b/docker/docker-compose.prometheus-grafana.yml
@@ -23,7 +23,7 @@ volumes:
 services:
 
   prometheus:
-    image: prom/prometheus:v2.1.0
+    image: prom/prometheus:v3.1.0
     volumes:
       - ./monitoring/prometheus/:/etc/prometheus/
       - prometheus_data:/prometheus
diff --git a/monitoring/pom.xml b/monitoring/pom.xml
index e19acb0fe6..d30a9ca71f 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
 
diff --git a/monitoring/src/main/resources/root_rule_chain.json b/monitoring/src/main/resources/root_rule_chain.json
index ff44ebfe79..46bdc72d9f 100644
--- a/monitoring/src/main/resources/root_rule_chain.json
+++ b/monitoring/src/main/resources/root_rule_chain.json
@@ -21,9 +21,13 @@
         "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
         "name": "Save Timeseries",
         "singletonMode": false,
-        "configurationVersion": 0,
+        "configurationVersion": 1,
         "configuration": {
-          "defaultTTL": 0
+          "defaultTTL": 0,
+          "useServerTs": false,
+          "processingSettings": {
+            "type": "ON_EVERY_MESSAGE"
+          }
         },
         "externalId": null
       },
@@ -273,9 +277,13 @@
         "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
         "name": "Save Timeseries",
         "singletonMode": false,
-        "configurationVersion": 0,
+        "configurationVersion": 1,
         "configuration": {
-          "defaultTTL": 0
+          "defaultTTL": 0,
+          "useServerTs": false,
+          "processingSettings": {
+            "type": "ON_EVERY_MESSAGE"
+          }
         },
         "externalId": null
       },
@@ -307,11 +315,13 @@
         "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
         "name": "Save Timeseries with TTL",
         "singletonMode": false,
-        "configurationVersion": 0,
+        "configurationVersion": 1,
         "configuration": {
           "defaultTTL": 180,
-          "skipLatestPersistence": null,
-          "useServerTs": null
+          "useServerTs": false,
+          "processingSettings": {
+            "type": "ON_EVERY_MESSAGE"
+          }
         },
         "externalId": null
       }
@@ -415,4 +425,4 @@
     ],
     "ruleChainConnections": null
   }
-}
\ No newline at end of file
+}
diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml
index 5563fcc8d8..c1c0980b64 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/black-box-tests/src/test/resources/MqttRuleNodeTestMetadata.json b/msa/black-box-tests/src/test/resources/MqttRuleNodeTestMetadata.json
index c2bb52514e..c09da6aebb 100644
--- a/msa/black-box-tests/src/test/resources/MqttRuleNodeTestMetadata.json
+++ b/msa/black-box-tests/src/test/resources/MqttRuleNodeTestMetadata.json
@@ -36,11 +36,13 @@
       "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
       "name": "save timeseries",
       "singletonMode": false,
-      "configurationVersion": 0,
+      "configurationVersion": 1,
       "configuration": {
         "defaultTTL": 0,
-        "skipLatestPersistence": false,
-        "useServerTs": false
+        "useServerTs": false,
+        "processingSettings": {
+          "type": "ON_EVERY_MESSAGE"
+        }
       },
       "externalId": null
     },
diff --git a/msa/js-executor/api/jsExecutor.models.ts b/msa/js-executor/api/jsExecutor.models.ts
index 3f14079139..182ec5cf23 100644
--- a/msa/js-executor/api/jsExecutor.models.ts
+++ b/msa/js-executor/api/jsExecutor.models.ts
@@ -16,8 +16,6 @@
 
 
 export interface TbMessage {
-    scriptIdMSB: string; // deprecated
-    scriptIdLSB: string; // deprecated
     scriptHash: string;
 }
 
diff --git a/msa/js-executor/api/jsInvokeMessageProcessor.ts b/msa/js-executor/api/jsInvokeMessageProcessor.ts
index fe18c320bc..f55a1ba468 100644
--- a/msa/js-executor/api/jsInvokeMessageProcessor.ts
+++ b/msa/js-executor/api/jsInvokeMessageProcessor.ts
@@ -18,7 +18,7 @@ import config from 'config';
 import { _logger } from '../config/logger';
 import { JsExecutor, TbScript } from './jsExecutor';
 import { performance } from 'perf_hooks';
-import { isString, parseJsErrorDetails, toUUIDString, UUIDFromBuffer, UUIDToBits, isNotUUID } from './utils';
+import { isString, parseJsErrorDetails, UUIDFromBuffer, UUIDToBits } from './utils';
 import { IQueue } from '../queue/queue.models';
 import {
     JsCompileRequest,
@@ -306,26 +306,12 @@ export class JsInvokeMessageProcessor {
     }
 
     private static createCompileResponse(scriptId: string, success: boolean, errorCode?: number, err?: any): JsCompileResponse {
-        if (isNotUUID(scriptId)) {
-            return {
-                errorCode: errorCode,
-                success: success,
-                errorDetails: parseJsErrorDetails(err),
-                scriptIdMSB: "0",
-                scriptIdLSB: "0",
-                scriptHash: scriptId
-            };
-        } else { // this is for backward compatibility (to be able to work with tb-node of previous version) - todo: remove in the next release
-            let scriptIdBits = UUIDToBits(scriptId);
-            return {
-                errorCode: errorCode,
-                success: success,
-                errorDetails: parseJsErrorDetails(err),
-                scriptIdMSB: scriptIdBits[0],
-                scriptIdLSB: scriptIdBits[1],
-                scriptHash: ""
-            };
-        }
+        return {
+            errorCode: errorCode,
+            success: success,
+            errorDetails: parseJsErrorDetails(err),
+            scriptHash: scriptId
+        };
     }
 
     private static createInvokeResponse(result: string | undefined, success: boolean, errorCode?: number, err?: any): JsInvokeResponse {
@@ -338,26 +324,14 @@ export class JsInvokeMessageProcessor {
     }
 
     private static createReleaseResponse(scriptId: string, success: boolean): JsReleaseResponse {
-        if (isNotUUID(scriptId)) {
-            return {
-                success: success,
-                scriptIdMSB: "0",
-                scriptIdLSB: "0",
-                scriptHash: scriptId,
-            };
-        } else { // todo: remove in the next release
-            let scriptIdBits = UUIDToBits(scriptId);
-            return {
-                success: success,
-                scriptIdMSB: scriptIdBits[0],
-                scriptIdLSB: scriptIdBits[1],
-                scriptHash: ""
-            }
-        }
+        return {
+            success: success,
+            scriptHash: scriptId,
+        };
     }
 
     private static getScriptId(request: TbMessage): string {
-        return request.scriptHash ? request.scriptHash : toUUIDString(request.scriptIdMSB, request.scriptIdLSB);
+        return request.scriptHash;
     }
 
     private incrementUseScriptId(scriptId: string) {
diff --git a/msa/js-executor/api/utils.ts b/msa/js-executor/api/utils.ts
index c228d98315..f044d40f58 100644
--- a/msa/js-executor/api/utils.ts
+++ b/msa/js-executor/api/utils.ts
@@ -17,13 +17,6 @@
 import Long from 'long';
 import uuidParse from 'uuid-parse';
 
-export function toUUIDString(mostSigBits: string, leastSigBits: string): string {
-    const msbBytes = Long.fromValue(mostSigBits, false).toBytes(false);
-    const lsbBytes = Long.fromValue(leastSigBits, false).toBytes(false);
-    const uuidBytes = msbBytes.concat(lsbBytes);
-    return uuidParse.unparse(uuidBytes as any);
-}
-
 export function UUIDFromBuffer(buf: Buffer): string {
     return uuidParse.unparse(buf);
 }
@@ -59,10 +52,6 @@ export function parseJsErrorDetails(err: any): string | undefined {
     return details;
 }
 
-export function isNotUUID(candidate: string) {
-    return candidate.length != 36 || !candidate.includes('-');
-}
-
 export function isNotEmptyStr(value: any): boolean {
     return typeof value === 'string' && value.trim().length > 0;
 }
diff --git a/msa/js-executor/config/custom-environment-variables.yml b/msa/js-executor/config/custom-environment-variables.yml
index 7c79eda0d1..f28df78d1d 100644
--- a/msa/js-executor/config/custom-environment-variables.yml
+++ b/msa/js-executor/config/custom-environment-variables.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-queue_type: "TB_QUEUE_TYPE" #kafka (Apache Kafka) or aws-sqs (AWS SQS) or pubsub (PubSub) or service-bus (Azure Service Bus) or rabbitmq (RabbitMQ)
+queue_type: "TB_QUEUE_TYPE" #kafka (Apache Kafka)
 queue_prefix: "TB_QUEUE_PREFIX"
 request_topic: "REMOTE_JS_EVAL_REQUEST_TOPIC"
 http_port: "HTTP_PORT"      # /livenessProbe
@@ -55,32 +55,6 @@ kafka:
     username: "TB_QUEUE_KAFKA_CONFLUENT_USERNAME"
     password: "TB_QUEUE_KAFKA_CONFLUENT_PASSWORD"
 
-pubsub:
-  project_id: "TB_QUEUE_PUBSUB_PROJECT_ID"
-  service_account: "TB_QUEUE_PUBSUB_SERVICE_ACCOUNT"
-  queue_properties: "TB_QUEUE_PUBSUB_JE_QUEUE_PROPERTIES"
-
-aws_sqs:
-  access_key_id: "TB_QUEUE_AWS_SQS_ACCESS_KEY_ID"
-  secret_access_key: "TB_QUEUE_AWS_SQS_SECRET_ACCESS_KEY"
-  region: "TB_QUEUE_AWS_SQS_REGION"
-  queue_properties: "TB_QUEUE_AWS_SQS_JE_QUEUE_PROPERTIES"
-
-rabbitmq:
-  host: "TB_QUEUE_RABBIT_MQ_HOST"
-  port: "TB_QUEUE_RABBIT_MQ_PORT"
-  virtual_host: "TB_QUEUE_RABBIT_MQ_VIRTUAL_HOST"
-  username: "TB_QUEUE_RABBIT_MQ_USERNAME"
-  password: "TB_QUEUE_RABBIT_MQ_PASSWORD"
-  queue_properties: "TB_QUEUE_RABBIT_MQ_JE_QUEUE_PROPERTIES"
-
-service_bus:
-  namespace_name: "TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME"
-  sas_key_name: "TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME"
-  sas_key: "TB_QUEUE_SERVICE_BUS_SAS_KEY"
-  max_messages: "TB_QUEUE_SERVICE_BUS_MAX_MESSAGES"
-  queue_properties: "TB_QUEUE_SERVICE_BUS_JE_QUEUE_PROPERTIES"
-
 logger:
   level: "LOGGER_LEVEL"
   path: "LOG_FOLDER"
diff --git a/msa/js-executor/config/default.yml b/msa/js-executor/config/default.yml
index f5bde183e4..dda3ef02c7 100644
--- a/msa/js-executor/config/default.yml
+++ b/msa/js-executor/config/default.yml
@@ -44,23 +44,6 @@ kafka:
     sasl:
       mechanism: "PLAIN"
 
-pubsub:
-  queue_properties: "ackDeadlineInSec:30;messageRetentionInSec:604800"
-
-aws_sqs:
-  queue_properties: "VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800"
-
-rabbitmq:
-  host: "localhost"
-  port: "5672"
-  virtual_host: "/"
-  username: "admin"
-  password: "password"
-  queue_properties: "x-max-length-bytes:1048576000;x-message-ttl:604800000"
-
-service_bus:
-  queue_properties: "lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800"
-
 logger:
   level: "info"
   path: "logs"
diff --git a/msa/js-executor/package.json b/msa/js-executor/package.json
index 0fb241c558..350d6029f0 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.9.0",
+  "version": "4.0.0",
   "description": "ThingsBoard JavaScript Executor Microservice",
   "main": "server.ts",
   "bin": "server.js",
@@ -13,17 +13,12 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@aws-sdk/client-sqs": "^3.682.0",
-    "@azure/service-bus": "^7.9.5",
-    "@google-cloud/pubsub": "^4.8.0",
-    "amqplib": "^0.10.4",
     "config": "^3.3.12",
     "express": "^4.21.1",
     "js-yaml": "^4.1.0",
     "kafkajs": "^2.2.4",
     "long": "^5.2.3",
     "uuid-parse": "^1.1.0",
-    "uuid-random": "^1.3.2",
     "winston": "^3.16.0",
     "winston-daily-rotate-file": "^5.0.0"
   },
@@ -36,7 +31,6 @@
     ]
   },
   "devDependencies": {
-    "@types/amqplib": "^0.10.5",
     "@types/config": "^3.3.5",
     "@types/express": "~4.17.21",
     "@types/node": "~20.17.6",
diff --git a/msa/js-executor/pom.xml b/msa/js-executor/pom.xml
index daea52bfa5..62545f5ad6 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/js-executor/queue/awsSqsTemplate.ts b/msa/js-executor/queue/awsSqsTemplate.ts
deleted file mode 100644
index 3edb0db1f4..0000000000
--- a/msa/js-executor/queue/awsSqsTemplate.ts
+++ /dev/null
@@ -1,198 +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.
-///
-
-import config from 'config';
-import { _logger } from '../config/logger';
-import { JsInvokeMessageProcessor } from '../api/jsInvokeMessageProcessor'
-import { IQueue } from './queue.models';
-import {
-    CreateQueueCommand,
-    CreateQueueRequest,
-    DeleteMessageBatchCommand,
-    DeleteMessageBatchRequest,
-    DeleteMessageBatchRequestEntry,
-    ListQueuesCommand,
-    ListQueuesResult,
-    ReceiveMessageCommand,
-    ReceiveMessageRequest,
-    ReceiveMessageResult,
-    SendMessageCommand,
-    SendMessageRequest,
-    SQSClient
-} from '@aws-sdk/client-sqs';
-import uuid from 'uuid-random';
-
-export class AwsSqsTemplate implements IQueue {
-
-    private logger = _logger(`awsSqsTemplate`);
-    private queuePrefix: string = config.get('queue_prefix');
-    private requestTopic: string = this.queuePrefix ? this.queuePrefix + "." + config.get('request_topic') : config.get('request_topic');
-    private accessKeyId: string = config.get('aws_sqs.access_key_id');
-    private secretAccessKey: string = config.get('aws_sqs.secret_access_key');
-    private region: string = config.get('aws_sqs.region');
-    private queueProperties: string = config.get('aws_sqs.queue_properties');
-    private pollInterval = Number(config.get('js.response_poll_interval'));
-
-    private sqsClient: SQSClient;
-    private requestQueueURL: string
-    private queueUrls = new Map<string, string>();
-    private queueAttributes: { [n: string]: string } = {
-        FifoQueue: 'true'
-    };
-    private timer: NodeJS.Timeout;
-
-    name = 'AWS SQS';
-
-    constructor() {
-    }
-
-    async init() {
-        this.sqsClient = new SQSClient({
-            apiVersion: '2012-11-05',
-            credentials: {
-                accessKeyId: this.accessKeyId,
-                secretAccessKey: this.secretAccessKey
-            },
-            region: this.region
-        });
-
-        const queues = await this.getQueues();
-
-        if (queues.QueueUrls) {
-            queues.QueueUrls.forEach(queueUrl => {
-                const delimiterPosition = queueUrl.lastIndexOf('/');
-                const queueName = queueUrl.substring(delimiterPosition + 1);
-                this.queueUrls.set(queueName, queueUrl);
-            });
-        }
-
-        this.parseQueueProperties();
-
-        this.requestQueueURL = this.queueUrls.get(AwsSqsTemplate.topicToSqsQueueName(this.requestTopic)) || '';
-        if (!this.requestQueueURL) {
-            this.requestQueueURL = await this.createQueue(this.requestTopic);
-        }
-
-        const messageProcessor = new JsInvokeMessageProcessor(this);
-
-        const params: ReceiveMessageRequest = {
-            MaxNumberOfMessages: 10,
-            QueueUrl: this.requestQueueURL,
-            WaitTimeSeconds: Math.ceil(this.pollInterval / 10)
-        };
-        this.timer = setTimeout(() => {this.getAndProcessMessage(messageProcessor, params)}, this.pollInterval);
-    }
-
-    private async getAndProcessMessage(messageProcessor: JsInvokeMessageProcessor, params: ReceiveMessageRequest) {
-        const messagesResponse: ReceiveMessageResult = await this.sqsClient.send(new ReceiveMessageCommand(params));
-        const messages = messagesResponse.Messages;
-
-        if (messages && messages.length > 0) {
-            const entries: DeleteMessageBatchRequestEntry[] = [];
-
-            messages.forEach(message => {
-                entries.push({
-                    Id: message.MessageId,
-                    ReceiptHandle: message.ReceiptHandle
-                });
-                messageProcessor.onJsInvokeMessage(JSON.parse(message.Body || ''));
-            });
-
-            const deleteBatch: DeleteMessageBatchRequest = {
-                QueueUrl: this.requestQueueURL,
-                Entries: entries
-            };
-            try {
-                await this.sqsClient.send(new DeleteMessageBatchCommand(deleteBatch))
-            } catch (err: any) {
-                this.logger.error("Failed to delete messages from queue.", err.message);
-            }
-        }
-        this.timer = setTimeout(() => {this.getAndProcessMessage(messageProcessor, params)}, this.pollInterval);
-    }
-
-    async send(responseTopic: string, msgKey: string, rawResponse: Buffer, headers: any): Promise<any> {
-        let msgBody = JSON.stringify(
-            {
-                key: msgKey,
-                data: [...rawResponse],
-                headers: headers
-            });
-
-        let responseQueueUrl = this.queueUrls.get(AwsSqsTemplate.topicToSqsQueueName(responseTopic));
-
-        if (!responseQueueUrl) {
-            responseQueueUrl = await this.createQueue(responseTopic);
-            this.queueUrls.set(responseTopic, responseQueueUrl);
-        }
-
-        let msgId = uuid();
-
-        let params: SendMessageRequest = {
-            MessageBody: msgBody,
-            QueueUrl: responseQueueUrl,
-            MessageGroupId: msgId,
-            MessageDeduplicationId: msgId
-        };
-
-        return this.sqsClient.send(new SendMessageCommand(params))
-    }
-
-    private async getQueues(): Promise<ListQueuesResult> {
-        return this.sqsClient.send(new ListQueuesCommand({}));
-    }
-
-    private parseQueueProperties() {
-        const props = this.queueProperties.split(';');
-        props.forEach(p => {
-            const delimiterPosition = p.indexOf(':');
-            this.queueAttributes[p.substring(0, delimiterPosition)] = p.substring(delimiterPosition + 1);
-        });
-    }
-
-    private static topicToSqsQueueName(topic: string): string {
-        return topic.replace(/\./g, '_') + '.fifo';
-    }
-
-    private async createQueue(topic: string): Promise<string> {
-        let queueName = AwsSqsTemplate.topicToSqsQueueName(topic);
-        let queueParams: CreateQueueRequest = {
-            QueueName: queueName,
-            Attributes: this.queueAttributes
-        };
-
-        const result = await this.sqsClient.send(new CreateQueueCommand(queueParams));
-        return result.QueueUrl || '';
-    }
-
-    async destroy(): Promise<void> {
-        this.logger.info('Stopping AWS SQS resources...');
-        clearTimeout(this.timer);
-        if (this.sqsClient) {
-            this.logger.info('Stopping AWS SQS client...');
-            try {
-                const _sqsClient = this.sqsClient;
-                // @ts-ignore
-                delete this.sqsClient;
-                _sqsClient.destroy();
-                this.logger.info('AWS SQS client stopped.');
-            } catch (e: any) {
-                this.logger.info('AWS SQS client stop error.');
-            }
-        }
-        this.logger.info('AWS SQS resources stopped.')
-    }
-}
diff --git a/msa/js-executor/queue/pubSubTemplate.ts b/msa/js-executor/queue/pubSubTemplate.ts
deleted file mode 100644
index 537d2e71b1..0000000000
--- a/msa/js-executor/queue/pubSubTemplate.ts
+++ /dev/null
@@ -1,162 +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.
-///
-
-import config from 'config';
-import { _logger } from '../config/logger';
-import { JsInvokeMessageProcessor } from '../api/jsInvokeMessageProcessor'
-import { PubSub } from '@google-cloud/pubsub';
-import { IQueue } from './queue.models';
-import { Message } from '@google-cloud/pubsub/build/src/subscriber';
-
-export class PubSubTemplate implements IQueue {
-
-    private logger = _logger(`pubSubTemplate`);
-    private projectId: string = config.get('pubsub.project_id');
-    private credentials = JSON.parse(config.get('pubsub.service_account'));
-    private queuePrefix: string = config.get('queue_prefix');
-    private requestTopic: string = this.queuePrefix ? this.queuePrefix + "." + config.get('request_topic') : config.get('request_topic');
-    private queueProperties: string = config.get('pubsub.queue_properties');
-
-    private pubSubClient: PubSub;
-    private queueProps: { [n: string]: string } = {};
-    private topics: string[] = [];
-    private subscriptions: string[] = [];
-
-    name = 'Pub/Sub';
-
-    constructor() {
-    }
-
-    async init() {
-        this.pubSubClient = new PubSub({
-            projectId: this.projectId,
-            credentials: this.credentials
-        });
-
-        this.parseQueueProperties();
-
-        const topicList = await this.pubSubClient.getTopics();
-
-        if (topicList) {
-            topicList[0].forEach(topic => {
-                this.topics.push(PubSubTemplate.getName(topic.name));
-            });
-        }
-
-        const subscriptionList = await this.pubSubClient.getSubscriptions();
-
-        if (subscriptionList) {
-            topicList[0].forEach(sub => {
-                this.subscriptions.push(PubSubTemplate.getName(sub.name));
-            });
-        }
-
-        if (!(this.subscriptions.includes(this.requestTopic) && this.topics.includes(this.requestTopic))) {
-            await this.createTopic(this.requestTopic);
-            await this.createSubscription(this.requestTopic);
-        }
-
-        const subscription = this.pubSubClient.subscription(this.requestTopic);
-
-        const messageProcessor = new JsInvokeMessageProcessor(this);
-
-        const messageHandler = (message: Message) => {
-            messageProcessor.onJsInvokeMessage(JSON.parse(message.data.toString('utf8')));
-            message.ack();
-        };
-
-        subscription.on('message', messageHandler);
-    }
-
-    async send(responseTopic: string, msgKey: string, rawResponse: Buffer, headers: any): Promise<any> {
-        if (!(this.subscriptions.includes(responseTopic) && this.topics.includes(this.requestTopic))) {
-            await this.createTopic(this.requestTopic);
-            await this.createSubscription(this.requestTopic);
-        }
-
-        let data = JSON.stringify(
-            {
-                key: msgKey,
-                data: [...rawResponse],
-                headers: headers
-            });
-        let dataBuffer = Buffer.from(data);
-        return this.pubSubClient.topic(responseTopic).publishMessage({data: dataBuffer});
-    }
-
-    private parseQueueProperties() {
-        const props = this.queueProperties.split(';');
-        props.forEach(p => {
-            const delimiterPosition = p.indexOf(':');
-            this.queueProps[p.substring(0, delimiterPosition)] = p.substring(delimiterPosition + 1);
-        });
-    }
-
-    private static getName(fullName: string): string {
-        const delimiterPosition = fullName.lastIndexOf('/');
-        return fullName.substring(delimiterPosition + 1);
-    }
-
-    private async createTopic(topic: string) {
-        if (!this.topics.includes(topic)) {
-            try {
-                await this.pubSubClient.createTopic(topic);
-                this.logger.info('Created new Pub/Sub topic: %s', topic);
-            } catch (e) {
-                this.logger.info('Pub/Sub topic already exists');
-            }
-            this.topics.push(topic);
-        }
-    }
-
-    private async createSubscription(topic: string) {
-        if (!this.subscriptions.includes(topic)) {
-            try {
-                await this.pubSubClient.createSubscription(topic, topic, {
-                    topic: topic,
-                    name: topic,
-                    ackDeadlineSeconds: Number(this.queueProps['ackDeadlineInSec']),
-                    messageRetentionDuration: {
-                        seconds: this.queueProps['messageRetentionInSec']
-                    }
-                });
-                this.logger.info('Created new Pub/Sub subscription: %s', topic);
-            } catch (e) {
-                this.logger.info('Pub/Sub subscription already exists.');
-            }
-
-            this.subscriptions.push(topic);
-        }
-    }
-
-    async destroy(): Promise<void> {
-        this.logger.info('Stopping Pub/Sub resources...');
-        if (this.pubSubClient) {
-            this.logger.info('Stopping Pub/Sub client...');
-            try {
-                const _pubSubClient = this.pubSubClient;
-                // @ts-ignore
-                delete this.pubSubClient;
-                await _pubSubClient.close();
-                this.logger.info('Pub/Sub client stopped.');
-            } catch (e) {
-                this.logger.info('Pub/Sub client stop error.');
-            }
-        }
-        this.logger.info('Pub/Sub resources stopped.');
-    }
-}
-
diff --git a/msa/js-executor/queue/rabbitmqTemplate.ts b/msa/js-executor/queue/rabbitmqTemplate.ts
deleted file mode 100644
index 9219afedc9..0000000000
--- a/msa/js-executor/queue/rabbitmqTemplate.ts
+++ /dev/null
@@ -1,128 +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.
-///
-
-import config from 'config';
-import { _logger } from '../config/logger';
-import { JsInvokeMessageProcessor } from '../api/jsInvokeMessageProcessor'
-import { IQueue } from './queue.models';
-import amqp, { ConfirmChannel, Connection } from 'amqplib';
-import { Options, Replies } from 'amqplib/properties';
-
-export class RabbitMqTemplate implements IQueue {
-
-    private logger = _logger(`rabbitmqTemplate`);
-    private queuePrefix: string = config.get('queue_prefix');
-    private requestTopic: string = this.queuePrefix ? this.queuePrefix + "." + config.get('request_topic') : config.get('request_topic');
-    private host = config.get('rabbitmq.host');
-    private port = config.get('rabbitmq.port');
-    private vhost = config.get('rabbitmq.virtual_host');
-    private username = config.get('rabbitmq.username');
-    private password = config.get('rabbitmq.password');
-    private queueProperties: string = config.get('rabbitmq.queue_properties');
-
-    private queueOptions: Options.AssertQueue = {
-        durable: false,
-        exclusive: false,
-        autoDelete: false
-    };
-    private connection: Connection;
-    private channel: ConfirmChannel;
-    private topics: string[] = [];
-
-    name = 'RabbitMQ';
-
-    constructor() {
-    }
-
-    async init(): Promise<void> {
-        const url = `amqp://${this.username}:${this.password}@${this.host}:${this.port}${this.vhost}`;
-        this.connection = await amqp.connect(url);
-        this.channel = await this.connection.createConfirmChannel();
-
-        this.parseQueueProperties();
-
-        await this.createQueue(this.requestTopic);
-
-        const messageProcessor = new JsInvokeMessageProcessor(this);
-
-        await this.channel.consume(this.requestTopic, (message) => {
-            if (message) {
-                messageProcessor.onJsInvokeMessage(JSON.parse(message.content.toString('utf8')));
-                this.channel.ack(message);
-            }
-        })
-    }
-
-    async send(responseTopic: string, msgKey: string, rawResponse: Buffer, headers: any): Promise<any> {
-
-        if (!this.topics.includes(responseTopic)) {
-            await this.createQueue(responseTopic);
-            this.topics.push(responseTopic);
-        }
-
-        let data = JSON.stringify(
-            {
-                key: msgKey,
-                data: [...rawResponse],
-                headers: headers
-            });
-        let dataBuffer = Buffer.from(data);
-        this.channel.sendToQueue(responseTopic, dataBuffer);
-        return this.channel.waitForConfirms()
-    }
-
-    private parseQueueProperties() {
-        let args: { [n: string]: number } = {};
-        const props = this.queueProperties.split(';');
-        props.forEach(p => {
-            const delimiterPosition = p.indexOf(':');
-            args[p.substring(0, delimiterPosition)] = Number(p.substring(delimiterPosition + 1));
-        });
-        this.queueOptions['arguments'] = args;
-    }
-
-    private async createQueue(topic: string): Promise<Replies.AssertQueue> {
-        return this.channel.assertQueue(topic, this.queueOptions);
-    }
-
-    async destroy() {
-        this.logger.info('Stopping RabbitMQ resources...');
-
-        if (this.channel) {
-            this.logger.info('Stopping RabbitMQ chanel...');
-            const _channel = this.channel;
-            // @ts-ignore
-            delete this.channel;
-            await _channel.close();
-            this.logger.info('RabbitMQ chanel stopped');
-        }
-
-        if (this.connection) {
-            this.logger.info('Stopping RabbitMQ connection...')
-            try {
-                const _connection = this.connection;
-                // @ts-ignore
-                delete this.connection;
-                await _connection.close();
-                this.logger.info('RabbitMQ client connection.');
-            } catch (e) {
-                this.logger.info('RabbitMQ connection stop error.');
-            }
-        }
-        this.logger.info('RabbitMQ resources stopped.')
-    }
-
-}
diff --git a/msa/js-executor/queue/serviceBusTemplate.ts b/msa/js-executor/queue/serviceBusTemplate.ts
deleted file mode 100644
index 2a9c1d843e..0000000000
--- a/msa/js-executor/queue/serviceBusTemplate.ts
+++ /dev/null
@@ -1,175 +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.
-///
-
-import config from 'config';
-import { _logger } from '../config/logger';
-import { JsInvokeMessageProcessor } from '../api/jsInvokeMessageProcessor'
-import { IQueue } from './queue.models';
-import {
-    CreateQueueOptions,
-    ProcessErrorArgs,
-    ServiceBusAdministrationClient,
-    ServiceBusClient,
-    ServiceBusReceivedMessage,
-    ServiceBusReceiver,
-    ServiceBusSender
-} from '@azure/service-bus';
-
-export class ServiceBusTemplate implements IQueue {
-
-    private logger = _logger(`serviceBusTemplate`);
-    private queuePrefix: string = config.get('queue_prefix');
-    private requestTopic: string = this.queuePrefix ? this.queuePrefix + "." + config.get('request_topic') : config.get('request_topic');
-    private namespaceName = config.get('service_bus.namespace_name');
-    private sasKeyName = config.get('service_bus.sas_key_name');
-    private sasKey = config.get('service_bus.sas_key');
-    private queueProperties: string = config.get('service_bus.queue_properties');
-
-    private sbClient: ServiceBusClient;
-    private serviceBusService: ServiceBusAdministrationClient;
-    private queueOptions: CreateQueueOptions = {};
-    private queues: string[] = [];
-    private receiver: ServiceBusReceiver;
-    private senderMap = new Map<string, ServiceBusSender>();
-
-    name = 'Azure Service Bus';
-
-    constructor() {
-    }
-
-    async init() {
-        const connectionString = `Endpoint=sb://${this.namespaceName}.servicebus.windows.net/;SharedAccessKeyName=${this.sasKeyName};SharedAccessKey=${this.sasKey}`;
-        this.sbClient = new ServiceBusClient(connectionString)
-        this.serviceBusService = new ServiceBusAdministrationClient(connectionString);
-
-        this.parseQueueProperties();
-
-        const listQueues = this.serviceBusService.listQueues();
-        for await (const queue of listQueues) {
-            this.queues.push(queue.name);
-        }
-
-        if (!this.queues.includes(this.requestTopic)) {
-            await this.createQueueIfNotExist(this.requestTopic);
-            this.queues.push(this.requestTopic);
-        }
-
-        this.receiver = this.sbClient.createReceiver(this.requestTopic, {receiveMode: 'peekLock'});
-
-        const messageProcessor = new JsInvokeMessageProcessor(this);
-
-        const messageHandler = async (message: ServiceBusReceivedMessage) => {
-            if (message) {
-                messageProcessor.onJsInvokeMessage(message.body);
-                await this.receiver.completeMessage(message);
-            }
-        };
-        const errorHandler = async (error: ProcessErrorArgs) => {
-            this.logger.error('Failed to receive message from queue.', error);
-        };
-        this.receiver.subscribe({processMessage: messageHandler, processError: errorHandler})
-    }
-
-    async send(responseTopic: string, msgKey: string, rawResponse: Buffer, headers: any): Promise<any> {
-        if (!this.queues.includes(this.requestTopic)) {
-            await this.createQueueIfNotExist(this.requestTopic);
-            this.queues.push(this.requestTopic);
-        }
-
-        let customSender = this.senderMap.get(responseTopic);
-
-        if (!customSender) {
-            customSender = this.sbClient.createSender(responseTopic);
-            this.senderMap.set(responseTopic, customSender);
-        }
-
-        let data = {
-            key: msgKey,
-            data: [...rawResponse],
-            headers: headers
-        };
-
-        return customSender.sendMessages({body: data});
-    }
-
-    private parseQueueProperties() {
-        let properties: { [n: string]: string } = {};
-        const props = this.queueProperties.split(';');
-        props.forEach(p => {
-            const delimiterPosition = p.indexOf(':');
-            properties[p.substring(0, delimiterPosition)] = p.substring(delimiterPosition + 1);
-        });
-        this.queueOptions = {
-            requiresDuplicateDetection: false,
-            maxSizeInMegabytes: Number(properties['maxSizeInMb']),
-            defaultMessageTimeToLive: `PT${properties['messageTimeToLiveInSec']}S`,
-            lockDuration: `PT${properties['lockDurationInSec']}S`
-        };
-    }
-
-    private async createQueueIfNotExist(topic: string) {
-        try {
-            await this.serviceBusService.createQueue(topic, this.queueOptions)
-        } catch (err: any) {
-            if (err && err.code !== "MessageEntityAlreadyExistsError") {
-                throw new Error(err);
-            }
-        }
-    }
-
-    async destroy() {
-        this.logger.info('Stopping Azure Service Bus resources...')
-        if (this.receiver) {
-            this.logger.info('Stopping Service Bus Receiver...');
-            try {
-                const _receiver = this.receiver;
-                // @ts-ignore
-                delete this.receiver;
-                await _receiver.close();
-                this.logger.info('Service Bus Receiver stopped.');
-            } catch (e) {
-                this.logger.info('Service Bus Receiver stop error.');
-            }
-        }
-
-        this.logger.info('Stopping Service Bus Senders...');
-        const senders: Promise<void>[] = [];
-        this.senderMap.forEach((sender) => {
-            senders.push(sender.close());
-        });
-        this.senderMap.clear();
-        try {
-            await Promise.all(senders);
-            this.logger.info('Service Bus Senders stopped.');
-        } catch (e) {
-            this.logger.info('Service Bus Senders stop error.');
-        }
-
-        if (this.sbClient) {
-            this.logger.info('Stopping Service Bus Client...');
-            try {
-                const _sbClient = this.sbClient;
-                // @ts-ignore
-                delete this.sbClient;
-                await _sbClient.close();
-                this.logger.info('Service Bus Client stopped.');
-            } catch (e) {
-                this.logger.info('Service Bus Client stop error.');
-            }
-        }
-        this.logger.info('Azure Service Bus resources stopped.')
-    }
-}
diff --git a/msa/js-executor/server.ts b/msa/js-executor/server.ts
index 5bd1f59692..50d326d1e8 100644
--- a/msa/js-executor/server.ts
+++ b/msa/js-executor/server.ts
@@ -19,10 +19,6 @@ import { _logger } from './config/logger';
 import { HttpServer } from './api/httpServer';
 import { IQueue } from './queue/queue.models';
 import { KafkaTemplate } from './queue/kafkaTemplate';
-import { PubSubTemplate } from './queue/pubSubTemplate';
-import { AwsSqsTemplate } from './queue/awsSqsTemplate';
-import { RabbitMqTemplate } from './queue/rabbitmqTemplate';
-import { ServiceBusTemplate } from './queue/serviceBusTemplate';
 
 const logger = _logger('main');
 
@@ -55,14 +51,6 @@ async function createQueue(serviceType: string): Promise<IQueue> {
     switch (serviceType) {
         case 'kafka':
             return new KafkaTemplate();
-        case 'pubsub':
-            return new PubSubTemplate();
-        case 'aws-sqs':
-            return new AwsSqsTemplate();
-        case 'rabbitmq':
-            return new RabbitMqTemplate();
-        case 'service-bus':
-            return new ServiceBusTemplate();
         default:
             throw new Error('Unknown service type: ' + serviceType);
     }
diff --git a/msa/js-executor/yarn.lock b/msa/js-executor/yarn.lock
index 662703f9be..7008959b89 100644
--- a/msa/js-executor/yarn.lock
+++ b/msa/js-executor/yarn.lock
@@ -2,604 +2,6 @@
 # yarn lockfile v1
 
 
-"@acuminous/bitsyntax@^0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@acuminous/bitsyntax/-/bitsyntax-0.1.2.tgz#e0b31b9ee7ad1e4dd840c34864327c33d9f1f653"
-  integrity sha512-29lUK80d1muEQqiUsSo+3A0yP6CdspgC95EnKBMi22Xlwt79i/En4Vr67+cXhU+cZjbti3TgGGC5wy1stIywVQ==
-  dependencies:
-    buffer-more-ints "~1.0.0"
-    debug "^4.3.4"
-    safe-buffer "~5.1.2"
-
-"@aws-crypto/sha256-browser@5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz#153895ef1dba6f9fce38af550e0ef58988eb649e"
-  integrity sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==
-  dependencies:
-    "@aws-crypto/sha256-js" "^5.2.0"
-    "@aws-crypto/supports-web-crypto" "^5.2.0"
-    "@aws-crypto/util" "^5.2.0"
-    "@aws-sdk/types" "^3.222.0"
-    "@aws-sdk/util-locate-window" "^3.0.0"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.6.2"
-
-"@aws-crypto/sha256-js@5.2.0", "@aws-crypto/sha256-js@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz#c4fdb773fdbed9a664fc1a95724e206cf3860042"
-  integrity sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==
-  dependencies:
-    "@aws-crypto/util" "^5.2.0"
-    "@aws-sdk/types" "^3.222.0"
-    tslib "^2.6.2"
-
-"@aws-crypto/supports-web-crypto@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz#a1e399af29269be08e695109aa15da0a07b5b5fb"
-  integrity sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==
-  dependencies:
-    tslib "^2.6.2"
-
-"@aws-crypto/util@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-5.2.0.tgz#71284c9cffe7927ddadac793c14f14886d3876da"
-  integrity sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==
-  dependencies:
-    "@aws-sdk/types" "^3.222.0"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/client-sqs@^3.682.0":
-  version "3.682.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sqs/-/client-sqs-3.682.0.tgz#5b714033a36f9934b627ff1891c3aba78624848a"
-  integrity sha512-93r0i2VwiHiZkcXfWVoxMpyw91Ou0C6gyS7AzPHoZ9ZoXV1VaBFqQ/FmcLzzNa9pwjE6k/Pn7VJMNKBezE8EmQ==
-  dependencies:
-    "@aws-crypto/sha256-browser" "5.2.0"
-    "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/client-sso-oidc" "3.682.0"
-    "@aws-sdk/client-sts" "3.682.0"
-    "@aws-sdk/core" "3.679.0"
-    "@aws-sdk/credential-provider-node" "3.682.0"
-    "@aws-sdk/middleware-host-header" "3.679.0"
-    "@aws-sdk/middleware-logger" "3.679.0"
-    "@aws-sdk/middleware-recursion-detection" "3.679.0"
-    "@aws-sdk/middleware-sdk-sqs" "3.679.0"
-    "@aws-sdk/middleware-user-agent" "3.682.0"
-    "@aws-sdk/region-config-resolver" "3.679.0"
-    "@aws-sdk/types" "3.679.0"
-    "@aws-sdk/util-endpoints" "3.679.0"
-    "@aws-sdk/util-user-agent-browser" "3.679.0"
-    "@aws-sdk/util-user-agent-node" "3.682.0"
-    "@smithy/config-resolver" "^3.0.9"
-    "@smithy/core" "^2.4.8"
-    "@smithy/fetch-http-handler" "^3.2.9"
-    "@smithy/hash-node" "^3.0.7"
-    "@smithy/invalid-dependency" "^3.0.7"
-    "@smithy/md5-js" "^3.0.7"
-    "@smithy/middleware-content-length" "^3.0.9"
-    "@smithy/middleware-endpoint" "^3.1.4"
-    "@smithy/middleware-retry" "^3.0.23"
-    "@smithy/middleware-serde" "^3.0.7"
-    "@smithy/middleware-stack" "^3.0.7"
-    "@smithy/node-config-provider" "^3.1.8"
-    "@smithy/node-http-handler" "^3.2.4"
-    "@smithy/protocol-http" "^4.1.4"
-    "@smithy/smithy-client" "^3.4.0"
-    "@smithy/types" "^3.5.0"
-    "@smithy/url-parser" "^3.0.7"
-    "@smithy/util-base64" "^3.0.0"
-    "@smithy/util-body-length-browser" "^3.0.0"
-    "@smithy/util-body-length-node" "^3.0.0"
-    "@smithy/util-defaults-mode-browser" "^3.0.23"
-    "@smithy/util-defaults-mode-node" "^3.0.23"
-    "@smithy/util-endpoints" "^2.1.3"
-    "@smithy/util-middleware" "^3.0.7"
-    "@smithy/util-retry" "^3.0.7"
-    "@smithy/util-utf8" "^3.0.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/client-sso-oidc@3.682.0":
-  version "3.682.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.682.0.tgz#423d6b3179fe560a515e3b286689414590f3263b"
-  integrity sha512-ZPZ7Y/r/w3nx/xpPzGSqSQsB090Xk5aZZOH+WBhTDn/pBEuim09BYXCLzvvxb7R7NnuoQdrTJiwimdJAhHl7ZQ==
-  dependencies:
-    "@aws-crypto/sha256-browser" "5.2.0"
-    "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.679.0"
-    "@aws-sdk/credential-provider-node" "3.682.0"
-    "@aws-sdk/middleware-host-header" "3.679.0"
-    "@aws-sdk/middleware-logger" "3.679.0"
-    "@aws-sdk/middleware-recursion-detection" "3.679.0"
-    "@aws-sdk/middleware-user-agent" "3.682.0"
-    "@aws-sdk/region-config-resolver" "3.679.0"
-    "@aws-sdk/types" "3.679.0"
-    "@aws-sdk/util-endpoints" "3.679.0"
-    "@aws-sdk/util-user-agent-browser" "3.679.0"
-    "@aws-sdk/util-user-agent-node" "3.682.0"
-    "@smithy/config-resolver" "^3.0.9"
-    "@smithy/core" "^2.4.8"
-    "@smithy/fetch-http-handler" "^3.2.9"
-    "@smithy/hash-node" "^3.0.7"
-    "@smithy/invalid-dependency" "^3.0.7"
-    "@smithy/middleware-content-length" "^3.0.9"
-    "@smithy/middleware-endpoint" "^3.1.4"
-    "@smithy/middleware-retry" "^3.0.23"
-    "@smithy/middleware-serde" "^3.0.7"
-    "@smithy/middleware-stack" "^3.0.7"
-    "@smithy/node-config-provider" "^3.1.8"
-    "@smithy/node-http-handler" "^3.2.4"
-    "@smithy/protocol-http" "^4.1.4"
-    "@smithy/smithy-client" "^3.4.0"
-    "@smithy/types" "^3.5.0"
-    "@smithy/url-parser" "^3.0.7"
-    "@smithy/util-base64" "^3.0.0"
-    "@smithy/util-body-length-browser" "^3.0.0"
-    "@smithy/util-body-length-node" "^3.0.0"
-    "@smithy/util-defaults-mode-browser" "^3.0.23"
-    "@smithy/util-defaults-mode-node" "^3.0.23"
-    "@smithy/util-endpoints" "^2.1.3"
-    "@smithy/util-middleware" "^3.0.7"
-    "@smithy/util-retry" "^3.0.7"
-    "@smithy/util-utf8" "^3.0.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/client-sso@3.682.0":
-  version "3.682.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.682.0.tgz#7533f677456d5f79cfcceed44a3481bcd86b560e"
-  integrity sha512-PYH9RFUMYLFl66HSBq4tIx6fHViMLkhJHTYJoJONpBs+Td+NwVJ895AdLtDsBIhMS0YseCbPpuyjUCJgsUrwUw==
-  dependencies:
-    "@aws-crypto/sha256-browser" "5.2.0"
-    "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.679.0"
-    "@aws-sdk/middleware-host-header" "3.679.0"
-    "@aws-sdk/middleware-logger" "3.679.0"
-    "@aws-sdk/middleware-recursion-detection" "3.679.0"
-    "@aws-sdk/middleware-user-agent" "3.682.0"
-    "@aws-sdk/region-config-resolver" "3.679.0"
-    "@aws-sdk/types" "3.679.0"
-    "@aws-sdk/util-endpoints" "3.679.0"
-    "@aws-sdk/util-user-agent-browser" "3.679.0"
-    "@aws-sdk/util-user-agent-node" "3.682.0"
-    "@smithy/config-resolver" "^3.0.9"
-    "@smithy/core" "^2.4.8"
-    "@smithy/fetch-http-handler" "^3.2.9"
-    "@smithy/hash-node" "^3.0.7"
-    "@smithy/invalid-dependency" "^3.0.7"
-    "@smithy/middleware-content-length" "^3.0.9"
-    "@smithy/middleware-endpoint" "^3.1.4"
-    "@smithy/middleware-retry" "^3.0.23"
-    "@smithy/middleware-serde" "^3.0.7"
-    "@smithy/middleware-stack" "^3.0.7"
-    "@smithy/node-config-provider" "^3.1.8"
-    "@smithy/node-http-handler" "^3.2.4"
-    "@smithy/protocol-http" "^4.1.4"
-    "@smithy/smithy-client" "^3.4.0"
-    "@smithy/types" "^3.5.0"
-    "@smithy/url-parser" "^3.0.7"
-    "@smithy/util-base64" "^3.0.0"
-    "@smithy/util-body-length-browser" "^3.0.0"
-    "@smithy/util-body-length-node" "^3.0.0"
-    "@smithy/util-defaults-mode-browser" "^3.0.23"
-    "@smithy/util-defaults-mode-node" "^3.0.23"
-    "@smithy/util-endpoints" "^2.1.3"
-    "@smithy/util-middleware" "^3.0.7"
-    "@smithy/util-retry" "^3.0.7"
-    "@smithy/util-utf8" "^3.0.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/client-sts@3.682.0":
-  version "3.682.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.682.0.tgz#97ff70ca141aa6ef48a22f14ef9727bd6ae17b03"
-  integrity sha512-xKuo4HksZ+F8m9DOfx/ZuWNhaPuqZFPwwy0xqcBT6sWH7OAuBjv/fnpOTzyQhpVTWddlf+ECtMAMrxjxuOExGQ==
-  dependencies:
-    "@aws-crypto/sha256-browser" "5.2.0"
-    "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/client-sso-oidc" "3.682.0"
-    "@aws-sdk/core" "3.679.0"
-    "@aws-sdk/credential-provider-node" "3.682.0"
-    "@aws-sdk/middleware-host-header" "3.679.0"
-    "@aws-sdk/middleware-logger" "3.679.0"
-    "@aws-sdk/middleware-recursion-detection" "3.679.0"
-    "@aws-sdk/middleware-user-agent" "3.682.0"
-    "@aws-sdk/region-config-resolver" "3.679.0"
-    "@aws-sdk/types" "3.679.0"
-    "@aws-sdk/util-endpoints" "3.679.0"
-    "@aws-sdk/util-user-agent-browser" "3.679.0"
-    "@aws-sdk/util-user-agent-node" "3.682.0"
-    "@smithy/config-resolver" "^3.0.9"
-    "@smithy/core" "^2.4.8"
-    "@smithy/fetch-http-handler" "^3.2.9"
-    "@smithy/hash-node" "^3.0.7"
-    "@smithy/invalid-dependency" "^3.0.7"
-    "@smithy/middleware-content-length" "^3.0.9"
-    "@smithy/middleware-endpoint" "^3.1.4"
-    "@smithy/middleware-retry" "^3.0.23"
-    "@smithy/middleware-serde" "^3.0.7"
-    "@smithy/middleware-stack" "^3.0.7"
-    "@smithy/node-config-provider" "^3.1.8"
-    "@smithy/node-http-handler" "^3.2.4"
-    "@smithy/protocol-http" "^4.1.4"
-    "@smithy/smithy-client" "^3.4.0"
-    "@smithy/types" "^3.5.0"
-    "@smithy/url-parser" "^3.0.7"
-    "@smithy/util-base64" "^3.0.0"
-    "@smithy/util-body-length-browser" "^3.0.0"
-    "@smithy/util-body-length-node" "^3.0.0"
-    "@smithy/util-defaults-mode-browser" "^3.0.23"
-    "@smithy/util-defaults-mode-node" "^3.0.23"
-    "@smithy/util-endpoints" "^2.1.3"
-    "@smithy/util-middleware" "^3.0.7"
-    "@smithy/util-retry" "^3.0.7"
-    "@smithy/util-utf8" "^3.0.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/core@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.679.0.tgz#102aa1d19db5bdcabefc2dcd044f2fb5d0771568"
-  integrity sha512-CS6PWGX8l4v/xyvX8RtXnBisdCa5+URzKd0L6GvHChype9qKUVxO/Gg6N/y43Hvg7MNWJt9FBPNWIxUB+byJwg==
-  dependencies:
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/core" "^2.4.8"
-    "@smithy/node-config-provider" "^3.1.8"
-    "@smithy/property-provider" "^3.1.7"
-    "@smithy/protocol-http" "^4.1.4"
-    "@smithy/signature-v4" "^4.2.0"
-    "@smithy/smithy-client" "^3.4.0"
-    "@smithy/types" "^3.5.0"
-    "@smithy/util-middleware" "^3.0.7"
-    fast-xml-parser "4.4.1"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-env@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.679.0.tgz#abf297714b77197a9da0d3d95a0f5687ae28e5b3"
-  integrity sha512-EdlTYbzMm3G7VUNAMxr9S1nC1qUNqhKlAxFU8E7cKsAe8Bp29CD5HAs3POc56AVo9GC4yRIS+/mtlZSmrckzUA==
-  dependencies:
-    "@aws-sdk/core" "3.679.0"
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/property-provider" "^3.1.7"
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-http@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.679.0.tgz#9fc29f4ec7ab52ecf394288c05295823e818d812"
-  integrity sha512-ZoKLubW5DqqV1/2a3TSn+9sSKg0T8SsYMt1JeirnuLJF0mCoYFUaWMyvxxKuxPoqvUsaycxKru4GkpJ10ltNBw==
-  dependencies:
-    "@aws-sdk/core" "3.679.0"
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/fetch-http-handler" "^3.2.9"
-    "@smithy/node-http-handler" "^3.2.4"
-    "@smithy/property-provider" "^3.1.7"
-    "@smithy/protocol-http" "^4.1.4"
-    "@smithy/smithy-client" "^3.4.0"
-    "@smithy/types" "^3.5.0"
-    "@smithy/util-stream" "^3.1.9"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-ini@3.682.0":
-  version "3.682.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.682.0.tgz#36a68cd8d0ec3b14acf413166dce72a201fcc2bd"
-  integrity sha512-6eqWeHdK6EegAxqDdiCi215nT3QZPwukgWAYuVxNfJ/5m0/P7fAzF+D5kKVgByUvGJEbq/FEL8Fw7OBe64AA+g==
-  dependencies:
-    "@aws-sdk/core" "3.679.0"
-    "@aws-sdk/credential-provider-env" "3.679.0"
-    "@aws-sdk/credential-provider-http" "3.679.0"
-    "@aws-sdk/credential-provider-process" "3.679.0"
-    "@aws-sdk/credential-provider-sso" "3.682.0"
-    "@aws-sdk/credential-provider-web-identity" "3.679.0"
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/credential-provider-imds" "^3.2.4"
-    "@smithy/property-provider" "^3.1.7"
-    "@smithy/shared-ini-file-loader" "^3.1.8"
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-node@3.682.0":
-  version "3.682.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.682.0.tgz#4ec1ebd00dcacb46ae76747b23ebf7bda04808bd"
-  integrity sha512-HSmDqZcBVZrTctHCT9m++vdlDfJ1ARI218qmZa+TZzzOFNpKWy6QyHMEra45GB9GnkkMmV6unoDSPMuN0AqcMg==
-  dependencies:
-    "@aws-sdk/credential-provider-env" "3.679.0"
-    "@aws-sdk/credential-provider-http" "3.679.0"
-    "@aws-sdk/credential-provider-ini" "3.682.0"
-    "@aws-sdk/credential-provider-process" "3.679.0"
-    "@aws-sdk/credential-provider-sso" "3.682.0"
-    "@aws-sdk/credential-provider-web-identity" "3.679.0"
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/credential-provider-imds" "^3.2.4"
-    "@smithy/property-provider" "^3.1.7"
-    "@smithy/shared-ini-file-loader" "^3.1.8"
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-process@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.679.0.tgz#a06b5193cdad2c14382708bcd44d487af52b11dc"
-  integrity sha512-u/p4TV8kQ0zJWDdZD4+vdQFTMhkDEJFws040Gm113VHa/Xo1SYOjbpvqeuFoz6VmM0bLvoOWjxB9MxnSQbwKpQ==
-  dependencies:
-    "@aws-sdk/core" "3.679.0"
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/property-provider" "^3.1.7"
-    "@smithy/shared-ini-file-loader" "^3.1.8"
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-sso@3.682.0":
-  version "3.682.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.682.0.tgz#aa7e3ffdac82bfc14fc0cf136cec3152f863a63a"
-  integrity sha512-h7IH1VsWgV6YAJSWWV6y8uaRjGqLY3iBpGZlXuTH/c236NMLaNv+WqCBLeBxkFGUb2WeQ+FUPEJDCD69rgLIkg==
-  dependencies:
-    "@aws-sdk/client-sso" "3.682.0"
-    "@aws-sdk/core" "3.679.0"
-    "@aws-sdk/token-providers" "3.679.0"
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/property-provider" "^3.1.7"
-    "@smithy/shared-ini-file-loader" "^3.1.8"
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-web-identity@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.679.0.tgz#5871c44e5846e7c93810fd033224c00493db65a3"
-  integrity sha512-a74tLccVznXCaBefWPSysUcLXYJiSkeUmQGtalNgJ1vGkE36W5l/8czFiiowdWdKWz7+x6xf0w+Kjkjlj42Ung==
-  dependencies:
-    "@aws-sdk/core" "3.679.0"
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/property-provider" "^3.1.7"
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/middleware-host-header@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.679.0.tgz#1eabe42250c57a9e28742dd04786781573faad1a"
-  integrity sha512-y176HuQ8JRY3hGX8rQzHDSbCl9P5Ny9l16z4xmaiLo+Qfte7ee4Yr3yaAKd7GFoJ3/Mhud2XZ37fR015MfYl2w==
-  dependencies:
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/protocol-http" "^4.1.4"
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/middleware-logger@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.679.0.tgz#cb0f205ddb5341d8327fc9ca1897bf06526c1896"
-  integrity sha512-0vet8InEj7nvIvGKk+ch7bEF5SyZ7Us9U7YTEgXPrBNStKeRUsgwRm0ijPWWd0a3oz2okaEwXsFl7G/vI0XiEA==
-  dependencies:
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/middleware-recursion-detection@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.679.0.tgz#3542de5baa466abffbfe5ee485fd87f60d5f917e"
-  integrity sha512-sQoAZFsQiW/LL3DfKMYwBoGjYDEnMbA9WslWN8xneCmBAwKo6IcSksvYs23PP8XMIoBGe2I2J9BSr654XWygTQ==
-  dependencies:
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/protocol-http" "^4.1.4"
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/middleware-sdk-sqs@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sqs/-/middleware-sdk-sqs-3.679.0.tgz#d2ccda366b3808081d331b1f2410797cd621431a"
-  integrity sha512-GjOpT9GRMH6n3Rm9ZsRsrIbLxBPE3/L1KMkIn2uZj14uqz1pdE4ALCN9b9ZkPN+L//rsUrYqtd9gq9Hn9c2FJw==
-  dependencies:
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/smithy-client" "^3.4.0"
-    "@smithy/types" "^3.5.0"
-    "@smithy/util-hex-encoding" "^3.0.0"
-    "@smithy/util-utf8" "^3.0.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/middleware-user-agent@3.682.0":
-  version "3.682.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.682.0.tgz#07d75723bce31e65a29ad0934347537e50e3536e"
-  integrity sha512-7TyvYR9HdGH1/Nq0eeApUTM4izB6rExiw87khVYuJwZHr6FmvIL1FsOVFro/4WlXa0lg4LiYOm/8H8dHv+fXTg==
-  dependencies:
-    "@aws-sdk/core" "3.679.0"
-    "@aws-sdk/types" "3.679.0"
-    "@aws-sdk/util-endpoints" "3.679.0"
-    "@smithy/core" "^2.4.8"
-    "@smithy/protocol-http" "^4.1.4"
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/region-config-resolver@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.679.0.tgz#d205dbaea8385aaf05e637fb7cb095c60bc708be"
-  integrity sha512-Ybx54P8Tg6KKq5ck7uwdjiKif7n/8g1x+V0V9uTjBjRWqaIgiqzXwKWoPj6NCNkE7tJNtqI4JrNxp/3S3HvmRw==
-  dependencies:
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/node-config-provider" "^3.1.8"
-    "@smithy/types" "^3.5.0"
-    "@smithy/util-config-provider" "^3.0.0"
-    "@smithy/util-middleware" "^3.0.7"
-    tslib "^2.6.2"
-
-"@aws-sdk/token-providers@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.679.0.tgz#7ec462d93941dd3cfdc245104ad32971f6ebc4f6"
-  integrity sha512-1/+Zso/x2jqgutKixYFQEGli0FELTgah6bm7aB+m2FAWH4Hz7+iMUsazg6nSWm714sG9G3h5u42Dmpvi9X6/hA==
-  dependencies:
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/property-provider" "^3.1.7"
-    "@smithy/shared-ini-file-loader" "^3.1.8"
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/types@3.679.0", "@aws-sdk/types@^3.222.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.679.0.tgz#3737bb0f190add9e788b838a24cd5d8106dbed4f"
-  integrity sha512-NwVq8YvInxQdJ47+zz4fH3BRRLC6lL+WLkvr242PVBbUOLRyK/lkwHlfiKUoeVIMyK5NF+up6TRg71t/8Bny6Q==
-  dependencies:
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/util-endpoints@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.679.0.tgz#b249ad8b4289e634cb5dfb3873a70b7aecbf323f"
-  integrity sha512-YL6s4Y/1zC45OvddvgE139fjeWSKKPgLlnfrvhVL7alNyY9n7beR4uhoDpNrt5mI6sn9qiBF17790o+xLAXjjg==
-  dependencies:
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/types" "^3.5.0"
-    "@smithy/util-endpoints" "^2.1.3"
-    tslib "^2.6.2"
-
-"@aws-sdk/util-locate-window@^3.0.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.679.0.tgz#8d5898624691e12ccbad839e103562002bbec85e"
-  integrity sha512-zKTd48/ZWrCplkXpYDABI74rQlbR0DNHs8nH95htfSLj9/mWRSwaGptoxwcihaq/77vi/fl2X3y0a1Bo8bt7RA==
-  dependencies:
-    tslib "^2.6.2"
-
-"@aws-sdk/util-user-agent-browser@3.679.0":
-  version "3.679.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.679.0.tgz#bbaa5a8771c8a16388cd3cd934bb84a641ce907d"
-  integrity sha512-CusSm2bTBG1kFypcsqU8COhnYc6zltobsqs3nRrvYqYaOqtMnuE46K4XTWpnzKgwDejgZGOE+WYyprtAxrPvmQ==
-  dependencies:
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/types" "^3.5.0"
-    bowser "^2.11.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/util-user-agent-node@3.682.0":
-  version "3.682.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.682.0.tgz#a493d2afb160c5cd4ab0520f929e9b7a2b36f74e"
-  integrity sha512-so5s+j0gPoTS0HM4HPL+G0ajk0T6cQAg8JXzRgvyiQAxqie+zGCZAV3VuVeMNWMVbzsgZl0pYZaatPFTLG/AxA==
-  dependencies:
-    "@aws-sdk/middleware-user-agent" "3.682.0"
-    "@aws-sdk/types" "3.679.0"
-    "@smithy/node-config-provider" "^3.1.8"
-    "@smithy/types" "^3.5.0"
-    tslib "^2.6.2"
-
-"@azure/abort-controller@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.1.0.tgz#788ee78457a55af8a1ad342acb182383d2119249"
-  integrity sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==
-  dependencies:
-    tslib "^2.2.0"
-
-"@azure/abort-controller@^2.0.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-2.1.2.tgz#42fe0ccab23841d9905812c58f1082d27784566d"
-  integrity sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==
-  dependencies:
-    tslib "^2.6.2"
-
-"@azure/core-amqp@^4.1.1":
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/@azure/core-amqp/-/core-amqp-4.3.2.tgz#689ea6c363c09a4298a10226b3794f456e3460a1"
-  integrity sha512-I8sI81E0o38zYjdXcM8cnnvveM6X3f90zqi51zSuD+ZX96P6ZsW8jEXpd/1E7aEUG+MuFGnsEx0iPPS53Lpfnw==
-  dependencies:
-    "@azure/abort-controller" "^2.0.0"
-    "@azure/core-auth" "^1.7.2"
-    "@azure/core-util" "^1.9.0"
-    "@azure/logger" "^1.1.2"
-    buffer "^6.0.3"
-    events "^3.3.0"
-    process "^0.11.10"
-    rhea "^3.0.0"
-    rhea-promise "^3.0.0"
-    tslib "^2.6.2"
-
-"@azure/core-auth@^1.3.0", "@azure/core-auth@^1.4.0", "@azure/core-auth@^1.7.2", "@azure/core-auth@^1.8.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.9.0.tgz#ac725b03fabe3c892371065ee9e2041bee0fd1ac"
-  integrity sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw==
-  dependencies:
-    "@azure/abort-controller" "^2.0.0"
-    "@azure/core-util" "^1.11.0"
-    tslib "^2.6.2"
-
-"@azure/core-client@^1.0.0":
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/@azure/core-client/-/core-client-1.9.2.tgz#6fc69cee2816883ab6c5cdd653ee4f2ff9774f74"
-  integrity sha512-kRdry/rav3fUKHl/aDLd/pDLcB+4pOFwPPTVEExuMyaI5r+JBbMWqRbCY1pn5BniDaU3lRxO9eaQ1AmSMehl/w==
-  dependencies:
-    "@azure/abort-controller" "^2.0.0"
-    "@azure/core-auth" "^1.4.0"
-    "@azure/core-rest-pipeline" "^1.9.1"
-    "@azure/core-tracing" "^1.0.0"
-    "@azure/core-util" "^1.6.1"
-    "@azure/logger" "^1.0.0"
-    tslib "^2.6.2"
-
-"@azure/core-paging@^1.4.0":
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.6.2.tgz#40d3860dc2df7f291d66350b2cfd9171526433e7"
-  integrity sha512-YKWi9YuCU04B55h25cnOYZHxXYtEvQEbKST5vqRga7hWY9ydd3FZHdeQF8pyh+acWZvppw13M/LMGx0LABUVMA==
-  dependencies:
-    tslib "^2.6.2"
-
-"@azure/core-rest-pipeline@^1.1.0", "@azure/core-rest-pipeline@^1.9.1":
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.17.0.tgz#55dafa1093553c549ed6d8dbca69aa505c7b3aa3"
-  integrity sha512-62Vv8nC+uPId3j86XJ0WI+sBf0jlqTqPUFCBNrGtlaUeQUIXWV/D8GE5A1d+Qx8H7OQojn2WguC8kChD6v0shA==
-  dependencies:
-    "@azure/abort-controller" "^2.0.0"
-    "@azure/core-auth" "^1.8.0"
-    "@azure/core-tracing" "^1.0.1"
-    "@azure/core-util" "^1.9.0"
-    "@azure/logger" "^1.0.0"
-    http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.0"
-    tslib "^2.6.2"
-
-"@azure/core-tracing@^1.0.0", "@azure/core-tracing@^1.0.1":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.2.0.tgz#7be5d53c3522d639cf19042cbcdb19f71bc35ab2"
-  integrity sha512-UKTiEJPkWcESPYJz3X5uKRYyOcJD+4nYph+KpfdPRnQJVrZfk0KJgdnaAWKfhsBBtAf/D58Az4AvCJEmWgIBAg==
-  dependencies:
-    tslib "^2.6.2"
-
-"@azure/core-util@^1.1.1", "@azure/core-util@^1.11.0", "@azure/core-util@^1.6.1", "@azure/core-util@^1.9.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.11.0.tgz#f530fc67e738aea872fbdd1cc8416e70219fada7"
-  integrity sha512-DxOSLua+NdpWoSqULhjDyAZTXFdP/LKkqtYuxxz1SCN289zk3OG8UOpnCQAz/tygyACBtWp/BoO72ptK7msY8g==
-  dependencies:
-    "@azure/abort-controller" "^2.0.0"
-    tslib "^2.6.2"
-
-"@azure/core-xml@^1.0.0":
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/@azure/core-xml/-/core-xml-1.4.4.tgz#a8656751943bf492762f758d147d33dfcd933d9e"
-  integrity sha512-J4FYAqakGXcbfeZjwjMzjNcpcH4E+JtEBv+xcV1yL0Ydn/6wbQfeFKTCHh9wttAi0lmajHw7yBbHPRG+YHckZQ==
-  dependencies:
-    fast-xml-parser "^4.4.1"
-    tslib "^2.6.2"
-
-"@azure/logger@^1.0.0", "@azure/logger@^1.1.2":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.1.4.tgz#223cbf2b424dfa66478ce9a4f575f59c6f379768"
-  integrity sha512-4IXXzcCdLdlXuCG+8UKEwLA1T1NHqUfanhXYHiQTn+6sfWCZXduqbtXDGceg3Ce5QxTGo7EqmbV6Bi+aqKuClQ==
-  dependencies:
-    tslib "^2.6.2"
-
-"@azure/service-bus@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@azure/service-bus/-/service-bus-7.9.5.tgz#ad5a6f3caf9e3269c5e838d7b15ecd030e2d8d33"
-  integrity sha512-R5Af+4jtZZII2snLomaddMyElFtTCBRZp2qERPlP8PuISLU87eFYFM7xWzxjNd0yeiyQUBkamx/ZhOC8eWhCHA==
-  dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-amqp" "^4.1.1"
-    "@azure/core-auth" "^1.3.0"
-    "@azure/core-client" "^1.0.0"
-    "@azure/core-paging" "^1.4.0"
-    "@azure/core-rest-pipeline" "^1.1.0"
-    "@azure/core-tracing" "^1.0.0"
-    "@azure/core-util" "^1.1.1"
-    "@azure/core-xml" "^1.0.0"
-    "@azure/logger" "^1.0.0"
-    "@types/is-buffer" "^2.0.0"
-    buffer "^6.0.0"
-    is-buffer "^2.0.3"
-    jssha "^3.1.0"
-    long "^5.2.0"
-    process "^0.11.10"
-    rhea-promise "^3.0.0"
-    tslib "^2.2.0"
-
 "@babel/generator@7.18.2":
   version "7.18.2"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d"
@@ -662,67 +64,6 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@google-cloud/paginator@^5.0.0":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-5.0.2.tgz#86ad773266ce9f3b82955a8f75e22cd012ccc889"
-  integrity sha512-DJS3s0OVH4zFDB1PzjxAsHqJT6sKVbRwwML0ZBP9PbU7Yebtu/7SWMRzvO2J3nUi9pRNITCfu4LJeooM2w4pjg==
-  dependencies:
-    arrify "^2.0.0"
-    extend "^3.0.2"
-
-"@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@^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@^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@^4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/pubsub/-/pubsub-4.8.0.tgz#b51acb0c75c6975deeaa7a68d0b56a5d736bb048"
-  integrity sha512-H9S4i5mAeQg5A4MZox8XfWnoxlMehlIn8QHWZ3iOj7Kz/yaHufsI5JtSGaezjZv+wF4elur5Yycygnl6pWHSyg==
-  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.9.0"
-    "@opentelemetry/semantic-conventions" "~1.26.0"
-    arrify "^2.0.0"
-    extend "^3.0.2"
-    google-auth-library "^9.3.0"
-    google-gax "^4.3.3"
-    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.10.9":
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.12.2.tgz#97eda82dd49bb9c24eaf6434ea8d7de446e95aac"
-  integrity sha512-bgxdZmgTrJZX50OjyVwz3+mNEnCTNkh3cIqGPWVNeW9jX6bn1ZkU80uPd+67/ZpIJIjRQ9qaHCjhavyoWYxumg==
-  dependencies:
-    "@grpc/proto-loader" "^0.7.13"
-    "@js-sdsl/ordered-map" "^4.4.2"
-
-"@grpc/proto-loader@^0.7.13":
-  version "0.7.13"
-  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.13.tgz#f6a44b2b7c9f7b609f5748c6eac2d420e37670cf"
-  integrity sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==
-  dependencies:
-    lodash.camelcase "^4.3.0"
-    long "^5.0.0"
-    protobufjs "^7.2.5"
-    yargs "^17.7.2"
-
 "@jridgewell/gen-mapping@^0.3.0":
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
@@ -763,11 +104,6 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@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.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -789,487 +125,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@opentelemetry/api@~1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe"
-  integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==
-
-"@opentelemetry/semantic-conventions@~1.26.0":
-  version "1.26.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.26.0.tgz#42da14476529ca86d0af4c11f58910f242a0a232"
-  integrity sha512-U9PJlOswJPSgQVPI+XEuNLElyFWkb0hAiMg+DExD9V0St03X2lPHGMdxMY/LrVmoukuIpXJ12oyrOtEZ4uXFkw==
-
-"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
-  integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
-
-"@protobufjs/base64@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
-  integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
-
-"@protobufjs/codegen@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
-  integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
-
-"@protobufjs/eventemitter@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
-  integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
-
-"@protobufjs/fetch@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
-  integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.1"
-    "@protobufjs/inquire" "^1.1.0"
-
-"@protobufjs/float@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
-  integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
-
-"@protobufjs/inquire@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
-  integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
-
-"@protobufjs/path@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
-  integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
-
-"@protobufjs/pool@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
-  integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
-
-"@protobufjs/utf8@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
-  integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
-
-"@smithy/abort-controller@^3.1.6":
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-3.1.6.tgz#d9de97b85ca277df6ffb9ee7cd83d5da793ee6de"
-  integrity sha512-0XuhuHQlEqbNQZp7QxxrFTdVWdwxch4vjxYgfInF91hZFkPxf9QDrdQka0KfxFMPqLNzSw0b95uGTrLliQUavQ==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/config-resolver@^3.0.10", "@smithy/config-resolver@^3.0.9":
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-3.0.10.tgz#d9529d9893e5fae1f14cb1ffd55517feb6d7e50f"
-  integrity sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw==
-  dependencies:
-    "@smithy/node-config-provider" "^3.1.9"
-    "@smithy/types" "^3.6.0"
-    "@smithy/util-config-provider" "^3.0.0"
-    "@smithy/util-middleware" "^3.0.8"
-    tslib "^2.6.2"
-
-"@smithy/core@^2.4.8", "@smithy/core@^2.5.1":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-2.5.1.tgz#7f635b76778afca845bcb401d36f22fa37712f15"
-  integrity sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg==
-  dependencies:
-    "@smithy/middleware-serde" "^3.0.8"
-    "@smithy/protocol-http" "^4.1.5"
-    "@smithy/types" "^3.6.0"
-    "@smithy/util-body-length-browser" "^3.0.0"
-    "@smithy/util-middleware" "^3.0.8"
-    "@smithy/util-stream" "^3.2.1"
-    "@smithy/util-utf8" "^3.0.0"
-    tslib "^2.6.2"
-
-"@smithy/credential-provider-imds@^3.2.4", "@smithy/credential-provider-imds@^3.2.5":
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.5.tgz#dbfd849a4a7ebd68519cd9fc35f78d091e126d0a"
-  integrity sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg==
-  dependencies:
-    "@smithy/node-config-provider" "^3.1.9"
-    "@smithy/property-provider" "^3.1.8"
-    "@smithy/types" "^3.6.0"
-    "@smithy/url-parser" "^3.0.8"
-    tslib "^2.6.2"
-
-"@smithy/fetch-http-handler@^3.2.9":
-  version "3.2.9"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz#8d5199c162a37caa37a8b6848eefa9ca58221a0b"
-  integrity sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A==
-  dependencies:
-    "@smithy/protocol-http" "^4.1.4"
-    "@smithy/querystring-builder" "^3.0.7"
-    "@smithy/types" "^3.5.0"
-    "@smithy/util-base64" "^3.0.0"
-    tslib "^2.6.2"
-
-"@smithy/fetch-http-handler@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-4.0.0.tgz#3763cb5178745ed630ed5bc3beb6328abdc31f36"
-  integrity sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g==
-  dependencies:
-    "@smithy/protocol-http" "^4.1.5"
-    "@smithy/querystring-builder" "^3.0.8"
-    "@smithy/types" "^3.6.0"
-    "@smithy/util-base64" "^3.0.0"
-    tslib "^2.6.2"
-
-"@smithy/hash-node@^3.0.7":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-3.0.8.tgz#f451cc342f74830466b0b39bf985dc3022634065"
-  integrity sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-    "@smithy/util-buffer-from" "^3.0.0"
-    "@smithy/util-utf8" "^3.0.0"
-    tslib "^2.6.2"
-
-"@smithy/invalid-dependency@^3.0.7":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.8.tgz#4d381a4c24832371ade79e904a72c173c9851e5f"
-  integrity sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/is-array-buffer@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz#f84f0d9f9a36601a9ca9381688bd1b726fd39111"
-  integrity sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/is-array-buffer@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz#9a95c2d46b8768946a9eec7f935feaddcffa5e7a"
-  integrity sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/md5-js@^3.0.7":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/md5-js/-/md5-js-3.0.8.tgz#837e54094007e87bf5196e11eca453d1c1e83a26"
-  integrity sha512-LwApfTK0OJ/tCyNUXqnWCKoE2b4rDSr4BJlDAVCkiWYeHESr+y+d5zlAanuLW6fnitVJRD/7d9/kN/ZM9Su4mA==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-    "@smithy/util-utf8" "^3.0.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-content-length@^3.0.9":
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.10.tgz#738266f6d81436d7e3a86bea931bc64e04ae7dbf"
-  integrity sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg==
-  dependencies:
-    "@smithy/protocol-http" "^4.1.5"
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-endpoint@^3.1.4", "@smithy/middleware-endpoint@^3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.2.1.tgz#b9ee42d29d8f3a266883d293c4d6a586f7b60979"
-  integrity sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA==
-  dependencies:
-    "@smithy/core" "^2.5.1"
-    "@smithy/middleware-serde" "^3.0.8"
-    "@smithy/node-config-provider" "^3.1.9"
-    "@smithy/shared-ini-file-loader" "^3.1.9"
-    "@smithy/types" "^3.6.0"
-    "@smithy/url-parser" "^3.0.8"
-    "@smithy/util-middleware" "^3.0.8"
-    tslib "^2.6.2"
-
-"@smithy/middleware-retry@^3.0.23":
-  version "3.0.25"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-3.0.25.tgz#a6b1081fc1a0991ffe1d15e567e76198af01f37c"
-  integrity sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg==
-  dependencies:
-    "@smithy/node-config-provider" "^3.1.9"
-    "@smithy/protocol-http" "^4.1.5"
-    "@smithy/service-error-classification" "^3.0.8"
-    "@smithy/smithy-client" "^3.4.2"
-    "@smithy/types" "^3.6.0"
-    "@smithy/util-middleware" "^3.0.8"
-    "@smithy/util-retry" "^3.0.8"
-    tslib "^2.6.2"
-    uuid "^9.0.1"
-
-"@smithy/middleware-serde@^3.0.7", "@smithy/middleware-serde@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-3.0.8.tgz#a46d10dba3c395be0d28610d55c89ff8c07c0cd3"
-  integrity sha512-Xg2jK9Wc/1g/MBMP/EUn2DLspN8LNt+GMe7cgF+Ty3vl+Zvu+VeZU5nmhveU+H8pxyTsjrAkci8NqY6OuvZnjA==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-stack@^3.0.7", "@smithy/middleware-stack@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-3.0.8.tgz#f1c7d9c7fe8280c6081141c88f4a76875da1fc43"
-  integrity sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/node-config-provider@^3.1.8", "@smithy/node-config-provider@^3.1.9":
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-3.1.9.tgz#d27ba8e4753f1941c24ed0af824dbc6c492f510a"
-  integrity sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew==
-  dependencies:
-    "@smithy/property-provider" "^3.1.8"
-    "@smithy/shared-ini-file-loader" "^3.1.9"
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/node-http-handler@^3.2.4", "@smithy/node-http-handler@^3.2.5":
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-3.2.5.tgz#ad9d9ba1528bf0d4a655135e978ecc14b3df26a2"
-  integrity sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w==
-  dependencies:
-    "@smithy/abort-controller" "^3.1.6"
-    "@smithy/protocol-http" "^4.1.5"
-    "@smithy/querystring-builder" "^3.0.8"
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/property-provider@^3.1.7", "@smithy/property-provider@^3.1.8":
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-3.1.8.tgz#b1c5a3949effbb9772785ad7ddc5b4b235b10fbe"
-  integrity sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/protocol-http@^4.1.4", "@smithy/protocol-http@^4.1.5":
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-4.1.5.tgz#a1f397440f299b6a5abeed6866957fecb1bf5013"
-  integrity sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/querystring-builder@^3.0.7", "@smithy/querystring-builder@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-3.0.8.tgz#0d845be53aa624771c518d1412881236ce12ed4f"
-  integrity sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-    "@smithy/util-uri-escape" "^3.0.0"
-    tslib "^2.6.2"
-
-"@smithy/querystring-parser@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-3.0.8.tgz#057a8e2d301eea8eac7071923100ba38a824d7df"
-  integrity sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/service-error-classification@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-3.0.8.tgz#265ad2573b972f6c7bdd1ad6c5155a88aeeea1c4"
-  integrity sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-
-"@smithy/shared-ini-file-loader@^3.1.8", "@smithy/shared-ini-file-loader@^3.1.9":
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.9.tgz#1b77852b5bb176445e1d80333fa3f739313a4928"
-  integrity sha512-/+OsJRNtoRbtsX0UpSgWVxFZLsJHo/4sTr+kBg/J78sr7iC+tHeOvOJrS5hCpVQ6sWBbhWLp1UNiuMyZhE6pmA==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/signature-v4@^4.2.0":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-4.2.1.tgz#a918fd7d99af9f60aa07617506fa54be408126ee"
-  integrity sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg==
-  dependencies:
-    "@smithy/is-array-buffer" "^3.0.0"
-    "@smithy/protocol-http" "^4.1.5"
-    "@smithy/types" "^3.6.0"
-    "@smithy/util-hex-encoding" "^3.0.0"
-    "@smithy/util-middleware" "^3.0.8"
-    "@smithy/util-uri-escape" "^3.0.0"
-    "@smithy/util-utf8" "^3.0.0"
-    tslib "^2.6.2"
-
-"@smithy/smithy-client@^3.4.0", "@smithy/smithy-client@^3.4.2":
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-3.4.2.tgz#a6e3ed98330ce170cf482e765bd0c21e0fde8ae4"
-  integrity sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA==
-  dependencies:
-    "@smithy/core" "^2.5.1"
-    "@smithy/middleware-endpoint" "^3.2.1"
-    "@smithy/middleware-stack" "^3.0.8"
-    "@smithy/protocol-http" "^4.1.5"
-    "@smithy/types" "^3.6.0"
-    "@smithy/util-stream" "^3.2.1"
-    tslib "^2.6.2"
-
-"@smithy/types@^3.5.0", "@smithy/types@^3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-3.6.0.tgz#03a52bfd62ee4b7b2a1842c8ae3ada7a0a5ff3a4"
-  integrity sha512-8VXK/KzOHefoC65yRgCn5vG1cysPJjHnOVt9d0ybFQSmJgQj152vMn4EkYhGuaOmnnZvCPav/KnYyE6/KsNZ2w==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/url-parser@^3.0.7", "@smithy/url-parser@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-3.0.8.tgz#8057d91d55ba8df97d74576e000f927b42da9e18"
-  integrity sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg==
-  dependencies:
-    "@smithy/querystring-parser" "^3.0.8"
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/util-base64@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-3.0.0.tgz#f7a9a82adf34e27a72d0719395713edf0e493017"
-  integrity sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==
-  dependencies:
-    "@smithy/util-buffer-from" "^3.0.0"
-    "@smithy/util-utf8" "^3.0.0"
-    tslib "^2.6.2"
-
-"@smithy/util-body-length-browser@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz#86ec2f6256310b4845a2f064e2f571c1ca164ded"
-  integrity sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/util-body-length-node@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz#99a291bae40d8932166907fe981d6a1f54298a6d"
-  integrity sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/util-buffer-from@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz#6fc88585165ec73f8681d426d96de5d402021e4b"
-  integrity sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==
-  dependencies:
-    "@smithy/is-array-buffer" "^2.2.0"
-    tslib "^2.6.2"
-
-"@smithy/util-buffer-from@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz#559fc1c86138a89b2edaefc1e6677780c24594e3"
-  integrity sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==
-  dependencies:
-    "@smithy/is-array-buffer" "^3.0.0"
-    tslib "^2.6.2"
-
-"@smithy/util-config-provider@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz#62c6b73b22a430e84888a8f8da4b6029dd5b8efe"
-  integrity sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/util-defaults-mode-browser@^3.0.23":
-  version "3.0.25"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.25.tgz#ef9b84272d1db23503ff155f9075a4543ab6dab7"
-  integrity sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA==
-  dependencies:
-    "@smithy/property-provider" "^3.1.8"
-    "@smithy/smithy-client" "^3.4.2"
-    "@smithy/types" "^3.6.0"
-    bowser "^2.11.0"
-    tslib "^2.6.2"
-
-"@smithy/util-defaults-mode-node@^3.0.23":
-  version "3.0.25"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.25.tgz#c16fe3995c8e90ae318e336178392173aebe1e37"
-  integrity sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g==
-  dependencies:
-    "@smithy/config-resolver" "^3.0.10"
-    "@smithy/credential-provider-imds" "^3.2.5"
-    "@smithy/node-config-provider" "^3.1.9"
-    "@smithy/property-provider" "^3.1.8"
-    "@smithy/smithy-client" "^3.4.2"
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/util-endpoints@^2.1.3":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-2.1.4.tgz#a29134c2b1982442c5fc3be18d9b22796e8eb964"
-  integrity sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ==
-  dependencies:
-    "@smithy/node-config-provider" "^3.1.9"
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/util-hex-encoding@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz#32938b33d5bf2a15796cd3f178a55b4155c535e6"
-  integrity sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/util-middleware@^3.0.7", "@smithy/util-middleware@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-3.0.8.tgz#372bc7a2845408ad69da039d277fc23c2734d0c6"
-  integrity sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA==
-  dependencies:
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/util-retry@^3.0.7", "@smithy/util-retry@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-3.0.8.tgz#9c607c175a4d8a87b5d8ebaf308f6b849e4dc4d0"
-  integrity sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow==
-  dependencies:
-    "@smithy/service-error-classification" "^3.0.8"
-    "@smithy/types" "^3.6.0"
-    tslib "^2.6.2"
-
-"@smithy/util-stream@^3.1.9", "@smithy/util-stream@^3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-3.2.1.tgz#f3055dc4c8caba8af4e47191ea7e773d0e5a429d"
-  integrity sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A==
-  dependencies:
-    "@smithy/fetch-http-handler" "^4.0.0"
-    "@smithy/node-http-handler" "^3.2.5"
-    "@smithy/types" "^3.6.0"
-    "@smithy/util-base64" "^3.0.0"
-    "@smithy/util-buffer-from" "^3.0.0"
-    "@smithy/util-hex-encoding" "^3.0.0"
-    "@smithy/util-utf8" "^3.0.0"
-    tslib "^2.6.2"
-
-"@smithy/util-uri-escape@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz#e43358a78bf45d50bb736770077f0f09195b6f54"
-  integrity sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/util-utf8@^2.0.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5"
-  integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==
-  dependencies:
-    "@smithy/util-buffer-from" "^2.2.0"
-    tslib "^2.6.2"
-
-"@smithy/util-utf8@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-3.0.0.tgz#1a6a823d47cbec1fd6933e5fc87df975286d9d6a"
-  integrity sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==
-  dependencies:
-    "@smithy/util-buffer-from" "^3.0.0"
-    tslib "^2.6.2"
-
-"@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.11"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
@@ -1290,13 +145,6 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
   integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
-"@types/amqplib@^0.10.5":
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/@types/amqplib/-/amqplib-0.10.5.tgz#fd883eddfbd669702a727fa10007b27c4c1e6ec7"
-  integrity sha512-/cSykxROY7BWwDoi4Y4/jLAuZTshZxd8Ey1QYa/VaXriMotBDoou7V/twJiOSHzU6t1Kp1AHAUXGCgqq+6DNeg==
-  dependencies:
-    "@types/node" "*"
-
 "@types/body-parser@*":
   version "1.19.5"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4"
@@ -1305,11 +153,6 @@
     "@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/config@^3.3.5":
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/@types/config/-/config-3.3.5.tgz#91f0a52b10212b9c4254fb0bbc4bedd77cd389b8"
@@ -1347,24 +190,12 @@
   resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f"
   integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==
 
-"@types/is-buffer@^2.0.0":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/is-buffer/-/is-buffer-2.0.2.tgz#3dcd8e21e7d6c2d312d0b9f6cf23bb6ca1ef9f76"
-  integrity sha512-G6OXy83Va+xEo8XgqAJYOuvOMxeey9xM5XKkvwJNmN8rVdcB+r15HvHsG86hl86JvU0y1aa7Z2ERkNFYWw9ySg==
-  dependencies:
-    "@types/node" "*"
-
-"@types/long@^4.0.0":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
-  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
-
 "@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/node@*", "@types/node@>=13.7.0":
+"@types/node@*":
   version "22.8.7"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-22.8.7.tgz#04ab7a073d95b4a6ee899f235d43f3c320a976f4"
   integrity sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q==
@@ -1388,16 +219,6 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
   integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
 
-"@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/send@*":
   version "0.17.4"
   resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
@@ -1415,11 +236,6 @@
     "@types/node" "*"
     "@types/send" "*"
 
-"@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/triple-beam@^1.3.2":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c"
@@ -1466,23 +282,6 @@ agent-base@6:
   dependencies:
     debug "4"
 
-agent-base@^7.0.2, agent-base@^7.1.0:
-  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.4:
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.10.4.tgz#4058c775830c908267dc198969015e0e8d280e70"
-  integrity sha512-DMZ4eCEjAVdX1II2TfIUpJhfKAuoCeDIo/YyETbfAqehHTXxxs7WOOd+N1Xxr4cKhx12y23zk8/os98FxlZHrw==
-  dependencies:
-    "@acuminous/bitsyntax" "^0.1.2"
-    buffer-more-ints "~1.0.0"
-    readable-stream "1.x >=1.1.9"
-    url-parse "~1.5.10"
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -1523,21 +322,11 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-arrify@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
-  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
-
 async@^3.2.3:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
   integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
@@ -1548,16 +337,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.3.0, base64-js@^1.3.1:
+base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-bignumber.js@^9.0.0:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c"
-  integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==
-
 binary-extensions@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
@@ -1590,11 +374,6 @@ body-parser@1.20.3:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
-bowser@^2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f"
-  integrity sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1610,16 +389,6 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-buffer-equal-constant-time@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
-  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
-
-buffer-more-ints@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-1.0.0.tgz#ef4f8e2dddbad429ed3828a9c55d44f05c611422"
-  integrity sha512-EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg==
-
 buffer@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
@@ -1628,7 +397,7 @@ buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-buffer@^6.0.0, buffer@^6.0.3:
+buffer@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
   integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
@@ -1689,15 +458,6 @@ 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"
-
 color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -1746,13 +506,6 @@ colorspace@1.1.x:
     color "^3.1.3"
     text-hex "1.0.x"
 
-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==
-  dependencies:
-    delayed-stream "~1.0.0"
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -1804,7 +557,7 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4, debug@^4.0.0, debug@^4.3.3, debug@^4.3.4:
+debug@4, debug@^4:
   version "4.3.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
   integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
@@ -1832,11 +585,6 @@ define-data-property@^1.1.4:
     es-errors "^1.3.0"
     gopd "^1.0.1"
 
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
 depd@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -1864,23 +612,6 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-duplexify@^4.0.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.3.tgz#a07e1c0d0a2c001158563d32592ba58bddb0236f"
-  integrity sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==
-  dependencies:
-    end-of-stream "^1.4.1"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-    stream-shift "^1.0.2"
-
-ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
-  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
-  dependencies:
-    safe-buffer "^5.0.1"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -1992,11 +723,6 @@ express@^4.21.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-extend@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
 fast-glob@^3.2.9:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
@@ -2008,20 +734,6 @@ fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-xml-parser@4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz#86dbf3f18edf8739326447bcaac31b4ae7f6514f"
-  integrity sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==
-  dependencies:
-    strnum "^1.0.5"
-
-fast-xml-parser@^4.4.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz#2882b7d01a6825dfdf909638f2de0256351def37"
-  integrity sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==
-  dependencies:
-    strnum "^1.0.5"
-
 fastq@^1.6.0:
   version "1.17.1"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
@@ -2066,16 +778,6 @@ fn.name@1.x.x:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
-form-data@^2.5.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.2.tgz#dc653743d1de2fcc340ceea38079daf6e9069fd2"
-  integrity sha512-GgwY0PS7DbXqajuGf4OYlsrIu3zgxD6Vvql43IBhm6MahqA5SK/7mwhtNj2AdH2z35YR34ujJ7BN+3fFC3jP5Q==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-    safe-buffer "^5.2.1"
-
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -2128,25 +830,6 @@ function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-gaxios@^6.0.0, gaxios@^6.1.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.7.1.tgz#ebd9f7093ede3ba502685e73390248bb5b7f71fb"
-  integrity sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==
-  dependencies:
-    extend "^3.0.2"
-    https-proxy-agent "^7.0.1"
-    is-stream "^2.0.0"
-    node-fetch "^2.6.9"
-    uuid "^9.0.1"
-
-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 "^6.0.0"
-    json-bigint "^1.0.0"
-
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -2187,36 +870,6 @@ globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-google-auth-library@^9.3.0:
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.14.2.tgz#92a53ba32b3a9ff9ced8ed34129edb5a7fa7fb52"
-  integrity sha512-R+FRIfk1GBo3RdlRYWPdwk8nmtVUOn6+BkDomAC46KoU8kzXzE1HLmOasSCbWUByMMAGkknVF0G5kQ69Vj7dlA==
-  dependencies:
-    base64-js "^1.3.0"
-    ecdsa-sig-formatter "^1.0.11"
-    gaxios "^6.1.1"
-    gcp-metadata "^6.1.0"
-    gtoken "^7.0.0"
-    jws "^4.0.0"
-
-google-gax@^4.3.3:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.4.1.tgz#95a9cf7ee7777ac22d1926a45b5f886dd8beecae"
-  integrity sha512-Phyp9fMfA00J3sZbJxbbB4jC55b7DBjE3F6poyL3wKMEBVKA79q6BGuHcTiM28yOzVql0NDbRL8MLLh8Iwk9Dg==
-  dependencies:
-    "@grpc/grpc-js" "^1.10.9"
-    "@grpc/proto-loader" "^0.7.13"
-    "@types/long" "^4.0.0"
-    abort-controller "^3.0.0"
-    duplexify "^4.0.0"
-    google-auth-library "^9.3.0"
-    node-fetch "^2.7.0"
-    object-hash "^3.0.0"
-    proto3-json-serializer "^2.0.2"
-    protobufjs "^7.3.2"
-    retry-request "^7.0.0"
-    uuid "^9.0.1"
-
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -2229,14 +882,6 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   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==
 
-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 "^6.0.0"
-    jws "^4.0.0"
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -2276,11 +921,6 @@ hasown@^2.0.0, hasown@^2.0.2:
   dependencies:
     function-bind "^1.1.2"
 
-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-errors@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
@@ -2292,23 +932,6 @@ 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"
-
-http-proxy-agent@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
-  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
-  dependencies:
-    agent-base "^7.1.0"
-    debug "^4.3.4"
-
 https-proxy-agent@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
@@ -2317,14 +940,6 @@ https-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
-https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.1:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
-  integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
-  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"
@@ -2347,7 +962,7 @@ ignore@^5.2.0:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
-inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -2382,11 +997,6 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-buffer@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
-  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
-
 is-core-module@2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
@@ -2423,21 +1033,11 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-stream-ended@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-stream-ended/-/is-stream-ended-0.1.4.tgz#f50224e95e06bce0e356d440a4827cd35b267eda"
-  integrity sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==
-
 is-stream@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
-
 isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -2455,13 +1055,6 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-json-bigint@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
-  integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==
-  dependencies:
-    bignumber.js "^9.0.0"
-
 json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
@@ -2476,28 +1069,6 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jssha@^3.1.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/jssha/-/jssha-3.3.1.tgz#c5b7fc7fb9aa745461923b87df0e247dd59c7ea8"
-  integrity sha512-VCMZj12FCFMQYcFLPRm/0lOBbLi8uM2BhXPTqw3U4YAfs4AZfiApOoBLoN8cQE60Z50m1MYMTQVCfgF/KaCVhQ==
-
-jwa@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz#a7e9c3f29dae94027ebcaf49975c9345593410fc"
-  integrity sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==
-  dependencies:
-    buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.11"
-    safe-buffer "^5.0.1"
-
-jws@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz#2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4"
-  integrity sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==
-  dependencies:
-    jwa "^2.0.0"
-    safe-buffer "^5.0.1"
-
 kafkajs@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/kafkajs/-/kafkajs-2.2.4.tgz#59e6e16459d87fdf8b64be73970ed5aa42370a5b"
@@ -2508,16 +1079,6 @@ kuler@^2.0.0:
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
   integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
 
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
-
-lodash.snakecase@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d"
-  integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==
-
 logform@^2.6.0, logform@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.1.tgz#71403a7d8cae04b2b734147963236205db9b3df0"
@@ -2530,7 +1091,7 @@ logform@^2.6.0, logform@^2.6.1:
     safe-stable-stringify "^2.3.1"
     triple-beam "^1.3.0"
 
-long@^5.0.0, long@^5.2.0, long@^5.2.3:
+long@^5.2.3:
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
   integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
@@ -2573,7 +1134,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -2647,7 +1208,7 @@ node-abi@^3.3.0:
   dependencies:
     semver "^7.3.5"
 
-node-fetch@^2.6.6, node-fetch@^2.6.9, node-fetch@^2.7.0:
+node-fetch@^2.6.6:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
   integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
@@ -2706,11 +1267,6 @@ one-time@^1.0.0:
   dependencies:
     fn.name "1.x.x"
 
-p-defer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83"
-  integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==
-
 p-is-promise@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971"
@@ -2808,31 +1364,6 @@ progress@^2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-proto3-json-serializer@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-2.0.2.tgz#5b705203b4d58f3880596c95fad64902617529dd"
-  integrity sha512-SAzp/O4Yh02jGdRc+uIrGoe87dkN/XtwxfZ4ZyafJHymd79ozp5VG5nyZ7ygqPM5+cpLDjjGnYFUkngonyDPOQ==
-  dependencies:
-    protobufjs "^7.2.5"
-
-protobufjs@^7.2.5, protobufjs@^7.3.2:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.4.0.tgz#7efe324ce9b3b61c82aae5de810d287bc08a248a"
-  integrity sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.2"
-    "@protobufjs/base64" "^1.1.2"
-    "@protobufjs/codegen" "^2.0.4"
-    "@protobufjs/eventemitter" "^1.1.0"
-    "@protobufjs/fetch" "^1.1.0"
-    "@protobufjs/float" "^1.0.2"
-    "@protobufjs/inquire" "^1.1.0"
-    "@protobufjs/path" "^1.1.2"
-    "@protobufjs/pool" "^1.1.0"
-    "@protobufjs/utf8" "^1.1.0"
-    "@types/node" ">=13.7.0"
-    long "^5.0.0"
-
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -2861,11 +1392,6 @@ qs@6.13.0:
   dependencies:
     side-channel "^1.0.6"
 
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -2896,16 +1422,6 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-"readable-stream@1.x >=1.1.9":
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@^2.0.0, readable-stream@^2.1.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
@@ -2951,11 +1467,6 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
-
 resolve@^1.22.0:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
@@ -2965,36 +1476,11 @@ resolve@^1.22.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-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:
-    "@types/request" "^2.48.8"
-    extend "^3.0.2"
-    teeny-request "^9.0.0"
-
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rhea-promise@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/rhea-promise/-/rhea-promise-3.0.3.tgz#fc68e39019442c5338a3999b5e3e28806f3f10d2"
-  integrity sha512-a875P5YcMkePSTEWMsnmCQS7Y4v/XvIw7ZoMtJxqtQRZsqSA6PsZxuz4vktyRykPuUgdNsA6F84dS3iEXZoYnQ==
-  dependencies:
-    debug "^4.0.0"
-    rhea "^3.0.0"
-    tslib "^2.6.0"
-
-rhea@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/rhea/-/rhea-3.0.3.tgz#38ff144b7f8ca982a67718aa1f5e67bd93075679"
-  integrity sha512-Y7se0USZQu6dErWSZ7eCmSVTMscyVfz/0+jjhBF7f9PqYfEXdIoQpPkC9Strks6wF9WytuBhn8w8Nz/tmBWpgA==
-  dependencies:
-    debug "^4.3.3"
-
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -3002,12 +1488,12 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.0, safe-buffer@~5.1.1, 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"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -3126,13 +1612,6 @@ 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"
@@ -3140,12 +1619,7 @@ stream-meter@^1.0.4:
   dependencies:
     readable-stream "^2.1.4"
 
-stream-shift@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.3.tgz#85b8fab4d71010fc3ba8772e8046cc49b8a3864b"
-  integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+string-width@^4.1.0, string-width@^4.2.0:
   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==
@@ -3161,11 +1635,6 @@ string_decoder@^1.1.1, string_decoder@^1.3.0:
   dependencies:
     safe-buffer "~5.2.0"
 
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
-
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -3185,16 +1654,6 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
-strnum@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db"
-  integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==
-
-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"
@@ -3235,17 +1694,6 @@ 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"
@@ -3302,11 +1750,6 @@ ts-node@^10.9.2:
     v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
-tslib@^2.2.0, tslib@^2.6.0, tslib@^2.6.2:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
-  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -3347,14 +1790,6 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-url-parse@~1.5.10:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
-  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -3370,16 +1805,6 @@ uuid-parse@^1.1.0:
   resolved "https://registry.yarnpkg.com/uuid-parse/-/uuid-parse-1.1.0.tgz#7061c5a1384ae0e1f943c538094597e1b5f3a65b"
   integrity sha512-OdmXxA8rDsQ7YpNVbKSJkNzTw2I+S5WsbMDnCtIWSQaosNAcWtFuI/YK1TjzUI6nbkgiqEyh8gWngfcv8Asd9A==
 
-uuid-random@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/uuid-random/-/uuid-random-1.3.2.tgz#96715edbaef4e84b1dcf5024b00d16f30220e2d0"
-  integrity sha512-UOzej0Le/UgkbWEO8flm+0y+G+ljUon1QWTEZOq1rnMAsxo2+SckbiZdKzAHHlVh6gJqI1TjC/xwgR50MuCrBQ==
-
-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"
@@ -3463,11 +1888,6 @@ 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"
@@ -3481,19 +1901,6 @@ 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/pom.xml b/msa/monitoring/pom.xml
index 20f8d90695..1b03765586 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
 
diff --git a/msa/pom.xml b/msa/pom.xml
index 057f37a575..ff394295f4 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>msa</artifactId>
diff --git a/msa/tb-node/pom.xml b/msa/tb-node/pom.xml
index 3ca22bcf55..6142c3c5d8 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/tb/pom.xml b/msa/tb/pom.xml
index 5e79740c8b..0c6046c09e 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/transport/coap/pom.xml b/msa/transport/coap/pom.xml
index 089581f1cb..325d4d45fa 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/transport/http/pom.xml b/msa/transport/http/pom.xml
index 4d9e17df5f..945c523455 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/transport/lwm2m/pom.xml b/msa/transport/lwm2m/pom.xml
index 94b86d035f..4d0370c1cf 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/transport/mqtt/pom.xml b/msa/transport/mqtt/pom.xml
index 2b637ddd19..20791ad61c 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.9.0-RC</version>
+        <version>4.0.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 4f7e0ad030..0b92e1fa97 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/transport/snmp/pom.xml b/msa/transport/snmp/pom.xml
index 94bc03f29d..b16469523e 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/vc-executor-docker/pom.xml b/msa/vc-executor-docker/pom.xml
index f6dc43ea13..72995b05ab 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.9.0-RC</version>
+        <version>4.0.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 725c3e40ad..1b88a41692 100644
--- a/msa/vc-executor/pom.xml
+++ b/msa/vc-executor/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-RC</version>
+        <version>4.0.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 6b79f2d101..cba83e5ff7 100644
--- a/msa/vc-executor/src/main/resources/tb-vc-executor.yml
+++ b/msa/vc-executor/src/main/resources/tb-vc-executor.yml
@@ -47,9 +47,7 @@ zk:
 
 # Queue configuration parameters
 queue:
-  # kafka (Apache Kafka). The following queue types are deprecated and will no longer be supported in ThingsBoard 4.0:
-  # aws-sqs (AWS SQS), pubsub (PubSub), service-bus (Azure Service Bus), rabbitmq (RabbitMQ)
-  type: "${TB_QUEUE_TYPE:kafka}"
+  type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka).
   in_memory:
     stats:
@@ -148,91 +146,10 @@ queue:
       print-interval-ms: "${TB_QUEUE_KAFKA_CONSUMER_STATS_MIN_PRINT_INTERVAL_MS:60000}"
       # Time to wait for the stats-loading requests to Kafka to finis
       kafka-response-timeout-ms: "${TB_QUEUE_KAFKA_CONSUMER_STATS_RESPONSE_TIMEOUT_MS:1000}"
-  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}"
-    # Access key ID from AWS IAM user
-    access_key_id: "${TB_QUEUE_AWS_SQS_ACCESS_KEY_ID:YOUR_KEY}"
-    # Secret access key from AWS IAM user
-    secret_access_key: "${TB_QUEUE_AWS_SQS_SECRET_ACCESS_KEY:YOUR_SECRET}"
-    # Region from AWS account
-    region: "${TB_QUEUE_AWS_SQS_REGION:YOUR_REGION}"
-    # Number of threads per each AWS SQS queue in consumer
-    threads_per_topic: "${TB_QUEUE_AWS_SQS_THREADS_PER_TOPIC:1}"
-    # Thread pool size for aws_sqs queue producer executor provider. Default value equals to AmazonSQSAsyncClient.DEFAULT_THREAD_POOL_SIZE
-    producer_thread_pool_size: "${TB_QUEUE_AWS_SQS_EXECUTOR_THREAD_POOL_SIZE:50}"
-    queue-properties:
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      core: "${TB_QUEUE_AWS_SQS_CORE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      notifications: "${TB_QUEUE_AWS_SQS_NOTIFICATIONS_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      version-control: "${TB_QUEUE_AWS_SQS_VC_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      #    VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-  pubsub:
-    # Project ID from Google Cloud
-    project_id: "${TB_QUEUE_PUBSUB_PROJECT_ID:YOUR_PROJECT_ID}"
-    # API Credentials in JSON format
-    service_account: "${TB_QUEUE_PUBSUB_SERVICE_ACCOUNT:YOUR_SERVICE_ACCOUNT}"
-    # Message size for PubSub queue.Value in bytes
-    max_msg_size: "${TB_QUEUE_PUBSUB_MAX_MSG_SIZE:1048576}" #in bytes
-    # Number of messages per consumer
-    max_messages: "${TB_QUEUE_PUBSUB_MAX_MESSAGES:1000}"
-    # Thread pool size for pubsub queue executor provider. If not set - default pubsub executor provider value will be used (5 * number of available processors)
-    executor_thread_pool_size: "${TB_QUEUE_PUBSUB_EXECUTOR_THREAD_POOL_SIZE:0}"
-    queue-properties:
-      # Pub/Sub properties for Core subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      core: "${TB_QUEUE_PUBSUB_CORE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Version Control subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      notifications: "${TB_QUEUE_PUBSUB_NOTIFICATIONS_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Transport Api subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      version-control: "${TB_QUEUE_PUBSUB_VC_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-  service_bus:
-    # Azure namespace
-    namespace_name: "${TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME:YOUR_NAMESPACE_NAME}"
-    # Azure Service Bus Shared Access Signatures key name
-    sas_key_name: "${TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME:YOUR_SAS_KEY_NAME}"
-    # Azure Service Bus Shared Access Signatures key
-    sas_key: "${TB_QUEUE_SERVICE_BUS_SAS_KEY:YOUR_SAS_KEY}"
-    # Number of messages per a consumer
-    max_messages: "${TB_QUEUE_SERVICE_BUS_MAX_MESSAGES:1000}"
-    queue-properties:
-      # Azure Service Bus properties for Core queues
-      core: "${TB_QUEUE_SERVICE_BUS_CORE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Notification queues
-      notifications: "${TB_QUEUE_SERVICE_BUS_NOTIFICATIONS_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Version Control queues
-      version-control: "${TB_QUEUE_SERVICE_BUS_VC_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-  rabbitmq:
-    # By default empty
-    exchange_name: "${TB_QUEUE_RABBIT_MQ_EXCHANGE_NAME:}"
-    # RabbitMQ host used to establish connection
-    host: "${TB_QUEUE_RABBIT_MQ_HOST:localhost}"
-    # RabbitMQ host used to establish a connection
-    port: "${TB_QUEUE_RABBIT_MQ_PORT:5672}"
-    # Virtual hosts provide logical grouping and separation of resources
-    virtual_host: "${TB_QUEUE_RABBIT_MQ_VIRTUAL_HOST:/}"
-    # Username for RabbitMQ user account
-    username: "${TB_QUEUE_RABBIT_MQ_USERNAME:YOUR_USERNAME}"
-    # User password for RabbitMQ user account
-    password: "${TB_QUEUE_RABBIT_MQ_PASSWORD:YOUR_PASSWORD}"
-    # Network connection between clients and RabbitMQ nodes can fail. RabbitMQ Java client supports automatic recovery of connections and topology (queues, exchanges, bindings, and consumers)
-    automatic_recovery_enabled: "${TB_QUEUE_RABBIT_MQ_AUTOMATIC_RECOVERY_ENABLED:false}"
-    # The connection timeout for the RabbitMQ connection factory
-    connection_timeout: "${TB_QUEUE_RABBIT_MQ_CONNECTION_TIMEOUT:60000}"
-    # RabbitMQ has a timeout for connection handshake. When clients run in heavily constrained environments, it may be necessary to increase the timeout
-    handshake_timeout: "${TB_QUEUE_RABBIT_MQ_HANDSHAKE_TIMEOUT:10000}"
-    queue-properties:
-      # RabbitMQ properties for Core queues
-      core: "${TB_QUEUE_RABBIT_MQ_CORE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Transport API queues
-      transport-api: "${TB_QUEUE_RABBIT_MQ_TA_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Version Control queues
-      version-control: "${TB_QUEUE_RABBIT_MQ_VC_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
   partitions:
     hash_function_name: "${TB_QUEUE_PARTITIONS_HASH_FUNCTION_NAME:murmur3_128}" # murmur3_32, murmur3_128 or sha256
   core:
-    # Default topic name of Kafka, RabbitMQ, etc. queue
+    # Default topic name
     topic: "${TB_QUEUE_CORE_TOPIC:tb_core}"
     # Interval in milliseconds to poll messages by Core microservices
     poll-interval: "${TB_QUEUE_CORE_POLL_INTERVAL_MS:25}"
@@ -247,7 +164,7 @@ queue:
       pack-interval-ms: "${TB_QUEUE_CORE_OTA_PACK_INTERVAL_MS:60000}"
       # The size of OTA updates notifications fetched from the queue. The queue stores pairs of firmware and device ids
       pack-size: "${TB_QUEUE_CORE_OTA_PACK_SIZE:100}"
-    # Stats topic name for queue Kafka, RabbitMQ, etc.
+    # Stats topic name
     usage-stats-topic: "${TB_QUEUE_US_TOPIC:tb_usage_stats}"
     stats:
       # Enable/disable statistics for Core microservices
@@ -258,7 +175,7 @@ queue:
       # Topic name for Housekeeper tasks
       topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   vc:
-    # Default topic name for Kafka, RabbitMQ, etc.
+    # Default topic name
     topic: "${TB_QUEUE_VC_TOPIC:tb_version_control}"
     # Number of partitions to associate with this queue. Used for scaling the number of messages that can be processed in parallel
     partitions: "${TB_QUEUE_VC_PARTITIONS:10}"
@@ -266,7 +183,7 @@ queue:
     poll-interval: "${TB_QUEUE_VC_INTERVAL_MS:25}"
     # Timeout before retrying all failed and timed-out messages from the processing pack
     pack-processing-timeout: "${TB_QUEUE_VC_PACK_PROCESSING_TIMEOUT_MS:180000}"
-    # Queue settings for Kafka, RabbitMQ, etc. Limit for single message size
+    # Limit for single queue message size
     msg-chunk-size: "${TB_QUEUE_VC_MSG_CHUNK_SIZE:250000}"
 
 # Version control parameters
diff --git a/msa/web-ui/package.json b/msa/web-ui/package.json
index 84b1a4a488..3374112096 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.9.0",
+  "version": "4.0.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 c5a900e004..361487b516 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/netty-mqtt/pom.xml b/netty-mqtt/pom.xml
index d4cd55629d..f7361a686d 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>netty-mqtt</artifactId>
-    <version>3.9.0-RC</version>
+    <version>4.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Netty MQTT Client</name>
diff --git a/pom.xml b/pom.xml
index 4de31c1c19..e70a57fbbf 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.9.0-RC</version>
+    <version>4.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Thingsboard</name>
@@ -117,7 +117,6 @@
         <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.6.4</passay.version>
         <ua-parser.version>1.6.1</ua-parser.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
@@ -2038,21 +2037,6 @@
                 <artifactId>proto-google-common-protos</artifactId>
                 <version>${google.common.protos.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.microsoft.azure</groupId>
-                <artifactId>azure-servicebus</artifactId>
-                <version>${azure-servicebus.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.nimbusds</groupId>
-                        <artifactId>content-type</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.passay</groupId>
                 <artifactId>passay</artifactId>
diff --git a/rest-client/pom.xml b/rest-client/pom.xml
index f868acabf5..c8232512f7 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>rest-client</artifactId>
diff --git a/rule-engine/pom.xml b/rule-engine/pom.xml
index fbefcd1de9..bd14daf22e 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.9.0-RC</version>
+        <version>4.0.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 3ee6496452..886a2169f3 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>rule-engine</artifactId>
     </parent>
     <groupId>org.thingsboard.rule-engine</groupId>
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/AttributesDeleteRequest.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/AttributesDeleteRequest.java
new file mode 100644
index 0000000000..118c62e78c
--- /dev/null
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/AttributesDeleteRequest.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.api;
+
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.SettableFuture;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.ToString;
+import org.thingsboard.server.common.data.AttributeScope;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+import java.util.List;
+
+@Getter
+@ToString
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class AttributesDeleteRequest {
+
+    private final TenantId tenantId;
+    private final EntityId entityId;
+    private final AttributeScope scope;
+    private final List<String> keys;
+    private final boolean notifyDevice;
+    private final FutureCallback<Void> callback;
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+
+        private TenantId tenantId;
+        private EntityId entityId;
+        private AttributeScope scope;
+        private List<String> keys;
+        private boolean notifyDevice;
+        private FutureCallback<Void> callback;
+
+        Builder() {}
+
+        public Builder tenantId(TenantId tenantId) {
+            this.tenantId = tenantId;
+            return this;
+        }
+
+        public Builder entityId(EntityId entityId) {
+            this.entityId = entityId;
+            return this;
+        }
+
+        public Builder scope(AttributeScope scope) {
+            this.scope = scope;
+            return this;
+        }
+
+        @Deprecated
+        public Builder scope(String scope) {
+            try {
+                this.scope = AttributeScope.valueOf(scope);
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException("Invalid attribute scope '" + scope + "'");
+            }
+            return this;
+        }
+
+        public Builder keys(List<String> keys) {
+            this.keys = keys;
+            return this;
+        }
+
+        public Builder notifyDevice(boolean notifyDevice) {
+            this.notifyDevice = notifyDevice;
+            return this;
+        }
+
+        public Builder callback(FutureCallback<Void> callback) {
+            this.callback = callback;
+            return this;
+        }
+
+        public Builder future(SettableFuture<Void> future) {
+            return callback(new FutureCallback<>() {
+                @Override
+                public void onSuccess(Void result) {
+                    future.set(result);
+                }
+
+                @Override
+                public void onFailure(Throwable t) {
+                    future.setException(t);
+                }
+            });
+        }
+
+        public AttributesDeleteRequest build() {
+            return new AttributesDeleteRequest(tenantId, entityId, scope, keys, notifyDevice, callback);
+        }
+
+    }
+
+}
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/AttributesSaveRequest.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/AttributesSaveRequest.java
new file mode 100644
index 0000000000..22fa8de6de
--- /dev/null
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/AttributesSaveRequest.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.api;
+
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.SettableFuture;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.ToString;
+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;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
+import org.thingsboard.server.common.data.kv.KvEntry;
+
+import java.util.List;
+
+@Getter
+@ToString
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class AttributesSaveRequest {
+
+    private final TenantId tenantId;
+    private final EntityId entityId;
+    private final AttributeScope scope;
+    private final List<AttributeKvEntry> entries;
+    private final boolean notifyDevice;
+    private final FutureCallback<Void> callback;
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+
+        private TenantId tenantId;
+        private EntityId entityId;
+        private AttributeScope scope;
+        private List<AttributeKvEntry> entries;
+        private boolean notifyDevice = true;
+        private FutureCallback<Void> callback;
+
+        Builder() {}
+
+        public Builder tenantId(TenantId tenantId) {
+            this.tenantId = tenantId;
+            return this;
+        }
+
+        public Builder entityId(EntityId entityId) {
+            this.entityId = entityId;
+            return this;
+        }
+
+        public Builder scope(AttributeScope scope) {
+            this.scope = scope;
+            return this;
+        }
+
+        @Deprecated
+        public Builder scope(String scope) {
+            try {
+                this.scope = AttributeScope.valueOf(scope);
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException("Invalid attribute scope '" + scope + "'");
+            }
+            return this;
+        }
+
+        public Builder entries(List<AttributeKvEntry> entries) {
+            this.entries = entries;
+            return this;
+        }
+
+        public Builder entry(AttributeKvEntry entry) {
+            return entries(List.of(entry));
+        }
+
+        public Builder entry(KvEntry kvEntry) {
+            return entry(new BaseAttributeKvEntry(kvEntry, System.currentTimeMillis()));
+        }
+
+        public Builder notifyDevice(boolean notifyDevice) {
+            this.notifyDevice = notifyDevice;
+            return this;
+        }
+
+        public Builder callback(FutureCallback<Void> callback) {
+            this.callback = callback;
+            return this;
+        }
+
+        public Builder future(SettableFuture<Void> future) {
+            return callback(new FutureCallback<>() {
+                @Override
+                public void onSuccess(Void result) {
+                    future.set(result);
+                }
+
+                @Override
+                public void onFailure(Throwable t) {
+                    future.setException(t);
+                }
+            });
+        }
+
+        public AttributesSaveRequest build() {
+            return new AttributesSaveRequest(tenantId, entityId, scope, entries, notifyDevice, callback);
+        }
+
+    }
+
+}
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 b8fb9b61ff..74c98cdec5 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
@@ -36,7 +36,7 @@ public interface NotificationCenter {
 
     NotificationRequest processNotificationRequest(TenantId tenantId, NotificationRequest notificationRequest, FutureCallback<NotificationRequestStats> callback);
 
-    void sendGeneralWebNotification(TenantId tenantId, UsersFilter recipients, NotificationTemplate template, GeneralNotificationInfo info);
+    void sendGeneralWebNotification(TenantId tenantId, UsersFilter recipients, NotificationTemplate template, GeneralNotificationInfo info); // for future use
 
     void sendSystemNotification(TenantId tenantId, NotificationTargetId targetId, NotificationType type, NotificationInfo info); // for future use and compatibility with PE
 
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 0c2de91b2f..17696b4bb1 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
@@ -15,97 +15,17 @@
  */
 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;
-import org.thingsboard.server.common.data.kv.AttributeKvEntry;
-import org.thingsboard.server.common.data.kv.DeleteTsKvQuery;
-import org.thingsboard.server.common.data.kv.TsKvEntry;
-
-import java.util.Collection;
-import java.util.List;
-
 /**
  * Created by ashvayka on 02.04.18.
  */
 public interface RuleEngineTelemetryService {
 
-    ListenableFuture<Void> saveAndNotify(TenantId tenantId, EntityId entityId, TsKvEntry ts);
-
-    void saveAndNotify(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Void> callback);
-
-    void saveAndNotify(TenantId tenantId, CustomerId id, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Void> callback);
-
-    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 saveTimeseries(TimeseriesSaveRequest request);
 
-    void deleteAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback);
+    void saveAttributes(AttributesSaveRequest request);
 
-    void deleteLatest(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback);
+    void deleteTimeseries(TimeseriesDeleteRequest request);
 
-    void deleteAllLatest(TenantId tenantId, EntityId entityId, FutureCallback<Collection<String>> callback);
+    void deleteAttributes(AttributesDeleteRequest request);
 
-    void deleteTimeseriesAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, List<DeleteTsKvQuery> deleteTsKvQueries, FutureCallback<Void> 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 b517bb0051..fa8e51b51f 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
@@ -192,9 +192,6 @@ public interface TbContext {
 
     void ack(TbMsg tbMsg);
 
-    @Deprecated(since = "3.6.0", forRemoval = true)
-    TbMsg newMsg(String queueName, String type, EntityId originator, TbMsgMetaData metaData, String data);
-
     /**
      * Creates a new TbMsg instance with the specified parameters.
      *
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TimeseriesDeleteRequest.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TimeseriesDeleteRequest.java
new file mode 100644
index 0000000000..b124806fff
--- /dev/null
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TimeseriesDeleteRequest.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.rule.engine.api;
+
+import com.google.common.util.concurrent.FutureCallback;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.ToString;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.kv.DeleteTsKvQuery;
+
+import java.util.List;
+
+@Getter
+@ToString
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class TimeseriesDeleteRequest {
+
+    private final TenantId tenantId;
+    private final EntityId entityId;
+    private final List<String> keys;
+    private final List<DeleteTsKvQuery> deleteHistoryQueries;
+    private final FutureCallback<List<String>> callback;
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+
+        private TenantId tenantId;
+        private EntityId entityId;
+        private List<String> keys;
+        private List<DeleteTsKvQuery> deleteHistoryQueries;
+        private FutureCallback<List<String>> callback;
+
+        Builder() {}
+
+        public Builder tenantId(TenantId tenantId) {
+            this.tenantId = tenantId;
+            return this;
+        }
+
+        public Builder entityId(EntityId entityId) {
+            this.entityId = entityId;
+            return this;
+        }
+
+        public Builder keys(List<String> keys) {
+            this.keys = keys;
+            return this;
+        }
+
+        public Builder deleteHistoryQueries(List<DeleteTsKvQuery> deleteHistoryQueries) {
+            this.deleteHistoryQueries = deleteHistoryQueries;
+            return this;
+        }
+
+        public Builder callback(FutureCallback<List<String>> callback) {
+            this.callback = callback;
+            return this;
+        }
+
+        public TimeseriesDeleteRequest build() {
+            return new TimeseriesDeleteRequest(tenantId, entityId, keys, deleteHistoryQueries, callback);
+        }
+
+    }
+
+}
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TimeseriesSaveRequest.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TimeseriesSaveRequest.java
new file mode 100644
index 0000000000..fb667fbfb2
--- /dev/null
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TimeseriesSaveRequest.java
@@ -0,0 +1,132 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.api;
+
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.SettableFuture;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+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.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.KvEntry;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+
+import java.util.List;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class TimeseriesSaveRequest {
+
+    private final TenantId tenantId;
+    private final CustomerId customerId;
+    private final EntityId entityId;
+    private final List<TsKvEntry> entries;
+    private final long ttl;
+    private final Strategy strategy;
+    private final FutureCallback<Void> callback;
+
+    public record Strategy(boolean saveTimeseries, boolean saveLatest, boolean sendWsUpdate) {
+
+        public static final Strategy SAVE_ALL = new Strategy(true, true, true);
+        public static final Strategy WS_ONLY = new Strategy(false, false, true);
+        public static final Strategy LATEST_AND_WS = new Strategy(false, true, true);
+        public static final Strategy SKIP_ALL = new Strategy(false, false, false);
+
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+
+        private TenantId tenantId;
+        private CustomerId customerId;
+        private EntityId entityId;
+        private List<TsKvEntry> entries;
+        private long ttl;
+        private Strategy strategy = Strategy.SAVE_ALL;
+        private FutureCallback<Void> callback;
+
+        Builder() {}
+
+        public Builder tenantId(TenantId tenantId) {
+            this.tenantId = tenantId;
+            return this;
+        }
+
+        public Builder customerId(CustomerId customerId) {
+            this.customerId = customerId;
+            return this;
+        }
+
+        public Builder entityId(EntityId entityId) {
+            this.entityId = entityId;
+            return this;
+        }
+
+        public Builder entries(List<TsKvEntry> entries) {
+            this.entries = entries;
+            return this;
+        }
+
+        public Builder entry(TsKvEntry entry) {
+            return entries(List.of(entry));
+        }
+
+        public Builder entry(KvEntry kvEntry) {
+            return entry(new BasicTsKvEntry(System.currentTimeMillis(), kvEntry));
+        }
+
+        public Builder ttl(long ttl) {
+            this.ttl = ttl;
+            return this;
+        }
+
+        public Builder strategy(Strategy strategy) {
+            this.strategy = strategy;
+            return this;
+        }
+
+        public Builder callback(FutureCallback<Void> callback) {
+            this.callback = callback;
+            return this;
+        }
+
+        public Builder future(SettableFuture<Void> future) {
+            return callback(new FutureCallback<>() {
+                @Override
+                public void onSuccess(Void result) {
+                    future.set(result);
+                }
+
+                @Override
+                public void onFailure(Throwable t) {
+                    future.setException(t);
+                }
+            });
+        }
+
+        public TimeseriesSaveRequest build() {
+            return new TimeseriesSaveRequest(tenantId, customerId, entityId, entries, ttl, strategy, callback);
+        }
+
+    }
+
+}
diff --git a/rule-engine/rule-engine-api/src/test/java/org/thingsboard/rule/engine/api/TimeseriesSaveRequestTest.java b/rule-engine/rule-engine-api/src/test/java/org/thingsboard/rule/engine/api/TimeseriesSaveRequestTest.java
new file mode 100644
index 0000000000..321892991e
--- /dev/null
+++ b/rule-engine/rule-engine-api/src/test/java/org/thingsboard/rule/engine/api/TimeseriesSaveRequestTest.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.rule.engine.api;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TimeseriesSaveRequestTest {
+
+    @Test
+    void testDefaultSaveStrategyIsSaveAll() {
+        var request = TimeseriesSaveRequest.builder().build();
+
+        assertThat(request.getStrategy()).isEqualTo(TimeseriesSaveRequest.Strategy.SAVE_ALL);
+    }
+
+    @Test
+    void testSaveAllStrategy() {
+        assertThat(TimeseriesSaveRequest.Strategy.SAVE_ALL).isEqualTo(new TimeseriesSaveRequest.Strategy(true, true, true));
+    }
+
+    @Test
+    void testWsOnlyStrategy() {
+        assertThat(TimeseriesSaveRequest.Strategy.WS_ONLY).isEqualTo(new TimeseriesSaveRequest.Strategy(false, false, true));
+    }
+
+    @Test
+    void testLatestAndWsStrategy() {
+        assertThat(TimeseriesSaveRequest.Strategy.LATEST_AND_WS).isEqualTo(new TimeseriesSaveRequest.Strategy(false, true, true));
+    }
+
+    @Test
+    void testSkipAllStrategy() {
+        assertThat(TimeseriesSaveRequest.Strategy.SKIP_ALL).isEqualTo(new TimeseriesSaveRequest.Strategy(false, false, false));
+    }
+
+}
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 7da2efdf3f..0aa3077add 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
@@ -44,7 +44,12 @@ public class TbNodeUtilsTest {
         ObjectNode node = JacksonUtil.newObjectNode();
         node.put("data_key", "data_value");
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(TenantId.SYS_TENANT_ID)
+                .copyMetaData(md)
+                .data(JacksonUtil.toString(node))
+                .build();
         String result = TbNodeUtils.processPattern(pattern, msg);
         Assertions.assertEquals("ABC metadata_value data_value", result);
     }
@@ -58,7 +63,12 @@ public class TbNodeUtilsTest {
         ObjectNode node = JacksonUtil.newObjectNode();
         node.put("key", "data_value");
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(TenantId.SYS_TENANT_ID)
+                .copyMetaData(md)
+                .data(JacksonUtil.toString(node))
+                .build();
         String result = TbNodeUtils.processPattern(pattern, msg);
         Assertions.assertEquals(pattern, result);
     }
@@ -72,7 +82,12 @@ public class TbNodeUtilsTest {
         ObjectNode node = JacksonUtil.newObjectNode();
         node.put("key", "data_value");
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(TenantId.SYS_TENANT_ID)
+                .copyMetaData(md)
+                .data(JacksonUtil.toString(node))
+                .build();
         String result = TbNodeUtils.processPattern(pattern, msg);
         Assertions.assertEquals("ABC metadata_value data_value", result);
     }
@@ -93,7 +108,12 @@ public class TbNodeUtilsTest {
         ObjectNode node = JacksonUtil.newObjectNode();
         node.set("key1", key1Node);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(TenantId.SYS_TENANT_ID)
+                .copyMetaData(md)
+                .data(JacksonUtil.toString(node))
+                .build();
         String result = TbNodeUtils.processPattern(pattern, msg);
         Assertions.assertEquals("ABC metadata_value value3", result);
     }
@@ -114,7 +134,12 @@ public class TbNodeUtilsTest {
         ObjectNode node = JacksonUtil.newObjectNode();
         node.set("key1", key1Node);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(TenantId.SYS_TENANT_ID)
+                .copyMetaData(md)
+                .data(JacksonUtil.toString(node))
+                .build();
         String result = TbNodeUtils.processPattern(pattern, msg);
         Assertions.assertEquals("ABC metadata_value $[key1.key2[0].key3]", result);
     }
diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml
index 33bb15af00..750701894f 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>rule-engine</artifactId>
     </parent>
     <groupId>org.thingsboard.rule-engine</groupId>
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractAlarmNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractAlarmNode.java
index 855727494e..5431913894 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractAlarmNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractAlarmNode.java
@@ -79,7 +79,9 @@ public abstract class TbAbstractAlarmNode<C extends TbAbstractAlarmNodeConfigura
             if (previousDetails != null) {
                 TbMsgMetaData metaData = msg.getMetaData().copy();
                 metaData.putValue(PREV_ALARM_DETAILS, JacksonUtil.toString(previousDetails));
-                dummyMsg = TbMsg.transformMsgMetadata(msg, metaData);
+                dummyMsg = msg.transform()
+                        .metaData(metaData)
+                        .build();
             }
             return scriptEngine.executeJsonAsync(dummyMsg);
         } catch (Exception e) {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNode.java
index 01dd176896..d6afd971b4 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNode.java
@@ -40,7 +40,6 @@ import org.thingsboard.server.common.msg.TbMsg;
         nodeDescription = "Assign message originator entity to customer",
         nodeDetails = "Finds target customer by title and assign message originator entity to this customer. " +
                 "Rule node will create a new customer if it doesn't exist, and 'Create new customer if it doesn't exist' enabled.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeAssignToCustomerConfig",
         icon = "add_circle",
         version = 1
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNode.java
index 622448f494..55ba8ae59a 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNode.java
@@ -43,7 +43,6 @@ import org.thingsboard.server.common.msg.TbMsg;
                         "If alarm was not cleared, original message is returned. Otherwise new Message returned with type 'ALARM', Alarm object in 'msg' property and 'metadata' will contains 'isClearedAlarm' property. " +
                         "Message payload can be accessed via <code>msg</code> property. For example <code>'temperature = ' + msg.temperature ;</code>. " +
                         "Message metadata can be accessed via <code>metadata</code> property. For example <code>'name = ' + metadata.customerName;</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeClearAlarmConfig",
         icon = "notifications_off"
 )
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 26bb6d7a4c..1a1bcf7daf 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
@@ -23,6 +23,8 @@ import com.google.gson.JsonPrimitive;
 import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.common.util.DonAsynchron;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.rule.engine.api.EmptyNodeConfiguration;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -61,7 +63,6 @@ import static org.thingsboard.server.common.data.msg.TbNodeConnectionType.SUCCES
         nodeDetails = "Copy attributes from asset/device to related entity view according to entity view configuration. \n " +
                 "Copy will be done only for attributes that are between start and end dates and according to attribute keys configuration. \n" +
                 "Changes message originator to related entity view and produces new messages according to count of updated entity views",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbNodeEmptyConfig",
         icon = "content_copy"
 )
@@ -105,15 +106,25 @@ public class TbCopyAttributesToEntityViewNode implements TbNode {
                                         List<String> filteredAttributes =
                                                 attributes.stream().filter(attr -> attributeContainsInEntityView(scope, attr, entityView)).collect(Collectors.toList());
                                         if (!filteredAttributes.isEmpty()) {
-                                            ctx.getTelemetryService().deleteAndNotify(ctx.getTenantId(), entityView.getId(), scope, filteredAttributes,
-                                                    getFutureCallback(ctx, msg, entityView));
+                                            ctx.getTelemetryService().deleteAttributes(AttributesDeleteRequest.builder()
+                                                    .tenantId(ctx.getTenantId())
+                                                    .entityId(entityView.getId())
+                                                    .scope(scope)
+                                                    .keys(filteredAttributes)
+                                                    .callback(getFutureCallback(ctx, msg, entityView))
+                                                    .build());
                                         }
                                     } else {
                                         Set<AttributeKvEntry> attributes = JsonConverter.convertToAttributes(JsonParser.parseString(msg.getData()));
                                         List<AttributeKvEntry> filteredAttributes =
                                                 attributes.stream().filter(attr -> attributeContainsInEntityView(scope, attr.getKey(), entityView)).collect(Collectors.toList());
-                                        ctx.getTelemetryService().saveAndNotify(ctx.getTenantId(), entityView.getId(), scope, filteredAttributes,
-                                                getFutureCallback(ctx, msg, entityView));
+                                        ctx.getTelemetryService().saveAttributes(AttributesSaveRequest.builder()
+                                                .tenantId(ctx.getTenantId())
+                                                .entityId(entityView.getId())
+                                                .scope(scope)
+                                                .entries(filteredAttributes)
+                                                .callback(getFutureCallback(ctx, msg, entityView))
+                                                .build());
                                     }
                                 }
                             }
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 7e535596cd..c1e8ae89aa 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
@@ -51,7 +51,6 @@ import java.util.List;
                         "If alarm was not created, original message is returned. Otherwise new Message returned with type 'ALARM', Alarm object in 'msg' property and 'metadata' will contains one of those properties 'isNewAlarm/isExistingAlarm'. " +
                         "Message payload can be accessed via <code>msg</code> property. For example <code>'temperature = ' + msg.temperature ;</code>. " +
                         "Message metadata can be accessed via <code>metadata</code> property. For example <code>'name = ' + metadata.customerName;</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeCreateAlarmConfig",
         icon = "notifications_active"
 )
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateRelationNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateRelationNode.java
index 7571695b49..0ae90cd6a7 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateRelationNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateRelationNode.java
@@ -61,7 +61,6 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
                 "Useful in GPS tracking use cases where relation acts as a temporary indicator of a tracker presence in specific geofence.</li>" +
                 "<li><strong>Change originator to target entity</strong> - useful when you need to process submitted message as a message from target entity.</li></ul>" +
                 "Output connections: <code>Success</code> - if the relation already exists or successfully created, otherwise <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeCreateRelationConfig",
         icon = "add_circle",
         version = 1
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeleteRelationNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeleteRelationNode.java
index dbc914065f..abbaad7cb3 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeleteRelationNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeleteRelationNode.java
@@ -53,7 +53,6 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
                 "<li><strong>User</strong> - use a user with the specified email as the target entity to delete relation with.</li>" +
                 "<li><strong>Edge</strong> - use an edge with the specified name as the target entity to delete relation with.</li></ul>" +
                 "Output connections: <code>Success</code> - If the relation(s) successfully deleted, otherwise <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeDeleteRelationConfig",
         icon = "remove_circle",
         version = 1
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeviceStateNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeviceStateNode.java
index 7925178b33..b00023e59d 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeviceStateNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeviceStateNode.java
@@ -58,7 +58,6 @@ import java.util.Set;
                 "This node is particularly useful when device isn't using transports to receive data, such as when fetching data from external API or computing new data within the rule chain.",
         configClazz = TbDeviceStateNodeConfiguration.class,
         relationTypes = {TbNodeConnectionType.SUCCESS, TbNodeConnectionType.FAILURE, "Rate limited"},
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeDeviceStateConfig"
 )
 public class TbDeviceStateNode implements TbNode {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNode.java
index 6b07d41a42..cdbaca491e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNode.java
@@ -43,7 +43,6 @@ import java.util.Objects;
         nodeDetails = "Transform incoming Message with configured JS function to String and log final value into Thingsboard log file. " +
                 "Message payload can be accessed via <code>msg</code> property. For example <code>'temperature = ' + msg.temperature ;</code>. " +
                 "Message metadata can be accessed via <code>metadata</code> property. For example <code>'name = ' + metadata.customerName;</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeLogConfig",
         icon = "menu"
 )
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbMsgCountNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbMsgCountNode.java
index 333aaaf7df..b387877f07 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbMsgCountNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbMsgCountNode.java
@@ -42,7 +42,6 @@ import java.util.concurrent.atomic.AtomicLong;
         nodeDescription = "Count incoming messages",
         nodeDetails = "Count incoming messages for specified interval and produces POST_TELEMETRY_REQUEST msg with messages count",
         icon = "functions",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeMsgCountConfig"
 )
 public class TbMsgCountNode implements TbNode {
@@ -74,7 +73,14 @@ public class TbMsgCountNode implements TbNode {
             TbMsgMetaData metaData = new TbMsgMetaData();
             metaData.putValue("delta", Long.toString(System.currentTimeMillis() - lastScheduledTs + delay));
 
-            TbMsg tbMsg = TbMsg.newMsg(msg.getQueueName(), TbMsgType.POST_TELEMETRY_REQUEST, ctx.getTenantId(), msg.getCustomerId(), metaData, gson.toJson(telemetryJson));
+            TbMsg tbMsg = TbMsg.newMsg()
+                    .queueName(msg.getQueueName())
+                    .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                    .originator(ctx.getTenantId())
+                    .customerId(msg.getCustomerId())
+                    .copyMetaData(metaData)
+                    .data(gson.toJson(telemetryJson))
+                    .build();
             ctx.enqueueForTellNext(tbMsg, TbNodeConnectionType.SUCCESS);
             scheduleTickMsg(ctx, tbMsg);
         } else {
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 a0dbc5da97..5c485353ab 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
@@ -69,7 +69,6 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
                 "<b>Note:</b>If the mapping key is <b>$entity_id</b>, that is identified by the Message Originator, then to the appropriate column name(mapping value) will be write the message originator id.<br><br>" +
                 "If specified message field does not exist or is not a JSON Primitive, the outbound message will be routed via <b>failure</b> chain," +
                 " otherwise, the message will be routed via <b>success</b> chain.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeCustomTableConfig",
         icon = "file_upload",
         ruleChainTypes = RuleChainType.CORE)
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNode.java
index 93fbe8019e..9569d0be77 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNode.java
@@ -42,7 +42,6 @@ import org.thingsboard.server.common.msg.TbMsg;
                 "If the incoming message originator is a dashboard, will try to search for the customer by title specified in the configuration. " +
                 "If customer doesn't exist, the exception will be thrown. Otherwise will unassign the dashboard from retrieved customer.<br><br>" +
                 "Other entities can be assigned only to one customer, so specified customer title in the configuration will be ignored if the originator isn't a dashboard.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeUnAssignToCustomerConfig",
         icon = "remove_circle",
         version = 1
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNode.java
index 1dbc81bfa1..6cf01f80c7 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNode.java
@@ -53,7 +53,6 @@ import static org.thingsboard.server.dao.service.ConstraintValidator.validateFie
                 "It sends messages using a RequestResponse invocation type. " +
                 "The node uses a pre-configured client and specified function to run.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodeLambdaConfig",
         iconUrl = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjQ4IiBoZWlnaHQ9IjQ4Ij48cGF0aCBkPSJNMTMuMjMgMTAuNTZWMTBjLTEuOTQgMC0zLjk5LjM5LTMuOTkgMi42NyAwIDEuMTYuNjEgMS45NSAxLjYzIDEuOTUuNzYgMCAxLjQzLS40NyAxLjg2LTEuMjIuNTItLjkzLjUtMS44LjUtMi44NG0yLjcgNi41M2MtLjE4LjE2LS40My4xNy0uNjMuMDYtLjg5LS43NC0xLjA1LTEuMDgtMS41NC0xLjc5LTEuNDcgMS41LTIuNTEgMS45NS00LjQyIDEuOTUtMi4yNSAwLTQuMDEtMS4zOS00LjAxLTQuMTcgMC0yLjE4IDEuMTctMy42NCAyLjg2LTQuMzggMS40Ni0uNjQgMy40OS0uNzYgNS4wNC0uOTNWNy41YzAtLjY2LjA1LTEuNDEtLjMzLTEuOTYtLjMyLS40OS0uOTUtLjctMS41LS43LTEuMDIgMC0xLjkzLjUzLTIuMTUgMS42MS0uMDUuMjQtLjI1LjQ4LS40Ny40OWwtMi42LS4yOGMtLjIyLS4wNS0uNDYtLjIyLS40LS41Ni42LTMuMTUgMy40NS00LjEgNi00LjEgMS4zIDAgMyAuMzUgNC4wMyAxLjMzQzE3LjExIDQuNTUgMTcgNi4xOCAxNyA3Ljk1djQuMTdjMCAxLjI1LjUgMS44MSAxIDIuNDguMTcuMjUuMjEuNTQgMCAuNzFsLTIuMDYgMS43OGgtLjAxIj48L3BhdGg+PHBhdGggZD0iTTIwLjE2IDE5LjU0QzE4IDIxLjE0IDE0LjgyIDIyIDEyLjEgMjJjLTMuODEgMC03LjI1LTEuNDEtOS44NS0zLjc2LS4yLS4xOC0uMDItLjQzLjI1LS4yOSAyLjc4IDEuNjMgNi4yNSAyLjYxIDkuODMgMi42MSAyLjQxIDAgNS4wNy0uNSA3LjUxLTEuNTMuMzctLjE2LjY2LjI0LjMyLjUxIj48L3BhdGg+PHBhdGggZD0iTTIxLjA3IDE4LjVjLS4yOC0uMzYtMS44NS0uMTctMi41Ny0uMDgtLjE5LjAyLS4yMi0uMTYtLjAzLS4zIDEuMjQtLjg4IDMuMjktLjYyIDMuNTMtLjMzLjI0LjMtLjA3IDIuMzUtMS4yNCAzLjMyLS4xOC4xNi0uMzUuMDctLjI2LS4xMS4yNi0uNjcuODUtMi4xNC41Ny0yLjV6Ij48L3BhdGg+PC9zdmc+"
 )
@@ -132,14 +131,19 @@ public class TbAwsLambdaNode extends TbAbstractExternalNode {
         TbMsgMetaData metaData = originalMsg.getMetaData().copy();
         metaData.putValue("requestId", invokeResult.getSdkResponseMetadata().getRequestId());
         String data = getPayload(invokeResult);
-        return TbMsg.transformMsg(originalMsg, metaData, data);
+        return originalMsg.transform()
+                .metaData(metaData)
+                .data(data)
+                .build();
     }
 
     private TbMsg processException(TbMsg origMsg, InvokeResult invokeResult, Throwable t) {
         TbMsgMetaData metaData = origMsg.getMetaData().copy();
         metaData.putValue("error", t.getClass() + ": " + t.getMessage());
         metaData.putValue("requestId", invokeResult.getSdkResponseMetadata().getRequestId());
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/sns/TbSnsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/sns/TbSnsNode.java
index 6516a5e4b3..3a9733ee82 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/sns/TbSnsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/sns/TbSnsNode.java
@@ -46,7 +46,6 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
         nodeDetails = "Will publish message payload to the AWS SNS topic. Outbound message will contain response fields " +
                 "(<code>messageId</code>, <code>requestId</code>) in the Message Metadata from the AWS SNS. " +
                 "For example <b>requestId</b> field can be accessed with <code>metadata.requestId</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodeSnsConfig",
         iconUrl = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjQ4IiBoZWlnaHQ9IjQ4Ij48cGF0aCBkPSJNMTMuMjMgMTAuNTZWMTBjLTEuOTQgMC0zLjk5LjM5LTMuOTkgMi42NyAwIDEuMTYuNjEgMS45NSAxLjYzIDEuOTUuNzYgMCAxLjQzLS40NyAxLjg2LTEuMjIuNTItLjkzLjUtMS44LjUtMi44NG0yLjcgNi41M2MtLjE4LjE2LS40My4xNy0uNjMuMDYtLjg5LS43NC0xLjA1LTEuMDgtMS41NC0xLjc5LTEuNDcgMS41LTIuNTEgMS45NS00LjQyIDEuOTUtMi4yNSAwLTQuMDEtMS4zOS00LjAxLTQuMTcgMC0yLjE4IDEuMTctMy42NCAyLjg2LTQuMzggMS40Ni0uNjQgMy40OS0uNzYgNS4wNC0uOTNWNy41YzAtLjY2LjA1LTEuNDEtLjMzLTEuOTYtLjMyLS40OS0uOTUtLjctMS41LS43LTEuMDIgMC0xLjkzLjUzLTIuMTUgMS42MS0uMDUuMjQtLjI1LjQ4LS40Ny40OWwtMi42LS4yOGMtLjIyLS4wNS0uNDYtLjIyLS40LS41Ni42LTMuMTUgMy40NS00LjEgNi00LjEgMS4zIDAgMyAuMzUgNC4wMyAxLjMzQzE3LjExIDQuNTUgMTcgNi4xOCAxNyA3Ljk1djQuMTdjMCAxLjI1LjUgMS44MSAxIDIuNDguMTcuMjUuMjEuNTQgMCAuNzFsLTIuMDYgMS43OGgtLjAxIj48L3BhdGg+PHBhdGggZD0iTTIwLjE2IDE5LjU0QzE4IDIxLjE0IDE0LjgyIDIyIDEyLjEgMjJjLTMuODEgMC03LjI1LTEuNDEtOS44NS0zLjc2LS4yLS4xOC0uMDItLjQzLjI1LS4yOSAyLjc4IDEuNjMgNi4yNSAyLjYxIDkuODMgMi42MSAyLjQxIDAgNS4wNy0uNSA3LjUxLTEuNTMuMzctLjE2LjY2LjI0LjMyLjUxIj48L3BhdGg+PHBhdGggZD0iTTIxLjA3IDE4LjVjLS4yOC0uMzYtMS44NS0uMTctMi41Ny0uMDgtLjE5LjAyLS4yMi0uMTYtLjAzLS4zIDEuMjQtLjg4IDMuMjktLjYyIDMuNTMtLjMzLjI0LjMtLjA3IDIuMzUtMS4yNCAzLjMyLS4xOC4xNi0uMzUuMDctLjI2LS4xMS4yNi0uNjcuODUtMi4xNC41Ny0yLjV6Ij48L3BhdGg+PC9zdmc+"
 )
@@ -103,13 +102,17 @@ public class TbSnsNode extends TbAbstractExternalNode {
         TbMsgMetaData metaData = origMsg.getMetaData().copy();
         metaData.putValue(MESSAGE_ID, result.getMessageId());
         metaData.putValue(REQUEST_ID, result.getSdkResponseMetadata().getRequestId());
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
     private TbMsg processException(TbMsg origMsg, Throwable t) {
         TbMsgMetaData metaData = origMsg.getMetaData().copy();
         metaData.putValue(ERROR, t.getClass() + ": " + t.getMessage());
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNode.java
index 4dbc188cdd..d9b6120fc7 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNode.java
@@ -52,7 +52,6 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
                 "response fields (<code>messageId</code>, <code>requestId</code>, <code>messageBodyMd5</code>, <code>messageAttributesMd5</code>" +
                 ", <code>sequenceNumber</code>) in the Message Metadata from the AWS SQS." +
                 " For example <b>requestId</b> field can be accessed with <code>metadata.requestId</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodeSqsConfig",
         iconUrl = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjQ4IiBoZWlnaHQ9IjQ4Ij48cGF0aCBkPSJNMTMuMjMgMTAuNTZWMTBjLTEuOTQgMC0zLjk5LjM5LTMuOTkgMi42NyAwIDEuMTYuNjEgMS45NSAxLjYzIDEuOTUuNzYgMCAxLjQzLS40NyAxLjg2LTEuMjIuNTItLjkzLjUtMS44LjUtMi44NG0yLjcgNi41M2MtLjE4LjE2LS40My4xNy0uNjMuMDYtLjg5LS43NC0xLjA1LTEuMDgtMS41NC0xLjc5LTEuNDcgMS41LTIuNTEgMS45NS00LjQyIDEuOTUtMi4yNSAwLTQuMDEtMS4zOS00LjAxLTQuMTcgMC0yLjE4IDEuMTctMy42NCAyLjg2LTQuMzggMS40Ni0uNjQgMy40OS0uNzYgNS4wNC0uOTNWNy41YzAtLjY2LjA1LTEuNDEtLjMzLTEuOTYtLjMyLS40OS0uOTUtLjctMS41LS43LTEuMDIgMC0xLjkzLjUzLTIuMTUgMS42MS0uMDUuMjQtLjI1LjQ4LS40Ny40OWwtMi42LS4yOGMtLjIyLS4wNS0uNDYtLjIyLS40LS41Ni42LTMuMTUgMy40NS00LjEgNi00LjEgMS4zIDAgMyAuMzUgNC4wMyAxLjMzQzE3LjExIDQuNTUgMTcgNi4xOCAxNyA3Ljk1djQuMTdjMCAxLjI1LjUgMS44MSAxIDIuNDguMTcuMjUuMjEuNTQgMCAuNzFsLTIuMDYgMS43OGgtLjAxIj48L3BhdGg+PHBhdGggZD0iTTIwLjE2IDE5LjU0QzE4IDIxLjE0IDE0LjgyIDIyIDEyLjEgMjJjLTMuODEgMC03LjI1LTEuNDEtOS44NS0zLjc2LS4yLS4xOC0uMDItLjQzLjI1LS4yOSAyLjc4IDEuNjMgNi4yNSAyLjYxIDkuODMgMi42MSAyLjQxIDAgNS4wNy0uNSA3LjUxLTEuNTMuMzctLjE2LjY2LjI0LjMyLjUxIj48L3BhdGg+PHBhdGggZD0iTTIxLjA3IDE4LjVjLS4yOC0uMzYtMS44NS0uMTctMi41Ny0uMDgtLjE5LjAyLS4yMi0uMTYtLjAzLS4zIDEuMjQtLjg4IDMuMjktLjYyIDMuNTMtLjMzLjI0LjMtLjA3IDIuMzUtMS4yNCAzLjMyLS4xOC4xNi0uMzUuMDctLjI2LS4xMS4yNi0uNjcuODUtMi4xNC41Ny0yLjV6Ij48L3BhdGg+PC9zdmc+"
 )
@@ -134,13 +133,17 @@ public class TbSqsNode extends TbAbstractExternalNode {
         if (!StringUtils.isEmpty(result.getSequenceNumber())) {
             metaData.putValue(SEQUENCE_NUMBER, result.getSequenceNumber());
         }
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
     private TbMsg processException(TbMsg origMsg, Throwable t) {
         TbMsgMetaData metaData = origMsg.getMetaData().copy();
         metaData.putValue(ERROR, t.getClass() + ": " + t.getMessage());
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java
index c7bf1423f8..0fcabd806a 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java
@@ -62,7 +62,6 @@ import static org.thingsboard.server.common.data.DataConstants.QUEUE_NAME;
         nodeDescription = "Periodically generates messages",
         nodeDetails = "Generates messages with configurable period. Javascript function used for message generation.",
         inEnabled = false,
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeGeneratorConfig",
         icon = "repeat"
 )
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNode.java
index 1afba3581f..6d13332f6f 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNode.java
@@ -59,8 +59,7 @@ import static org.thingsboard.server.common.data.DataConstants.QUEUE_NAME;
                 "<li><strong>ALL</strong> - return all messages as a single JSON array message. " +
                 "Where each element represents object with <strong><i>msg</i></strong> and <strong><i>metadata</i></strong> inner properties.</li></ul>",
         icon = "content_copy",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
-        configDirective = "tbActionNodeMsgDeduplicationConfig"
+        configDirective = "tbTransformationNodeDeduplicationConfig"
 )
 @Slf4j
 public class TbMsgDeduplicationNode implements TbNode {
@@ -154,12 +153,13 @@ public class TbMsgDeduplicationNode implements TbNode {
                             iterator.remove();
                         }
                     }
-                    deduplicationResults.add(TbMsg.newMsg(
-                            queueName,
-                            config.getOutMsgType(),
-                            deduplicationId,
-                            getMetadata(),
-                            getMergedData(pack)));
+                    deduplicationResults.add(TbMsg.newMsg()
+                            .queueName(queueName)
+                            .type(config.getOutMsgType())
+                            .originator(deduplicationId)
+                            .copyMetaData(getMetadata())
+                            .data(getMergedData(pack))
+                            .build());
                 } else {
                     TbMsg resultMsg = null;
                     boolean searchMin = DeduplicationStrategy.FIRST.equals(config.getStrategy());
@@ -176,13 +176,15 @@ public class TbMsgDeduplicationNode implements TbNode {
                         }
                     }
                     if (resultMsg != null) {
-                        deduplicationResults.add(TbMsg.newMsg(
-                                queueName != null ? queueName : resultMsg.getQueueName(),
-                                resultMsg.getType(),
-                                resultMsg.getOriginator(),
-                                resultMsg.getCustomerId(),
-                                resultMsg.getMetaData(),
-                                resultMsg.getData()));
+                        String queueName1 = queueName != null ? queueName : resultMsg.getQueueName();
+                        deduplicationResults.add(TbMsg.newMsg()
+                                .queueName(queueName1)
+                                .type(resultMsg.getType())
+                                .originator(resultMsg.getOriginator())
+                                .customerId(resultMsg.getCustomerId())
+                                .copyMetaData(resultMsg.getMetaData())
+                                .data(resultMsg.getData())
+                                .build());
                     }
                 }
                 packBoundsOpt = findValidPack(msgList, deduplicationTimeoutMs);
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/delay/TbMsgDelayNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/delay/TbMsgDelayNode.java
index b60a46ee0a..eb18bd13fe 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/delay/TbMsgDelayNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/delay/TbMsgDelayNode.java
@@ -45,7 +45,6 @@ import java.util.concurrent.TimeUnit;
                 "Deprecated because the acknowledged message still stays in memory (to be delayed) and this " +
                 "does not guarantee that message will be processed even if the \"retry failures and timeouts\" processing strategy will be chosen.",
         icon = "pause",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeMsgDelayConfig"
 )
 public class TbMsgDelayNode implements TbNode {
@@ -65,14 +64,14 @@ public class TbMsgDelayNode implements TbNode {
             TbMsg pendingMsg = pendingMsgs.remove(UUID.fromString(msg.getData()));
             if (pendingMsg != null) {
                 ctx.enqueueForTellNext(
-                        TbMsg.newMsg(
-                                pendingMsg.getQueueName(),
-                                pendingMsg.getType(),
-                                pendingMsg.getOriginator(),
-                                pendingMsg.getCustomerId(),
-                                pendingMsg.getMetaData(),
-                                pendingMsg.getData()
-                        ),
+                        TbMsg.newMsg()
+                                .queueName(pendingMsg.getQueueName())
+                                .type(pendingMsg.getType())
+                                .originator(pendingMsg.getOriginator())
+                                .customerId(pendingMsg.getCustomerId())
+                                .copyMetaData(pendingMsg.getMetaData())
+                                .data(pendingMsg.getData())
+                                .build(),
                         TbNodeConnectionType.SUCCESS
                 );
             }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNode.java
index 1ed2f8e849..50355632a3 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNode.java
@@ -46,7 +46,6 @@ import java.util.UUID;
                 "<br><code>ALARM</code><br><br>" +
                 "Message will be routed via <b>Failure</b> route if node was not able to save cloud event to database or unsupported originator type/message type arrived. " +
                 "In case successful storage cloud event to database message will be routed via <b>Success</b> route.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodePushToCloudConfig",
         icon = "cloud_upload",
         ruleChainTypes = RuleChainType.EDGE
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 4ae86742a2..2659bb281e 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
@@ -61,7 +61,6 @@ import static org.thingsboard.server.dao.edge.BaseRelatedEdgesService.RELATED_ED
                 "<br><code>ALARM</code><br><br>" +
                 "Message will be routed via <b>Failure</b> route if node was not able to save edge event to database or unsupported message type arrived. " +
                 "In case successful storage edge event to database message will be routed via <b>Success</b> route.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodePushToEdgeConfig",
         icon = "cloud_download",
         ruleChainTypes = RuleChainType.CORE
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNode.java
index 0fc03be83b..b0f5552b72 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNode.java
@@ -36,7 +36,6 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
         nodeDescription = "Route incoming messages based on the name of the asset profile",
         nodeDetails = "Route incoming messages based on the name of the asset profile. The asset profile name is case-sensitive.<br><br>" +
                 "Output connections: <i>Asset profile name</i> or <code>Failure</code>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbNodeEmptyConfig")
 public class TbAssetTypeSwitchNode extends TbAbstractTypeSwitchNode {
 
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 ed703e8661..6aa05007d1 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
@@ -43,7 +43,6 @@ import java.util.Objects;
         nodeDescription = "Checks alarm status.",
         nodeDetails = "Checks the alarm status to match one of the specified statuses.<br><br>" +
                 "Output connections: <code>True</code>, <code>False</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbFilterNodeCheckAlarmStatusConfig")
 public class TbCheckAlarmStatusNode implements TbNode {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckMessageNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckMessageNode.java
index 1b9f2f2a78..0ca3f74d29 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckMessageNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckMessageNode.java
@@ -40,7 +40,6 @@ import java.util.Map;
         nodeDetails = "By default, the rule node checks that all specified fields are present. " +
                 "Uncheck the 'Check that all selected fields are present' if the presence of at least one field is sufficient.<br><br>" +
                 "Output connections: <code>True</code>, <code>False</code>, <code>Failure</code>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbFilterNodeCheckMessageConfig")
 public class TbCheckMessageNode implements TbNode {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckRelationNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckRelationNode.java
index 0356548a03..f24312dba9 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckRelationNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckRelationNode.java
@@ -56,7 +56,6 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
                 "Otherwise, the rule node checks the presence of a relation to any entity. " +
                 "In both cases, relation lookup is based on configured direction and type.<br><br>" +
                 "Output connections: <code>True</code>, <code>False</code>, <code>Failure</code>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbFilterNodeCheckRelationConfig")
 public class TbCheckRelationNode implements TbNode {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNode.java
index d440969fff..a7ec1e86a4 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNode.java
@@ -36,7 +36,6 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
         nodeDescription = "Route incoming messages based on the name of the device profile",
         nodeDetails = "Route incoming messages based on the name of the device profile. The device profile name is case-sensitive<br><br>" +
                 "Output connections: <i>Device profile name</i> or <code>Failure</code>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbNodeEmptyConfig")
 public class TbDeviceTypeSwitchNode extends TbAbstractTypeSwitchNode {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java
index 6d5aaa6477..767c2f91d6 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java
@@ -44,7 +44,6 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
                 "Message metadata can be accessed via <code>metadata</code> property. For example <code>metadata.customerName === 'John';</code><br/>" +
                 "Message type can be accessed via <code>msgType</code> property.<br><br>" +
                 "Output connections: <code>True</code>, <code>False</code>, <code>Failure</code>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbFilterNodeScriptConfig"
 )
 public class TbJsFilterNode implements TbNode {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java
index e866f05bd0..10277d067b 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java
@@ -46,7 +46,6 @@ import java.util.Set;
                 "Message metadata can be accessed via <code>metadata</code> property. For example <code>metadata.customerName === 'John';</code><br/>" +
                 "Message type can be accessed via <code>msgType</code> property.<br><br>" +
                 "Output connections: <i>Custom connection(s) defined by switch node</i> or <code>Failure</code>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbFilterNodeSwitchConfig")
 public class TbJsSwitchNode implements TbNode {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java
index 579b6a3ec7..d818c3a8f1 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java
@@ -38,7 +38,6 @@ import org.thingsboard.server.common.msg.TbMsg;
         nodeDescription = "Filter incoming messages by Message Type",
         nodeDetails = "If incoming message type is expected - send Message via <b>True</b> chain, otherwise <b>False</b> chain is used.<br><br>" +
                 "Output connections: <code>True</code>, <code>False</code>, <code>Failure</code>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbFilterNodeMessageTypeConfig")
 public class TbMsgTypeFilterNode implements TbNode {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java
index 971ab22588..455bf2f78c 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java
@@ -36,7 +36,6 @@ import org.thingsboard.server.common.msg.TbMsg;
         nodeDetails = "Sends messages with message types <b>\"Post attributes\", \"Post telemetry\", \"RPC Request\"</b>" +
                 " etc. via corresponding chain, otherwise <b>Other</b> chain is used.<br><br>" +
                 "Output connections: <i>Message type connection</i>, <code>Other</code> - if message type is custom or <code>Failure</code>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbNodeEmptyConfig")
 public class TbMsgTypeSwitchNode implements TbNode {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNode.java
index 94a13be583..ad873666c0 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNode.java
@@ -36,7 +36,6 @@ import org.thingsboard.server.common.msg.TbMsg;
         nodeDescription = "Filter incoming messages by the type of message originator entity",
         nodeDetails = "Checks that the entity type of the incoming message originator matches one of the values specified in the filter.<br><br>" +
                 "Output connections: <code>True</code>, <code>False</code>, <code>Failure</code>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbFilterNodeOriginatorTypeConfig")
 public class TbOriginatorTypeFilterNode implements TbNode {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java
index 2eef991aa0..95f062e88f 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java
@@ -31,7 +31,6 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
         nodeDescription = "Route incoming messages by Message Originator Type",
         nodeDetails = "Routes messages to chain according to the entity type ('Device', 'Asset', etc.).<br><br>" +
                 "Output connections: <i>Message originator type</i> or <code>Failure</code>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbNodeEmptyConfig")
 public class TbOriginatorTypeSwitchNode extends TbAbstractTypeSwitchNode {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbAckNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbAckNode.java
index 505a5b3215..b19488f0ca 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbAckNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbAckNode.java
@@ -33,7 +33,6 @@ import org.thingsboard.server.common.msg.TbMsg;
         configClazz = EmptyNodeConfiguration.class,
         nodeDescription = "Acknowledges the incoming message",
         nodeDetails = "After acknowledgement, the message is pushed to related rule nodes. Useful if you don't care what happens to this message next.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbNodeEmptyConfig"
 )
 public class TbAckNode implements TbNode {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNode.java
index cd827c9e54..8b9f113621 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNode.java
@@ -40,7 +40,6 @@ import static org.thingsboard.server.common.data.DataConstants.QUEUE_NAME;
         hasQueueName = true,
         nodeDescription = "transfers the message to another queue",
         nodeDetails = "After successful transfer incoming message is automatically acknowledged. Queue name is configurable.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbNodeEmptyConfig"
 )
 public class TbCheckpointNode implements TbNode {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNode.java
index 0b30d02842..a594f548e8 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNode.java
@@ -46,7 +46,6 @@ import java.util.UUID;
                 "then target rule chain might be resolved dynamically based on incoming message originator. " +
                 "In this case rule chain specified in the configuration will be used as fallback rule chain.<br><br>" +
                 "Output connections: <i>Any connection(s) produced by output node(s) in the target rule chain.</i>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbFlowNodeRuleChainInputConfig",
         relationTypes = {},
         ruleChainNode = true,
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNode.java
index 2879397ace..1d887aa3a0 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNode.java
@@ -34,7 +34,6 @@ import org.thingsboard.server.common.msg.TbMsg;
         nodeDetails = "Produces output of the rule chain processing. " +
                 "The output is forwarded to the caller rule chain, as an output of the corresponding \"input\" rule node. " +
                 "The output rule node name corresponds to the relation type of the output message, and it is used to forward messages to other rule nodes in the caller rule chain. ",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbFlowNodeRuleChainOutputConfig",
         outEnabled = false
 )
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNode.java
index 537318fa75..45fe4f8bc0 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNode.java
@@ -52,7 +52,6 @@ import java.util.concurrent.TimeUnit;
         nodeDetails = "Will publish message payload to the Google Cloud Platform PubSub topic. Outbound message will contain response fields " +
                 "(<code>messageId</code> in the Message Metadata from the GCP PubSub. " +
                 "<b>messageId</b> field can be accessed with <code>metadata.messageId</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodePubSubConfig",
         iconUrl = "data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjgiIGhlaWdodD0iMTI4IiB2aWV3Qm94PSIwIDAgMTI4IDEyOCI+Cjx0aXRsZT5DbG91ZCBQdWJTdWI8L3RpdGxlPgo8Zz4KPHBhdGggZD0iTTEyNi40Nyw1OC4xMmwtMjYuMy00NS43NEExMS41NiwxMS41NiwwLDAsMCw5MC4zMSw2LjVIMzcuN2ExMS41NSwxMS41NSwwLDAsMC05Ljg2LDUuODhMMS41Myw1OGExMS40OCwxMS40OCwwLDAsMCwwLDExLjQ0bDI2LjMsNDZhMTEuNzcsMTEuNzcsMCwwLDAsOS44Niw2LjA5SDkwLjNhMTEuNzMsMTEuNzMsMCwwLDAsOS44Ny02LjA2bDI2LjMtNDUuNzRBMTEuNzMsMTEuNzMsMCwwLDAsMTI2LjQ3LDU4LjEyWiIgc3R5bGU9ImZpbGw6ICM3MzViMmYiLz4KPHBhdGggZD0iTTg5LjIyLDQ3Ljc0LDgzLjM2LDQ5bC0xNC42LTE0LjZMNjQuMDksNDMuMSw2MS41NSw1My4ybDQuMjksNC4yOUw1Ny42LDU5LjE4LDQ2LjMsNDcuODhsLTcuNjcsNy4zOEw1Mi43Niw2OS4zN2wtMTUsMTEuOUw3OCwxMjEuNUg5MC4zYTExLjczLDExLjczLDAsMCwwLDkuODctNi4wNmwyMC43Mi0zNloiIHN0eWxlPSJvcGFjaXR5OiAwLjA3MDAwMDAwMDI5ODAyMztpc29sYXRpb246IGlzb2xhdGUiLz4KPHBhdGggZD0iTTgyLjg2LDQ3YTUuMzIsNS4zMiwwLDEsMS0xLjk1LDcuMjdBNS4zMiw1LjMyLDAsMCwxLDgyLjg2LDQ3IiBzdHlsZT0iZmlsbDogI2ZmZiIvPgo8cGF0aCBkPSJNMzkuODIsNTYuMThhNS4zMiw1LjMyLDAsMSwxLDcuMjctMS45NSw1LjMyLDUuMzIsMCwwLDEtNy4yNywxLjk1IiBzdHlsZT0iZmlsbDogI2ZmZiIvPgo8cGF0aCBkPSJNNjkuMzIsODguODVBNS4zMiw1LjMyLDAsMSwxLDY0LDgzLjUyYTUuMzIsNS4zMiwwLDAsMSw1LjMyLDUuMzIiIHN0eWxlPSJmaWxsOiAjZmZmIi8+CjxnPgo8cGF0aCBkPSJNNjQsNTIuOTRhMTEuMDYsMTEuMDYsMCwwLDEsMi40Ni4yOFYzOS4xNUg2MS41NFY1My4yMkExMS4wNiwxMS4wNiwwLDAsMSw2NCw1Mi45NFoiIHN0eWxlPSJmaWxsOiAjZmZmIi8+CjxwYXRoIGQ9Ik03NC41Nyw2Ny4yNmExMSwxMSwwLDAsMS0yLjQ3LDQuMjVsMTIuMTksNywyLjQ2LTQuMjZaIiBzdHlsZT0iZmlsbDogI2ZmZiIvPgo8cGF0aCBkPSJNNTMuNDMsNjcuMjZsLTEyLjE4LDcsMi40Niw0LjI2LDEyLjE5LTdBMTEsMTEsMCwwLDEsNTMuNDMsNjcuMjZaIiBzdHlsZT0iZmlsbDogI2ZmZiIvPgo8L2c+CjxwYXRoIGQ9Ik03Mi42LDY0QTguNiw4LjYsMCwxLDEsNjQsNTUuNCw4LjYsOC42LDAsMCwxLDcyLjYsNjQiIHN0eWxlPSJmaWxsOiAjZmZmIi8+CjxwYXRoIGQ9Ik0zOS4xLDcwLjU3YTYuNzYsNi43NiwwLDEsMS0yLjQ3LDkuMjMsNi43Niw2Ljc2LDAsMCwxLDIuNDctOS4yMyIgc3R5bGU9ImZpbGw6ICNmZmYiLz4KPHBhdGggZD0iTTgyLjE0LDgyLjI3YTYuNzYsNi43NiwwLDEsMSw5LjIzLTIuNDcsNi43NSw2Ljc1LDAsMCwxLTkuMjMsMi40NyIgc3R5bGU9ImZpbGw6ICNmZmYiLz4KPHBhdGggZD0iTTcwLjc2LDM5LjE1QTYuNzYsNi43NiwwLDEsMSw2NCwzMi4zOWE2Ljc2LDYuNzYsMCwwLDEsNi43Niw2Ljc2IiBzdHlsZT0iZmlsbDogI2ZmZiIvPgo8L2c+Cjwvc3ZnPgo="
 )
@@ -120,13 +119,17 @@ public class TbPubSubNode extends TbAbstractExternalNode {
     private TbMsg processPublishResult(TbMsg origMsg, String messageId) {
         TbMsgMetaData metaData = origMsg.getMetaData().copy();
         metaData.putValue(MESSAGE_ID, messageId);
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
     private TbMsg processException(TbMsg origMsg, Throwable t) {
         TbMsgMetaData metaData = origMsg.getMetaData().copy();
         metaData.putValue(ERROR, t.getClass() + ": " + t.getMessage());
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
     Publisher initPubSubClient(TbContext ctx) throws IOException {
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 b2d16434d5..a6cbb58cf5 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
@@ -66,7 +66,6 @@ import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.OUTSIDE;
                 "If the presence monitoring strategy <b>\"On each message\"</b> is selected, sends messages via rule node connection type <code>Inside</code> or <code>Outside</code> every time the geofencing condition is satisfied. " +
                 "<br><br>" +
                 "Output connections: <code>Entered</code>, <code>Left</code>, <code>Inside</code>, <code>Outside</code>, <code>Success</code>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeGpsGeofencingConfig"
 )
 public class TbGpsGeofencingActionNode extends AbstractGeofencingNode<TbGpsGeofencingActionNodeConfiguration> {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNode.java
index 89ca1318b7..aa95f8e523 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNode.java
@@ -60,7 +60,6 @@ import org.thingsboard.server.common.msg.TbMsg;
                 "</br></br>" +
                 "Available radius units: METER, KILOMETER, FOOT, MILE, NAUTICAL_MILE;<br><br>" +
                 "Output connections: <code>True</code>, <code>False</code>, <code>Failure</code>",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbFilterNodeGpsGeofencingConfig")
 public class TbGpsGeofencingFilterNode extends AbstractGeofencingNode<TbGpsGeofencingFilterNodeConfiguration> {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/kafka/TbKafkaNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/kafka/TbKafkaNode.java
index 89b6e1c1d9..5a9e917427 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/kafka/TbKafkaNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/kafka/TbKafkaNode.java
@@ -52,7 +52,6 @@ import java.util.Properties;
         nodeDetails = "Will send record via Kafka producer to Kafka server. " +
                 "Outbound message will contain response fields (<code>offset</code>, <code>partition</code>, <code>topic</code>)" +
                 " from the Kafka in the Message Metadata. For example <b>partition</b> field can be accessed with <code>metadata.partition</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodeKafkaConfig",
         iconUrl = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTUzOCIgaGVpZ2h0PSIyNTAwIiB2aWV3Qm94PSIwIDAgMjU2IDQxNiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTIwMS44MTYgMjMwLjIxNmMtMTYuMTg2IDAtMzAuNjk3IDcuMTcxLTQwLjYzNCAxOC40NjFsLTI1LjQ2My0xOC4wMjZjMi43MDMtNy40NDIgNC4yNTUtMTUuNDMzIDQuMjU1LTIzLjc5NyAwLTguMjE5LTEuNDk4LTE2LjA3Ni00LjExMi0yMy40MDhsMjUuNDA2LTE3LjgzNWM5LjkzNiAxMS4yMzMgMjQuNDA5IDE4LjM2NSA0MC41NDggMTguMzY1IDI5Ljg3NSAwIDU0LjE4NC0yNC4zMDUgNTQuMTg0LTU0LjE4NCAwLTI5Ljg3OS0yNC4zMDktNTQuMTg0LTU0LjE4NC01NC4xODQtMjkuODc1IDAtNTQuMTg0IDI0LjMwNS01NC4xODQgNTQuMTg0IDAgNS4zNDguODA4IDEwLjUwNSAyLjI1OCAxNS4zODlsLTI1LjQyMyAxNy44NDRjLTEwLjYyLTEzLjE3NS0yNS45MTEtMjIuMzc0LTQzLjMzMy0yNS4xODJ2LTMwLjY0YzI0LjU0NC01LjE1NSA0My4wMzctMjYuOTYyIDQzLjAzNy01My4wMTlDMTI0LjE3MSAyNC4zMDUgOTkuODYyIDAgNjkuOTg3IDAgNDAuMTEyIDAgMTUuODAzIDI0LjMwNSAxNS44MDMgNTQuMTg0YzAgMjUuNzA4IDE4LjAxNCA0Ny4yNDYgNDIuMDY3IDUyLjc2OXYzMS4wMzhDMjUuMDQ0IDE0My43NTMgMCAxNzIuNDAxIDAgMjA2Ljg1NGMwIDM0LjYyMSAyNS4yOTIgNjMuMzc0IDU4LjM1NSA2OC45NHYzMi43NzRjLTI0LjI5OSA1LjM0MS00Mi41NTIgMjcuMDExLTQyLjU1MiA1Mi44OTQgMCAyOS44NzkgMjQuMzA5IDU0LjE4NCA1NC4xODQgNTQuMTg0IDI5Ljg3NSAwIDU0LjE4NC0yNC4zMDUgNTQuMTg0LTU0LjE4NCAwLTI1Ljg4My0xOC4yNTMtNDcuNTUzLTQyLjU1Mi01Mi44OTR2LTMyLjc3NWE2OS45NjUgNjkuOTY1IDAgMCAwIDQyLjYtMjQuNzc2bDI1LjYzMyAxOC4xNDNjLTEuNDIzIDQuODQtMi4yMiA5Ljk0Ni0yLjIyIDE1LjI0IDAgMjkuODc5IDI0LjMwOSA1NC4xODQgNTQuMTg0IDU0LjE4NCAyOS44NzUgMCA1NC4xODQtMjQuMzA1IDU0LjE4NC01NC4xODQgMC0yOS44NzktMjQuMzA5LTU0LjE4NC01NC4xODQtNTQuMTg0em0wLTEyNi42OTVjMTQuNDg3IDAgMjYuMjcgMTEuNzg4IDI2LjI3IDI2LjI3MXMtMTEuNzgzIDI2LjI3LTI2LjI3IDI2LjI3LTI2LjI3LTExLjc4Ny0yNi4yNy0yNi4yN2MwLTE0LjQ4MyAxMS43ODMtMjYuMjcxIDI2LjI3LTI2LjI3MXptLTE1OC4xLTQ5LjMzN2MwLTE0LjQ4MyAxMS43ODQtMjYuMjcgMjYuMjcxLTI2LjI3czI2LjI3IDExLjc4NyAyNi4yNyAyNi4yN2MwIDE0LjQ4My0xMS43ODMgMjYuMjctMjYuMjcgMjYuMjdzLTI2LjI3MS0xMS43ODctMjYuMjcxLTI2LjI3em01Mi41NDEgMzA3LjI3OGMwIDE0LjQ4My0xMS43ODMgMjYuMjctMjYuMjcgMjYuMjdzLTI2LjI3MS0xMS43ODctMjYuMjcxLTI2LjI3YzAtMTQuNDgzIDExLjc4NC0yNi4yNyAyNi4yNzEtMjYuMjdzMjYuMjcgMTEuNzg3IDI2LjI3IDI2LjI3em0tMjYuMjcyLTExNy45N2MtMjAuMjA1IDAtMzYuNjQyLTE2LjQzNC0zNi42NDItMzYuNjM4IDAtMjAuMjA1IDE2LjQzNy0zNi42NDIgMzYuNjQyLTM2LjY0MiAyMC4yMDQgMCAzNi42NDEgMTYuNDM3IDM2LjY0MSAzNi42NDIgMCAyMC4yMDQtMTYuNDM3IDM2LjYzOC0zNi42NDEgMzYuNjM4em0xMzEuODMxIDY3LjE3OWMtMTQuNDg3IDAtMjYuMjctMTEuNzg4LTI2LjI3LTI2LjI3MXMxMS43ODMtMjYuMjcgMjYuMjctMjYuMjcgMjYuMjcgMTEuNzg3IDI2LjI3IDI2LjI3YzAgMTQuNDgzLTExLjc4MyAyNi4yNzEtMjYuMjcgMjYuMjcxeiIvPjwvc3ZnPg=="
 )
@@ -188,13 +187,17 @@ public class TbKafkaNode extends TbAbstractExternalNode {
         metaData.putValue(OFFSET, String.valueOf(recordMetadata.offset()));
         metaData.putValue(PARTITION, String.valueOf(recordMetadata.partition()));
         metaData.putValue(TOPIC, recordMetadata.topic());
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
     private TbMsg processException(TbMsg origMsg, Exception e) {
         TbMsgMetaData metaData = origMsg.getMetaData().copy();
         metaData.putValue(ERROR, e.getClass() + ": " + e.getMessage());
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
index 864528b3a4..dd26a64993 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
@@ -42,7 +42,6 @@ import java.util.Map;
         nodeDescription = "Transforms message to email message",
         nodeDetails = "Transforms message to email message. If transformation completed successfully output message type will be set to <code>SEND_EMAIL</code>.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbTransformationNodeToEmailConfig",
         icon = "email"
 )
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
index 7be40fc829..27fdce68d9 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
@@ -44,7 +44,6 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
         nodeDetails = "Expects messages with <b>SEND_EMAIL</b> type. Node works only with messages that " +
                 " where created using <code>to Email</code> transformation Node, please connect this Node " +
                 "with <code>to Email</code> Node using <code>Successful</code> chain.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodeSendEmailConfig",
         icon = "send"
 )
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 4e64ad854e..27afa06f90 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,16 +19,19 @@ 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 com.google.common.util.concurrent.SettableFuture;
 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.JacksonUtil;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.rule.engine.api.RuleNode;
 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.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.rule.engine.util.SemaphoreWithTbMsgQueue;
 import org.thingsboard.server.common.data.AttributeScope;
@@ -37,6 +40,7 @@ import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
 import org.thingsboard.server.common.data.kv.DoubleDataEntry;
 import org.thingsboard.server.common.data.kv.KvEntry;
+import org.thingsboard.server.common.data.kv.LongDataEntry;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
 
@@ -72,7 +76,6 @@ import static org.thingsboard.rule.engine.math.TbMathArgumentType.CONSTANT;
                 "<br/><br/>" +
                 "The execution is synchronized in scope of message originator (e.g. device) and server node. " +
                 "If you have rule nodes in different rule chains, they will process messages from the same originator synchronously in the scope of the server node.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeMathFunctionConfig",
         icon = "calculate"
 
@@ -139,22 +142,36 @@ public class TbMathNode implements TbNode {
     }
 
     private ListenableFuture<Void> saveTimeSeries(TbContext ctx, TbMsg msg, double result, TbMathResult mathResultDef) {
-
-        return ctx.getTelemetryService().saveAndNotify(ctx.getTenantId(), msg.getOriginator(),
-                new BasicTsKvEntry(System.currentTimeMillis(), new DoubleDataEntry(mathResultDef.getKey(), result)));
+        final BasicTsKvEntry basicTsKvEntry = new BasicTsKvEntry(System.currentTimeMillis(), new DoubleDataEntry(mathResultDef.getKey(), result));
+        SettableFuture<Void> future = SettableFuture.create();
+        ctx.getTelemetryService().saveTimeseries(TimeseriesSaveRequest.builder()
+                .tenantId(ctx.getTenantId())
+                .entityId(msg.getOriginator())
+                .entry(basicTsKvEntry)
+                .future(future)
+                .build());
+        return future;
     }
 
     private ListenableFuture<Void> saveAttribute(TbContext ctx, TbMsg msg, double result, TbMathResult mathResultDef) {
         AttributeScope attributeScope = getAttributeScope(mathResultDef.getAttributeScope());
+        KvEntry kvEntry;
         if (isIntegerResult(mathResultDef, config.getOperation())) {
             var value = toIntValue(result);
-            return ctx.getTelemetryService().saveAttrAndNotify(
-                    ctx.getTenantId(), msg.getOriginator(), attributeScope, mathResultDef.getKey(), value);
+            kvEntry = new LongDataEntry(mathResultDef.getKey(), value);
         } else {
             var value = toDoubleValue(mathResultDef, result);
-            return ctx.getTelemetryService().saveAttrAndNotify(
-                    ctx.getTenantId(), msg.getOriginator(), attributeScope, mathResultDef.getKey(), value);
+            kvEntry = new DoubleDataEntry(mathResultDef.getKey(), value);
         }
+        SettableFuture<Void> future = SettableFuture.create();
+        ctx.getTelemetryService().saveAttributes(AttributesSaveRequest.builder()
+                .tenantId(ctx.getTenantId())
+                .entityId(msg.getOriginator())
+                .scope(attributeScope)
+                .entry(kvEntry)
+                .future(future)
+                .build());
+        return future;
     }
 
     private boolean isIntegerResult(TbMathResult mathResultDef, TbRuleNodeMathFunctionType function) {
@@ -202,7 +219,9 @@ public class TbMathNode implements TbNode {
         } else {
             body.put(mathResultKey, toDoubleValue(mathResultDef, result));
         }
-        return TbMsg.transformMsgData(msg, JacksonUtil.toString(body));
+        return msg.transform()
+                .data(JacksonUtil.toString(body))
+                .build();
     }
 
     private TbMsg addToMeta(TbMsg msg, TbMathResult mathResultDef, String mathResultKey, double result) {
@@ -212,7 +231,9 @@ public class TbMathNode implements TbNode {
         } else {
             md.putValue(mathResultKey, Double.toString(toDoubleValue(mathResultDef, result)));
         }
-        return TbMsg.transformMsgMetadata(msg, md);
+        return msg.transform()
+                .metaData(md)
+                .build();
     }
 
     private double calculateResult(List<TbMathArgumentValue> args) {
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 329fa46c3b..48c3ba4778 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
@@ -53,7 +53,6 @@ import java.util.Map;
                 "and current value for this key from the incoming message",
         nodeDetails = "Useful for metering use cases, when you need to calculate consumption based on pulse counter reading.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Other</code> or <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeCalculateDeltaConfig")
 public class CalculateDeltaNode implements TbNode {
 
@@ -175,7 +174,9 @@ public class CalculateDeltaNode implements TbNode {
                 long period = previousData != null ? msg.getMetaDataTs() - previousData.ts : 0;
                 json.put(config.getPeriodValueKey(), period);
             }
-            return TbMsg.transformMsgData(msg, JacksonUtil.toString(json));
+            return msg.transform()
+                    .data(JacksonUtil.toString(json))
+                    .build();
         }, MoreExecutors.directExecutor());
     }
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractNodeWithFetchTo.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractNodeWithFetchTo.java
index 951f1635d8..0e4fc27c02 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractNodeWithFetchTo.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractNodeWithFetchTo.java
@@ -82,9 +82,13 @@ public abstract class TbAbstractNodeWithFetchTo<C extends TbAbstractFetchToNodeC
     protected TbMsg transformMessage(TbMsg msg, ObjectNode msgDataNode, TbMsgMetaData msgMetaData) {
         switch (fetchTo) {
             case DATA:
-                return TbMsg.transformMsgData(msg, JacksonUtil.toString(msgDataNode));
+                return msg.transform()
+                        .data(JacksonUtil.toString(msgDataNode))
+                        .build();
             case METADATA:
-                return TbMsg.transformMsgMetadata(msg, msgMetaData);
+                return msg.transform()
+                        .metaData(msgMetaData)
+                        .build();
             default:
                 log.debug("Unexpected FetchTo value: {}. Allowed values: {}", fetchTo, TbMsgSource.values());
                 return msg;
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java
index 3362d60fac..6d11419e72 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java
@@ -45,7 +45,6 @@ import java.util.concurrent.ExecutionException;
                 "Useful when you need to fetch device credentials and use them for further message processing. " +
                 "For example, use device credentials to interact with external systems.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeFetchDeviceCredentialsConfig")
 public class TbFetchDeviceCredentialsNode extends TbAbstractNodeWithFetchTo<TbFetchDeviceCredentialsNodeConfiguration> {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java
index f618befb97..586b5077e2 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java
@@ -43,7 +43,6 @@ import org.thingsboard.server.common.msg.TbMsg;
                 "that are not included in the incoming message to use them for further message processing. " +
                 "For example to filter messages based on the threshold value stored in the attributes.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeOriginatorAttributesConfig")
 public class TbGetAttributesNode extends TbAbstractGetAttributesNode<TbGetAttributesNodeConfiguration, EntityId> {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java
index ea48f3a2c4..37a9d052e6 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java
@@ -41,7 +41,6 @@ import org.thingsboard.server.common.data.util.TbPair;
                 "that is stored as customer attributes or telemetry data and used for dynamic message filtering, transformation, " +
                 "or actions such as alarm creation if the threshold is exceeded.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeCustomerAttributesConfig")
 public class TbGetCustomerAttributeNode extends TbAbstractGetEntityDataNode<CustomerId> {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNode.java
index eb6eeb1e06..33cc5812e9 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNode.java
@@ -50,7 +50,6 @@ import java.util.NoSuchElementException;
         nodeDetails = "Useful in multi-customer solutions where we need dynamically use customer contact information " +
                 "such as email, phone, address, etc., for notifications via email, SMS, and other notification providers.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeEntityDetailsConfig")
 public class TbGetCustomerDetailsNode extends TbAbstractGetEntityDetailsNode<TbGetCustomerDetailsNodeConfiguration, CustomerId> {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNode.java
index 0e257ac3be..1dac58224c 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNode.java
@@ -42,7 +42,6 @@ import org.thingsboard.server.common.msg.TbMsg;
                 "Useful when you need to retrieve attributes and/or latest telemetry values from device that has a relation " +
                 "to the message originator and use them for further message processing.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeDeviceAttributesConfig")
 public class TbGetDeviceAttrNode extends TbAbstractGetAttributesNode<TbGetDeviceAttrNodeConfiguration, DeviceId> {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
index 391289cc5d..3807097349 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
@@ -43,7 +43,6 @@ import java.util.concurrent.ExecutionException;
         nodeDetails = "Fetches fields values specified in the mapping. If specified field is not part of originator fields it will be ignored. " +
                 "Useful when you need to retrieve originator fields and use them for further message processing.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeOriginatorFieldsConfig")
 public class TbGetOriginatorFieldsNode extends TbAbstractGetMappedDataNode<EntityId, TbGetOriginatorFieldsConfiguration> {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java
index d107de25c6..639f234f7e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java
@@ -42,7 +42,6 @@ import java.util.Arrays;
                 "If multiple related entities are found, only first entity is used for message enrichment, other entities are discarded. " +
                 "Useful when you need to retrieve data from an entity that has a relation to the message originator and use them for further message processing.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeRelatedAttributesConfig")
 public class TbGetRelatedAttributeNode extends TbAbstractGetEntityDataNode<EntityId> {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java
index 3a6f1dd9c4..b5d9361d50 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java
@@ -58,7 +58,6 @@ import java.util.stream.Collectors;
                 "instead of fetching just the latest telemetry or if you need to get the closest telemetry to the fetch interval start or end. " +
                 "Also, this node can be used for telemetry aggregation within configured fetch interval.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeGetTelemetryFromDatabase")
 public class TbGetTelemetryNode implements TbNode {
 
@@ -115,7 +114,9 @@ public class TbGetTelemetryNode implements TbNode {
         ListenableFuture<List<TsKvEntry>> list = ctx.getTimeseriesService().findAll(ctx.getTenantId(), msg.getOriginator(), buildQueries(interval, keys));
         DonAsynchron.withCallback(list, data -> {
             var metaData = updateMetadata(data, msg, keys);
-            ctx.tellSuccess(TbMsg.transformMsgMetadata(msg, metaData));
+            ctx.tellSuccess(msg.transform()
+                    .metaData(metaData)
+                    .build());
         }, error -> ctx.tellFailure(msg, error), ctx.getDbCallbackExecutor());
     }
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java
index c1f8e95896..5738eb801b 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java
@@ -39,7 +39,6 @@ import org.thingsboard.server.common.data.util.TbPair;
         nodeDetails = "Useful when you need to retrieve some common configuration or threshold set " +
                 "that is stored as tenant attributes or telemetry data and use it for further message processing.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeTenantAttributesConfig")
 public class TbGetTenantAttributeNode extends TbAbstractGetEntityDataNode<TenantId> {
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNode.java
index c18cb1f942..ef54aae34e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNode.java
@@ -39,7 +39,6 @@ import org.thingsboard.server.common.msg.TbMsg;
         nodeDetails = "Useful when we need to retrieve contact information from your tenant " +
                 "such as email, phone, address, etc., for notifications via email, SMS, and other notification providers.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeEntityDetailsConfig")
 public class TbGetTenantDetailsNode extends TbAbstractGetEntityDetailsNode<TbGetTenantDetailsNodeConfiguration, TenantId> {
 
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 912496f39e..9576384ab4 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
@@ -57,7 +57,6 @@ import java.util.concurrent.TimeoutException;
         clusteringMode = ComponentClusteringMode.USER_PREFERENCE,
         nodeDescription = "Publish messages to the MQTT broker",
         nodeDetails = "Will publish message payload to the MQTT broker with QoS <b>AT_LEAST_ONCE</b>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodeMqttConfig",
         icon = "call_split"
 )
@@ -103,7 +102,9 @@ public class TbMqttNode extends TbAbstractExternalNode {
     private TbMsg processException(TbMsg origMsg, Throwable e) {
         TbMsgMetaData metaData = origMsg.getMetaData().copy();
         metaData.putValue(ERROR, e.getClass() + ": " + e.getMessage());
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNode.java
index cbf431d63a..836fb215d9 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNode.java
@@ -41,7 +41,6 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
         clusteringMode = ComponentClusteringMode.SINGLETON,
         nodeDescription = "Publish messages to the Azure IoT Hub",
         nodeDetails = "Will publish message payload to the Azure IoT Hub with QoS <b>AT_LEAST_ONCE</b>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodeAzureIotHubConfig"
 )
 public class TbAzureIotHubNode extends TbMqttNode {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbNotificationNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbNotificationNode.java
index 34c5d6de28..4777a411dc 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbNotificationNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbNotificationNode.java
@@ -41,7 +41,6 @@ import java.util.concurrent.ExecutionException;
         configClazz = TbNotificationNodeConfiguration.class,
         nodeDescription = "Sends notification to targets using the template",
         nodeDetails = "Will send notification to the specified targets using the template",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodeNotificationConfig",
         icon = "notifications"
 )
@@ -82,7 +81,9 @@ public class TbNotificationNode extends TbAbstractExternalNode {
             public void onSuccess(NotificationRequestStats stats) {
                 TbMsgMetaData metaData = tbMsg.getMetaData().copy();
                 metaData.putValue("notificationRequestResult", JacksonUtil.toString(stats));
-                tellSuccess(ctx, TbMsg.transformMsgMetadata(tbMsg, metaData));
+                tellSuccess(ctx, tbMsg.transform()
+                        .metaData(metaData)
+                        .build());
             }
 
             @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbSlackNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbSlackNode.java
index 78e0b1e46c..a9c62c8d80 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbSlackNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbSlackNode.java
@@ -33,7 +33,6 @@ import java.util.concurrent.ExecutionException;
         configClazz = TbSlackNodeConfiguration.class,
         nodeDescription = "Send message via Slack",
         nodeDetails = "Sends message to a Slack channel or user",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodeSlackConfig",
         iconUrl = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZD0iTTYsMTVBMiwyIDAgMCwxIDQsMTdBMiwyIDAgMCwxIDIsMTVBMiwyIDAgMCwxIDQsMTNINlYxNU03LDE1QTIsMiAwIDAsMSA5LDEzQTIsMiAwIDAsMSAxMSwxNVYyMEEyLDIgMCAwLDEgOSwyMkEyLDIgMCAwLDEgNywyMFYxNU05LDdBMiwyIDAgMCwxIDcsNUEyLDIgMCAwLDEgOSwzQTIsMiAwIDAsMSAxMSw1VjdIOU05LDhBMiwyIDAgMCwxIDExLDEwQTIsMiAwIDAsMSA5LDEySDRBMiwyIDAgMCwxIDIsMTBBMiwyIDAgMCwxIDQsOEg5TTE3LDEwQTIsMiAwIDAsMSAxOSw4QTIsMiAwIDAsMSAyMSwxMEEyLDIgMCAwLDEgMTksMTJIMTdWMTBNMTYsMTBBMiwyIDAgMCwxIDE0LDEyQTIsMiAwIDAsMSAxMiwxMFY1QTIsMiAwIDAsMSAxNCwzQTIsMiAwIDAsMSAxNiw1VjEwTTE0LDE4QTIsMiAwIDAsMSAxNiwyMEEyLDIgMCAwLDEgMTQsMjJBMiwyIDAgMCwxIDEyLDIwVjE4SDE0TTE0LDE3QTIsMiAwIDAsMSAxMiwxNUEyLDIgMCAwLDEgMTQsMTNIMTlBMiwyIDAgMCwxIDIxLDE1QTIsMiAwIDAsMSAxOSwxN0gxNFoiIC8+PC9zdmc+"
 )
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNode.java
index c7b2d010a8..40fa08ae3c 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNode.java
@@ -29,6 +29,7 @@ import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 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.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.msg.TbMsgType;
@@ -58,8 +59,7 @@ import java.util.concurrent.TimeUnit;
         nodeDescription = "Process device messages based on device profile settings",
         nodeDetails = "Create and clear alarms based on alarm rules defined in device profile. The output relation type is either " +
                 "'Alarm Created', 'Alarm Updated', 'Alarm Severity Updated' and 'Alarm Cleared' or simply 'Success' if no alarms were affected.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
-        configDirective = "tbDeviceProfileConfig"
+        configDirective = "tbActionNodeDeviceProfileConfig"
 )
 public class TbDeviceProfileNode implements TbNode {
 
@@ -176,7 +176,14 @@ public class TbDeviceProfileNode implements TbNode {
     }
 
     protected void scheduleAlarmHarvesting(TbContext ctx, TbMsg msg) {
-        TbMsg periodicCheck = TbMsg.newMsg(TbMsgType.DEVICE_PROFILE_PERIODIC_SELF_MSG, ctx.getTenantId(), msg != null ? msg.getCustomerId() : null, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        CustomerId customerId = msg != null ? msg.getCustomerId() : null;
+        TbMsg periodicCheck = TbMsg.newMsg()
+                .type(TbMsgType.DEVICE_PROFILE_PERIODIC_SELF_MSG)
+                .originator(ctx.getTenantId())
+                .customerId(customerId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         ctx.tellSelf(periodicCheck, TimeUnit.MINUTES.toMillis(1));
     }
 
@@ -201,7 +208,12 @@ public class TbDeviceProfileNode implements TbNode {
     }
 
     protected void onProfileUpdate(DeviceProfile profile) {
-        ctx.tellSelf(TbMsg.newMsg(TbMsgType.DEVICE_PROFILE_UPDATE_SELF_MSG, ctx.getTenantId(), TbMsgMetaData.EMPTY, profile.getId().getId().toString()), 0L);
+        ctx.tellSelf(TbMsg.newMsg()
+                .type(TbMsgType.DEVICE_PROFILE_UPDATE_SELF_MSG)
+                .originator(ctx.getTenantId())
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(profile.getId().getId().toString())
+                .build(), 0L);
     }
 
     private void onDeviceUpdate(DeviceId deviceId, DeviceProfile deviceProfile) {
@@ -210,7 +222,12 @@ public class TbDeviceProfileNode implements TbNode {
         if (deviceProfile != null) {
             msgData.put("deviceProfileId", deviceProfile.getId().getId().toString());
         }
-        ctx.tellSelf(TbMsg.newMsg(TbMsgType.DEVICE_UPDATE_SELF_MSG, ctx.getTenantId(), TbMsgMetaData.EMPTY, JacksonUtil.toString(msgData)), 0L);
+        ctx.tellSelf(TbMsg.newMsg()
+                .type(TbMsgType.DEVICE_UPDATE_SELF_MSG)
+                .originator(ctx.getTenantId())
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.toString(msgData))
+                .build(), 0L);
     }
 
     protected void invalidateDeviceProfileCache(DeviceId deviceId, String deviceJson) {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNode.java
index b15e0e8e3d..ebd2a57e59 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNode.java
@@ -45,7 +45,6 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
         configClazz = TbRabbitMqNodeConfiguration.class,
         nodeDescription = "Publish messages to the RabbitMQ",
         nodeDetails = "Will publish message payload to RabbitMQ queue.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodeRabbitMqConfig",
         iconUrl = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbDpzcGFjZT0icHJlc2VydmUiIHZlcnNpb249IjEuMSIgeT0iMHB4IiB4PSIwcHgiIHZpZXdCb3g9IjAgMCAxMDAwIDEwMDAiPjxwYXRoIHN0cm9rZS13aWR0aD0iLjg0OTU2IiBkPSJtODYwLjQ3IDQxNi4zMmgtMjYyLjAxYy0xMi45MTMgMC0yMy42MTgtMTAuNzA0LTIzLjYxOC0yMy42MTh2LTI3Mi43MWMwLTIwLjMwNS0xNi4yMjctMzYuMjc2LTM2LjI3Ni0zNi4yNzZoLTkzLjc5MmMtMjAuMzA1IDAtMzYuMjc2IDE2LjIyNy0zNi4yNzYgMzYuMjc2djI3MC44NGMtMC4yNTQ4NyAxNC4xMDMtMTEuNDY5IDI1LjU3Mi0yNS43NDIgMjUuNTcybC04NS42MzYgMC42Nzk2NWMtMTQuMTAzIDAtMjUuNTcyLTExLjQ2OS0yNS41NzItMjUuNTcybDAuNjc5NjUtMjcxLjUyYzAtMjAuMzA1LTE2LjIyNy0zNi4yNzYtMzYuMjc2LTM2LjI3NmgtOTMuNTM3Yy0yMC4zMDUgMC0zNi4yNzYgMTYuMjI3LTM2LjI3NiAzNi4yNzZ2NzYzLjg0YzAgMTguMDk2IDE0Ljc4MiAzMi40NTMgMzIuNDUzIDMyLjQ1M2g3MjIuODFjMTguMDk2IDAgMzIuNDUzLTE0Ljc4MiAzMi40NTMtMzIuNDUzdi00MzUuMzFjLTEuMTg5NC0xOC4xODEtMTUuMjkyLTMyLjE5OC0zMy4zODgtMzIuMTk4em0tMTIyLjY4IDI4Ny4wN2MwIDIzLjYxOC0xOC44NiA0Mi40NzgtNDIuNDc4IDQyLjQ3OGgtNzMuOTk3Yy0yMy42MTggMC00Mi40NzgtMTguODYtNDIuNDc4LTQyLjQ3OHYtNzQuMjUyYzAtMjMuNjE4IDE4Ljg2LTQyLjQ3OCA0Mi40NzgtNDIuNDc4aDczLjk5N2MyMy42MTggMCA0Mi40NzggMTguODYgNDIuNDc4IDQyLjQ3OHoiLz48L3N2Zz4="
 )
@@ -127,7 +126,9 @@ public class TbRabbitMqNode extends TbAbstractExternalNode {
     private TbMsg processException(TbMsg origMsg, Throwable t) {
         TbMsgMetaData metaData = origMsg.getMetaData().copy();
         metaData.putValue(ERROR, t.getClass() + ": " + t.getMessage());
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeConfiguration.java
index 177a4f752b..6049ff919d 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeConfiguration.java
@@ -44,7 +44,6 @@ public class TbRabbitMqNodeConfiguration implements NodeConfiguration<TbRabbitMq
         configuration.setExchangeNamePattern("");
         configuration.setRoutingKeyPattern("");
         configuration.setMessageProperties(null);
-        configuration.setHost(ConnectionFactory.DEFAULT_HOST);
         configuration.setPort(ConnectionFactory.DEFAULT_AMQP_PORT);
         configuration.setVirtualHost(ConnectionFactory.DEFAULT_VHOST);
         configuration.setUsername(ConnectionFactory.DEFAULT_USER);
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 b4f5c7f096..4745147de8 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
@@ -323,7 +323,9 @@ public class TbHttpClient {
         metaData.putValue(STATUS_REASON, httpStatus.getReasonPhrase());
         metaData.putValue(ERROR_BODY, response.getBody());
         headersToMetaData(response.getHeaders(), metaData::putValue);
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
     private TbMsg processException(TbMsg origMsg, Throwable e) {
@@ -334,7 +336,9 @@ public class TbHttpClient {
             metaData.putValue(STATUS_CODE, restClientResponseException.getStatusCode().value() + "");
             metaData.putValue(ERROR_BODY, restClientResponseException.getResponseBodyAsString());
         }
-        return TbMsg.transformMsgMetadata(origMsg, metaData);
+        return origMsg.transform()
+                .metaData(metaData)
+                .build();
     }
 
     private void prepareHeaders(HttpHeaders headers, TbMsg msg) {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbRestApiCallNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbRestApiCallNode.java
index 0e65905dfe..d25e1d647c 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbRestApiCallNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbRestApiCallNode.java
@@ -45,7 +45,6 @@ import java.util.List;
                 "For example <b>statusCode</b> field can be accessed with <code>metadata.statusCode</code>." +
                 "<br/><b>Note-</b> if you use system proxy properties, the next system proxy properties should be added: \"http.proxyHost\" and \"http.proxyPort\" or  \"https.proxyHost\" and \"https.proxyPort\" or \"socksProxyHost\" and \"socksProxyPort\"," +
                 "and if your proxy with auth, the next ones  should be added: \"tb.proxy.user\" and \"tb.proxy.password\" to the thingsboard.conf file.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodeRestApiCallConfig",
         iconUrl = "data:image/svg+xml;base64,PHN2ZyBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA1MTIgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbDpzcGFjZT0icHJlc2VydmUiIHZpZXdCb3g9IjAgMCA1MTIgNTEyIiB2ZXJzaW9uPSIxLjEiIHk9IjBweCIgeD0iMHB4Ij48ZyB0cmFuc2Zvcm09Im1hdHJpeCguOTQ5NzUgMCAwIC45NDk3NSAxNy4xMiAyNi40OTIpIj48cGF0aCBkPSJtMTY5LjExIDEwOC41NGMtOS45MDY2IDAuMDczNC0xOS4wMTQgNi41NzI0LTIyLjAxNCAxNi40NjlsLTY5Ljk5MyAyMzEuMDhjLTMuNjkwNCAxMi4xODEgMy4yODkyIDI1LjIyIDE1LjQ2OSAyOC45MSAyLjIyNTkgMC42NzQ4MSA0LjQ5NjkgMSA2LjcyODUgMSA5Ljk3MjEgMCAxOS4xNjUtNi41MTUzIDIyLjE4Mi0xNi40NjdhNi41MjI0IDYuNTIyNCAwIDAgMCAwLjAwMiAtMC4wMDJsNjkuOTktMjMxLjA3YTYuNTIyNCA2LjUyMjQgMCAwIDAgMCAtMC4wMDJjMy42ODU1LTEyLjE4MS0zLjI4Ny0yNS4yMjUtMTUuNDcxLTI4LjkxMi0yLjI4MjUtMC42OTE0NS00LjYxMTYtMS4wMTY5LTYuODk4NC0xem04NC45ODggMGMtOS45MDQ4IDAuMDczNC0xOS4wMTggNi41Njc1LTIyLjAxOCAxNi40NjlsLTY5Ljk4NiAyMzEuMDhjLTMuNjg5OCAxMi4xNzkgMy4yODUzIDI1LjIxNyAxNS40NjUgMjguOTA4IDIuMjI5NyAwLjY3NjQ3IDQuNTAwOCAxLjAwMiA2LjczMjQgMS4wMDIgOS45NzIxIDAgMTkuMTY1LTYuNTE1MyAyMi4xODItMTYuNDY3YTYuNTIyNCA2LjUyMjQgMCAwIDAgMC4wMDIgLTAuMDAybDY5Ljk4OC0yMzEuMDdjMy42OTA4LTEyLjE4MS0zLjI4NTItMjUuMjIzLTE1LjQ2Ny0yOC45MTItMi4yODE0LTAuNjkyMzEtNC42MTA4LTEuMDE4OS02Ljg5ODQtMS4wMDJ6bS0yMTcuMjkgNDIuMjNjLTEyLjcyOS0wLjAwMDg3LTIzLjE4OCAxMC40NTYtMjMuMTg4IDIzLjE4NiAwLjAwMSAxMi43MjggMTAuNDU5IDIzLjE4NiAyMy4xODggMjMuMTg2IDEyLjcyNy0wLjAwMSAyMy4xODMtMTAuNDU5IDIzLjE4NC0yMy4xODYgMC4wMDA4NzYtMTIuNzI4LTEwLjQ1Ni0yMy4xODUtMjMuMTg0LTIzLjE4NnptMCAxNDYuNjRjLTEyLjcyNy0wLjAwMDg3LTIzLjE4NiAxMC40NTUtMjMuMTg4IDIzLjE4NC0wLjAwMDg3MyAxMi43MjkgMTAuNDU4IDIzLjE4OCAyMy4xODggMjMuMTg4IDEyLjcyOC0wLjAwMSAyMy4xODQtMTAuNDYgMjMuMTg0LTIzLjE4OC0wLjAwMS0xMi43MjYtMTAuNDU3LTIzLjE4My0yMy4xODQtMjMuMTg0em0yNzAuNzkgNDIuMjExYy0xMi43MjcgMC0yMy4xODQgMTAuNDU3LTIzLjE4NCAyMy4xODRzMTAuNDU1IDIzLjE4OCAyMy4xODQgMjMuMTg4aDE1NC45OGMxMi43MjkgMCAyMy4xODYtMTAuNDYgMjMuMTg2LTIzLjE4OCAwLjAwMS0xMi43MjgtMTAuNDU4LTIzLjE4NC0yMy4xODYtMjMuMTg0eiIgdHJhbnNmb3JtPSJtYXRyaXgoMS4wMzc2IDAgMCAxLjAzNzYgLTcuNTY3NiAtMTQuOTI1KSIgc3Ryb2tlLXdpZHRoPSIxLjI2OTMiLz48L2c+PC9zdmc+"
 )
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNode.java
index 84441fb213..0c6e449576 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNode.java
@@ -35,7 +35,6 @@ import java.util.UUID;
         configClazz = TbSendRestApiCallReplyNodeConfiguration.class,
         nodeDescription = "Sends reply to REST API call to rule engine",
         nodeDetails = "Expects messages with any message type. Forwards incoming message as a reply to REST API call sent to rule engine.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeSendRestApiCallReplyConfig",
         icon = "call_merge"
 )
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 c343b242bf..1f071b590e 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
@@ -48,7 +48,6 @@ import java.util.UUID;
         configClazz = TbSendRpcReplyNodeConfiguration.class,
         nodeDescription = "Sends reply to RPC call from device",
         nodeDetails = "Expects messages with any message type. Will forward message body to the device.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeRpcReplyConfig",
         icon = "call_merge"
 )
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java
index 81863f9410..76d6649734 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java
@@ -49,7 +49,6 @@ import java.util.concurrent.TimeUnit;
         nodeDescription = "Sends RPC call to device",
         nodeDetails = "Expects messages with \"method\" and \"params\". Will forward response from device to next nodes." +
                 "If the RPC call request is originated by REST API call from user, will forward the response to user immediately.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeRpcRequestConfig",
         icon = "call_made"
 )
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/sms/TbSendSmsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/sms/TbSendSmsNode.java
index 0024936b89..3fbd074a14 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/sms/TbSendSmsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/sms/TbSendSmsNode.java
@@ -35,7 +35,6 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
         configClazz = TbSendSmsNodeConfiguration.class,
         nodeDescription = "Sends SMS message via SMS provider.",
         nodeDetails = "Will send SMS message by populating target phone numbers and sms message fields using values derived from message metadata.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbExternalNodeSendSmsConfig",
         icon = "sms"
 )
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 40b82ba150..c57c62e2ae 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
@@ -17,11 +17,13 @@ package org.thingsboard.rule.engine.telemetry;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.gson.JsonParser;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.common.util.DonAsynchron;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNode;
@@ -56,11 +58,10 @@ import static org.thingsboard.server.common.data.msg.TbMsgType.POST_ATTRIBUTES_R
         version = 2,
         nodeDescription = "Saves attributes data",
         nodeDetails = "Saves entity attributes based on configurable scope parameter. Expects messages with 'POST_ATTRIBUTES_REQUEST' message type. " +
-                      "If upsert(update/insert) operation is completed successfully rule node will send the incoming message via <b>Success</b> chain, otherwise, <b>Failure</b> chain is used. " +
-                      "Additionally if checkbox <b>Send attributes updated notification</b> is set to true, rule node will put the \"Attributes Updated\" " +
-                      "event for <b>SHARED_SCOPE</b> and <b>SERVER_SCOPE</b> attributes updates to the corresponding rule engine queue." +
-                      "Performance checkbox 'Save attributes only if the value changes' will skip attributes overwrites for values with no changes (avoid concurrent writes because this check is not transactional; will not update 'Last updated time' for skipped attributes).",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
+                "If upsert(update/insert) operation is completed successfully rule node will send the incoming message via <b>Success</b> chain, otherwise, <b>Failure</b> chain is used. " +
+                "Additionally if checkbox <b>Send attributes updated notification</b> is set to true, rule node will put the \"Attributes Updated\" " +
+                "event for <b>SHARED_SCOPE</b> and <b>SERVER_SCOPE</b> attributes updates to the corresponding rule engine queue." +
+                "Performance checkbox 'Save attributes only if the value changes' will skip attributes overwrites for values with no changes (avoid concurrent writes because this check is not transactional; will not update 'Last updated time' for skipped attributes).",
         configDirective = "tbActionNodeAttributesConfig",
         icon = "file_upload"
 )
@@ -114,16 +115,17 @@ public class TbMsgAttributesNode implements TbNode {
             ctx.tellSuccess(msg);
             return;
         }
-        ctx.getTelemetryService().saveAndNotify(
-                ctx.getTenantId(),
-                msg.getOriginator(),
-                scope,
-                attributes,
-                config.isNotifyDevice() || checkNotifyDeviceMdValue(msg.getMetaData().getValue(NOTIFY_DEVICE_METADATA_KEY)),
-                sendAttributesUpdateNotification ?
-                        new AttributesUpdateNodeCallback(ctx, msg, scope.name(), attributes) :
-                        new TelemetryNodeCallback(ctx, msg)
-        );
+        FutureCallback<Void> callback = sendAttributesUpdateNotification ?
+                new AttributesUpdateNodeCallback(ctx, msg, scope.name(), attributes) :
+                new TelemetryNodeCallback(ctx, msg);
+        ctx.getTelemetryService().saveAttributes(AttributesSaveRequest.builder()
+                .tenantId(ctx.getTenantId())
+                .entityId(msg.getOriginator())
+                .scope(scope)
+                .entries(attributes)
+                .notifyDevice(config.isNotifyDevice() || checkNotifyDeviceMdValue(msg.getMetaData().getValue(NOTIFY_DEVICE_METADATA_KEY)))
+                .callback(callback)
+                .build());
     }
 
     List<AttributeKvEntry> filterChangedAttr(List<AttributeKvEntry> currentAttributes, List<AttributeKvEntry> newAttributes) {
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 66faa80f9f..a89a4f37d8 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
@@ -16,6 +16,7 @@
 package org.thingsboard.rule.engine.telemetry;
 
 import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNode;
@@ -44,7 +45,6 @@ import static org.thingsboard.server.common.data.DataConstants.SCOPE;
                 " a key selected in the configuration, it will be ignored. If delete operation is completed successfully, " +
                 " rule node will send the \"Attributes Deleted\" event to the root chain of the message originator and " +
                 " send the incoming message via <b>Success</b> chain, otherwise, <b>Failure</b> chain is used.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbActionNodeDeleteAttributesConfig",
         icon = "remove_circle"
 )
@@ -70,16 +70,16 @@ public class TbMsgDeleteAttributesNode implements TbNode {
             ctx.tellSuccess(msg);
         } else {
             AttributeScope scope = getScope(msg.getMetaData().getValue(SCOPE));
-            ctx.getTelemetryService().deleteAndNotify(
-                    ctx.getTenantId(),
-                    msg.getOriginator(),
-                    scope,
-                    keysToDelete,
-                    checkNotifyDevice(msg.getMetaData().getValue(NOTIFY_DEVICE_METADATA_KEY), scope),
-                    config.isSendAttributesDeletedNotification() ?
+            ctx.getTelemetryService().deleteAttributes(AttributesDeleteRequest.builder()
+                    .tenantId(ctx.getTenantId())
+                    .entityId(msg.getOriginator())
+                    .scope(scope)
+                    .keys(keysToDelete)
+                    .notifyDevice(checkNotifyDevice(msg.getMetaData().getValue(NOTIFY_DEVICE_METADATA_KEY), scope))
+                    .callback(config.isSendAttributesDeletedNotification() ?
                             new AttributesDeleteNodeCallback(ctx, msg, scope.name(), keysToDelete) :
-                            new TelemetryNodeCallback(ctx, msg)
-            );
+                            new TelemetryNodeCallback(ctx, msg))
+                    .build());
         }
     }
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNode.java
index c90e8e2375..1b3acb6dae 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNode.java
@@ -15,14 +15,19 @@
  */
 package org.thingsboard.rule.engine.telemetry;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.gson.JsonParser;
 import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleNode;
 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.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
+import org.thingsboard.rule.engine.telemetry.strategy.ProcessingStrategy;
 import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.TenantProfile;
@@ -31,13 +36,20 @@ import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.common.msg.TbMsg;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import static org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNodeConfiguration.ProcessingSettings;
+import static org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNodeConfiguration.ProcessingSettings.Advanced;
+import static org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNodeConfiguration.ProcessingSettings.Deduplicate;
+import static org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNodeConfiguration.ProcessingSettings.OnEveryMessage;
+import static org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNodeConfiguration.ProcessingSettings.WebSocketsOnly;
 import static org.thingsboard.server.common.data.msg.TbMsgType.POST_TELEMETRY_REQUEST;
 
 @Slf4j
@@ -45,21 +57,52 @@ import static org.thingsboard.server.common.data.msg.TbMsgType.POST_TELEMETRY_RE
         type = ComponentType.ACTION,
         name = "save time series",
         configClazz = TbMsgTimeseriesNodeConfiguration.class,
-        nodeDescription = "Saves time series data",
-        nodeDetails = "Saves time series telemetry data based on configurable TTL parameter. Expects messages with 'POST_TELEMETRY_REQUEST' message type. " +
-                "Timestamp in milliseconds will be taken from metadata.ts, otherwise 'now' message timestamp will be applied. " +
-                "Allows stopping updating values for incoming keys in the latest ts_kv table if 'skipLatestPersistence' is set to true.\n " +
-                "<br/>" +
-                "Enable 'useServerTs' param 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).\n" +
-                "<br/>" +
-                "In the case of sequential processing, the platform guarantees that the messages are processed in the order of their submission to the queue. " +
-                "However, the timestamp of the messages originated by multiple devices/servers may be unsynchronized long before they are pushed to the queue. " +
-                "The DB layer has certain optimizations to ignore the updates of the \"attributes\" and \"latest values\" tables if the new record has a timestamp that is older than the previous record. " +
-                "So, to make sure that all the messages will be processed correctly, one should enable this parameter for sequential message processing scenarios.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
+        nodeDescription = """
+                Saves time series data with a configurable TTL and according to configured processing strategies.
+                """,
+        nodeDetails = """
+                Node performs three <strong>actions:</strong>
+                <ul>
+                  <li><strong>Time series:</strong> save time series data to a <code>ts_kv</code> table in a DB.</li>
+                  <li><strong>Latest values:</strong> save time series data to a <code>ts_kv_latest</code> table in a DB.</li>
+                  <li><strong>WebSockets:</strong> notify WebSockets subscriptions about time series data updates.</li>
+                </ul>
+                
+                For each <em>action</em>, three <strong>processing strategies</strong> are available:
+                <ul>
+                  <li><strong>On every message:</strong> perform the action for every message.</li>
+                  <li><strong>Deduplicate:</strong> perform the action only for the first message from a particular originator within a configurable interval.</li>
+                  <li><strong>Skip:</strong> never perform the action.</li>
+                </ul>
+                
+                <strong>Processing strategies</strong> are configured using <em>processing settings</em>, which support two modes:
+                <ul>
+                  <li><strong>Basic</strong>
+                    <ul>
+                      <li><strong>On every message:</strong> applies the "On every message" strategy to all actions.</li>
+                      <li><strong>Deduplicate:</strong> applies the "Deduplicate" strategy (with a specified interval) to all actions.</li>
+                      <li><strong>WebSockets only:</strong> applies the "Skip" strategy to Time series and Latest values, and the "On every message" strategy to WebSockets.</li>
+                    </ul>
+                  </li>
+                  <li><strong>Advanced:</strong> configure each action’s strategy independently.</li>
+                </ul>
+                
+                By default, the timestamp is taken from <code>metadata.ts</code>. You can enable
+                <em>Use server timestamp</em> to always use the current server time instead. This is particularly
+                useful in sequential processing scenarios where messages may arrive with out-of-order timestamps from
+                multiple sources. Note that the DB layer may ignore older records for attributes and latest values,
+                so enabling <em>Use server timestamp</em> can ensure correct ordering.
+                <br><br>
+                The TTL is taken first from <code>metadata.TTL</code>. If absent, the node configuration’s default
+                TTL is used. If neither is set, the tenant profile default applies.
+                <br><br>
+                This node expects messages of type <code>POST_TELEMETRY_REQUEST</code>.
+                <br><br>
+                Output connections: <code>Success</code>, <code>Failure</code>.
+                """,
         configDirective = "tbActionNodeTimeseriesConfig",
-        icon = "file_upload"
+        icon = "file_upload",
+        version = 1
 )
 public class TbMsgTimeseriesNode implements TbNode {
 
@@ -67,15 +110,18 @@ public class TbMsgTimeseriesNode implements TbNode {
     private TbContext ctx;
     private long tenantProfileDefaultStorageTtl;
 
+    private ProcessingSettings processingSettings;
+
     @Override
     public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
         this.config = TbNodeUtils.convert(configuration, TbMsgTimeseriesNodeConfiguration.class);
         this.ctx = ctx;
         ctx.addTenantProfileListener(this::onTenantProfileUpdate);
         onTenantProfileUpdate(ctx.getTenantProfile());
+        processingSettings = config.getProcessingSettings();
     }
 
-    void onTenantProfileUpdate(TenantProfile tenantProfile) {
+    private void onTenantProfileUpdate(TenantProfile tenantProfile) {
         DefaultTenantProfileConfiguration configuration = (DefaultTenantProfileConfiguration) tenantProfile.getProfileData().getConfiguration();
         tenantProfileDefaultStorageTtl = TimeUnit.DAYS.toSeconds(configuration.getDefaultStorageTtlDays());
     }
@@ -87,6 +133,15 @@ public class TbMsgTimeseriesNode implements TbNode {
             return;
         }
         long ts = computeTs(msg, config.isUseServerTs());
+
+        TimeseriesSaveRequest.Strategy strategy = determineSaveStrategy(ts, msg.getOriginator().getId());
+
+        // short-circuit
+        if (!strategy.saveTimeseries() && !strategy.saveLatest() && !strategy.sendWsUpdate()) {
+            ctx.tellSuccess(msg);
+            return;
+        }
+
         String src = msg.getData();
         Map<Long, List<KvEntry>> tsKvMap = JsonConverter.convertToTelemetry(JsonParser.parseString(src), ts);
         if (tsKvMap.isEmpty()) {
@@ -104,20 +159,71 @@ public class TbMsgTimeseriesNode implements TbNode {
         if (ttl == 0L) {
             ttl = tenantProfileDefaultStorageTtl;
         }
-        if (config.isSkipLatestPersistence()) {
-            ctx.getTelemetryService().saveWithoutLatestAndNotify(ctx.getTenantId(), msg.getCustomerId(), msg.getOriginator(), tsKvEntryList, ttl, new TelemetryNodeCallback(ctx, msg));
-        } else {
-            ctx.getTelemetryService().saveAndNotify(ctx.getTenantId(), msg.getCustomerId(), msg.getOriginator(), tsKvEntryList, ttl, new TelemetryNodeCallback(ctx, msg));
-        }
+        ctx.getTelemetryService().saveTimeseries(TimeseriesSaveRequest.builder()
+                .tenantId(ctx.getTenantId())
+                .customerId(msg.getCustomerId())
+                .entityId(msg.getOriginator())
+                .entries(tsKvEntryList)
+                .ttl(ttl)
+                .strategy(strategy)
+                .callback(new TelemetryNodeCallback(ctx, msg))
+                .build());
     }
 
     public static long computeTs(TbMsg msg, boolean ignoreMetadataTs) {
         return ignoreMetadataTs ? System.currentTimeMillis() : msg.getMetaDataTs();
     }
 
+    private TimeseriesSaveRequest.Strategy determineSaveStrategy(long ts, UUID originatorUuid) {
+        if (processingSettings instanceof OnEveryMessage) {
+            return TimeseriesSaveRequest.Strategy.SAVE_ALL;
+        }
+        if (processingSettings instanceof WebSocketsOnly) {
+            return TimeseriesSaveRequest.Strategy.WS_ONLY;
+        }
+        if (processingSettings instanceof Deduplicate deduplicate) {
+            boolean isFirstMsgInInterval = deduplicate.getProcessingStrategy().shouldProcess(ts, originatorUuid);
+            return isFirstMsgInInterval ? TimeseriesSaveRequest.Strategy.SAVE_ALL : TimeseriesSaveRequest.Strategy.SKIP_ALL;
+        }
+        if (processingSettings instanceof Advanced advanced) {
+            return new TimeseriesSaveRequest.Strategy(
+                    advanced.timeseries().shouldProcess(ts, originatorUuid),
+                    advanced.latest().shouldProcess(ts, originatorUuid),
+                    advanced.webSockets().shouldProcess(ts, originatorUuid)
+            );
+        }
+        // should not happen
+        throw new IllegalArgumentException("Unknown processing settings type: " + processingSettings.getClass().getSimpleName());
+    }
+
     @Override
     public void destroy() {
         ctx.removeListeners();
     }
 
+    @Override
+    public TbPair<Boolean, JsonNode> upgrade(int fromVersion, JsonNode oldConfiguration) throws TbNodeException {
+        boolean hasChanges = false;
+        switch (fromVersion) {
+            case 0:
+                hasChanges = true;
+                JsonNode skipLatestPersistence = oldConfiguration.get("skipLatestPersistence");
+                if (skipLatestPersistence != null && "true".equals(skipLatestPersistence.asText())) {
+                    var skipLatestProcessingSettings = new Advanced(
+                            ProcessingStrategy.onEveryMessage(),
+                            ProcessingStrategy.skip(),
+                            ProcessingStrategy.onEveryMessage()
+                    );
+                    ((ObjectNode) oldConfiguration).set("processingSettings", JacksonUtil.valueToTree(skipLatestProcessingSettings));
+                } else {
+                    ((ObjectNode) oldConfiguration).set("processingSettings", JacksonUtil.valueToTree(new OnEveryMessage()));
+                }
+                ((ObjectNode) oldConfiguration).remove("skipLatestPersistence");
+                break;
+            default:
+                break;
+        }
+        return new TbPair<>(hasChanges, oldConfiguration);
+    }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeConfiguration.java
index 1c33778a6b..88524e3751 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeConfiguration.java
@@ -15,22 +15,84 @@
  */
 package org.thingsboard.rule.engine.telemetry;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import lombok.Getter;
 import org.thingsboard.rule.engine.api.NodeConfiguration;
+import org.thingsboard.rule.engine.telemetry.strategy.ProcessingStrategy;
+
+import java.util.Objects;
+
+import static org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNodeConfiguration.ProcessingSettings.Advanced;
+import static org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNodeConfiguration.ProcessingSettings.Deduplicate;
+import static org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNodeConfiguration.ProcessingSettings.OnEveryMessage;
+import static org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNodeConfiguration.ProcessingSettings.WebSocketsOnly;
 
 @Data
 public class TbMsgTimeseriesNodeConfiguration implements NodeConfiguration<TbMsgTimeseriesNodeConfiguration> {
 
     private long defaultTTL;
-    private boolean skipLatestPersistence;
     private boolean useServerTs;
+    @NotNull
+    private TbMsgTimeseriesNodeConfiguration.ProcessingSettings processingSettings;
 
     @Override
     public TbMsgTimeseriesNodeConfiguration defaultConfiguration() {
         TbMsgTimeseriesNodeConfiguration configuration = new TbMsgTimeseriesNodeConfiguration();
         configuration.setDefaultTTL(0L);
-        configuration.setSkipLatestPersistence(false);
         configuration.setUseServerTs(false);
+        configuration.setProcessingSettings(new OnEveryMessage());
         return configuration;
     }
+
+    @JsonTypeInfo(
+            use = JsonTypeInfo.Id.NAME,
+            include = JsonTypeInfo.As.PROPERTY,
+            property = "type"
+    )
+    @JsonSubTypes({
+            @JsonSubTypes.Type(value = OnEveryMessage.class, name = "ON_EVERY_MESSAGE"),
+            @JsonSubTypes.Type(value = WebSocketsOnly.class, name = "WEBSOCKETS_ONLY"),
+            @JsonSubTypes.Type(value = Deduplicate.class, name = "DEDUPLICATE"),
+            @JsonSubTypes.Type(value = Advanced.class, name = "ADVANCED")
+    })
+    sealed interface ProcessingSettings permits OnEveryMessage, Deduplicate, WebSocketsOnly, Advanced {
+
+        record OnEveryMessage() implements ProcessingSettings {}
+
+        record WebSocketsOnly() implements ProcessingSettings {}
+
+        @Getter
+        final class Deduplicate implements ProcessingSettings {
+
+            private final int deduplicationIntervalSecs;
+
+            @JsonIgnore
+            private final ProcessingStrategy processingStrategy;
+
+            @JsonCreator
+            Deduplicate(@JsonProperty("deduplicationIntervalSecs") int deduplicationIntervalSecs) {
+                this.deduplicationIntervalSecs = deduplicationIntervalSecs;
+                processingStrategy = ProcessingStrategy.deduplicate(deduplicationIntervalSecs);
+            }
+
+        }
+
+        record Advanced(ProcessingStrategy timeseries, ProcessingStrategy latest, ProcessingStrategy webSockets) implements ProcessingSettings {
+
+            public Advanced {
+                Objects.requireNonNull(timeseries);
+                Objects.requireNonNull(latest);
+                Objects.requireNonNull(webSockets);
+            }
+
+        }
+
+    }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/strategy/DeduplicateProcessingStrategy.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/strategy/DeduplicateProcessingStrategy.java
new file mode 100644
index 0000000000..a9c6fc38fd
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/strategy/DeduplicateProcessingStrategy.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.rule.engine.telemetry.strategy;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.google.common.collect.Sets;
+import com.google.common.primitives.Longs;
+
+import java.time.Duration;
+import java.util.Set;
+import java.util.UUID;
+
+final class DeduplicateProcessingStrategy implements ProcessingStrategy {
+
+    private static final int MIN_DEDUPLICATION_INTERVAL_SECS = 1;
+    private static final int MAX_DEDUPLICATION_INTERVAL_SECS = (int) Duration.ofDays(1L).toSeconds();
+
+    private static final long MIN_INTERVAL_EXPIRY_MILLIS = Duration.ofMinutes(10L).toMillis();
+    private static final int INTERVAL_EXPIRY_FACTOR = 10;
+    private static final long MAX_INTERVAL_EXPIRY_MILLIS = Duration.ofDays(2L).toMillis();
+
+    private static final int MAX_TOTAL_INTERVALS_DURATION_SECS = (int) Duration.ofDays(2L).toSeconds();
+    private static final int MAX_NUMBER_OF_INTERVALS = 100;
+
+    private final long deduplicationIntervalMillis;
+    private final LoadingCache<Long, Set<UUID>> deduplicationCache;
+
+    @JsonCreator
+    public DeduplicateProcessingStrategy(@JsonProperty("deduplicationIntervalSecs") int deduplicationIntervalSecs) {
+        if (deduplicationIntervalSecs < MIN_DEDUPLICATION_INTERVAL_SECS || deduplicationIntervalSecs > MAX_DEDUPLICATION_INTERVAL_SECS) {
+            throw new IllegalArgumentException("Deduplication interval must be at least " + MIN_DEDUPLICATION_INTERVAL_SECS + " second(s) " +
+                    "and at most " + MAX_DEDUPLICATION_INTERVAL_SECS + " second(s), was " + deduplicationIntervalSecs + " second(s)");
+        }
+        deduplicationIntervalMillis = Duration.ofSeconds(deduplicationIntervalSecs).toMillis();
+        deduplicationCache = Caffeine.newBuilder()
+                .softValues()
+                .expireAfterAccess(calculateExpireAfterAccess(deduplicationIntervalSecs))
+                .maximumSize(calculateMaxNumberOfDeduplicationIntervals(deduplicationIntervalSecs))
+                .build(__ -> Sets.newConcurrentHashSet());
+    }
+
+    /**
+     * Calculates the expire-after-access duration. By default, we keep each deduplication interval
+     * alive for 10 “iterations” (interval duration × 10). However, we never let this drop below
+     * 10 minutes to ensure adequate retention for small intervals, nor exceed 48 hours to prevent
+     * storing stale data in memory.
+     */
+    private static Duration calculateExpireAfterAccess(int deduplicationIntervalSecs) {
+        long desiredExpiryMillis = Duration.ofSeconds(deduplicationIntervalSecs).toMillis() * INTERVAL_EXPIRY_FACTOR;
+        return Duration.ofMillis(Longs.constrainToRange(desiredExpiryMillis, MIN_INTERVAL_EXPIRY_MILLIS, MAX_INTERVAL_EXPIRY_MILLIS));
+    }
+
+    /**
+     * Calculates the maximum number of deduplication intervals we will store in the cache.
+     * We limit retention to two days to avoid stale data and cap it at 100 intervals to manage memory usage.
+     */
+    private static long calculateMaxNumberOfDeduplicationIntervals(int deduplicationIntervalSecs) {
+        int numberOfDeduplicationIntervals = MAX_TOTAL_INTERVALS_DURATION_SECS / deduplicationIntervalSecs;
+        return Math.min(numberOfDeduplicationIntervals, MAX_NUMBER_OF_INTERVALS);
+    }
+
+    @JsonProperty("deduplicationIntervalSecs")
+    public long getDeduplicationIntervalSecs() {
+        return Duration.ofMillis(deduplicationIntervalMillis).toSeconds();
+    }
+
+    @Override
+    public boolean shouldProcess(long ts, UUID originatorUuid) {
+        long intervalNumber = ts / deduplicationIntervalMillis;
+        return deduplicationCache.get(intervalNumber).add(originatorUuid);
+    }
+
+}
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/strategy/OnEveryMessageProcessingStrategy.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/strategy/OnEveryMessageProcessingStrategy.java
new file mode 100644
index 0000000000..9e8a87364a
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/strategy/OnEveryMessageProcessingStrategy.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.rule.engine.telemetry.strategy;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+import java.util.UUID;
+
+final class OnEveryMessageProcessingStrategy implements ProcessingStrategy {
+
+    private static final OnEveryMessageProcessingStrategy INSTANCE = new OnEveryMessageProcessingStrategy();
+
+    private OnEveryMessageProcessingStrategy() {}
+
+    @JsonCreator
+    public static OnEveryMessageProcessingStrategy getInstance() {
+        return INSTANCE;
+    }
+
+    @Override
+    public boolean shouldProcess(long ts, UUID originatorUuid) {
+        return true;
+    }
+
+}
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/strategy/ProcessingStrategy.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/strategy/ProcessingStrategy.java
new file mode 100644
index 0000000000..724727dc22
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/strategy/ProcessingStrategy.java
@@ -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.
+ */
+package org.thingsboard.rule.engine.telemetry.strategy;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+import java.util.UUID;
+
+@JsonTypeInfo(
+        use = JsonTypeInfo.Id.NAME,
+        include = JsonTypeInfo.As.PROPERTY,
+        property = "type"
+)
+@JsonSubTypes({
+        @JsonSubTypes.Type(value = OnEveryMessageProcessingStrategy.class, name = "ON_EVERY_MESSAGE"),
+        @JsonSubTypes.Type(value = DeduplicateProcessingStrategy.class, name = "DEDUPLICATE"),
+        @JsonSubTypes.Type(value = SkipProcessingStrategy.class, name = "SKIP")
+})
+public sealed interface ProcessingStrategy permits OnEveryMessageProcessingStrategy, DeduplicateProcessingStrategy, SkipProcessingStrategy {
+
+    static ProcessingStrategy onEveryMessage() {
+        return OnEveryMessageProcessingStrategy.getInstance();
+    }
+
+    static ProcessingStrategy deduplicate(int deduplicationIntervalSecs) {
+        return new DeduplicateProcessingStrategy(deduplicationIntervalSecs);
+    }
+
+    static ProcessingStrategy skip() {
+        return SkipProcessingStrategy.getInstance();
+    }
+
+    boolean shouldProcess(long ts, UUID originatorUuid);
+
+}
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/strategy/SkipProcessingStrategy.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/strategy/SkipProcessingStrategy.java
new file mode 100644
index 0000000000..66b966653d
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/strategy/SkipProcessingStrategy.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.rule.engine.telemetry.strategy;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+import java.util.UUID;
+
+final class SkipProcessingStrategy implements ProcessingStrategy {
+
+    private static final SkipProcessingStrategy INSTANCE = new SkipProcessingStrategy();
+
+    private SkipProcessingStrategy() {}
+
+    @JsonCreator
+    public static SkipProcessingStrategy getInstance() {
+        return INSTANCE;
+    }
+
+    @Override
+    public boolean shouldProcess(long ts, UUID originatorUuid) {
+        return false;
+    }
+
+}
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationBeginNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationBeginNode.java
index 543767cfeb..50d668b1d4 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationBeginNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationBeginNode.java
@@ -34,7 +34,6 @@ import org.thingsboard.server.common.msg.TbMsg;
         nodeDetails = "This node should be used together with \"synchronization end\" node. \n This node will put messages into queue based on message originator id. \n" +
                 "Subsequent messages will not be processed until the previous message processing is completed or timeout event occurs.\n" +
                 "Size of the queue per originator and timeout values are configurable on a system level",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbNodeEmptyConfig")
 @Deprecated
 public class TbSynchronizationBeginNode implements TbNode {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationEndNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationEndNode.java
index 6f1344acf3..9407414dcb 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationEndNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationEndNode.java
@@ -32,7 +32,6 @@ import org.thingsboard.server.common.msg.TbMsg;
         configClazz = EmptyNodeConfiguration.class,
         nodeDescription = "This Node is now deprecated. Use \"Checkpoint\" instead.",
         nodeDetails = "",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = ("tbNodeEmptyConfig")
 )
 @Deprecated
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java
index d590bbbb75..e45f1dd8b2 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java
@@ -54,7 +54,6 @@ import static org.thingsboard.rule.engine.transform.OriginatorSource.RELATED;
                 "<li><strong>Entity by name pattern</strong> - specify entity type and name pattern of new originator. Following entity types are supported: " +
                 "'Device', 'Asset', 'Entity View', 'Edge' or 'User'.</li></ul>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbTransformationNodeChangeOriginatorConfig",
         icon = "find_replace"
 )
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyKeysNode.java
index aedf8eac1e..aadc3a3851 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyKeysNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyKeysNode.java
@@ -46,7 +46,6 @@ import java.util.stream.Collectors;
         nodeDetails = "Copies key-value pairs from the message to message metadata, or vice-versa, according to the configured direction and keys. " +
                 "Regular expressions can be used to define which keys-value pairs to copy. Any configured key not found in the source will be ignored.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbTransformationNodeCopyKeysConfig",
         icon = "content_copy"
 )
@@ -105,7 +104,10 @@ public class TbCopyKeysNode extends TbAbstractTransformNodeWithTbMsgSource {
                     log.debug("Unexpected CopyFrom value: {}. Allowed values: {}", copyFrom, TbMsgSource.values());
             }
         }
-        ctx.tellSuccess(msgChanged ? TbMsg.transformMsg(msg, metaDataCopy, msgData) : msg);
+        ctx.tellSuccess(msgChanged ? msg.transform()
+                .metaData(metaDataCopy)
+                .data(msgData)
+                .build() : msg);
     }
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNode.java
index 3d4c9b9684..412b523786 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNode.java
@@ -46,7 +46,6 @@ import java.util.stream.Collectors;
         nodeDetails = "Deletes key-value pairs from the message or message metadata according to the configured " +
                 "keys and/or regular expressions.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbTransformationNodeDeleteKeysConfig",
         icon = "remove_circle"
 )
@@ -100,7 +99,10 @@ public class TbDeleteKeysNode extends TbAbstractTransformNodeWithTbMsgSource {
             default:
                 log.debug("Unexpected DeleteFrom value: {}. Allowed values: {}", deleteFrom, TbMsgSource.values());
         }
-        ctx.tellSuccess(hasNoChanges ? msg : TbMsg.transformMsg(msg, metaDataCopy, msgDataStr));
+        ctx.tellSuccess(hasNoChanges ? msg : msg.transform()
+                .metaData(metaDataCopy)
+                .data(msgDataStr)
+                .build());
     }
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbJsonPathNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbJsonPathNode.java
index b0a7bc059f..af9121e8a1 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbJsonPathNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbJsonPathNode.java
@@ -40,7 +40,6 @@ import java.util.concurrent.ExecutionException;
         nodeDescription = "Transforms incoming message body using JSONPath expression.",
         nodeDetails = "JSONPath expression specifies a path to an element or a set of elements in a JSON structure.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         icon = "functions",
         configDirective = "tbTransformationNodeJsonPathConfig"
 )
@@ -68,7 +67,9 @@ public class TbJsonPathNode implements TbNode {
         if (!TbJsonPathNodeConfiguration.DEFAULT_JSON_PATH.equals(this.jsonPathValue)) {
             try {
                 Object jsonPathData = jsonPath.read(msg.getData(), this.configurationJsonPath);
-                ctx.tellSuccess(TbMsg.transformMsgData(msg, JacksonUtil.toString(jsonPathData)));
+                ctx.tellSuccess(msg.transform()
+                        .data(JacksonUtil.toString(jsonPathData))
+                        .build());
             } catch (PathNotFoundException e) {
                 ctx.tellFailure(msg, e);
             }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java
index f01f09ae49..904e624c75 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java
@@ -43,7 +43,6 @@ import java.util.concurrent.ExecutionException;
         nodeDetails = "Renames keys in the message or message metadata according to the provided mapping. " +
                 "If key to rename doesn't exist in the specified source (message or message metadata) it will be ignored.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbTransformationNodeRenameKeysConfig",
         icon = "find_replace"
 )
@@ -106,7 +105,10 @@ public class TbRenameKeysNode extends TbAbstractTransformNodeWithTbMsgSource {
             default:
                 log.debug("Unexpected RenameIn value: {}. Allowed values: {}", renameIn, TbMsgSource.values());
         }
-        ctx.tellSuccess(msgChanged ? TbMsg.transformMsg(msg, metaDataCopy, data) : msg);
+        ctx.tellSuccess(msgChanged ? msg.transform()
+                .metaData(metaDataCopy)
+                .data(data)
+                .build() : msg);
     }
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNode.java
index fb12352dc0..588d073cac 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNode.java
@@ -43,7 +43,6 @@ import java.util.concurrent.ExecutionException;
         nodeDetails = "Splits an array message into individual elements, with each element sent as a separate message. " +
                 "All outbound messages will have the same type and metadata as the original array message.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         icon = "content_copy",
         configDirective = "tbNodeEmptyConfig"
 )
@@ -64,7 +63,9 @@ public class TbSplitArrayMsgNode implements TbNode {
             if (data.isEmpty()) {
                 ctx.ack(msg);
             } else if (data.size() == 1) {
-                ctx.tellSuccess(TbMsg.transformMsgData(msg, JacksonUtil.toString(data.get(0))));
+                ctx.tellSuccess(msg.transform()
+                        .data(JacksonUtil.toString(data.get(0)))
+                        .build());
             } else {
                 TbMsgCallbackWrapper wrapper = new MultipleTbMsgsCallbackWrapper(data.size(), new TbMsgCallback() {
                     @Override
@@ -78,7 +79,9 @@ public class TbSplitArrayMsgNode implements TbNode {
                     }
                 });
                 data.forEach(msgNode -> {
-                    TbMsg outMsg = TbMsg.transformMsgData(msg, JacksonUtil.toString(msgNode));
+                    TbMsg outMsg = msg.transform()
+                            .data(JacksonUtil.toString(msgNode))
+                            .build();
                     ctx.enqueueForTellNext(outMsg, TbNodeConnectionType.SUCCESS, wrapper::onSuccess, wrapper::onFailure);
                 });
             }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java
index 3227c0c52c..01c6bd36c2 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java
@@ -41,7 +41,6 @@ import java.util.List;
                 "<code>{ msg: <i style=\"color: #666;\">new payload</i>,<br/>&nbsp&nbsp&nbspmetadata: <i style=\"color: #666;\">new metadata</i>,<br/>&nbsp&nbsp&nbspmsgType: <i style=\"color: #666;\">new msgType</i> }</code><br/>" +
                 "All fields in resulting object are optional and will be taken from original message if not specified.<br><br>" +
                 "Output connections: <code>Success</code>, <code>Failure</code>.",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbTransformationNodeScriptConfig"
 )
 public class TbTransformMsgNode extends TbAbstractTransformNode<TbTransformMsgNodeConfiguration> {
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
deleted file mode 100644
index 2ad9ac666b..0000000000
--- a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
+++ /dev/null
@@ -1 +0,0 @@
-System.register(["@angular/core","@shared/public-api","@ngrx/store","@angular/forms","@core/public-api","@ngx-translate/core","@angular/cdk/keycodes","@angular/common","@home/components/public-api","tslib","rxjs","@angular/cdk/coercion","rxjs/operators"],(function(e){"use strict";var t,n,r,a,i,o,l,s,p,m,d,u,c,f,g,h,y,b,v,x,C,S,T,I,E,F,q,A,k,N,w,M,B,V,O,D,L,P,R,_,j,G,K,U,H,z,$,Q,J,Y,W,X,Z,ee,te,ne,re,ae,ie;return{setters:[function(e){t=e,n=e.EventEmitter,r=e.forwardRef,a=e.ɵNG_COMP_DEF},function(e){i=e.RuleNodeConfigurationComponent,o=e.AttributeScope,l=e.telemetryTypeTranslations,s=e.ScriptLanguage,p=e.AlarmSeverity,m=e.alarmSeverityTranslations,d=e.EntitySearchDirection,u=e.EntityType,c=e.entityFields,f=e.messageTypeNames,g=e.MessageType,h=e.coerceBoolean,y=e.PageComponent,b=e.entitySearchDirectionTranslations,v=e,x=e.AlarmStatus,C=e.alarmStatusTranslations,S=e.SharedModule,T=e.AggregationType,I=e.aggregationTranslations,E=e.NotificationType,F=e.SlackChanelType,q=e.SlackChanelTypesTranslateMap},function(e){A=e},function(e){k=e,N=e.Validators,w=e.FormArray,M=e.FormGroup,B=e.NgControl,V=e.NG_VALUE_ACCESSOR,O=e.NG_VALIDATORS},function(e){D=e.getCurrentAuthState,L=e,P=e.isDefinedAndNotNull,R=e.isEqual,_=e.deepTrim,j=e.isObject,G=e.isNotEmptyStr},function(e){K=e},function(e){U=e.ENTER,H=e.COMMA,z=e.SEMICOLON},function(e){$=e.CommonModule},function(e){Q=e.HomeComponentsModule},function(e){J=e.__decorate},function(e){Y=e.Subject,W=e.takeUntil,X=e.of},function(e){Z=e.coerceBooleanProperty},function(e){ee=e.startWith,te=e.map,ne=e.mergeMap,re=e.share,ae=e.tap,ie=e.takeUntil}],execute:function(){class oe extends i{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.emptyConfigForm}onConfigurationSet(e){this.emptyConfigForm=this.fb.group({})}static{this.ɵfac=function(e){return new(e||oe)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:oe,selectors:[["tb-node-empty-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:1,vars:0,template:function(e,n){1&e&&t.ɵɵelement(0,"div")},dependencies:t.ɵɵgetComponentDepsFactory(oe),encapsulation:2})}}function le(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.customer-name-pattern-required")," "))}e("EmptyConfigComponent",oe);class se extends i{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,[N.required,N.pattern(/.*\S.*/)]],createCustomerIfNotExists:[!!e&&e.createCustomerIfNotExists,[]]})}prepareOutputConfig(e){return e.customerNamePattern=e.customerNamePattern.trim(),e}static{this.ɵfac=function(e){return new(e||se)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:se,selectors:[["tb-action-node-assign-to-customer-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:13,vars:5,consts:[[1,"flex","flex-col",3,"formGroup"],[1,"tb-form-panel","no-padding","no-border"],["subscriptSizing","dynamic",1,"mat-block"],["translate",""],["required","","matInput","","formControlName","customerNamePattern"],[4,"ngIf"],[1,"tb-form-row"],["formControlName","createCustomerIfNotExists",1,"mat-slide"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"mat-form-field",2)(3,"mat-label",3),t.ɵɵtext(4,"tb.rulenode.customer-name-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(5,"input",4),t.ɵɵtemplate(6,le,3,3,"mat-error",5),t.ɵɵelementStart(7,"mat-hint",3),t.ɵɵtext(8,"tb.rulenode.customer-name-pattern-hint"),t.ɵɵelementEnd()(),t.ɵɵelementStart(9,"div",6)(10,"mat-slide-toggle",7),t.ɵɵtext(11),t.ɵɵpipe(12,"translate"),t.ɵɵelementEnd()()()()),2&e&&(t.ɵɵproperty("formGroup",n.assignCustomerConfigForm),t.ɵɵadvance(6),t.ɵɵproperty("ngIf",n.assignCustomerConfigForm.get("customerNamePattern").hasError("required")||n.assignCustomerConfigForm.get("customerNamePattern").hasError("pattern")),t.ɵɵadvance(5),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(12,3,"tb.rulenode.create-customer-if-not-exists")," "))},dependencies:t.ɵɵgetComponentDepsFactory(se),encapsulation:2})}}e("AssignCustomerConfigComponent",se);const pe=()=>({standalone:!0});function me(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",15),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.telemetryTypeTranslationsMap.get(e))," ")}}function de(e,n){1&e&&(t.ɵɵelementStart(0,"div",12),t.ɵɵpipe(1,"translate"),t.ɵɵelementStart(2,"mat-slide-toggle",16),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd()()),2&e&&(t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(1,2,"tb.rulenode.send-attributes-updated-notification-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(4,4,"tb.rulenode.send-attributes-updated-notification")," "))}function ue(e,n){1&e&&(t.ɵɵelementStart(0,"div",12),t.ɵɵpipe(1,"translate"),t.ɵɵelementStart(2,"mat-slide-toggle",17),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd()()),2&e&&(t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(1,2,"tb.rulenode.notify-device-on-update-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(4,4,"tb.rulenode.notify-device")," "))}class ce extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.attributeScopeMap=o,this.attributeScopes=Object.keys(o),this.telemetryTypeTranslationsMap=l}configForm(){return this.attributesConfigForm}onConfigurationSet(e){this.attributesConfigForm=this.fb.group({scope:[e?e.scope:null,[N.required]],notifyDevice:[!e||e.notifyDevice,[]],sendAttributesUpdatedNotification:[!!e&&e.sendAttributesUpdatedNotification,[]],updateAttributesOnlyOnValueChange:[!!e&&e.updateAttributesOnlyOnValueChange,[]]}),this.attributesConfigForm.get("scope").valueChanges.subscribe((e=>{e!==o.SHARED_SCOPE&&this.attributesConfigForm.get("notifyDevice").patchValue(!1,{emitEvent:!1}),e===o.CLIENT_SCOPE&&this.attributesConfigForm.get("sendAttributesUpdatedNotification").patchValue(!1,{emitEvent:!1}),this.attributesConfigForm.get("updateAttributesOnlyOnValueChange").patchValue(!1,{emitEvent:!1})}))}static{this.ɵfac=function(e){return new(e||ce)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:ce,selectors:[["tb-action-node-attributes-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:31,vars:24,consts:[[1,"tb-form-panel","no-border","no-padding",3,"formGroup"],[1,"tb-form-panel","stroked"],[3,"hintText"],[1,"tb-form-row","no-border","no-padding","tb-standard-fields"],[1,"flex"],["required","","matInput","","formControlName","scope",1,"tb-entity-type-select"],[3,"value",4,"ngFor","ngForOf"],["type","text","matInput","","readonly","","disabled","",3,"ngModel","ngModelOptions"],["type","button","matSuffix","","mat-icon-button","","aria-label","Copy","ngxClipboard","",3,"cbContent","matTooltip"],["aria-hidden","false","aria-label","help-icon"],[1,"tb-settings"],["translate",""],[1,"tb-form-row","no-border","no-padding",3,"tb-hint-tooltip-icon"],["formControlName","updateAttributesOnlyOnValueChange",1,"mat-slide"],["class","tb-form-row no-border no-padding",3,"tb-hint-tooltip-icon",4,"ngIf"],[3,"value"],["formControlName","sendAttributesUpdatedNotification",1,"mat-slide"],["formControlName","notifyDevice",1,"mat-slide"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1),t.ɵɵelement(2,"tb-example-hint",2),t.ɵɵelementStart(3,"div",3)(4,"mat-form-field",4)(5,"mat-label"),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(8,"mat-select",5),t.ɵɵtemplate(9,me,3,4,"mat-option",6),t.ɵɵelementEnd()(),t.ɵɵelementStart(10,"mat-form-field",4)(11,"mat-label"),t.ɵɵtext(12),t.ɵɵpipe(13,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(14,"input",7),t.ɵɵelementStart(15,"button",8),t.ɵɵpipe(16,"translate"),t.ɵɵelementStart(17,"mat-icon",9),t.ɵɵtext(18,"content_copy "),t.ɵɵelementEnd()()()()(),t.ɵɵelementStart(19,"section",1)(20,"mat-expansion-panel",10)(21,"mat-expansion-panel-header")(22,"mat-panel-title",11),t.ɵɵtext(23,"tb.rulenode.advanced-settings"),t.ɵɵelementEnd()(),t.ɵɵelementStart(24,"div",12),t.ɵɵpipe(25,"translate"),t.ɵɵelementStart(26,"mat-slide-toggle",13),t.ɵɵtext(27),t.ɵɵpipe(28,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(29,de,5,6,"div",14)(30,ue,5,6,"div",14),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.attributesConfigForm),t.ɵɵadvance(2),t.ɵɵproperty("hintText","tb.rulenode.attributes-scope-hint"),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(7,13,"tb.rulenode.attributes-scope")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.attributeScopes),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(13,15,"tb.rulenode.attributes-scope-value")),t.ɵɵadvance(2),t.ɵɵproperty("ngModel",n.attributesConfigForm.get("scope").value)("ngModelOptions",t.ɵɵpureFunction0(23,pe)),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(16,17,"tb.rulenode.attributes-scope-value-copy")),t.ɵɵproperty("cbContent",n.attributesConfigForm.get("scope").value),t.ɵɵadvance(9),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(25,19,n.attributesConfigForm.get("updateAttributesOnlyOnValueChange").value?"tb.rulenode.update-attributes-only-on-value-change-hint-enabled":"tb.rulenode.update-attributes-only-on-value-change-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(28,21,"tb.rulenode.update-attributes-only-on-value-change")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.attributesConfigForm.get("scope").value!==n.attributeScopeMap.CLIENT_SCOPE),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.attributesConfigForm.get("scope").value===n.attributeScopeMap.SHARED_SCOPE))},dependencies:t.ɵɵgetComponentDepsFactory(ce),encapsulation:2})}}e("AttributesConfigComponent",ce);const fe=["jsFuncComponent"],ge=["tbelFuncComponent"],he=()=>["msg","metadata","msgType"];function ye(e,n){1&e&&t.ɵɵelement(0,"tb-script-lang",12)}function be(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",13,0)(2,"button",14),t.ɵɵpipe(3,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(4,"mat-icon",15),t.ɵɵtext(5,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(4,he)),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(3,2,e.testScriptLabel))}}function ve(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",16,1)(2,"button",14),t.ɵɵpipe(3,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(4,"mat-icon",15),t.ɵɵtext(5,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(6,he))("disableUndefinedCheck",!0)("scriptLanguage",e.scriptLanguage.TBEL),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(3,4,e.testScriptLabel))}}function xe(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.alarm-type-required")," "))}class Ce extends i{constructor(e,t,r,a){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=r,this.translate=a,this.tbelEnabled=D(this.store).tbelEnabled,this.scriptLanguage=s,this.changeScript=new n,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:s.JS,[N.required]],alarmDetailsBuildJs:[e?e.alarmDetailsBuildJs:null,[]],alarmDetailsBuildTbel:[e?e.alarmDetailsBuildTbel:null,[]],alarmType:[e?e.alarmType:null,[N.required]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.clearAlarmConfigForm.get("scriptLang").value;t!==s.TBEL||this.tbelEnabled||(t=s.JS,this.clearAlarmConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.clearAlarmConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.clearAlarmConfigForm.get("alarmDetailsBuildJs").setValidators(t===s.JS?[N.required]:[]),this.clearAlarmConfigForm.get("alarmDetailsBuildJs").updateValueAndValidity({emitEvent:e}),this.clearAlarmConfigForm.get("alarmDetailsBuildTbel").setValidators(t===s.TBEL?[N.required]:[]),this.clearAlarmConfigForm.get("alarmDetailsBuildTbel").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=s.JS)),e}testScript(e){const t=this.clearAlarmConfigForm.get("scriptLang").value,n=t===s.JS?"alarmDetailsBuildJs":"alarmDetailsBuildTbel",r=t===s.JS?"rulenode/clear_alarm_node_script_fn":"rulenode/tbel/clear_alarm_node_script_fn",a=this.clearAlarmConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(a,"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===s.JS&&this.jsFuncComponent.validateOnSubmit()}static{this.ɵfac=function(e){return new(e||Ce)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder),t.ɵɵdirectiveInject(L.NodeScriptTestService),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Ce,selectors:[["tb-action-node-clear-alarm-config"]],viewQuery:function(e,n){if(1&e&&(t.ɵɵviewQuery(fe,5),t.ɵɵviewQuery(ge,5)),2&e){let e;t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.jsFuncComponent=e.first),t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.tbelFuncComponent=e.first)}},features:[t.ɵɵInheritDefinitionFeature],decls:15,vars:8,consts:[["jsFuncComponent",""],["tbelFuncComponent",""],[1,"flex","flex-col",3,"formGroup"],["formControlName","scriptLang",4,"ngIf"],["formControlName","alarmDetailsBuildJs","functionName","Details","helpId","rulenode/clear_alarm_node_script_fn","noValidate","true",3,"functionArgs",4,"ngIf"],["formControlName","alarmDetailsBuildTbel","functionName","Details","helpId","rulenode/tbel/clear_alarm_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage",4,"ngIf"],[1,"flex","flex-row",2,"padding-bottom","16px"],["mat-button","","mat-raised-button","","color","primary",3,"click"],["subscriptSizing","dynamic",1,"mat-block"],["translate",""],["required","","matInput","","formControlName","alarmType"],[4,"ngIf"],["formControlName","scriptLang"],["formControlName","alarmDetailsBuildJs","functionName","Details","helpId","rulenode/clear_alarm_node_script_fn","noValidate","true",3,"functionArgs"],["toolbarSuffixButton","","mat-icon-button","","matTooltipPosition","above",1,"tb-mat-32",3,"click","matTooltip"],["color","primary",1,"material-icons"],["formControlName","alarmDetailsBuildTbel","functionName","Details","helpId","rulenode/tbel/clear_alarm_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",2),t.ɵɵtemplate(1,ye,1,0,"tb-script-lang",3)(2,be,6,5,"tb-js-func",4)(3,ve,6,7,"tb-js-func",5),t.ɵɵelementStart(4,"div",6)(5,"button",7),t.ɵɵlistener("click",(function(){return n.testScript()})),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd()(),t.ɵɵelementStart(8,"mat-form-field",8)(9,"mat-label",9),t.ɵɵtext(10,"tb.rulenode.alarm-type"),t.ɵɵelementEnd(),t.ɵɵelement(11,"input",10),t.ɵɵtemplate(12,xe,3,3,"mat-error",11),t.ɵɵelementStart(13,"mat-hint",9),t.ɵɵtext(14,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.clearAlarmConfigForm),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.tbelEnabled),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.clearAlarmConfigForm.get("scriptLang").value===n.scriptLanguage.JS),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.clearAlarmConfigForm.get("scriptLang").value===n.scriptLanguage.TBEL),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(7,6,n.testScriptLabel)," "),t.ɵɵadvance(6),t.ɵɵproperty("ngIf",n.clearAlarmConfigForm.get("alarmType").hasError("required")))},dependencies:t.ɵɵgetComponentDepsFactory(Ce),encapsulation:2})}}e("ClearAlarmConfigComponent",Ce);const Se=["jsFuncComponent"],Te=["tbelFuncComponent"],Ie=()=>["msg","metadata","msgType"];function Ee(e,n){1&e&&(t.ɵɵelementStart(0,"mat-checkbox",7),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.overwrite-alarm-details")," "))}function Fe(e,n){1&e&&t.ɵɵelement(0,"tb-script-lang",14)}function qe(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",15,0)(2,"button",16),t.ɵɵpipe(3,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext(2);return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(4,"mat-icon",17),t.ɵɵtext(5,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext(2);t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(4,Ie)),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(3,2,e.testScriptLabel))}}function Ae(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",18,1)(2,"button",16),t.ɵɵpipe(3,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext(2);return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(4,"mat-icon",17),t.ɵɵtext(5,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext(2);t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(6,Ie))("disableUndefinedCheck",!0)("scriptLanguage",e.scriptLanguage.TBEL),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(3,4,e.testScriptLabel))}}function ke(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"section",8),t.ɵɵtemplate(1,Fe,1,0,"tb-script-lang",9)(2,qe,6,5,"tb-js-func",10)(3,Ae,6,7,"tb-js-func",11),t.ɵɵelementStart(4,"div",12)(5,"button",13),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.tbelEnabled),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.createAlarmConfigForm.get("scriptLang").value===e.scriptLanguage.JS),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.createAlarmConfigForm.get("scriptLang").value===e.scriptLanguage.TBEL),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(7,4,e.testScriptLabel)," ")}}function Ne(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.alarm-type-required")," "))}function we(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",32),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(3);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.alarmSeverityTranslationMap.get(e))," ")}}function Me(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.alarm-severity-required")," "))}function Be(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",29)(1,"mat-label",20),t.ɵɵtext(2,"tb.rulenode.alarm-severity"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"mat-select",30),t.ɵɵtemplate(4,we,3,4,"mat-option",31),t.ɵɵelementEnd(),t.ɵɵtemplate(5,Me,3,3,"mat-error",22),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(4),t.ɵɵproperty("ngForOf",e.alarmSeverities),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.createAlarmConfigForm.get("severity").hasError("required"))}}function Ve(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.alarm-severity-required")," "))}function Oe(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",19)(1,"mat-label",20),t.ɵɵtext(2,"tb.rulenode.alarm-severity-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",33),t.ɵɵtemplate(4,Ve,3,3,"mat-error",22),t.ɵɵelement(5,"mat-hint",34),t.ɵɵpipe(6,"translate"),t.ɵɵpipe(7,"safe"),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(4),t.ɵɵproperty("ngIf",e.createAlarmConfigForm.get("severity").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("innerHTML",t.ɵɵpipeBind2(7,4,t.ɵɵpipeBind1(6,2,"tb.rulenode.alarm-severity-pattern-hint"),"html"),t.ɵɵsanitizeHtml)}}function De(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"mat-chip-row",38),t.ɵɵlistener("removed",(function(){const n=t.ɵɵrestoreView(e).$implicit,r=t.ɵɵnextContext(3);return t.ɵɵresetView(r.removeKey(n,"relationTypes"))})),t.ɵɵtext(1),t.ɵɵelementStart(2,"mat-icon",39),t.ɵɵtext(3,"close"),t.ɵɵelementEnd()()}if(2&e){const e=n.$implicit;t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e," ")}}function Le(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"section")(1,"mat-form-field",35)(2,"mat-label",20),t.ɵɵtext(3,"tb.rulenode.relation-types-list"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"mat-chip-grid",null,2),t.ɵɵtemplate(6,De,4,1,"mat-chip-row",36),t.ɵɵelementStart(7,"input",37),t.ɵɵpipe(8,"translate"),t.ɵɵlistener("matChipInputTokenEnd",(function(n){t.ɵɵrestoreView(e);const r=t.ɵɵnextContext(2);return t.ɵɵresetView(r.addKey(n,"relationTypes"))})),t.ɵɵelementEnd()(),t.ɵɵelementStart(9,"mat-hint",20),t.ɵɵtext(10,"tb.rulenode.relation-types-list-hint"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵreference(5),n=t.ɵɵnextContext(2);t.ɵɵadvance(6),t.ɵɵproperty("ngForOf",n.createAlarmConfigForm.get("relationTypes").value),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("placeholder",t.ɵɵpipeBind1(8,5,"tb.rulenode.relation-types-list")),t.ɵɵproperty("matChipInputFor",e)("matChipInputSeparatorKeyCodes",n.separatorKeysCodes)("matChipInputAddOnBlur",!0)}}function Pe(e,n){if(1&e&&(t.ɵɵelementStart(0,"section",8)(1,"mat-form-field",19)(2,"mat-label",20),t.ɵɵtext(3,"tb.rulenode.alarm-type"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",21),t.ɵɵtemplate(5,Ne,3,3,"mat-error",22),t.ɵɵelementStart(6,"mat-hint",20),t.ɵɵtext(7,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()(),t.ɵɵelementStart(8,"mat-checkbox",23),t.ɵɵtext(9),t.ɵɵpipe(10,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(11,Be,6,2,"mat-form-field",24)(12,Oe,8,7,"mat-form-field",25),t.ɵɵelementStart(13,"mat-checkbox",26),t.ɵɵtext(14),t.ɵɵpipe(15,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(16,Le,11,7,"section",22),t.ɵɵelementStart(17,"mat-checkbox",27),t.ɵɵtext(18),t.ɵɵpipe(19,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(20,"mat-checkbox",28),t.ɵɵtext(21),t.ɵɵpipe(22,"translate"),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(5),t.ɵɵproperty("ngIf",e.createAlarmConfigForm.get("alarmType").hasError("required")),t.ɵɵadvance(4),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(10,8,"tb.rulenode.use-alarm-severity-pattern")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!e.createAlarmConfigForm.get("dynamicSeverity").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.createAlarmConfigForm.get("dynamicSeverity").value),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(15,10,"tb.rulenode.propagate")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!0===e.createAlarmConfigForm.get("propagate").value),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(19,12,"tb.rulenode.propagate-to-owner")," "),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(22,14,"tb.rulenode.propagate-to-tenant")," ")}}class Re extends i{constructor(e,t,r,a){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=r,this.translate=a,this.alarmSeverities=Object.keys(p),this.alarmSeverityTranslationMap=m,this.separatorKeysCodes=[U,H,z],this.tbelEnabled=D(this.store).tbelEnabled,this.scriptLanguage=s,this.changeScript=new n,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:s.JS,[N.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([N.required]),this.createAlarmConfigForm.get("severity").setValidators([N.required])),this.createAlarmConfigForm.get("alarmType").updateValueAndValidity({emitEvent:e}),this.createAlarmConfigForm.get("severity").updateValueAndValidity({emitEvent:e});let r=this.createAlarmConfigForm.get("scriptLang").value;r!==s.TBEL||this.tbelEnabled||(r=s.JS,this.createAlarmConfigForm.get("scriptLang").patchValue(r,{emitEvent:!1}),setTimeout((()=>{this.createAlarmConfigForm.updateValueAndValidity({emitEvent:!0})})));const a=!1===t||!0===n;this.createAlarmConfigForm.get("alarmDetailsBuildJs").setValidators(a&&r===s.JS?[N.required]:[]),this.createAlarmConfigForm.get("alarmDetailsBuildTbel").setValidators(a&&r===s.TBEL?[N.required]:[]),this.createAlarmConfigForm.get("alarmDetailsBuildJs").updateValueAndValidity({emitEvent:e}),this.createAlarmConfigForm.get("alarmDetailsBuildTbel").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=s.JS)),e}testScript(e){const t=this.createAlarmConfigForm.get("scriptLang").value,n=t===s.JS?"alarmDetailsBuildJs":"alarmDetailsBuildTbel",r=t===s.JS?"rulenode/create_alarm_node_script_fn":"rulenode/tbel/create_alarm_node_script_fn",a=this.createAlarmConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(a,"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===s.JS&&this.jsFuncComponent.validateOnSubmit()}}static{this.ɵfac=function(e){return new(e||Re)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder),t.ɵɵdirectiveInject(L.NodeScriptTestService),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Re,selectors:[["tb-action-node-create-alarm-config"]],viewQuery:function(e,n){if(1&e&&(t.ɵɵviewQuery(Se,5),t.ɵɵviewQuery(Te,5)),2&e){let e;t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.jsFuncComponent=e.first),t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.tbelFuncComponent=e.first)}},features:[t.ɵɵInheritDefinitionFeature],decls:7,vars:7,consts:[["jsFuncComponent",""],["tbelFuncComponent",""],["relationTypesChipList",""],[1,"flex","flex-col",3,"formGroup"],["formControlName","useMessageAlarmData"],["formControlName","overwriteAlarmDetails",4,"ngIf"],["class","flex flex-col",4,"ngIf"],["formControlName","overwriteAlarmDetails"],[1,"flex","flex-col"],["formControlName","scriptLang",4,"ngIf"],["formControlName","alarmDetailsBuildJs","functionName","Details","helpId","rulenode/create_alarm_node_script_fn","noValidate","true",3,"functionArgs",4,"ngIf"],["formControlName","alarmDetailsBuildTbel","functionName","Details","helpId","rulenode/tbel/create_alarm_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage",4,"ngIf"],[1,"flex","flex-row",2,"padding-bottom","16px"],["mat-button","","mat-raised-button","","color","primary",3,"click"],["formControlName","scriptLang"],["formControlName","alarmDetailsBuildJs","functionName","Details","helpId","rulenode/create_alarm_node_script_fn","noValidate","true",3,"functionArgs"],["toolbarSuffixButton","","mat-icon-button","","matTooltipPosition","above",1,"tb-mat-32",3,"click","matTooltip"],["color","primary",1,"material-icons"],["formControlName","alarmDetailsBuildTbel","functionName","Details","helpId","rulenode/tbel/create_alarm_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage"],["subscriptSizing","dynamic",1,"flex-1"],["translate",""],["required","","matInput","","formControlName","alarmType"],[4,"ngIf"],["formControlName","dynamicSeverity"],["class","flex-1",4,"ngIf"],["class","flex-1","subscriptSizing","dynamic",4,"ngIf"],["formControlName","propagate"],["formControlName","propagateToOwner"],["formControlName","propagateToTenant"],[1,"flex-1"],["formControlName","severity","required",""],[3,"value",4,"ngFor","ngForOf"],[3,"value"],["matInput","","formControlName","severity","required",""],[3,"innerHTML"],["floatLabel","always","subscriptSizing","dynamic",1,"mat-block"],[3,"removed",4,"ngFor","ngForOf"],["matInput","","type","text",3,"matChipInputTokenEnd","placeholder","matChipInputFor","matChipInputSeparatorKeyCodes","matChipInputAddOnBlur"],[3,"removed"],["matChipRemove",""]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",3)(1,"mat-checkbox",4),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(4,Ee,3,3,"mat-checkbox",5)(5,ke,8,6,"section",6)(6,Pe,23,16,"section",6),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.createAlarmConfigForm),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(3,5,"tb.rulenode.use-message-alarm-data")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!0===n.createAlarmConfigForm.get("useMessageAlarmData").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf",!1===n.createAlarmConfigForm.get("useMessageAlarmData").value||!0===n.createAlarmConfigForm.get("overwriteAlarmDetails").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf",!1===n.createAlarmConfigForm.get("useMessageAlarmData").value))},dependencies:t.ɵɵgetComponentDepsFactory(Re),encapsulation:2})}}function _e(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",21),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.directionTypeTranslations.get(e))," ")}}function je(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",22)(1,"mat-label"),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",23),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(2),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(3,1,e.entityTypeNamePatternTranslation.get(e.createRelationConfigForm.get("entityType").value)))}}function Ge(e,n){1&e&&(t.ɵɵelementStart(0,"mat-form-field",22)(1,"mat-label",5),t.ɵɵtext(2,"tb.rulenode.profile-name"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",24),t.ɵɵelementEnd())}function Ke(e,n){1&e&&t.ɵɵelement(0,"tb-example-hint",25),2&e&&t.ɵɵproperty("hintText","tb.rulenode.kv-map-pattern-hint")}function Ue(e,n){1&e&&(t.ɵɵelementStart(0,"div",26),t.ɵɵpipe(1,"translate"),t.ɵɵelementStart(2,"mat-slide-toggle",27),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd()()),2&e&&(t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(1,2,"tb.rulenode.create-entity-if-not-exists-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(4,4,"tb.rulenode.create-entity-if-not-exists")," "))}e("CreateAlarmConfigComponent",Re);class He extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.keys(d),this.directionTypeTranslations=new Map([[d.FROM,"tb.rulenode.search-direction-from"],[d.TO,"tb.rulenode.search-direction-to"]]),this.entityType=u,this.entityTypeNamePatternTranslation=new Map([[u.DEVICE,"tb.rulenode.device-name-pattern"],[u.ASSET,"tb.rulenode.asset-name-pattern"],[u.ENTITY_VIEW,"tb.rulenode.entity-view-name-pattern"],[u.CUSTOMER,"tb.rulenode.customer-title-pattern"],[u.USER,"tb.rulenode.user-name-pattern"],[u.DASHBOARD,"tb.rulenode.dashboard-name-pattern"],[u.EDGE,"tb.rulenode.edge-name-pattern"]]),this.allowedEntityTypes=[u.DEVICE,u.ASSET,u.ENTITY_VIEW,u.TENANT,u.CUSTOMER,u.USER,u.DASHBOARD,u.EDGE]}configForm(){return this.createRelationConfigForm}onConfigurationSet(e){this.createRelationConfigForm=this.fb.group({direction:[e?e.direction:null,[N.required]],entityType:[e?e.entityType:null,[N.required]],entityNamePattern:[e?e.entityNamePattern:null,[]],entityTypePattern:[e?e.entityTypePattern:null,[]],relationType:[e?e.relationType:null,[N.required]],createEntityIfNotExists:[!!e&&e.createEntityIfNotExists,[]],removeCurrentRelations:[!!e&&e.removeCurrentRelations,[]],changeOriginatorToRelatedEntity:[!!e&&e.changeOriginatorToRelatedEntity,[]]})}validatorTriggers(){return["entityType","createEntityIfNotExists"]}updateValidators(e){const t=this.createRelationConfigForm.get("entityType").value;if(t?this.createRelationConfigForm.get("entityNamePattern").setValidators([N.required,N.pattern(/.*\S.*/)]):this.createRelationConfigForm.get("entityNamePattern").setValidators([]),!t||t!==u.DEVICE&&t!==u.ASSET)this.createRelationConfigForm.get("entityTypePattern").setValidators([]);else{const e=[N.pattern(/.*\S.*/)];this.createRelationConfigForm.get("createEntityIfNotExists").value&&e.push(N.required),this.createRelationConfigForm.get("entityTypePattern").setValidators(e)}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}static{this.ɵfac=function(e){return new(e||He)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:He,selectors:[["tb-action-node-create-relation-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:36,vars:19,consts:[[1,"tb-form-panel","no-padding","no-border",3,"formGroup"],[1,"tb-form-panel","stroked","no-padding-bottom"],["translate","",1,"tb-form-panel-title"],[1,"flex","flex-col"],["hideRequiredMarker","",1,"mat-block"],["translate",""],["required","","matInput","","formControlName","direction"],[3,"value",4,"ngFor","ngForOf"],["required","","formControlName","relationType"],[1,"flex","flex-row","gap-4"],["showLabel","","required","","formControlName","entityType",1,"flex-1",3,"allowedEntityTypes"],["class","mat-block flex-1",4,"ngIf"],[3,"hintText",4,"ngIf"],["style","margin-bottom: 18px","class","tb-form-row no-border no-padding",3,"tb-hint-tooltip-icon",4,"ngIf"],[1,"tb-form-panel","stroked","no-padding"],[1,"tb-settings"],[2,"padding","16px"],[1,"tb-form-panel","no-border","no-padding-top"],[1,"tb-form-row","no-border","no-padding",3,"tb-hint-tooltip-icon"],["formControlName","removeCurrentRelations",1,"mat-slide"],["formControlName","changeOriginatorToRelatedEntity",1,"mat-slide"],[3,"value"],[1,"mat-block","flex-1"],["required","","matInput","","formControlName","entityNamePattern"],["matInput","","formControlName","entityTypePattern"],[3,"hintText"],[1,"tb-form-row","no-border","no-padding",2,"margin-bottom","18px",3,"tb-hint-tooltip-icon"],["formControlName","createEntityIfNotExists",1,"mat-slide"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"div",2),t.ɵɵtext(3,"tb.rulenode.relation-parameters"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"div",3)(5,"mat-form-field",4)(6,"mat-label",5),t.ɵɵtext(7,"relation.direction"),t.ɵɵelementEnd(),t.ɵɵelementStart(8,"mat-select",6),t.ɵɵtemplate(9,_e,3,4,"mat-option",7),t.ɵɵelementEnd()(),t.ɵɵelement(10,"tb-relation-type-autocomplete",8),t.ɵɵelementEnd()(),t.ɵɵelementStart(11,"div",1)(12,"div",2),t.ɵɵtext(13,"tb.rulenode.target-entity"),t.ɵɵelementEnd(),t.ɵɵelementStart(14,"div",9),t.ɵɵelement(15,"tb-entity-type-select",10),t.ɵɵtemplate(16,je,5,3,"mat-form-field",11)(17,Ge,4,0,"mat-form-field",11),t.ɵɵelementEnd(),t.ɵɵtemplate(18,Ke,1,1,"tb-example-hint",12)(19,Ue,5,6,"div",13),t.ɵɵelementEnd(),t.ɵɵelementStart(20,"section",14)(21,"mat-expansion-panel",15)(22,"mat-expansion-panel-header",16)(23,"mat-panel-title",5),t.ɵɵtext(24,"tb.rulenode.advanced-settings"),t.ɵɵelementEnd()(),t.ɵɵelementStart(25,"div",17)(26,"div",18),t.ɵɵpipe(27,"translate"),t.ɵɵelementStart(28,"mat-slide-toggle",19),t.ɵɵtext(29),t.ɵɵpipe(30,"translate"),t.ɵɵelementEnd()(),t.ɵɵelementStart(31,"div",18),t.ɵɵpipe(32,"translate"),t.ɵɵelementStart(33,"mat-slide-toggle",20),t.ɵɵtext(34),t.ɵɵpipe(35,"translate"),t.ɵɵelementEnd()()()()()()),2&e&&(t.ɵɵproperty("formGroup",n.createRelationConfigForm),t.ɵɵadvance(9),t.ɵɵproperty("ngForOf",n.directionTypes),t.ɵɵadvance(6),t.ɵɵproperty("allowedEntityTypes",n.allowedEntityTypes),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.createRelationConfigForm.get("entityType").value&&n.createRelationConfigForm.get("entityType").value!==n.entityType.TENANT),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.createRelationConfigForm.get("entityType").value===n.entityType.DEVICE||n.createRelationConfigForm.get("entityType").value===n.entityType.ASSET),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.createRelationConfigForm.get("entityType").value===n.entityType.CUSTOMER||n.createRelationConfigForm.get("entityType").value===n.entityType.DEVICE||n.createRelationConfigForm.get("entityType").value===n.entityType.ASSET),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.createRelationConfigForm.get("entityType").value===n.entityType.CUSTOMER||n.createRelationConfigForm.get("entityType").value===n.entityType.DEVICE||n.createRelationConfigForm.get("entityType").value===n.entityType.ASSET),t.ɵɵadvance(7),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(27,11,"tb.rulenode.remove-current-relations-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(30,13,"tb.rulenode.remove-current-relations")," "),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(32,15,"tb.rulenode.change-originator-to-related-entity-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(35,17,"tb.rulenode.change-originator-to-related-entity")," "))},dependencies:t.ɵɵgetComponentDepsFactory(He),encapsulation:2})}}function ze(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",13),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.directionTypeTranslations.get(e))," ")}}function $e(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",18)(1,"mat-label"),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",19),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(2),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(3,1,e.entityTypeNamePatternTranslation.get(e.deleteRelationConfigForm.get("entityType").value)))}}function Qe(e,n){1&e&&t.ɵɵelement(0,"tb-example-hint",20),2&e&&t.ɵɵproperty("hintText","tb.rulenode.kv-map-single-pattern-hint")}function Je(e,n){if(1&e&&(t.ɵɵelementStart(0,"div")(1,"div",14),t.ɵɵelement(2,"tb-entity-type-select",15),t.ɵɵtemplate(3,$e,5,3,"mat-form-field",16),t.ɵɵelementEnd(),t.ɵɵtemplate(4,Qe,1,1,"tb-example-hint",17),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(2),t.ɵɵproperty("allowedEntityTypes",e.allowedEntityTypes),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.deleteRelationConfigForm.get("entityType").value&&e.deleteRelationConfigForm.get("entityType").value!==e.entityType.TENANT),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.deleteRelationConfigForm.get("entityType").value&&e.deleteRelationConfigForm.get("entityType").value!==e.entityType.TENANT)}}e("CreateRelationConfigComponent",He);class Ye extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.keys(d),this.directionTypeTranslations=new Map([[d.FROM,"tb.rulenode.del-relation-direction-from"],[d.TO,"tb.rulenode.del-relation-direction-to"]]),this.entityTypeNamePatternTranslation=new Map([[u.DEVICE,"tb.rulenode.device-name-pattern"],[u.ASSET,"tb.rulenode.asset-name-pattern"],[u.ENTITY_VIEW,"tb.rulenode.entity-view-name-pattern"],[u.CUSTOMER,"tb.rulenode.customer-title-pattern"],[u.USER,"tb.rulenode.user-name-pattern"],[u.DASHBOARD,"tb.rulenode.dashboard-name-pattern"],[u.EDGE,"tb.rulenode.edge-name-pattern"]]),this.entityType=u,this.allowedEntityTypes=[u.DEVICE,u.ASSET,u.ENTITY_VIEW,u.TENANT,u.CUSTOMER,u.USER,u.DASHBOARD,u.EDGE]}configForm(){return this.deleteRelationConfigForm}onConfigurationSet(e){this.deleteRelationConfigForm=this.fb.group({deleteForSingleEntity:[!!e&&e.deleteForSingleEntity,[]],direction:[e?e.direction:null,[N.required]],entityType:[e?e.entityType:null,[]],entityNamePattern:[e?e.entityNamePattern:null,[]],relationType:[e?e.relationType:null,[N.required]]})}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([N.required]):this.deleteRelationConfigForm.get("entityType").setValidators([]),t&&n&&n!==u.TENANT?this.deleteRelationConfigForm.get("entityNamePattern").setValidators([N.required,N.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}static{this.ɵfac=function(e){return new(e||Ye)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Ye,selectors:[["tb-action-node-delete-relation-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:18,vars:9,consts:[[1,"tb-form-panel","no-padding","no-border",3,"formGroup"],[1,"tb-form-panel","stroked","no-padding-bottom"],["translate","",1,"tb-form-panel-title"],[1,"flex","flex-col"],["hideRequiredMarker","",1,"mat-block"],["translate",""],["required","","matInput","","formControlName","direction"],[3,"value",4,"ngFor","ngForOf"],["required","","formControlName","relationType"],[1,"tb-form-panel","stroked"],[1,"tb-form-row","no-border","no-padding",3,"tb-hint-tooltip-icon"],["formControlName","deleteForSingleEntity",1,"mat-slide"],[4,"ngIf"],[3,"value"],[1,"flex","flex-row","gap-2.5"],["showLabel","","required","","formControlName","entityType",1,"flex-1",3,"allowedEntityTypes"],["class","mat-block flex-1",4,"ngIf"],[3,"hintText",4,"ngIf"],[1,"mat-block","flex-1"],["required","","matInput","","formControlName","entityNamePattern"],[3,"hintText"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"div",2),t.ɵɵtext(3,"tb.rulenode.relation-parameters"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"div",3)(5,"mat-form-field",4)(6,"mat-label",5),t.ɵɵtext(7,"relation.direction"),t.ɵɵelementEnd(),t.ɵɵelementStart(8,"mat-select",6),t.ɵɵtemplate(9,ze,3,4,"mat-option",7),t.ɵɵelementEnd()(),t.ɵɵelement(10,"tb-relation-type-autocomplete",8),t.ɵɵelementEnd()(),t.ɵɵelementStart(11,"div",9)(12,"div",10),t.ɵɵpipe(13,"translate"),t.ɵɵelementStart(14,"mat-slide-toggle",11),t.ɵɵtext(15),t.ɵɵpipe(16,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(17,Je,5,3,"div",12),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.deleteRelationConfigForm),t.ɵɵadvance(9),t.ɵɵproperty("ngForOf",n.directionTypes),t.ɵɵadvance(3),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(13,5,"tb.rulenode.delete-relation-with-specific-entity-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(16,7,"tb.rulenode.delete-relation-with-specific-entity")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.deleteRelationConfigForm.get("deleteForSingleEntity").value))},dependencies:t.ɵɵgetComponentDepsFactory(Ye),encapsulation:2})}}e("DeleteRelationConfigComponent",Ye);class We extends i{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],fetchAlarmRulesStateOnStart:[!!e&&e.fetchAlarmRulesStateOnStart]})}validatorTriggers(){return["persistAlarmRulesState"]}updateValidators(e){this.deviceProfile.get("persistAlarmRulesState").value?this.deviceProfile.get("fetchAlarmRulesStateOnStart").enable({emitEvent:!1}):(this.deviceProfile.get("fetchAlarmRulesStateOnStart").setValue(!1,{emitEvent:!1}),this.deviceProfile.get("fetchAlarmRulesStateOnStart").disable({emitEvent:!1})),this.deviceProfile.get("fetchAlarmRulesStateOnStart").updateValueAndValidity({emitEvent:e})}static{this.ɵfac=function(e){return new(e||We)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:We,selectors:[["tb-device-profile-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:13,vars:13,consts:[[1,"tb-form-panel","stroked",3,"formGroup"],["translate","",1,"tb-form-hint","tb-primary-fill"],[1,"tb-form-row","no-border","no-padding","slide-toggle",3,"tb-hint-tooltip-icon"],["formControlName","persistAlarmRulesState",1,"mat-slide"],["formControlName","fetchAlarmRulesStateOnStart",1,"mat-slide"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1),t.ɵɵtext(2,"tb.rulenode.device-profile-node-hint"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"div",2),t.ɵɵpipe(4,"translate"),t.ɵɵelementStart(5,"mat-slide-toggle",3),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd()(),t.ɵɵelementStart(8,"div",2),t.ɵɵpipe(9,"translate"),t.ɵɵelementStart(10,"mat-slide-toggle",4),t.ɵɵtext(11),t.ɵɵpipe(12,"translate"),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.deviceProfile),t.ɵɵadvance(3),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(4,5,"tb.rulenode.persist-alarm-rules-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(7,7,"tb.rulenode.persist-alarm-rules")," "),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(9,9,"tb.rulenode.fetch-alarm-rules-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(12,11,"tb.rulenode.fetch-alarm-rules")," "))},dependencies:t.ɵɵgetComponentDepsFactory(We),encapsulation:2})}}e("DeviceProfileConfigComponent",We);const Xe=["jsFuncComponent"],Ze=["tbelFuncComponent"],et=()=>["prevMsg","prevMetadata","prevMsgType"];function tt(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.message-count-required")," "))}function nt(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-message-count-message")," "))}function rt(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.generation-frequency-required")," "))}function at(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-generation-frequency-message")," "))}function it(e,n){if(1&e&&(t.ɵɵelementStart(0,"tb-toggle-select",22)(1,"tb-toggle-option",23),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"tb-toggle-option",23),t.ɵɵtext(5),t.ɵɵpipe(6,"translate"),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(),t.ɵɵproperty("value",e.scriptLanguage.TBEL),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(3,4,"tb.rulenode.script-lang-tbel")," "),t.ɵɵadvance(2),t.ɵɵproperty("value",e.scriptLanguage.JS),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(6,6,"tb.rulenode.script-lang-js")," ")}}function ot(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",18,0),t.ɵɵtemplate(2,it,7,8,"tb-toggle-select",19),t.ɵɵelementStart(3,"button",20),t.ɵɵpipe(4,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(5,"mat-icon",21),t.ɵɵtext(6,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(5,et)),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",e.tbelEnabled),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(4,3,e.testScriptLabel))}}function lt(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",24,1)(2,"tb-toggle-select",22)(3,"tb-toggle-option",23),t.ɵɵtext(4),t.ɵɵpipe(5,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(6,"tb-toggle-option",23),t.ɵɵtext(7),t.ɵɵpipe(8,"translate"),t.ɵɵelementEnd()(),t.ɵɵelementStart(9,"button",20),t.ɵɵpipe(10,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(11,"mat-icon",21),t.ɵɵtext(12,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(14,et))("disableUndefinedCheck",!0)("scriptLanguage",e.scriptLanguage.TBEL),t.ɵɵadvance(3),t.ɵɵproperty("value",e.scriptLanguage.TBEL),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(5,8,"tb.rulenode.script-lang-tbel")," "),t.ɵɵadvance(2),t.ɵɵproperty("value",e.scriptLanguage.JS),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(8,10,"tb.rulenode.script-lang-js")," "),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(10,12,e.testScriptLabel))}}class st extends i{constructor(e,t,r,a){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=r,this.translate=a,this.tbelEnabled=D(this.store).tbelEnabled,this.scriptLanguage=s,this.changeScript=new n,this.allowedEntityTypes=[u.DEVICE,u.ASSET,u.ENTITY_VIEW,u.CUSTOMER,u.USER,u.DASHBOARD],this.additionEntityTypes={TENANT:this.translate.instant("tb.rulenode.current-tenant"),RULE_NODE:this.translate.instant("tb.rulenode.current-rule-node")},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,[N.required,N.min(0)]],periodInSeconds:[e?e.periodInSeconds:null,[N.required,N.min(1)]],originator:[e?e.originator:{id:null,entityType:u.RULE_NODE},[]],scriptLang:[e?e.scriptLang:s.JS,[N.required]],jsScript:[e?e.jsScript:null,[]],tbelScript:[e?e.tbelScript:null,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.generatorConfigForm.get("scriptLang").value;t!==s.TBEL||this.tbelEnabled||(t=s.JS,this.generatorConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.generatorConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.generatorConfigForm.get("jsScript").setValidators(t===s.JS?[N.required]:[]),this.generatorConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.generatorConfigForm.get("tbelScript").setValidators(t===s.TBEL?[N.required]:[]),this.generatorConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return{msgCount:P(e?.msgCount)?e?.msgCount:0,periodInSeconds:P(e?.periodInSeconds)?e?.periodInSeconds:1,originator:{id:P(e?.originatorId)?e?.originatorId:null,entityType:P(e?.originatorType)?e?.originatorType:u.RULE_NODE},scriptLang:P(e?.scriptLang)?e?.scriptLang:s.JS,tbelScript:P(e?.tbelScript)?e?.tbelScript:null,jsScript:P(e?.jsScript)?e?.jsScript:null}}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===s.JS?"jsScript":"tbelScript",r=t===s.JS?"rulenode/generator_node_script_fn":"rulenode/tbel/generator_node_script_fn",a=this.generatorConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(a,"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===s.JS&&this.jsFuncComponent.validateOnSubmit()}static{this.ɵfac=function(e){return new(e||st)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder),t.ɵɵdirectiveInject(L.NodeScriptTestService),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:st,selectors:[["tb-action-node-generator-config"]],viewQuery:function(e,n){if(1&e&&(t.ɵɵviewQuery(Xe,5),t.ɵɵviewQuery(Ze,5)),2&e){let e;t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.jsFuncComponent=e.first),t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.tbelFuncComponent=e.first)}},features:[t.ɵɵInheritDefinitionFeature],decls:32,vars:12,consts:[["jsFuncComponent",""],["tbelFuncComponent",""],[1,"tb-form-panel","no-border","no-padding",3,"formGroup"],[1,"tb-form-panel","no-padding-bottom","stroked"],["translate","",1,"tb-form-panel-title"],[1,"tb-form-row","no-border","no-padding","tb-standard-fields","column-xs"],[1,"flex"],["translate",""],["required","","type","number","min","0","step","1","matInput","","formControlName","msgCount"],[4,"ngIf"],["required","","type","number","min","1","step","1","matInput","","formControlName","periodInSeconds"],["required","true","useAliasEntityTypes","true","formControlName","originator",1,"flex-1",3,"allowedEntityTypes","additionEntityTypes"],[1,"tb-form-panel","stroked"],["expanded","",1,"tb-settings"],["formControlName","jsScript","functionName","Generate","helpId","rulenode/generator_node_script_fn","noValidate","true",3,"functionArgs",4,"ngIf"],["formControlName","tbelScript","functionName","Generate","helpId","rulenode/tbel/generator_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage",4,"ngIf"],[1,"flex","flex-row",2,"padding-bottom","16px"],["mat-button","","mat-raised-button","","color","primary",3,"click"],["formControlName","jsScript","functionName","Generate","helpId","rulenode/generator_node_script_fn","noValidate","true",3,"functionArgs"],["toolbarPrefixButton","","formControlName","scriptLang","appearance","fill",4,"ngIf"],["toolbarSuffixButton","","mat-icon-button","","matTooltipPosition","above",1,"tb-mat-32",3,"click","matTooltip"],["color","primary",1,"material-icons"],["toolbarPrefixButton","","formControlName","scriptLang","appearance","fill"],[3,"value"],["formControlName","tbelScript","functionName","Generate","helpId","rulenode/tbel/generator_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",2)(1,"div",3)(2,"div",4),t.ɵɵtext(3,"tb.rulenode.generation-parameters"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"div",5)(5,"mat-form-field",6)(6,"mat-label",7),t.ɵɵtext(7,"tb.rulenode.message-count"),t.ɵɵelementEnd(),t.ɵɵelement(8,"input",8),t.ɵɵtemplate(9,tt,3,3,"mat-error",9)(10,nt,3,3,"mat-error",9),t.ɵɵelementEnd(),t.ɵɵelementStart(11,"mat-form-field",6)(12,"mat-label",7),t.ɵɵtext(13,"tb.rulenode.generation-frequency-seconds"),t.ɵɵelementEnd(),t.ɵɵelement(14,"input",10),t.ɵɵtemplate(15,rt,3,3,"mat-error",9)(16,at,3,3,"mat-error",9),t.ɵɵelementEnd()()(),t.ɵɵelementStart(17,"div",3)(18,"div",4),t.ɵɵtext(19,"tb.rulenode.originator"),t.ɵɵelementEnd(),t.ɵɵelement(20,"tb-entity-select",11),t.ɵɵelementEnd(),t.ɵɵelementStart(21,"div",12)(22,"mat-expansion-panel",13)(23,"mat-expansion-panel-header")(24,"mat-panel-title",7),t.ɵɵtext(25,"tb.rulenode.generator-function"),t.ɵɵelementEnd()(),t.ɵɵtemplate(26,ot,7,6,"tb-js-func",14)(27,lt,13,15,"tb-js-func",15),t.ɵɵelementStart(28,"div",16)(29,"button",17),t.ɵɵlistener("click",(function(){return n.testScript()})),t.ɵɵtext(30),t.ɵɵpipe(31,"translate"),t.ɵɵelementEnd()()()()()),2&e&&(t.ɵɵproperty("formGroup",n.generatorConfigForm),t.ɵɵadvance(9),t.ɵɵproperty("ngIf",n.generatorConfigForm.get("msgCount").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.generatorConfigForm.get("msgCount").hasError("min")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.generatorConfigForm.get("periodInSeconds").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.generatorConfigForm.get("periodInSeconds").hasError("min")),t.ɵɵadvance(4),t.ɵɵproperty("allowedEntityTypes",n.allowedEntityTypes)("additionEntityTypes",n.additionEntityTypes),t.ɵɵadvance(6),t.ɵɵproperty("ngIf",n.generatorConfigForm.get("scriptLang").value===n.scriptLanguage.JS),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.generatorConfigForm.get("scriptLang").value===n.scriptLanguage.TBEL),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(31,10,n.testScriptLabel)," "))},dependencies:t.ɵɵgetComponentDepsFactory(st),styles:["[_nghost-%COMP%]     .mat-button-toggle-group{min-width:120px;height:24px!important}[_nghost-%COMP%]     .mat-button-toggle-group .mat-button-toggle{font-size:0}[_nghost-%COMP%]     .mat-button-toggle-group .mat-button-toggle .mat-button-toggle-button{height:20px!important;line-height:20px!important;border:none!important}[_nghost-%COMP%]     .mat-button-toggle-group .mat-button-toggle .mat-button-toggle-button .mat-button-toggle-label-content{font-size:14px!important;line-height:20px!important}@media screen and (min-width: 599px){[_nghost-%COMP%]     .tb-entity-select{display:flex;flex-direction:row;gap:16px}}[_nghost-%COMP%]     .tb-entity-select tb-entity-type-select{flex:1}[_nghost-%COMP%]     .tb-entity-select tb-entity-autocomplete{flex:1}[_nghost-%COMP%]     .tb-entity-select tb-entity-autocomplete mat-form-field{width:100%!important}"]})}}var pt;e("GeneratorConfigComponent",st),function(e){e.CUSTOMER="CUSTOMER",e.TENANT="TENANT",e.RELATED="RELATED",e.ALARM_ORIGINATOR="ALARM_ORIGINATOR",e.ENTITY="ENTITY"}(pt||(pt={}));const mt=new Map([[pt.CUSTOMER,"tb.rulenode.originator-customer"],[pt.TENANT,"tb.rulenode.originator-tenant"],[pt.RELATED,"tb.rulenode.originator-related"],[pt.ALARM_ORIGINATOR,"tb.rulenode.originator-alarm-originator"],[pt.ENTITY,"tb.rulenode.originator-entity"]]),dt=new Map([[pt.CUSTOMER,"tb.rulenode.originator-customer-desc"],[pt.TENANT,"tb.rulenode.originator-tenant-desc"],[pt.RELATED,"tb.rulenode.originator-related-entity-desc"],[pt.ALARM_ORIGINATOR,"tb.rulenode.originator-alarm-originator-desc"],[pt.ENTITY,"tb.rulenode.originator-entity-by-name-pattern-desc"]]),ut=[c.createdTime,c.name,{value:"type",name:"tb.rulenode.profile-name",keyName:"originatorProfileName"},c.firstName,c.lastName,c.email,c.title,c.country,c.state,c.city,c.address,c.address2,c.zip,c.phone,c.label,{value:"id",name:"tb.rulenode.id",keyName:"id"},{value:"additionalInfo",name:"tb.rulenode.additional-info",keyName:"additionalInfo"}],ct=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 ft;!function(e){e.CIRCLE="CIRCLE",e.POLYGON="POLYGON"}(ft||(ft={}));const gt=new Map([[ft.CIRCLE,"tb.rulenode.perimeter-circle"],[ft.POLYGON,"tb.rulenode.perimeter-polygon"]]);var ht;!function(e){e.MILLISECONDS="MILLISECONDS",e.SECONDS="SECONDS",e.MINUTES="MINUTES",e.HOURS="HOURS",e.DAYS="DAYS"}(ht||(ht={}));const yt=new Map([[ht.MILLISECONDS,"tb.rulenode.time-unit-milliseconds"],[ht.SECONDS,"tb.rulenode.time-unit-seconds"],[ht.MINUTES,"tb.rulenode.time-unit-minutes"],[ht.HOURS,"tb.rulenode.time-unit-hours"],[ht.DAYS,"tb.rulenode.time-unit-days"]]);var bt;!function(e){e.METER="METER",e.KILOMETER="KILOMETER",e.FOOT="FOOT",e.MILE="MILE",e.NAUTICAL_MILE="NAUTICAL_MILE"}(bt||(bt={}));const vt=new Map([[bt.METER,"tb.rulenode.range-unit-meter"],[bt.KILOMETER,"tb.rulenode.range-unit-kilometer"],[bt.FOOT,"tb.rulenode.range-unit-foot"],[bt.MILE,"tb.rulenode.range-unit-mile"],[bt.NAUTICAL_MILE,"tb.rulenode.range-unit-nautical-mile"]]);var xt;!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"}(xt||(xt={}));const Ct=new Map([[xt.ID,"tb.rulenode.entity-details-id"],[xt.TITLE,"tb.rulenode.entity-details-title"],[xt.COUNTRY,"tb.rulenode.entity-details-country"],[xt.STATE,"tb.rulenode.entity-details-state"],[xt.CITY,"tb.rulenode.entity-details-city"],[xt.ZIP,"tb.rulenode.entity-details-zip"],[xt.ADDRESS,"tb.rulenode.entity-details-address"],[xt.ADDRESS2,"tb.rulenode.entity-details-address2"],[xt.PHONE,"tb.rulenode.entity-details-phone"],[xt.EMAIL,"tb.rulenode.entity-details-email"],[xt.ADDITIONAL_INFO,"tb.rulenode.entity-details-additional_info"]]);var St;!function(e){e.FIRST="FIRST",e.LAST="LAST",e.ALL="ALL"}(St||(St={}));const Tt=new Map([[St.FIRST,"tb.rulenode.first"],[St.LAST,"tb.rulenode.last"],[St.ALL,"tb.rulenode.all"]]),It=new Map([[St.FIRST,"tb.rulenode.first-mode-hint"],[St.LAST,"tb.rulenode.last-mode-hint"],[St.ALL,"tb.rulenode.all-mode-hint"]]);var Et,Ft;!function(e){e.ASC="ASC",e.DESC="DESC"}(Et||(Et={})),function(e){e.ATTRIBUTES="ATTRIBUTES",e.LATEST_TELEMETRY="LATEST_TELEMETRY",e.FIELDS="FIELDS"}(Ft||(Ft={}));const qt=new Map([[Ft.ATTRIBUTES,"tb.rulenode.attributes"],[Ft.LATEST_TELEMETRY,"tb.rulenode.latest-telemetry"],[Ft.FIELDS,"tb.rulenode.fields"]]),At=new Map([[Ft.ATTRIBUTES,"tb.rulenode.add-mapped-attribute-to"],[Ft.LATEST_TELEMETRY,"tb.rulenode.add-mapped-latest-telemetry-to"],[Ft.FIELDS,"tb.rulenode.add-mapped-fields-to"]]),kt=new Map([[Et.ASC,"tb.rulenode.ascending"],[Et.DESC,"tb.rulenode.descending"]]);var Nt;!function(e){e.STANDARD="STANDARD",e.FIFO="FIFO"}(Nt||(Nt={}));const wt=new Map([[Nt.STANDARD,"tb.rulenode.sqs-queue-standard"],[Nt.FIFO,"tb.rulenode.sqs-queue-fifo"]]),Mt=["anonymous","basic","cert.PEM"],Bt=new Map([["anonymous","tb.rulenode.credentials-anonymous"],["basic","tb.rulenode.credentials-basic"],["cert.PEM","tb.rulenode.credentials-pem"]]),Vt=["sas","cert.PEM"],Ot=new Map([["sas","tb.rulenode.credentials-sas"],["cert.PEM","tb.rulenode.credentials-pem"]]);var Dt;!function(e){e.GET="GET",e.POST="POST",e.PUT="PUT",e.DELETE="DELETE"}(Dt||(Dt={}));const Lt=["US-ASCII","ISO-8859-1","UTF-8","UTF-16BE","UTF-16LE","UTF-16"],Pt=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 Rt;!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"}(Rt||(Rt={}));const _t=new Map([[Rt.CUSTOM,{value:Rt.CUSTOM,name:"Custom Function",description:"Use this function to specify complex mathematical expression.",minArgs:1,maxArgs:16}],[Rt.ADD,{value:Rt.ADD,name:"Addition",description:"x + y",minArgs:2,maxArgs:2}],[Rt.SUB,{value:Rt.SUB,name:"Subtraction",description:"x - y",minArgs:2,maxArgs:2}],[Rt.MULT,{value:Rt.MULT,name:"Multiplication",description:"x * y",minArgs:2,maxArgs:2}],[Rt.DIV,{value:Rt.DIV,name:"Division",description:"x / y",minArgs:2,maxArgs:2}],[Rt.SIN,{value:Rt.SIN,name:"Sine",description:"Returns the trigonometric sine of an angle in radians.",minArgs:1,maxArgs:1}],[Rt.SINH,{value:Rt.SINH,name:"Hyperbolic sine",description:"Returns the hyperbolic sine of an argument.",minArgs:1,maxArgs:1}],[Rt.COS,{value:Rt.COS,name:"Cosine",description:"Returns the trigonometric cosine of an angle in radians.",minArgs:1,maxArgs:1}],[Rt.COSH,{value:Rt.COSH,name:"Hyperbolic cosine",description:"Returns the hyperbolic cosine of an argument.",minArgs:1,maxArgs:1}],[Rt.TAN,{value:Rt.TAN,name:"Tangent",description:"Returns the trigonometric tangent of an angle in radians",minArgs:1,maxArgs:1}],[Rt.TANH,{value:Rt.TANH,name:"Hyperbolic tangent",description:"Returns the hyperbolic tangent of an argument",minArgs:1,maxArgs:1}],[Rt.ACOS,{value:Rt.ACOS,name:"Arc cosine",description:"Returns the arc cosine of an argument",minArgs:1,maxArgs:1}],[Rt.ASIN,{value:Rt.ASIN,name:"Arc sine",description:"Returns the arc sine of an argument",minArgs:1,maxArgs:1}],[Rt.ATAN,{value:Rt.ATAN,name:"Arc tangent",description:"Returns the arc tangent of an argument",minArgs:1,maxArgs:1}],[Rt.ATAN2,{value:Rt.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}],[Rt.EXP,{value:Rt.EXP,name:"Exponential",description:"Returns Euler's number e raised to the power of an argument",minArgs:1,maxArgs:1}],[Rt.EXPM1,{value:Rt.EXPM1,name:"Exponential minus one",description:"Returns Euler's number e raised to the power of an argument minus one",minArgs:1,maxArgs:1}],[Rt.SQRT,{value:Rt.SQRT,name:"Square",description:"Returns the correctly rounded positive square root of an argument",minArgs:1,maxArgs:1}],[Rt.CBRT,{value:Rt.CBRT,name:"Cube root",description:"Returns the cube root of an argument",minArgs:1,maxArgs:1}],[Rt.GET_EXP,{value:Rt.GET_EXP,name:"Get exponent",description:"Returns the unbiased exponent used in the representation of an argument",minArgs:1,maxArgs:1}],[Rt.HYPOT,{value:Rt.HYPOT,name:"Square root",description:"Returns the square root of the squares of the arguments",minArgs:2,maxArgs:2}],[Rt.LOG,{value:Rt.LOG,name:"Logarithm",description:"Returns the natural logarithm of an argument",minArgs:1,maxArgs:1}],[Rt.LOG10,{value:Rt.LOG10,name:"Base 10 logarithm",description:"Returns the base 10 logarithm of an argument",minArgs:1,maxArgs:1}],[Rt.LOG1P,{value:Rt.LOG1P,name:"Logarithm of the sum",description:"Returns the natural logarithm of the sum of an argument",minArgs:1,maxArgs:1}],[Rt.CEIL,{value:Rt.CEIL,name:"Ceiling",description:"Returns the smallest (closest to negative infinity) of an argument",minArgs:1,maxArgs:1}],[Rt.FLOOR,{value:Rt.FLOOR,name:"Floor",description:"Returns the largest (closest to positive infinity) of an argument",minArgs:1,maxArgs:1}],[Rt.FLOOR_DIV,{value:Rt.FLOOR_DIV,name:"Floor division",description:"Returns the largest (closest to positive infinity) of the arguments",minArgs:2,maxArgs:2}],[Rt.FLOOR_MOD,{value:Rt.FLOOR_MOD,name:"Floor modulus",description:"Returns the floor modulus of the arguments",minArgs:2,maxArgs:2}],[Rt.ABS,{value:Rt.ABS,name:"Absolute",description:"Returns the absolute value of an argument",minArgs:1,maxArgs:1}],[Rt.MIN,{value:Rt.MIN,name:"Min",description:"Returns the smaller of the arguments",minArgs:2,maxArgs:2}],[Rt.MAX,{value:Rt.MAX,name:"Max",description:"Returns the greater of the arguments",minArgs:2,maxArgs:2}],[Rt.POW,{value:Rt.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}],[Rt.SIGNUM,{value:Rt.SIGNUM,name:"Sign of a real number",description:"Returns the signum function of the argument",minArgs:1,maxArgs:1}],[Rt.RAD,{value:Rt.RAD,name:"Radian",description:"Converts an angle measured in degrees to an approximately equivalent angle measured in radians",minArgs:1,maxArgs:1}],[Rt.DEG,{value:Rt.DEG,name:"Degrees",description:"Converts an angle measured in radians to an approximately equivalent angle measured in degrees.",minArgs:1,maxArgs:1}]]);var jt,Gt,Kt;!function(e){e.MESSAGE_BODY="MESSAGE_BODY",e.MESSAGE_METADATA="MESSAGE_METADATA",e.ATTRIBUTE="ATTRIBUTE",e.TIME_SERIES="TIME_SERIES",e.CONSTANT="CONSTANT"}(jt||(jt={})),function(e){e.MESSAGE_BODY="MESSAGE_BODY",e.MESSAGE_METADATA="MESSAGE_METADATA",e.ATTRIBUTE="ATTRIBUTE",e.TIME_SERIES="TIME_SERIES"}(Gt||(Gt={})),function(e){e.DATA="DATA",e.METADATA="METADATA"}(Kt||(Kt={}));const Ut=new Map([[Kt.DATA,"tb.rulenode.message-to-metadata"],[Kt.METADATA,"tb.rulenode.metadata-to-message"]]),Ht=(new Map([[Kt.DATA,"tb.rulenode.from-message"],[Kt.METADATA,"tb.rulenode.from-metadata"]]),new Map([[Kt.DATA,"tb.rulenode.message"],[Kt.METADATA,"tb.rulenode.metadata"]])),zt=new Map([[Kt.DATA,"tb.rulenode.message"],[Kt.METADATA,"tb.rulenode.message-metadata"]]),$t=new Map([[jt.MESSAGE_BODY,{name:"tb.rulenode.message-body-type",description:"Fetch argument value from incoming message"}],[jt.MESSAGE_METADATA,{name:"tb.rulenode.message-metadata-type",description:"Fetch argument value from incoming message metadata"}],[jt.ATTRIBUTE,{name:"tb.rulenode.attribute-type",description:"Fetch attribute value from database"}],[jt.TIME_SERIES,{name:"tb.rulenode.time-series-type",description:"Fetch latest time-series value from database"}],[jt.CONSTANT,{name:"tb.rulenode.constant-type",description:"Define constant value"}]]),Qt=new Map([[Gt.MESSAGE_BODY,{name:"tb.rulenode.message-body-type",description:"Add result to the outgoing message"}],[Gt.MESSAGE_METADATA,{name:"tb.rulenode.message-metadata-type",description:"Add result to the outgoing message metadata"}],[Gt.ATTRIBUTE,{name:"tb.rulenode.attribute-type",description:"Store result as an entity attribute in the database"}],[Gt.TIME_SERIES,{name:"tb.rulenode.time-series-type",description:"Store result as an entity time-series in the database"}]]),Jt=["x","y","z","a","b","c","d","k","l","m","n","o","p","r","s","t"];var Yt,Wt;!function(e){e.SHARED_SCOPE="SHARED_SCOPE",e.SERVER_SCOPE="SERVER_SCOPE",e.CLIENT_SCOPE="CLIENT_SCOPE"}(Yt||(Yt={})),function(e){e.SHARED_SCOPE="SHARED_SCOPE",e.SERVER_SCOPE="SERVER_SCOPE"}(Wt||(Wt={}));const Xt=new Map([[Yt.SHARED_SCOPE,"tb.rulenode.shared-scope"],[Yt.SERVER_SCOPE,"tb.rulenode.server-scope"],[Yt.CLIENT_SCOPE,"tb.rulenode.client-scope"]]);var Zt;!function(e){e.ON_FIRST_MESSAGE="ON_FIRST_MESSAGE",e.ON_EACH_MESSAGE="ON_EACH_MESSAGE"}(Zt||(Zt={}));const en=new Map([[Zt.ON_EACH_MESSAGE,{value:!0,name:"tb.rulenode.presence-monitoring-strategy-on-each-message"}],[Zt.ON_FIRST_MESSAGE,{value:!1,name:"tb.rulenode.presence-monitoring-strategy-on-first-message"}]]),tn=2147483648,nn=e=>({perimeterKeyName:e});function rn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.latitude-field-name-required")," "))}function an(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.longitude-field-name-required")," "))}function on(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",22),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.perimeterTypeTranslationMap.get(e))," ")}}function ln(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.perimeter-key-name-required")," "))}function sn(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",23)(1,"mat-label"),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",24),t.ɵɵtemplate(5,ln,3,3,"mat-error",6),t.ɵɵelementStart(6,"mat-hint"),t.ɵɵtext(7),t.ɵɵpipe(8,"translate"),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(2),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(3,3,"tb.rulenode.perimeter-key-name")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.geoActionConfigForm.get("perimeterKeyName").hasError("required")),t.ɵɵadvance(2),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(8,5,"tb.rulenode.perimeter-key-name-hint"))}}function pn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.circle-center-latitude-required")," "))}function mn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.circle-center-longitude-required")," "))}function dn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.range-required")," "))}function un(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",22),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(2);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.rangeUnitTranslationMap.get(e))," ")}}function cn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.range-units-required")," "))}function fn(e,n){if(1&e&&(t.ɵɵelementStart(0,"div",9)(1,"div",3)(2,"mat-form-field",25)(3,"mat-label"),t.ɵɵtext(4),t.ɵɵpipe(5,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(6,"input",26),t.ɵɵtemplate(7,pn,3,3,"mat-error",6),t.ɵɵelementEnd(),t.ɵɵelementStart(8,"mat-form-field",25)(9,"mat-label"),t.ɵɵtext(10),t.ɵɵpipe(11,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(12,"input",27),t.ɵɵtemplate(13,mn,3,3,"mat-error",6),t.ɵɵelementEnd()(),t.ɵɵelementStart(14,"div",3)(15,"mat-form-field",25)(16,"mat-label"),t.ɵɵtext(17),t.ɵɵpipe(18,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(19,"input",28),t.ɵɵtemplate(20,dn,3,3,"mat-error",6),t.ɵɵelementEnd(),t.ɵɵelementStart(21,"mat-form-field",25)(22,"mat-label"),t.ɵɵtext(23),t.ɵɵpipe(24,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(25,"mat-select",29),t.ɵɵtemplate(26,un,3,4,"mat-option",12),t.ɵɵelementEnd(),t.ɵɵtemplate(27,cn,3,3,"mat-error",6),t.ɵɵelementEnd()()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(5,9,"tb.rulenode.circle-center-latitude")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.geoActionConfigForm.get("centerLatitude").hasError("required")),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(11,11,"tb.rulenode.circle-center-longitude")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.geoActionConfigForm.get("centerLongitude").hasError("required")),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(18,13,"tb.rulenode.range")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.geoActionConfigForm.get("range").hasError("required")),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(24,15,"tb.rulenode.range-units")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",e.rangeUnits),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.geoActionConfigForm.get("rangeUnit").hasError("required"))}}function gn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.polygon-definition-required")," "))}function hn(e,n){if(1&e&&(t.ɵɵelementStart(0,"div",9)(1,"mat-form-field",30)(2,"mat-label",31),t.ɵɵtext(3,"tb.rulenode.polygon-definition"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",32),t.ɵɵelementStart(5,"mat-icon",33),t.ɵɵpipe(6,"translate"),t.ɵɵtext(7," help "),t.ɵɵelementEnd(),t.ɵɵtemplate(8,gn,3,3,"mat-error",6),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(5),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(6,2,"tb.rulenode.polygon-definition-hint")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.geoActionConfigForm.get("polygonsDefinition").hasError("required"))}}function yn(e,n){if(1&e&&(t.ɵɵelementStart(0,"tb-toggle-option",22),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",r.presenceMonitoringStrategies.get(e).value),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.presenceMonitoringStrategies.get(e).name)," ")}}function bn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-inside-duration-value-required")," "))}function vn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.time-value-range")," "))}function xn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.time-value-range")," "))}function Cn(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",22),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(2);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.timeUnitsTranslationMap.get(e))," ")}}function Sn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-outside-duration-value-required")," "))}function Tn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.time-value-range")," "))}function In(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.time-value-range")," "))}function En(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",22),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(2);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.timeUnitsTranslationMap.get(e))," ")}}function Fn(e,n){if(1&e&&(t.ɵɵelementStart(0,"div")(1,"div",34)(2,"mat-form-field",35)(3,"mat-label",31),t.ɵɵtext(4,"tb.rulenode.min-inside-duration"),t.ɵɵelementEnd(),t.ɵɵelement(5,"input",36),t.ɵɵtemplate(6,bn,3,3,"mat-error",6)(7,vn,3,3,"mat-error",6)(8,xn,3,3,"mat-error",6),t.ɵɵelementEnd(),t.ɵɵelementStart(9,"mat-form-field",35)(10,"mat-label",31),t.ɵɵtext(11,"tb.rulenode.min-inside-duration-time-unit"),t.ɵɵelementEnd(),t.ɵɵelementStart(12,"mat-select",37),t.ɵɵtemplate(13,Cn,3,4,"mat-option",12),t.ɵɵelementEnd()()(),t.ɵɵelementStart(14,"div",34)(15,"mat-form-field",35)(16,"mat-label",31),t.ɵɵtext(17,"tb.rulenode.min-outside-duration"),t.ɵɵelementEnd(),t.ɵɵelement(18,"input",38),t.ɵɵtemplate(19,Sn,3,3,"mat-error",6)(20,Tn,3,3,"mat-error",6)(21,In,3,3,"mat-error",6),t.ɵɵelementEnd(),t.ɵɵelementStart(22,"mat-form-field",35)(23,"mat-label",31),t.ɵɵtext(24,"tb.rulenode.min-outside-duration-time-unit"),t.ɵɵelementEnd(),t.ɵɵelementStart(25,"mat-select",39),t.ɵɵtemplate(26,En,3,4,"mat-option",12),t.ɵɵelementEnd()()()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(6),t.ɵɵproperty("ngIf",e.geoActionConfigForm.get("minInsideDuration").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.geoActionConfigForm.get("minInsideDuration").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.geoActionConfigForm.get("minInsideDuration").hasError("max")),t.ɵɵadvance(5),t.ɵɵproperty("ngForOf",e.timeUnits),t.ɵɵadvance(6),t.ɵɵproperty("ngIf",e.geoActionConfigForm.get("minOutsideDuration").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.geoActionConfigForm.get("minOutsideDuration").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.geoActionConfigForm.get("minOutsideDuration").hasError("max")),t.ɵɵadvance(5),t.ɵɵproperty("ngForOf",e.timeUnits)}}class qn extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.perimeterType=ft,this.perimeterTypes=Object.keys(ft),this.perimeterTypeTranslationMap=gt,this.rangeUnits=Object.keys(bt),this.rangeUnitTranslationMap=vt,this.presenceMonitoringStrategies=en,this.presenceMonitoringStrategyKeys=Array.from(this.presenceMonitoringStrategies.keys()),this.timeUnits=Object.keys(ht),this.timeUnitsTranslationMap=yt,this.defaultPaddingEnable=!0}configForm(){return this.geoActionConfigForm}onConfigurationSet(e){this.geoActionConfigForm=this.fb.group({reportPresenceStatusOnEachMessage:[!e||e.reportPresenceStatusOnEachMessage,[N.required]],latitudeKeyName:[e?e.latitudeKeyName:null,[N.required]],longitudeKeyName:[e?e.longitudeKeyName:null,[N.required]],perimeterType:[e?e.perimeterType:null,[N.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,[N.required,N.min(1),N.max(2147483647)]],minInsideDurationTimeUnit:[e?e.minInsideDurationTimeUnit:null,[N.required]],minOutsideDuration:[e?e.minOutsideDuration:null,[N.required,N.min(1),N.max(2147483647)]],minOutsideDurationTimeUnit:[e?e.minOutsideDurationTimeUnit:null,[N.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([N.required]):this.geoActionConfigForm.get("perimeterKeyName").setValidators([]),t||n!==ft.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([N.required,N.min(-90),N.max(90)]),this.geoActionConfigForm.get("centerLongitude").setValidators([N.required,N.min(-180),N.max(180)]),this.geoActionConfigForm.get("range").setValidators([N.required,N.min(0)]),this.geoActionConfigForm.get("rangeUnit").setValidators([N.required]),this.defaultPaddingEnable=!1),t||n!==ft.POLYGON?this.geoActionConfigForm.get("polygonsDefinition").setValidators([]):this.geoActionConfigForm.get("polygonsDefinition").setValidators([N.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})}static{this.ɵfac=function(e){return new(e||qn)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:qn,selectors:[["tb-action-node-gps-geofencing-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:52,vars:42,consts:[[1,"tb-form-panel","no-border","no-padding",3,"formGroup"],[1,"tb-form-panel","stroked"],["translate","",1,"tb-form-panel-title"],[1,"flex","flex-row","gap-4"],[1,"mat-block","max-w-50%","flex-full"],["matInput","","formControlName","latitudeKeyName","required",""],[4,"ngIf"],["matInput","","formControlName","longitudeKeyName","required",""],["translate","",1,"tb-form-hint","tb-primary-fill"],[1,"flex","flex-col"],["hideRequiredMarker","",1,"mat-block","flex-1"],["formControlName","perimeterType"],[3,"value",4,"ngFor","ngForOf"],[1,"tb-form-row","no-border","no-padding","slide-toggle",3,"tb-hint-tooltip-icon"],["formControlName","fetchPerimeterInfoFromMessageMetadata",1,"mat-slide"],["class","mat-block",4,"ngIf"],["class","flex flex-col",4,"ngIf"],[1,"tb-form-panel","stroked","no-padding-bottom"],[1,"flex","flex-col","items-stretch","justify-between","gt-sm:flex-row","lt-md:gap-4"],[1,"tb-form-panel-title"],["formControlName","reportPresenceStatusOnEachMessage","appearance","fill",1,"fetch-to-data-toggle"],[1,"tb-form-hint","tb-primary-fill"],[3,"value"],[1,"mat-block"],["matInput","","formControlName","perimeterKeyName","required",""],[1,"flex-1"],["type","number","min","-90","max","90","step","0.1","matInput","","formControlName","centerLatitude","required",""],["type","number","min","-180","max","180","step","0.1","matInput","","formControlName","centerLongitude","required",""],["type","number","min","0","step","0.1","matInput","","formControlName","range","required",""],["formControlName","rangeUnit","required",""],["subscriptSizing","dynamic",1,"mat-block"],["translate",""],["matInput","","formControlName","polygonsDefinition","required",""],["matSuffix","","aria-hidden","false","aria-label","help-icon","color","primary",1,"margin-8","cursor-pointer",3,"matTooltip"],[1,"flex","flex-col","gt-sm:flex-row","gt-sm:gap-2"],[1,"mat-block","flex-1"],["type","number","step","1","min","1","max","2147483647","matInput","","formControlName","minInsideDuration","required",""],["formControlName","minInsideDurationTimeUnit","required",""],["type","number","step","1","min","1","max","2147483647","matInput","","formControlName","minOutsideDuration","required",""],["formControlName","minOutsideDurationTimeUnit","required",""]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"section",1)(2,"div",2),t.ɵɵtext(3,"tb.rulenode.coordinate-field-names"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"section")(5,"div",3)(6,"mat-form-field",4)(7,"mat-label"),t.ɵɵtext(8),t.ɵɵpipe(9,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(10,"input",5),t.ɵɵtemplate(11,rn,3,3,"mat-error",6),t.ɵɵelementEnd(),t.ɵɵelementStart(12,"mat-form-field",4)(13,"mat-label"),t.ɵɵtext(14),t.ɵɵpipe(15,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(16,"input",7),t.ɵɵtemplate(17,an,3,3,"mat-error",6),t.ɵɵelementEnd()(),t.ɵɵelementStart(18,"div",8),t.ɵɵtext(19,"tb.rulenode.coordinate-field-hint"),t.ɵɵelementEnd()()(),t.ɵɵelementStart(20,"section",1)(21,"div",2),t.ɵɵtext(22,"tb.rulenode.geofence-configuration"),t.ɵɵelementEnd(),t.ɵɵelementStart(23,"section",9)(24,"mat-form-field",10)(25,"mat-label"),t.ɵɵtext(26),t.ɵɵpipe(27,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(28,"mat-select",11),t.ɵɵtemplate(29,on,3,4,"mat-option",12),t.ɵɵelementEnd()(),t.ɵɵelementStart(30,"div",13),t.ɵɵpipe(31,"translate"),t.ɵɵpipe(32,"translate"),t.ɵɵelementStart(33,"mat-slide-toggle",14),t.ɵɵtext(34),t.ɵɵpipe(35,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(36,sn,9,7,"mat-form-field",15)(37,fn,28,17,"div",16)(38,hn,9,4,"div",16),t.ɵɵelementEnd()(),t.ɵɵelementStart(39,"section",17)(40,"div",18)(41,"div",19),t.ɵɵtext(42),t.ɵɵpipe(43,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(44,"tb-toggle-select",20),t.ɵɵtemplate(45,yn,3,4,"tb-toggle-option",12),t.ɵɵelementEnd()(),t.ɵɵelementStart(46,"div",21),t.ɵɵtext(47),t.ɵɵpipe(48,"translate"),t.ɵɵpipe(49,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(50,"section",9),t.ɵɵtemplate(51,Fn,27,8,"div",6),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.geoActionConfigForm),t.ɵɵadvance(8),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(9,18,"tb.rulenode.latitude-field-name")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.geoActionConfigForm.get("latitudeKeyName").hasError("required")),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(15,20,"tb.rulenode.longitude-field-name")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.geoActionConfigForm.get("longitudeKeyName").hasError("required")),t.ɵɵadvance(3),t.ɵɵclassProp("no-padding-bottom",!n.defaultPaddingEnable),t.ɵɵadvance(6),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(27,22,"tb.rulenode.perimeter-type")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.perimeterTypes),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",n.geoActionConfigForm.get("perimeterType").value===n.perimeterType.CIRCLE?t.ɵɵpipeBind2(31,24,"tb.rulenode.fetch-circle-parameter-info-from-metadata-hint",t.ɵɵpureFunction1(38,nn,n.geoActionConfigForm.get("perimeterKeyName").valid?n.geoActionConfigForm.get("perimeterKeyName").value:"ss_perimeter")):t.ɵɵpipeBind2(32,27,"tb.rulenode.fetch-poligon-parameter-info-from-metadata-hint",t.ɵɵpureFunction1(40,nn,n.geoActionConfigForm.get("perimeterKeyName").valid?n.geoActionConfigForm.get("perimeterKeyName").value:"ss_perimeter"))),t.ɵɵadvance(4),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(35,30,"tb.rulenode.fetch-perimeter-info-from-metadata")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.geoActionConfigForm.get("fetchPerimeterInfoFromMessageMetadata").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.geoActionConfigForm.get("perimeterType").value===n.perimeterType.CIRCLE&&!n.geoActionConfigForm.get("fetchPerimeterInfoFromMessageMetadata").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.geoActionConfigForm.get("perimeterType").value===n.perimeterType.POLYGON&&!n.geoActionConfigForm.get("fetchPerimeterInfoFromMessageMetadata").value),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(43,32,"tb.rulenode.presence-monitoring-strategy")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.presenceMonitoringStrategyKeys),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",!1===n.geoActionConfigForm.get("reportPresenceStatusOnEachMessage").value?t.ɵɵpipeBind1(48,34,"tb.rulenode.presence-monitoring-strategy-on-first-message-hint"):t.ɵɵpipeBind1(49,36,"tb.rulenode.presence-monitoring-strategy-on-each-message-hint")," "),t.ɵɵadvance(4),t.ɵɵproperty("ngIf",!1===n.geoActionConfigForm.get("reportPresenceStatusOnEachMessage").value))},dependencies:t.ɵɵgetComponentDepsFactory(qn),styles:["[_nghost-%COMP%]   .slide-toggle[_ngcontent-%COMP%]{margin-bottom:18px}"]})}}e("GpsGeoActionConfigComponent",qn);const An=["jsFuncComponent"],kn=["tbelFuncComponent"],Nn=()=>["msg","metadata","msgType"];function wn(e,n){1&e&&t.ɵɵelement(0,"tb-script-lang",8)}function Mn(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",9,0)(2,"button",10),t.ɵɵpipe(3,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(4,"mat-icon",11),t.ɵɵtext(5,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(4,Nn)),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(3,2,e.testScriptLabel))}}function Bn(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",12,1)(2,"button",10),t.ɵɵpipe(3,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(4,"mat-icon",11),t.ɵɵtext(5,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(6,Nn))("disableUndefinedCheck",!0)("scriptLanguage",e.scriptLanguage.TBEL),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(3,4,e.testScriptLabel))}}class Vn extends i{constructor(e,t,r,a){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=r,this.translate=a,this.tbelEnabled=D(this.store).tbelEnabled,this.scriptLanguage=s,this.changeScript=new n,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:s.JS,[N.required]],jsScript:[e?e.jsScript:null,[]],tbelScript:[e?e.tbelScript:null,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.logConfigForm.get("scriptLang").value;t!==s.TBEL||this.tbelEnabled||(t=s.JS,this.logConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.logConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.logConfigForm.get("jsScript").setValidators(t===s.JS?[N.required]:[]),this.logConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.logConfigForm.get("tbelScript").setValidators(t===s.TBEL?[N.required]:[]),this.logConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=s.JS)),e}testScript(e){const t=this.logConfigForm.get("scriptLang").value,n=t===s.JS?"jsScript":"tbelScript",r=t===s.JS?"rulenode/log_node_script_fn":"rulenode/tbel/log_node_script_fn",a=this.logConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(a,"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===s.JS&&this.jsFuncComponent.validateOnSubmit()}static{this.ɵfac=function(e){return new(e||Vn)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder),t.ɵɵdirectiveInject(L.NodeScriptTestService),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Vn,selectors:[["tb-action-node-log-config"]],viewQuery:function(e,n){if(1&e&&(t.ɵɵviewQuery(An,5),t.ɵɵviewQuery(kn,5)),2&e){let e;t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.jsFuncComponent=e.first),t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.tbelFuncComponent=e.first)}},features:[t.ɵɵInheritDefinitionFeature],decls:8,vars:7,consts:[["jsFuncComponent",""],["tbelFuncComponent",""],[1,"flex","flex-col",3,"formGroup"],["formControlName","scriptLang",4,"ngIf"],["formControlName","jsScript","functionName","ToString","helpId","rulenode/log_node_script_fn","noValidate","true",3,"functionArgs",4,"ngIf"],["formControlName","tbelScript","functionName","ToString","helpId","rulenode/tbel/log_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage",4,"ngIf"],[1,"flex","flex-row"],["mat-button","","mat-raised-button","","color","primary",3,"click"],["formControlName","scriptLang"],["formControlName","jsScript","functionName","ToString","helpId","rulenode/log_node_script_fn","noValidate","true",3,"functionArgs"],["toolbarSuffixButton","","mat-icon-button","","matTooltipPosition","above",1,"tb-mat-32",3,"click","matTooltip"],["color","primary",1,"material-icons"],["formControlName","tbelScript","functionName","ToString","helpId","rulenode/tbel/log_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",2),t.ɵɵtemplate(1,wn,1,0,"tb-script-lang",3)(2,Mn,6,5,"tb-js-func",4)(3,Bn,6,7,"tb-js-func",5),t.ɵɵelementStart(4,"div",6)(5,"button",7),t.ɵɵlistener("click",(function(){return n.testScript()})),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.logConfigForm),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.tbelEnabled),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.logConfigForm.get("scriptLang").value===n.scriptLanguage.JS),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.logConfigForm.get("scriptLang").value===n.scriptLanguage.TBEL),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(7,5,n.testScriptLabel)," "))},dependencies:t.ɵɵgetComponentDepsFactory(Vn),encapsulation:2})}}function On(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.interval-seconds-required")," "))}function Dn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-interval-seconds-message")," "))}function Ln(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.output-timeseries-key-prefix-required")," "))}e("LogConfigComponent",Vn);class Pn extends i{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,[N.required,N.min(1)]],telemetryPrefix:[e?e.telemetryPrefix:null,[N.required]]})}static{this.ɵfac=function(e){return new(e||Pn)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Pn,selectors:[["tb-action-node-msg-count-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:12,vars:4,consts:[[1,"flex","flex-col",3,"formGroup"],[1,"mat-block"],["translate",""],["required","","type","number","min","1","step","1","matInput","","formControlName","interval"],[4,"ngIf"],["required","","matInput","","formControlName","telemetryPrefix"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.interval-seconds"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵtemplate(5,On,3,3,"mat-error",4)(6,Dn,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(7,"mat-form-field",1)(8,"mat-label",2),t.ɵɵtext(9,"tb.rulenode.output-timeseries-key-prefix"),t.ɵɵelementEnd(),t.ɵɵelement(10,"input",5),t.ɵɵtemplate(11,Ln,3,3,"mat-error",4),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.msgCountConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.msgCountConfigForm.get("interval").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.msgCountConfigForm.get("interval").hasError("min")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.msgCountConfigForm.get("telemetryPrefix").hasError("required")))},dependencies:t.ɵɵgetComponentDepsFactory(Pn),encapsulation:2})}}function Rn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.period-seconds-required")," "))}function _n(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-period-0-seconds-message")," "))}function jn(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",5)(1,"mat-label",6),t.ɵɵtext(2,"tb.rulenode.period-seconds"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",9),t.ɵɵtemplate(4,Rn,3,3,"mat-error",8)(5,_n,3,3,"mat-error",8),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(4),t.ɵɵproperty("ngIf",e.msgDelayConfigForm.get("periodInSeconds").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.msgDelayConfigForm.get("periodInSeconds").hasError("min"))}}function Gn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.period-in-seconds-pattern-required")," "))}function Kn(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",10)(1,"mat-label",6),t.ɵɵtext(2,"tb.rulenode.period-in-seconds-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",11),t.ɵɵtemplate(4,Gn,3,3,"mat-error",8),t.ɵɵelementStart(5,"mat-hint",6),t.ɵɵtext(6,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(4),t.ɵɵproperty("ngIf",e.msgDelayConfigForm.get("periodInSecondsPattern").hasError("required"))}}function Un(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-pending-messages-required")," "))}function Hn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-pending-messages-range")," "))}function zn(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-pending-messages-range")," "))}e("MsgCountConfigComponent",Pn);class $n extends i{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,[N.required,N.min(1),N.max(1e5)]]})}validatorTriggers(){return["useMetadataPeriodInSecondsPatterns"]}updateValidators(e){this.msgDelayConfigForm.get("useMetadataPeriodInSecondsPatterns").value?(this.msgDelayConfigForm.get("periodInSecondsPattern").setValidators([N.required]),this.msgDelayConfigForm.get("periodInSeconds").setValidators([])):(this.msgDelayConfigForm.get("periodInSecondsPattern").setValidators([]),this.msgDelayConfigForm.get("periodInSeconds").setValidators([N.required,N.min(0)])),this.msgDelayConfigForm.get("periodInSecondsPattern").updateValueAndValidity({emitEvent:e}),this.msgDelayConfigForm.get("periodInSeconds").updateValueAndValidity({emitEvent:e})}static{this.ɵfac=function(e){return new(e||$n)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:$n,selectors:[["tb-action-node-msg-delay-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:16,vars:9,consts:[["periodInSecondsPattern",""],[1,"flex","flex-col",3,"formGroup"],["formControlName","useMetadataPeriodInSecondsPatterns"],["translate","",1,"tb-hint"],["class","mat-block",4,"ngIf","ngIfElse"],[1,"mat-block"],["translate",""],["required","","type","number","min","1","max","100000","step","1","matInput","","formControlName","maxPendingMsgs"],[4,"ngIf"],["required","","type","number","min","0","step","1","matInput","","formControlName","periodInSeconds"],["subscriptSizing","dynamic",1,"mat-block"],["required","","matInput","","formControlName","periodInSecondsPattern"]],template:function(e,n){if(1&e&&(t.ɵɵelementStart(0,"section",1)(1,"mat-checkbox",2),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"div",3),t.ɵɵtext(5,"tb.rulenode.use-metadata-period-in-seconds-patterns-hint"),t.ɵɵelementEnd(),t.ɵɵtemplate(6,jn,6,2,"mat-form-field",4)(7,Kn,7,1,"ng-template",null,0,t.ɵɵtemplateRefExtractor),t.ɵɵelementStart(9,"mat-form-field",5)(10,"mat-label",6),t.ɵɵtext(11,"tb.rulenode.max-pending-messages"),t.ɵɵelementEnd(),t.ɵɵelement(12,"input",7),t.ɵɵtemplate(13,Un,3,3,"mat-error",8)(14,Hn,3,3,"mat-error",8)(15,zn,3,3,"mat-error",8),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵreference(8);t.ɵɵproperty("formGroup",n.msgDelayConfigForm),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(3,7,"tb.rulenode.use-metadata-period-in-seconds-patterns")," "),t.ɵɵadvance(4),t.ɵɵproperty("ngIf",!0!==n.msgDelayConfigForm.get("useMetadataPeriodInSecondsPatterns").value)("ngIfElse",e),t.ɵɵadvance(7),t.ɵɵproperty("ngIf",n.msgDelayConfigForm.get("maxPendingMsgs").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.msgDelayConfigForm.get("maxPendingMsgs").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.msgDelayConfigForm.get("maxPendingMsgs").hasError("max"))}},dependencies:t.ɵɵgetComponentDepsFactory($n),encapsulation:2})}}e("MsgDelayConfigComponent",$n);const Qn=()=>({standalone:!0});function Jn(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",10),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.telemetryTypeTranslationsMap.get(e))," ")}}class Yn extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.attributeScopes=Object.keys(o),this.telemetryTypeTranslationsMap=l}configForm(){return this.pushToCloudConfigForm}onConfigurationSet(e){this.pushToCloudConfigForm=this.fb.group({scope:[e?e.scope:null,[N.required]]})}static{this.ɵfac=function(e){return new(e||Yn)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Yn,selectors:[["tb-action-node-push-to-cloud-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:19,vars:16,consts:[[1,"tb-form-panel","no-border","no-padding",3,"formGroup"],[1,"tb-form-panel","stroked"],[3,"hintText"],[1,"tb-form-row","no-border","no-padding","tb-standard-fields"],[1,"flex"],["required","","matInput","","formControlName","scope",1,"tb-entity-type-select"],[3,"value",4,"ngFor","ngForOf"],["type","text","matInput","","readonly","","disabled","",3,"ngModel","ngModelOptions"],["type","button","matSuffix","","mat-icon-button","","aria-label","Copy","ngxClipboard","",3,"cbContent","matTooltip"],["aria-hidden","false","aria-label","help-icon"],[3,"value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1),t.ɵɵelement(2,"tb-example-hint",2),t.ɵɵelementStart(3,"div",3)(4,"mat-form-field",4)(5,"mat-label"),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(8,"mat-select",5),t.ɵɵtemplate(9,Jn,3,4,"mat-option",6),t.ɵɵelementEnd()(),t.ɵɵelementStart(10,"mat-form-field",4)(11,"mat-label"),t.ɵɵtext(12),t.ɵɵpipe(13,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(14,"input",7),t.ɵɵelementStart(15,"button",8),t.ɵɵpipe(16,"translate"),t.ɵɵelementStart(17,"mat-icon",9),t.ɵɵtext(18,"content_copy "),t.ɵɵelementEnd()()()()()()),2&e&&(t.ɵɵproperty("formGroup",n.pushToCloudConfigForm),t.ɵɵadvance(2),t.ɵɵproperty("hintText","tb.rulenode.attributes-scope-hint"),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(7,9,"tb.rulenode.attributes-scope")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.attributeScopes),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(13,11,"tb.rulenode.attributes-scope-value")),t.ɵɵadvance(2),t.ɵɵproperty("ngModel",n.pushToCloudConfigForm.get("scope").value)("ngModelOptions",t.ɵɵpureFunction0(15,Qn)),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(16,13,"tb.rulenode.attributes-scope-value-copy")),t.ɵɵproperty("cbContent",n.pushToCloudConfigForm.get("scope").value))},dependencies:t.ɵɵgetComponentDepsFactory(Yn),encapsulation:2})}}e("PushToCloudConfigComponent",Yn);const Wn=()=>({standalone:!0});function Xn(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",10),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.telemetryTypeTranslationsMap.get(e))," ")}}class Zn extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.attributeScopes=Object.keys(o),this.telemetryTypeTranslationsMap=l}configForm(){return this.pushToEdgeConfigForm}onConfigurationSet(e){this.pushToEdgeConfigForm=this.fb.group({scope:[e?e.scope:null,[N.required]]})}static{this.ɵfac=function(e){return new(e||Zn)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Zn,selectors:[["tb-action-node-push-to-edge-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:19,vars:16,consts:[[1,"tb-form-panel","no-border","no-padding",3,"formGroup"],[1,"tb-form-panel","stroked"],[3,"hintText"],[1,"tb-form-row","no-border","no-padding","tb-standard-fields"],[1,"flex"],["required","","matInput","","formControlName","scope",1,"tb-entity-type-select"],[3,"value",4,"ngFor","ngForOf"],["type","text","matInput","","readonly","","disabled","",3,"ngModel","ngModelOptions"],["type","button","matSuffix","","mat-icon-button","","aria-label","Copy","ngxClipboard","",3,"cbContent","matTooltip"],["aria-hidden","false","aria-label","help-icon"],[3,"value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1),t.ɵɵelement(2,"tb-example-hint",2),t.ɵɵelementStart(3,"div",3)(4,"mat-form-field",4)(5,"mat-label"),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(8,"mat-select",5),t.ɵɵtemplate(9,Xn,3,4,"mat-option",6),t.ɵɵelementEnd()(),t.ɵɵelementStart(10,"mat-form-field",4)(11,"mat-label"),t.ɵɵtext(12),t.ɵɵpipe(13,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(14,"input",7),t.ɵɵelementStart(15,"button",8),t.ɵɵpipe(16,"translate"),t.ɵɵelementStart(17,"mat-icon",9),t.ɵɵtext(18,"content_copy "),t.ɵɵelementEnd()()()()()()),2&e&&(t.ɵɵproperty("formGroup",n.pushToEdgeConfigForm),t.ɵɵadvance(2),t.ɵɵproperty("hintText","tb.rulenode.attributes-scope-hint"),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(7,9,"tb.rulenode.attributes-scope")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.attributeScopes),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(13,11,"tb.rulenode.attributes-scope-value")),t.ɵɵadvance(2),t.ɵɵproperty("ngModel",n.pushToEdgeConfigForm.get("scope").value)("ngModelOptions",t.ɵɵpureFunction0(15,Wn)),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(16,13,"tb.rulenode.attributes-scope-value-copy")),t.ɵɵproperty("cbContent",n.pushToEdgeConfigForm.get("scope").value))},dependencies:t.ɵɵgetComponentDepsFactory(Zn),encapsulation:2})}}e("PushToEdgeConfigComponent",Zn);class er extends i{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.rpcReplyConfigForm}onConfigurationSet(e){this.rpcReplyConfigForm=this.fb.group({serviceIdMetaDataAttribute:[e?e.serviceIdMetaDataAttribute:null,[]],sessionIdMetaDataAttribute:[e?e.sessionIdMetaDataAttribute:null,[]],requestIdMetaDataAttribute:[e?e.requestIdMetaDataAttribute:null,[]]})}static{this.ɵfac=function(e){return new(e||er)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:er,selectors:[["tb-action-node-rpc-reply-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:17,vars:2,consts:[[1,"tb-form-panel","stroked","no-padding-bottom",3,"formGroup"],["translate","",1,"tb-form-panel-title"],[3,"hintText"],[1,"tb-form-row","no-border","no-padding","tb-standard-fields","column-xs"],[1,"flex"],["translate",""],["matInput","","formControlName","serviceIdMetaDataAttribute"],["matInput","","formControlName","sessionIdMetaDataAttribute"],["matInput","","formControlName","requestIdMetaDataAttribute"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1),t.ɵɵtext(2,"tb.rulenode.reply-routing-configuration"),t.ɵɵelementEnd(),t.ɵɵelement(3,"tb-example-hint",2),t.ɵɵelementStart(4,"div",3)(5,"mat-form-field",4)(6,"mat-label",5),t.ɵɵtext(7,"tb.rulenode.service-id-metadata-attribute"),t.ɵɵelementEnd(),t.ɵɵelement(8,"input",6),t.ɵɵelementEnd(),t.ɵɵelementStart(9,"mat-form-field",4)(10,"mat-label",5),t.ɵɵtext(11,"tb.rulenode.session-id-metadata-attribute"),t.ɵɵelementEnd(),t.ɵɵelement(12,"input",7),t.ɵɵelementEnd(),t.ɵɵelementStart(13,"mat-form-field",4)(14,"mat-label",5),t.ɵɵtext(15,"tb.rulenode.request-id-metadata-attribute"),t.ɵɵelementEnd(),t.ɵɵelement(16,"input",8),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.rpcReplyConfigForm),t.ɵɵadvance(3),t.ɵɵproperty("hintText","tb.rulenode.rpc-reply-routing-configuration-hint"))},dependencies:t.ɵɵgetComponentDepsFactory(er),encapsulation:2})}}function tr(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.timeout-required")," "))}function nr(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-timeout-message")," "))}e("RpcReplyConfigComponent",er);class rr extends i{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,[N.required,N.min(0)]]})}static{this.ɵfac=function(e){return new(e||rr)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:rr,selectors:[["tb-action-node-rpc-request-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:7,vars:3,consts:[[1,"flex","flex-col",3,"formGroup"],[1,"mat-block","flex-1"],["translate",""],["type","number","min","0","step","1","matInput","","formControlName","timeoutInSeconds","required",""],[4,"ngIf"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.timeout-sec"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵtemplate(5,tr,3,3,"mat-error",4)(6,nr,3,3,"mat-error",4),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.rpcRequestConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.rpcRequestConfigForm.get("timeoutInSeconds").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.rpcRequestConfigForm.get("timeoutInSeconds").hasError("min")))},dependencies:t.ɵɵgetComponentDepsFactory(rr),encapsulation:2})}}function ar(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.custom-table-name-required")," "))}function ir(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-default-ttl-message")," "))}function or(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.default-ttl-required")," "))}e("RpcRequestConfigComponent",rr);class lr extends i{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,[N.required,N.pattern(/.*\S.*/)]],fieldsMapping:[e?e.fieldsMapping:null,[N.required]],defaultTtl:[e?e.defaultTtl:0,[N.required,N.min(0)]]})}prepareOutputConfig(e){return e.tableName=e.tableName.trim(),e}static{this.ɵfac=function(e){return new(e||lr)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:lr,selectors:[["tb-action-node-custom-table-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:24,vars:26,consts:[[1,"tb-form-panel","no-border","no-padding",3,"formGroup"],["subscriptSizing","dynamic",1,"mat-block"],["translate",""],["required","","matInput","","formControlName","tableName"],["aria-hidden","false","aria-label","help-icon","matSuffix","",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"],[4,"ngIf"],["required","","formControlName","fieldsMapping",3,"labelText","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText"],[1,"mat-block","flex-1"],["type","number","min","0","step","1","matInput","","formControlName","defaultTtl","required",""]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.custom-table-name"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵelementStart(5,"mat-icon",4),t.ɵɵpipe(6,"translate"),t.ɵɵtext(7," help "),t.ɵɵelementEnd(),t.ɵɵtemplate(8,ar,3,3,"mat-error",5),t.ɵɵelementEnd(),t.ɵɵelement(9,"tb-kv-map-config",6),t.ɵɵpipe(10,"translate"),t.ɵɵpipe(11,"translate"),t.ɵɵpipe(12,"translate"),t.ɵɵpipe(13,"translate"),t.ɵɵpipe(14,"translate"),t.ɵɵpipe(15,"translate"),t.ɵɵelementStart(16,"mat-form-field",7)(17,"mat-label",2),t.ɵɵtext(18,"tb.rulenode.default-ttl"),t.ɵɵelementEnd(),t.ɵɵelement(19,"input",8),t.ɵɵelementStart(20,"mat-hint",2),t.ɵɵtext(21,"tb.rulenode.default-ttl-zero-hint"),t.ɵɵelementEnd(),t.ɵɵtemplate(22,ir,3,3,"mat-error",5)(23,or,3,3,"mat-error",5),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.saveToCustomTableConfigForm),t.ɵɵadvance(5),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(6,12,"tb.rulenode.custom-table-hint")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.saveToCustomTableConfigForm.get("tableName").hasError("required")||n.saveToCustomTableConfigForm.get("tableName").hasError("pattern")),t.ɵɵadvance(),t.ɵɵproperty("labelText",t.ɵɵpipeBind1(10,14,"tb.rulenode.fields-mapping"))("requiredText",t.ɵɵpipeBind1(11,16,"tb.rulenode.fields-mapping-required"))("keyText",t.ɵɵpipeBind1(12,18,"tb.rulenode.message-field"))("keyRequiredText",t.ɵɵpipeBind1(13,20,"tb.rulenode.message-field-required"))("valText",t.ɵɵpipeBind1(14,22,"tb.rulenode.table-col"))("valRequiredText",t.ɵɵpipeBind1(15,24,"tb.rulenode.table-col-required"))("hintText","tb.rulenode.fields-mapping-hint"),t.ɵɵadvance(13),t.ɵɵproperty("ngIf",n.saveToCustomTableConfigForm.get("defaultTtl").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.saveToCustomTableConfigForm.get("defaultTtl").hasError("required")))},dependencies:t.ɵɵgetComponentDepsFactory(lr),encapsulation:2})}}function sr(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.default-ttl-required")," "))}function pr(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-default-ttl-message")," "))}e("SaveToCustomTableConfigComponent",lr);class mr extends i{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,[N.required,N.min(0)]],skipLatestPersistence:[!!e&&e.skipLatestPersistence,[]],useServerTs:[!!e&&e.useServerTs,[]]})}static{this.ɵfac=function(e){return new(e||mr)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:mr,selectors:[["tb-action-node-timeseries-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:21,vars:18,consts:[[1,"tb-form-panel","no-border","no-padding",3,"formGroup"],[1,"mat-block","flex-1"],["translate",""],["type","number","min","0","step","1","matInput","","formControlName","defaultTTL","required",""],["aria-hidden","false","aria-label","help-icon","matSuffix","",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"],[4,"ngIf"],[1,"tb-form-panel","stroked"],[1,"tb-form-row","no-border","no-padding",3,"tb-hint-tooltip-icon"],["formControlName","useServerTs",1,"mat-slide"],["formControlName","skipLatestPersistence",1,"mat-slide"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.default-ttl"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵelementStart(5,"mat-icon",4),t.ɵɵpipe(6,"translate"),t.ɵɵtext(7," help "),t.ɵɵelementEnd(),t.ɵɵtemplate(8,sr,3,3,"mat-error",5)(9,pr,3,3,"mat-error",5),t.ɵɵelementEnd(),t.ɵɵelementStart(10,"div",6)(11,"div",7),t.ɵɵpipe(12,"translate"),t.ɵɵelementStart(13,"mat-slide-toggle",8),t.ɵɵtext(14),t.ɵɵpipe(15,"translate"),t.ɵɵelementEnd()(),t.ɵɵelementStart(16,"div",7),t.ɵɵpipe(17,"translate"),t.ɵɵelementStart(18,"mat-slide-toggle",9),t.ɵɵtext(19),t.ɵɵpipe(20,"translate"),t.ɵɵelementEnd()()()()),2&e&&(t.ɵɵproperty("formGroup",n.timeseriesConfigForm),t.ɵɵadvance(5),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(6,8,"tb.rulenode.default-ttl-hint")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.timeseriesConfigForm.get("defaultTTL").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.timeseriesConfigForm.get("defaultTTL").hasError("min")),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(12,10,"tb.rulenode.use-server-ts-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(15,12,"tb.rulenode.use-server-ts")," "),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(17,14,"tb.rulenode.skip-latest-persistence-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(20,16,"tb.rulenode.skip-latest-persistence")," "))},dependencies:t.ɵɵgetComponentDepsFactory(mr),encapsulation:2})}}function dr(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.customer-name-pattern-required")," "))}function ur(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",6)(1,"mat-label",7),t.ɵɵtext(2,"tb.rulenode.customer-name-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",8),t.ɵɵtemplate(4,dr,3,3,"mat-error",9),t.ɵɵelementStart(5,"mat-hint",7),t.ɵɵtext(6,"tb.rulenode.customer-name-pattern-hint"),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(4),t.ɵɵproperty("ngIf",e.unassignCustomerConfigForm.get("customerNamePattern").hasError("required")||e.unassignCustomerConfigForm.get("customerNamePattern").hasError("pattern"))}}e("TimeseriesConfigComponent",mr);class cr extends i{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.unassignCustomerConfigForm}prepareInputConfig(e){return{customerNamePattern:P(e?.customerNamePattern)?e.customerNamePattern:null,unassignFromCustomer:P(e?.customerNamePattern)}}onConfigurationSet(e){this.unassignCustomerConfigForm=this.fb.group({customerNamePattern:[e.customerNamePattern,[]],unassignFromCustomer:[e.unassignFromCustomer,[]]})}validatorTriggers(){return["unassignFromCustomer"]}updateValidators(e){this.unassignCustomerConfigForm.get("unassignFromCustomer").value?this.unassignCustomerConfigForm.get("customerNamePattern").setValidators([N.required,N.pattern(/.*\S.*/)]):this.unassignCustomerConfigForm.get("customerNamePattern").setValidators([]),this.unassignCustomerConfigForm.get("customerNamePattern").updateValueAndValidity({emitEvent:e})}prepareOutputConfig(e){return{customerNamePattern:e.unassignFromCustomer?e.customerNamePattern.trim():null}}static{this.ɵfac=function(e){return new(e||cr)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:cr,selectors:[["tb-action-node-un-assign-to-customer-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:9,vars:10,consts:[[1,"flex","flex-col",3,"formGroup"],[1,"tb-form-panel","no-padding","no-border"],[1,"tb-form-panel","stroked"],[1,"tb-form-row","no-border","no-padding",3,"tb-hint-tooltip-icon"],["formControlName","unassignFromCustomer",1,"mat-slide"],["class","mat-block","subscriptSizing","dynamic",4,"ngIf"],["subscriptSizing","dynamic",1,"mat-block"],["translate",""],["required","","matInput","","formControlName","customerNamePattern"],[4,"ngIf"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"div",2)(3,"div",3),t.ɵɵpipe(4,"translate"),t.ɵɵelementStart(5,"mat-slide-toggle",4),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(8,ur,7,1,"mat-form-field",5),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.unassignCustomerConfigForm),t.ɵɵadvance(2),t.ɵɵclassProp("no-padding-bottom",n.unassignCustomerConfigForm.get("unassignFromCustomer").value),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(4,6,"tb.rulenode.unassign-from-customer-tooltip")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(7,8,"tb.rulenode.unassign-from-customer")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.unassignCustomerConfigForm.get("unassignFromCustomer").value))},dependencies:t.ɵɵgetComponentDepsFactory(cr),encapsulation:2})}}e("UnassignCustomerConfigComponent",cr);class fr extends i{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.sendRestApiCallReplyConfigForm}onConfigurationSet(e){this.sendRestApiCallReplyConfigForm=this.fb.group({requestIdMetaDataAttribute:[e?e.requestIdMetaDataAttribute:null,[]],serviceIdMetaDataAttribute:[e?e.serviceIdMetaDataAttribute:null,[]]})}static{this.ɵfac=function(e){return new(e||fr)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:fr,selectors:[["tb-action-node-send-rest-api-call-reply-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:13,vars:2,consts:[[1,"tb-form-panel","stroked","no-padding-bottom",3,"formGroup"],["translate","",1,"tb-form-panel-title"],[3,"hintText"],[1,"tb-form-row","no-border","no-padding","tb-standard-fields","column-xs"],[1,"flex"],["translate",""],["matInput","","formControlName","serviceIdMetaDataAttribute"],["matInput","","formControlName","requestIdMetaDataAttribute"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1),t.ɵɵtext(2,"tb.rulenode.reply-routing-configuration"),t.ɵɵelementEnd(),t.ɵɵelement(3,"tb-example-hint",2),t.ɵɵelementStart(4,"div",3)(5,"mat-form-field",4)(6,"mat-label",5),t.ɵɵtext(7,"tb.rulenode.service-id-metadata-attribute"),t.ɵɵelementEnd(),t.ɵɵelement(8,"input",6),t.ɵɵelementEnd(),t.ɵɵelementStart(9,"mat-form-field",4)(10,"mat-label",5),t.ɵɵtext(11,"tb.rulenode.request-id-metadata-attribute"),t.ɵɵelementEnd(),t.ɵɵelement(12,"input",7),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.sendRestApiCallReplyConfigForm),t.ɵɵadvance(3),t.ɵɵproperty("hintText","tb.rulenode.reply-routing-configuration-hint"))},dependencies:t.ɵɵgetComponentDepsFactory(fr),encapsulation:2})}}e("SendRestApiCallReplyConfigComponent",fr);const gr=["attributeChipList"],hr=()=>({standalone:!0});function yr(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",21),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.telemetryTypeTranslationsMap.get(e))," ")}}function br(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"mat-chip-row",22),t.ɵɵlistener("removed",(function(){const n=t.ɵɵrestoreView(e).$implicit,r=t.ɵɵnextContext();return t.ɵɵresetView(r.removeKey(n))})),t.ɵɵtext(1),t.ɵɵelementStart(2,"mat-icon",23),t.ɵɵtext(3,"close"),t.ɵɵelementEnd()()}if(2&e){const e=n.$implicit;t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e," ")}}function vr(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(2,1,"tb.rulenode.attributes-keys-required")))}function xr(e,n){1&e&&(t.ɵɵelementStart(0,"div",18),t.ɵɵpipe(1,"translate"),t.ɵɵelementStart(2,"mat-slide-toggle",24),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd()()),2&e&&(t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(1,2,"tb.rulenode.notify-device-on-delete-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(4,4,"tb.rulenode.notify-device")," "))}class Cr extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.attributeScopeMap=o,this.attributeScopes=Object.keys(o),this.telemetryTypeTranslationsMap=l,this.separatorKeysCodes=[U,H,z]}configForm(){return this.deleteAttributesConfigForm}onConfigurationSet(e){this.deleteAttributesConfigForm=this.fb.group({scope:[e?e.scope:null,[N.required]],keys:[e?e.keys:null,[N.required]],sendAttributesDeletedNotification:[!!e&&e.sendAttributesDeletedNotification,[]],notifyDevice:[!!e&&e.notifyDevice,[]]}),this.deleteAttributesConfigForm.get("scope").valueChanges.subscribe((e=>{e!==o.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="")}static{this.ɵfac=function(e){return new(e||Cr)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Cr,selectors:[["tb-action-node-delete-attributes-config"]],viewQuery:function(e,n){if(1&e&&t.ɵɵviewQuery(gr,5),2&e){let e;t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.attributeChipList=e.first)}},features:[t.ɵɵInheritDefinitionFeature],decls:41,vars:31,consts:[["attributeChipList",""],[1,"tb-form-panel","no-border","no-padding",3,"formGroup"],[1,"tb-form-panel","stroked"],[3,"hintText"],[1,"tb-form-row","no-border","no-padding","tb-standard-fields"],[1,"flex"],["required","","matInput","","formControlName","scope",1,"tb-entity-type-select"],[3,"value",4,"ngFor","ngForOf"],["type","text","matInput","","readonly","","disabled","",3,"ngModel","ngModelOptions"],["type","button","matSuffix","","mat-icon-button","","aria-label","Copy","ngxClipboard","",3,"cbContent","matTooltip"],["aria-hidden","false","aria-label","help-icon"],["subscriptSizing","dynamic",1,"mat-block"],["formControlName","keys"],[3,"removed",4,"ngFor","ngForOf"],["matInput","","type","text",3,"matChipInputTokenEnd","matChipInputFor","matChipInputSeparatorKeyCodes","matChipInputAddOnBlur"],[4,"ngIf"],["translate",""],[1,"tb-settings"],[1,"tb-form-row","no-border","no-padding",3,"tb-hint-tooltip-icon"],["formControlName","sendAttributesDeletedNotification",1,"mat-slide"],["class","tb-form-row no-border no-padding",3,"tb-hint-tooltip-icon",4,"ngIf"],[3,"value"],[3,"removed"],["matChipRemove",""],["formControlName","notifyDevice",1,"mat-slide"]],template:function(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"section",1)(1,"div",2),t.ɵɵelement(2,"tb-example-hint",3),t.ɵɵelementStart(3,"div",4)(4,"mat-form-field",5)(5,"mat-label"),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(8,"mat-select",6),t.ɵɵtemplate(9,yr,3,4,"mat-option",7),t.ɵɵelementEnd()(),t.ɵɵelementStart(10,"mat-form-field",5)(11,"mat-label"),t.ɵɵtext(12),t.ɵɵpipe(13,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(14,"input",8),t.ɵɵelementStart(15,"button",9),t.ɵɵpipe(16,"translate"),t.ɵɵelementStart(17,"mat-icon",10),t.ɵɵtext(18,"content_copy "),t.ɵɵelementEnd()()()()(),t.ɵɵelementStart(19,"mat-form-field",11)(20,"mat-label"),t.ɵɵtext(21),t.ɵɵpipe(22,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(23,"mat-chip-grid",12,0),t.ɵɵtemplate(25,br,4,1,"mat-chip-row",13),t.ɵɵelementStart(26,"input",14),t.ɵɵlistener("matChipInputTokenEnd",(function(r){return t.ɵɵrestoreView(e),t.ɵɵresetView(n.addKey(r))})),t.ɵɵelementEnd()(),t.ɵɵtemplate(27,vr,3,3,"mat-error",15),t.ɵɵelementStart(28,"mat-hint",16),t.ɵɵtext(29,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()(),t.ɵɵelementStart(30,"section",2)(31,"mat-expansion-panel",17)(32,"mat-expansion-panel-header")(33,"mat-panel-title",16),t.ɵɵtext(34,"tb.rulenode.advanced-settings"),t.ɵɵelementEnd()(),t.ɵɵelementStart(35,"div",18),t.ɵɵpipe(36,"translate"),t.ɵɵelementStart(37,"mat-slide-toggle",19),t.ɵɵtext(38),t.ɵɵpipe(39,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(40,xr,5,6,"div",20),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵreference(24);t.ɵɵproperty("formGroup",n.deleteAttributesConfigForm),t.ɵɵadvance(2),t.ɵɵproperty("hintText","tb.rulenode.attributes-scope-hint"),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(7,18,"tb.rulenode.attributes-scope")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.attributeScopes),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(13,20,"tb.rulenode.attributes-scope-value")),t.ɵɵadvance(2),t.ɵɵproperty("ngModel",n.deleteAttributesConfigForm.get("scope").value)("ngModelOptions",t.ɵɵpureFunction0(30,hr)),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(16,22,"tb.rulenode.attributes-scope-value-copy")),t.ɵɵproperty("cbContent",n.deleteAttributesConfigForm.get("scope").value),t.ɵɵadvance(6),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(22,24,"tb.rulenode.attributes-keys")),t.ɵɵadvance(4),t.ɵɵproperty("ngForOf",n.deleteAttributesConfigForm.get("keys").value),t.ɵɵadvance(),t.ɵɵproperty("matChipInputFor",e)("matChipInputSeparatorKeyCodes",n.separatorKeysCodes)("matChipInputAddOnBlur",!0),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.deleteAttributesConfigForm.get("keys").hasError("required")),t.ɵɵadvance(8),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(36,26,"tb.rulenode.send-attributes-deleted-notification-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(39,28,"tb.rulenode.send-attributes-deleted-notification")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.deleteAttributesConfigForm.get("scope").value===n.attributeScopeMap.SHARED_SCOPE)}},dependencies:t.ɵɵgetComponentDepsFactory(Cr),encapsulation:2})}}e("DeleteAttributesConfigComponent",Cr);const Sr=(e,t)=>[e,t];function Tr(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error",8),t.ɵɵtext(1," tb.rulenode.custom-expression-field-input-required "),t.ɵɵelementEnd())}function Ir(e,n){if(1&e&&(t.ɵɵelementStart(0,"fieldset",2)(1,"legend",21),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"mat-form-field",22),t.ɵɵelement(5,"input",23),t.ɵɵtemplate(6,Tr,2,0,"mat-error",11),t.ɵɵelementStart(7,"mat-hint",8),t.ɵɵtext(8,"tb.rulenode.custom-expression-field-input-hint"),t.ɵɵelementEnd()()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(2),t.ɵɵtextInterpolate1("",t.ɵɵpipeBind1(3,2,"tb.rulenode.custom-expression-field-input")," *"),t.ɵɵadvance(4),t.ɵɵproperty("ngIf",e.mathFunctionConfigForm.get("customFunction").hasError("required"))}}function Er(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",24),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementStart(3,"small",25),t.ɵɵtext(4),t.ɵɵelementEnd()()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,3,r.argumentTypeResultMap.get(e).name)," "),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",r.argumentTypeResultMap.get(e).description," ")}}function Fr(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error",8),t.ɵɵtext(1," tb.rulenode.type-field-input-required "),t.ɵɵelementEnd())}function qr(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",28),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(2);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.attributeScopeMap.get(e))," ")}}function Ar(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",7)(1,"mat-label",8),t.ɵɵtext(2,"tb.rulenode.attribute-scope-field-input"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"mat-select",26),t.ɵɵtemplate(4,qr,3,4,"mat-option",27),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(4),t.ɵɵproperty("ngForOf",e.attributeScopeResult)}}function kr(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error",8),t.ɵɵtext(1," tb.rulenode.key-field-input-required "),t.ɵɵelementEnd())}function Nr(e,n){1&e&&(t.ɵɵelementStart(0,"div",29)(1,"mat-checkbox",30),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"mat-checkbox",31),t.ɵɵtext(5),t.ɵɵpipe(6,"translate"),t.ɵɵelementEnd()()),2&e&&(t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(3,2,"tb.rulenode.add-to-message-field-input")," "),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(6,4,"tb.rulenode.add-to-metadata-field-input")," "))}class wr extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.MathFunction=Rt,this.ArgumentTypeResult=Gt,this.argumentTypeResultMap=Qt,this.attributeScopeMap=Xt,this.argumentsResult=Object.values(Gt),this.attributeScopeResult=Object.values(Wt)}configForm(){return this.mathFunctionConfigForm}onConfigurationSet(e){this.mathFunctionConfigForm=this.fb.group({operation:[e?e.operation:null,[N.required]],arguments:[e?e.arguments:null,[N.required]],customFunction:[e?e.customFunction:"",[N.required]],result:this.fb.group({type:[e?e.result.type:null,[N.required]],attributeScope:[e?e.result.attributeScope:null,[N.required]],key:[e?e.result.key:"",[N.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===Rt.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===Gt.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"]}static{this.ɵfac=function(e){return new(e||wr)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:wr,selectors:[["tb-action-node-math-function-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:39,vars:23,consts:[[1,"flex","flex-col",3,"formGroup"],["required","","formControlName","operation",1,"flex-full","max-h-30%","xs:max-h-full","md:max-h-full"],[1,"fields-group","flex","flex-col","gap-2"],["translate","",1,"group-title"],["formControlName","arguments",3,"function"],["class","fields-group flex flex-col gap-2",4,"ngIf"],["formGroupName","result"],[1,"mat-block","flex-1"],["translate",""],["formControlName","type","required",""],["style","border-bottom: 1px solid #eee;",3,"value",4,"ngFor","ngForOf"],["translate","",4,"ngIf"],[1,"xs:flex-col","gt-xs:gap-4","flex","flex-1","flex-row"],["class","mat-block flex-1",4,"ngIf"],["floatLabel","always",1,"mat-block","flex-1"],["matInput","","formControlName","key","required",""],["aria-hidden","false","aria-label","help-icon","matSuffix","","color","primary",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"],["floatLabel","always","subscriptSizing","dynamic",1,"mat-block","flex-1"],["formControlName","resultValuePrecision","matInput","","step","1","min","0","type","number"],[3,"innerHTML"],["class","xs:flex-col gt-xs:gap-4 flex flex-1 flex-row items-stretch justify-start","style","padding-top: 16px;",4,"ngIf"],[1,"group-title"],["subscriptSizing","dynamic",1,"mat-block","no-margin-top","flex-1"],["matInput","","formControlName","customFunction","required",""],[2,"border-bottom","1px solid #eee",3,"value"],[2,"display","block","overflow","hidden","text-overflow","ellipsis","white-space","nowrap"],["required","","formControlName","attributeScope"],[3,"value",4,"ngFor","ngForOf"],[3,"value"],[1,"xs:flex-col","gt-xs:gap-4","flex","flex-1","flex-row","items-stretch","justify-start",2,"padding-top","16px"],["formControlName","addToBody"],["formControlName","addToMetadata"]],template:function(e,n){if(1&e&&(t.ɵɵelementStart(0,"section",0),t.ɵɵelement(1,"tb-math-function-autocomplete",1),t.ɵɵelementStart(2,"fieldset",2)(3,"legend",3),t.ɵɵtext(4,"tb.rulenode.argument-tile"),t.ɵɵelementEnd(),t.ɵɵelement(5,"tb-arguments-map-config",4),t.ɵɵelementEnd(),t.ɵɵtemplate(6,Ir,9,4,"fieldset",5),t.ɵɵelementStart(7,"fieldset",2)(8,"legend",3),t.ɵɵtext(9,"tb.rulenode.result-title"),t.ɵɵelementEnd(),t.ɵɵelementStart(10,"div",6)(11,"mat-form-field",7)(12,"mat-label",8),t.ɵɵtext(13,"tb.rulenode.type-field-input"),t.ɵɵelementEnd(),t.ɵɵelementStart(14,"mat-select",9)(15,"mat-select-trigger"),t.ɵɵtext(16),t.ɵɵpipe(17,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(18,Er,5,5,"mat-option",10),t.ɵɵelementEnd(),t.ɵɵtemplate(19,Fr,2,0,"mat-error",11),t.ɵɵelementEnd(),t.ɵɵelementStart(20,"div",12),t.ɵɵtemplate(21,Ar,5,1,"mat-form-field",13),t.ɵɵelementStart(22,"mat-form-field",14)(23,"mat-label",8),t.ɵɵtext(24,"tb.rulenode.key-field-input"),t.ɵɵelementEnd(),t.ɵɵelement(25,"input",15),t.ɵɵelementStart(26,"mat-icon",16),t.ɵɵpipe(27,"translate"),t.ɵɵtext(28,"help"),t.ɵɵelementEnd(),t.ɵɵtemplate(29,kr,2,0,"mat-error",11),t.ɵɵelementEnd()(),t.ɵɵelementStart(30,"div",12)(31,"mat-form-field",17)(32,"mat-label",8),t.ɵɵtext(33,"tb.rulenode.number-floating-point-field-input"),t.ɵɵelementEnd(),t.ɵɵelement(34,"input",18)(35,"mat-hint",19),t.ɵɵpipe(36,"translate"),t.ɵɵpipe(37,"safe"),t.ɵɵelementEnd()(),t.ɵɵtemplate(38,Nr,7,6,"div",20),t.ɵɵelementEnd()()()),2&e){let e;t.ɵɵproperty("formGroup",n.mathFunctionConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("function",n.mathFunctionConfigForm.get("operation").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.mathFunctionConfigForm.get("operation").value===n.MathFunction.CUSTOM),t.ɵɵadvance(10),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(17,11,null==(e=n.argumentTypeResultMap.get(n.mathFunctionConfigForm.get("result.type").value))?null:e.name)," "),t.ɵɵadvance(2),t.ɵɵproperty("ngForOf",n.argumentsResult),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.mathFunctionConfigForm.get("result.type").hasError("required")),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.mathFunctionConfigForm.get("result").get("type").value===n.ArgumentTypeResult.ATTRIBUTE),t.ɵɵadvance(5),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(27,13,"tb.rulenode.math-templatization-tooltip")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.mathFunctionConfigForm.get("result.key").hasError("required")),t.ɵɵadvance(6),t.ɵɵproperty("innerHTML",t.ɵɵpipeBind2(37,17,t.ɵɵpipeBind1(36,15,"tb.rulenode.number-floating-point-field-input-hint"),"html"),t.ɵɵsanitizeHtml),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",t.ɵɵpureFunction2(20,Sr,n.ArgumentTypeResult.ATTRIBUTE,n.ArgumentTypeResult.TIME_SERIES).includes(n.mathFunctionConfigForm.get("result").get("type").value))}},dependencies:t.ɵɵgetComponentDepsFactory(wr),styles:["[_nghost-%COMP%]     .fields-group{padding:0 16px 8px;margin:10px 0;border:1px groove rgba(0,0,0,.25);border-radius:4px}[_nghost-%COMP%]     .fields-group .mat-mdc-form-field .mat-mdc-form-field-infix{width:100%}[_nghost-%COMP%]     .fields-group legend{color:#000000b3;width:fit-content}[_nghost-%COMP%]     .fields-group legend+*{display:block}[_nghost-%COMP%]     .fields-group legend+*.no-margin-top{margin-top:0}"]})}}function Mr(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",4),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",r.messageTypeNames.get(e)," ")}}e("MathFunctionConfigComponent",wr);class Br extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.messageTypeNames=f,this.eventOptions=[g.CONNECT_EVENT,g.ACTIVITY_EVENT,g.DISCONNECT_EVENT,g.INACTIVITY_EVENT]}configForm(){return this.deviceState}prepareInputConfig(e){return{event:P(e?.event)?e.event:g.ACTIVITY_EVENT}}onConfigurationSet(e){this.deviceState=this.fb.group({event:[e.event,[N.required]]})}static{this.ɵfac=function(e){return new(e||Br)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Br,selectors:[["tb-action-node-device-state-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:7,vars:5,consts:[[3,"formGroup"],["subscriptSizing","dynamic",1,"mat-block"],["formControlName","event"],[3,"value",4,"ngFor","ngForOf"],[3,"value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label"),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"mat-select",2),t.ɵɵtemplate(6,Mr,2,2,"mat-option",3),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.deviceState),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(4,3,"tb.rulenode.select-device-connectivity-event")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.eventOptions))},dependencies:t.ɵɵgetComponentDepsFactory(Br),encapsulation:2})}}e("DeviceStateConfigComponent",Br);const Vr=(e,t)=>({valText:e,keyText:t});function Or(e,n){if(1&e&&(t.ɵɵelementStart(0,"div",13),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e.requiredText," ")}}function Dr(e,n){1&e&&(t.ɵɵelementStart(0,"div",13),t.ɵɵtext(1," tb.rulenode.map-fields-required "),t.ɵɵelementEnd())}function Lr(e,n){if(1&e&&(t.ɵɵelementStart(0,"div",13),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind2(2,1,"tb.key-val.unique-key-value-pair-error",t.ɵɵpureFunction2(4,Vr,e.valText,e.keyText))," ")}}function Pr(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"div",14)(1,"mat-form-field",15),t.ɵɵelement(2,"input",16),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"mat-form-field",15),t.ɵɵelement(4,"input",16),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"div",17)(6,"button",18),t.ɵɵpipe(7,"translate"),t.ɵɵlistener("click",(function(){const n=t.ɵɵrestoreView(e).index,r=t.ɵɵnextContext();return t.ɵɵresetView(r.removeKeyVal(n))})),t.ɵɵelementStart(8,"mat-icon"),t.ɵɵtext(9,"delete"),t.ɵɵelementEnd()()()()}if(2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵadvance(2),t.ɵɵproperty("placeholder",r.keyText+"*")("formControl",e.get("key")),t.ɵɵadvance(2),t.ɵɵproperty("placeholder",r.valText+"*")("formControl",e.get("value")),t.ɵɵadvance(2),t.ɵɵclassProp("tb-hidden",1===r.keyValsFormArray().controls.length),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(7,8,"tb.key-val.remove-mapping-entry")),t.ɵɵproperty("disabled",r.disabled)}}function Rr(e,n){if(1&e&&t.ɵɵelement(0,"tb-example-hint",19),2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("hintText",e.hintText)("popupHelpLink",e.popupHelpLink)}}class _r{constructor(e,t){this.injector=e,this.fb=t,this.propagateChange=()=>{},this.destroy$=new Y,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 w||e instanceof M){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 R(t,{})?null:t}}ngOnInit(){this.ngControl=this.injector.get(B),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(W(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,[N.required,N.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],value:[t.value,[N.required,N.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:["",[N.required,N.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],value:["",[N.required,N.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)}}static{this.ɵfac=function(e){return new(e||_r)(t.ɵɵdirectiveInject(t.Injector),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:_r,selectors:[["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"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>_r)),multi:!0},{provide:O,useExisting:r((()=>_r)),multi:!0}])],decls:22,vars:12,consts:[[1,"tb-form-panel","stroked",3,"formGroup"],[1,"tb-form-row","no-padding","no-border","space-between"],[1,"tb-form-panel-title"],["class","tb-form-panel-hint tb-error","translate","",4,"ngIf"],[1,"tb-form-panel","no-border","no-padding"],[1,"tb-form-table"],[1,"tb-form-table-header"],[1,"tb-form-table-header-cell","field-space"],[1,"tb-form-table-header-cell","actions-header"],[1,"tb-form-table-body"],["class","tb-form-table-row",4,"ngFor","ngForOf"],["type","button","mat-stroked-button","","color","primary",3,"click"],[3,"hintText","popupHelpLink",4,"ngIf"],["translate","",1,"tb-form-panel-hint","tb-error"],[1,"tb-form-table-row"],["appearance","outline","subscriptSizing","dynamic",1,"tb-inline-field","field-space"],["matInput","",3,"placeholder","formControl"],[1,"tb-form-table-row-cell-buttons"],["type","button","mat-icon-button","","matTooltipPosition","above",3,"click","disabled","matTooltip"],[3,"hintText","popupHelpLink"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"div",2),t.ɵɵtext(3),t.ɵɵelementEnd(),t.ɵɵtemplate(4,Or,2,1,"div",3)(5,Dr,2,0,"div",3)(6,Lr,3,7,"div",3),t.ɵɵelementEnd(),t.ɵɵelementStart(7,"div",4)(8,"div",5)(9,"div",6)(10,"div",7),t.ɵɵtext(11),t.ɵɵelementEnd(),t.ɵɵelementStart(12,"div",7),t.ɵɵtext(13),t.ɵɵelementEnd(),t.ɵɵelement(14,"div",8),t.ɵɵelementEnd(),t.ɵɵelementStart(15,"div",9),t.ɵɵtemplate(16,Pr,10,10,"div",10),t.ɵɵelementEnd()()(),t.ɵɵelementStart(17,"div")(18,"button",11),t.ɵɵlistener("click",(function(){return n.addKeyVal()})),t.ɵɵtext(19),t.ɵɵpipe(20,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(21,Rr,1,2,"tb-example-hint",12),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.kvListFormGroup),t.ɵɵadvance(3),t.ɵɵtextInterpolate(n.labelText),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.kvListFormGroup.hasError("kvMapRequired")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.kvListFormGroup.hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.kvListFormGroup.hasError("uniqueKeyValuePair")),t.ɵɵadvance(5),t.ɵɵtextInterpolate(n.keyText),t.ɵɵadvance(2),t.ɵɵtextInterpolate(n.valText),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.keyValsFormArray().controls),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(20,10,"tb.key-val.add-mapping-entry")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.popupHelpLink||n.hintText))},dependencies:t.ɵɵgetComponentDepsFactory(_r),styles:["[_nghost-%COMP%]   .field-space[_ngcontent-%COMP%]{flex:1 1 50%}[_nghost-%COMP%]   .actions-header[_ngcontent-%COMP%]{width:40px}"]})}}e("KvMapConfigComponent",_r),J([h()],_r.prototype,"disabled",void 0),J([h()],_r.prototype,"uniqueKeyValuePairValidator",void 0),J([h()],_r.prototype,"required",void 0);const jr=e=>({inputName:e});function Gr(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",13),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementStart(3,"span",3),t.ɵɵtext(4,"tb.rulenode.relations-query-config-direction-suffix"),t.ɵɵelementEnd()()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.directionTypeTranslations.get(e))," ")}}function Kr(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-relation-level-error")," "))}function Ur(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-relation-level-invalid")," "))}function Hr(e,n){1&e&&(t.ɵɵelementStart(0,"div",14),t.ɵɵpipe(1,"translate"),t.ɵɵelementStart(2,"mat-slide-toggle",15),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd()()),2&e&&(t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(1,2,"tb.rulenode.last-level-device-relation-tooltip")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(4,4,"alias.last-level-relation")," "))}class zr extends y{get required(){return this.requiredValue}set required(e){this.requiredValue=Z(e)}constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.values(d),this.directionTypeTranslations=b,this.entityType=u,this.propagateChange=null}ngOnInit(){this.deviceRelationsQueryFormGroup=this.fb.group({fetchLastLevelOnly:[!1,[]],direction:[null,[N.required]],maxLevel:[null,[N.min(1)]],relationType:[null],deviceTypes:[null,[N.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})}static{this.ɵfac=function(e){return new(e||zr)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:zr,selectors:[["tb-device-relations-query-config"]],inputs:{disabled:"disabled",required:"required"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>zr)),multi:!0}]),t.ɵɵInheritDefinitionFeature],decls:24,vars:26,consts:[[1,"flex","flex-col",3,"formGroup"],[1,"flex","flex-row","gap-5.5"],["subscriptSizing","dynamic","hideRequiredMarker","",1,"mat-block","max-w-50%","flex-full",2,"min-width","100px"],["translate",""],["required","","formControlName","direction"],[3,"value",4,"ngFor","ngForOf"],["floatLabel","always",1,"mat-block","max-w-50%","flex-full"],["matInput","","type","text","pattern","[0-9]*","inputmode","numeric","min","1","formControlName","maxLevel",3,"placeholder"],[4,"ngIf"],["class","tb-form-row no-border no-padding last-level-slide-toggle",3,"tb-hint-tooltip-icon",4,"ngIf"],["formControlName","relationType",1,"flex-1"],["required","","formControlName","deviceTypes",3,"label","entityType","emptyInputPlaceholder","filledInputPlaceholder"],["matSuffix","","aria-hidden","false","aria-label","help-icon","color","primary",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"],[3,"value"],[1,"tb-form-row","no-border","no-padding","last-level-slide-toggle",3,"tb-hint-tooltip-icon"],["formControlName","fetchLastLevelOnly",1,"mat-slide"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"mat-form-field",2)(3,"mat-label",3),t.ɵɵtext(4,"relation.direction"),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"mat-select",4),t.ɵɵtemplate(6,Gr,5,4,"mat-option",5),t.ɵɵelementEnd()(),t.ɵɵelementStart(7,"mat-form-field",6)(8,"mat-label",3),t.ɵɵtext(9,"tb.rulenode.max-relation-level"),t.ɵɵelementEnd(),t.ɵɵelement(10,"input",7),t.ɵɵpipe(11,"translate"),t.ɵɵtemplate(12,Kr,3,3,"mat-error",8)(13,Ur,3,3,"mat-error",8),t.ɵɵelementEnd()(),t.ɵɵtemplate(14,Hr,5,6,"div",9),t.ɵɵelement(15,"tb-relation-type-autocomplete",10),t.ɵɵelementStart(16,"tb-entity-subtype-list",11),t.ɵɵpipe(17,"translate"),t.ɵɵpipe(18,"translate"),t.ɵɵpipe(19,"translate"),t.ɵɵelementStart(20,"mat-icon",12),t.ɵɵpipe(21,"translate"),t.ɵɵpipe(22,"translate"),t.ɵɵtext(23,"help"),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.deviceRelationsQueryFormGroup),t.ɵɵadvance(6),t.ɵɵproperty("ngForOf",n.directionTypes),t.ɵɵadvance(4),t.ɵɵpropertyInterpolate("placeholder",t.ɵɵpipeBind1(11,11,"tb.rulenode.unlimited-level")),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.deviceRelationsQueryFormGroup.get("maxLevel").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.deviceRelationsQueryFormGroup.get("maxLevel").invalid),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.deviceRelationsQueryFormGroup.get("maxLevel").value>1),t.ɵɵadvance(2),t.ɵɵproperty("label",t.ɵɵpipeBind1(17,13,"tb.rulenode.device-profiles"))("entityType",n.entityType.DEVICE)("emptyInputPlaceholder",t.ɵɵpipeBind1(18,15,"tb.rulenode.add-device-profile"))("filledInputPlaceholder",t.ɵɵpipeBind1(19,17,"tb.rulenode.add-device-profile")),t.ɵɵadvance(4),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind2(22,21,"tb.rulenode.chip-help",t.ɵɵpureFunction1(24,jr,t.ɵɵpipeBind1(21,19,"tb.rulenode.device-profile")))))},dependencies:t.ɵɵgetComponentDepsFactory(zr),styles:["[_nghost-%COMP%]   .last-level-slide-toggle[_ngcontent-%COMP%]{margin:8px 0 24px}"]})}}function $r(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",13),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementStart(3,"span",4),t.ɵɵtext(4,"tb.rulenode.relations-query-config-direction-suffix"),t.ɵɵelementEnd()()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.directionTypeTranslations.get(e))," ")}}function Qr(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-relation-level-error")," "))}function Jr(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-relation-level-invalid")," "))}function Yr(e,n){1&e&&(t.ɵɵelementStart(0,"div",14),t.ɵɵpipe(1,"translate"),t.ɵɵelementStart(2,"mat-slide-toggle",15),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd()()),2&e&&(t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(1,2,"tb.rulenode.last-level-relation-tooltip")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(4,4,"alias.last-level-relation")," "))}e("DeviceRelationsQueryConfigComponent",zr);class Wr extends y{get required(){return this.requiredValue}set required(e){this.requiredValue=Z(e)}constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.values(d),this.directionTypeTranslations=b,this.propagateChange=null}ngOnInit(){this.relationsQueryFormGroup=this.fb.group({fetchLastLevelOnly:[!1,[]],direction:[null,[N.required]],maxLevel:[null,[N.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})}static{this.ɵfac=function(e){return new(e||Wr)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Wr,selectors:[["tb-relations-query-config"]],inputs:{disabled:"disabled",required:"required"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>Wr)),multi:!0}]),t.ɵɵInheritDefinitionFeature],decls:22,vars:9,consts:[[1,"tb-form-panel","stroked",3,"formGroup"],["translate","",1,"tb-form-panel-title","tb-required"],[1,"flex","flex-row","gap-4"],["hideRequiredMarker","",1,"mat-block","max-w-50%","flex-full",2,"min-width","100px"],["translate",""],["required","","formControlName","direction"],[3,"value",4,"ngFor","ngForOf"],["floatLabel","always",1,"mat-block","max-w-50%","flex-full"],["matInput","","type","text","pattern","[0-9]*","min","1","inputmode","numeric","formControlName","maxLevel",3,"placeholder"],[4,"ngIf"],["class","tb-form-row no-border no-padding last-level-slide-toggle",3,"tb-hint-tooltip-icon",4,"ngIf"],["translate","",1,"tb-form-panel-title"],["formControlName","filters"],[3,"value"],[1,"tb-form-row","no-border","no-padding","last-level-slide-toggle",3,"tb-hint-tooltip-icon"],["formControlName","fetchLastLevelOnly",1,"mat-slide"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1),t.ɵɵtext(2,"tb.rulenode.relations-query"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"section")(4,"div",2)(5,"mat-form-field",3)(6,"mat-label",4),t.ɵɵtext(7,"relation.direction"),t.ɵɵelementEnd(),t.ɵɵelementStart(8,"mat-select",5),t.ɵɵtemplate(9,$r,5,4,"mat-option",6),t.ɵɵelementEnd()(),t.ɵɵelementStart(10,"mat-form-field",7)(11,"mat-label",4),t.ɵɵtext(12,"tb.rulenode.max-relation-level"),t.ɵɵelementEnd(),t.ɵɵelement(13,"input",8),t.ɵɵpipe(14,"translate"),t.ɵɵtemplate(15,Qr,3,3,"mat-error",9)(16,Jr,3,3,"mat-error",9),t.ɵɵelementEnd()(),t.ɵɵtemplate(17,Yr,5,6,"div",10),t.ɵɵelementEnd(),t.ɵɵelementStart(18,"section",0)(19,"div",11),t.ɵɵtext(20,"relation.relation-filters"),t.ɵɵelementEnd(),t.ɵɵelement(21,"tb-relation-filters",12),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.relationsQueryFormGroup),t.ɵɵadvance(9),t.ɵɵproperty("ngForOf",n.directionTypes),t.ɵɵadvance(4),t.ɵɵpropertyInterpolate("placeholder",t.ɵɵpipeBind1(14,7,"tb.rulenode.unlimited-level")),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.relationsQueryFormGroup.get("maxLevel").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.relationsQueryFormGroup.get("maxLevel").invalid),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.relationsQueryFormGroup.get("maxLevel").value>1),t.ɵɵadvance(),t.ɵɵproperty("formGroup",n.relationsQueryFormGroup))},dependencies:t.ɵɵgetComponentDepsFactory(Wr),encapsulation:2})}}e("RelationsQueryConfigComponent",Wr);const Xr=["chipList"],Zr=["messageTypeAutocomplete"],ea=["messageTypeInput"],ta=e=>({inputName:e}),na=e=>({messageType:e});function ra(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-label"),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(),t.ɵɵtextInterpolate(e.label)}}function aa(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"mat-chip-row",13),t.ɵɵlistener("removed",(function(){const n=t.ɵɵrestoreView(e).$implicit,r=t.ɵɵnextContext();return t.ɵɵresetView(r.remove(n))})),t.ɵɵtext(1),t.ɵɵelementStart(2,"mat-icon",14),t.ɵɵtext(3,"close"),t.ɵɵelementEnd()()}if(2&e){const e=n.$implicit;t.ɵɵproperty("removable",!0),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e.name," ")}}function ia(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",15),t.ɵɵelement(1,"span",16),t.ɵɵpipe(2,"highlight"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵproperty("innerHTML",t.ɵɵpipeBind2(2,2,e.name,r.searchText),t.ɵɵsanitizeHtml)}}function oa(e,n){1&e&&(t.ɵɵelementStart(0,"div")(1,"span",21),t.ɵɵtext(2,"tb.rulenode.no-message-types-found"),t.ɵɵelementEnd()())}function la(e,n){if(1&e&&(t.ɵɵelementStart(0,"span"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind2(2,1,"tb.rulenode.no-message-type-matching",t.ɵɵpureFunction1(4,na,e.truncate.transform(e.searchText,!0,6,"...")))," ")}}function sa(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"mat-option",17)(1,"div",18),t.ɵɵlistener("click",(function(n){return t.ɵɵrestoreView(e),t.ɵɵresetView(n.stopPropagation())})),t.ɵɵtemplate(2,oa,3,0,"div",19)(3,la,3,6,"ng-template",null,3,t.ɵɵtemplateRefExtractor),t.ɵɵelementStart(5,"span")(6,"a",20),t.ɵɵlistener("click",(function(n){t.ɵɵrestoreView(e);const r=t.ɵɵnextContext();return t.ɵɵresetView(r.createMessageType(n,r.searchText))})),t.ɵɵtext(7,"tb.rulenode.create-new-message-type"),t.ɵɵelementEnd()()()()}if(2&e){const e=t.ɵɵreference(4),n=t.ɵɵnextContext();t.ɵɵproperty("value",null),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!n.textIsNotEmpty(n.searchText))("ngIfElse",e)}}function pa(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.select-message-types-required")," "))}class ma extends y{get required(){return this.requiredValue}set required(e){this.requiredValue=Z(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=[U,H,z],this.messageTypes=[],this.messageTypesList=[],this.searchText="",this.propagateChange=e=>{},this.messageTypeConfigForm=this.fb.group({messageType:[null]});for(const e of Object.keys(g))this.messageTypesList.push({name:f.get(g[e]),value:e})}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}ngOnInit(){this.filteredMessageTypes=this.messageTypeConfigForm.get("messageType").valueChanges.pipe(ee(""),te((e=>e||"")),ne((e=>this.fetchMessageTypes(e))),re())}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 X(this.messageTypesList.filter((t=>t.name.toUpperCase().includes(e))))}return X(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))}static{this.ɵfac=function(e){return new(e||ma)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(K.TranslateService),t.ɵɵdirectiveInject(v.TruncatePipe),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:ma,selectors:[["tb-message-types-config"]],viewQuery:function(e,n){if(1&e&&(t.ɵɵviewQuery(Xr,5),t.ɵɵviewQuery(Zr,5),t.ɵɵviewQuery(ea,5)),2&e){let e;t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.chipList=e.first),t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.matAutocomplete=e.first),t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.messageTypeInput=e.first)}},inputs:{required:"required",label:"label",placeholder:"placeholder",disabled:"disabled"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>ma)),multi:!0}]),t.ɵɵInheritDefinitionFeature],decls:20,vars:27,consts:[["chipList",""],["messageTypeInput","","origin","matAutocompleteOrigin"],["messageTypeAutocomplete","matAutocomplete"],["searchNotEmpty",""],[2,"width","100%",3,"formGroup"],[4,"ngIf"],[3,"required"],[3,"removable","removed",4,"ngFor","ngForOf"],["matInput","","type","text","formControlName","messageType","matAutocompleteOrigin","",3,"focusin","matChipInputTokenEnd","placeholder","matAutocompleteConnectedTo","matAutocomplete","matChipInputFor","matChipInputSeparatorKeyCodes"],[1,"tb-autocomplete",3,"optionSelected","displayWith"],[3,"value",4,"ngFor","ngForOf"],["class","tb-not-found",3,"value",4,"ngIf"],["aria-hidden","false","aria-label","help-icon","matSuffix","","color","primary",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"],[3,"removed","removable"],["matChipRemove",""],[3,"value"],[3,"innerHTML"],[1,"tb-not-found",3,"value"],[1,"tb-not-found-content",3,"click"],[4,"ngIf","ngIfElse"],["translate","",3,"click"],["translate",""]],template:function(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"mat-form-field",4),t.ɵɵtemplate(1,ra,2,1,"mat-label",5),t.ɵɵelementStart(2,"mat-chip-grid",6,0),t.ɵɵtemplate(4,aa,4,2,"mat-chip-row",7),t.ɵɵelementStart(5,"input",8,1),t.ɵɵpipe(8,"translate"),t.ɵɵlistener("focusin",(function(){return t.ɵɵrestoreView(e),t.ɵɵresetView(n.onFocus())}))("matChipInputTokenEnd",(function(r){return t.ɵɵrestoreView(e),t.ɵɵresetView(n.add(r))})),t.ɵɵelementEnd()(),t.ɵɵelementStart(9,"mat-autocomplete",9,2),t.ɵɵlistener("optionSelected",(function(r){return t.ɵɵrestoreView(e),t.ɵɵresetView(n.selected(r))})),t.ɵɵtemplate(11,ia,3,5,"mat-option",10),t.ɵɵpipe(12,"async"),t.ɵɵtemplate(13,sa,8,3,"mat-option",11),t.ɵɵpipe(14,"async"),t.ɵɵelementEnd(),t.ɵɵelementStart(15,"mat-icon",12),t.ɵɵpipe(16,"translate"),t.ɵɵpipe(17,"translate"),t.ɵɵtext(18,"help"),t.ɵɵelementEnd(),t.ɵɵtemplate(19,pa,3,3,"mat-error",5),t.ɵɵelementEnd()}if(2&e){let e;const r=t.ɵɵreference(3),a=t.ɵɵreference(7),i=t.ɵɵreference(10);t.ɵɵproperty("formGroup",n.messageTypeConfigForm),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.label),t.ɵɵadvance(),t.ɵɵproperty("required",n.required),t.ɵɵadvance(2),t.ɵɵproperty("ngForOf",n.messageTypes),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("placeholder",t.ɵɵpipeBind1(8,14,n.placeholder)),t.ɵɵproperty("matAutocompleteConnectedTo",a)("matAutocomplete",i)("matChipInputFor",r)("matChipInputSeparatorKeyCodes",n.separatorKeysCodes),t.ɵɵadvance(4),t.ɵɵproperty("displayWith",n.displayMessageTypeFn),t.ɵɵadvance(2),t.ɵɵproperty("ngForOf",t.ɵɵpipeBind1(12,16,n.filteredMessageTypes)),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",0===(null==(e=t.ɵɵpipeBind1(14,18,n.filteredMessageTypes))?null:e.length)),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind2(17,22,"tb.rulenode.chip-help",t.ɵɵpureFunction1(25,ta,t.ɵɵpipeBind1(16,20,"tb.rulenode.message-type")))),t.ɵɵadvance(4),t.ɵɵproperty("ngIf",r.errorState)}},dependencies:t.ɵɵgetComponentDepsFactory(ma),encapsulation:2})}}function da(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",12),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(2);t.ɵɵproperty("value",e)("disabled","cert.PEM"===e&&r.disableCertPemCredentials),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,3,r.credentialsTypeTranslationsMap.get(e))," ")}}function ua(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.credentials-type-required")," "))}function ca(e,t){}function fa(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.username-required")," "))}function ga(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.password-required")," "))}function ha(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",4)(1,"mat-label",2),t.ɵɵtext(2,"tb.rulenode.username"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",13),t.ɵɵtemplate(4,fa,3,3,"mat-error",7),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"mat-form-field",4)(6,"mat-label",2),t.ɵɵtext(7,"tb.rulenode.password"),t.ɵɵelementEnd(),t.ɵɵelement(8,"input",14)(9,"tb-toggle-password",15),t.ɵɵtemplate(10,ga,3,3,"mat-error",7),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(4),t.ɵɵproperty("ngIf",e.credentialsConfigFormGroup.get("username").hasError("required")),t.ɵɵadvance(4),t.ɵɵproperty("required",e.passwordFieldRequired),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",e.credentialsConfigFormGroup.get("password").hasError("required"))}}function ya(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"div",16),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"tb-file-input",17),t.ɵɵpipe(4,"translate"),t.ɵɵpipe(5,"translate"),t.ɵɵlistener("fileNameChanged",(function(n){t.ɵɵrestoreView(e);const r=t.ɵɵnextContext(2);return t.ɵɵresetView(r.credentialsConfigFormGroup.get("caCertFileName").setValue(n))})),t.ɵɵelementEnd(),t.ɵɵelementStart(6,"tb-file-input",18),t.ɵɵpipe(7,"translate"),t.ɵɵpipe(8,"translate"),t.ɵɵlistener("fileNameChanged",(function(n){t.ɵɵrestoreView(e);const r=t.ɵɵnextContext(2);return t.ɵɵresetView(r.credentialsConfigFormGroup.get("certFileName").setValue(n))})),t.ɵɵelementEnd(),t.ɵɵelementStart(9,"tb-file-input",19),t.ɵɵpipe(10,"translate"),t.ɵɵpipe(11,"translate"),t.ɵɵlistener("fileNameChanged",(function(n){t.ɵɵrestoreView(e);const r=t.ɵɵnextContext(2);return t.ɵɵresetView(r.credentialsConfigFormGroup.get("privateKeyFileName").setValue(n))})),t.ɵɵelementEnd(),t.ɵɵelementStart(12,"mat-form-field",4)(13,"mat-label",2),t.ɵɵtext(14,"tb.rulenode.private-key-password"),t.ɵɵelementEnd(),t.ɵɵelement(15,"input",20)(16,"tb-toggle-password",15),t.ɵɵelementEnd()}if(2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(2,10,"tb.rulenode.credentials-pem-hint")),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("label",t.ɵɵpipeBind1(4,12,"tb.rulenode.ca-cert")),t.ɵɵpropertyInterpolate("dropLabel",t.ɵɵpipeBind1(5,14,"tb.rulenode.drop-file")),t.ɵɵproperty("existingFileName",e.credentialsConfigFormGroup.get("caCertFileName").value),t.ɵɵadvance(3),t.ɵɵpropertyInterpolate("label",t.ɵɵpipeBind1(7,16,"tb.rulenode.cert")),t.ɵɵpropertyInterpolate("dropLabel",t.ɵɵpipeBind1(8,18,"tb.rulenode.drop-file")),t.ɵɵproperty("existingFileName",e.credentialsConfigFormGroup.get("certFileName").value),t.ɵɵadvance(3),t.ɵɵpropertyInterpolate("label",t.ɵɵpipeBind1(10,20,"tb.rulenode.private-key")),t.ɵɵpropertyInterpolate("dropLabel",t.ɵɵpipeBind1(11,22,"tb.rulenode.drop-file")),t.ɵɵproperty("existingFileName",e.credentialsConfigFormGroup.get("privateKeyFileName").value)}}function ba(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",4)(1,"mat-label",2),t.ɵɵtext(2,"tb.rulenode.credentials-type"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"mat-select",5),t.ɵɵtemplate(4,da,3,5,"mat-option",6),t.ɵɵelementEnd(),t.ɵɵtemplate(5,ua,3,3,"mat-error",7),t.ɵɵelementEnd(),t.ɵɵelementStart(6,"section",8),t.ɵɵtemplate(7,ca,0,0,"ng-template",9)(8,ha,11,3,"ng-template",10)(9,ya,17,24,"ng-template",11),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(4),t.ɵɵproperty("ngForOf",e.allCredentialsTypes),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.credentialsConfigFormGroup.get("type").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngSwitch",e.credentialsConfigFormGroup.get("type").value)}}e("MessageTypesConfigComponent",ma);class va extends y{get required(){return this.requiredValue}set required(e){this.requiredValue=Z(e)}constructor(e,t){super(e),this.store=e,this.fb=t,this.subscriptions=[],this.disableCertPemCredentials=!1,this.passwordFieldRequired=!0,this.allCredentialsTypes=Mt,this.credentialsTypeTranslationsMap=Bt,this.propagateChange=e=>{}}ngOnInit(){this.credentialsConfigFormGroup=this.fb.group({type:[null,[N.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){P(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([N.required]),this.credentialsConfigFormGroup.get("password").setValidators(this.passwordFieldRequired?[N.required]:[]);break;case"cert.PEM":this.credentialsConfigFormGroup.setValidators([this.requiredFilesSelected(N.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}}}static{this.ɵfac=function(e){return new(e||va)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:va,selectors:[["tb-credentials-config"]],inputs:{required:"required",disableCertPemCredentials:"disableCertPemCredentials",passwordFieldRequired:"passwordFieldRequired"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>va)),multi:!0},{provide:O,useExisting:r((()=>va)),multi:!0}]),t.ɵɵInheritDefinitionFeature,t.ɵɵNgOnChangesFeature],decls:9,vars:4,consts:[[1,"flex","flex-col",3,"formGroup"],[1,"tb-credentials-config-panel-group"],["translate",""],["matExpansionPanelContent",""],[1,"mat-block"],["formControlName","type","required",""],[3,"value","disabled",4,"ngFor","ngForOf"],[4,"ngIf"],[1,"flex","flex-col",3,"ngSwitch"],["ngSwitchCase","anonymous"],["ngSwitchCase","basic"],["ngSwitchCase","cert.PEM"],[3,"value","disabled"],["required","","matInput","","formControlName","username"],["type","password","matInput","","formControlName","password",3,"required"],["matSuffix",""],[1,"tb-hint"],["formControlName","caCert","inputId","caCertSelect","noFileText","tb.rulenode.no-file",3,"fileNameChanged","existingFileName","label","dropLabel"],["formControlName","cert","inputId","CertSelect","noFileText","tb.rulenode.no-file",3,"fileNameChanged","existingFileName","label","dropLabel"],["formControlName","privateKey","inputId","privateKeySelect","noFileText","tb.rulenode.no-file",2,"padding-bottom","8px",3,"fileNameChanged","existingFileName","label","dropLabel"],["type","password","matInput","","formControlName","password"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-expansion-panel",1)(2,"mat-expansion-panel-header")(3,"mat-panel-title",2),t.ɵɵtext(4,"tb.rulenode.credentials"),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"mat-panel-description"),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(8,ba,10,3,"ng-template",3),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.credentialsConfigFormGroup),t.ɵɵadvance(6),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(7,2,n.credentialsTypeTranslationsMap.get(n.credentialsConfigFormGroup.get("type").value))," "))},dependencies:t.ɵɵgetComponentDepsFactory(va),encapsulation:2})}}function xa(e,n){1&e&&(t.ɵɵelementStart(0,"button",22),t.ɵɵpipe(1,"translate"),t.ɵɵelementStart(2,"mat-icon"),t.ɵɵtext(3,"drag_handle"),t.ɵɵelementEnd()()),2&e&&t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(1,1,"action.drag"))}function Ca(e,n){if(1&e&&(t.ɵɵelementStart(0,"span",23),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext().$implicit;t.ɵɵadvance(),t.ɵɵtextInterpolate1("",e.get("name").value,".")}}function Sa(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",24),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementStart(3,"small",25),t.ɵɵtext(4),t.ɵɵelementEnd()()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(2);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,3,r.argumentTypeMap.get(e).name)," "),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",r.argumentTypeMap.get(e).description," ")}}function Ta(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error",13),t.ɵɵtext(1," tb.rulenode.argument-source-field-input-required "),t.ɵɵelementEnd())}function Ia(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error",13),t.ɵɵtext(1," tb.rulenode.argument-key-field-input-required "),t.ɵɵelementEnd())}function Ea(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",26)(1,"mat-label",13),t.ɵɵtext(2,"tb.rulenode.argument-key-field-input"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",27),t.ɵɵelementStart(4,"mat-icon",28),t.ɵɵpipe(5,"translate"),t.ɵɵtext(6," help "),t.ɵɵelementEnd(),t.ɵɵtemplate(7,Ia,2,0,"mat-error",16),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext().$implicit;t.ɵɵadvance(3),t.ɵɵproperty("formControl",e.get("key")),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(5,3,"tb.rulenode.math-templatization-tooltip")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.get("key").hasError("required"))}}function Fa(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error",13),t.ɵɵtext(1," tb.rulenode.constant-value-field-input-required "),t.ɵɵelementEnd())}function qa(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",29)(1,"mat-label",13),t.ɵɵtext(2,"tb.rulenode.constant-value-field-input"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",30),t.ɵɵtemplate(4,Fa,2,0,"mat-error",16),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext().$implicit;t.ɵɵadvance(3),t.ɵɵproperty("formControl",e.get("key")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.get("key").hasError("required"))}}function Aa(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",26)(1,"mat-label",13),t.ɵɵtext(2,"tb.rulenode.default-value-field-input"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",31),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext().$implicit;t.ɵɵadvance(3),t.ɵɵproperty("formControl",e.get("defaultValue"))}}function ka(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",33),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(3);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.attributeScopeMap.get(e))," ")}}function Na(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error",13),t.ɵɵtext(1," tb.rulenode.attribute-scope-field-input-required "),t.ɵɵelementEnd())}function wa(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",12)(1,"mat-label",13),t.ɵɵtext(2,"tb.rulenode.attribute-scope-field-input"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"mat-select",14),t.ɵɵtemplate(4,ka,3,4,"mat-option",32),t.ɵɵelementEnd(),t.ɵɵtemplate(5,Na,2,0,"mat-error",16),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext().$implicit,n=t.ɵɵnextContext();t.ɵɵadvance(3),t.ɵɵproperty("formControl",e.get("attributeScope")),t.ɵɵadvance(),t.ɵɵproperty("ngForOf",n.attributeScope),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.get("attributeScope").hasError("required"))}}function Ma(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"button",34),t.ɵɵpipe(1,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext().index,r=t.ɵɵnextContext();return t.ɵɵresetView(r.removeArgument(n))})),t.ɵɵelementStart(2,"mat-icon"),t.ɵɵtext(3,"close"),t.ɵɵelementEnd()()}2&e&&t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(1,1,"action.remove"))}function Ba(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-list-item",6)(1,"div",7),t.ɵɵtemplate(2,xa,4,3,"button",8),t.ɵɵelementStart(3,"div",9),t.ɵɵtemplate(4,Ca,2,1,"span",10),t.ɵɵelementStart(5,"div",11)(6,"mat-form-field",12)(7,"mat-label",13),t.ɵɵtext(8,"tb.rulenode.argument-source-field-input"),t.ɵɵelementEnd(),t.ɵɵelementStart(9,"mat-select",14)(10,"mat-select-trigger"),t.ɵɵtext(11),t.ɵɵpipe(12,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(13,Sa,5,5,"mat-option",15),t.ɵɵelementEnd(),t.ɵɵtemplate(14,Ta,2,0,"mat-error",16),t.ɵɵelementEnd(),t.ɵɵelementStart(15,"div",17),t.ɵɵtemplate(16,Ea,8,5,"mat-form-field",18)(17,qa,5,2,"mat-form-field",19)(18,Aa,4,1,"mat-form-field",18),t.ɵɵelementEnd(),t.ɵɵtemplate(19,wa,6,3,"mat-form-field",20),t.ɵɵelementEnd(),t.ɵɵtemplate(20,Ma,4,3,"button",21),t.ɵɵelementEnd()()()),2&e){let e;const r=n.$implicit,a=t.ɵɵnextContext();t.ɵɵproperty("cdkDragDisabled",a.disabled),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!a.disabled),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",a.displayArgumentName),t.ɵɵadvance(5),t.ɵɵproperty("formControl",r.get("type")),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(12,12,null==(e=a.argumentTypeMap.get(r.get("type").value))?null:e.name)," "),t.ɵɵadvance(2),t.ɵɵproperty("ngForOf",a.arguments),t.ɵɵadvance(),t.ɵɵproperty("ngIf",r.get("type").hasError("required")),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",r.get("type").value&&r.get("type").value!==a.ArgumentType.CONSTANT),t.ɵɵadvance(),t.ɵɵproperty("ngIf",r.get("type").value===a.ArgumentType.CONSTANT),t.ɵɵadvance(),t.ɵɵproperty("ngIf",r.get("type").value&&r.get("type").value!==a.ArgumentType.CONSTANT),t.ɵɵadvance(),t.ɵɵproperty("ngIf",r.get("type").value===a.ArgumentType.ATTRIBUTE),t.ɵɵadvance(),t.ɵɵproperty("ngIf",!a.disabled)}}function Va(e,n){1&e&&(t.ɵɵelementStart(0,"div")(1,"span",35),t.ɵɵtext(2,"tb.rulenode.no-arguments-prompt"),t.ɵɵelementEnd()())}e("CredentialsConfigComponent",va);class Oa extends y{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=_t,this.ArgumentType=jt,this.attributeScopeMap=Xt,this.argumentTypeMap=$t,this.arguments=Object.values(jt),this.attributeScope=Object.values(Yt),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===Rt.CUSTOM),this.argumentsFormGroup){for(this.argumentsFormGroup.get("arguments").setValidators([N.minLength(this.minArgs),N.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,[N.required]],key:[e?.key,[N.required]],name:[Jt[t],[N.required]],attributeScope:[e?.attributeScope??Yt.SERVER_SCOPE,[N.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===jt.ATTRIBUTE?e.get("attributeScope").enable({emitEvent:!1}):e.get("attributeScope").disable({emitEvent:!1}),t&&t!==jt.CONSTANT?e.get("defaultValue").enable({emitEvent:!1}):e.get("defaultValue").disable({emitEvent:!1})}updateArgumentNames(){this.argumentsFormArray.controls.forEach(((e,t)=>{e.get("name").setValue(Jt[t])}))}updateModel(){const e=this.argumentsFormArray.value;e.length&&this.argumentsFormGroup.valid?this.propagateChange(e):this.propagateChange(null)}static{this.ɵfac=function(e){return new(e||Oa)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Oa,selectors:[["tb-arguments-map-config"]],inputs:{disabled:"disabled",function:"function"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>Oa)),multi:!0},{provide:O,useExisting:r((()=>Oa)),multi:!0}]),t.ɵɵInheritDefinitionFeature],decls:10,vars:10,consts:[[1,"flex","flex-col"],[2,"max-height","500px","overflow","auto"],["cdkDropList","","cdkDropListOrientation","vertical",1,"tb-drop-list","arguments-list",3,"cdkDropListDropped","formGroup","cdkDropListDisabled"],["formArrayName","arguments","cdkDrag","","class","tb-argument tb-draggable","style","height: 100%",3,"cdkDragDisabled",4,"ngFor","ngForOf"],[4,"ngIf"],["mat-button","","mat-raised-button","","color","primary","type","button","matTooltipPosition","above",3,"click","disabled"],["formArrayName","arguments","cdkDrag","",1,"tb-argument","tb-draggable",2,"height","100%",3,"cdkDragDisabled"],[1,"flex","flex-1","flex-row","items-center","justify-start"],["mat-icon-button","","color","primary","cdkDragHandle","","class","tb-drag-handle handle","style","min-width: 40px; margin: 0","matTooltipPosition","above",3,"matTooltip",4,"ngIf"],[1,"flex","flex-1","flex-row","items-center","justify-start","gap-4"],["style","padding: 0 10px; min-width: 20px;",4,"ngIf"],[1,"flex","flex-1","flex-col"],[1,"mat-block"],["translate",""],["required","",3,"formControl"],["style","border-bottom: 1px solid #eee;",3,"value",4,"ngFor","ngForOf"],["translate","",4,"ngIf"],[1,"flex","flex-1","flex-row","xs:flex-col","gt-xs:gap-4"],["floatLabel","always","class","mat-block gt-xs:max-w-50% gt-xs:flex-full",4,"ngIf"],["floatLabel","always","class","mat-block flex-1",4,"ngIf"],["class","mat-block",4,"ngIf"],["mat-icon-button","","color","primary","style","min-width: 40px;","matTooltipPosition","above",3,"matTooltip","click",4,"ngIf"],["mat-icon-button","","color","primary","cdkDragHandle","","matTooltipPosition","above",1,"tb-drag-handle","handle",2,"min-width","40px","margin","0",3,"matTooltip"],[2,"padding","0 10px","min-width","20px"],[2,"border-bottom","1px solid #eee",3,"value"],[2,"display","block","overflow","hidden","text-overflow","ellipsis","white-space","nowrap"],["floatLabel","always",1,"mat-block","gt-xs:max-w-50%","gt-xs:flex-full"],["matInput","","required","",3,"formControl"],["aria-hidden","false","aria-label","help-icon","matSuffix","","color","primary",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"],["floatLabel","always",1,"mat-block","flex-1"],["matInput","","required","","step","1","min","0","type","number",3,"formControl"],["matInput","","step","1","type","number",3,"formControl"],[3,"value",4,"ngFor","ngForOf"],[3,"value"],["mat-icon-button","","color","primary","matTooltipPosition","above",2,"min-width","40px",3,"click","matTooltip"],["translate","",1,"tb-prompt","flex","items-center","justify-center"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"mat-list",2),t.ɵɵlistener("cdkDropListDropped",(function(e){return n.onDrop(e)})),t.ɵɵtemplate(3,Ba,21,14,"mat-list-item",3),t.ɵɵelementEnd()(),t.ɵɵtemplate(4,Va,3,0,"div",4),t.ɵɵelementStart(5,"button",5),t.ɵɵlistener("click",(function(){return n.addArgument()})),t.ɵɵelementStart(6,"mat-icon"),t.ɵɵtext(7,"add"),t.ɵɵelementEnd(),t.ɵɵtext(8),t.ɵɵpipe(9,"translate"),t.ɵɵelementEnd()()),2&e&&(t.ɵɵadvance(),t.ɵɵclassProp("readonly",n.disabled),t.ɵɵadvance(),t.ɵɵproperty("formGroup",n.argumentsFormGroup)("cdkDropListDisabled",n.disabled),t.ɵɵadvance(),t.ɵɵproperty("ngForOf",n.argumentsFormArray.controls),t.ɵɵadvance(),t.ɵɵproperty("ngIf",!n.argumentsFormArray.length),t.ɵɵadvance(),t.ɵɵproperty("disabled",n.argumentsFormArray.length>=n.maxArgs),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(9,8,"action.add")," "))},dependencies:t.ɵɵgetComponentDepsFactory(Oa),styles:["[_nghost-%COMP%]   .mat-mdc-list-item.tb-argument[_ngcontent-%COMP%]{border:solid rgba(0,0,0,.25) 1px;border-radius:4px;padding:10px 0;margin-bottom:16px}[_nghost-%COMP%]   .arguments-list[_ngcontent-%COMP%]{padding:0}"]})}}e("ArgumentsMapConfigComponent",Oa);const Da=["operationInput"];function La(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"button",9),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.clear())})),t.ɵɵelementStart(1,"mat-icon",10),t.ɵɵtext(2,"close"),t.ɵɵelementEnd()()}}function Pa(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",11),t.ɵɵelement(1,"span",12),t.ɵɵpipe(2,"highlight"),t.ɵɵelementStart(3,"small",13),t.ɵɵtext(4),t.ɵɵelementEnd()()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e.value),t.ɵɵadvance(),t.ɵɵproperty("innerHTML",t.ɵɵpipeBind2(2,3,e.value+" | "+e.name,r.searchText),t.ɵɵsanitizeHtml),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",e.description," ")}}function Ra(e,n){1&e&&(t.ɵɵelementStart(0,"mat-option",11)(1,"span",3),t.ɵɵtext(2,"tb.rulenode.no-option-found"),t.ɵɵelementEnd()()),2&e&&t.ɵɵproperty("value",null)}class _a extends y{get required(){return this.requiredValue}set required(e){this.requiredValue=Z(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=[..._t.values()],this.propagateChange=null}ngOnInit(){this.mathFunctionForm=this.fb.group({operation:[""]}),this.filteredOptions=this.mathFunctionForm.get("operation").valueChanges.pipe(ae((e=>{let t;t="string"==typeof e&&Rt[e]?Rt[e]:null,this.updateView(t)})),te((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=_t.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)}static{this.ɵfac=function(e){return new(e||_a)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(K.TranslateService),t.ɵɵdirectiveInject(t.Injector),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:_a,selectors:[["tb-math-function-autocomplete"]],viewQuery:function(e,n){if(1&e&&t.ɵɵviewQuery(Da,7),2&e){let e;t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.operationInput=e.first)}},inputs:{required:"required",disabled:"disabled"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>_a)),multi:!0}]),t.ɵɵInheritDefinitionFeature],decls:12,vars:11,consts:[["operationInput",""],["auto","matAutocomplete"],[1,"mat-block",3,"formGroup"],["translate",""],["type","text","matInput","","formControlName","operation",3,"focusin","required","matAutocomplete"],["type","button","matSuffix","","mat-icon-button","","aria-label","Clear",3,"click",4,"ngIf"],[1,"tb-autocomplete",3,"displayWith"],[3,"value",4,"ngFor","ngForOf"],[3,"value",4,"ngIf"],["type","button","matSuffix","","mat-icon-button","","aria-label","Clear",3,"click"],[1,"material-icons"],[3,"value"],[3,"innerHTML"],[2,"display","block","overflow","hidden","text-overflow","ellipsis","white-space","nowrap"]],template:function(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"mat-form-field",2)(1,"mat-label",3),t.ɵɵtext(2,"tb.rulenode.functions-field-input"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"input",4,0),t.ɵɵlistener("focusin",(function(){return t.ɵɵrestoreView(e),t.ɵɵresetView(n.onFocus())})),t.ɵɵelementEnd(),t.ɵɵtemplate(5,La,3,0,"button",5),t.ɵɵelementStart(6,"mat-autocomplete",6,1),t.ɵɵtemplate(8,Pa,5,6,"mat-option",7),t.ɵɵpipe(9,"async"),t.ɵɵtemplate(10,Ra,3,1,"mat-option",8),t.ɵɵpipe(11,"async"),t.ɵɵelementEnd()()}if(2&e){let e;const r=t.ɵɵreference(7);t.ɵɵproperty("formGroup",n.mathFunctionForm),t.ɵɵadvance(3),t.ɵɵproperty("required",n.required)("matAutocomplete",r),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.mathFunctionForm.get("operation").value),t.ɵɵadvance(),t.ɵɵproperty("displayWith",n.mathFunctionDisplayFn),t.ɵɵadvance(2),t.ɵɵproperty("ngForOf",t.ɵɵpipeBind1(9,7,n.filteredOptions)),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!(null!=(e=t.ɵɵpipeBind1(11,9,n.filteredOptions))&&e.length))}},dependencies:t.ɵɵgetComponentDepsFactory(_a),encapsulation:2})}}function ja(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",8),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e.name," ")}}function Ga(e,n){if(1&e&&(t.ɵɵelementStart(0,"button",9),t.ɵɵpipe(1,"translate"),t.ɵɵelementStart(2,"mat-icon",10),t.ɵɵtext(3,"content_copy "),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext();t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(1,2,"tb.rulenode.copy-message-type")),t.ɵɵproperty("cbContent",e.messageTypeFormGroup.get("messageType").value)}}function Ka(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.message-type-value-required")," "))}function Ua(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.message-type-value-max-length")," "))}e("MathFunctionAutocompleteComponent",_a);class Ha{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 Y,this.messageTypeFormGroup=this.fb.group({messageTypeAlias:[null,[N.required]],messageType:[{value:null,disabled:!0},[N.maxLength(255)]]}),this.messageTypeFormGroup.get("messageTypeAlias").valueChanges.pipe(W(this.destroy$)).subscribe((e=>this.updateMessageTypeValue(e))),this.messageTypeFormGroup.valueChanges.pipe(W(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?[N.required,N.maxLength(255)]:[N.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)}static{this.ɵfac=function(e){return new(e||Ha)(t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Ha,selectors:[["tb-output-message-type-autocomplete"]],inputs:{subscriptSizing:"subscriptSizing",disabled:"disabled",required:"required"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>Ha)),multi:!0},{provide:O,useExisting:r((()=>Ha)),multi:!0}])],decls:15,vars:14,consts:[[1,"tb-form-row","no-border","no-padding","tb-standard-fields","column-xs",3,"formGroup"],["hideRequiredMarker","",1,"flex",3,"subscriptSizing"],["formControlName","messageTypeAlias"],[3,"value",4,"ngFor","ngForOf"],[1,"flex",3,"subscriptSizing","hideRequiredMarker"],["matInput","","type","text","formControlName","messageType"],["type","button","matSuffix","","mat-icon-button","","aria-label","Copy","ngxClipboard","",3,"cbContent","matTooltip",4,"ngIf"],[4,"ngIf"],[3,"value"],["type","button","matSuffix","","mat-icon-button","","aria-label","Copy","ngxClipboard","",3,"cbContent","matTooltip"],["aria-hidden","false","aria-label","help-icon"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label"),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"mat-select",2),t.ɵɵtemplate(6,ja,2,2,"mat-option",3),t.ɵɵelementEnd()(),t.ɵɵelementStart(7,"mat-form-field",4)(8,"mat-label"),t.ɵɵtext(9),t.ɵɵpipe(10,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(11,"input",5),t.ɵɵtemplate(12,Ga,4,4,"button",6)(13,Ka,3,3,"mat-error",7)(14,Ua,3,3,"mat-error",7),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.messageTypeFormGroup),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("subscriptSizing",n.subscriptSizing),t.ɵɵadvance(2),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(4,10,"tb.rulenode.output-message-type")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.messageTypes),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("subscriptSizing",n.subscriptSizing),t.ɵɵproperty("hideRequiredMarker",n.messageTypeFormGroup.get("messageType").disabled),t.ɵɵadvance(2),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(10,12,"tb.rulenode.message-type-value")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.messageTypeFormGroup.get("messageType").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.messageTypeFormGroup.get("messageType").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.messageTypeFormGroup.get("messageType").hasError("maxlength")))},dependencies:t.ɵɵgetComponentDepsFactory(Ha),encapsulation:2})}}e("OutputMessageTypeAutocompleteComponent",Ha),J([h()],Ha.prototype,"disabled",void 0),J([h()],Ha.prototype,"required",null);const za=(e,t)=>({keyText:e,valText:t});function $a(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,e.keyRequiredText)," ")}}function Qa(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,e.valRequiredText)," ")}}function Ja(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"div",10)(1,"mat-form-field",11),t.ɵɵelement(2,"input",12),t.ɵɵpipe(3,"translate"),t.ɵɵtemplate(4,$a,3,3,"mat-error",13),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"mat-form-field",11),t.ɵɵelement(6,"input",12),t.ɵɵpipe(7,"translate"),t.ɵɵtemplate(8,Qa,3,3,"mat-error",13),t.ɵɵelementEnd(),t.ɵɵelementStart(9,"button",14),t.ɵɵpipe(10,"translate"),t.ɵɵpipe(11,"async"),t.ɵɵlistener("click",(function(){const n=t.ɵɵrestoreView(e).index,r=t.ɵɵnextContext();return t.ɵɵresetView(r.removeKeyVal(n))})),t.ɵɵelementStart(12,"mat-icon"),t.ɵɵtext(13,"close"),t.ɵɵelementEnd()()()}if(2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("placeholder",t.ɵɵpipeBind1(3,10,r.keyText)),t.ɵɵproperty("formControl",e.get("key")),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",e.get("key").hasError("required")),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("placeholder",t.ɵɵpipeBind1(7,12,r.valText)),t.ɵɵproperty("formControl",e.get("value")),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",e.get("value").hasError("required")),t.ɵɵadvance(),t.ɵɵclassProp("!hidden",r.disabled),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(10,14,"tb.key-val.remove-entry")),t.ɵɵproperty("disabled",t.ɵɵpipeBind1(11,16,r.isLoading$))}}function Ya(e,n){if(1&e&&(t.ɵɵelement(0,"div",15),t.ɵɵpipe(1,"translate"),t.ɵɵpipe(2,"safe")),2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("innerHTML",t.ɵɵpipeBind2(2,3,t.ɵɵpipeBind1(1,1,e.hintText),"html"),t.ɵɵsanitizeHtml)}}class Wa extends y{get required(){return this.requiredValue}set required(e){this.requiredValue=Z(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(B),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,[N.required]],value:[e[n],[N.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:["",[N.required]],value:["",[N.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)}}static{this.ɵfac=function(e){return new(e||Wa)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(K.TranslateService),t.ɵɵdirectiveInject(t.Injector),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Wa,selectors:[["tb-kv-map-config-old"]],inputs:{disabled:"disabled",uniqueKeyValuePairValidator:"uniqueKeyValuePairValidator",requiredText:"requiredText",keyText:"keyText",keyRequiredText:"keyRequiredText",valText:"valText",valRequiredText:"valRequiredText",hintText:"hintText",required:"required"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>Wa)),multi:!0},{provide:O,useExisting:r((()=>Wa)),multi:!0}]),t.ɵɵInheritDefinitionFeature],decls:21,vars:26,consts:[[1,"tb-kv-map-config","flex","flex-col",3,"formGroup"],[1,"header","flex","flex-1","flex-row","gap-2"],[1,"cell","tb-required","flex-1"],["innerHTML",t.ɵɵtrustConstantHtml`&nbsp`,2,"width","52px"],[1,"body"],["class","row flex flex-row items-center justify-start gap-2","formArrayName","keyVals",4,"ngFor","ngForOf"],["class","tb-hint",3,"innerHTML",4,"ngIf"],[3,"error"],[2,"margin-top","16px"],["mat-button","","mat-raised-button","","color","primary","type","button","matTooltipPosition","above",3,"click","disabled","matTooltip"],["formArrayName","keyVals",1,"row","flex","flex-row","items-center","justify-start","gap-2"],[1,"cell","mat-block","flex-1"],["matInput","","required","",3,"formControl","placeholder"],[4,"ngIf"],["mat-icon-button","","color","primary","type","button","matTooltipPosition","above",3,"click","disabled","matTooltip"],[1,"tb-hint",3,"innerHTML"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"span",2),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"span",2),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(8,"span",3),t.ɵɵelementEnd(),t.ɵɵelementStart(9,"div",4),t.ɵɵtemplate(10,Ja,14,18,"div",5)(11,Ya,3,6,"div",6),t.ɵɵelementEnd(),t.ɵɵelement(12,"tb-error",7),t.ɵɵelementStart(13,"div",8)(14,"button",9),t.ɵɵpipe(15,"translate"),t.ɵɵpipe(16,"async"),t.ɵɵlistener("click",(function(){return n.addKeyVal()})),t.ɵɵelementStart(17,"mat-icon"),t.ɵɵtext(18,"add"),t.ɵɵelementEnd(),t.ɵɵtext(19),t.ɵɵpipe(20,"translate"),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.kvListFormGroup),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(4,13,n.keyText)),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(7,15,n.valText)),t.ɵɵadvance(2),t.ɵɵclassProp("!hidden",n.disabled),t.ɵɵadvance(2),t.ɵɵproperty("ngForOf",n.keyValsFormArray().controls),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.hintText),t.ɵɵadvance(),t.ɵɵproperty("error",n.ngControl.hasError("kvMapRequired")||n.ngControl.hasError("uniqueKeyValuePair")?n.ngControl.hasError("kvMapRequired")?n.translate.instant(n.requiredText):n.translate.instant("tb.key-val.unique-key-value-pair-error",t.ɵɵpureFunction2(23,za,n.translate.instant(n.keyText),n.translate.instant(n.valText))):""),t.ɵɵadvance(2),t.ɵɵclassProp("!hidden",n.disabled),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(15,17,"tb.key-val.add-entry")),t.ɵɵproperty("disabled",t.ɵɵpipeBind1(16,19,n.isLoading$)),t.ɵɵadvance(5),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(20,21,"action.add")," "))},dependencies:t.ɵɵgetComponentDepsFactory(Wa),styles:["[_nghost-%COMP%]   .tb-kv-map-config[_ngcontent-%COMP%]{margin-bottom:16px}[_nghost-%COMP%]   .tb-kv-map-config[_ngcontent-%COMP%]   .header[_ngcontent-%COMP%]{padding-left:5px;padding-right:5px;padding-bottom:5px}[_nghost-%COMP%]   .tb-kv-map-config[_ngcontent-%COMP%]   .header[_ngcontent-%COMP%]   .cell[_ngcontent-%COMP%]{padding-left:5px;padding-right:5px;color:#757575;font-size:12px;font-weight:700;white-space:nowrap}[_nghost-%COMP%]   .tb-kv-map-config[_ngcontent-%COMP%]   .header[_ngcontent-%COMP%]   .tb-required[_ngcontent-%COMP%]:after{color:#757575;font-size:12px;font-weight:700}[_nghost-%COMP%]   .tb-kv-map-config[_ngcontent-%COMP%]   .body[_ngcontent-%COMP%]{padding-left:5px;padding-right:5px;padding-bottom:0;max-height:300px;overflow:auto}[_nghost-%COMP%]   .tb-kv-map-config[_ngcontent-%COMP%]   .body[_ngcontent-%COMP%]   .cell[_ngcontent-%COMP%]{padding-left:5px;padding-right:5px}[_nghost-%COMP%]   .tb-kv-map-config[_ngcontent-%COMP%]   tb-error[_ngcontent-%COMP%]{display:block;margin-top:-12px}"]})}}function Xa(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-chip-option",4),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵpropertyInterpolate("selectable",r.chipControlGroup.get("chipControl").value!==e.value),t.ɵɵproperty("value",e.value),t.ɵɵadvance(),t.ɵɵtextInterpolate(e.name)}}e("KvMapConfigOldComponent",Wa);class Za{constructor(e,t){this.fb=e,this.translate=t,this.translation=Ht,this.propagateChange=()=>{},this.destroy$=new Y,this.selectOptions=[]}ngOnInit(){this.initOptions(),this.chipControlGroup=this.fb.group({chipControl:[null,[]]}),this.chipControlGroup.get("chipControl").valueChanges.pipe(ie(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})}static{this.ɵfac=function(e){return new(e||Za)(t.ɵɵdirectiveInject(k.FormBuilder),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Za,selectors:[["tb-msg-metadata-chip"]],inputs:{labelText:"labelText",translation:"translation"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>Za)),multi:!0}])],decls:5,vars:3,consts:[[1,"tb-form-row","space-between",3,"formGroup"],[1,"fixed-title-width"],["formControlName","chipControl"],["color","primary",3,"selectable","value",4,"ngFor","ngForOf"],["color","primary",3,"selectable","value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"div",0)(1,"div",1),t.ɵɵtext(2),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"mat-chip-listbox",2),t.ɵɵtemplate(4,Xa,2,3,"mat-chip-option",3),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.chipControlGroup),t.ɵɵadvance(2),t.ɵɵtextInterpolate(n.labelText),t.ɵɵadvance(2),t.ɵɵproperty("ngForOf",n.selectOptions))},dependencies:t.ɵɵgetComponentDepsFactory(Za),encapsulation:2})}}function ei(e,n){1&e&&(t.ɵɵelementStart(0,"div",13),t.ɵɵtext(1," tb.rulenode.map-fields-required "),t.ɵɵelementEnd())}function ti(e,n){if(1&e&&(t.ɵɵelementStart(0,"div",13),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e.requiredText," ")}}function ni(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",21),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e.value),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e.name," ")}}function ri(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"div",14)(1,"mat-form-field",15)(2,"mat-select",16),t.ɵɵtemplate(3,ni,2,2,"mat-option",17),t.ɵɵelementEnd()(),t.ɵɵelementStart(4,"mat-form-field",15),t.ɵɵelement(5,"input",18),t.ɵɵelementEnd(),t.ɵɵelementStart(6,"div",19)(7,"button",20),t.ɵɵpipe(8,"translate"),t.ɵɵpipe(9,"async"),t.ɵɵlistener("click",(function(){const n=t.ɵɵrestoreView(e).index,r=t.ɵɵnextContext();return t.ɵɵresetView(r.removeKeyVal(n))})),t.ɵɵelementStart(10,"mat-icon"),t.ɵɵtext(11,"delete"),t.ɵɵelementEnd()()()()}if(2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵadvance(2),t.ɵɵproperty("placeholder",r.selectText)("formControl",e.get("key")),t.ɵɵadvance(),t.ɵɵproperty("ngForOf",r.filterSelectOptions(e)),t.ɵɵadvance(2),t.ɵɵproperty("placeholder",r.valText)("formControl",e.get("value")),t.ɵɵadvance(2),t.ɵɵclassProp("tb-hidden",1===r.keyValsFormArray().controls.length),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(8,9,"tb.key-val.remove-mapping-entry")),t.ɵɵproperty("disabled",t.ɵɵpipeBind1(9,11,r.isLoading$))}}e("MsgMetadataChipComponent",Za);class ai extends y{constructor(e,t,n,r){super(e),this.store=e,this.translate=t,this.injector=n,this.fb=r,this.destroy$=new Y,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 w||e instanceof M){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 R(t,{})?null:t}}ngOnInit(){this.ngControl=this.injector.get(B),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(ie(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,[N.required]],value:[t.value,[N.required,N.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)P(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:["",[N.required]],value:["",[N.required,N.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]})),this.keyChangeSubscribe(this.keyValsFormArray().at(this.keyValsFormArray().length-1))}keyChangeSubscribe(e){this.sourceFieldSubcritption.push(e.get("key").valueChanges.pipe(ie(this.destroy$)).subscribe((t=>{const n=ct.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)}}static{this.ɵfac=function(e){return new(e||ai)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(K.TranslateService),t.ɵɵdirectiveInject(t.Injector),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:ai,selectors:[["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"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>ai)),multi:!0},{provide:O,useExisting:r((()=>ai)),multi:!0}]),t.ɵɵInheritDefinitionFeature],decls:22,vars:15,consts:[[1,"tb-form-panel","stroked",3,"formGroup"],[1,"tb-form-row","no-padding","no-border","space-between"],[1,"tb-form-panel-title"],["class","tb-form-panel-hint tb-error","translate","",4,"ngIf"],[1,"tb-form-panel","no-border","no-padding"],[1,"tb-form-table"],[1,"tb-form-table-header"],[1,"tb-form-table-header-cell","field-space"],[1,"tb-form-table-header-cell","actions-header"],[1,"tb-form-table-body"],["class","tb-form-table-row",4,"ngFor","ngForOf"],["type","button","mat-stroked-button","","color","primary",3,"click","disabled"],[3,"hintText","popupHelpLink"],["translate","",1,"tb-form-panel-hint","tb-error"],[1,"tb-form-table-row"],["appearance","outline","subscriptSizing","dynamic",1,"tb-inline-field","field-space"],["required","",3,"placeholder","formControl"],[3,"value",4,"ngFor","ngForOf"],["matInput","",3,"placeholder","formControl"],[1,"tb-form-table-row-cell-buttons"],["type","button","mat-icon-button","","matTooltipPosition","above",3,"click","disabled","matTooltip"],[3,"value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"div",2),t.ɵɵtext(3),t.ɵɵelementEnd(),t.ɵɵtemplate(4,ei,2,0,"div",3)(5,ti,2,1,"div",3),t.ɵɵelementEnd(),t.ɵɵelementStart(6,"div",4)(7,"div",5)(8,"div",6)(9,"div",7),t.ɵɵtext(10),t.ɵɵelementEnd(),t.ɵɵelementStart(11,"div",7),t.ɵɵtext(12),t.ɵɵelementEnd(),t.ɵɵelement(13,"div",8),t.ɵɵelementEnd(),t.ɵɵelementStart(14,"div",9),t.ɵɵtemplate(15,ri,12,13,"div",10),t.ɵɵelementEnd()()(),t.ɵɵelementStart(16,"div")(17,"button",11),t.ɵɵpipe(18,"async"),t.ɵɵlistener("click",(function(){return n.addKeyVal()})),t.ɵɵtext(19),t.ɵɵpipe(20,"translate"),t.ɵɵelementEnd()(),t.ɵɵelement(21,"tb-example-hint",12),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.svListFormGroup),t.ɵɵadvance(3),t.ɵɵtextInterpolate(n.labelText),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.svListFormGroup.hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.svListFormGroup.hasError("svMapRequired")),t.ɵɵadvance(5),t.ɵɵtextInterpolate(n.selectText),t.ɵɵadvance(2),t.ɵɵtextInterpolate(n.valText),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.keyValsFormArray().controls),t.ɵɵadvance(2),t.ɵɵproperty("disabled",t.ɵɵpipeBind1(18,11,n.isLoading$)||n.keyValsFormArray().length>=n.selectOptions.length),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(20,13,"tb.key-val.add-mapping-entry")," "),t.ɵɵadvance(2),t.ɵɵproperty("hintText",n.hintText)("popupHelpLink",n.popupHelpLink))},dependencies:t.ɵɵgetComponentDepsFactory(ai),styles:["[_nghost-%COMP%]   .field-space[_ngcontent-%COMP%]{flex:1 1 50%}[_nghost-%COMP%]   .actions-header[_ngcontent-%COMP%]{width:40px}"]})}}function ii(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",11),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.directionTypeTranslations.get(e))," ")}}e("SvMapConfigComponent",ai),J([h()],ai.prototype,"disabled",void 0),J([h()],ai.prototype,"required",void 0);class oi extends y{get required(){return this.requiredValue}set required(e){this.requiredValue=Z(e)}constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.keys(d),this.directionTypeTranslations=b,this.propagateChange=null}ngOnInit(){this.relationsQueryFormGroup=this.fb.group({fetchLastLevelOnly:[!1,[]],direction:[null,[N.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})}static{this.ɵfac=function(e){return new(e||oi)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:oi,selectors:[["tb-relations-query-config-old"]],inputs:{disabled:"disabled",required:"required"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>oi)),multi:!0}]),t.ɵɵInheritDefinitionFeature],decls:18,vars:8,consts:[[1,"flex","flex-col",3,"formGroup"],["formControlName","fetchLastLevelOnly"],[1,"flex","flex-row","gap-2"],[1,"mat-block",2,"min-width","100px"],["translate",""],["required","","matInput","","formControlName","direction"],[3,"value",4,"ngFor","ngForOf"],["floatLabel","always",1,"mat-block","flex-1"],["matInput","","type","number","min","1","step","1","formControlName","maxLevel",3,"placeholder"],["translate","",1,"mat-caption",2,"color","#6e6e6e"],["formControlName","filters"],[3,"value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-checkbox",1),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"div",2)(5,"mat-form-field",3)(6,"mat-label",4),t.ɵɵtext(7,"relation.direction"),t.ɵɵelementEnd(),t.ɵɵelementStart(8,"mat-select",5),t.ɵɵtemplate(9,ii,3,4,"mat-option",6),t.ɵɵelementEnd()(),t.ɵɵelementStart(10,"mat-form-field",7)(11,"mat-label",4),t.ɵɵtext(12,"tb.rulenode.max-relation-level"),t.ɵɵelementEnd(),t.ɵɵelement(13,"input",8),t.ɵɵpipe(14,"translate"),t.ɵɵelementEnd()(),t.ɵɵelementStart(15,"div",9),t.ɵɵtext(16,"relation.relation-filters"),t.ɵɵelementEnd(),t.ɵɵelement(17,"tb-relation-filters",10),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.relationsQueryFormGroup),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(3,4,"alias.last-level-relation")," "),t.ɵɵadvance(7),t.ɵɵproperty("ngForOf",n.directionTypes),t.ɵɵadvance(4),t.ɵɵpropertyInterpolate("placeholder",t.ɵɵpipeBind1(14,6,"tb.rulenode.unlimited-level")))},dependencies:t.ɵɵgetComponentDepsFactory(oi),encapsulation:2})}}e("RelationsQueryConfigOldComponent",oi);const li=e=>({latestTsKeyName:e}),si=e=>({inputName:e});function pi(e,n){1&e&&t.ɵɵelementContainer(0,9)}function mi(e,n){1&e&&t.ɵɵelementContainer(0,9)}function di(e,n){1&e&&t.ɵɵelementContainer(0,9)}function ui(e,n){1&e&&t.ɵɵelementContainer(0,9)}function ci(e,n){if(1&e&&(t.ɵɵelementStart(0,"div",10),t.ɵɵpipe(1,"translate"),t.ɵɵelementStart(2,"mat-slide-toggle",11),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext();t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind2(1,2,"tb.rulenode.fetch-latest-telemetry-with-timestamp-tooltip",t.ɵɵpureFunction1(7,li,e.attributeControlGroup.get("latestTsKeyNames").value[0]))),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(4,5,"tb.rulenode.fetch-latest-telemetry-with-timestamp")," ")}}function fi(e,n){1&e&&(t.ɵɵelementStart(0,"mat-icon",12),t.ɵɵpipe(1,"translate"),t.ɵɵpipe(2,"translate"),t.ɵɵtext(3,"help"),t.ɵɵelementEnd()),2&e&&t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind2(2,3,"tb.rulenode.chip-help",t.ɵɵpureFunction1(6,si,t.ɵɵpipeBind1(1,1,"tb.rulenode.field-name"))))}class gi{constructor(e,t){this.translate=e,this.fb=t,this.propagateChange=e=>{},this.destroy$=new Y,this.separatorKeysCodes=[U,H,z],this.onTouched=()=>{}}ngOnInit(){this.attributeControlGroup=this.fb.group({clientAttributeNames:[[],[]],sharedAttributeNames:[[],[]],serverAttributeNames:[[],[]],latestTsKeyNames:[[],[]],getLatestValueWithTs:[!1,[]]},{validators:this.atLeastOne(N.required,["clientAttributeNames","sharedAttributeNames","serverAttributeNames","latestTsKeyNames"])}),this.attributeControlGroup.valueChanges.pipe(ie(this.destroy$)).subscribe((e=>{this.propagateChange(this.preparePropagateValue(e))}))}preparePropagateValue(e){const t={};for(const n in e)t[n]="getLatestValueWithTs"===n||P(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()}static{this.ɵfac=function(e){return new(e||gi)(t.ɵɵdirectiveInject(K.TranslateService),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:gi,selectors:[["tb-select-attributes"]],inputs:{popupHelpLink:"popupHelpLink"},features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>gi)),multi:!0},{provide:O,useExisting:gi,multi:!0}])],decls:22,vars:34,consts:[["helpIcon",""],[1,"tb-form-panel","no-padding","no-border",3,"formGroup"],[3,"hintText","popupHelpLink"],["subscriptSizing","dynamic","editable","","formControlName","clientAttributeNames",1,"mat-block",3,"focusout","placeholder","label"],["matSuffix","",4,"ngTemplateOutlet"],["subscriptSizing","dynamic","editable","","formControlName","sharedAttributeNames",1,"mat-block",3,"focusout","placeholder","label"],["subscriptSizing","dynamic","editable","","formControlName","serverAttributeNames",1,"mat-block",3,"focusout","placeholder","label"],["subscriptSizing","dynamic","editable","","formControlName","latestTsKeyNames",1,"mat-block",3,"focusout","placeholder","label"],["class","tb-form-row no-border no-padding",3,"tb-hint-tooltip-icon",4,"ngIf"],["matSuffix",""],[1,"tb-form-row","no-border","no-padding",3,"tb-hint-tooltip-icon"],["formControlName","getLatestValueWithTs",1,"mat-slide"],["aria-hidden","false","aria-label","help-icon","color","primary",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"]],template:function(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"div",1),t.ɵɵelement(1,"tb-example-hint",2),t.ɵɵpipe(2,"translate"),t.ɵɵelementStart(3,"tb-string-items-list",3),t.ɵɵpipe(4,"translate"),t.ɵɵpipe(5,"translate"),t.ɵɵlistener("focusout",(function(){return t.ɵɵrestoreView(e),t.ɵɵresetView(n.onTouched())})),t.ɵɵtemplate(6,pi,1,0,"ng-container",4),t.ɵɵelementEnd(),t.ɵɵelementStart(7,"tb-string-items-list",5),t.ɵɵpipe(8,"translate"),t.ɵɵpipe(9,"translate"),t.ɵɵlistener("focusout",(function(){return t.ɵɵrestoreView(e),t.ɵɵresetView(n.onTouched())})),t.ɵɵtemplate(10,mi,1,0,"ng-container",4),t.ɵɵelementEnd(),t.ɵɵelementStart(11,"tb-string-items-list",6),t.ɵɵpipe(12,"translate"),t.ɵɵpipe(13,"translate"),t.ɵɵlistener("focusout",(function(){return t.ɵɵrestoreView(e),t.ɵɵresetView(n.onTouched())})),t.ɵɵtemplate(14,di,1,0,"ng-container",4),t.ɵɵelementEnd(),t.ɵɵelementStart(15,"tb-string-items-list",7),t.ɵɵpipe(16,"translate"),t.ɵɵpipe(17,"translate"),t.ɵɵlistener("focusout",(function(){return t.ɵɵrestoreView(e),t.ɵɵresetView(n.onTouched())})),t.ɵɵtemplate(18,ui,1,0,"ng-container",4),t.ɵɵelementEnd(),t.ɵɵtemplate(19,ci,5,9,"div",8),t.ɵɵelementEnd(),t.ɵɵtemplate(20,fi,4,8,"ng-template",null,0,t.ɵɵtemplateRefExtractor)}if(2&e){let e;const r=t.ɵɵreference(21);t.ɵɵproperty("formGroup",n.attributeControlGroup),t.ɵɵadvance(),t.ɵɵproperty("hintText",t.ɵɵpipeBind1(2,16,"tb.rulenode.kv-map-pattern-hint"))("popupHelpLink",n.popupHelpLink),t.ɵɵadvance(2),t.ɵɵproperty("placeholder",t.ɵɵpipeBind1(4,18,"tb.rulenode.add-attribute-key"))("label",t.ɵɵpipeBind1(5,20,"tb.rulenode.client-attributes")),t.ɵɵadvance(3),t.ɵɵproperty("ngTemplateOutlet",r),t.ɵɵadvance(),t.ɵɵproperty("placeholder",t.ɵɵpipeBind1(8,22,"tb.rulenode.add-attribute-key"))("label",t.ɵɵpipeBind1(9,24,"tb.rulenode.shared-attributes")),t.ɵɵadvance(3),t.ɵɵproperty("ngTemplateOutlet",r),t.ɵɵadvance(),t.ɵɵproperty("placeholder",t.ɵɵpipeBind1(12,26,"tb.rulenode.add-attribute-key"))("label",t.ɵɵpipeBind1(13,28,"tb.rulenode.server-attributes")),t.ɵɵadvance(3),t.ɵɵproperty("ngTemplateOutlet",r),t.ɵɵadvance(),t.ɵɵproperty("placeholder",t.ɵɵpipeBind1(16,30,"tb.rulenode.add-telemetry-key"))("label",t.ɵɵpipeBind1(17,32,"tb.rulenode.latest-telemetry")),t.ɵɵadvance(3),t.ɵɵproperty("ngTemplateOutlet",r),t.ɵɵadvance(),t.ɵɵproperty("ngIf",(null==(e=n.attributeControlGroup.get("latestTsKeyNames").value)?null:e.length)>0)}},dependencies:t.ɵɵgetComponentDepsFactory(gi),encapsulation:2})}}e("SelectAttributesComponent",gi);class hi extends y{constructor(e,t){super(e),this.store=e,this.fb=t,this.propagateChange=null,this.destroy$=new Y,this.alarmStatus=x,this.alarmStatusTranslations=C}ngOnInit(){this.alarmStatusGroup=this.fb.group({alarmStatus:[null,[]]}),this.alarmStatusGroup.get("alarmStatus").valueChanges.pipe(ie(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})}static{this.ɵfac=function(e){return new(e||hi)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:hi,selectors:[["tb-alarm-status-select"]],features:[t.ɵɵProvidersFeature([{provide:V,useExisting:r((()=>hi)),multi:!0}]),t.ɵɵInheritDefinitionFeature],decls:16,vars:17,consts:[[1,"flex","flex-col","items-center","justify-center",3,"formGroup"],["multiple","","formControlName","alarmStatus",1,"chip-listbox","flex","flex-col"],[1,"toggle-column"],[1,"option","flex-1",3,"value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-chip-listbox",1)(2,"div",2)(3,"mat-chip-option",3),t.ɵɵtext(4),t.ɵɵpipe(5,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(6,"mat-chip-option",3),t.ɵɵtext(7),t.ɵɵpipe(8,"translate"),t.ɵɵelementEnd()(),t.ɵɵelementStart(9,"div",2)(10,"mat-chip-option",3),t.ɵɵtext(11),t.ɵɵpipe(12,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(13,"mat-chip-option",3),t.ɵɵtext(14),t.ɵɵpipe(15,"translate"),t.ɵɵelementEnd()()()()),2&e&&(t.ɵɵproperty("formGroup",n.alarmStatusGroup),t.ɵɵadvance(3),t.ɵɵproperty("value",n.alarmStatus.ACTIVE_UNACK),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(5,9,n.alarmStatusTranslations.get(n.alarmStatus.ACTIVE_UNACK))," "),t.ɵɵadvance(2),t.ɵɵproperty("value",n.alarmStatus.ACTIVE_ACK),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(8,11,n.alarmStatusTranslations.get(n.alarmStatus.ACTIVE_ACK))," "),t.ɵɵadvance(3),t.ɵɵproperty("value",n.alarmStatus.CLEARED_UNACK),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(12,13,n.alarmStatusTranslations.get(n.alarmStatus.CLEARED_UNACK))," "),t.ɵɵadvance(2),t.ɵɵproperty("value",n.alarmStatus.CLEARED_ACK),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(15,15,n.alarmStatusTranslations.get(n.alarmStatus.CLEARED_ACK))," "))},dependencies:t.ɵɵgetComponentDepsFactory(hi),styles:["[_nghost-%COMP%]   .chip-listbox[_ngcontent-%COMP%]{max-width:460px;width:100%}[_nghost-%COMP%]   .chip-listbox[_ngcontent-%COMP%]   .toggle-column[_ngcontent-%COMP%]{display:flex;flex:1 1 100%;gap:8px}[_nghost-%COMP%]   .chip-listbox[_ngcontent-%COMP%]   .option[_ngcontent-%COMP%]{margin:0}@media screen and (max-width: 959px){[_nghost-%COMP%]   .chip-listbox[_ngcontent-%COMP%]{max-width:360px}[_nghost-%COMP%]   .chip-listbox[_ngcontent-%COMP%]   .toggle-column[_ngcontent-%COMP%]{flex-direction:column}}[_nghost-%COMP%]     .chip-listbox .mdc-evolution-chip-set__chips{gap:8px}[_nghost-%COMP%]     .chip-listbox .option button{flex-basis:100%;justify-content:start}[_nghost-%COMP%]     .chip-listbox .option .mdc-evolution-chip__graphic{flex-grow:0}"]})}}e("AlarmStatusSelectComponent",hi);const yi=()=>({maxWidth:"820px"});function bi(e,n){if(1&e&&(t.ɵɵelement(0,"div",3),t.ɵɵpipe(1,"translate")),2&e){const e=t.ɵɵnextContext();t.ɵɵpropertyInterpolate("tb-help-popup",e.popupHelpLink),t.ɵɵpropertyInterpolate("trigger-text",t.ɵɵpipeBind1(1,3,"tb.key-val.see-examples")),t.ɵɵproperty("tb-help-popup-style",t.ɵɵpureFunction0(5,yi))}}class vi{constructor(){this.textAlign="left"}static{this.ɵfac=function(e){return new(e||vi)}}static{this.ɵcmp=t.ɵɵdefineComponent({type:vi,selectors:[["tb-example-hint"]],inputs:{hintText:"hintText",popupHelpLink:"popupHelpLink",textAlign:"textAlign"},decls:5,vars:10,consts:[[1,"tb-form-hint","tb-primary-fill","space-between",3,"hidden"],[1,"hint-text",3,"innerHTML"],["class","see-example","hintMode","","tb-help-popup-placement","right","trigger-style","letter-spacing:0.25px; font-size:12px",3,"tb-help-popup","tb-help-popup-style","trigger-text",4,"ngIf"],["hintMode","","tb-help-popup-placement","right","trigger-style","letter-spacing:0.25px; font-size:12px",1,"see-example",3,"tb-help-popup","tb-help-popup-style","trigger-text"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"div",0),t.ɵɵelement(1,"div",1),t.ɵɵpipe(2,"translate"),t.ɵɵpipe(3,"safe"),t.ɵɵtemplate(4,bi,2,6,"div",2),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("hidden",!n.hintText),t.ɵɵadvance(),t.ɵɵstyleProp("text-align",n.textAlign),t.ɵɵproperty("innerHTML",t.ɵɵpipeBind2(3,7,t.ɵɵpipeBind1(2,5,n.hintText),"html"),t.ɵɵsanitizeHtml),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.popupHelpLink))},dependencies:t.ɵɵgetComponentDepsFactory(vi),styles:["[_nghost-%COMP%]   .space-between[_ngcontent-%COMP%]{display:flex;justify-content:space-between;gap:20px}[_nghost-%COMP%]   .space-between[_ngcontent-%COMP%]   .see-example[_ngcontent-%COMP%]{display:flex;flex-shrink:0}[_nghost-%COMP%]   .hint-text[_ngcontent-%COMP%]{width:100%}"]})}}e("ExampleHintComponent",vi);class xi{static{this.ɵfac=function(e){return new(e||xi)}}static{this.ɵmod=t.ɵɵdefineNgModule({type:xi})}static{this.ɵinj=t.ɵɵdefineInjector({imports:[$,S,Q,_r,zr,Wr,ma,va,Oa,_a,Ha,Wa,Za,ai,oi,gi,hi,vi]})}}e("RulenodeCoreConfigCommonModule",xi),("undefined"==typeof ngJitMode||ngJitMode)&&t.ɵɵsetNgModuleScope(xi,{declarations:[_r,zr,Wr,ma,va,Oa,_a,Ha,Wa,Za,ai,oi,gi,hi,vi],imports:[$,S,Q],exports:[_r,zr,Wr,ma,va,Oa,_a,Ha,Wa,Za,ai,oi,gi,hi,vi]});class Ci{static{this.ɵfac=function(e){return new(e||Ci)}}static{this.ɵmod=t.ɵɵdefineNgModule({type:Ci})}static{this.ɵinj=t.ɵɵdefineInjector({imports:[$,S,Q,xi,Cr,ce,mr,rr,Vn,se,Ce,Re,He,$n,Ye,st,qn,Pn,er,lr,cr,fr,We,Zn,Yn,wr,Br]})}}e("RuleNodeCoreConfigActionModule",Ci),("undefined"==typeof ngJitMode||ngJitMode)&&t.ɵɵsetNgModuleScope(Ci,{declarations:[Cr,ce,mr,rr,Vn,se,Ce,Re,He,$n,Ye,st,qn,Pn,er,lr,cr,fr,We,Zn,Yn,wr,Br],imports:[$,S,Q,xi],exports:[Cr,ce,mr,rr,Vn,se,Ce,Re,He,$n,Ye,st,qn,Pn,er,lr,cr,fr,We,Zn,Yn,wr,Br]});const Si=e=>({inputValueKey:e}),Ti=e=>({periodValueKey:e}),Ii=(e,t)=>({outputValueKey:e,periodValueKey:t}),Ei=e=>({outputValueKey:e});function Fi(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.input-value-key-required")," "))}function qi(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.output-value-key-required")," "))}function Ai(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.number-of-digits-after-floating-point-range")," "))}function ki(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.number-of-digits-after-floating-point-range")," "))}function Ni(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.period-value-key-required")," "))}function wi(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",16)(1,"mat-label"),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",17),t.ɵɵtemplate(5,Ni,3,3,"mat-error",4),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(2),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(3,2,"tb.rulenode.period-value-key")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.calculateDeltaConfigForm.get("periodValueKey").hasError("required"))}}class Mi extends i{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n,this.separatorKeysCodes=[U,H,z]}configForm(){return this.calculateDeltaConfigForm}onConfigurationSet(e){this.calculateDeltaConfigForm=this.fb.group({inputValueKey:[e.inputValueKey,[N.required,N.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],outputValueKey:[e.outputValueKey,[N.required,N.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],useCache:[e.useCache,[]],addPeriodBetweenMsgs:[e.addPeriodBetweenMsgs,[]],periodValueKey:[e.periodValueKey,[]],round:[e.round,[N.min(0),N.max(15)]],tellFailureIfDeltaIsNegative:[e.tellFailureIfDeltaIsNegative,[]],excludeZeroDeltas:[e.excludeZeroDeltas,[]]})}prepareInputConfig(e){return{inputValueKey:P(e?.inputValueKey)?e.inputValueKey:null,outputValueKey:P(e?.outputValueKey)?e.outputValueKey:null,useCache:!P(e?.useCache)||e.useCache,addPeriodBetweenMsgs:!!P(e?.addPeriodBetweenMsgs)&&e.addPeriodBetweenMsgs,periodValueKey:P(e?.periodValueKey)?e.periodValueKey:null,round:P(e?.round)?e.round:null,tellFailureIfDeltaIsNegative:!P(e?.tellFailureIfDeltaIsNegative)||e.tellFailureIfDeltaIsNegative,excludeZeroDeltas:!!P(e?.excludeZeroDeltas)&&e.excludeZeroDeltas}}prepareOutputConfig(e){return _(e)}updateValidators(e){this.calculateDeltaConfigForm.get("addPeriodBetweenMsgs").value?this.calculateDeltaConfigForm.get("periodValueKey").setValidators([N.required]):this.calculateDeltaConfigForm.get("periodValueKey").setValidators([]),this.calculateDeltaConfigForm.get("periodValueKey").updateValueAndValidity({emitEvent:e})}validatorTriggers(){return["addPeriodBetweenMsgs"]}static{this.ɵfac=function(e){return new(e||Mi)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(K.TranslateService),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Mi,selectors:[["tb-enrichment-node-calculate-delta-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:50,vars:69,consts:[[3,"formGroup"],[1,"gt-sm:flex","gt-sm:flex-row","gt-sm:gap-5.5"],[1,"mat-block","flex-1"],["matInput","","formControlName","inputValueKey"],[4,"ngIf"],["matInput","","formControlName","outputValueKey"],["type","number","min","0","max","15","step","1","matInput","","formControlName","round"],[1,"tb-form-panel","no-padding","no-border"],[1,"tb-form-row","same-padding",3,"tb-hint-tooltip-icon"],["formControlName","tellFailureIfDeltaIsNegative",1,"mat-slide","margin"],["formControlName","useCache",1,"mat-slide","margin"],[1,"tb-form-panel","stroked"],[1,"tb-form-row","no-border","no-padding",3,"tb-hint-tooltip-icon"],["formControlName","addPeriodBetweenMsgs",1,"mat-slide"],["class","mat-block",4,"ngIf"],["formControlName","excludeZeroDeltas",1,"mat-slide","margin"],[1,"mat-block"],["required","","matInput","","formControlName","periodValueKey"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"mat-form-field",2)(3,"mat-label"),t.ɵɵtext(4),t.ɵɵpipe(5,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(6,"input",3),t.ɵɵtemplate(7,Fi,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(8,"mat-form-field",2)(9,"mat-label"),t.ɵɵtext(10),t.ɵɵpipe(11,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(12,"input",5),t.ɵɵtemplate(13,qi,3,3,"mat-error",4),t.ɵɵelementEnd()(),t.ɵɵelementStart(14,"mat-form-field",2)(15,"mat-label"),t.ɵɵtext(16),t.ɵɵpipe(17,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(18,"input",6),t.ɵɵtemplate(19,Ai,3,3,"mat-error",4)(20,ki,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(21,"div",7)(22,"div",8),t.ɵɵpipe(23,"translate"),t.ɵɵelementStart(24,"mat-slide-toggle",9),t.ɵɵtext(25),t.ɵɵpipe(26,"translate"),t.ɵɵelementEnd()(),t.ɵɵelementStart(27,"div",8),t.ɵɵpipe(28,"translate"),t.ɵɵpipe(29,"translate"),t.ɵɵelementStart(30,"mat-slide-toggle",10),t.ɵɵtext(31),t.ɵɵpipe(32,"translate"),t.ɵɵelementEnd()(),t.ɵɵelementStart(33,"div",11)(34,"div",12),t.ɵɵpipe(35,"translate"),t.ɵɵelementStart(36,"mat-slide-toggle",13),t.ɵɵtext(37),t.ɵɵpipe(38,"translate"),t.ɵɵpipe(39,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(40,wi,6,4,"mat-form-field",14),t.ɵɵelementEnd(),t.ɵɵelementStart(41,"div",8),t.ɵɵpipe(42,"translate"),t.ɵɵpipe(43,"translate"),t.ɵɵpipe(44,"translate"),t.ɵɵpipe(45,"translate"),t.ɵɵpipe(46,"translate"),t.ɵɵelementStart(47,"mat-slide-toggle",15),t.ɵɵtext(48),t.ɵɵpipe(49,"translate"),t.ɵɵelementEnd()()()()),2&e&&(t.ɵɵproperty("formGroup",n.calculateDeltaConfigForm),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(5,19,"tb.rulenode.input-value-key")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.calculateDeltaConfigForm.get("inputValueKey").hasError("required")||n.calculateDeltaConfigForm.get("inputValueKey").hasError("pattern")),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(11,21,"tb.rulenode.output-value-key")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.calculateDeltaConfigForm.get("outputValueKey").hasError("required")||n.calculateDeltaConfigForm.get("outputValueKey").hasError("pattern")),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(17,23,"tb.rulenode.number-of-digits-after-floating-point")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.calculateDeltaConfigForm.get("round").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.calculateDeltaConfigForm.get("round").hasError("max")),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(23,25,"tb.rulenode.failure-if-delta-negative-tooltip")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(26,27,"tb.rulenode.failure-if-delta-negative")," "),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind2(29,31,"tb.rulenode.use-caching-tooltip",t.ɵɵpureFunction1(58,Si,n.calculateDeltaConfigForm.get("inputValueKey").valid?n.calculateDeltaConfigForm.get("inputValueKey").value:t.ɵɵpipeBind1(28,29,"tb.rulenode.input-value-key")))),t.ɵɵadvance(4),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(32,34,"tb.rulenode.use-caching")," "),t.ɵɵadvance(2),t.ɵɵclassProp("no-padding-bottom",n.calculateDeltaConfigForm.get("addPeriodBetweenMsgs").value),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind2(35,36,"tb.rulenode.add-time-difference-between-readings-tooltip",t.ɵɵpureFunction1(60,Ti,n.calculateDeltaConfigForm.get("periodValueKey").valid&&n.calculateDeltaConfigForm.get("addPeriodBetweenMsgs").value?n.calculateDeltaConfigForm.get("periodValueKey").value:"periodInMs"))),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind2(39,41,"tb.rulenode.add-time-difference-between-readings",t.ɵɵpureFunction1(62,Si,n.calculateDeltaConfigForm.get("inputValueKey").valid?n.calculateDeltaConfigForm.get("inputValueKey").value:t.ɵɵpipeBind1(38,39,"tb.rulenode.input-value-key")))," "),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.calculateDeltaConfigForm.get("addPeriodBetweenMsgs").value),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",n.calculateDeltaConfigForm.get("addPeriodBetweenMsgs").value?t.ɵɵpipeBind2(44,48,"tb.rulenode.exclude-zero-deltas-time-difference-hint",t.ɵɵpureFunction2(64,Ii,n.calculateDeltaConfigForm.get("outputValueKey").valid?n.calculateDeltaConfigForm.get("outputValueKey").value:t.ɵɵpipeBind1(42,44,"tb.rulenode.output-value-key"),n.calculateDeltaConfigForm.get("periodValueKey").valid?n.calculateDeltaConfigForm.get("periodValueKey").value:t.ɵɵpipeBind1(43,46,"tb.rulenode.period-value-key"))):t.ɵɵpipeBind2(46,53,"tb.rulenode.exclude-zero-deltas-hint",t.ɵɵpureFunction1(67,Ei,n.calculateDeltaConfigForm.get("outputValueKey").valid?n.calculateDeltaConfigForm.get("outputValueKey").value:t.ɵɵpipeBind1(45,51,"tb.rulenode.output-value-key")))),t.ɵɵadvance(7),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(49,56,"tb.rulenode.exclude-zero-deltas")," "))},dependencies:t.ɵɵgetComponentDepsFactory(Mi),encapsulation:2})}}function Bi(e,n){if(1&e&&(t.ɵɵelementStart(0,"tb-toggle-option",8),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e.value),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e.name," ")}}e("CalculateDeltaConfigComponent",Mi);class Vi extends i{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.fetchToData=[],this.DataToFetch=Ft;for(const e of qt.keys())e!==Ft.FIELDS&&this.fetchToData.push({value:e,name:this.translate.instant(qt.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,_(e)}prepareInputConfig(e){let t,n;return t=P(e?.telemetry)?e.telemetry?Ft.LATEST_TELEMETRY:Ft.ATTRIBUTES:P(e?.dataToFetch)?e.dataToFetch:Ft.ATTRIBUTES,n=P(e?.attrMapping)?e.attrMapping:P(e?.dataMapping)?e.dataMapping:null,{dataToFetch:t,dataMapping:n,fetchTo:P(e?.fetchTo)?e.fetchTo:Kt.METADATA}}selectTranslation(e,t){return this.customerAttributesConfigForm.get("dataToFetch").value===Ft.LATEST_TELEMETRY?e:t}onConfigurationSet(e){this.customerAttributesConfigForm=this.fb.group({dataToFetch:[e.dataToFetch,[]],dataMapping:[e.dataMapping,[N.required]],fetchTo:[e.fetchTo]})}static{this.ɵfac=function(e){return new(e||Vi)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Vi,selectors:[["tb-enrichment-node-customer-attributes-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:17,vars:26,consts:[[1,"tb-form-panel","stroked",3,"formGroup"],["translate","",1,"tb-form-panel-title"],[1,"flex","flex-1","items-center","justify-center"],[1,"fetch-to-data-toggle"],["formControlName","dataToFetch","appearance","fill",1,"fetch-to-data-toggle"],[3,"value",4,"ngFor","ngForOf"],["required","","formControlName","dataMapping","popupHelpLink","rulenode/customer_attributes_node_fields_templatization",3,"requiredText","labelText","keyText","keyRequiredText","valText","valRequiredText","hintText"],["formControlName","fetchTo",3,"labelText"],[3,"value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1),t.ɵɵtext(2,"tb.rulenode.mapping-of-customers"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"div",2)(4,"div",3)(5,"tb-toggle-select",4),t.ɵɵtemplate(6,Bi,2,2,"tb-toggle-option",5),t.ɵɵelementEnd()()(),t.ɵɵelement(7,"tb-kv-map-config",6),t.ɵɵpipe(8,"translate"),t.ɵɵpipe(9,"translate"),t.ɵɵpipe(10,"translate"),t.ɵɵpipe(11,"translate"),t.ɵɵpipe(12,"translate"),t.ɵɵpipe(13,"translate"),t.ɵɵelement(14,"tb-msg-metadata-chip",7),t.ɵɵpipe(15,"translate"),t.ɵɵpipe(16,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.customerAttributesConfigForm),t.ɵɵadvance(6),t.ɵɵproperty("ngForOf",n.fetchToData),t.ɵɵadvance(),t.ɵɵproperty("requiredText",t.ɵɵpipeBind1(8,10,"tb.rulenode.attr-mapping-required"))("labelText",t.ɵɵpipeBind1(9,12,n.selectTranslation("tb.rulenode.latest-telemetry-mapping","tb.rulenode.attributes-mapping")))("keyText",t.ɵɵpipeBind1(10,14,n.selectTranslation("tb.rulenode.source-telemetry","tb.rulenode.source-attribute")))("keyRequiredText",t.ɵɵpipeBind1(11,16,n.selectTranslation("tb.rulenode.source-telemetry-required","tb.rulenode.source-attribute-required")))("valText",t.ɵɵpipeBind1(12,18,"tb.rulenode.target-key"))("valRequiredText",t.ɵɵpipeBind1(13,20,"tb.rulenode.target-key-required"))("hintText","tb.rulenode.kv-map-pattern-hint"),t.ɵɵadvance(7),t.ɵɵproperty("labelText",n.customerAttributesConfigForm.get("dataToFetch").value===n.DataToFetch.LATEST_TELEMETRY?t.ɵɵpipeBind1(15,22,"tb.rulenode.add-mapped-latest-telemetry-to"):t.ɵɵpipeBind1(16,24,"tb.rulenode.add-mapped-attribute-to")))},dependencies:t.ɵɵgetComponentDepsFactory(Vi),styles:["[_nghost-%COMP%]   .fetch-to-data-toggle[_ngcontent-%COMP%]{max-width:420px;width:100%}"]})}}e("CustomerAttributesConfigComponent",Vi);class Oi extends i{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,[N.required]],tellFailureIfAbsent:[e.tellFailureIfAbsent,[]],fetchTo:[e.fetchTo,[]],attributesControl:[e.attributesControl,[]]})}prepareInputConfig(e){return j(e)&&(e.attributesControl={clientAttributeNames:P(e?.clientAttributeNames)?e.clientAttributeNames:[],latestTsKeyNames:P(e?.latestTsKeyNames)?e.latestTsKeyNames:[],serverAttributeNames:P(e?.serverAttributeNames)?e.serverAttributeNames:[],sharedAttributeNames:P(e?.sharedAttributeNames)?e.sharedAttributeNames:[],getLatestValueWithTs:!!P(e?.getLatestValueWithTs)&&e.getLatestValueWithTs}),{deviceRelationsQuery:P(e?.deviceRelationsQuery)?e.deviceRelationsQuery:null,tellFailureIfAbsent:!P(e?.tellFailureIfAbsent)||e.tellFailureIfAbsent,fetchTo:P(e?.fetchTo)?e.fetchTo:Kt.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}static{this.ɵfac=function(e){return new(e||Oi)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(K.TranslateService),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Oi,selectors:[["tb-enrichment-node-device-attributes-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:19,vars:11,consts:[[1,"tb-form-panel","no-padding","no-border",3,"formGroup"],[1,"tb-form-panel","stroked","no-padding-bottom"],["translate","",1,"tb-form-panel-title"],["required","","formControlName","deviceRelationsQuery"],[1,"tb-form-panel","stroked"],[1,"tb-form-row","no-padding","no-border","space-between"],["translate","",1,"tb-form-panel-title","tb-required"],["translate","",1,"tb-form-panel-hint","tb-error",3,"hidden"],["formControlName","attributesControl","popupHelpLink","rulenode/related_device_attributes_node_fields_templatization"],["formControlName","fetchTo",3,"labelText"],[1,"tb-form-row","same-padding",3,"tb-hint-tooltip-icon"],["formControlName","tellFailureIfAbsent",1,"mat-slide","margin"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"div",2),t.ɵɵtext(3,"tb.rulenode.device-relations-query"),t.ɵɵelementEnd(),t.ɵɵelement(4,"tb-device-relations-query-config",3),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"div",4)(6,"div",5)(7,"div",6),t.ɵɵtext(8,"tb.rulenode.related-device-attributes"),t.ɵɵelementEnd(),t.ɵɵelementStart(9,"div",7),t.ɵɵtext(10," tb.rulenode.at-least-one-field-required "),t.ɵɵelementEnd()(),t.ɵɵelement(11,"tb-select-attributes",8)(12,"tb-msg-metadata-chip",9),t.ɵɵpipe(13,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(14,"div",10),t.ɵɵpipe(15,"translate"),t.ɵɵelementStart(16,"mat-slide-toggle",11),t.ɵɵtext(17),t.ɵɵpipe(18,"translate"),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.deviceAttributesConfigForm),t.ɵɵadvance(9),t.ɵɵproperty("hidden",!(n.deviceAttributesConfigForm.get("attributesControl").touched&&n.deviceAttributesConfigForm.get("attributesControl").hasError("atLeastOneRequired"))),t.ɵɵadvance(3),t.ɵɵproperty("labelText",t.ɵɵpipeBind1(13,5,"tb.rulenode.add-selected-attributes-to")),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(15,7,"tb.rulenode.tell-failure-tooltip")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(18,9,"tb.rulenode.tell-failure")," "))},dependencies:t.ɵɵgetComponentDepsFactory(Oi),encapsulation:2})}}e("DeviceAttributesConfigComponent",Oi);const Di=e=>({inputName:e});class Li extends i{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n,this.predefinedValues=[];for(const e of Object.keys(xt))this.predefinedValues.push({value:xt[e],name:this.translate.instant(Ct.get(xt[e]))})}ngOnInit(){super.ngOnInit()}configForm(){return this.entityDetailsConfigForm}prepareInputConfig(e){let t;return t=P(e?.addToMetadata)?e.addToMetadata?Kt.METADATA:Kt.DATA:e?.fetchTo?e.fetchTo:Kt.DATA,{detailsList:P(e?.detailsList)?e.detailsList:null,fetchTo:t}}onConfigurationSet(e){this.entityDetailsConfigForm=this.fb.group({detailsList:[e.detailsList,[N.required]],fetchTo:[e.fetchTo,[]]})}static{this.ɵfac=function(e){return new(e||Li)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(K.TranslateService),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Li,selectors:[["tb-enrichment-node-entity-details-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:11,vars:22,consts:[[3,"formGroup"],["required","","formControlName","detailsList",1,"mat-block",3,"predefinedValues","label","placeholder","requiredText"],["matSuffix","","aria-hidden","false","aria-label","help-icon","color","primary",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"],["formControlName","fetchTo",3,"labelText"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"tb-string-items-list",1),t.ɵɵpipe(2,"translate"),t.ɵɵpipe(3,"translate"),t.ɵɵpipe(4,"translate"),t.ɵɵelementStart(5,"mat-icon",2),t.ɵɵpipe(6,"translate"),t.ɵɵpipe(7,"translate"),t.ɵɵtext(8," help "),t.ɵɵelementEnd()(),t.ɵɵelement(9,"tb-msg-metadata-chip",3),t.ɵɵpipe(10,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.entityDetailsConfigForm),t.ɵɵadvance(),t.ɵɵproperty("predefinedValues",n.predefinedValues)("label",t.ɵɵpipeBind1(2,7,"tb.rulenode.select-details"))("placeholder",t.ɵɵpipeBind1(3,9,"tb.rulenode.add-detail"))("requiredText",t.ɵɵpipeBind1(4,11,"tb.rulenode.entity-details-list-empty")),t.ɵɵadvance(4),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind2(7,15,"tb.rulenode.chip-help",t.ɵɵpureFunction1(20,Di,t.ɵɵpipeBind1(6,13,"tb.rulenode.detail")))),t.ɵɵadvance(4),t.ɵɵproperty("labelText",t.ɵɵpipeBind1(10,18,"tb.rulenode.add-selected-details-to")))},dependencies:t.ɵɵgetComponentDepsFactory(Li),encapsulation:2})}}e("EntityDetailsConfigComponent",Li);const Pi=()=>({maxWidth:"820px"}),Ri=e=>({inputName:e}),_i=(e,t,n,r)=>({startInterval:e,endInterval:t,startIntervalTimeUnit:n,endIntervalTimeUnit:r});function ji(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.start-interval-value-required")," "))}function Gi(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.time-value-range")," "))}function Ki(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.time-value-range")," "))}function Ui(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",29),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(2);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.timeUnitsTranslationMap.get(e))," ")}}function Hi(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.end-interval-value-required")," "))}function zi(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.time-value-range")," "))}function $i(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.time-value-range")," "))}function Qi(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",29),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(2);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.timeUnitsTranslationMap.get(e))," ")}}function Ji(e,n){if(1&e&&(t.ɵɵelementContainerStart(0),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementContainerEnd()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind2(2,1,"tb.rulenode.fetch-timeseries-from-to",t.ɵɵpureFunction4(4,_i,e.getTelemetryFromDatabaseConfigForm.get("interval.startInterval").value,e.getTelemetryFromDatabaseConfigForm.get("interval.endInterval").value,e.getTelemetryFromDatabaseConfigForm.get("interval.startIntervalTimeUnit").value.toLowerCase(),e.getTelemetryFromDatabaseConfigForm.get("interval.endIntervalTimeUnit").value.toLowerCase()))," ")}}function Yi(e,n){1&e&&(t.ɵɵtext(0),t.ɵɵpipe(1,"translate")),2&e&&t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(1,1,"tb.rulenode.fetch-timeseries-from-to-invalid")," ")}function Wi(e,n){if(1&e&&(t.ɵɵelementStart(0,"div",17)(1,"div",18)(2,"mat-form-field",19)(3,"mat-label"),t.ɵɵtext(4),t.ɵɵpipe(5,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(6,"input",20),t.ɵɵtemplate(7,ji,3,3,"mat-error",16)(8,Gi,3,3,"mat-error",16)(9,Ki,3,3,"mat-error",16),t.ɵɵelementEnd(),t.ɵɵelementStart(10,"mat-form-field",21)(11,"mat-label"),t.ɵɵtext(12),t.ɵɵpipe(13,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(14,"mat-select",22),t.ɵɵtemplate(15,Ui,3,4,"mat-option",14),t.ɵɵelementEnd()()(),t.ɵɵelementStart(16,"div",18)(17,"mat-form-field",19)(18,"mat-label"),t.ɵɵtext(19),t.ɵɵpipe(20,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(21,"input",23),t.ɵɵtemplate(22,Hi,3,3,"mat-error",16)(23,zi,3,3,"mat-error",16)(24,$i,3,3,"mat-error",16),t.ɵɵelementEnd(),t.ɵɵelementStart(25,"mat-form-field",21)(26,"mat-label"),t.ɵɵtext(27),t.ɵɵpipe(28,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(29,"mat-select",24),t.ɵɵtemplate(30,Qi,3,4,"mat-option",14),t.ɵɵelementEnd()()(),t.ɵɵelementStart(31,"div",25)(32,"mat-icon",26),t.ɵɵtext(33,"error_outline"),t.ɵɵelementEnd(),t.ɵɵelementStart(34,"div",27),t.ɵɵtemplate(35,Ji,3,9,"ng-container",28)(36,Yi,2,3,"ng-template",null,1,t.ɵɵtemplateRefExtractor),t.ɵɵelementEnd()()()),2&e){const e=t.ɵɵreference(37),n=t.ɵɵnextContext();t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(5,16,"tb.rulenode.interval-start")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.getTelemetryFromDatabaseConfigForm.get("interval.startInterval").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.getTelemetryFromDatabaseConfigForm.get("interval.startInterval").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.getTelemetryFromDatabaseConfigForm.get("interval.startInterval").hasError("max")),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(13,18,"tb.rulenode.time-unit")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.timeUnits),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(20,20,"tb.rulenode.interval-end")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.getTelemetryFromDatabaseConfigForm.get("interval.endInterval").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.getTelemetryFromDatabaseConfigForm.get("interval.endInterval").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.getTelemetryFromDatabaseConfigForm.get("interval.endInterval").hasError("max")),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(28,22,"tb.rulenode.time-unit")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.timeUnits),t.ɵɵadvance(),t.ɵɵclassProp("error",n.getTelemetryFromDatabaseConfigForm.get("interval").invalid),t.ɵɵadvance(4),t.ɵɵproperty("ngIf",n.getTelemetryFromDatabaseConfigForm.get("interval").valid)("ngIfElse",e)}}function Xi(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.start-interval-required")," "))}function Zi(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.end-interval-required")," "))}function eo(e,n){if(1&e&&(t.ɵɵelementStart(0,"div",30)(1,"mat-form-field",31)(2,"mat-label"),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(5,"input",32),t.ɵɵtemplate(6,Xi,3,3,"mat-error",16),t.ɵɵelementEnd(),t.ɵɵelementStart(7,"mat-form-field",31)(8,"mat-label"),t.ɵɵtext(9),t.ɵɵpipe(10,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(11,"input",33),t.ɵɵtemplate(12,Zi,3,3,"mat-error",16),t.ɵɵelementEnd(),t.ɵɵelement(13,"tb-example-hint",34),t.ɵɵpipe(14,"translate"),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(4,5,"tb.rulenode.start-interval")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.getTelemetryFromDatabaseConfigForm.get("startIntervalPattern").hasError("required")||e.getTelemetryFromDatabaseConfigForm.get("startIntervalPattern").hasError("pattern")),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(10,7,"tb.rulenode.end-interval")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.getTelemetryFromDatabaseConfigForm.get("endIntervalPattern").hasError("required")||e.getTelemetryFromDatabaseConfigForm.get("endIntervalPattern").hasError("pattern")),t.ɵɵadvance(),t.ɵɵproperty("hintText",t.ɵɵpipeBind1(14,9,"tb.rulenode.metadata-dynamic-interval-hint"))}}function to(e,n){if(1&e&&(t.ɵɵelementStart(0,"tb-toggle-option",29),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e.value),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e.name," ")}}function no(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",29),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(2);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.aggregationTypesTranslations.get(r.aggregationTypes[e]))," ")}}function ro(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",29),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(3);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.samplingOrdersTranslate.get(e))," ")}}function ao(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.limit-required")," "))}function io(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.limit-range")," "))}function oo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.limit-range")," "))}function lo(e,n){if(1&e&&(t.ɵɵelementStart(0,"div")(1,"mat-form-field",37)(2,"mat-label"),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"mat-select",38),t.ɵɵtemplate(6,ro,3,4,"mat-option",14),t.ɵɵelementEnd()(),t.ɵɵelementStart(7,"mat-form-field",39)(8,"mat-label"),t.ɵɵtext(9),t.ɵɵpipe(10,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(11,"input",40),t.ɵɵelementStart(12,"mat-hint"),t.ɵɵtext(13),t.ɵɵpipe(14,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(15,ao,3,3,"mat-error",16)(16,io,3,3,"mat-error",16)(17,oo,3,3,"mat-error",16),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(4,7,"tb.rulenode.order-by-timestamp")," "),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",e.samplingOrders),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(10,9,"tb.rulenode.limit")),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(14,11,"tb.rulenode.limit-hint")),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",e.getTelemetryFromDatabaseConfigForm.get("limit").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.getTelemetryFromDatabaseConfigForm.get("limit").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.getTelemetryFromDatabaseConfigForm.get("limit").hasError("max"))}}function so(e,n){if(1&e&&(t.ɵɵelementStart(0,"div")(1,"mat-form-field",35)(2,"mat-label"),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"mat-select",36),t.ɵɵtemplate(6,no,3,4,"mat-option",14),t.ɵɵelementEnd()(),t.ɵɵtemplate(7,lo,18,13,"div",16),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(),t.ɵɵproperty("subscriptSizing",e.defaultPaddingEnable()?"fixed":"dynamic"),t.ɵɵadvance(2),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(4,4,"aggregation.function")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",e.aggregations),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.getTelemetryFromDatabaseConfigForm.get("aggregation").value===e.aggregationTypes.NONE)}}class po extends i{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n,this.separatorKeysCodes=[U,H,z],this.aggregationTypes=T,this.aggregations=Object.values(T),this.aggregationTypesTranslations=I,this.fetchMode=St,this.samplingOrders=Object.values(Et),this.samplingOrdersTranslate=kt,this.timeUnits=Object.values(ht),this.timeUnitsTranslationMap=yt,this.deduplicationStrategiesHintTranslations=It,this.headerOptions=[],this.timeUnitMap={[ht.MILLISECONDS]:1,[ht.SECONDS]:1e3,[ht.MINUTES]:6e4,[ht.HOURS]:36e5,[ht.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 Tt.keys())this.headerOptions.push({value:e,name:this.translate.instant(Tt.get(e))})}configForm(){return this.getTelemetryFromDatabaseConfigForm}onConfigurationSet(e){this.getTelemetryFromDatabaseConfigForm=this.fb.group({latestTsKeyNames:[e.latestTsKeyNames,[N.required]],aggregation:[e.aggregation,[N.required]],fetchMode:[e.fetchMode,[N.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,_(e)}prepareInputConfig(e){return j(e)&&(e.interval={startInterval:e.startInterval,startIntervalTimeUnit:e.startIntervalTimeUnit,endInterval:e.endInterval,endIntervalTimeUnit:e.endIntervalTimeUnit}),{latestTsKeyNames:P(e?.latestTsKeyNames)?e.latestTsKeyNames:null,aggregation:P(e?.aggregation)?e.aggregation:T.NONE,fetchMode:P(e?.fetchMode)?e.fetchMode:St.FIRST,orderBy:P(e?.orderBy)?e.orderBy:Et.ASC,limit:P(e?.limit)?e.limit:1e3,useMetadataIntervalPatterns:!!P(e?.useMetadataIntervalPatterns)&&e.useMetadataIntervalPatterns,interval:{startInterval:P(e?.interval?.startInterval)?e.interval.startInterval:2,startIntervalTimeUnit:P(e?.interval?.startIntervalTimeUnit)?e.interval.startIntervalTimeUnit:ht.MINUTES,endInterval:P(e?.interval?.endInterval)?e.interval.endInterval:1,endIntervalTimeUnit:P(e?.interval?.endIntervalTimeUnit)?e.interval.endIntervalTimeUnit:ht.MINUTES},startIntervalPattern:P(e?.startIntervalPattern)?e.startIntervalPattern:null,endIntervalPattern:P(e?.endIntervalPattern)?e.endIntervalPattern:null}}updateValidators(e){const t=this.getTelemetryFromDatabaseConfigForm.get("fetchMode").value,n=this.getTelemetryFromDatabaseConfigForm.get("useMetadataIntervalPatterns").value;t&&t===St.ALL?(this.getTelemetryFromDatabaseConfigForm.get("aggregation").setValidators([N.required]),this.getTelemetryFromDatabaseConfigForm.get("orderBy").setValidators([N.required]),this.getTelemetryFromDatabaseConfigForm.get("limit").setValidators([N.required,N.min(2),N.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([N.required,N.pattern(/(?:.|\s)*\S(&:.|\s)*/)]),this.getTelemetryFromDatabaseConfigForm.get("endIntervalPattern").setValidators([N.required,N.pattern(/(?:.|\s)*\S(&:.|\s)*/)])):(this.getTelemetryFromDatabaseConfigForm.get("interval.startInterval").setValidators([N.required,N.min(1),N.max(2147483647)]),this.getTelemetryFromDatabaseConfigForm.get("interval.startIntervalTimeUnit").setValidators([N.required]),this.getTelemetryFromDatabaseConfigForm.get("interval.endInterval").setValidators([N.required,N.min(1),N.max(2147483647)]),this.getTelemetryFromDatabaseConfigForm.get("interval.endIntervalTimeUnit").setValidators([N.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===St.ALL&&this.getTelemetryFromDatabaseConfigForm.get("aggregation").value===T.NONE}static{this.ɵfac=function(e){return new(e||po)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(K.TranslateService),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:po,selectors:[["tb-enrichment-node-get-telemetry-from-database"]],features:[t.ɵɵInheritDefinitionFeature],decls:34,vars:40,consts:[["intervalPattern",""],["invalidText",""],[1,"tb-form-panel","no-padding","no-border",3,"formGroup"],["editable","","subscriptSizing","dynamic","required","","formControlName","latestTsKeyNames",1,"mat-block",3,"placeholder","requiredText","label","hint"],["matHintEnd","","hintMode","","tb-help-popup-placement","right","trigger-style","letter-spacing:0.25px; font-size:12px",1,"see-example",3,"tb-help-popup","tb-help-popup-style","trigger-text"],["matSuffix","","aria-hidden","false","aria-label","help-icon","color","primary",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"],[1,"tb-form-panel","stroked"],["translate","",1,"tb-form-panel-title"],[1,"tb-form-row","no-border","no-padding",3,"tb-hint-tooltip-icon"],["formControlName","useMetadataIntervalPatterns",1,"mat-slide"],["formGroupName","interval","class","flex flex-col",4,"ngIf","ngIfElse"],[1,"tb-form-panel","no-border","no-padding","item-center"],[1,"fetch-mod-toggle"],["formControlName","fetchMode","appearance","fill"],[3,"value",4,"ngFor","ngForOf"],[1,"tb-form-hint","tb-primary-fill","hint-container"],[4,"ngIf"],["formGroupName","interval",1,"flex","flex-col"],[1,"flex","flex-col","gap-0","gt-sm:flex-row","gt-sm:gap-4"],[1,"mat-block","gt-sm:max-w-50%","gt-sm:flex-full"],["type","number","step","1","min","1","max","2147483647","matInput","","formControlName","startInterval","required",""],["hideRequiredMarker","",1,"mat-block","gt-sm:max-w-50%","gt-sm:flex-full"],["formControlName","startIntervalTimeUnit","required",""],["type","number","step","1","min","1","max","2147483647","matInput","","formControlName","endInterval","required",""],["formControlName","endIntervalTimeUnit","required",""],[1,"description-block","tb-primary-fill"],[1,"description-icon"],[1,"description-text"],[4,"ngIf","ngIfElse"],[3,"value"],[1,"input-block","flex","flex-col"],[1,"mat-block","flex-1"],["matInput","","formControlName","startIntervalPattern","required",""],["matInput","","formControlName","endIntervalPattern","required",""],["popupHelpLink","rulenode/originator_telemetry_node_fields_templatization",3,"hintText"],["hideRequiredMarker","",1,"mat-block",3,"subscriptSizing"],["formControlName","aggregation","required",""],["hideRequiredMarker","",1,"mat-block"],["formControlName","orderBy","required",""],[1,"mat-block"],["type","number","min","2","max","1000","step","1","matInput","","formControlName","limit","required",""]],template:function(e,n){if(1&e&&(t.ɵɵelementStart(0,"section",2)(1,"tb-string-items-list",3),t.ɵɵpipe(2,"translate"),t.ɵɵpipe(3,"translate"),t.ɵɵpipe(4,"translate"),t.ɵɵpipe(5,"translate"),t.ɵɵelement(6,"div",4),t.ɵɵpipe(7,"translate"),t.ɵɵelementStart(8,"mat-icon",5),t.ɵɵpipe(9,"translate"),t.ɵɵpipe(10,"translate"),t.ɵɵtext(11,"help "),t.ɵɵelementEnd()(),t.ɵɵelementStart(12,"div",6)(13,"div",7),t.ɵɵtext(14,"tb.rulenode.fetch-interval"),t.ɵɵelementEnd(),t.ɵɵelementStart(15,"div",8),t.ɵɵpipe(16,"translate"),t.ɵɵelementStart(17,"mat-slide-toggle",9),t.ɵɵtext(18),t.ɵɵpipe(19,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(20,Wi,38,24,"div",10)(21,eo,15,11,"ng-template",null,0,t.ɵɵtemplateRefExtractor),t.ɵɵelementEnd(),t.ɵɵelementStart(23,"div",6)(24,"div",7),t.ɵɵtext(25,"tb.rulenode.fetch-strategy"),t.ɵɵelementEnd(),t.ɵɵelementStart(26,"div",11)(27,"div",12)(28,"tb-toggle-select",13),t.ɵɵtemplate(29,to,2,2,"tb-toggle-option",14),t.ɵɵelementEnd()(),t.ɵɵelementStart(30,"div",15),t.ɵɵtext(31),t.ɵɵpipe(32,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(33,so,8,6,"div",16),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵreference(22);t.ɵɵproperty("formGroup",n.getTelemetryFromDatabaseConfigForm),t.ɵɵadvance(),t.ɵɵproperty("placeholder",t.ɵɵpipeBind1(2,16,"tb.rulenode.add-timeseries-key"))("requiredText",t.ɵɵpipeBind1(3,18,"tb.rulenode.timeseries-keys-required"))("label",t.ɵɵpipeBind1(4,20,"tb.rulenode.timeseries-keys"))("hint",t.ɵɵpipeBind1(5,22,"tb.rulenode.general-pattern-hint")),t.ɵɵadvance(5),t.ɵɵpropertyInterpolate("tb-help-popup","rulenode/originator_telemetry_node_fields_templatization"),t.ɵɵpropertyInterpolate("trigger-text",t.ɵɵpipeBind1(7,24,"tb.key-val.see-examples")),t.ɵɵproperty("tb-help-popup-style",t.ɵɵpureFunction0(37,Pi)),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind2(10,28,"tb.rulenode.chip-help",t.ɵɵpureFunction1(38,Ri,t.ɵɵpipeBind1(9,26,"tb.rulenode.timeseries-key")))),t.ɵɵadvance(7),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(16,31,"tb.rulenode.use-metadata-dynamic-interval-tooltip")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(19,33,"tb.rulenode.use-metadata-dynamic-interval")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!1===n.getTelemetryFromDatabaseConfigForm.get("useMetadataIntervalPatterns").value)("ngIfElse",e),t.ɵɵadvance(9),t.ɵɵproperty("ngForOf",n.headerOptions),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(32,35,n.deduplicationStrategiesHintTranslations.get(n.getTelemetryFromDatabaseConfigForm.get("fetchMode").value))," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.getTelemetryFromDatabaseConfigForm.get("fetchMode").value===n.fetchMode.ALL)}},dependencies:t.ɵɵgetComponentDepsFactory(po),styles:["[_nghost-%COMP%]   .see-example[_ngcontent-%COMP%]{display:inline-block}[_nghost-%COMP%]   .description-block[_ngcontent-%COMP%]{display:flex;align-items:center;border-radius:6px;border:1px solid #EAEAEA}[_nghost-%COMP%]   .description-block[_ngcontent-%COMP%]   .description-icon[_ngcontent-%COMP%]{font-size:24px;height:24px;min-height:24px;width:24px;min-width:24px;line-height:24px;color:#d9d9d9;margin:4px}[_nghost-%COMP%]   .description-block[_ngcontent-%COMP%]   .description-text[_ngcontent-%COMP%]{font-size:12px;line-height:16px;letter-spacing:.25px;margin:6px}[_nghost-%COMP%]   .description-block.error[_ngcontent-%COMP%]{color:var(--mdc-theme-error, #f44336)}[_nghost-%COMP%]   .description-block.error[_ngcontent-%COMP%]   .description-icon[_ngcontent-%COMP%]{color:var(--mdc-theme-error, #f44336)}[_nghost-%COMP%]   .item-center[_ngcontent-%COMP%]{align-items:center}[_nghost-%COMP%]   .item-center[_ngcontent-%COMP%]   .fetch-mod-toggle[_ngcontent-%COMP%]{width:100%}[_nghost-%COMP%]   .hint-container[_ngcontent-%COMP%]{width:100%}"]})}}e("GetTelemetryFromDatabaseConfigComponent",po);class mo extends i{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 j(e)&&(e.attributesControl={clientAttributeNames:P(e?.clientAttributeNames)?e.clientAttributeNames:[],latestTsKeyNames:P(e?.latestTsKeyNames)?e.latestTsKeyNames:[],serverAttributeNames:P(e?.serverAttributeNames)?e.serverAttributeNames:[],sharedAttributeNames:P(e?.sharedAttributeNames)?e.sharedAttributeNames:[],getLatestValueWithTs:!!P(e?.getLatestValueWithTs)&&e.getLatestValueWithTs}),{fetchTo:P(e?.fetchTo)?e.fetchTo:Kt.METADATA,tellFailureIfAbsent:!!P(e?.tellFailureIfAbsent)&&e.tellFailureIfAbsent,attributesControl:P(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}static{this.ɵfac=function(e){return new(e||mo)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(K.TranslateService),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:mo,selectors:[["tb-enrichment-node-originator-attributes-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:15,vars:11,consts:[[1,"tb-form-panel","no-padding","no-border",3,"formGroup"],[1,"tb-form-panel","stroked"],[1,"tb-form-row","no-padding","no-border","space-between"],["translate","",1,"tb-form-panel-title","tb-required"],["translate","",1,"tb-form-panel-hint","tb-error",3,"hidden"],["formControlName","attributesControl","popupHelpLink","rulenode/originator_attributes_node_fields_templatization"],["formControlName","fetchTo",3,"labelText"],[1,"tb-form-row","same-padding",3,"tb-hint-tooltip-icon"],["formControlName","tellFailureIfAbsent",1,"mat-slide","margin"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"div",2)(3,"div",3),t.ɵɵtext(4,"tb.rulenode.originator-attributes"),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"div",4),t.ɵɵtext(6," tb.rulenode.at-least-one-field-required "),t.ɵɵelementEnd()(),t.ɵɵelement(7,"tb-select-attributes",5)(8,"tb-msg-metadata-chip",6),t.ɵɵpipe(9,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(10,"div",7),t.ɵɵpipe(11,"translate"),t.ɵɵelementStart(12,"mat-slide-toggle",8),t.ɵɵtext(13),t.ɵɵpipe(14,"translate"),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.originatorAttributesConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("hidden",!(n.originatorAttributesConfigForm.get("attributesControl").touched&&n.originatorAttributesConfigForm.get("attributesControl").hasError("atLeastOneRequired"))),t.ɵɵadvance(3),t.ɵɵproperty("labelText",t.ɵɵpipeBind1(9,5,"tb.rulenode.add-originator-attributes-to")),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(11,7,"tb.rulenode.tell-failure-tooltip")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(14,9,"tb.rulenode.tell-failure")," "))},dependencies:t.ɵɵgetComponentDepsFactory(mo),encapsulation:2})}}e("OriginatorAttributesConfigComponent",mo);class uo extends i{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.originatorFields=[];for(const e of ut)this.originatorFields.push({value:e.value,name:this.translate.instant(e.name)})}configForm(){return this.originatorFieldsConfigForm}prepareOutputConfig(e){return _(e)}prepareInputConfig(e){return{dataMapping:P(e?.dataMapping)?e.dataMapping:null,ignoreNullStrings:P(e?.ignoreNullStrings)?e.ignoreNullStrings:null,fetchTo:P(e?.fetchTo)?e.fetchTo:Kt.METADATA}}onConfigurationSet(e){this.originatorFieldsConfigForm=this.fb.group({dataMapping:[e.dataMapping,[N.required]],ignoreNullStrings:[e.ignoreNullStrings,[]],fetchTo:[e.fetchTo,[]]})}static{this.ɵfac=function(e){return new(e||uo)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:uo,selectors:[["tb-enrichment-node-originator-fields-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:16,vars:32,consts:[[1,"tb-form-panel","no-padding","no-border",3,"formGroup"],["required","","targetKeyPrefix","originator","formControlName","dataMapping","popupHelpLink","rulenode/originator_fields_node_fields_templatization",3,"selectOptions","requiredText","labelText","selectText","selectRequiredText","valText","valRequiredText","hintText"],["formControlName","fetchTo",3,"labelText"],[1,"tb-form-row","same-padding",3,"tb-hint-tooltip-icon"],["formControlName","ignoreNullStrings",1,"mat-slide","margin"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0),t.ɵɵelement(1,"tb-sv-map-config",1),t.ɵɵpipe(2,"translate"),t.ɵɵpipe(3,"translate"),t.ɵɵpipe(4,"translate"),t.ɵɵpipe(5,"translate"),t.ɵɵpipe(6,"translate"),t.ɵɵpipe(7,"translate"),t.ɵɵpipe(8,"translate"),t.ɵɵelement(9,"tb-msg-metadata-chip",2),t.ɵɵpipe(10,"translate"),t.ɵɵelementStart(11,"div",3),t.ɵɵpipe(12,"translate"),t.ɵɵelementStart(13,"mat-slide-toggle",4),t.ɵɵtext(14),t.ɵɵpipe(15,"translate"),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.originatorFieldsConfigForm),t.ɵɵadvance(),t.ɵɵproperty("selectOptions",n.originatorFields)("requiredText",t.ɵɵpipeBind1(2,12,"tb.rulenode.attr-mapping-required"))("labelText",t.ɵɵpipeBind1(3,14,"tb.rulenode.originator-fields-mapping"))("selectText",t.ɵɵpipeBind1(4,16,"tb.rulenode.source-field"))("selectRequiredText",t.ɵɵpipeBind1(5,18,"tb.rulenode.source-field-required"))("valText",t.ɵɵpipeBind1(6,20,"tb.rulenode.target-key"))("valRequiredText",t.ɵɵpipeBind1(7,22,"tb.rulenode.target-key-required"))("hintText",t.ɵɵpipeBind1(8,24,"tb.rulenode.originator-fields-sv-map-hint")),t.ɵɵadvance(8),t.ɵɵproperty("labelText",t.ɵɵpipeBind1(10,26,"tb.rulenode.add-mapped-originator-fields-to")),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(12,28,"tb.rulenode.skip-empty-fields-tooltip")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(15,30,"tb.rulenode.skip-empty-fields")," "))},dependencies:t.ɵɵgetComponentDepsFactory(uo),encapsulation:2})}}function co(e,n){if(1&e&&(t.ɵɵelementStart(0,"tb-toggle-option",9),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e.value),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e.name," ")}}e("OriginatorFieldsConfigComponent",uo);class fo extends i{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.DataToFetch=Ft,this.msgMetadataLabelTranslations=At,this.originatorFields=[],this.fetchToData=[];for(const e of Object.keys(ut))this.originatorFields.push({value:ut[e].value,name:this.translate.instant(ut[e].name)});for(const e of qt.keys())this.fetchToData.push({value:e,name:this.translate.instant(qt.get(e))})}configForm(){return this.relatedAttributesConfigForm}prepareOutputConfig(e){e.dataToFetch===Ft.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,_(e)}prepareInputConfig(e){let t,n,r={[c.name.value]:`relatedEntity${this.translate.instant(c.name.name)}`},a={serialNumber:"sn"};return t=P(e?.telemetry)?e.telemetry?Ft.LATEST_TELEMETRY:Ft.ATTRIBUTES:P(e?.dataToFetch)?e.dataToFetch:Ft.ATTRIBUTES,n=P(e?.attrMapping)?e.attrMapping:P(e?.dataMapping)?e.dataMapping:null,t===Ft.FIELDS?r=n:a=n,{relationsQuery:P(e?.relationsQuery)?e.relationsQuery:null,dataToFetch:t,svMap:r,kvMap:a,fetchTo:P(e?.fetchTo)?e.fetchTo:Kt.METADATA}}selectTranslation(e,t){return this.relatedAttributesConfigForm.get("dataToFetch").value===Ft.LATEST_TELEMETRY?e:t}onConfigurationSet(e){this.relatedAttributesConfigForm=this.fb.group({relationsQuery:[e.relationsQuery,[N.required]],dataToFetch:[e.dataToFetch,[]],kvMap:[e.kvMap,[N.required]],svMap:[e.svMap,[N.required]],fetchTo:[e.fetchTo,[]]})}validatorTriggers(){return["dataToFetch"]}updateValidators(e){this.relatedAttributesConfigForm.get("dataToFetch").value===Ft.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())}static{this.ɵfac=function(e){return new(e||fo)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:fo,selectors:[["tb-enrichment-node-related-attributes-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:24,vars:48,consts:[[1,"tb-form-panel","no-padding","no-border",3,"formGroup"],["required","","formControlName","relationsQuery"],[1,"tb-form-panel","stroked"],["translate","",1,"tb-form-panel-title"],["formControlName","dataToFetch","appearance","fill"],[3,"value",4,"ngFor","ngForOf"],["required","","formControlName","kvMap","popupHelpLink","rulenode/related_entity_data_node_fields_templatization",3,"hidden","requiredText","labelText","keyText","keyRequiredText","valText","valRequiredText","hintText"],["required","","targetKeyPrefix","relatedEntity","formControlName","svMap","popupHelpLink","rulenode/related_entity_data_node_fields_templatization",3,"hidden","labelText","selectOptions","requiredText","selectText","selectRequiredText","valText","valRequiredText","hintText"],["formControlName","fetchTo",3,"labelText"],[3,"value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0),t.ɵɵelement(1,"tb-relations-query-config",1),t.ɵɵelementStart(2,"div",2)(3,"div",3),t.ɵɵtext(4,"tb.rulenode.data-to-fetch"),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"tb-toggle-select",4),t.ɵɵtemplate(6,co,2,2,"tb-toggle-option",5),t.ɵɵelementEnd(),t.ɵɵelement(7,"tb-kv-map-config",6),t.ɵɵpipe(8,"translate"),t.ɵɵpipe(9,"translate"),t.ɵɵpipe(10,"translate"),t.ɵɵpipe(11,"translate"),t.ɵɵpipe(12,"translate"),t.ɵɵpipe(13,"translate"),t.ɵɵelement(14,"tb-sv-map-config",7),t.ɵɵpipe(15,"translate"),t.ɵɵpipe(16,"translate"),t.ɵɵpipe(17,"translate"),t.ɵɵpipe(18,"translate"),t.ɵɵpipe(19,"translate"),t.ɵɵpipe(20,"translate"),t.ɵɵpipe(21,"translate"),t.ɵɵelement(22,"tb-msg-metadata-chip",8),t.ɵɵpipe(23,"translate"),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.relatedAttributesConfigForm),t.ɵɵadvance(6),t.ɵɵproperty("ngForOf",n.fetchToData),t.ɵɵadvance(),t.ɵɵproperty("hidden",n.relatedAttributesConfigForm.get("dataToFetch").value===n.DataToFetch.FIELDS)("requiredText",t.ɵɵpipeBind1(8,20,"tb.rulenode.attr-mapping-required"))("labelText",t.ɵɵpipeBind1(9,22,n.selectTranslation("tb.rulenode.latest-telemetry-mapping","tb.rulenode.attributes-mapping")))("keyText",t.ɵɵpipeBind1(10,24,n.selectTranslation("tb.rulenode.source-telemetry","tb.rulenode.source-attribute")))("keyRequiredText",t.ɵɵpipeBind1(11,26,n.selectTranslation("tb.rulenode.source-telemetry-required","tb.rulenode.source-attribute-required")))("valText",t.ɵɵpipeBind1(12,28,"tb.rulenode.target-key"))("valRequiredText",t.ɵɵpipeBind1(13,30,"tb.rulenode.target-key-required"))("hintText","tb.rulenode.kv-map-pattern-hint"),t.ɵɵadvance(7),t.ɵɵproperty("hidden",n.relatedAttributesConfigForm.get("dataToFetch").value!==n.DataToFetch.FIELDS)("labelText",t.ɵɵpipeBind1(15,32,"tb.rulenode.fields-mapping"))("selectOptions",n.originatorFields)("requiredText",t.ɵɵpipeBind1(16,34,"tb.rulenode.attr-mapping-required"))("selectText",t.ɵɵpipeBind1(17,36,"tb.rulenode.source-field"))("selectRequiredText",t.ɵɵpipeBind1(18,38,"tb.rulenode.source-field-required"))("valText",t.ɵɵpipeBind1(19,40,"tb.rulenode.target-key"))("valRequiredText",t.ɵɵpipeBind1(20,42,"tb.rulenode.target-key-required"))("hintText",t.ɵɵpipeBind1(21,44,"tb.rulenode.sv-map-hint")),t.ɵɵadvance(8),t.ɵɵproperty("labelText",t.ɵɵpipeBind1(23,46,n.msgMetadataLabelTranslations.get(n.relatedAttributesConfigForm.get("dataToFetch").value))))},dependencies:t.ɵɵgetComponentDepsFactory(fo),encapsulation:2})}}function go(e,n){if(1&e&&(t.ɵɵelementStart(0,"tb-toggle-option",8),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e.value),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e.name," ")}}e("RelatedAttributesConfigComponent",fo);class ho extends i{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.fetchToData=[],this.DataToFetch=Ft;for(const e of qt.keys())e!==Ft.FIELDS&&this.fetchToData.push({value:e,name:this.translate.instant(qt.get(e))})}configForm(){return this.tenantAttributesConfigForm}prepareInputConfig(e){let t,n;return t=P(e?.telemetry)?e.telemetry?Ft.LATEST_TELEMETRY:Ft.ATTRIBUTES:P(e?.dataToFetch)?e.dataToFetch:Ft.ATTRIBUTES,n=P(e?.attrMapping)?e.attrMapping:P(e?.dataMapping)?e.dataMapping:null,{dataToFetch:t,dataMapping:n,fetchTo:P(e?.fetchTo)?e.fetchTo:Kt.METADATA}}selectTranslation(e,t){return this.tenantAttributesConfigForm.get("dataToFetch").value===Ft.LATEST_TELEMETRY?e:t}onConfigurationSet(e){this.tenantAttributesConfigForm=this.fb.group({dataToFetch:[e.dataToFetch,[]],dataMapping:[e.dataMapping,[N.required]],fetchTo:[e.fetchTo,[]]})}static{this.ɵfac=function(e){return new(e||ho)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:ho,selectors:[["tb-enrichment-node-tenant-attributes-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:17,vars:26,consts:[[1,"tb-form-panel","stroked",3,"formGroup"],["translate","",1,"tb-form-panel-title"],[1,"flex","flex-1","items-center","justify-center"],[1,"fetch-to-data-toggle"],["formControlName","dataToFetch","appearance","fill",1,"fetch-to-data-toggle"],[3,"value",4,"ngFor","ngForOf"],["required","","formControlName","dataMapping","popupHelpLink","rulenode/tenant_attributes_node_fields_templatization",3,"requiredText","labelText","keyText","keyRequiredText","valText","valRequiredText","hintText"],["formControlName","fetchTo",3,"labelText"],[3,"value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1),t.ɵɵtext(2,"tb.rulenode.mapping-of-tenant"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"div",2)(4,"div",3)(5,"tb-toggle-select",4),t.ɵɵtemplate(6,go,2,2,"tb-toggle-option",5),t.ɵɵelementEnd()()(),t.ɵɵelement(7,"tb-kv-map-config",6),t.ɵɵpipe(8,"translate"),t.ɵɵpipe(9,"translate"),t.ɵɵpipe(10,"translate"),t.ɵɵpipe(11,"translate"),t.ɵɵpipe(12,"translate"),t.ɵɵpipe(13,"translate"),t.ɵɵelement(14,"tb-msg-metadata-chip",7),t.ɵɵpipe(15,"translate"),t.ɵɵpipe(16,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.tenantAttributesConfigForm),t.ɵɵadvance(6),t.ɵɵproperty("ngForOf",n.fetchToData),t.ɵɵadvance(),t.ɵɵproperty("requiredText",t.ɵɵpipeBind1(8,10,"tb.rulenode.attr-mapping-required"))("labelText",t.ɵɵpipeBind1(9,12,n.selectTranslation("tb.rulenode.latest-telemetry-mapping","tb.rulenode.attributes-mapping")))("keyText",t.ɵɵpipeBind1(10,14,n.selectTranslation("tb.rulenode.source-telemetry","tb.rulenode.source-attribute")))("keyRequiredText",t.ɵɵpipeBind1(11,16,n.selectTranslation("tb.rulenode.source-telemetry-required","tb.rulenode.source-attribute-required")))("valText",t.ɵɵpipeBind1(12,18,"tb.rulenode.target-key"))("valRequiredText",t.ɵɵpipeBind1(13,20,"tb.rulenode.target-key-required"))("hintText","tb.rulenode.kv-map-pattern-hint"),t.ɵɵadvance(7),t.ɵɵproperty("labelText",n.tenantAttributesConfigForm.get("dataToFetch").value===n.DataToFetch.LATEST_TELEMETRY?t.ɵɵpipeBind1(15,22,"tb.rulenode.add-mapped-latest-telemetry-to"):t.ɵɵpipeBind1(16,24,"tb.rulenode.add-mapped-attribute-to")))},dependencies:t.ɵɵgetComponentDepsFactory(ho),styles:["[_nghost-%COMP%]   .fetch-to-data-toggle[_ngcontent-%COMP%]{max-width:420px;width:100%}"]})}}e("TenantAttributesConfigComponent",ho);class yo extends i{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.fetchDeviceCredentialsConfigForm}prepareInputConfig(e){return{fetchTo:P(e?.fetchTo)?e.fetchTo:Kt.METADATA}}onConfigurationSet(e){this.fetchDeviceCredentialsConfigForm=this.fb.group({fetchTo:[e.fetchTo,[]]})}static{this.ɵfac=function(e){return new(e||yo)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:yo,selectors:[["tb-enrichment-node-fetch-device-credentials-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:3,vars:4,consts:[[3,"formGroup"],["formControlName","fetchTo",3,"labelText"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0),t.ɵɵelement(1,"tb-msg-metadata-chip",1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.fetchDeviceCredentialsConfigForm),t.ɵɵadvance(),t.ɵɵproperty("labelText",t.ɵɵpipeBind1(2,2,"tb.rulenode.fetch-credentials-to")))},dependencies:t.ɵɵgetComponentDepsFactory(yo),encapsulation:2})}}e("FetchDeviceCredentialsConfigComponent",yo);class bo{static{this.ɵfac=function(e){return new(e||bo)}}static{this.ɵmod=t.ɵɵdefineNgModule({type:bo})}static{this.ɵinj=t.ɵɵdefineInjector({imports:[$,S,xi,Vi,Li,Oi,mo,uo,po,fo,ho,Mi,yo]})}}function vo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.topic-required")," "))}function xo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.hostname-required")," "))}function Co(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.device-id-required")," "))}function So(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",17),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.azureIotHubCredentialsTypeTranslationsMap.get(e))," ")}}function To(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.credentials-type-required")," "))}function Io(e,t){}function Eo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.sas-key-required")," "))}function Fo(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"mat-form-field",5)(1,"mat-label",2),t.ɵɵtext(2,"tb.rulenode.sas-key"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",18)(4,"tb-toggle-password",19),t.ɵɵtemplate(5,Eo,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(6,"tb-file-input",20),t.ɵɵpipe(7,"translate"),t.ɵɵpipe(8,"translate"),t.ɵɵlistener("fileNameChanged",(function(n){t.ɵɵrestoreView(e);const r=t.ɵɵnextContext();return t.ɵɵresetView(r.azureIotHubConfigForm.get("credentials.caCertFileName").setValue(n))})),t.ɵɵelementEnd()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(5),t.ɵɵproperty("ngIf",e.azureIotHubConfigForm.get("credentials.sasKey").hasError("required")),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("label",t.ɵɵpipeBind1(7,4,"tb.rulenode.azure-ca-cert")),t.ɵɵpropertyInterpolate("dropLabel",t.ɵɵpipeBind1(8,6,"tb.rulenode.drop-file")),t.ɵɵproperty("existingFileName",e.azureIotHubConfigForm.get("credentials.caCertFileName").value)}}function qo(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-file-input",20),t.ɵɵpipe(1,"translate"),t.ɵɵpipe(2,"translate"),t.ɵɵlistener("fileNameChanged",(function(n){t.ɵɵrestoreView(e);const r=t.ɵɵnextContext();return t.ɵɵresetView(r.azureIotHubConfigForm.get("credentials.caCertFileName").setValue(n))})),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"tb-file-input",21),t.ɵɵpipe(4,"translate"),t.ɵɵpipe(5,"translate"),t.ɵɵlistener("fileNameChanged",(function(n){t.ɵɵrestoreView(e);const r=t.ɵɵnextContext();return t.ɵɵresetView(r.azureIotHubConfigForm.get("credentials.certFileName").setValue(n))})),t.ɵɵelementEnd(),t.ɵɵelementStart(6,"tb-file-input",22),t.ɵɵpipe(7,"translate"),t.ɵɵpipe(8,"translate"),t.ɵɵlistener("fileNameChanged",(function(n){t.ɵɵrestoreView(e);const r=t.ɵɵnextContext();return t.ɵɵresetView(r.azureIotHubConfigForm.get("credentials.privateKeyFileName").setValue(n))})),t.ɵɵelementEnd(),t.ɵɵelementStart(9,"mat-form-field",5)(10,"mat-label",2),t.ɵɵtext(11,"tb.rulenode.private-key-password"),t.ɵɵelementEnd(),t.ɵɵelement(12,"input",23)(13,"tb-toggle-password",19),t.ɵɵelementEnd()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵpropertyInterpolate("label",t.ɵɵpipeBind1(1,9,"tb.rulenode.azure-ca-cert")),t.ɵɵpropertyInterpolate("dropLabel",t.ɵɵpipeBind1(2,11,"tb.rulenode.drop-file")),t.ɵɵproperty("existingFileName",e.azureIotHubConfigForm.get("credentials.caCertFileName").value),t.ɵɵadvance(3),t.ɵɵpropertyInterpolate("label",t.ɵɵpipeBind1(4,13,"tb.rulenode.cert")),t.ɵɵpropertyInterpolate("dropLabel",t.ɵɵpipeBind1(5,15,"tb.rulenode.drop-file")),t.ɵɵproperty("existingFileName",e.azureIotHubConfigForm.get("credentials.certFileName").value),t.ɵɵadvance(3),t.ɵɵpropertyInterpolate("label",t.ɵɵpipeBind1(7,17,"tb.rulenode.private-key")),t.ɵɵpropertyInterpolate("dropLabel",t.ɵɵpipeBind1(8,19,"tb.rulenode.drop-file")),t.ɵɵproperty("existingFileName",e.azureIotHubConfigForm.get("credentials.privateKeyFileName").value)}}e("RulenodeCoreConfigEnrichmentModule",bo),("undefined"==typeof ngJitMode||ngJitMode)&&t.ɵɵsetNgModuleScope(bo,{declarations:[Vi,Li,Oi,mo,uo,po,fo,ho,Mi,yo],imports:[$,S,xi],exports:[Vi,Li,Oi,mo,uo,po,fo,ho,Mi,yo]});class Ao extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.allAzureIotHubCredentialsTypes=Vt,this.azureIotHubCredentialsTypeTranslationsMap=Ot}configForm(){return this.azureIotHubConfigForm}onConfigurationSet(e){this.azureIotHubConfigForm=this.fb.group({topicPattern:[e?e.topicPattern:null,[N.required]],host:[e?e.host:null,[N.required]],port:[e?e.port:null,[N.required,N.min(1),N.max(65535)]],connectTimeoutSec:[e?e.connectTimeoutSec:null,[N.required,N.min(1),N.max(200)]],clientId:[e?e.clientId:null,[N.required]],cleanSession:[!!e&&e.cleanSession,[]],ssl:[!!e&&e.ssl,[]],credentials:this.fb.group({type:[e&&e.credentials?e.credentials.type:null,[N.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([N.required]);break;case"cert.PEM":t.get("privateKey").setValidators([N.required]),t.get("privateKeyFileName").setValidators([N.required]),t.get("cert").setValidators([N.required]),t.get("certFileName").setValidators([N.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})}static{this.ɵfac=function(e){return new(e||Ao)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Ao,selectors:[["tb-external-node-azure-iot-hub-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:37,vars:10,consts:[[1,"flex","flex-col",3,"formGroup"],["subscriptSizing","dynamic",1,"mat-block"],["translate",""],["required","","matInput","","formControlName","topicPattern"],[4,"ngIf"],[1,"mat-block"],["required","","matInput","","formControlName","host"],["required","","matInput","","formControlName","clientId","autocomplete","new-clientId"],[1,"tb-mqtt-credentials-panel-group"],["translate","",1,"tb-required"],["formGroupName","credentials",1,"flex","flex-col"],["formControlName","type","required",""],[3,"value",4,"ngFor","ngForOf"],[1,"flex","flex-col",3,"ngSwitch"],["ngSwitchCase","anonymous"],["ngSwitchCase","sas"],["ngSwitchCase","cert.PEM"],[3,"value"],["type","password","required","","matInput","","formControlName","sasKey","autocomplete","new-password"],["matSuffix",""],["formControlName","caCert","inputId","caCertSelect","noFileText","tb.rulenode.no-file",3,"fileNameChanged","existingFileName","label","dropLabel"],["formControlName","cert","inputId","CertSelect","required","","requiredAsError","","noFileText","tb.rulenode.no-file",3,"fileNameChanged","existingFileName","label","dropLabel"],["formControlName","privateKey","inputId","privateKeySelect","required","","requiredAsError","","noFileText","tb.rulenode.no-file",2,"padding-bottom","8px",3,"fileNameChanged","existingFileName","label","dropLabel"],["type","password","matInput","","formControlName","password","autocomplete","new-password"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.topic"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵtemplate(5,vo,3,3,"mat-error",4),t.ɵɵelementStart(6,"mat-hint",2),t.ɵɵtext(7,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()(),t.ɵɵelementStart(8,"mat-form-field",5)(9,"mat-label",2),t.ɵɵtext(10,"tb.rulenode.hostname"),t.ɵɵelementEnd(),t.ɵɵelement(11,"input",6),t.ɵɵtemplate(12,xo,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(13,"mat-form-field",5)(14,"mat-label",2),t.ɵɵtext(15,"tb.rulenode.device-id"),t.ɵɵelementEnd(),t.ɵɵelement(16,"input",7),t.ɵɵtemplate(17,Co,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(18,"mat-accordion")(19,"mat-expansion-panel",8)(20,"mat-expansion-panel-header")(21,"mat-panel-title",9),t.ɵɵtext(22,"tb.rulenode.credentials"),t.ɵɵelementEnd(),t.ɵɵelementStart(23,"mat-panel-description"),t.ɵɵtext(24),t.ɵɵpipe(25,"translate"),t.ɵɵelementEnd()(),t.ɵɵelementStart(26,"section",10)(27,"mat-form-field",5)(28,"mat-label",2),t.ɵɵtext(29,"tb.rulenode.credentials-type"),t.ɵɵelementEnd(),t.ɵɵelementStart(30,"mat-select",11),t.ɵɵtemplate(31,So,3,4,"mat-option",12),t.ɵɵelementEnd(),t.ɵɵtemplate(32,To,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(33,"section",13),t.ɵɵtemplate(34,Io,0,0,"ng-template",14)(35,Fo,9,8,"ng-template",15)(36,qo,14,21,"ng-template",16),t.ɵɵelementEnd()()()()()),2&e&&(t.ɵɵproperty("formGroup",n.azureIotHubConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.azureIotHubConfigForm.get("topicPattern").hasError("required")),t.ɵɵadvance(7),t.ɵɵproperty("ngIf",n.azureIotHubConfigForm.get("host").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.azureIotHubConfigForm.get("clientId").hasError("required")),t.ɵɵadvance(7),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(25,8,n.azureIotHubCredentialsTypeTranslationsMap.get(n.azureIotHubConfigForm.get("credentials.type").value))," "),t.ɵɵadvance(7),t.ɵɵproperty("ngForOf",n.allAzureIotHubCredentialsTypes),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.azureIotHubConfigForm.get("credentials.type").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngSwitch",n.azureIotHubConfigForm.get("credentials.type").value))},dependencies:t.ɵɵgetComponentDepsFactory(Ao),styles:["[_nghost-%COMP%]   .tb-mqtt-credentials-panel-group[_ngcontent-%COMP%]{margin:0 6px}"]})}}function ko(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.topic-pattern-required")," "))}function No(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.bootstrap-servers-required")," "))}function wo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-retries-message")," "))}function Mo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-batch-size-bytes-message")," "))}function Bo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-linger-ms-message")," "))}function Vo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-buffer-memory-bytes-message")," "))}function Oo(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",21),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e," ")}}function Do(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.key-serializer-required")," "))}function Lo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.value-serializer-required")," "))}function Po(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",21),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(2);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.ToByteStandartCharsetTypeTranslationMap.get(e))," ")}}function Ro(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",22)(1,"mat-label",2),t.ɵɵtext(2,"tb.rulenode.charset-encoding"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"mat-select",23),t.ɵɵtemplate(4,Po,3,4,"mat-option",14),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(4),t.ɵɵproperty("ngForOf",e.ToByteStandartCharsetTypesValues)}}e("AzureIotHubConfigComponent",Ao);class _o extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.ackValues=["all","-1","0","1"],this.ToByteStandartCharsetTypesValues=Lt,this.ToByteStandartCharsetTypeTranslationMap=Pt}configForm(){return this.kafkaConfigForm}onConfigurationSet(e){this.kafkaConfigForm=this.fb.group({topicPattern:[e?e.topicPattern:null,[N.required]],keyPattern:[e?e.keyPattern:null],bootstrapServers:[e?e.bootstrapServers:null,[N.required]],retries:[e?e.retries:null,[N.min(0)]],batchSize:[e?e.batchSize:null,[N.min(0)]],linger:[e?e.linger:null,[N.min(0)]],bufferMemory:[e?e.bufferMemory:null,[N.min(0)]],acks:[e?e.acks:null,[N.required]],keySerializer:[e?e.keySerializer:null,[N.required]],valueSerializer:[e?e.valueSerializer:null,[N.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([N.required]):this.kafkaConfigForm.get("kafkaHeadersCharset").setValidators([]),this.kafkaConfigForm.get("kafkaHeadersCharset").updateValueAndValidity({emitEvent:e})}static{this.ɵfac=function(e){return new(e||_o)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:_o,selectors:[["tb-external-node-kafka-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:65,vars:14,consts:[[1,"flex","flex-col",3,"formGroup"],["subscriptSizing","dynamic",1,"mat-block"],["translate",""],["required","","matInput","","formControlName","topicPattern"],[4,"ngIf"],["matInput","","formControlName","keyPattern"],["translate","",1,"tb-hint"],[1,"mat-block"],["required","","matInput","","formControlName","bootstrapServers"],["type","number","step","1","min","0","matInput","","formControlName","retries"],["type","number","step","1","min","0","matInput","","formControlName","batchSize"],["type","number","step","1","min","0","matInput","","formControlName","linger"],["type","number","step","1","min","0","matInput","","formControlName","bufferMemory"],["formControlName","acks","required",""],[3,"value",4,"ngFor","ngForOf"],["required","","matInput","","formControlName","keySerializer"],["required","","matInput","","formControlName","valueSerializer"],["translate","",1,"tb-title"],["required","false","formControlName","otherProperties","keyText","tb.rulenode.key","keyRequiredText","tb.rulenode.key-required","valText","tb.rulenode.value","valRequiredText","tb.rulenode.value-required"],["formControlName","addMetadataKeyValuesAsKafkaHeaders",1,"flex-1"],["class","mat-block flex-1",4,"ngIf"],[3,"value"],[1,"mat-block","flex-1"],["formControlName","kafkaHeadersCharset","required",""]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.topic-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵtemplate(5,ko,3,3,"mat-error",4),t.ɵɵelementStart(6,"mat-hint",2),t.ɵɵtext(7,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()(),t.ɵɵelementStart(8,"mat-form-field",1)(9,"mat-label",2),t.ɵɵtext(10,"tb.rulenode.key-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(11,"input",5),t.ɵɵelementStart(12,"mat-hint",2),t.ɵɵtext(13,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()(),t.ɵɵelementStart(14,"div",6),t.ɵɵtext(15,"tb.rulenode.key-pattern-hint"),t.ɵɵelementEnd(),t.ɵɵelementStart(16,"mat-form-field",7)(17,"mat-label",2),t.ɵɵtext(18,"tb.rulenode.bootstrap-servers"),t.ɵɵelementEnd(),t.ɵɵelement(19,"input",8),t.ɵɵtemplate(20,No,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(21,"mat-form-field",7)(22,"mat-label",2),t.ɵɵtext(23,"tb.rulenode.retries"),t.ɵɵelementEnd(),t.ɵɵelement(24,"input",9),t.ɵɵtemplate(25,wo,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(26,"mat-form-field",7)(27,"mat-label",2),t.ɵɵtext(28,"tb.rulenode.batch-size-bytes"),t.ɵɵelementEnd(),t.ɵɵelement(29,"input",10),t.ɵɵtemplate(30,Mo,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(31,"mat-form-field",7)(32,"mat-label",2),t.ɵɵtext(33,"tb.rulenode.linger-ms"),t.ɵɵelementEnd(),t.ɵɵelement(34,"input",11),t.ɵɵtemplate(35,Bo,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(36,"mat-form-field",7)(37,"mat-label",2),t.ɵɵtext(38,"tb.rulenode.buffer-memory-bytes"),t.ɵɵelementEnd(),t.ɵɵelement(39,"input",12),t.ɵɵtemplate(40,Vo,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(41,"mat-form-field",7)(42,"mat-label",2),t.ɵɵtext(43,"tb.rulenode.acks"),t.ɵɵelementEnd(),t.ɵɵelementStart(44,"mat-select",13),t.ɵɵtemplate(45,Oo,2,2,"mat-option",14),t.ɵɵelementEnd()(),t.ɵɵelementStart(46,"mat-form-field",7)(47,"mat-label",2),t.ɵɵtext(48,"tb.rulenode.key-serializer"),t.ɵɵelementEnd(),t.ɵɵelement(49,"input",15),t.ɵɵtemplate(50,Do,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(51,"mat-form-field",7)(52,"mat-label",2),t.ɵɵtext(53,"tb.rulenode.value-serializer"),t.ɵɵelementEnd(),t.ɵɵelement(54,"input",16),t.ɵɵtemplate(55,Lo,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(56,"label",17),t.ɵɵtext(57,"tb.rulenode.other-properties"),t.ɵɵelementEnd(),t.ɵɵelement(58,"tb-kv-map-config-old",18),t.ɵɵelementStart(59,"mat-checkbox",19),t.ɵɵtext(60),t.ɵɵpipe(61,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(62,"div",6),t.ɵɵtext(63,"tb.rulenode.add-metadata-key-values-as-kafka-headers-hint"),t.ɵɵelementEnd(),t.ɵɵtemplate(64,Ro,5,1,"mat-form-field",20),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.kafkaConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.kafkaConfigForm.get("topicPattern").hasError("required")),t.ɵɵadvance(15),t.ɵɵproperty("ngIf",n.kafkaConfigForm.get("bootstrapServers").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.kafkaConfigForm.get("retries").hasError("min")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.kafkaConfigForm.get("batchSize").hasError("min")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.kafkaConfigForm.get("linger").hasError("min")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.kafkaConfigForm.get("bufferMemory").hasError("min")),t.ɵɵadvance(5),t.ɵɵproperty("ngForOf",n.ackValues),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.kafkaConfigForm.get("keySerializer").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.kafkaConfigForm.get("valueSerializer").hasError("required")),t.ɵɵadvance(5),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(61,12,"tb.rulenode.add-metadata-key-values-as-kafka-headers")," "),t.ɵɵadvance(4),t.ɵɵproperty("ngIf",n.kafkaConfigForm.get("addMetadataKeyValuesAsKafkaHeaders").value))},dependencies:t.ɵɵgetComponentDepsFactory(_o),encapsulation:2})}}function jo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.topic-pattern-required")," "))}function Go(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.host-required")," "))}function Ko(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.port-required")," "))}function Uo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.port-range")," "))}function Ho(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.port-range")," "))}function zo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.connect-timeout-required")," "))}function $o(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.connect-timeout-range")," "))}function Qo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.connect-timeout-range")," "))}e("KafkaConfigComponent",_o);class Jo extends i{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,[N.required]],host:[e?e.host:null,[N.required]],port:[e?e.port:null,[N.required,N.min(1),N.max(65535)]],connectTimeoutSec:[e?e.connectTimeoutSec:null,[N.required,N.min(1),N.max(200)]],clientId:[e?e.clientId:null,[]],appendClientIdSuffix:[{value:!!e&&e.appendClientIdSuffix,disabled:!(e&&G(e.clientId))},[]],parseToPlainText:[!!e&&e.parseToPlainText,[]],cleanSession:[!!e&&e.cleanSession,[]],retainedMessage:[!!e&&e.retainedMessage,[]],ssl:[!!e&&e.ssl,[]],credentials:[e?e.credentials:null,[]]})}updateValidators(e){G(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"]}static{this.ɵfac=function(e){return new(e||Jo)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Jo,selectors:[["tb-external-node-mqtt-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:57,vars:34,consts:[[1,"flex","flex-col",3,"formGroup"],["subscriptSizing","dynamic",1,"mat-block"],["translate",""],["required","","matInput","","formControlName","topicPattern"],[4,"ngIf"],[1,"flex","flex-1","flex-col","gt-sm:flex-row","gt-sm:gap-2"],[1,"mat-block","gt-sm:max-w-60%","gt-sm:flex-full"],["required","","matInput","","formControlName","host"],[1,"mat-block","gt-sm:max-w-40%","gt-sm:flex-full"],["required","","type","number","step","1","min","1","max","65535","matInput","","formControlName","port"],["required","","type","number","step","1","min","1","max","200","matInput","","formControlName","connectTimeoutSec"],["matInput","","formControlName","clientId"],["formControlName","appendClientIdSuffix"],[1,"tb-hint"],["formControlName","parseToPlainText"],["formControlName","cleanSession"],["formControlName","retainedMessage"],["formControlName","ssl"],["formControlName","credentials",3,"passwordFieldRequired"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.topic-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵtemplate(5,jo,3,3,"mat-error",4),t.ɵɵelementStart(6,"mat-hint",2),t.ɵɵtext(7,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()(),t.ɵɵelementStart(8,"div",5)(9,"mat-form-field",6)(10,"mat-label",2),t.ɵɵtext(11,"tb.rulenode.host"),t.ɵɵelementEnd(),t.ɵɵelement(12,"input",7),t.ɵɵtemplate(13,Go,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(14,"mat-form-field",8)(15,"mat-label",2),t.ɵɵtext(16,"tb.rulenode.port"),t.ɵɵelementEnd(),t.ɵɵelement(17,"input",9),t.ɵɵtemplate(18,Ko,3,3,"mat-error",4)(19,Uo,3,3,"mat-error",4)(20,Ho,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(21,"mat-form-field",8)(22,"mat-label",2),t.ɵɵtext(23,"tb.rulenode.connect-timeout"),t.ɵɵelementEnd(),t.ɵɵelement(24,"input",10),t.ɵɵtemplate(25,zo,3,3,"mat-error",4)(26,$o,3,3,"mat-error",4)(27,Qo,3,3,"mat-error",4),t.ɵɵelementEnd()(),t.ɵɵelementStart(28,"mat-form-field",1)(29,"mat-label",2),t.ɵɵtext(30,"tb.rulenode.client-id"),t.ɵɵelementEnd(),t.ɵɵelement(31,"input",11),t.ɵɵelementStart(32,"mat-hint"),t.ɵɵtext(33),t.ɵɵpipe(34,"translate"),t.ɵɵelementEnd()(),t.ɵɵelementStart(35,"mat-checkbox",12),t.ɵɵtext(36),t.ɵɵpipe(37,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(38,"div",13),t.ɵɵtext(39),t.ɵɵpipe(40,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(41,"mat-checkbox",14),t.ɵɵtext(42),t.ɵɵpipe(43,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(44,"div",13),t.ɵɵtext(45),t.ɵɵpipe(46,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(47,"mat-checkbox",15),t.ɵɵtext(48),t.ɵɵpipe(49,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(50,"mat-checkbox",16),t.ɵɵtext(51),t.ɵɵpipe(52,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(53,"mat-checkbox",17),t.ɵɵtext(54),t.ɵɵpipe(55,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(56,"tb-credentials-config",18),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.mqttConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.mqttConfigForm.get("topicPattern").hasError("required")),t.ɵɵadvance(8),t.ɵɵproperty("ngIf",n.mqttConfigForm.get("host").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.mqttConfigForm.get("port").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.mqttConfigForm.get("port").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.mqttConfigForm.get("port").hasError("max")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.mqttConfigForm.get("connectTimeoutSec").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.mqttConfigForm.get("connectTimeoutSec").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.mqttConfigForm.get("connectTimeoutSec").hasError("max")),t.ɵɵadvance(6),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(34,18,"tb.rulenode.client-id-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(37,20,"tb.rulenode.append-client-id-suffix")," "),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(40,22,"tb.rulenode.client-id-suffix-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(43,24,"tb.rulenode.parse-to-plain-text")," "),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(46,26,"tb.rulenode.parse-to-plain-text-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(49,28,"tb.rulenode.clean-session")," "),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(52,30,"tb.rulenode.retained-message")," "),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(55,32,"tb.rulenode.enable-ssl")," "),t.ɵɵadvance(2),t.ɵɵproperty("passwordFieldRequired",!1))},dependencies:t.ɵɵgetComponentDepsFactory(Jo),styles:["[_nghost-%COMP%]   .tb-mqtt-credentials-panel-group[_ngcontent-%COMP%]{margin:0 6px}"]})}}e("MqttConfigComponent",Jo);class Yo extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.notificationType=E,this.entityType=u}configForm(){return this.notificationConfigForm}onConfigurationSet(e){this.notificationConfigForm=this.fb.group({templateId:[e?e.templateId:null,[N.required]],targets:[e?e.targets:[],[N.required]]})}static{this.ɵfac=function(e){return new(e||Yo)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Yo,selectors:[["tb-external-node-notification-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:6,vars:13,consts:[[1,"flex","flex-col",3,"formGroup"],["required","","allowCreate","","formControlName","templateId",3,"notificationTypes"],["required","","formControlName","targets",3,"labelText","placeholderText","requiredText","entityType","subType"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0),t.ɵɵelement(1,"tb-template-autocomplete",1)(2,"tb-entity-list",2),t.ɵɵpipe(3,"translate"),t.ɵɵpipe(4,"translate"),t.ɵɵpipe(5,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.notificationConfigForm),t.ɵɵadvance(),t.ɵɵproperty("notificationTypes",n.notificationType.RULE_NODE),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("labelText",t.ɵɵpipeBind1(3,7,"notification.recipients")),t.ɵɵpropertyInterpolate("placeholderText",t.ɵɵpipeBind1(4,9,"notification.recipient")),t.ɵɵpropertyInterpolate("requiredText",t.ɵɵpipeBind1(5,11,"notification.recipients-required")),t.ɵɵpropertyInterpolate("entityType",n.entityType.NOTIFICATION_TARGET),t.ɵɵpropertyInterpolate("subType",n.notificationType.RULE_NODE))},dependencies:t.ɵɵgetComponentDepsFactory(Yo),encapsulation:2})}}function Wo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.gcp-project-id-required")," "))}function Xo(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.pubsub-topic-name-required")," "))}e("NotificationConfigComponent",Yo);class Zo extends i{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,[N.required]],topicName:[e?e.topicName:null,[N.required]],serviceAccountKey:[e?e.serviceAccountKey:null,[N.required]],serviceAccountKeyFileName:[e?e.serviceAccountKeyFileName:null,[N.required]],messageAttributes:[e?e.messageAttributes:null,[]]})}static{this.ɵfac=function(e){return new(e||Zo)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Zo,selectors:[["tb-external-node-pub-sub-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:20,vars:16,consts:[[1,"flex","flex-col",3,"formGroup"],[1,"mat-block"],["translate",""],["required","","matInput","","formControlName","projectId"],[4,"ngIf"],["required","","matInput","","formControlName","topicName"],["formControlName","serviceAccountKey","required","","requiredAsError","","noFileText","tb.rulenode.no-file",2,"padding-bottom","24px",3,"fileNameChanged","existingFileName","label","dropLabel"],["translate","",1,"tb-title"],[1,"tb-hint",3,"innerHTML"],["required","false","formControlName","messageAttributes","keyText","tb.rulenode.name","keyRequiredText","tb.rulenode.name-required","valText","tb.rulenode.value","valRequiredText","tb.rulenode.value-required"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.gcp-project-id"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵtemplate(5,Wo,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(6,"mat-form-field",1)(7,"mat-label",2),t.ɵɵtext(8,"tb.rulenode.pubsub-topic-name"),t.ɵɵelementEnd(),t.ɵɵelement(9,"input",5),t.ɵɵtemplate(10,Xo,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(11,"tb-file-input",6),t.ɵɵpipe(12,"translate"),t.ɵɵpipe(13,"translate"),t.ɵɵlistener("fileNameChanged",(function(e){return n.pubSubConfigForm.get("serviceAccountKeyFileName").setValue(e)})),t.ɵɵelementEnd(),t.ɵɵelementStart(14,"label",7),t.ɵɵtext(15,"tb.rulenode.message-attributes"),t.ɵɵelementEnd(),t.ɵɵelement(16,"div",8),t.ɵɵpipe(17,"translate"),t.ɵɵpipe(18,"safe"),t.ɵɵelement(19,"tb-kv-map-config-old",9),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.pubSubConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.pubSubConfigForm.get("projectId").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.pubSubConfigForm.get("topicName").hasError("required")),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("label",t.ɵɵpipeBind1(12,7,"tb.rulenode.gcp-service-account-key")),t.ɵɵpropertyInterpolate("dropLabel",t.ɵɵpipeBind1(13,9,"tb.rulenode.drop-file")),t.ɵɵproperty("existingFileName",n.pubSubConfigForm.get("serviceAccountKeyFileName").value),t.ɵɵadvance(5),t.ɵɵproperty("innerHTML",t.ɵɵpipeBind2(18,13,t.ɵɵpipeBind1(17,11,"tb.rulenode.message-attributes-hint"),"html"),t.ɵɵsanitizeHtml))},dependencies:t.ɵɵgetComponentDepsFactory(Zo),encapsulation:2})}}function el(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",22),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e," ")}}function tl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.host-required")," "))}function nl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.port-required")," "))}function rl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.port-range")," "))}function al(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.port-range")," "))}function il(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-connection-timeout-ms-message")," "))}function ol(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-handshake-timeout-ms-message")," "))}e("PubSubConfigComponent",Zo);class ll extends i{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,[N.required]],port:[e?e.port:null,[N.required,N.min(1),N.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,[N.min(0)]],handshakeTimeout:[e?e.handshakeTimeout:null,[N.min(0)]],clientProperties:[e?e.clientProperties:null,[]]})}static{this.ɵfac=function(e){return new(e||ll)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:ll,selectors:[["tb-external-node-rabbit-mq-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:56,vars:11,consts:[[1,"flex","flex-col",3,"formGroup"],[1,"mat-block"],["translate",""],["matInput","","formControlName","exchangeNamePattern"],["matInput","","formControlName","routingKeyPattern"],["formControlName","messageProperties"],[3,"value",4,"ngFor","ngForOf"],[1,"gt-sm:flex","gt-sm:flex-row","gt-sm:gap-2"],[1,"mat-block","gt-sm:max-w-60%","gt-sm:flex-full"],["required","","matInput","","formControlName","host"],[4,"ngIf"],[1,"mat-block","gt-sm:max-w-40%","gt-sm:flex-full"],["required","","type","number","step","1","min","1","max","65535","matInput","","formControlName","port"],["matInput","","formControlName","virtualHost"],["matInput","","formControlName","username"],["type","password","matInput","","formControlName","password"],["matSuffix",""],["formControlName","automaticRecoveryEnabled"],["type","number","step","1","min","0","matInput","","formControlName","connectionTimeout"],["type","number","step","1","min","0","matInput","","formControlName","handshakeTimeout"],["translate","",1,"tb-title"],["required","false","formControlName","clientProperties","keyText","tb.rulenode.key","keyRequiredText","tb.rulenode.key-required","valText","tb.rulenode.value","valRequiredText","tb.rulenode.value-required"],[3,"value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.exchange-name-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"mat-form-field",1)(6,"mat-label",2),t.ɵɵtext(7,"tb.rulenode.routing-key-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(8,"input",4),t.ɵɵelementEnd(),t.ɵɵelementStart(9,"mat-form-field",1)(10,"mat-label",2),t.ɵɵtext(11,"tb.rulenode.message-properties"),t.ɵɵelementEnd(),t.ɵɵelementStart(12,"mat-select",5),t.ɵɵtemplate(13,el,2,2,"mat-option",6),t.ɵɵelementEnd()(),t.ɵɵelementStart(14,"div",7)(15,"mat-form-field",8)(16,"mat-label",2),t.ɵɵtext(17,"tb.rulenode.host"),t.ɵɵelementEnd(),t.ɵɵelement(18,"input",9),t.ɵɵtemplate(19,tl,3,3,"mat-error",10),t.ɵɵelementEnd(),t.ɵɵelementStart(20,"mat-form-field",11)(21,"mat-label",2),t.ɵɵtext(22,"tb.rulenode.port"),t.ɵɵelementEnd(),t.ɵɵelement(23,"input",12),t.ɵɵtemplate(24,nl,3,3,"mat-error",10)(25,rl,3,3,"mat-error",10)(26,al,3,3,"mat-error",10),t.ɵɵelementEnd()(),t.ɵɵelementStart(27,"mat-form-field",1)(28,"mat-label",2),t.ɵɵtext(29,"tb.rulenode.virtual-host"),t.ɵɵelementEnd(),t.ɵɵelement(30,"input",13),t.ɵɵelementEnd(),t.ɵɵelementStart(31,"mat-form-field",1)(32,"mat-label",2),t.ɵɵtext(33,"tb.rulenode.username"),t.ɵɵelementEnd(),t.ɵɵelement(34,"input",14),t.ɵɵelementEnd(),t.ɵɵelementStart(35,"mat-form-field",1)(36,"mat-label",2),t.ɵɵtext(37,"tb.rulenode.password"),t.ɵɵelementEnd(),t.ɵɵelement(38,"input",15)(39,"tb-toggle-password",16),t.ɵɵelementEnd(),t.ɵɵelementStart(40,"mat-checkbox",17),t.ɵɵtext(41),t.ɵɵpipe(42,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(43,"mat-form-field",1)(44,"mat-label",2),t.ɵɵtext(45,"tb.rulenode.connection-timeout-ms"),t.ɵɵelementEnd(),t.ɵɵelement(46,"input",18),t.ɵɵtemplate(47,il,3,3,"mat-error",10),t.ɵɵelementEnd(),t.ɵɵelementStart(48,"mat-form-field",1)(49,"mat-label",2),t.ɵɵtext(50,"tb.rulenode.handshake-timeout-ms"),t.ɵɵelementEnd(),t.ɵɵelement(51,"input",19),t.ɵɵtemplate(52,ol,3,3,"mat-error",10),t.ɵɵelementEnd(),t.ɵɵelementStart(53,"label",20),t.ɵɵtext(54,"tb.rulenode.client-properties"),t.ɵɵelementEnd(),t.ɵɵelement(55,"tb-kv-map-config-old",21),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.rabbitMqConfigForm),t.ɵɵadvance(13),t.ɵɵproperty("ngForOf",n.messageProperties),t.ɵɵadvance(6),t.ɵɵproperty("ngIf",n.rabbitMqConfigForm.get("host").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.rabbitMqConfigForm.get("port").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.rabbitMqConfigForm.get("port").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.rabbitMqConfigForm.get("port").hasError("max")),t.ɵɵadvance(15),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(42,9,"tb.rulenode.automatic-recovery")," "),t.ɵɵadvance(6),t.ɵɵproperty("ngIf",n.rabbitMqConfigForm.get("connectionTimeout").hasError("min")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.rabbitMqConfigForm.get("handshakeTimeout").hasError("min")))},dependencies:t.ɵɵgetComponentDepsFactory(ll),encapsulation:2})}}e("RabbitMqConfigComponent",ll);const sl=e=>({max:e});function pl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.endpoint-url-pattern-required")," "))}function ml(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",20),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e," ")}}function dl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-checkbox",21),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.use-simple-client-http-factory")," "))}function ul(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",20),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e," ")}}function cl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.proxy-host-required")," "))}function fl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.proxy-port-required")," "))}function gl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.proxy-port-range")," "))}function hl(e,n){if(1&e&&(t.ɵɵelementStart(0,"div")(1,"div",23)(2,"mat-form-field",24)(3,"mat-label",2),t.ɵɵtext(4,"tb.rulenode.proxy-scheme"),t.ɵɵelementEnd(),t.ɵɵelementStart(5,"mat-select",25),t.ɵɵtemplate(6,ul,2,2,"mat-option",7),t.ɵɵelementEnd()(),t.ɵɵelementStart(7,"mat-form-field",26)(8,"mat-label",2),t.ɵɵtext(9,"tb.rulenode.proxy-host"),t.ɵɵelementEnd(),t.ɵɵelement(10,"input",27),t.ɵɵtemplate(11,cl,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(12,"mat-form-field",28)(13,"mat-label",2),t.ɵɵtext(14,"tb.rulenode.proxy-port"),t.ɵɵelementEnd(),t.ɵɵelement(15,"input",29),t.ɵɵtemplate(16,fl,3,3,"mat-error",4)(17,gl,3,3,"mat-error",4),t.ɵɵelementEnd()(),t.ɵɵelementStart(18,"mat-form-field",5)(19,"mat-label",2),t.ɵɵtext(20,"tb.rulenode.proxy-user"),t.ɵɵelementEnd(),t.ɵɵelement(21,"input",30),t.ɵɵelementEnd(),t.ɵɵelementStart(22,"mat-form-field",5)(23,"mat-label",2),t.ɵɵtext(24,"tb.rulenode.proxy-password"),t.ɵɵelementEnd(),t.ɵɵelement(25,"input",31),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(6),t.ɵɵproperty("ngForOf",e.proxySchemes),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",e.restApiCallConfigForm.get("proxyHost").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",e.restApiCallConfigForm.get("proxyPort").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.restApiCallConfigForm.get("proxyPort").hasError("min")||e.restApiCallConfigForm.get("proxyPort").hasError("max"))}}function yl(e,n){if(1&e&&(t.ɵɵelementStart(0,"div")(1,"mat-checkbox",22),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(4,hl,26,4,"div",4),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(3,2,"tb.rulenode.use-system-proxy-properties")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!e.restApiCallConfigForm.get("useSystemProxyProperties").value)}}function bl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.int-range")," "))}function vl(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",1)(1,"mat-label",2),t.ɵɵtext(2,"tb.rulenode.read-timeout"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",32),t.ɵɵelementStart(4,"mat-hint",2),t.ɵɵtext(5,"tb.rulenode.read-timeout-hint"),t.ɵɵelementEnd(),t.ɵɵtemplate(6,bl,3,3,"mat-error",4),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(3),t.ɵɵproperty("max",e.IntLimit),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.restApiCallConfigForm.get("readTimeoutMs").hasError("max"))}}function xl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.int-range")," "))}function Cl(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind2(2,1,"tb.rulenode.memory-buffer-size-range",t.ɵɵpureFunction1(4,sl,e.MemoryBufferSizeInKbLimit))," ")}}class Sl extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.proxySchemes=["http","https"],this.httpRequestTypes=Object.keys(Dt),this.MemoryBufferSizeInKbLimit=25e3,this.IntLimit=tn}configForm(){return this.restApiCallConfigForm}onConfigurationSet(e){this.restApiCallConfigForm=this.fb.group({restEndpointUrlPattern:[e?e.restEndpointUrlPattern:null,[N.required]],requestMethod:[e?e.requestMethod:null,[N.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,[N.min(0),N.max(tn)]],maxParallelRequestsCount:[e?e.maxParallelRequestsCount:null,[N.min(0),N.max(tn)]],headers:[e?e.headers:null,[]],credentials:[e?e.credentials:null,[]],maxInMemoryBufferSizeInKb:[e?e.maxInMemoryBufferSizeInKb:null,[N.min(1),N.max(this.MemoryBufferSizeInKbLimit)]]})}validatorTriggers(){return["useSimpleClientHttpFactory","enableProxy","useSystemProxyProperties"]}updateValidators(e){const t=this.restApiCallConfigForm.get("useSimpleClientHttpFactory").value,n=this.restApiCallConfigForm.get("enableProxy").value,r=this.restApiCallConfigForm.get("useSystemProxyProperties").value;n&&!r?(this.restApiCallConfigForm.get("proxyHost").setValidators(n?[N.required]:[]),this.restApiCallConfigForm.get("proxyPort").setValidators(n?[N.required,N.min(1),N.max(65535)]:[])):(this.restApiCallConfigForm.get("proxyHost").setValidators([]),this.restApiCallConfigForm.get("proxyPort").setValidators([]),t?this.restApiCallConfigForm.get("readTimeoutMs").setValidators([]):this.restApiCallConfigForm.get("readTimeoutMs").setValidators([N.min(0),N.max(tn)])),this.restApiCallConfigForm.get("readTimeoutMs").updateValueAndValidity({emitEvent:e}),this.restApiCallConfigForm.get("proxyHost").updateValueAndValidity({emitEvent:e}),this.restApiCallConfigForm.get("proxyPort").updateValueAndValidity({emitEvent:e}),this.restApiCallConfigForm.get("credentials").updateValueAndValidity({emitEvent:e})}static{this.ɵfac=function(e){return new(e||Sl)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Sl,selectors:[["tb-external-node-rest-api-call-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:48,vars:26,consts:[[1,"flex","flex-col",3,"formGroup"],["subscriptSizing","dynamic",1,"mat-block"],["translate",""],["required","","matInput","","formControlName","restEndpointUrlPattern"],[4,"ngIf"],[1,"mat-block"],["formControlName","requestMethod"],[3,"value",4,"ngFor","ngForOf"],["formControlName","enableProxy"],["formControlName","useSimpleClientHttpFactory",4,"ngIf"],["formControlName","parseToPlainText"],["translate","",1,"tb-hint",2,"padding-bottom","5px"],["formControlName","ignoreRequestBody"],["class","mat-block","subscriptSizing","dynamic",4,"ngIf"],["type","text","min","0","inputmode","numeric","pattern","[0-9]*","matInput","","formControlName","maxParallelRequestsCount",3,"max"],["type","text","min","1","inputmode","numeric","pattern","[0-9]*","matInput","","formControlName","maxInMemoryBufferSizeInKb",3,"max"],["translate","",1,"tb-title"],[1,"tb-hint",3,"innerHTML"],["required","false","formControlName","headers","keyText","tb.rulenode.header","keyRequiredText","tb.rulenode.header-required","valText","tb.rulenode.value","valRequiredText","tb.rulenode.value-required"],["formControlName","credentials",3,"disableCertPemCredentials"],[3,"value"],["formControlName","useSimpleClientHttpFactory"],["formControlName","useSystemProxyProperties"],[1,"gt-sm:flex","gt-sm:flex-row","gt-sm:gap-2"],[1,"mat-block","gt-sm:max-w-10%","gt-sm:flex-full"],["formControlName","proxyScheme"],[1,"md-block","gt-sm:max-w-50%","gt-sm:flex-full"],["matInput","","required","","formControlName","proxyHost"],[1,"mat-block","gt-sm:max-w-40%","gt-sm:flex-full"],["matInput","","required","","formControlName","proxyPort","type","number","step","1"],["matInput","","formControlName","proxyUser"],["matInput","","formControlName","proxyPassword"],["type","text","min","0","inputmode","numeric","pattern","[0-9]*","matInput","","formControlName","readTimeoutMs",3,"max"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.endpoint-url-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵtemplate(5,pl,3,3,"mat-error",4),t.ɵɵelementStart(6,"mat-hint",2),t.ɵɵtext(7,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()(),t.ɵɵelementStart(8,"mat-form-field",5)(9,"mat-label",2),t.ɵɵtext(10,"tb.rulenode.request-method"),t.ɵɵelementEnd(),t.ɵɵelementStart(11,"mat-select",6),t.ɵɵtemplate(12,ml,2,2,"mat-option",7),t.ɵɵelementEnd()(),t.ɵɵelementStart(13,"mat-checkbox",8),t.ɵɵtext(14),t.ɵɵpipe(15,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(16,dl,3,3,"mat-checkbox",9),t.ɵɵelementStart(17,"mat-checkbox",10),t.ɵɵtext(18),t.ɵɵpipe(19,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(20,"div",11),t.ɵɵtext(21,"tb.rulenode.parse-to-plain-text-hint"),t.ɵɵelementEnd(),t.ɵɵelementStart(22,"mat-checkbox",12),t.ɵɵtext(23),t.ɵɵpipe(24,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(25,yl,5,4,"div",4)(26,vl,7,2,"mat-form-field",13),t.ɵɵelementStart(27,"mat-form-field",1)(28,"mat-label",2),t.ɵɵtext(29,"tb.rulenode.max-parallel-requests-count"),t.ɵɵelementEnd(),t.ɵɵelement(30,"input",14),t.ɵɵelementStart(31,"mat-hint",2),t.ɵɵtext(32,"tb.rulenode.max-parallel-requests-count-hint"),t.ɵɵelementEnd(),t.ɵɵtemplate(33,xl,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(34,"mat-form-field",1)(35,"mat-label",2),t.ɵɵtext(36,"tb.rulenode.max-response-size"),t.ɵɵelementEnd(),t.ɵɵelement(37,"input",15),t.ɵɵelementStart(38,"mat-hint",2),t.ɵɵtext(39,"tb.rulenode.max-response-size-hint"),t.ɵɵelementEnd(),t.ɵɵtemplate(40,Cl,3,6,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(41,"label",16),t.ɵɵtext(42,"tb.rulenode.headers"),t.ɵɵelementEnd(),t.ɵɵelement(43,"div",17),t.ɵɵpipe(44,"translate"),t.ɵɵpipe(45,"safe"),t.ɵɵelement(46,"tb-kv-map-config-old",18)(47,"tb-credentials-config",19),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.restApiCallConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.restApiCallConfigForm.get("restEndpointUrlPattern").hasError("required")),t.ɵɵadvance(7),t.ɵɵproperty("ngForOf",n.httpRequestTypes),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(15,15,"tb.rulenode.enable-proxy")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!n.restApiCallConfigForm.get("enableProxy").value),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(19,17,"tb.rulenode.parse-to-plain-text")," "),t.ɵɵadvance(5),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(24,19,"tb.rulenode.ignore-request-body")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.restApiCallConfigForm.get("enableProxy").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf",!n.restApiCallConfigForm.get("useSimpleClientHttpFactory").value||n.restApiCallConfigForm.get("enableProxy").value),t.ɵɵadvance(4),t.ɵɵproperty("max",n.IntLimit),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.restApiCallConfigForm.get("maxParallelRequestsCount").hasError("max")),t.ɵɵadvance(4),t.ɵɵproperty("max",n.MemoryBufferSizeInKbLimit),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.restApiCallConfigForm.get("maxInMemoryBufferSizeInKb").hasError("min")||n.restApiCallConfigForm.get("maxInMemoryBufferSizeInKb").hasError("max")),t.ɵɵadvance(3),t.ɵɵproperty("innerHTML",t.ɵɵpipeBind2(45,23,t.ɵɵpipeBind1(44,21,"tb.rulenode.headers-hint"),"html"),t.ɵɵsanitizeHtml),t.ɵɵadvance(4),t.ɵɵproperty("disableCertPemCredentials",n.restApiCallConfigForm.get("useSimpleClientHttpFactory").value))},dependencies:t.ɵɵgetComponentDepsFactory(Sl),encapsulation:2})}}function Tl(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",22),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e.toUpperCase()," ")}}function Il(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.smtp-host-required")," "))}function El(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.smtp-port-required")," "))}function Fl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.smtp-port-range")," "))}function ql(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.smtp-port-range")," "))}function Al(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.timeout-required")," "))}function kl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-timeout-msec-message")," "))}function Nl(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",22),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e," ")}}function wl(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",4)(1,"mat-label",5),t.ɵɵtext(2,"tb.rulenode.tls-version"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"mat-select",23),t.ɵɵtemplate(4,Nl,2,2,"mat-option",7),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(4),t.ɵɵproperty("ngForOf",e.tlsVersions)}}function Ml(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.proxy-host-required")," "))}function Bl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.proxy-port-required")," "))}function Vl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.proxy-port-range")," "))}function Ol(e,n){if(1&e&&(t.ɵɵelementStart(0,"div")(1,"div",8)(2,"mat-form-field",9)(3,"mat-label",5),t.ɵɵtext(4,"tb.rulenode.proxy-host"),t.ɵɵelementEnd(),t.ɵɵelement(5,"input",24),t.ɵɵtemplate(6,Ml,3,3,"mat-error",11),t.ɵɵelementEnd(),t.ɵɵelementStart(7,"mat-form-field",12)(8,"mat-label",5),t.ɵɵtext(9,"tb.rulenode.proxy-port"),t.ɵɵelementEnd(),t.ɵɵelement(10,"input",25),t.ɵɵtemplate(11,Bl,3,3,"mat-error",11)(12,Vl,3,3,"mat-error",11),t.ɵɵelementEnd()(),t.ɵɵelementStart(13,"mat-form-field",4)(14,"mat-label",5),t.ɵɵtext(15,"tb.rulenode.proxy-user"),t.ɵɵelementEnd(),t.ɵɵelement(16,"input",26),t.ɵɵelementEnd(),t.ɵɵelementStart(17,"mat-form-field",4)(18,"mat-label",5),t.ɵɵtext(19,"tb.rulenode.proxy-password"),t.ɵɵelementEnd(),t.ɵɵelement(20,"input",27),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext(2);t.ɵɵadvance(6),t.ɵɵproperty("ngIf",e.sendEmailConfigForm.get("proxyHost").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",e.sendEmailConfigForm.get("proxyPort").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.sendEmailConfigForm.get("proxyPort").hasError("min")||e.sendEmailConfigForm.get("proxyPort").hasError("max"))}}function Dl(e,n){if(1&e&&(t.ɵɵelementStart(0,"section",3)(1,"mat-form-field",4)(2,"mat-label",5),t.ɵɵtext(3,"tb.rulenode.smtp-protocol"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"mat-select",6),t.ɵɵtemplate(5,Tl,2,2,"mat-option",7),t.ɵɵelementEnd()(),t.ɵɵelementStart(6,"div",8)(7,"mat-form-field",9)(8,"mat-label",5),t.ɵɵtext(9,"tb.rulenode.smtp-host"),t.ɵɵelementEnd(),t.ɵɵelement(10,"input",10),t.ɵɵtemplate(11,Il,3,3,"mat-error",11),t.ɵɵelementEnd(),t.ɵɵelementStart(12,"mat-form-field",12)(13,"mat-label",5),t.ɵɵtext(14,"tb.rulenode.smtp-port"),t.ɵɵelementEnd(),t.ɵɵelement(15,"input",13),t.ɵɵtemplate(16,El,3,3,"mat-error",11)(17,Fl,3,3,"mat-error",11)(18,ql,3,3,"mat-error",11),t.ɵɵelementEnd()(),t.ɵɵelementStart(19,"mat-form-field",4)(20,"mat-label",5),t.ɵɵtext(21,"tb.rulenode.timeout-msec"),t.ɵɵelementEnd(),t.ɵɵelement(22,"input",14),t.ɵɵtemplate(23,Al,3,3,"mat-error",11)(24,kl,3,3,"mat-error",11),t.ɵɵelementEnd(),t.ɵɵelementStart(25,"mat-checkbox",15),t.ɵɵtext(26),t.ɵɵpipe(27,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(28,wl,5,1,"mat-form-field",16),t.ɵɵelementStart(29,"tb-checkbox",17),t.ɵɵtext(30),t.ɵɵpipe(31,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(32,Ol,21,3,"div",11),t.ɵɵelementStart(33,"mat-form-field",18)(34,"mat-label",5),t.ɵɵtext(35,"tb.rulenode.username"),t.ɵɵelementEnd(),t.ɵɵelement(36,"input",19),t.ɵɵpipe(37,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(38,"mat-form-field",18)(39,"mat-label",5),t.ɵɵtext(40,"tb.rulenode.password"),t.ɵɵelementEnd(),t.ɵɵelement(41,"input",20),t.ɵɵpipe(42,"translate"),t.ɵɵelement(43,"tb-toggle-password",21),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(5),t.ɵɵproperty("ngForOf",e.smtpProtocols),t.ɵɵadvance(6),t.ɵɵproperty("ngIf",e.sendEmailConfigForm.get("smtpHost").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",e.sendEmailConfigForm.get("smtpPort").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.sendEmailConfigForm.get("smtpPort").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.sendEmailConfigForm.get("smtpPort").hasError("max")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",e.sendEmailConfigForm.get("timeout").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.sendEmailConfigForm.get("timeout").hasError("min")),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(27,13,"tb.rulenode.enable-tls")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!0===e.sendEmailConfigForm.get("enableTls").value),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(31,15,"tb.rulenode.enable-proxy")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",e.sendEmailConfigForm.get("enableProxy").value),t.ɵɵadvance(4),t.ɵɵpropertyInterpolate("placeholder",t.ɵɵpipeBind1(37,17,"tb.rulenode.enter-username")),t.ɵɵadvance(5),t.ɵɵpropertyInterpolate("placeholder",t.ɵɵpipeBind1(42,19,"tb.rulenode.enter-password"))}}e("RestApiCallConfigComponent",Sl);class Ll extends i{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([N.required]),this.sendEmailConfigForm.get("smtpHost").setValidators([N.required]),this.sendEmailConfigForm.get("smtpPort").setValidators([N.required,N.min(1),N.max(65535)]),this.sendEmailConfigForm.get("timeout").setValidators([N.required,N.min(0)]),this.sendEmailConfigForm.get("proxyHost").setValidators(n?[N.required]:[]),this.sendEmailConfigForm.get("proxyPort").setValidators(n?[N.required,N.min(1),N.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})}static{this.ɵfac=function(e){return new(e||Ll)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Ll,selectors:[["tb-external-node-send-email-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:5,vars:5,consts:[[1,"flex","flex-col",3,"formGroup"],["formControlName","useSystemSmtpSettings"],["class","flex flex-col",4,"ngIf"],[1,"flex","flex-col"],[1,"mat-block"],["translate",""],["formControlName","smtpProtocol"],[3,"value",4,"ngFor","ngForOf"],[1,"gt-sm:flex","gt-sm:flex-row","gt-sm:gap-2"],[1,"mat-block","gt-sm:max-w-60%","gt-sm:flex-full"],["required","","matInput","","formControlName","smtpHost"],[4,"ngIf"],[1,"mat-block","gt-sm:max-w-40%","gt-sm:flex-full"],["required","","type","number","step","1","min","1","max","65535","matInput","","formControlName","smtpPort"],["required","","type","number","step","1","min","0","matInput","","formControlName","timeout"],["formControlName","enableTls"],["class","mat-block",4,"ngIf"],["formControlName","enableProxy"],["floatLabel","always",1,"mat-block"],["matInput","","formControlName","username",3,"placeholder"],["matInput","","type","password","formControlName","password",3,"placeholder"],["matSuffix",""],[3,"value"],["formControlName","tlsVersion"],["matInput","","required","","formControlName","proxyHost"],["matInput","","required","","formControlName","proxyPort","type","number","step","1","min","1","max","65535"],["matInput","","formControlName","proxyUser"],["matInput","","formControlName","proxyPassword"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-checkbox",1),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(4,Dl,44,21,"section",2),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.sendEmailConfigForm),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(3,3,"tb.rulenode.use-system-smtp-settings")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!1===n.sendEmailConfigForm.get("useSystemSmtpSettings").value))},dependencies:t.ɵɵgetComponentDepsFactory(Ll),encapsulation:2})}}function Pl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.numbers-to-template-required")," "))}function Rl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.sms-message-template-required")," "))}function _l(e,n){1&e&&t.ɵɵelement(0,"tb-sms-provider-configuration",9)}e("SendEmailConfigComponent",Ll);class jl extends i{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,[N.required]],smsMessageTemplate:[e?e.smsMessageTemplate:null,[N.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([N.required]),this.sendSmsConfigForm.get("smsProviderConfiguration").updateValueAndValidity({emitEvent:e})}static{this.ɵfac=function(e){return new(e||jl)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:jl,selectors:[["tb-external-node-send-sms-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:20,vars:13,consts:[[1,"flex","flex-col",3,"formGroup"],["subscriptSizing","dynamic",1,"mat-block"],["translate",""],["required","","matInput","","formControlName","numbersToTemplate"],[4,"ngIf"],[3,"innerHTML"],["required","","matInput","","formControlName","smsMessageTemplate","rows","6"],["formControlName","useSystemSmsSettings"],["formControlName","smsProviderConfiguration","required","",4,"ngIf"],["formControlName","smsProviderConfiguration","required",""]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.numbers-to-template"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵtemplate(5,Pl,3,3,"mat-error",4),t.ɵɵelement(6,"mat-hint",5),t.ɵɵpipe(7,"translate"),t.ɵɵpipe(8,"safe"),t.ɵɵelementEnd(),t.ɵɵelementStart(9,"mat-form-field",1)(10,"mat-label",2),t.ɵɵtext(11,"tb.rulenode.sms-message-template"),t.ɵɵelementEnd(),t.ɵɵelement(12,"textarea",6),t.ɵɵtemplate(13,Rl,3,3,"mat-error",4),t.ɵɵelementStart(14,"mat-hint",2),t.ɵɵtext(15,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()(),t.ɵɵelementStart(16,"mat-checkbox",7),t.ɵɵtext(17),t.ɵɵpipe(18,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(19,_l,1,0,"tb-sms-provider-configuration",8),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.sendSmsConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.sendSmsConfigForm.get("numbersToTemplate").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("innerHTML",t.ɵɵpipeBind2(8,8,t.ɵɵpipeBind1(7,6,"tb.rulenode.numbers-to-template-hint"),"html"),t.ɵɵsanitizeHtml),t.ɵɵadvance(7),t.ɵɵproperty("ngIf",n.sendSmsConfigForm.get("smsMessageTemplate").hasError("required")),t.ɵɵadvance(4),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(18,11,"tb.rulenode.use-system-sms-settings")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!1===n.sendSmsConfigForm.get("useSystemSmsSettings").value))},dependencies:t.ɵɵgetComponentDepsFactory(jl),encapsulation:2})}}function Gl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.message-template-required")," "))}function Kl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.slack-api-token-required")," "))}function Ul(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",11)(1,"mat-label",2),t.ɵɵtext(2,"tb.rulenode.slack-api-token"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",12),t.ɵɵtemplate(4,Kl,3,3,"mat-error",4),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(4),t.ɵɵproperty("ngIf",e.slackConfigForm.get("botToken").hasError("required"))}}function Hl(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-radio-button",13),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.slackChanelTypesTranslateMap.get(e))," ")}}e("SendSmsConfigComponent",jl);class zl extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.slackChanelTypes=Object.keys(F),this.slackChanelTypesTranslateMap=q}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,[N.required]],conversationType:[e?e.conversationType:null,[N.required]],conversation:[e?e.conversation:null,[N.required]]})}validatorTriggers(){return["useSystemSettings"]}updateValidators(e){this.slackConfigForm.get("useSystemSettings").value?this.slackConfigForm.get("botToken").clearValidators():this.slackConfigForm.get("botToken").setValidators([N.required]),this.slackConfigForm.get("botToken").updateValueAndValidity({emitEvent:e})}static{this.ɵfac=function(e){return new(e||zl)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:zl,selectors:[["tb-external-node-slack-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:18,vars:12,consts:[[1,"flex","flex-col",3,"formGroup"],[1,"mat-block","flex-1"],["translate",""],["required","","matInput","","formControlName","messageTemplate"],[4,"ngIf"],["formControlName","useSystemSettings"],["class","mat-block",4,"ngIf"],[1,"tb-title"],["formControlName","conversationType"],[3,"value",4,"ngFor","ngForOf"],["formControlName","conversation","required","",3,"token","slackChanelType"],[1,"mat-block"],["required","","matInput","","formControlName","botToken"],[3,"value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.message-template"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵtemplate(5,Gl,3,3,"mat-error",4),t.ɵɵelementStart(6,"mat-hint",2),t.ɵɵtext(7,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()(),t.ɵɵelementStart(8,"mat-checkbox",5),t.ɵɵtext(9),t.ɵɵpipe(10,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(11,Ul,5,1,"mat-form-field",6),t.ɵɵelementStart(12,"label",7),t.ɵɵtext(13),t.ɵɵpipe(14,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(15,"mat-radio-group",8),t.ɵɵtemplate(16,Hl,3,4,"mat-radio-button",9),t.ɵɵelementEnd(),t.ɵɵelement(17,"tb-slack-conversation-autocomplete",10),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.slackConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.slackConfigForm.get("messageTemplate").hasError("required")),t.ɵɵadvance(4),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(10,8,"tb.rulenode.use-system-slack-settings")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",!n.slackConfigForm.get("useSystemSettings").value),t.ɵɵadvance(2),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(14,10,"notification.slack-chanel-type")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.slackChanelTypes),t.ɵɵadvance(),t.ɵɵproperty("token",n.slackConfigForm.get("useSystemSettings").value?"":n.slackConfigForm.get("botToken").value)("slackChanelType",n.slackConfigForm.get("conversationType").value))},dependencies:t.ɵɵgetComponentDepsFactory(zl),styles:["[_nghost-%COMP%]   .tb-title[_ngcontent-%COMP%]{display:block;padding-bottom:6px}[_nghost-%COMP%]     .mat-mdc-radio-group{display:flex;flex-direction:row;margin-bottom:22px;gap:12px}[_nghost-%COMP%]     .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){[_nghost-%COMP%]     .mat-mdc-radio-group{flex-direction:column}}"]})}}function $l(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.topic-arn-pattern-required")," "))}function Ql(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.aws-access-key-id-required")," "))}function Jl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.aws-secret-access-key-required")," "))}function Yl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.aws-region-required")," "))}e("SlackConfigComponent",zl);class Wl extends i{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,[N.required]],accessKeyId:[e?e.accessKeyId:null,[N.required]],secretAccessKey:[e?e.secretAccessKey:null,[N.required]],region:[e?e.region:null,[N.required]]})}static{this.ɵfac=function(e){return new(e||Wl)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Wl,selectors:[["tb-external-node-sns-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:23,vars:5,consts:[[1,"flex","flex-col",3,"formGroup"],["subscriptSizing","dynamic",1,"mat-block"],["translate",""],["required","","matInput","","formControlName","topicArnPattern"],[4,"ngIf"],[1,"mat-block"],["required","","matInput","","formControlName","accessKeyId"],["required","","matInput","","formControlName","secretAccessKey"],["required","","matInput","","formControlName","region"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.topic-arn-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",3),t.ɵɵtemplate(5,$l,3,3,"mat-error",4),t.ɵɵelementStart(6,"mat-hint",2),t.ɵɵtext(7,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()(),t.ɵɵelementStart(8,"mat-form-field",5)(9,"mat-label",2),t.ɵɵtext(10,"tb.rulenode.aws-access-key-id"),t.ɵɵelementEnd(),t.ɵɵelement(11,"input",6),t.ɵɵtemplate(12,Ql,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(13,"mat-form-field",5)(14,"mat-label",2),t.ɵɵtext(15,"tb.rulenode.aws-secret-access-key"),t.ɵɵelementEnd(),t.ɵɵelement(16,"input",7),t.ɵɵtemplate(17,Jl,3,3,"mat-error",4),t.ɵɵelementEnd(),t.ɵɵelementStart(18,"mat-form-field",5)(19,"mat-label",2),t.ɵɵtext(20,"tb.rulenode.aws-region"),t.ɵɵelementEnd(),t.ɵɵelement(21,"input",8),t.ɵɵtemplate(22,Yl,3,3,"mat-error",4),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.snsConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.snsConfigForm.get("topicArnPattern").hasError("required")),t.ɵɵadvance(7),t.ɵɵproperty("ngIf",n.snsConfigForm.get("accessKeyId").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.snsConfigForm.get("secretAccessKey").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.snsConfigForm.get("region").hasError("required")))},dependencies:t.ɵɵgetComponentDepsFactory(Wl),encapsulation:2})}}function Xl(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",15),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.sqsQueueTypeTranslationsMap.get(e))," ")}}function Zl(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.queue-url-pattern-required")," "))}function es(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.min-delay-seconds-message")," "))}function ts(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-delay-seconds-message")," "))}function ns(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",1)(1,"mat-label",2),t.ɵɵtext(2,"tb.rulenode.delay-seconds"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",16),t.ɵɵtemplate(4,es,3,3,"mat-error",7)(5,ts,3,3,"mat-error",7),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(4),t.ɵɵproperty("ngIf",e.sqsConfigForm.get("delaySeconds").hasError("min")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.sqsConfigForm.get("delaySeconds").hasError("max"))}}function rs(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.aws-access-key-id-required")," "))}function as(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.aws-secret-access-key-required")," "))}function is(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.aws-region-required")," "))}e("SnsConfigComponent",Wl);class os extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.sqsQueueType=Nt,this.sqsQueueTypes=Object.keys(Nt),this.sqsQueueTypeTranslationsMap=wt}configForm(){return this.sqsConfigForm}onConfigurationSet(e){this.sqsConfigForm=this.fb.group({queueType:[e?e.queueType:null,[N.required]],queueUrlPattern:[e?e.queueUrlPattern:null,[N.required]],delaySeconds:[e?e.delaySeconds:null,[N.min(0),N.max(900)]],messageAttributes:[e?e.messageAttributes:null,[]],accessKeyId:[e?e.accessKeyId:null,[N.required]],secretAccessKey:[e?e.secretAccessKey:null,[N.required]],region:[e?e.region:null,[N.required]]})}static{this.ɵfac=function(e){return new(e||os)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:os,selectors:[["tb-external-node-sqs-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:35,vars:13,consts:[[1,"flex","flex-col",3,"formGroup"],[1,"mat-block"],["translate",""],["formControlName","queueType","required",""],[3,"value",4,"ngFor","ngForOf"],["subscriptSizing","dynamic",1,"mat-block"],["required","","matInput","","formControlName","queueUrlPattern"],[4,"ngIf"],["class","mat-block",4,"ngIf"],["translate","",1,"tb-title"],[1,"tb-hint",3,"innerHTML"],["required","false","formControlName","messageAttributes","keyText","tb.rulenode.name","keyRequiredText","tb.rulenode.name-required","valText","tb.rulenode.value","valRequiredText","tb.rulenode.value-required"],["required","","matInput","","formControlName","accessKeyId"],["required","","matInput","","formControlName","secretAccessKey"],["required","","matInput","","formControlName","region"],[3,"value"],["required","","type","number","min","0","max","900","step","1","matInput","","formControlName","delaySeconds"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.queue-type"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"mat-select",3),t.ɵɵtemplate(5,Xl,3,4,"mat-option",4),t.ɵɵelementEnd()(),t.ɵɵelementStart(6,"mat-form-field",5)(7,"mat-label",2),t.ɵɵtext(8,"tb.rulenode.queue-url-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(9,"input",6),t.ɵɵtemplate(10,Zl,3,3,"mat-error",7),t.ɵɵelementStart(11,"mat-hint",2),t.ɵɵtext(12,"tb.rulenode.general-pattern-hint"),t.ɵɵelementEnd()(),t.ɵɵtemplate(13,ns,6,2,"mat-form-field",8),t.ɵɵelementStart(14,"label",9),t.ɵɵtext(15,"tb.rulenode.message-attributes"),t.ɵɵelementEnd(),t.ɵɵelement(16,"div",10),t.ɵɵpipe(17,"translate"),t.ɵɵpipe(18,"safe"),t.ɵɵelement(19,"tb-kv-map-config-old",11),t.ɵɵelementStart(20,"mat-form-field",1)(21,"mat-label",2),t.ɵɵtext(22,"tb.rulenode.aws-access-key-id"),t.ɵɵelementEnd(),t.ɵɵelement(23,"input",12),t.ɵɵtemplate(24,rs,3,3,"mat-error",7),t.ɵɵelementEnd(),t.ɵɵelementStart(25,"mat-form-field",1)(26,"mat-label",2),t.ɵɵtext(27,"tb.rulenode.aws-secret-access-key"),t.ɵɵelementEnd(),t.ɵɵelement(28,"input",13),t.ɵɵtemplate(29,as,3,3,"mat-error",7),t.ɵɵelementEnd(),t.ɵɵelementStart(30,"mat-form-field",1)(31,"mat-label",2),t.ɵɵtext(32,"tb.rulenode.aws-region"),t.ɵɵelementEnd(),t.ɵɵelement(33,"input",14),t.ɵɵtemplate(34,is,3,3,"mat-error",7),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.sqsConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("ngForOf",n.sqsQueueTypes),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.sqsConfigForm.get("queueUrlPattern").hasError("required")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.sqsConfigForm.get("queueType").value===n.sqsQueueType.STANDARD),t.ɵɵadvance(3),t.ɵɵproperty("innerHTML",t.ɵɵpipeBind2(18,10,t.ɵɵpipeBind1(17,8,"tb.rulenode.message-attributes-hint"),"html"),t.ɵɵsanitizeHtml),t.ɵɵadvance(8),t.ɵɵproperty("ngIf",n.sqsConfigForm.get("accessKeyId").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.sqsConfigForm.get("secretAccessKey").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.sqsConfigForm.get("region").hasError("required")))},dependencies:t.ɵɵgetComponentDepsFactory(os),encapsulation:2})}}function ls(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.function-name-required")," "))}function ss(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.aws-access-key-id-required")," "))}function ps(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.aws-secret-access-key-required")," "))}function ms(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.aws-region-required")," "))}function ds(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.connection-timeout-required")," "))}function us(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.connection-timeout-min")," "))}function cs(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.request-timeout-required")," "))}function fs(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.request-timeout-min")," "))}e("SqsConfigComponent",os);class gs extends i{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.lambdaConfigForm}onConfigurationSet(e){this.lambdaConfigForm=this.fb.group({functionName:[e?e.functionName:null,[N.required]],qualifier:[e?e.qualifier:null,[]],accessKey:[e?e.accessKey:null,[N.required]],secretKey:[e?e.secretKey:null,[N.required]],region:[e?e.region:null,[N.required]],connectionTimeout:[e?e.connectionTimeout:null,[N.required,N.min(0)]],requestTimeout:[e?e.requestTimeout:null,[N.required,N.min(0)]],tellFailureIfFuncThrowsExc:[!!e&&e.tellFailureIfFuncThrowsExc,[]]})}static{this.ɵfac=function(e){return new(e||gs)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:gs,selectors:[["tb-external-node-lambda-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:71,vars:28,consts:[[1,"tb-form-panel","no-padding","no-border",3,"formGroup"],[1,"tb-form-panel","stroked"],[1,"tb-form-row","no-padding","no-border"],["translate","",1,"tb-form-panel-title","tb-required"],["popupHelpLink","rulenode/node-templatization-doc",3,"hintText"],[1,"tb-standard-fields"],[1,"mat-block"],["required","","matInput","","formControlName","functionName"],[4,"ngIf"],["matInput","","formControlName","qualifier"],["translate",""],["expanded","",1,"tb-settings"],["required","","matInput","","formControlName","accessKey"],["required","","matInput","","formControlName","secretKey"],["required","","matInput","","formControlName","region"],[1,"tb-form-panel","stroked","no-padding"],[1,"tb-settings"],[2,"padding","16px"],[1,"tb-form-panel","no-border","no-padding","no-gap",2,"margin-top","0"],[1,"tb-form-row","no-border","same-padding","tb-standard-fields"],[1,"flex"],["type","number","required","","min","0","matInput","","formControlName","connectionTimeout"],["matSuffix","","aria-hidden","false","aria-label","help-icon","color","primary",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"],["type","number","required","","min","0","matInput","","formControlName","requestTimeout"],[1,"tb-form-row","no-border",2,"margin-bottom","16px",3,"tb-hint-tooltip-icon"],["formControlName","tellFailureIfFuncThrowsExc",1,"mat-slide"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"div",2)(3,"div",3),t.ɵɵtext(4,"tb.rulenode.function-configuration"),t.ɵɵelementEnd()(),t.ɵɵelement(5,"tb-example-hint",4),t.ɵɵelementStart(6,"div",5)(7,"mat-form-field",6)(8,"mat-label"),t.ɵɵtext(9),t.ɵɵpipe(10,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(11,"input",7),t.ɵɵtemplate(12,ls,3,3,"mat-error",8),t.ɵɵelementEnd(),t.ɵɵelementStart(13,"mat-form-field",6)(14,"mat-label"),t.ɵɵtext(15),t.ɵɵpipe(16,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(17,"input",9),t.ɵɵelementStart(18,"mat-hint",10),t.ɵɵtext(19,"tb.rulenode.qualifier-hint"),t.ɵɵelementEnd()()()(),t.ɵɵelementStart(20,"div",1)(21,"mat-expansion-panel",11)(22,"mat-expansion-panel-header")(23,"mat-panel-title",3),t.ɵɵtext(24,"tb.rulenode.aws-credentials"),t.ɵɵelementEnd()(),t.ɵɵelementStart(25,"div",5)(26,"mat-form-field",6)(27,"mat-label",10),t.ɵɵtext(28,"tb.rulenode.aws-access-key-id"),t.ɵɵelementEnd(),t.ɵɵelement(29,"input",12),t.ɵɵtemplate(30,ss,3,3,"mat-error",8),t.ɵɵelementEnd(),t.ɵɵelementStart(31,"mat-form-field",6)(32,"mat-label",10),t.ɵɵtext(33,"tb.rulenode.aws-secret-access-key"),t.ɵɵelementEnd(),t.ɵɵelement(34,"input",13),t.ɵɵtemplate(35,ps,3,3,"mat-error",8),t.ɵɵelementEnd(),t.ɵɵelementStart(36,"mat-form-field",6)(37,"mat-label",10),t.ɵɵtext(38,"tb.rulenode.aws-region"),t.ɵɵelementEnd(),t.ɵɵelement(39,"input",14),t.ɵɵtemplate(40,ms,3,3,"mat-error",8),t.ɵɵelementEnd()()()(),t.ɵɵelementStart(41,"div",15)(42,"mat-expansion-panel",16)(43,"mat-expansion-panel-header",17)(44,"mat-panel-title",10),t.ɵɵtext(45,"tb.rulenode.advanced-settings"),t.ɵɵelementEnd()(),t.ɵɵelementStart(46,"div",18)(47,"div",19)(48,"mat-form-field",20)(49,"mat-label",10),t.ɵɵtext(50,"tb.rulenode.connection-timeout"),t.ɵɵelementEnd(),t.ɵɵelement(51,"input",21),t.ɵɵtemplate(52,ds,3,3,"mat-error",8)(53,us,3,3,"mat-error",8),t.ɵɵelementStart(54,"mat-icon",22),t.ɵɵpipe(55,"translate"),t.ɵɵtext(56,"help"),t.ɵɵelementEnd()(),t.ɵɵelementStart(57,"mat-form-field",20)(58,"mat-label",10),t.ɵɵtext(59,"tb.rulenode.request-timeout"),t.ɵɵelementEnd(),t.ɵɵelement(60,"input",23),t.ɵɵtemplate(61,cs,3,3,"mat-error",8)(62,fs,3,3,"mat-error",8),t.ɵɵelementStart(63,"mat-icon",22),t.ɵɵpipe(64,"translate"),t.ɵɵtext(65,"help"),t.ɵɵelementEnd()()(),t.ɵɵelementStart(66,"div",24),t.ɵɵpipe(67,"translate"),t.ɵɵelementStart(68,"mat-slide-toggle",25),t.ɵɵtext(69),t.ɵɵpipe(70,"translate"),t.ɵɵelementEnd()()()()()()),2&e&&(t.ɵɵproperty("formGroup",n.lambdaConfigForm),t.ɵɵadvance(5),t.ɵɵproperty("hintText","tb.rulenode.template-rules-hint"),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(10,16,"tb.rulenode.function-name")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.lambdaConfigForm.get("functionName").hasError("required")),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(16,18,"tb.rulenode.qualifier")),t.ɵɵadvance(15),t.ɵɵproperty("ngIf",n.lambdaConfigForm.get("accessKey").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.lambdaConfigForm.get("secretKey").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.lambdaConfigForm.get("region").hasError("required")),t.ɵɵadvance(12),t.ɵɵproperty("ngIf",n.lambdaConfigForm.get("connectionTimeout").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.lambdaConfigForm.get("connectionTimeout").hasError("min")),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(55,20,"tb.rulenode.connection-timeout-hint")),t.ɵɵadvance(7),t.ɵɵproperty("ngIf",n.lambdaConfigForm.get("requestTimeout").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.lambdaConfigForm.get("requestTimeout").hasError("min")),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(64,22,"tb.rulenode.request-timeout-hint")),t.ɵɵadvance(3),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(67,24,"tb.rulenode.tell-failure-aws-lambda-hint")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(70,26,"tb.rulenode.tell-failure-aws-lambda")," "))},dependencies:t.ɵɵgetComponentDepsFactory(gs),encapsulation:2})}}e("LambdaConfigComponent",gs);class hs{static{this.ɵfac=function(e){return new(e||hs)}}static{this.ɵmod=t.ɵɵdefineNgModule({type:hs})}static{this.ɵinj=t.ɵɵdefineInjector({imports:[$,S,Q,xi,Wl,os,gs,Zo,_o,Jo,Yo,ll,Sl,Ll,Ao,jl,zl]})}}e("RulenodeCoreConfigExternalModule",hs),("undefined"==typeof ngJitMode||ngJitMode)&&t.ɵɵsetNgModuleScope(hs,{declarations:[Wl,os,gs,Zo,_o,Jo,Yo,ll,Sl,Ll,Ao,jl,zl],imports:[$,S,Q,xi],exports:[Wl,os,gs,Zo,_o,Jo,Yo,ll,Sl,Ll,Ao,jl,zl]});class ys extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.searchText=""}configForm(){return this.alarmStatusConfigForm}prepareInputConfig(e){return{alarmStatusList:P(e?.alarmStatusList)?e.alarmStatusList:null}}onConfigurationSet(e){this.alarmStatusConfigForm=this.fb.group({alarmStatusList:[e.alarmStatusList,[N.required]]})}static{this.ɵfac=function(e){return new(e||ys)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:ys,selectors:[["tb-filter-node-check-alarm-status-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:7,vars:2,consts:[[1,"tb-form-panel","stroked",3,"formGroup"],[1,"tb-form-row","no-padding","no-border","space-between"],["translate","",1,"tb-form-panel-title","tb-required"],["translate","",1,"tb-form-panel-hint","tb-error",3,"hidden"],["formControlName","alarmStatusList"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"div",2),t.ɵɵtext(3,"tb.rulenode.alarm-status"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"div",3),t.ɵɵtext(5," tb.rulenode.alarm-required "),t.ɵɵelementEnd()(),t.ɵɵelement(6,"tb-alarm-status-select",4),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.alarmStatusConfigForm),t.ɵɵadvance(4),t.ɵɵproperty("hidden",n.alarmStatusConfigForm.get("alarmStatusList").valid))},dependencies:t.ɵɵgetComponentDepsFactory(ys),encapsulation:2})}}e("CheckAlarmStatusComponent",ys);const bs=e=>({inputName:e});class vs extends i{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.checkMessageConfigForm}prepareInputConfig(e){return{messageNames:P(e?.messageNames)?e.messageNames:[],metadataNames:P(e?.metadataNames)?e.metadataNames:[],checkAllKeys:!!P(e?.checkAllKeys)&&e.checkAllKeys}}prepareOutputConfig(e){return{messageNames:P(e?.messageNames)?e.messageNames:[],metadataNames:P(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(N.required,["messageNames","metadataNames"])})}get touchedValidationControl(){return["messageNames","metadataNames"].some((e=>this.checkMessageConfigForm.get(e).touched))}static{this.ɵfac=function(e){return new(e||vs)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:vs,selectors:[["tb-filter-node-check-message-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:25,vars:36,consts:[[1,"tb-form-panel","stroked",3,"formGroup"],[1,"tb-form-row","no-padding","no-border","space-between"],["translate","",1,"tb-form-panel-title","tb-required"],["translate","",1,"tb-form-panel-hint","tb-error",3,"hidden"],["editable","","subscriptSizing","dynamic","formControlName","messageNames",3,"label","placeholder"],["matSuffix","","color","primary","aria-hidden","false","aria-label","help-icon",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"],["editable","","subscriptSizing","dynamic","formControlName","metadataNames",3,"label","placeholder"],[1,"tb-form-row","no-border","no-padding",3,"tb-hint-tooltip-icon"],["formControlName","checkAllKeys",1,"mat-slide"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"div",2),t.ɵɵtext(3,"tb.rulenode.fields-to-check"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"div",3),t.ɵɵtext(5," tb.rulenode.at-least-one-field-required "),t.ɵɵelementEnd()(),t.ɵɵelementStart(6,"tb-string-items-list",4),t.ɵɵpipe(7,"translate"),t.ɵɵpipe(8,"translate"),t.ɵɵelementStart(9,"mat-icon",5),t.ɵɵpipe(10,"translate"),t.ɵɵpipe(11,"translate"),t.ɵɵtext(12,"help"),t.ɵɵelementEnd()(),t.ɵɵelementStart(13,"tb-string-items-list",6),t.ɵɵpipe(14,"translate"),t.ɵɵpipe(15,"translate"),t.ɵɵelementStart(16,"mat-icon",5),t.ɵɵpipe(17,"translate"),t.ɵɵpipe(18,"translate"),t.ɵɵtext(19,"help"),t.ɵɵelementEnd()(),t.ɵɵelementStart(20,"div",7),t.ɵɵpipe(21,"translate"),t.ɵɵelementStart(22,"mat-slide-toggle",8),t.ɵɵtext(23),t.ɵɵpipe(24,"translate"),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.checkMessageConfigForm),t.ɵɵadvance(4),t.ɵɵproperty("hidden",!(n.touchedValidationControl&&n.checkMessageConfigForm.hasError("atLeastOne"))),t.ɵɵadvance(2),t.ɵɵproperty("label",t.ɵɵpipeBind1(7,10,"tb.rulenode.data-keys"))("placeholder",t.ɵɵpipeBind1(8,12,"tb.rulenode.add-message-field")),t.ɵɵadvance(3),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind2(11,16,"tb.rulenode.chip-help",t.ɵɵpureFunction1(32,bs,t.ɵɵpipeBind1(10,14,"tb.rulenode.field-name")))),t.ɵɵadvance(4),t.ɵɵproperty("label",t.ɵɵpipeBind1(14,19,"tb.rulenode.metadata-keys"))("placeholder",t.ɵɵpipeBind1(15,21,"tb.rulenode.add-metadata-field")),t.ɵɵadvance(3),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind2(18,25,"tb.rulenode.chip-help",t.ɵɵpureFunction1(34,bs,t.ɵɵpipeBind1(17,23,"tb.rulenode.field-name")))),t.ɵɵadvance(4),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(21,28,"tb.rulenode.check-all-keys-tooltip")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(24,30,"tb.rulenode.check-all-keys")," "))},dependencies:t.ɵɵgetComponentDepsFactory(vs),encapsulation:2})}}function xs(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",10),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementStart(3,"span",11),t.ɵɵtext(4,"tb.rulenode.relations-query-config-direction-suffix"),t.ɵɵelementEnd()()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.entitySearchDirectionTranslationsMap.get(e))," ")}}function Cs(e,n){if(1&e&&t.ɵɵelement(0,"tb-entity-autocomplete",15),2&e){const e=t.ɵɵnextContext(2);t.ɵɵproperty("entityType",e.checkRelationConfigForm.get("entityType").value)}}function Ss(e,n){if(1&e&&(t.ɵɵelementStart(0,"div",12),t.ɵɵelement(1,"tb-entity-type-select",13),t.ɵɵtemplate(2,Cs,1,1,"tb-entity-autocomplete",14),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(2),t.ɵɵproperty("ngIf",e.checkRelationConfigForm.get("entityType").value)}}e("CheckMessageConfigComponent",vs);class Ts extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.entitySearchDirection=Object.values(d),this.entitySearchDirectionTranslationsMap=b}configForm(){return this.checkRelationConfigForm}prepareInputConfig(e){return{checkForSingleEntity:!!P(e?.checkForSingleEntity)&&e.checkForSingleEntity,direction:P(e?.direction)?e.direction:null,entityType:P(e?.entityType)?e.entityType:null,entityId:P(e?.entityId)?e.entityId:null,relationType:P(e?.relationType)?e.relationType:null}}onConfigurationSet(e){this.checkRelationConfigForm=this.fb.group({checkForSingleEntity:[e.checkForSingleEntity,[]],direction:[e.direction,[]],entityType:[e.entityType,e&&e.checkForSingleEntity?[N.required]:[]],entityId:[e.entityId,e&&e.checkForSingleEntity?[N.required]:[]],relationType:[e.relationType,[N.required]]})}validatorTriggers(){return["checkForSingleEntity"]}updateValidators(e){const t=this.checkRelationConfigForm.get("checkForSingleEntity").value;this.checkRelationConfigForm.get("entityType").setValidators(t?[N.required]:[]),this.checkRelationConfigForm.get("entityType").updateValueAndValidity({emitEvent:e}),this.checkRelationConfigForm.get("entityId").setValidators(t?[N.required]:[]),this.checkRelationConfigForm.get("entityId").updateValueAndValidity({emitEvent:e})}static{this.ɵfac=function(e){return new(e||Ts)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Ts,selectors:[["tb-filter-node-check-relation-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:17,vars:12,consts:[[1,"tb-form-panel","stroked","no-padding-bottom",3,"formGroup"],["translate","",1,"tb-form-panel-title"],[1,"flex","flex-col"],["hideRequiredMarker","",1,"mat-block"],["formControlName","direction","required",""],[3,"value",4,"ngFor","ngForOf"],["required","","formControlName","relationType"],[1,"tb-form-row","no-border","no-padding","slide-toggle",3,"tb-hint-tooltip-icon"],["formControlName","checkForSingleEntity",1,"mat-slide"],["class","same-width-component-row",4,"ngIf"],[3,"value"],["translate",""],[1,"same-width-component-row"],["showLabel","","required","","formControlName","entityType",2,"min-width","100px","flex","1"],["class","flex-1","required","","formControlName","entityId",3,"entityType",4,"ngIf"],["required","","formControlName","entityId",1,"flex-1",3,"entityType"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1),t.ɵɵtext(2,"tb.rulenode.relation-search-parameters"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"div",2)(4,"mat-form-field",3)(5,"mat-label"),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(8,"mat-select",4),t.ɵɵtemplate(9,xs,5,4,"mat-option",5),t.ɵɵelementEnd()(),t.ɵɵelement(10,"tb-relation-type-autocomplete",6),t.ɵɵelementStart(11,"div",7),t.ɵɵpipe(12,"translate"),t.ɵɵelementStart(13,"mat-slide-toggle",8),t.ɵɵtext(14),t.ɵɵpipe(15,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(16,Ss,3,1,"div",9),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.checkRelationConfigForm),t.ɵɵadvance(6),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(7,6,"relation.direction")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.entitySearchDirection),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(12,8,"tb.rulenode.check-relation-to-specific-entity-tooltip")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(15,10,"tb.rulenode.check-relation-to-specific-entity")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.checkRelationConfigForm.get("checkForSingleEntity").value))},dependencies:t.ɵɵgetComponentDepsFactory(Ts),styles:["[_nghost-%COMP%]   .slide-toggle[_ngcontent-%COMP%]{margin-bottom:18px}"]})}}e("CheckRelationConfigComponent",Ts);const Is=e=>({perimeterKeyName:e});function Es(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.latitude-field-name-required")," "))}function Fs(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.longitude-field-name-required")," "))}function qs(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",18),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.perimeterTypeTranslationMap.get(e))," ")}}function As(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.perimeter-key-name-required")," "))}function ks(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",19)(1,"mat-label"),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",20),t.ɵɵtemplate(5,As,3,3,"mat-error",6),t.ɵɵelementStart(6,"mat-hint"),t.ɵɵtext(7),t.ɵɵpipe(8,"translate"),t.ɵɵelementEnd()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(2),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(3,3,"tb.rulenode.perimeter-key-name")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.geoFilterConfigForm.get("perimeterKeyName").hasError("required")),t.ɵɵadvance(2),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(8,5,"tb.rulenode.perimeter-key-name-hint"))}}function Ns(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.circle-center-latitude-required")," "))}function ws(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.circle-center-longitude-required")," "))}function Ms(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.range-required")," "))}function Bs(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",18),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext(2);t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.rangeUnitTranslationMap.get(e))," ")}}function Vs(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.range-units-required")," "))}function Os(e,n){if(1&e&&(t.ɵɵelementStart(0,"div",9)(1,"div",3)(2,"mat-form-field",21)(3,"mat-label"),t.ɵɵtext(4),t.ɵɵpipe(5,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(6,"input",22),t.ɵɵtemplate(7,Ns,3,3,"mat-error",6),t.ɵɵelementEnd(),t.ɵɵelementStart(8,"mat-form-field",21)(9,"mat-label"),t.ɵɵtext(10),t.ɵɵpipe(11,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(12,"input",23),t.ɵɵtemplate(13,ws,3,3,"mat-error",6),t.ɵɵelementEnd()(),t.ɵɵelementStart(14,"div",3)(15,"mat-form-field",21)(16,"mat-label"),t.ɵɵtext(17),t.ɵɵpipe(18,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(19,"input",24),t.ɵɵtemplate(20,Ms,3,3,"mat-error",6),t.ɵɵelementEnd(),t.ɵɵelementStart(21,"mat-form-field",21)(22,"mat-label"),t.ɵɵtext(23),t.ɵɵpipe(24,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(25,"mat-select",25),t.ɵɵtemplate(26,Bs,3,4,"mat-option",12),t.ɵɵelementEnd(),t.ɵɵtemplate(27,Vs,3,3,"mat-error",6),t.ɵɵelementEnd()()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(5,9,"tb.rulenode.circle-center-latitude")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.geoFilterConfigForm.get("centerLatitude").hasError("required")),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(11,11,"tb.rulenode.circle-center-longitude")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.geoFilterConfigForm.get("centerLongitude").hasError("required")),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(18,13,"tb.rulenode.range")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",e.geoFilterConfigForm.get("range").hasError("required")),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(24,15,"tb.rulenode.range-units")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",e.rangeUnits),t.ɵɵadvance(),t.ɵɵproperty("ngIf",e.geoFilterConfigForm.get("rangeUnit").hasError("required"))}}function Ds(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.polygon-definition-required")," "))}function Ls(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-form-field",26)(1,"mat-label"),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(4,"input",27),t.ɵɵelementStart(5,"mat-hint"),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(8,Ds,3,3,"mat-error",6),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(2),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(3,3,"tb.rulenode.polygon-definition")),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(7,5,"tb.rulenode.polygon-definition-hint")),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",e.geoFilterConfigForm.get("polygonsDefinition").hasError("required"))}}class Ps extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.perimeterType=ft,this.perimeterTypes=Object.values(ft),this.perimeterTypeTranslationMap=gt,this.rangeUnits=Object.values(bt),this.rangeUnitTranslationMap=vt,this.defaultPaddingEnable=!0}configForm(){return this.geoFilterConfigForm}prepareInputConfig(e){return{latitudeKeyName:P(e?.latitudeKeyName)?e.latitudeKeyName:null,longitudeKeyName:P(e?.longitudeKeyName)?e.longitudeKeyName:null,perimeterType:P(e?.perimeterType)?e.perimeterType:null,fetchPerimeterInfoFromMessageMetadata:!!P(e?.fetchPerimeterInfoFromMessageMetadata)&&e.fetchPerimeterInfoFromMessageMetadata,perimeterKeyName:P(e?.perimeterKeyName)?e.perimeterKeyName:null,centerLatitude:P(e?.centerLatitude)?e.centerLatitude:null,centerLongitude:P(e?.centerLongitude)?e.centerLongitude:null,range:P(e?.range)?e.range:null,rangeUnit:P(e?.rangeUnit)?e.rangeUnit:null,polygonsDefinition:P(e?.polygonsDefinition)?e.polygonsDefinition:null}}onConfigurationSet(e){this.geoFilterConfigForm=this.fb.group({latitudeKeyName:[e.latitudeKeyName,[N.required]],longitudeKeyName:[e.longitudeKeyName,[N.required]],perimeterType:[e.perimeterType,[N.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([N.required]):this.geoFilterConfigForm.get("perimeterKeyName").setValidators([]),t||n!==ft.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([N.required,N.min(-90),N.max(90)]),this.geoFilterConfigForm.get("centerLongitude").setValidators([N.required,N.min(-180),N.max(180)]),this.geoFilterConfigForm.get("range").setValidators([N.required,N.min(0)]),this.geoFilterConfigForm.get("rangeUnit").setValidators([N.required]),this.defaultPaddingEnable=!1),t||n!==ft.POLYGON?this.geoFilterConfigForm.get("polygonsDefinition").setValidators([]):this.geoFilterConfigForm.get("polygonsDefinition").setValidators([N.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})}static{this.ɵfac=function(e){return new(e||Ps)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Ps,selectors:[["tb-filter-node-gps-geofencing-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:39,vars:32,consts:[[1,"tb-form-panel","no-border","no-padding",3,"formGroup"],[1,"tb-form-panel","stroked"],["translate","",1,"tb-form-panel-title"],[1,"flex","flex-row","gap-4"],[1,"mat-block","max-w-50%","flex-full"],["matInput","","formControlName","latitudeKeyName","required",""],[4,"ngIf"],["matInput","","formControlName","longitudeKeyName","required",""],["translate","",1,"tb-form-hint","tb-primary-fill"],[1,"flex","flex-col"],["hideRequiredMarker","",1,"mat-block","flex-1"],["formControlName","perimeterType"],[3,"value",4,"ngFor","ngForOf"],[1,"tb-form-row","no-border","no-padding","slide-toggle",3,"tb-hint-tooltip-icon"],["formControlName","fetchPerimeterInfoFromMessageMetadata",1,"mat-slide"],["class","mat-block",4,"ngIf"],["class","flex flex-col",4,"ngIf"],["class","mat-block","subscriptSizing","dynamic",4,"ngIf"],[3,"value"],[1,"mat-block"],["matInput","","formControlName","perimeterKeyName","required",""],[1,"flex-1"],["type","number","min","-90","max","90","step","0.1","matInput","","formControlName","centerLatitude","required",""],["type","number","min","-180","max","180","step","0.1","matInput","","formControlName","centerLongitude","required",""],["type","number","min","0","step","0.1","matInput","","formControlName","range","required",""],["formControlName","rangeUnit","required",""],["subscriptSizing","dynamic",1,"mat-block"],["matInput","","formControlName","polygonsDefinition","required",""]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"section",1)(2,"div",2),t.ɵɵtext(3,"tb.rulenode.coordinate-field-names"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"section")(5,"div",3)(6,"mat-form-field",4)(7,"mat-label"),t.ɵɵtext(8),t.ɵɵpipe(9,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(10,"input",5),t.ɵɵtemplate(11,Es,3,3,"mat-error",6),t.ɵɵelementEnd(),t.ɵɵelementStart(12,"mat-form-field",4)(13,"mat-label"),t.ɵɵtext(14),t.ɵɵpipe(15,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(16,"input",7),t.ɵɵtemplate(17,Fs,3,3,"mat-error",6),t.ɵɵelementEnd()(),t.ɵɵelementStart(18,"div",8),t.ɵɵtext(19,"tb.rulenode.coordinate-field-hint"),t.ɵɵelementEnd()()(),t.ɵɵelementStart(20,"section",1)(21,"div",2),t.ɵɵtext(22,"tb.rulenode.geofence-configuration"),t.ɵɵelementEnd(),t.ɵɵelementStart(23,"section",9)(24,"mat-form-field",10)(25,"mat-label"),t.ɵɵtext(26),t.ɵɵpipe(27,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(28,"mat-select",11),t.ɵɵtemplate(29,qs,3,4,"mat-option",12),t.ɵɵelementEnd()(),t.ɵɵelementStart(30,"div",13),t.ɵɵpipe(31,"translate"),t.ɵɵpipe(32,"translate"),t.ɵɵelementStart(33,"mat-slide-toggle",14),t.ɵɵtext(34),t.ɵɵpipe(35,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(36,ks,9,7,"mat-form-field",15)(37,Os,28,17,"div",16)(38,Ls,9,7,"mat-form-field",17),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.geoFilterConfigForm),t.ɵɵadvance(8),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(9,14,"tb.rulenode.latitude-field-name")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.geoFilterConfigForm.get("latitudeKeyName").hasError("required")),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(15,16,"tb.rulenode.longitude-field-name")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.geoFilterConfigForm.get("longitudeKeyName").hasError("required")),t.ɵɵadvance(3),t.ɵɵclassProp("no-padding-bottom",!n.defaultPaddingEnable),t.ɵɵadvance(6),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(27,18,"tb.rulenode.perimeter-type")),t.ɵɵadvance(3),t.ɵɵproperty("ngForOf",n.perimeterTypes),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",n.geoFilterConfigForm.get("perimeterType").value===n.perimeterType.CIRCLE?t.ɵɵpipeBind2(31,20,"tb.rulenode.fetch-circle-parameter-info-from-metadata-hint",t.ɵɵpureFunction1(28,Is,n.geoFilterConfigForm.get("perimeterKeyName").valid?n.geoFilterConfigForm.get("perimeterKeyName").value:"ss_perimeter")):t.ɵɵpipeBind2(32,23,"tb.rulenode.fetch-poligon-parameter-info-from-metadata-hint",t.ɵɵpureFunction1(30,Is,n.geoFilterConfigForm.get("perimeterKeyName").valid?n.geoFilterConfigForm.get("perimeterKeyName").value:"ss_perimeter"))),t.ɵɵadvance(4),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(35,26,"tb.rulenode.fetch-perimeter-info-from-metadata")," "),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.geoFilterConfigForm.get("fetchPerimeterInfoFromMessageMetadata").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.geoFilterConfigForm.get("perimeterType").value===n.perimeterType.CIRCLE&&!n.geoFilterConfigForm.get("fetchPerimeterInfoFromMessageMetadata").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.geoFilterConfigForm.get("perimeterType").value===n.perimeterType.POLYGON&&!n.geoFilterConfigForm.get("fetchPerimeterInfoFromMessageMetadata").value))},dependencies:t.ɵɵgetComponentDepsFactory(Ps),styles:["[_nghost-%COMP%]   .slide-toggle[_ngcontent-%COMP%]{margin-bottom:18px}"]})}}e("GpsGeoFilterConfigComponent",Ps);class Rs extends i{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.messageTypeConfigForm}prepareInputConfig(e){return{messageTypes:P(e?.messageTypes)?e.messageTypes:null}}onConfigurationSet(e){this.messageTypeConfigForm=this.fb.group({messageTypes:[e.messageTypes,[N.required]]})}static{this.ɵfac=function(e){return new(e||Rs)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Rs,selectors:[["tb-filter-node-message-type-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:3,vars:4,consts:[[3,"formGroup"],["required","","formControlName","messageTypes",3,"label"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0),t.ɵɵelement(1,"tb-message-types-config",1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.messageTypeConfigForm),t.ɵɵadvance(),t.ɵɵproperty("label",t.ɵɵpipeBind1(2,2,"tb.rulenode.select-message-types")))},dependencies:t.ɵɵgetComponentDepsFactory(Rs),encapsulation:2})}}e("MessageTypeConfigComponent",Rs);const _s=e=>({inputName:e});class js extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.allowedEntityTypes=[u.DEVICE,u.ASSET,u.ENTITY_VIEW,u.TENANT,u.CUSTOMER,u.USER,u.DASHBOARD,u.RULE_CHAIN,u.RULE_NODE,u.EDGE]}configForm(){return this.originatorTypeConfigForm}prepareInputConfig(e){return{originatorTypes:P(e?.originatorTypes)?e.originatorTypes:null}}onConfigurationSet(e){this.originatorTypeConfigForm=this.fb.group({originatorTypes:[e.originatorTypes,[N.required]]})}static{this.ɵfac=function(e){return new(e||js)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:js,selectors:[["tb-filter-node-originator-type-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:9,vars:20,consts:[[3,"formGroup"],["formControlName","originatorTypes","required","",1,"flex-1",3,"allowedEntityTypes","ignoreAuthorityFilter","emptyInputPlaceholder","filledInputPlaceholder","label"],["matSuffix","","aria-hidden","false","aria-label","help-icon","color","primary",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"tb-entity-type-list",1),t.ɵɵpipe(2,"translate"),t.ɵɵpipe(3,"translate"),t.ɵɵpipe(4,"translate"),t.ɵɵelementStart(5,"mat-icon",2),t.ɵɵpipe(6,"translate"),t.ɵɵpipe(7,"translate"),t.ɵɵtext(8,"help"),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.originatorTypeConfigForm),t.ɵɵadvance(),t.ɵɵproperty("allowedEntityTypes",n.allowedEntityTypes)("ignoreAuthorityFilter",!0)("emptyInputPlaceholder",t.ɵɵpipeBind1(2,7,"tb.rulenode.add-entity-type"))("filledInputPlaceholder",t.ɵɵpipeBind1(3,9,"tb.rulenode.add-entity-type"))("label",t.ɵɵpipeBind1(4,11,"tb.rulenode.select-entity-types")),t.ɵɵadvance(4),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind2(7,15,"tb.rulenode.chip-help",t.ɵɵpureFunction1(18,_s,t.ɵɵpipeBind1(6,13,"tb.rulenode.entity-type")))))},dependencies:t.ɵɵgetComponentDepsFactory(js),encapsulation:2})}}e("OriginatorTypeConfigComponent",js);const Gs=["jsFuncComponent"],Ks=["tbelFuncComponent"],Us=()=>["msg","metadata","msgType"];function Hs(e,n){1&e&&t.ɵɵelement(0,"tb-script-lang",7)}function zs(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",8,0)(2,"button",9),t.ɵɵpipe(3,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(4,"mat-icon",10),t.ɵɵtext(5,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(4,Us)),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(3,2,e.testScriptLabel))}}function $s(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",11,1)(2,"button",9),t.ɵɵpipe(3,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(4,"mat-icon",10),t.ɵɵtext(5,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(6,Us))("disableUndefinedCheck",!0)("scriptLanguage",e.scriptLanguage.TBEL),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(3,4,e.testScriptLabel))}}class Qs extends i{constructor(e,t,r,a){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=r,this.translate=a,this.tbelEnabled=D(this.store).tbelEnabled,this.scriptLanguage=s,this.changeScript=new n,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-filter-function"}configForm(){return this.scriptConfigForm}onConfigurationSet(e){this.scriptConfigForm=this.fb.group({scriptLang:[e.scriptLang,[N.required]],jsScript:[e.jsScript,[]],tbelScript:[e.tbelScript,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.scriptConfigForm.get("scriptLang").value;t!==s.TBEL||this.tbelEnabled||(t=s.JS,this.scriptConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.scriptConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.scriptConfigForm.get("jsScript").setValidators(t===s.JS?[N.required]:[]),this.scriptConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.scriptConfigForm.get("tbelScript").setValidators(t===s.TBEL?[N.required]:[]),this.scriptConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=s.JS)),{scriptLang:P(e?.scriptLang)?e.scriptLang:s.JS,jsScript:P(e?.jsScript)?e.jsScript:null,tbelScript:P(e?.tbelScript)?e.tbelScript:null}}testScript(e){const t=this.scriptConfigForm.get("scriptLang").value,n=t===s.JS?"jsScript":"tbelScript",r=t===s.JS?"rulenode/filter_node_script_fn":"rulenode/tbel/filter_node_script_fn",a=this.scriptConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(a,"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===s.JS&&this.jsFuncComponent.validateOnSubmit()}static{this.ɵfac=function(e){return new(e||Qs)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder),t.ɵɵdirectiveInject(L.NodeScriptTestService),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Qs,selectors:[["tb-filter-node-script-config"]],viewQuery:function(e,n){if(1&e&&(t.ɵɵviewQuery(Gs,5),t.ɵɵviewQuery(Ks,5)),2&e){let e;t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.jsFuncComponent=e.first),t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.tbelFuncComponent=e.first)}},features:[t.ɵɵInheritDefinitionFeature],decls:7,vars:7,consts:[["jsFuncComponent",""],["tbelFuncComponent",""],[3,"formGroup"],["formControlName","scriptLang",4,"ngIf"],["formControlName","jsScript","functionName","Filter","helpId","rulenode/filter_node_script_fn","noValidate","true",3,"functionArgs",4,"ngIf"],["formControlName","tbelScript","functionName","Filter","helpId","rulenode/tbel/filter_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage",4,"ngIf"],["mat-button","","mat-raised-button","","color","primary",3,"click"],["formControlName","scriptLang"],["formControlName","jsScript","functionName","Filter","helpId","rulenode/filter_node_script_fn","noValidate","true",3,"functionArgs"],["toolbarSuffixButton","","mat-icon-button","","matTooltipPosition","above",1,"tb-mat-32",3,"click","matTooltip"],["color","primary",1,"material-icons"],["formControlName","tbelScript","functionName","Filter","helpId","rulenode/tbel/filter_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",2),t.ɵɵtemplate(1,Hs,1,0,"tb-script-lang",3)(2,zs,6,5,"tb-js-func",4)(3,$s,6,7,"tb-js-func",5),t.ɵɵelementStart(4,"button",6),t.ɵɵlistener("click",(function(){return n.testScript()})),t.ɵɵtext(5),t.ɵɵpipe(6,"translate"),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.scriptConfigForm),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.tbelEnabled),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.scriptConfigForm.get("scriptLang").value===n.scriptLanguage.JS),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.scriptConfigForm.get("scriptLang").value===n.scriptLanguage.TBEL),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(6,5,n.testScriptLabel)," "))},dependencies:t.ɵɵgetComponentDepsFactory(Qs),encapsulation:2})}}e("ScriptConfigComponent",Qs);const Js=["jsFuncComponent"],Ys=["tbelFuncComponent"],Ws=()=>["msg","metadata","msgType"];function Xs(e,n){1&e&&t.ɵɵelement(0,"tb-script-lang",7)}function Zs(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",8,0)(2,"button",9),t.ɵɵpipe(3,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(4,"mat-icon",10),t.ɵɵtext(5,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(4,Ws)),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(3,2,e.testScriptLabel))}}function ep(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",11,1)(2,"button",9),t.ɵɵpipe(3,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(4,"mat-icon",10),t.ɵɵtext(5,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(6,Ws))("disableUndefinedCheck",!0)("scriptLanguage",e.scriptLanguage.TBEL),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(3,4,e.testScriptLabel))}}class tp extends i{constructor(e,t,r,a){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=r,this.translate=a,this.tbelEnabled=D(this.store).tbelEnabled,this.scriptLanguage=s,this.changeScript=new n,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-switch-function"}configForm(){return this.switchConfigForm}onConfigurationSet(e){this.switchConfigForm=this.fb.group({scriptLang:[e.scriptLang,[N.required]],jsScript:[e.jsScript,[]],tbelScript:[e.tbelScript,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.switchConfigForm.get("scriptLang").value;t!==s.TBEL||this.tbelEnabled||(t=s.JS,this.switchConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.switchConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.switchConfigForm.get("jsScript").setValidators(t===s.JS?[N.required]:[]),this.switchConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.switchConfigForm.get("tbelScript").setValidators(t===s.TBEL?[N.required]:[]),this.switchConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=s.JS)),{scriptLang:P(e?.scriptLang)?e.scriptLang:s.JS,jsScript:P(e?.jsScript)?e.jsScript:null,tbelScript:P(e?.tbelScript)?e.tbelScript:null}}testScript(e){const t=this.switchConfigForm.get("scriptLang").value,n=t===s.JS?"jsScript":"tbelScript",r=t===s.JS?"rulenode/switch_node_script_fn":"rulenode/tbel/switch_node_script_fn",a=this.switchConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(a,"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===s.JS&&this.jsFuncComponent.validateOnSubmit()}static{this.ɵfac=function(e){return new(e||tp)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder),t.ɵɵdirectiveInject(L.NodeScriptTestService),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:tp,selectors:[["tb-filter-node-switch-config"]],viewQuery:function(e,n){if(1&e&&(t.ɵɵviewQuery(Js,5),t.ɵɵviewQuery(Ys,5)),2&e){let e;t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.jsFuncComponent=e.first),t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.tbelFuncComponent=e.first)}},features:[t.ɵɵInheritDefinitionFeature],decls:7,vars:7,consts:[["jsFuncComponent",""],["tbelFuncComponent",""],[3,"formGroup"],["formControlName","scriptLang",4,"ngIf"],["formControlName","jsScript","functionName","Switch","helpId","rulenode/switch_node_script_fn","noValidate","true",3,"functionArgs",4,"ngIf"],["formControlName","tbelScript","functionName","Switch","helpId","rulenode/tbel/switch_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage",4,"ngIf"],["mat-button","","mat-raised-button","","color","primary",3,"click"],["formControlName","scriptLang"],["formControlName","jsScript","functionName","Switch","helpId","rulenode/switch_node_script_fn","noValidate","true",3,"functionArgs"],["toolbarSuffixButton","","mat-icon-button","","matTooltipPosition","above",1,"tb-mat-32",3,"click","matTooltip"],["color","primary",1,"material-icons"],["formControlName","tbelScript","functionName","Switch","helpId","rulenode/tbel/switch_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",2),t.ɵɵtemplate(1,Xs,1,0,"tb-script-lang",3)(2,Zs,6,5,"tb-js-func",4)(3,ep,6,7,"tb-js-func",5),t.ɵɵelementStart(4,"button",6),t.ɵɵlistener("click",(function(){return n.testScript()})),t.ɵɵtext(5),t.ɵɵpipe(6,"translate"),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.switchConfigForm),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.tbelEnabled),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.switchConfigForm.get("scriptLang").value===n.scriptLanguage.JS),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.switchConfigForm.get("scriptLang").value===n.scriptLanguage.TBEL),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(6,5,n.testScriptLabel)," "))},dependencies:t.ɵɵgetComponentDepsFactory(tp),encapsulation:2})}}e("SwitchConfigComponent",tp);class np{static{this.ɵfac=function(e){return new(e||np)}}static{this.ɵmod=t.ɵɵdefineNgModule({type:np})}static{this.ɵinj=t.ɵɵdefineInjector({imports:[$,S,xi,vs,Ts,Ps,Rs,js,Qs,tp,ys]})}}function rp(e,n){if(1&e&&(t.ɵɵelementStart(0,"span"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,e.originatorSourceTranslationMap.get(e.changeOriginatorConfigForm.get("originatorSource").value))," ")}}function ap(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",8)(1,"span",9),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(4,"br"),t.ɵɵelementStart(5,"small",10),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd()()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(3,3,r.originatorSourceTranslationMap.get(e))," "),t.ɵɵadvance(4),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(7,5,r.originatorSourceDescTranslationMap.get(e))," ")}}function ip(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.entity-name-pattern-required")," "))}function op(e,n){if(1&e&&(t.ɵɵelementStart(0,"div",11),t.ɵɵelement(1,"tb-example-hint",12),t.ɵɵelementStart(2,"div",13),t.ɵɵelement(3,"tb-entity-type-select",14),t.ɵɵelementStart(4,"mat-form-field",15)(5,"mat-label",2),t.ɵɵtext(6,"tb.rulenode.entity-name-pattern"),t.ɵɵelementEnd(),t.ɵɵelement(7,"input",16),t.ɵɵtemplate(8,ip,3,3,"mat-error",4),t.ɵɵelementEnd()()()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(),t.ɵɵproperty("hintText","tb.rulenode.entity-name-pattern-hint"),t.ɵɵadvance(2),t.ɵɵproperty("allowedEntityTypes",e.allowedEntityTypes),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",e.changeOriginatorConfigForm.get("entityNamePattern").hasError("required")||e.changeOriginatorConfigForm.get("entityNamePattern").hasError("pattern"))}}function lp(e,n){1&e&&t.ɵɵelement(0,"tb-relations-query-config",17)}e("RuleNodeCoreConfigFilterModule",np),("undefined"==typeof ngJitMode||ngJitMode)&&t.ɵɵsetNgModuleScope(np,{declarations:[vs,Ts,Ps,Rs,js,Qs,tp,ys],imports:[$,S,xi],exports:[vs,Ts,Ps,Rs,js,Qs,tp,ys]});class sp extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.originatorSource=pt,this.originatorSources=Object.keys(pt),this.originatorSourceTranslationMap=mt,this.originatorSourceDescTranslationMap=dt,this.allowedEntityTypes=[u.DEVICE,u.ASSET,u.ENTITY_VIEW,u.USER,u.EDGE]}configForm(){return this.changeOriginatorConfigForm}onConfigurationSet(e){this.changeOriginatorConfigForm=this.fb.group({originatorSource:[e?e.originatorSource:null,[N.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===pt.RELATED?this.changeOriginatorConfigForm.get("relationsQuery").setValidators([N.required]):this.changeOriginatorConfigForm.get("relationsQuery").setValidators([]),t===pt.ENTITY?(this.changeOriginatorConfigForm.get("entityType").setValidators([N.required]),this.changeOriginatorConfigForm.get("entityNamePattern").setValidators([N.required,N.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})}static{this.ɵfac=function(e){return new(e||sp)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:sp,selectors:[["tb-transformation-node-change-originator-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:10,vars:5,consts:[[1,"tb-form-panel","no-border","no-padding",3,"formGroup"],["subscriptSizing","dynamic","hideRequiredMarker","",1,"mat-block"],["translate",""],["formControlName","originatorSource","required",""],[4,"ngIf"],[3,"value",4,"ngFor","ngForOf"],["class","tb-form-panel stroked no-padding-bottom",4,"ngIf"],["required","","formControlName","relationsQuery",4,"ngIf"],[3,"value"],["matListItemTitle",""],["matListItemMeta","",2,"color","inherit"],[1,"tb-form-panel","stroked","no-padding-bottom"],["popupHelpLink","rulenode/change_originator_node_fields_templatization",3,"hintText"],[1,"tb-form-row","no-border","no-padding","tb-standard-fields"],["showLabel","","required","","formControlName","entityType",1,"mat-mdc-form-field","flex",3,"allowedEntityTypes"],[1,"flex"],["required","","matInput","","formControlName","entityNamePattern"],["required","","formControlName","relationsQuery"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label",2),t.ɵɵtext(3,"tb.rulenode.new-originator"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"mat-select",3)(5,"mat-select-trigger"),t.ɵɵtemplate(6,rp,3,3,"span",4),t.ɵɵelementEnd(),t.ɵɵtemplate(7,ap,8,7,"mat-option",5),t.ɵɵelementEnd()(),t.ɵɵtemplate(8,op,9,3,"div",6)(9,lp,1,0,"tb-relations-query-config",7),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.changeOriginatorConfigForm),t.ɵɵadvance(6),t.ɵɵproperty("ngIf",n.originatorSourceTranslationMap.get(n.changeOriginatorConfigForm.get("originatorSource").value)),t.ɵɵadvance(),t.ɵɵproperty("ngForOf",n.originatorSources),t.ɵɵadvance(),t.ɵɵproperty("ngIf","ENTITY"===n.changeOriginatorConfigForm.get("originatorSource").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.changeOriginatorConfigForm.get("originatorSource").value===n.originatorSource.RELATED))},dependencies:t.ɵɵgetComponentDepsFactory(sp),encapsulation:2})}}e("ChangeOriginatorConfigComponent",sp);const pp=["jsFuncComponent"],mp=["tbelFuncComponent"],dp=()=>["msg","metadata","msgType"];function up(e,n){1&e&&t.ɵɵelement(0,"tb-script-lang",7)}function cp(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",8,0)(2,"button",9),t.ɵɵpipe(3,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(4,"mat-icon",10),t.ɵɵtext(5,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(4,dp)),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(3,2,e.testScriptLabel))}}function fp(e,n){if(1&e){const e=t.ɵɵgetCurrentView();t.ɵɵelementStart(0,"tb-js-func",11,1)(2,"button",9),t.ɵɵpipe(3,"translate"),t.ɵɵlistener("click",(function(){t.ɵɵrestoreView(e);const n=t.ɵɵnextContext();return t.ɵɵresetView(n.testScript())})),t.ɵɵelementStart(4,"mat-icon",10),t.ɵɵtext(5,"bug_report"),t.ɵɵelementEnd()()()}if(2&e){const e=t.ɵɵnextContext();t.ɵɵproperty("functionArgs",t.ɵɵpureFunction0(6,dp))("disableUndefinedCheck",!0)("scriptLanguage",e.scriptLanguage.TBEL),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(3,4,e.testScriptLabel))}}class gp extends i{constructor(e,t,r,a){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=r,this.translate=a,this.tbelEnabled=D(this.store).tbelEnabled,this.scriptLanguage=s,this.changeScript=new n,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:s.JS,[N.required]],jsScript:[e?e.jsScript:null,[N.required]],tbelScript:[e?e.tbelScript:null,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.scriptConfigForm.get("scriptLang").value;t!==s.TBEL||this.tbelEnabled||(t=s.JS,this.scriptConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.scriptConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.scriptConfigForm.get("jsScript").setValidators(t===s.JS?[N.required]:[]),this.scriptConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.scriptConfigForm.get("tbelScript").setValidators(t===s.TBEL?[N.required]:[]),this.scriptConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=s.JS)),e}testScript(e){const t=this.scriptConfigForm.get("scriptLang").value,n=t===s.JS?"jsScript":"tbelScript",r=t===s.JS?"rulenode/transformation_node_script_fn":"rulenode/tbel/transformation_node_script_fn",a=this.scriptConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(a,"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===s.JS&&this.jsFuncComponent.validateOnSubmit()}static{this.ɵfac=function(e){return new(e||gp)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder),t.ɵɵdirectiveInject(L.NodeScriptTestService),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:gp,selectors:[["tb-transformation-node-script-config"]],viewQuery:function(e,n){if(1&e&&(t.ɵɵviewQuery(pp,5),t.ɵɵviewQuery(mp,5)),2&e){let e;t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.jsFuncComponent=e.first),t.ɵɵqueryRefresh(e=t.ɵɵloadQuery())&&(n.tbelFuncComponent=e.first)}},features:[t.ɵɵInheritDefinitionFeature],decls:8,vars:7,consts:[["jsFuncComponent",""],["tbelFuncComponent",""],[3,"formGroup"],["formControlName","scriptLang",4,"ngIf"],["formControlName","jsScript","functionName","Transform","helpId","rulenode/transformation_node_script_fn","noValidate","true",3,"functionArgs",4,"ngIf"],["formControlName","tbelScript","functionName","Transform","helpId","rulenode/tbel/transformation_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage",4,"ngIf"],["mat-button","","mat-raised-button","","color","primary",3,"click"],["formControlName","scriptLang"],["formControlName","jsScript","functionName","Transform","helpId","rulenode/transformation_node_script_fn","noValidate","true",3,"functionArgs"],["toolbarSuffixButton","","mat-icon-button","","matTooltipPosition","above",1,"tb-mat-32",3,"click","matTooltip"],["color","primary",1,"material-icons"],["formControlName","tbelScript","functionName","Transform","helpId","rulenode/tbel/transformation_node_script_fn","noValidate","true",3,"functionArgs","disableUndefinedCheck","scriptLanguage"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",2),t.ɵɵtemplate(1,up,1,0,"tb-script-lang",3)(2,cp,6,5,"tb-js-func",4)(3,fp,6,7,"tb-js-func",5),t.ɵɵelementStart(4,"div")(5,"button",6),t.ɵɵlistener("click",(function(){return n.testScript()})),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.scriptConfigForm),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.tbelEnabled),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.scriptConfigForm.get("scriptLang").value===n.scriptLanguage.JS),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.scriptConfigForm.get("scriptLang").value===n.scriptLanguage.TBEL),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(7,5,n.testScriptLabel)," "))},dependencies:t.ɵɵgetComponentDepsFactory(gp),encapsulation:2})}}e("TransformScriptConfigComponent",gp);const hp=()=>({maxWidth:"820px"});function yp(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.from-template-required")," "))}function bp(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.to-template-required")," "))}function vp(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.subject-template-required")," "))}function xp(e,n){if(1&e&&(t.ɵɵelementStart(0,"span"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=t.ɵɵnextContext();t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,e.getBodyTypeName())," ")}}function Cp(e,n){if(1&e&&(t.ɵɵelementStart(0,"mat-option",24)(1,"span",25),t.ɵɵtext(2),t.ɵɵpipe(3,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(4,"br"),t.ɵɵelementStart(5,"small",26),t.ɵɵtext(6),t.ɵɵpipe(7,"translate"),t.ɵɵelementEnd()()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e.value),t.ɵɵadvance(2),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(3,3,e.name)," "),t.ɵɵadvance(4),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(7,5,e.description)," ")}}function Sp(e,n){1&e&&(t.ɵɵelementStart(0,"mat-form-field",18)(1,"mat-label",5),t.ɵɵtext(2,"tb.rulenode.body-type-template"),t.ɵɵelementEnd(),t.ɵɵelement(3,"input",27),t.ɵɵelementStart(4,"mat-hint",5),t.ɵɵtext(5,"tb.mail-body-type.after-template-evaluation-hint"),t.ɵɵelementEnd()())}function Tp(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.body-template-required")," "))}class Ip extends i{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,[N.required]],toTemplate:[e?e.toTemplate:null,[N.required]],ccTemplate:[e?e.ccTemplate:null,[]],bccTemplate:[e?e.bccTemplate:null,[]],subjectTemplate:[e?e.subjectTemplate:null,[N.required]],mailBodyType:[e?e.mailBodyType:null],isHtmlTemplate:[e?e.isHtmlTemplate:null,[N.required]],bodyTemplate:[e?e.bodyTemplate:null,[N.required]]})}prepareInputConfig(e){return{fromTemplate:P(e?.fromTemplate)?e.fromTemplate:null,toTemplate:P(e?.toTemplate)?e.toTemplate:null,ccTemplate:P(e?.ccTemplate)?e.ccTemplate:null,bccTemplate:P(e?.bccTemplate)?e.bccTemplate:null,subjectTemplate:P(e?.subjectTemplate)?e.subjectTemplate:null,mailBodyType:P(e?.mailBodyType)?e.mailBodyType:null,isHtmlTemplate:P(e?.isHtmlTemplate)?e.isHtmlTemplate:null,bodyTemplate:P(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}static{this.ɵfac=function(e){return new(e||Ip)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Ip,selectors:[["tb-transformation-node-to-email-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:61,vars:23,consts:[[1,"tb-form-panel","no-border","no-padding",3,"formGroup"],[1,"tb-form-panel","stroked"],["translate","",1,"tb-form-panel-title"],[1,"tb-form-row","no-border","no-padding","tb-standard-fields"],["subscriptSizing","dynamic",1,"flex"],["translate",""],["required","","matInput","","formControlName","fromTemplate"],["align","start"],["align","end"],[1,"input-bottom-double-hint"],["hintMode","","tb-help-popup-placement","right","trigger-style","letter-spacing:0.25px; font-size:12px;",1,"see-example",3,"tb-help-popup","tb-help-popup-style","trigger-text"],[4,"ngIf"],[1,"tb-form-panel","no-padding","no-border"],["popupHelpLink","rulenode/to_email_node_fields_templatization",3,"hintText"],[1,"flex"],["required","","matInput","","formControlName","toTemplate","cdkTextareaAutosize","","cdkAutosizeMinRows","1",1,"tb-enable-vertical-resize"],["matInput","","formControlName","ccTemplate","cdkTextareaAutosize","","cdkAutosizeMinRows","1",1,"tb-enable-vertical-resize"],["matInput","","formControlName","bccTemplate","cdkTextareaAutosize","","cdkAutosizeMinRows","1",1,"tb-enable-vertical-resize"],[1,"mat-block"],["required","","matInput","","formControlName","subjectTemplate","cdkTextareaAutosize","","cdkAutosizeMinRows","1",1,"tb-enable-vertical-resize"],["formControlName","mailBodyType"],[3,"value",4,"ngFor","ngForOf"],["class","mat-block",4,"ngIf"],["required","","matInput","","formControlName","bodyTemplate","cdkTextareaAutosize","","cdkAutosizeMinRows","2",1,"tb-enable-vertical-resize"],[3,"value"],["matListItemTitle",""],["matListItemMeta","",2,"color","inherit"],["required","","matInput","","formControlName","isHtmlTemplate"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"div",2),t.ɵɵtext(3,"tb.rulenode.email-sender"),t.ɵɵelementEnd(),t.ɵɵelementStart(4,"div",3)(5,"mat-form-field",4)(6,"mat-label",5),t.ɵɵtext(7,"tb.rulenode.from-template"),t.ɵɵelementEnd(),t.ɵɵelement(8,"input",6),t.ɵɵelementStart(9,"mat-hint",7),t.ɵɵtext(10),t.ɵɵpipe(11,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(12,"mat-hint",8)(13,"div",9),t.ɵɵelement(14,"div",10),t.ɵɵpipe(15,"translate"),t.ɵɵelementEnd()(),t.ɵɵtemplate(16,yp,3,3,"mat-error",11),t.ɵɵelementEnd()()(),t.ɵɵelementStart(17,"div",1)(18,"div",12)(19,"div",2),t.ɵɵtext(20,"tb.rulenode.recipients"),t.ɵɵelementEnd(),t.ɵɵelement(21,"tb-example-hint",13),t.ɵɵpipe(22,"translate"),t.ɵɵelementEnd(),t.ɵɵelementStart(23,"div",3)(24,"mat-form-field",14)(25,"mat-label",5),t.ɵɵtext(26,"tb.rulenode.to-template"),t.ɵɵelementEnd(),t.ɵɵelement(27,"textarea",15),t.ɵɵtemplate(28,bp,3,3,"mat-error",11),t.ɵɵelementEnd(),t.ɵɵelementStart(29,"mat-form-field",14)(30,"mat-label",5),t.ɵɵtext(31,"tb.rulenode.cc-template"),t.ɵɵelementEnd(),t.ɵɵelement(32,"textarea",16),t.ɵɵelementEnd(),t.ɵɵelementStart(33,"mat-form-field",14)(34,"mat-label",5),t.ɵɵtext(35,"tb.rulenode.bcc-template"),t.ɵɵelementEnd(),t.ɵɵelement(36,"textarea",17),t.ɵɵelementEnd()()(),t.ɵɵelementStart(37,"div",1)(38,"div",2),t.ɵɵtext(39,"tb.rulenode.message-subject-and-content"),t.ɵɵelementEnd(),t.ɵɵelement(40,"tb-example-hint",13),t.ɵɵpipe(41,"translate"),t.ɵɵelementStart(42,"section")(43,"mat-form-field",18)(44,"mat-label",5),t.ɵɵtext(45,"tb.rulenode.subject-template"),t.ɵɵelementEnd(),t.ɵɵelement(46,"textarea",19),t.ɵɵtemplate(47,vp,3,3,"mat-error",11),t.ɵɵelementEnd(),t.ɵɵelementStart(48,"mat-form-field",18)(49,"mat-label",5),t.ɵɵtext(50,"tb.rulenode.mail-body-type"),t.ɵɵelementEnd(),t.ɵɵelementStart(51,"mat-select",20)(52,"mat-select-trigger"),t.ɵɵtemplate(53,xp,3,3,"span",11),t.ɵɵelementEnd(),t.ɵɵtemplate(54,Cp,8,7,"mat-option",21),t.ɵɵelementEnd()(),t.ɵɵtemplate(55,Sp,6,0,"mat-form-field",22),t.ɵɵelementStart(56,"mat-form-field",18)(57,"mat-label",5),t.ɵɵtext(58,"tb.rulenode.body-template"),t.ɵɵelementEnd(),t.ɵɵelement(59,"textarea",23),t.ɵɵtemplate(60,Tp,3,3,"mat-error",11),t.ɵɵelementEnd()()()()),2&e&&(t.ɵɵproperty("formGroup",n.toEmailConfigForm),t.ɵɵadvance(10),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(11,14,"tb.rulenode.email-from-template-hint")," "),t.ɵɵadvance(4),t.ɵɵpropertyInterpolate("tb-help-popup","rulenode/to_email_node_fields_templatization"),t.ɵɵpropertyInterpolate("trigger-text",t.ɵɵpipeBind1(15,16,"tb.key-val.see-examples")),t.ɵɵproperty("tb-help-popup-style",t.ɵɵpureFunction0(22,hp)),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.toEmailConfigForm.get("fromTemplate").hasError("required")),t.ɵɵadvance(5),t.ɵɵproperty("hintText",t.ɵɵpipeBind1(22,18,"tb.rulenode.recipients-block-main-hint")),t.ɵɵadvance(7),t.ɵɵproperty("ngIf",n.toEmailConfigForm.get("toTemplate").hasError("required")),t.ɵɵadvance(12),t.ɵɵproperty("hintText",t.ɵɵpipeBind1(41,20,"tb.rulenode.kv-map-pattern-hint")),t.ɵɵadvance(7),t.ɵɵproperty("ngIf",n.toEmailConfigForm.get("subjectTemplate").hasError("required")),t.ɵɵadvance(6),t.ɵɵproperty("ngIf",n.toEmailConfigForm.get("mailBodyType").value),t.ɵɵadvance(),t.ɵɵproperty("ngForOf",n.mailBodyTypes),t.ɵɵadvance(),t.ɵɵproperty("ngIf","dynamic"===n.toEmailConfigForm.get("mailBodyType").value),t.ɵɵadvance(5),t.ɵɵproperty("ngIf",n.toEmailConfigForm.get("bodyTemplate").hasError("required")))},dependencies:t.ɵɵgetComponentDepsFactory(Ip),styles:["[_nghost-%COMP%]   .input-bottom-double-hint[_ngcontent-%COMP%]{display:inline-flex}[_nghost-%COMP%]   .input-bottom-double-hint[_ngcontent-%COMP%]   .see-example[_ngcontent-%COMP%]{flex-shrink:0;padding-right:16px}[_nghost-%COMP%]   textarea.tb-enable-vertical-resize[_ngcontent-%COMP%]{resize:vertical}"]})}}e("ToEmailConfigComponent",Ip);class Ep extends i{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.copyFrom=[],this.translation=Ut;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,[N.required]],keys:[e?e.keys:null,[N.required]]})}configForm(){return this.copyKeysConfigForm}prepareInputConfig(e){let t;return t=P(e?.fromMetadata)?e.copyFrom?Kt.METADATA:Kt.DATA:P(e?.copyFrom)?e.copyFrom:Kt.DATA,{keys:P(e?.keys)?e.keys:null,copyFrom:t}}static{this.ɵfac=function(e){return new(e||Ep)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Ep,selectors:[["tb-transformation-node-copy-keys-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:10,vars:17,consts:[[1,"tb-form-panel","no-padding","no-border",3,"formGroup"],["formControlName","copyFrom",3,"labelText","translation"],["required","","formControlName","keys",1,"mat-block",3,"label","placeholder","requiredText"],["matSuffix","","aria-hidden","false","aria-label","help-icon","color","primary",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0),t.ɵɵelement(1,"tb-msg-metadata-chip",1),t.ɵɵpipe(2,"translate"),t.ɵɵelementStart(3,"tb-string-items-list",2),t.ɵɵpipe(4,"translate"),t.ɵɵpipe(5,"translate"),t.ɵɵpipe(6,"translate"),t.ɵɵelementStart(7,"mat-icon",3),t.ɵɵpipe(8,"translate"),t.ɵɵtext(9," help "),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.copyKeysConfigForm),t.ɵɵadvance(),t.ɵɵproperty("labelText",t.ɵɵpipeBind1(2,7,"tb.key-val.copy-key-values-from"))("translation",n.translation),t.ɵɵadvance(2),t.ɵɵproperty("label",t.ɵɵpipeBind1(4,9,"tb.rulenode.keys"))("placeholder",t.ɵɵpipeBind1(5,11,"tb.rulenode.add-key"))("requiredText",t.ɵɵpipeBind1(6,13,"tb.key-val.at-least-one-key-error")),t.ɵɵadvance(4),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(8,15,"tb.rulenode.use-regular-expression-hint")))},dependencies:t.ɵɵgetComponentDepsFactory(Ep),encapsulation:2})}}function Fp(e,n){if(1&e&&(t.ɵɵelementStart(0,"tb-toggle-option",7),t.ɵɵtext(1),t.ɵɵelementEnd()),2&e){const e=n.$implicit;t.ɵɵproperty("value",e.value),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",e.name," ")}}e("CopyKeysConfigComponent",Ep);class qp extends i{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.renameIn=[],this.translation=zt;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,[N.required]],renameKeysMapping:[e?e.renameKeysMapping:null,[N.required]]})}prepareInputConfig(e){let t;return t=P(e?.fromMetadata)?e.fromMetadata?Kt.METADATA:Kt.DATA:P(e?.renameIn)?e?.renameIn:Kt.DATA,{renameKeysMapping:P(e?.renameKeysMapping)?e.renameKeysMapping:null,renameIn:t}}static{this.ɵfac=function(e){return new(e||qp)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:qp,selectors:[["tb-transformation-node-rename-keys-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:15,vars:24,consts:[[1,"tb-form-panel","stroked",3,"formGroup"],["translate","",1,"tb-form-panel-title"],[1,"fx-centered"],[1,"fetch-to-data-toggle"],["formControlName","renameIn","appearance","fill",1,"fetch-to-data-toggle"],[3,"value",4,"ngFor","ngForOf"],["required","","formControlName","renameKeysMapping","uniqueKeyValuePairValidator","",3,"labelText","requiredText","keyText","keyRequiredText","valText","valRequiredText"],[3,"value"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1),t.ɵɵtext(2,"tb.rulenode.rename-keys-in"),t.ɵɵelementEnd(),t.ɵɵelementStart(3,"div",2)(4,"div",3)(5,"tb-toggle-select",4),t.ɵɵtemplate(6,Fp,2,2,"tb-toggle-option",5),t.ɵɵelementEnd()()(),t.ɵɵelement(7,"tb-kv-map-config",6),t.ɵɵpipe(8,"translate"),t.ɵɵpipe(9,"translate"),t.ɵɵpipe(10,"translate"),t.ɵɵpipe(11,"translate"),t.ɵɵpipe(12,"translate"),t.ɵɵpipe(13,"translate"),t.ɵɵpipe(14,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.renameKeysConfigForm),t.ɵɵadvance(6),t.ɵɵproperty("ngForOf",n.renameIn),t.ɵɵadvance(),t.ɵɵpropertyInterpolate2("labelText","",t.ɵɵpipeBind1(8,10,n.translation.get(n.renameKeysConfigForm.get("renameIn").value))," ",t.ɵɵpipeBind1(9,12,"tb.rulenode.keys-mapping"),""),t.ɵɵpropertyInterpolate("requiredText",t.ɵɵpipeBind1(10,14,"tb.rulenode.attr-mapping-required")),t.ɵɵpropertyInterpolate("keyText",t.ɵɵpipeBind1(11,16,"tb.rulenode.current-key-name")),t.ɵɵpropertyInterpolate("keyRequiredText",t.ɵɵpipeBind1(12,18,"tb.rulenode.key-name-required")),t.ɵɵpropertyInterpolate("valText",t.ɵɵpipeBind1(13,20,"tb.rulenode.new-key-name")),t.ɵɵpropertyInterpolate("valRequiredText",t.ɵɵpipeBind1(14,22,"tb.rulenode.new-key-name-required")))},dependencies:t.ɵɵgetComponentDepsFactory(qp),styles:["[_nghost-%COMP%]   .fetch-to-data-toggle[_ngcontent-%COMP%]{max-width:420px;width:100%}[_nghost-%COMP%]   .fx-centered[_ngcontent-%COMP%]{display:flex;width:100%;justify-content:space-around}"]})}}function Ap(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(2,1,"tb.rulenode.json-path-expression-required")))}e("RenameKeysConfigComponent",qp);class kp extends i{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,[N.required]]})}static{this.ɵfac=function(e){return new(e||kp)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:kp,selectors:[["tb-transformation-node-json-path-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:10,vars:8,consts:[[3,"formGroup"],["subscriptSizing","dynamic",1,"mat-block"],["matInput","","formControlName","jsonPath","required",""],[4,"ngIf"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label"),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(5,"input",2),t.ɵɵelementStart(6,"mat-hint"),t.ɵɵtext(7),t.ɵɵpipe(8,"translate"),t.ɵɵelementEnd(),t.ɵɵtemplate(9,Ap,3,3,"mat-error",3),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.jsonPathConfigForm),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(4,4,"tb.rulenode.json-path-expression")),t.ɵɵadvance(4),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(8,6,"tb.rulenode.json-path-expression-hint")),t.ɵɵadvance(2),t.ɵɵproperty("ngIf",n.jsonPathConfigForm.get("jsonPath").hasError("required")))},dependencies:t.ɵɵgetComponentDepsFactory(kp),encapsulation:2})}}e("NodeJsonPathConfigComponent",kp);class Np extends i{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.deleteFrom=[],this.translation=Ht;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,[N.required]],keys:[e?e.keys:null,[N.required]]})}prepareInputConfig(e){let t;return t=P(e?.fromMetadata)?e.fromMetadata?Kt.METADATA:Kt.DATA:P(e?.deleteFrom)?e?.deleteFrom:Kt.DATA,{keys:P(e?.keys)?e.keys:null,deleteFrom:t}}configForm(){return this.deleteKeysConfigForm}static{this.ɵfac=function(e){return new(e||Np)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder),t.ɵɵdirectiveInject(K.TranslateService))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Np,selectors:[["tb-transformation-node-delete-keys-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:10,vars:16,consts:[[1,"tb-form-panel","no-border","no-padding",3,"formGroup"],["formControlName","deleteFrom",3,"labelText"],["required","","formControlName","keys",1,"mat-block",3,"label","placeholder","requiredText"],["matSuffix","","aria-hidden","false","aria-label","help-icon","color","primary",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0),t.ɵɵelement(1,"tb-msg-metadata-chip",1),t.ɵɵpipe(2,"translate"),t.ɵɵelementStart(3,"tb-string-items-list",2),t.ɵɵpipe(4,"translate"),t.ɵɵpipe(5,"translate"),t.ɵɵpipe(6,"translate"),t.ɵɵelementStart(7,"mat-icon",3),t.ɵɵpipe(8,"translate"),t.ɵɵtext(9," help "),t.ɵɵelementEnd()()()),2&e&&(t.ɵɵproperty("formGroup",n.deleteKeysConfigForm),t.ɵɵadvance(),t.ɵɵproperty("labelText",t.ɵɵpipeBind1(2,6,"tb.key-val.delete-key-values-from")),t.ɵɵadvance(2),t.ɵɵproperty("label",t.ɵɵpipeBind1(4,8,"tb.rulenode.keys"))("placeholder",t.ɵɵpipeBind1(5,10,"tb.rulenode.add-key"))("requiredText",t.ɵɵpipeBind1(6,12,"tb.key-val.at-least-one-key-error")),t.ɵɵadvance(4),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(8,14,"tb.rulenode.use-regular-expression-delete-hint")))},dependencies:t.ɵɵgetComponentDepsFactory(Np),encapsulation:2})}}function wp(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.interval-required")," "))}function Mp(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.interval-min-error")," "))}function Bp(e,n){if(1&e&&(t.ɵɵelementStart(0,"tb-toggle-option",18),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e){const e=n.$implicit,r=t.ɵɵnextContext();t.ɵɵproperty("value",e),t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,2,r.deduplicationStrategiesTranslations.get(e))," ")}}function Vp(e,n){1&e&&(t.ɵɵelement(0,"tb-example-hint",19),t.ɵɵpipe(1,"translate")),2&e&&t.ɵɵproperty("hintText",t.ɵɵpipeBind1(1,1,"tb.rulenode.strategy-all-hint"))}function Op(e,n){1&e&&(t.ɵɵelement(0,"tb-example-hint",20),t.ɵɵpipe(1,"translate")),2&e&&t.ɵɵproperty("hintText",t.ɵɵpipeBind1(1,1,"tb.rulenode.strategy-first-hint"))}function Dp(e,n){1&e&&(t.ɵɵelement(0,"tb-example-hint",20),t.ɵɵpipe(1,"translate")),2&e&&t.ɵɵproperty("hintText",t.ɵɵpipeBind1(1,1,"tb.rulenode.strategy-last-hint"))}function Lp(e,n){1&e&&(t.ɵɵelementStart(0,"div"),t.ɵɵelement(1,"tb-output-message-type-autocomplete",21),t.ɵɵelementEnd())}function Pp(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-pending-msgs-required")," "))}function Rp(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-pending-msgs-max-error")," "))}function _p(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-pending-msgs-min-error")," "))}function jp(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-retries-required")," "))}function Gp(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-retries-max-error")," "))}function Kp(e,n){1&e&&(t.ɵɵelementStart(0,"mat-error"),t.ɵɵtext(1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵadvance(),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(2,1,"tb.rulenode.max-retries-min-error")," "))}e("DeleteKeysConfigComponent",Np);class Up extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.deduplicationStrategie=St,this.deduplicationStrategies=Object.keys(this.deduplicationStrategie),this.deduplicationStrategiesTranslations=Tt}configForm(){return this.deduplicationConfigForm}onConfigurationSet(e){this.deduplicationConfigForm=this.fb.group({interval:[P(e?.interval)?e.interval:null,[N.required,N.min(1)]],strategy:[P(e?.strategy)?e.strategy:null,[N.required]],outMsgType:[P(e?.outMsgType)?e.outMsgType:null,[N.required]],maxPendingMsgs:[P(e?.maxPendingMsgs)?e.maxPendingMsgs:null,[N.required,N.min(1),N.max(1e3)]],maxRetries:[P(e?.maxRetries)?e.maxRetries:null,[N.required,N.min(0),N.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"]}static{this.ɵfac=function(e){return new(e||Up)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.FormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Up,selectors:[["tb-action-node-msg-deduplication-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:49,vars:32,consts:[[3,"formGroup"],[1,"mat-block"],["type","number","required","","matInput","","formControlName","interval"],[4,"ngIf"],["matSuffix","","aria-hidden","false","aria-label","help-icon","color","primary",1,"help-icon","margin-8","cursor-pointer",3,"matTooltip"],[1,"tb-form-panel","no-padding","no-border"],[1,"tb-form-panel","stroked"],["translate","",1,"tb-form-panel-title","tb-required"],["formControlName","strategy","appearance","fill",1,"fetch-to-data-toggle"],[3,"value",4,"ngFor","ngForOf"],[3,"hintText",4,"ngIf"],["textAlign","'center'",3,"hintText",4,"ngIf"],[1,"tb-settings"],["translate",""],[1,"tb-form-row","no-border","no-padding","tb-standard-fields"],[1,"flex"],["type","number","required","","matInput","","formControlName","maxPendingMsgs"],["type","number","required","","matInput","","formControlName","maxRetries"],[3,"value"],[3,"hintText"],["textAlign","'center'",3,"hintText"],["required","","formControlName","outMsgType"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"mat-form-field",1)(2,"mat-label"),t.ɵɵtext(3),t.ɵɵpipe(4,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(5,"input",2),t.ɵɵtemplate(6,wp,3,3,"mat-error",3)(7,Mp,3,3,"mat-error",3),t.ɵɵelementStart(8,"mat-icon",4),t.ɵɵpipe(9,"translate"),t.ɵɵtext(10,"help"),t.ɵɵelementEnd()(),t.ɵɵelementStart(11,"div",5)(12,"div",6)(13,"div",7),t.ɵɵtext(14,"tb.rulenode.strategy"),t.ɵɵelementEnd(),t.ɵɵelementStart(15,"tb-toggle-select",8),t.ɵɵtemplate(16,Bp,3,4,"tb-toggle-option",9),t.ɵɵelementEnd(),t.ɵɵtemplate(17,Vp,2,3,"tb-example-hint",10)(18,Op,2,3,"tb-example-hint",11)(19,Dp,2,3,"tb-example-hint",11)(20,Lp,2,0,"div",3),t.ɵɵelementEnd(),t.ɵɵelementStart(21,"section",6)(22,"mat-expansion-panel",12)(23,"mat-expansion-panel-header")(24,"mat-panel-title",13),t.ɵɵtext(25,"tb.rulenode.advanced-settings"),t.ɵɵelementEnd()(),t.ɵɵelementStart(26,"div",14)(27,"mat-form-field",15)(28,"mat-label"),t.ɵɵtext(29),t.ɵɵpipe(30,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(31,"input",16),t.ɵɵtemplate(32,Pp,3,3,"mat-error",3)(33,Rp,3,3,"mat-error",3)(34,_p,3,3,"mat-error",3),t.ɵɵelementStart(35,"mat-icon",4),t.ɵɵpipe(36,"translate"),t.ɵɵtext(37,"help"),t.ɵɵelementEnd()(),t.ɵɵelementStart(38,"mat-form-field",15)(39,"mat-label"),t.ɵɵtext(40),t.ɵɵpipe(41,"translate"),t.ɵɵelementEnd(),t.ɵɵelement(42,"input",17),t.ɵɵtemplate(43,jp,3,3,"mat-error",3)(44,Gp,3,3,"mat-error",3)(45,Kp,3,3,"mat-error",3),t.ɵɵelementStart(46,"mat-icon",4),t.ɵɵpipe(47,"translate"),t.ɵɵtext(48,"help"),t.ɵɵelementEnd()()()()()()()),2&e&&(t.ɵɵproperty("formGroup",n.deduplicationConfigForm),t.ɵɵadvance(3),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(4,20,"tb.rulenode.interval")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.deduplicationConfigForm.get("interval").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.deduplicationConfigForm.get("interval").hasError("min")),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(9,22,"tb.rulenode.interval-hint")),t.ɵɵadvance(8),t.ɵɵproperty("ngForOf",n.deduplicationStrategies),t.ɵɵadvance(),t.ɵɵproperty("ngIf","ALL"===n.deduplicationConfigForm.get("strategy").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf","FIRST"===n.deduplicationConfigForm.get("strategy").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf","LAST"===n.deduplicationConfigForm.get("strategy").value),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.deduplicationConfigForm.get("strategy").value===n.deduplicationStrategie.ALL),t.ɵɵadvance(9),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(30,24,"tb.rulenode.max-pending-msgs")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.deduplicationConfigForm.get("maxPendingMsgs").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.deduplicationConfigForm.get("maxPendingMsgs").hasError("max")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.deduplicationConfigForm.get("maxPendingMsgs").hasError("min")),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(36,26,"tb.rulenode.max-pending-msgs-hint")),t.ɵɵadvance(5),t.ɵɵtextInterpolate(t.ɵɵpipeBind1(41,28,"tb.rulenode.max-retries")),t.ɵɵadvance(3),t.ɵɵproperty("ngIf",n.deduplicationConfigForm.get("maxRetries").hasError("required")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.deduplicationConfigForm.get("maxRetries").hasError("max")),t.ɵɵadvance(),t.ɵɵproperty("ngIf",n.deduplicationConfigForm.get("maxRetries").hasError("min")),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("matTooltip",t.ɵɵpipeBind1(47,30,"tb.rulenode.max-retries-hint")))},dependencies:t.ɵɵgetComponentDepsFactory(Up),encapsulation:2})}}e("DeduplicationConfigComponent",Up);class Hp{static{this.ɵfac=function(e){return new(e||Hp)}}static{this.ɵmod=t.ɵɵdefineNgModule({type:Hp})}static{this.ɵinj=t.ɵɵdefineInjector({imports:[$,S,xi,sp,gp,Ip,Ep,qp,kp,Np,Up]})}}e("RulenodeCoreConfigTransformModule",Hp),("undefined"==typeof ngJitMode||ngJitMode)&&t.ɵɵsetNgModuleScope(Hp,{declarations:[sp,gp,Ip,Ep,qp,kp,Np,Up],imports:[$,S,xi],exports:[sp,gp,Ip,Ep,qp,kp,Np,Up]});const zp=e=>[e];class $p extends i{constructor(e,t){super(e),this.store=e,this.fb=t,this.entityType=u}configForm(){return this.ruleChainInputConfigForm}onConfigurationSet(e){this.ruleChainInputConfigForm=this.fb.group({forwardMsgToDefaultRuleChain:[!!e&&e?.forwardMsgToDefaultRuleChain,[]],ruleChainId:[e?e.ruleChainId:null,[N.required]]})}static{this.ɵfac=function(e){return new(e||$p)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:$p,selectors:[["tb-flow-node-rule-chain-input-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:8,vars:12,consts:[[1,"flex","flex-col",3,"formGroup"],[1,"tb-form-panel","no-padding","no-border"],[1,"tb-form-row","no-border",3,"tb-hint-tooltip-icon"],["formControlName","forwardMsgToDefaultRuleChain",1,"mat-slide"],["required","","formControlName","ruleChainId",3,"excludeEntityIds","entityType","entitySubtype"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0)(1,"div",1)(2,"div",2),t.ɵɵpipe(3,"translate"),t.ɵɵelementStart(4,"mat-slide-toggle",3),t.ɵɵtext(5),t.ɵɵpipe(6,"translate"),t.ɵɵelementEnd()(),t.ɵɵelement(7,"tb-entity-autocomplete",4),t.ɵɵelementEnd()()),2&e&&(t.ɵɵproperty("formGroup",n.ruleChainInputConfigForm),t.ɵɵadvance(2),t.ɵɵpropertyInterpolate("tb-hint-tooltip-icon",t.ɵɵpipeBind1(3,6,"tb.rulenode.forward-msg-default-rule-chain-tooltip")),t.ɵɵadvance(3),t.ɵɵtextInterpolate1(" ",t.ɵɵpipeBind1(6,8,"tb.rulenode.forward-msg-default-rule-chain")," "),t.ɵɵadvance(2),t.ɵɵproperty("excludeEntityIds",t.ɵɵpureFunction1(10,zp,n.ruleChainId))("entityType",n.entityType.RULE_CHAIN)("entitySubtype",n.ruleChainType))},dependencies:t.ɵɵgetComponentDepsFactory($p),encapsulation:2})}}e("RuleChainInputComponent",$p);class Qp extends i{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.ruleChainOutputConfigForm}onConfigurationSet(e){this.ruleChainOutputConfigForm=this.fb.group({})}static{this.ɵfac=function(e){return new(e||Qp)(t.ɵɵdirectiveInject(A.Store),t.ɵɵdirectiveInject(k.UntypedFormBuilder))}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Qp,selectors:[["tb-flow-node-rule-chain-output-config"]],features:[t.ɵɵInheritDefinitionFeature],decls:3,vars:4,consts:[[1,"flex","flex-col",3,"formGroup"],[3,"innerHTML"]],template:function(e,n){1&e&&(t.ɵɵelementStart(0,"section",0),t.ɵɵelement(1,"div",1),t.ɵɵpipe(2,"translate"),t.ɵɵelementEnd()),2&e&&(t.ɵɵproperty("formGroup",n.ruleChainOutputConfigForm),t.ɵɵadvance(),t.ɵɵpropertyInterpolate("innerHTML",t.ɵɵpipeBind1(2,2,"tb.rulenode.output-node-name-hint"),t.ɵɵsanitizeHtml))},dependencies:t.ɵɵgetComponentDepsFactory(Qp),encapsulation:2})}}e("RuleChainOutputComponent",Qp);class Jp{static{this.ɵfac=function(e){return new(e||Jp)}}static{this.ɵmod=t.ɵɵdefineNgModule({type:Jp})}static{this.ɵinj=t.ɵɵdefineInjector({imports:[$,S,xi,$p,Qp]})}}e("RuleNodeCoreConfigFlowModule",Jp),("undefined"==typeof ngJitMode||ngJitMode)&&t.ɵɵsetNgModuleScope(Jp,{declarations:[$p,Qp],imports:[$,S,xi],exports:[$p,Qp]});class Yp{constructor(){}static{this.ɵfac=function(e){return new(e||Yp)}}static{this.ɵcmp=t.ɵɵdefineComponent({type:Yp,selectors:[["tb-lib-styles-entry"]],standalone:!0,features:[t.ɵɵStandaloneFeature],decls:0,vars:0,template:function(e,t){},styles:['.tb-default tb-rule-node-config .margin-8{margin:8px}.tb-default tb-rule-node-config .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}.tb-default tb-rule-node-config .tb-required:after{content:"*";font-size:16px;color:#000000de}.tb-default tb-rule-node-config .help-icon{color:#000;opacity:.38;padding:unset}.tb-default tb-rule-node-config .help-icon:hover{color:#305680;opacity:unset}.tb-default tb-rule-node-config .same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.tb-default tb-rule-node-config .same-width-component-row{gap:8px}}.tb-default tb-rule-node-config .same-width-component-row>*{flex:1}.tb-default .gap-0{gap:0px}.tb-default .gap-5\\.5{gap:1.375rem}@media (max-width: 599px){.tb-default .xs\\:max-h-full{max-height:100%}}@media (min-width: 960px) and (max-width: 1279px){.tb-default .md\\:max-h-full{max-height:100%}}@media (max-width: 959px){.tb-default .lt-md\\:gap-4{gap:1rem}}@media (min-width: 960px){.tb-default .gt-sm\\:max-w-10{max-width:2.5rem}.tb-default .gt-sm\\:max-w-10\\%{max-width:10%}.tb-default .gt-sm\\:gap-4{gap:1rem}.tb-default .gt-sm\\:gap-5\\.5{gap:1.375rem}}\n'],encapsulation:2})}}const Wp=(e,t)=>{const n=e[a];if(n.styles?.length){const e=n.styles[0];let r=document.getElementById(t);if(!r){r=document.createElement("style"),r.id=t;(document.head||document.getElementsByTagName("head")[0]).appendChild(r)}r.innerHTML=e}};class Xp{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 it doesn't exist","create-entity-if-not-exists-hint":"If enabled, a new entity with specified parameters will be created unless it already exists. Existing entities will be used as is for relation.","select-device-connectivity-event":"Select device connectivity event","entity-name-pattern":"Name pattern","device-name-pattern":"Device name","asset-name-pattern":"Asset name","entity-view-name-pattern":"Entity view name","customer-title-pattern":"Customer title","dashboard-name-pattern":"Dashboard title","user-name-pattern":"User email","edge-name-pattern":"Edge name","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 title","customer-name-pattern-required":"Customer title is required","customer-name-pattern-hint":"Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","create-customer-if-not-exists":"Create new customer if it doesn't exist","unassign-from-customer":"Unassign from specific customer if originator is dashboard","unassign-from-customer-tooltip":"Only dashboards can be assigned to multiple customers at once. \nIf the message originator is a dashboard, you need to explicitly specify the customer's title to unassign from.","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","attributes-scope":"Attributes scope","attributes-scope-value":"Attributes scope value","attributes-scope-value-copy":"Copy attributes scope value","attributes-scope-hint":"Use the 'scope' metadata key to dynamically set the attribute scope per message. If provided, this overrides the scope set in the configuration.","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":"Time series keys","timeseries-keys-required":"At least one time series key should be selected.","add-timeseries-key":"Add time series key","add-message-field":"Add message field","relation-search-parameters":"Relation search parameters","relation-parameters":"Relation 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.","max-relation-level-invalid":"Value should be an integer.","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","fields-mapping-hint":"If the message field is set to $entityId, the message originator's id will be saved to the specified table column.","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.","default-ttl-hint":"Rule node will fetch Time-to-Live (TTL) value from the message metadata. If no value is present, it defaults to the TTL specified in the configuration. If the value is set to 0, the TTL from the tenant profile configuration will be applied.","default-ttl-zero-hint":"TTL will not be applied if its value is set to 0.","min-default-ttl-message":"Only 0 minimum TTL is allowed.","generation-parameters":"Generation parameters","message-count":"Generated messages limit (0 - unlimited)","message-count-required":"Generated messages limit is required.","min-message-count-message":"Only 0 minimum message count is allowed.","period-seconds":"Period in seconds","period-seconds-required":"Period is required.","generation-frequency-seconds":"Generation frequency in seconds","generation-frequency-required":"Generation frequency is required.","min-generation-frequency-message":"Only 1 second minimum is allowed.","script-lang-tbel":"TBEL","script-lang-js":"JS","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","current-rule-node":"Current Rule Node","current-tenant":"Current Tenant","generator-function":"Generator function","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","reply-routing-configuration":"Reply Routing Configuration","rpc-reply-routing-configuration-hint":"These configuration parameters specify the metadata key names used to identify the service, session, and request for sending a reply back.","reply-routing-configuration-hint":"These configuration parameters specify the metadata key names used to identify the service and request for sending a reply back.","request-id-metadata-attribute":"Request Id","service-id-metadata-attribute":"Service Id","session-id-metadata-attribute":"Session Id","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","max-response-size":"Max response size (in KB)","max-response-size-hint":"The maximum amount of memory allocated for buffering data when decoding or encoding HTTP messages, such as JSON or XML payloads",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.","memory-buffer-size-range":"Memory buffer size must be between 0 and {{max}} KB",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-with-specific-entity":"Delete relation with specific entity","delete-relation-with-specific-entity-hint":"If enabled, will delete the relation with just one specific entity. Otherwise, the relation will be removed with all matching entities.","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.","int-range":"Value must not exceed the maximum integer limit (2147483648)","min-interval-seconds-message":"Only 1 second minimum interval is allowed.","output-timeseries-key-prefix":"Output time series key prefix","output-timeseries-key-prefix-required":"Output time series 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":"The table must be created in your Cassandra cluster and its name must start with the prefix 'cs_tb_' to avoid the data insertion to the common TB tables. Enter the table name here without the 'cs_tb_' prefix.","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;"',"ignore-null-strings":"Ignore null strings","ignore-null-strings-hint":"If selected rule node will ignore entity fields with empty value.","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.","device-profile-node-hint":"Useful if you have duration or repeating conditions to ensure continuity of alarm state evaluation.","persist-alarm-rules":"Persist state of alarm rules","persist-alarm-rules-hint":"If enabled, the rule node will store the state of processing to the database.","fetch-alarm-rules":"Fetch state of alarm rules","fetch-alarm-rules-hint":"If enabled, the rule node will restore the state of processing on initialization and ensure that alarms are raised even after server restarts. Otherwise, the state will be restored when the first message from the device arrives.","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","skip-latest-persistence-hint":"Rule node will not update values for incoming keys for the latest time series data. Useful for highly loaded use-cases to decrease the pressure on the DB.","use-server-ts":"Use server ts","use-server-ts-hint":"Rule node will use the timestamp of 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.","kv-map-single-pattern-hint":"Input field 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":"time series 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 time series from {{startInterval}} {{startIntervalTimeUnit}} ago to {{endInterval}} {{endIntervalTimeUnit}} ago.","fetch-timeseries-from-to-invalid":'Fetch time series 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 message 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.","forward-msg-default-rule-chain":"Forward message to the originator's default rule chain","forward-msg-default-rule-chain-tooltip":"If enabled, message will be forwarded to the originator's default rule chain, or rule chain from configuration, if originator has no default rule chain defined in the entity profile.","exclude-zero-deltas":"Exclude zero deltas from outbound message","exclude-zero-deltas-hint":'If enabled, the "{{outputValueKey}}" output key will be added to the outbound message if its value is not zero.',"exclude-zero-deltas-time-difference-hint":'If enabled, the "{{outputValueKey}}" and "{{periodValueKey}}" output keys will be added to the outbound message only if the "{{outputValueKey}}" value is not zero.',"search-direction-from":"From originator to target entity","search-direction-to":"From target entity to originator","del-relation-direction-from":"From originator","del-relation-direction-to":"To originator","target-entity":"Target entity","function-configuration":"Function configuration","function-name":"Function name","function-name-required":"Function name is required.",qualifier:"Qualifier","qualifier-hint":'If the qualifier is not specified, the default qualifier "$LATEST" will be used.',"aws-credentials":"AWS Credentials","connection-timeout":"Connection timeout","connection-timeout-required":"Connection timeout is required.","connection-timeout-min":"Min connection timeout is 0.","connection-timeout-hint":"The amount of time to wait in seconds when initially establishing a connection before giving up and timing out. A value of 0 means infinity, and is not recommended.","request-timeout":"Request timeout","request-timeout-required":"Request timeout is required","request-timeout-min":"Min request timeout is 0","request-timeout-hint":"The amount of time to wait in seconds for the request to complete before giving up and timing out. A value of 0 means infinity, and is not recommended.","tell-failure-aws-lambda":"Tell Failure if AWS Lambda function execution raises exception","tell-failure-aws-lambda-hint":"Rule node forces failure of message processing if AWS Lambda function execution raises exception."},"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),Wp(Yp,"tb-rule-node-core-config-css")}static{this.ɵfac=function(e){return new(e||Xp)(t.ɵɵinject(K.TranslateService))}}static{this.ɵmod=t.ɵɵdefineNgModule({type:Xp})}static{this.ɵinj=t.ɵɵdefineInjector({imports:[$,S,Ci,np,bo,hs,Hp,Jp,oe]})}}e("RuleNodeCoreConfigModule",Xp),("undefined"==typeof ngJitMode||ngJitMode)&&t.ɵɵsetNgModuleScope(Xp,{declarations:[oe],imports:[$,S],exports:[Ci,np,bo,hs,Hp,Jp,oe]})}}}));//# sourceMappingURL=rulenode-core-config.js.map
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
index dde4808deb..6a136a473b 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
@@ -306,7 +306,12 @@ class TbAssignToCustomerNodeTest extends AbstractRuleNodeUpgradeTest {
     }
 
     private TbMsg getTbMsg(EntityId originator) {
-        return TbMsg.newMsg(TbMsgType.NA, originator, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        return TbMsg.newMsg()
+                .type(TbMsgType.NA)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
     }
 
     private EntityId toOriginator(EntityType type) {
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
index afab0a0a99..a50c2ff5aa 100644
--- 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
@@ -91,7 +91,12 @@ class TbClearAlarmNodeTest {
     void alarmCanBeCleared() {
         initWithClearAlarmScript();
         metadata.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50}");
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(msgOriginator)
+                .copyMetaData(metadata)
+                .data("{\"temperature\": 50}")
+                .build();
 
         long oldEndDate = System.currentTimeMillis();
         Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(msgOriginator).severity(AlarmSeverity.WARNING).endTs(oldEndDate).build();
@@ -143,7 +148,12 @@ class TbClearAlarmNodeTest {
     void alarmCanBeClearedWithAlarmOriginator() {
         initWithClearAlarmScript();
         metadata.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, alarmOriginator, metadata, "{\"temperature\": 50}");
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(alarmOriginator)
+                .copyMetaData(metadata)
+                .data("{\"temperature\": 50}")
+                .build();
 
         long oldEndDate = System.currentTimeMillis();
         AlarmId id = new AlarmId(alarmOriginator.getId());
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNodeTest.java
index 4166c05a7a..91bdb8d6ff 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNodeTest.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.rule.engine.action;
 
-import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -26,6 +25,8 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.rule.engine.api.EmptyNodeConfiguration;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -37,7 +38,6 @@ import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityViewId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.msg.TbMsgType;
 import org.thingsboard.server.common.data.msg.TbNodeConnectionType;
 import org.thingsboard.server.common.data.objects.AttributesEntityView;
@@ -55,7 +55,7 @@ import java.util.UUID;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.assertArg;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.verify;
@@ -106,17 +106,20 @@ public class TbCopyAttributesToEntityViewNodeTest {
     public void givenExistingClientAttributes_whenOnMsg_thenCopyAttributesToView() {
         EntityView entityView = getEntityView(CLIENT_TELEMETRY_ENTITY_VIEW);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, DEVICE_ID,
-                new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())),
-                "{\"clientAttribute1\": 100, \"clientAttribute2\": \"value2\"}");
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())))
+                .data("{\"clientAttribute1\": 100, \"clientAttribute2\": \"value2\"}")
+                .build();
 
         mockEntityViewLookup(entityView);
         when(ctxMock.getTelemetryService()).thenReturn(telemetryServiceMock);
         doAnswer(invocation -> {
-            FutureCallback<Void> callback = invocation.getArgument(4);
-            callback.onSuccess(null);
+            AttributesSaveRequest request = invocation.getArgument(0);
+            request.getCallback().onSuccess(null);
             return null;
-        }).when(telemetryServiceMock).saveAndNotify(any(), any(), any(AttributeScope.class), anyList(), any(FutureCallback.class));
+        }).when(telemetryServiceMock).saveAttributes(any(AttributesSaveRequest.class));
         TbMsg newMsg = TbMsg.newMsg(msg, msg.getQueueName(), msg.getRuleChainId(), msg.getRuleNodeId());
         // TODO: use newMsg() with any(TbMsgType.class), replace in other tests as well.
         doAnswer(invocation -> newMsg).when(ctxMock).newMsg(any(), any(String.class), any(), any(), any(), any());
@@ -124,13 +127,15 @@ public class TbCopyAttributesToEntityViewNodeTest {
         node.onMsg(ctxMock, msg);
 
         verify(entityViewServiceMock).findEntityViewsByTenantIdAndEntityIdAsync(eq(TENANT_ID), eq(DEVICE_ID));
-        ArgumentCaptor<List<AttributeKvEntry>> filteredAttributesCaptor = ArgumentCaptor.forClass(List.class);
-        verify(telemetryServiceMock).saveAndNotify(eq(TENANT_ID), eq(ENTITY_VIEW_ID), eq(AttributeScope.CLIENT_SCOPE),
-                filteredAttributesCaptor.capture(), any(FutureCallback.class));
-        List<AttributeKvEntry> filteredAttributesCaptorValue = filteredAttributesCaptor.getValue();
-        assertThat(filteredAttributesCaptorValue.size()).isEqualTo(1);
-        assertThat(filteredAttributesCaptorValue.get(0).getKey()).isEqualTo("clientAttribute1");
-        assertThat(filteredAttributesCaptorValue.get(0).getValue()).isEqualTo(100L);
+        verify(telemetryServiceMock).saveAttributes(assertArg(request -> {
+            assertThat(request.getTenantId()).isEqualTo(TENANT_ID);
+            assertThat(request.getEntityId()).isEqualTo(ENTITY_VIEW_ID);
+            assertThat(request.getScope()).isEqualTo(AttributeScope.CLIENT_SCOPE);
+
+            assertThat(request.getEntries().size()).isEqualTo(1);
+            assertThat(request.getEntries().get(0).getKey()).isEqualTo("clientAttribute1");
+            assertThat(request.getEntries().get(0).getValue()).isEqualTo(100L);
+        }));
         verify(ctxMock).ack(eq(msg));
         verify(ctxMock).enqueueForTellNext(eq(newMsg), eq(TbNodeConnectionType.SUCCESS));
         verifyNoMoreInteractions(ctxMock, entityViewServiceMock, telemetryServiceMock);
@@ -140,28 +145,33 @@ public class TbCopyAttributesToEntityViewNodeTest {
     public void givenExistingServerAttributesAndMsgTypeAttributesDeleted_whenOnMsg_thenDeleteAttributesFromView() {
         EntityView entityView = getEntityView(SERVER_TELEMETRY_ENTITY_VIEW);
 
-        TbMsg msg = TbMsg.newMsg(
-                ATTRIBUTES_DELETED, DEVICE_ID, new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())),
-                "{\"attributes\": [\"serverAttribute1\"]}");
+        TbMsg msg = TbMsg.newMsg()
+                .type(ATTRIBUTES_DELETED)
+                .originator(DEVICE_ID)
+                .copyMetaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())))
+                .data("{\"attributes\": [\"serverAttribute1\"]}")
+                .build();
 
         mockEntityViewLookup(entityView);
         when(ctxMock.getTelemetryService()).thenReturn(telemetryServiceMock);
         doAnswer(invocation -> {
-            FutureCallback<Void> callback = invocation.getArgument(4);
-            callback.onSuccess(null);
+            AttributesDeleteRequest request = invocation.getArgument(0);
+            request.getCallback().onSuccess(null);
             return null;
-        }).when(telemetryServiceMock).deleteAndNotify(any(), any(), any(AttributeScope.class), anyList(), any(FutureCallback.class));
+        }).when(telemetryServiceMock).deleteAttributes(any());
         TbMsg newMsg = TbMsg.newMsg(msg, msg.getQueueName(), msg.getRuleChainId(), msg.getRuleNodeId());
         doAnswer(invocation -> newMsg).when(ctxMock).newMsg(any(), any(String.class), any(), any(), any(), any());
 
         node.onMsg(ctxMock, msg);
 
         verify(entityViewServiceMock).findEntityViewsByTenantIdAndEntityIdAsync(eq(TENANT_ID), eq(DEVICE_ID));
-        ArgumentCaptor<List<String>> filteredAttributesCaptor = ArgumentCaptor.forClass(List.class);
-        verify(telemetryServiceMock).deleteAndNotify(eq(TENANT_ID), eq(ENTITY_VIEW_ID), eq(AttributeScope.SERVER_SCOPE), filteredAttributesCaptor.capture(), any(FutureCallback.class));
-        List<String> filteredAttributesCaptorValue = filteredAttributesCaptor.getValue();
-        assertThat(filteredAttributesCaptorValue.size()).isEqualTo(1);
-        assertThat(filteredAttributesCaptorValue.get(0)).isEqualTo("serverAttribute1");
+        verify(telemetryServiceMock).deleteAttributes(assertArg(request -> {
+            assertThat(request.getTenantId()).isEqualTo(TENANT_ID);
+            assertThat(request.getEntityId()).isEqualTo(ENTITY_VIEW_ID);
+            assertThat(request.getScope()).isEqualTo(AttributeScope.SERVER_SCOPE);
+            assertThat(request.getKeys().size()).isEqualTo(1);
+            assertThat(request.getKeys().get(0)).isEqualTo("serverAttribute1");
+        }));
         verify(ctxMock).ack(eq(msg));
         verify(ctxMock).enqueueForTellNext(eq(newMsg), eq(TbNodeConnectionType.SUCCESS));
         verifyNoMoreInteractions(ctxMock, entityViewServiceMock, telemetryServiceMock);
@@ -171,9 +181,12 @@ public class TbCopyAttributesToEntityViewNodeTest {
     public void givenNonMatchedSharedAttributesAndMsgTypeIsAttributesDeleted_whenOnMsg_thenNoAttributesDeleteFromView() {
         EntityView entityView = getEntityView(SHARED_TELEMETRY_ENTITY_VIEW);
 
-        TbMsg msg = TbMsg.newMsg(
-                TbMsgType.ATTRIBUTES_DELETED, DEVICE_ID, new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SHARED_SCOPE.name())),
-                "{\"attributes\": [\"anotherAttribute\"]}");
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.ATTRIBUTES_DELETED)
+                .originator(DEVICE_ID)
+                .copyMetaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SHARED_SCOPE.name())))
+                .data("{\"attributes\": [\"anotherAttribute\"]}")
+                .build();
 
         mockEntityViewLookup(entityView);
 
@@ -188,24 +201,32 @@ public class TbCopyAttributesToEntityViewNodeTest {
     public void givenNonMatchedAttributesAndMsgTypeIsPostAttributesRequest_whenOnMsg_thenCopyNoAttributesToView() {
         EntityView entityView = getEntityView(CLIENT_TELEMETRY_ENTITY_VIEW);
 
-        TbMsg msg = TbMsg.newMsg(
-                TbMsgType.POST_ATTRIBUTES_REQUEST, DEVICE_ID, new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())),
-                "{\"clientAttribute2\": \"value2\"}");
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())))
+                .data("{\"clientAttribute2\": \"value2\"}")
+                .build();
 
         mockEntityViewLookup(entityView);
         when(ctxMock.getTelemetryService()).thenReturn(telemetryServiceMock);
         doAnswer(invocation -> {
-            FutureCallback<Void> callback = invocation.getArgument(4);
-            callback.onSuccess(null);
+            AttributesSaveRequest request = invocation.getArgument(0);
+            request.getCallback().onSuccess(null);
             return null;
-        }).when(telemetryServiceMock).saveAndNotify(any(), any(), any(AttributeScope.class), anyList(), any(FutureCallback.class));
+        }).when(telemetryServiceMock).saveAttributes(any(AttributesSaveRequest.class));
         TbMsg newMsg = TbMsg.newMsg(msg, msg.getQueueName(), msg.getRuleChainId(), msg.getRuleNodeId());
         doAnswer(invocation -> newMsg).when(ctxMock).newMsg(any(), any(String.class), any(), any(), any(), any());
 
         node.onMsg(ctxMock, msg);
 
         verify(entityViewServiceMock).findEntityViewsByTenantIdAndEntityIdAsync(eq(TENANT_ID), eq(DEVICE_ID));
-        verify(telemetryServiceMock).saveAndNotify(eq(TENANT_ID), eq(ENTITY_VIEW_ID), eq(AttributeScope.CLIENT_SCOPE), eq(Collections.emptyList()), any(FutureCallback.class));
+        verify(telemetryServiceMock).saveAttributes(assertArg(request -> {
+            assertThat(request.getTenantId()).isEqualTo(TENANT_ID);
+            assertThat(request.getEntityId()).isEqualTo(ENTITY_VIEW_ID);
+            assertThat(request.getScope()).isEqualTo(AttributeScope.CLIENT_SCOPE);
+            assertThat(request.getEntries().isEmpty()).isTrue();
+        }));
         verify(ctxMock).ack(eq(msg));
         verify(ctxMock).enqueueForTellNext(eq(newMsg), eq(TbNodeConnectionType.SUCCESS));
         verifyNoMoreInteractions(ctxMock, entityViewServiceMock, telemetryServiceMock);
@@ -220,9 +241,12 @@ public class TbCopyAttributesToEntityViewNodeTest {
         );
         mockEntityViewLookup(entityView);
 
-        TbMsg msg = TbMsg.newMsg(
-                ATTRIBUTES_DELETED, DEVICE_ID, new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())),
-                "{\"attributes\": [\"serverAttribute1\"]}");
+        TbMsg msg = TbMsg.newMsg()
+                .type(ATTRIBUTES_DELETED)
+                .originator(DEVICE_ID)
+                .copyMetaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())))
+                .data("{\"attributes\": [\"serverAttribute1\"]}")
+                .build();
         node.onMsg(ctxMock, msg);
 
         verify(entityViewServiceMock).findEntityViewsByTenantIdAndEntityIdAsync(eq(TENANT_ID), eq(DEVICE_ID));
@@ -233,7 +257,12 @@ public class TbCopyAttributesToEntityViewNodeTest {
     @ParameterizedTest
     @EnumSource(TbMsgType.class)
     public void givenMsgTypeAndEmptyMetadata_whenOnMsg_thenVerifyFailureMsg(TbMsgType msgType) {
-        TbMsg msg = TbMsg.newMsg(msgType, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(msgType)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         node.onMsg(ctxMock, msg);
 
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
index c0e27231c4..370c9f1347 100644
--- 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
@@ -163,7 +163,12 @@ class TbCreateAlarmNodeTest {
 
         var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
 
-        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50}");
+        var incomingMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(msgOriginator)
+                .copyMetaData(metadata)
+                .data("{\"temperature\": 50}")
+                .build();
 
         Alarm existingAlarm = null;
 
@@ -224,12 +229,12 @@ class TbCreateAlarmNodeTest {
         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))
+                .willAnswer(answer -> answer.getArgument(0, TbMsg.class).transform()
+                                .type(answer.getArgument(1, TbMsgType.class))
+                                .originator(answer.getArgument(2, EntityId.class))
+                                .metaData(answer.getArgument(3, TbMsgMetaData.class))
+                                .data(answer.getArgument(4, String.class))
+                                .build()
                 );
         given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, TbAbstractAlarmNodeConfiguration.ALARM_DETAILS_BUILD_TBEL_TEMPLATE)).willReturn(alarmDetailsScriptMock);
 
@@ -317,7 +322,12 @@ class TbCreateAlarmNodeTest {
 
         var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
 
-        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50, \"alarmType\": \"" + alarmType + "\"}");
+        var incomingMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(msgOriginator)
+                .copyMetaData(metadata)
+                .data("{\"temperature\": 50, \"alarmType\": \"" + alarmType + "\"}")
+                .build();
 
         var existingClearedAlarm = Alarm.builder()
                 .tenantId(tenantId)
@@ -393,12 +403,12 @@ class TbCreateAlarmNodeTest {
         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))
+                .willAnswer(answer -> answer.getArgument(0, TbMsg.class).transform()
+                                .type(answer.getArgument(1, TbMsgType.class))
+                                .originator(answer.getArgument(2, EntityId.class))
+                                .metaData(answer.getArgument(3, TbMsgMetaData.class))
+                                .data(answer.getArgument(4, String.class))
+                                .build()
                 );
         given(ctxMock.createScriptEngine(ScriptLanguage.JS, config.getAlarmDetailsBuildJs())).willReturn(alarmDetailsScriptMock);
 
@@ -508,7 +518,12 @@ class TbCreateAlarmNodeTest {
 
         var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
 
-        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50, \"alarmSeverity\": \"" + newAlarmSeverity.name() + "\"}");
+        var incomingMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(msgOriginator)
+                .copyMetaData(metadata)
+                .data("{\"temperature\": 50, \"alarmSeverity\": \"" + newAlarmSeverity.name() + "\"}")
+                .build();
 
         var existingAlarmId = new AlarmId(Uuids.timeBased());
         var existingActiveAlarm = Alarm.builder()
@@ -583,12 +598,12 @@ class TbCreateAlarmNodeTest {
         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))
+                .willAnswer(answer -> answer.getArgument(0, TbMsg.class).transform()
+                                .type(answer.getArgument(1, TbMsgType.class))
+                                .originator(answer.getArgument(2, EntityId.class))
+                                .metaData(answer.getArgument(3, TbMsgMetaData.class))
+                                .data(answer.getArgument(4, String.class))
+                                .build()
                 );
         given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
 
@@ -680,7 +695,12 @@ class TbCreateAlarmNodeTest {
 
         var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
 
-        var incomingMsg = TbMsg.newMsg(TbMsgType.ALARM, msgOriginator, metadata, JacksonUtil.toString(alarmFromIncomingMessage));
+        var incomingMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(msgOriginator)
+                .copyMetaData(metadata)
+                .data(JacksonUtil.toString(alarmFromIncomingMessage))
+                .build();
 
         var existingClearedAlarm = Alarm.builder()
                 .tenantId(tenantId)
@@ -755,12 +775,12 @@ class TbCreateAlarmNodeTest {
         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))
+                .willAnswer(answer -> answer.getArgument(0, TbMsg.class).transform()
+                                .type(answer.getArgument(1, TbMsgType.class))
+                                .originator(answer.getArgument(2, EntityId.class))
+                                .metaData(answer.getArgument(3, TbMsgMetaData.class))
+                                .data(answer.getArgument(4, String.class))
+                                .build()
                 );
         given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
 
@@ -867,7 +887,12 @@ class TbCreateAlarmNodeTest {
                 .details(newAlarmDetails)
                 .build();
 
-        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, JacksonUtil.toString(alarmFromIncomingMessage));
+        var incomingMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(msgOriginator)
+                .copyMetaData(metadata)
+                .data(JacksonUtil.toString(alarmFromIncomingMessage))
+                .build();
 
         var existingAlarmId = new AlarmId(Uuids.timeBased());
         var existingActiveAlarm = Alarm.builder()
@@ -942,12 +967,12 @@ class TbCreateAlarmNodeTest {
         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))
+                .willAnswer(answer -> answer.getArgument(0, TbMsg.class).transform()
+                                .type(answer.getArgument(1, TbMsgType.class))
+                                .originator(answer.getArgument(2, EntityId.class))
+                                .metaData(answer.getArgument(3, TbMsgMetaData.class))
+                                .data(answer.getArgument(4, String.class))
+                                .build()
                 );
         given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
 
@@ -1048,7 +1073,12 @@ class TbCreateAlarmNodeTest {
                 .details(alarmDetails)
                 .build();
 
-        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, JacksonUtil.toString(alarmFromIncomingMessage));
+        var incomingMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(msgOriginator)
+                .copyMetaData(metadata)
+                .data(JacksonUtil.toString(alarmFromIncomingMessage))
+                .build();
 
         var existingAlarmId = new AlarmId(Uuids.timeBased());
         var existingActiveAlarm = Alarm.builder()
@@ -1123,12 +1153,12 @@ class TbCreateAlarmNodeTest {
         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))
+                .willAnswer(answer -> answer.getArgument(0, TbMsg.class).transform()
+                                .type(answer.getArgument(1, TbMsgType.class))
+                                .originator(answer.getArgument(2, EntityId.class))
+                                .metaData(answer.getArgument(3, TbMsgMetaData.class))
+                                .data(answer.getArgument(4, String.class))
+                                .build()
                 );
         given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
 
@@ -1189,7 +1219,12 @@ class TbCreateAlarmNodeTest {
         // GIVEN
         config = config.defaultConfiguration();
 
-        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50}");
+        var incomingMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(msgOriginator)
+                .copyMetaData(metadata)
+                .data("{\"temperature\": 50}")
+                .build();
 
         given(ctxMock.getTenantId()).willReturn(tenantId);
         given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
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 86381634ac..cf4eec3072 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
@@ -439,7 +439,9 @@ public class TbCreateRelationNodeTest extends AbstractRuleNodeUpgradeTest {
         var md = getMetadataWithNameTemplate();
         var msg = getTbMsg(originatorId, md);
 
-        var msgAfterOriginatorChanged = TbMsg.transformMsgOriginator(msg, originatorId);
+        var msgAfterOriginatorChanged = msg.transform()
+                .originator(originatorId)
+                .build();
         when(ctxMock.transformMsgOriginator(any(), any())).thenReturn(msgAfterOriginatorChanged);
 
         // WHEN
@@ -486,7 +488,12 @@ public class TbCreateRelationNodeTest extends AbstractRuleNodeUpgradeTest {
         when(ctxMock.getRelationService()).thenReturn(relationServiceMock);
 
         var mockMethodCallsMap = mockEntityServiceCallsCreateEntityIfNotExistsEnabled();
-        var entityCreatedMsg = TbMsg.newMsg(TbMsgType.ENTITY_CREATED, entityId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        var entityCreatedMsg = TbMsg.newMsg()
+                .type(TbMsgType.ENTITY_CREATED)
+                .originator(entityId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         mockMethodCallsMap.get(entityType).accept(entity, entityCreatedMsg);
 
         when(relationServiceMock.checkRelationAsync(any(), any(), any(), any(), any())).thenReturn(Futures.immediateFuture(false));
@@ -676,7 +683,12 @@ public class TbCreateRelationNodeTest extends AbstractRuleNodeUpgradeTest {
     }
 
     private TbMsg getTbMsg(EntityId originator, TbMsgMetaData metaData) {
-        return TbMsg.newMsg(TbMsgType.NA, originator, metaData, TbMsg.EMPTY_JSON_OBJECT);
+        return TbMsg.newMsg()
+                .type(TbMsgType.NA)
+                .originator(originator)
+                .copyMetaData(metaData)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
     }
 
     private TbMsgMetaData getMetadataWithNameTemplate() {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
index 55461bdd7b..ac530bd93b 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
@@ -560,7 +560,12 @@ public class TbDeleteRelationNodeTest extends AbstractRuleNodeUpgradeTest {
     }
 
     private TbMsg getTbMsg(EntityId originator, TbMsgMetaData metaData) {
-        return TbMsg.newMsg(TbMsgType.NA, originator, metaData, TbMsg.EMPTY_JSON_OBJECT);
+        return TbMsg.newMsg()
+                .type(TbMsgType.NA)
+                .originator(originator)
+                .copyMetaData(metaData)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
     }
 
     private TbMsgMetaData getMetadataWithNameTemplate() {
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 9b3d2dc29b..6dff2b90b0 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
@@ -85,7 +85,12 @@ public class TbDeviceStateNodeTest {
         metaData.putValue("ts", String.valueOf(METADATA_TS));
         var data = JacksonUtil.newObjectNode();
         data.put("humidity", 58.3);
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, JacksonUtil.toString(data));
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(JacksonUtil.toString(data))
+                .build();
     }
 
     @BeforeEach
@@ -207,7 +212,12 @@ public class TbDeviceStateNodeTest {
                 return unsupportedType;
             }
         };
-        var msg = TbMsg.newMsg(TbMsgType.ENTITY_CREATED, nonDeviceOriginator, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.ENTITY_CREATED)
+                .originator(nonDeviceOriginator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -236,7 +246,13 @@ public class TbDeviceStateNodeTest {
         given(ctxMock.getDeviceStateManager()).willReturn(deviceStateManagerMock);
 
         long msgTs = METADATA_TS + 1;
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT, msgTs);
+        msg = TbMsg.newMsg()
+                .ts(msgTs)
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbLogNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbLogNodeTest.java
index 7d915f1cc9..70ebc8dbef 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbLogNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbLogNodeTest.java
@@ -50,7 +50,12 @@ public class TbLogNodeTest {
         TbLogNode node = new TbLogNode();
         String data = "{\"key\": \"value\"}";
         TbMsgMetaData metaData = new TbMsgMetaData(Map.of("mdKey1", "mdValue1", "mdKey2", "23"));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, metaData, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(TenantId.SYS_TENANT_ID)
+                .copyMetaData(metaData)
+                .data(data)
+                .build();
 
         String logMessage = node.toLogMessage(msg);
         log.info(logMessage);
@@ -66,7 +71,12 @@ public class TbLogNodeTest {
     void givenEmptyDataMsg_whenToLog_thenReturnString() {
         TbLogNode node = new TbLogNode();
         TbMsgMetaData metaData = new TbMsgMetaData(Collections.emptyMap());
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, metaData, "");
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(TenantId.SYS_TENANT_ID)
+                .copyMetaData(metaData)
+                .data("")
+                .build();
 
         String logMessage = node.toLogMessage(msg);
         log.info(logMessage);
@@ -82,7 +92,12 @@ public class TbLogNodeTest {
     void givenNullDataMsg_whenToLog_thenReturnString() {
         TbLogNode node = new TbLogNode();
         TbMsgMetaData metaData = new TbMsgMetaData(Collections.emptyMap());
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, metaData, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(TenantId.SYS_TENANT_ID)
+                .copyMetaData(metaData)
+                .data(null)
+                .build();
 
         String logMessage = node.toLogMessage(msg);
         log.info(logMessage);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbMsgCountNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbMsgCountNodeTest.java
index e1f020f5ff..9e5f744b53 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbMsgCountNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbMsgCountNodeTest.java
@@ -63,7 +63,12 @@ public class TbMsgCountNodeTest {
     private final DeviceId DEVICE_ID = new DeviceId(UUID.fromString("1b21c7cc-0c9e-4ab1-b867-99451599e146"));
     private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("04dfbd38-10e5-47b7-925f-11e795db89e1"));
 
-    private final TbMsg tickMsg = TbMsg.newMsg(TbMsgType.MSG_COUNT_SELF_MSG, RULE_NODE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
+    private final TbMsg tickMsg = TbMsg.newMsg()
+            .type(TbMsgType.MSG_COUNT_SELF_MSG)
+            .originator(RULE_NODE_ID)
+            .copyMetaData(TbMsgMetaData.EMPTY)
+            .data(TbMsg.EMPTY_STRING)
+            .build();
 
     private ScheduledExecutorService executorService;
     private TbMsgCountNode node;
@@ -120,7 +125,12 @@ public class TbMsgCountNodeTest {
 
         var expectedProcessedMsgs = new ArrayList<TbMsg>();
         for (int i = 0; i < msgCount; i++) {
-            var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
+            var msg = TbMsg.newMsg()
+                    .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                    .originator(DEVICE_ID)
+                    .copyMetaData(TbMsgMetaData.EMPTY)
+                    .data(TbMsg.EMPTY_STRING)
+                    .build();
             if (msgWithCounterSent.get()) {
                 break;
             }
@@ -142,7 +152,12 @@ public class TbMsgCountNodeTest {
         then(ctxMock).should().enqueueForTellNext(msgWithCounterCaptor.capture(), eq(TbNodeConnectionType.SUCCESS));
         TbMsg resultedMsg = msgWithCounterCaptor.getValue();
         String expectedData = "{\"messageCount_tb-rule-engine\":" + currentMsgNumber + "}";
-        TbMsg expectedMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TENANT_ID, TbMsgMetaData.EMPTY, expectedData);
+        TbMsg expectedMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(TENANT_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(expectedData)
+                .build();
         assertThat(resultedMsg).usingRecursiveComparison()
                 .ignoringFields("id", "ts", "ctx", "metaData")
                 .isEqualTo(expectedMsg);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNodeTest.java
index 7df2a982de..eae95e7025 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNodeTest.java
@@ -185,7 +185,12 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad
 
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         assertThatThrownBy(() -> node.onMsg(ctxMock, msg))
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("Invalid message structure, it is not a JSON Object: " + null);
@@ -206,7 +211,12 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad
                   "humidity": 77
                 }
                 """;
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(data)
+                .build();
         assertThatThrownBy(() -> node.onMsg(ctxMock, msg))
                 .isInstanceOf(RuntimeException.class)
                 .hasMessage("Message data doesn't contain key: 'temp'!");
@@ -227,7 +237,12 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad
                 "temp": [value]
                 }
                 """;
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(data)
+                .build();
         assertThatThrownBy(() -> node.onMsg(ctxMock, msg))
                 .isInstanceOf(RuntimeException.class)
                 .hasMessage("Message data key: 'temp' with value: '[\"value\"]' is not a JSON Object or JSON Primitive!");
@@ -249,7 +264,12 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad
         mockSubmittingCassandraTask();
 
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(sessionMock).should().prepare(expectedQuery);
@@ -299,7 +319,12 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad
                     }
                 }
                 """;
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(data)
+                .build();
         node.onMsg(ctxMock, msg);
 
         verifySettingStatementBuilder();
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
index 8abef77289..d7858e5ceb 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
@@ -294,7 +294,12 @@ class TbUnassignFromCustomerNodeTest extends AbstractRuleNodeUpgradeTest {
     }
 
     private TbMsg getTbMsg(EntityId originator) {
-        return TbMsg.newMsg(TbMsgType.NA, originator, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        return TbMsg.newMsg()
+                .type(TbMsgType.NA)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
     }
 
     private static EntityId toOriginator(EntityType type) {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeTest.java
index 14ae9bef20..0afa3804b9 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeTest.java
@@ -145,7 +145,12 @@ public class TbAwsLambdaNodeTest {
         config.setFunctionName(functionName);
         config.setQualifier(qualifier);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metadata, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(data)
+                .build();
 
         InvokeRequest request = createInvokeRequest(msg);
         String requestIdStr = "a124af57-e7c3-4ebb-83bf-b09ff86eaa23";
@@ -171,7 +176,10 @@ public class TbAwsLambdaNodeTest {
         assertThat(invokeRequestCaptor.getValue().getQualifier()).isEqualTo(expectedQualifier);
         TbMsgMetaData resultMsgMetadata = metadata.copy();
         resultMsgMetadata.putValue("requestId", requestIdStr);
-        TbMsg resultedMsg = TbMsg.transformMsg(msg, resultMsgMetadata, funcResponsePayload);
+        TbMsg resultedMsg = msg.transform()
+                .metaData(resultMsgMetadata)
+                .data(funcResponsePayload)
+                .build();
         assertThat(msgCaptor.getValue()).usingRecursiveComparison()
                 .ignoringFields("ctx")
                 .isEqualTo(resultedMsg);
@@ -197,7 +205,12 @@ public class TbAwsLambdaNodeTest {
         init();
         config.setTellFailureIfFuncThrowsExc(true);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_ARRAY);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_ARRAY)
+                .build();
         InvokeRequest request = createInvokeRequest(msg);
         String requestIdStr = "a124af57-e7c3-4ebb-83bf-b09ff86eaa23";
         String errorMsg = "Unhandled exception from function";
@@ -221,7 +234,9 @@ public class TbAwsLambdaNodeTest {
         verify(ctx).tellFailure(msgCaptor.capture(), throwableCaptor.capture());
 
         var metadata = Map.of("error", RuntimeException.class + ": " + errorMsg, "requestId", requestIdStr);
-        TbMsg resultedMsg = TbMsg.transformMsgMetadata(msg, new TbMsgMetaData(metadata));
+        TbMsg resultedMsg = msg.transform()
+                .metaData(new TbMsgMetaData(metadata))
+                .build();
 
         assertThat(msgCaptor.getValue()).usingRecursiveComparison()
                 .ignoringFields("ctx")
@@ -233,7 +248,12 @@ public class TbAwsLambdaNodeTest {
     public void givenExceptionWasThrownInsideFunctionAndTellFailureIfFuncThrowsExcIsFalse_whenOnMsg_thenTellSuccess() {
         init();
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         InvokeRequest request = createInvokeRequest(msg);
         String requestIdStr = "e83dfbc4-68d5-441c-8ee9-289959a30d3b";
         String payload = "{\"errorMessage\":\"Something went wrong\",\"errorType\":\"Exception\",\"requestId\":\"" + requestIdStr + "\"}";
@@ -255,7 +275,10 @@ public class TbAwsLambdaNodeTest {
         verify(ctx).tellSuccess(msgCaptor.capture());
 
         Map<String, String> metadata = Map.of("requestId", requestIdStr);
-        TbMsg resultedMsg = TbMsg.transformMsg(msg, new TbMsgMetaData(metadata), payload);
+        TbMsg resultedMsg = msg.transform()
+                .metaData(new TbMsgMetaData(metadata))
+                .data(payload)
+                .build();
 
         assertThat(msgCaptor.getValue()).usingRecursiveComparison()
                 .ignoringFields("ctx")
@@ -266,7 +289,12 @@ public class TbAwsLambdaNodeTest {
     public void givenPayloadFromResultIsNull_whenOnMsg_thenTellFailure() {
         init();
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         InvokeRequest request = createInvokeRequest(msg);
         String requestIdStr = "12bbb074-e2fc-4381-8f28-d4bd235103d5";
         String errorMsg = "Payload from result of AWS Lambda function execution is null.";
@@ -289,7 +317,9 @@ public class TbAwsLambdaNodeTest {
         verify(ctx).tellFailure(msgCaptor.capture(), throwableCaptor.capture());
 
         var metadata = Map.of("error", RuntimeException.class + ": " + errorMsg, "requestId", requestIdStr);
-        TbMsg resultedMsg = TbMsg.transformMsgMetadata(msg, new TbMsgMetaData(metadata));
+        TbMsg resultedMsg = msg.transform()
+                .metaData(new TbMsgMetaData(metadata))
+                .build();
 
         assertThat(msgCaptor.getValue()).usingRecursiveComparison()
                 .ignoringFields("ctx")
@@ -300,7 +330,12 @@ public class TbAwsLambdaNodeTest {
     @Test
     public void givenExceptionWasThrownOnAWS_whenOnMsg_thenTellFailure() {
         init();
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         InvokeRequest request = createInvokeRequest(msg);
 
         String errorMsg = "Simulated error";
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sns/TbSnsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sns/TbSnsNodeTest.java
index eaa20e7b59..e085857f3d 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sns/TbSnsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sns/TbSnsNodeTest.java
@@ -105,7 +105,12 @@ class TbSnsNodeTest {
         given(publishResultMock.getSdkResponseMetadata()).willReturn(responseMetadataMock);
         given(responseMetadataMock.getRequestId()).willReturn(requestId);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(data)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should().ack(msg);
@@ -143,7 +148,12 @@ class TbSnsNodeTest {
         ListenableFuture<TbMsg> failedFuture = Futures.immediateFailedFuture(new RuntimeException(errorMsg));
         given(listeningExecutor.executeAsync(any(Callable.class))).willReturn(failedFuture);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should(never()).enqueueForTellNext(any(), any(String.class));
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNodeTest.java
index e8238ce5af..3da7f3d190 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNodeTest.java
@@ -107,7 +107,12 @@ class TbSqsNodeTest {
 
         mockSendingMsgRequest();
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(data)
+                .build();
         node.onMsg(ctxMock, msg);
 
         SendMessageRequest sendMsgRequest = new SendMessageRequest()
@@ -143,7 +148,12 @@ class TbSqsNodeTest {
 
         mockSendingMsgRequest();
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(data)
+                .build();
         node.onMsg(ctxMock, msg);
 
         Map<String, MessageAttributeValue> messageAttributes = new HashMap<>();
@@ -186,7 +196,12 @@ class TbSqsNodeTest {
         given(sendMessageResultMock.getMD5OfMessageAttributes()).willReturn(messageAttributesMd5);
         given(sendMessageResultMock.getSequenceNumber()).willReturn(sequenceNumber);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should().ack(msg);
@@ -221,7 +236,12 @@ class TbSqsNodeTest {
         ListenableFuture<TbMsg> failedFuture = Futures.immediateFailedFuture(new RuntimeException(errorMsg));
         given(listeningExecutor.executeAsync(any(Callable.class))).willReturn(failedFuture);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should(never()).enqueueForTellNext(any(), any(String.class));
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeTest.java
index 53b8e5f814..cd5498c5d8 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeTest.java
@@ -190,7 +190,12 @@ public class TbMsgGeneratorNodeTest extends AbstractRuleNodeUpgradeTest {
         given(ctxMock.createScriptEngine(any(), any(), any(), any(), any())).willReturn(scriptEngineMock);
 
         // creation of tickMsg
-        TbMsg tickMsg = TbMsg.newMsg(TbMsgType.GENERATOR_NODE_SELF_MSG, RULE_NODE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
+        TbMsg tickMsg = TbMsg.newMsg()
+                .type(TbMsgType.GENERATOR_NODE_SELF_MSG)
+                .originator(RULE_NODE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         given(ctxMock.newMsg(null, TbMsgType.GENERATOR_NODE_SELF_MSG, RULE_NODE_ID, null, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING)).willReturn(tickMsg);
 
         // invocation of tellSelf() method
@@ -203,16 +208,31 @@ public class TbMsgGeneratorNodeTest extends AbstractRuleNodeUpgradeTest {
         }).given(ctxMock).tellSelf(any(), any(Long.class));
 
         // creation of first message
-        TbMsg firstMsg = TbMsg.newMsg(TbMsg.EMPTY_STRING, RULE_NODE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg firstMsg = TbMsg.newMsg()
+                .type(TbMsg.EMPTY_STRING)
+                .originator(RULE_NODE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         given(ctxMock.newMsg(null, TbMsg.EMPTY_STRING, RULE_NODE_ID, null, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT)).willReturn(firstMsg);
 
         // creation of generated message
         TbMsgMetaData metaData = new TbMsgMetaData(Map.of("data", "40"));
-        TbMsg generatedMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, RULE_NODE_ID, metaData, "{ \"temp\": 42, \"humidity\": 77 }");
+        TbMsg generatedMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(RULE_NODE_ID)
+                .copyMetaData(metaData)
+                .data("{ \"temp\": 42, \"humidity\": 77 }")
+                .build();
         given(scriptEngineMock.executeGenerateAsync(any())).willReturn(Futures.immediateFuture(generatedMsg));
 
         // creation of prev message
-        TbMsg prevMsg = TbMsg.newMsg(generatedMsg.getType(), RULE_NODE_ID, generatedMsg.getMetaData(), generatedMsg.getData());
+        TbMsg prevMsg = TbMsg.newMsg()
+                .type(generatedMsg.getType())
+                .originator(RULE_NODE_ID)
+                .copyMetaData(generatedMsg.getMetaData())
+                .data(generatedMsg.getData())
+                .build();
         given(ctxMock.newMsg(null, generatedMsg.getType(), RULE_NODE_ID, null, generatedMsg.getMetaData(), generatedMsg.getData())).willReturn(prevMsg);
 
         // WHEN
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 621a1a4ba2..602983398f 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
@@ -85,8 +85,13 @@ public class TbMsgPushToEdgeNodeTest {
         Mockito.when(ctx.getEdgeService()).thenReturn(edgeService);
         Mockito.when(edgeService.findRelatedEdgeIdsByEntityId(tenantId, deviceId, new PageLink(RELATED_EDGES_CACHE_ITEMS))).thenReturn(new PageData<>());
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, TbMsg.EMPTY_JSON_OBJECT, null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -106,8 +111,13 @@ public class TbMsgPushToEdgeNodeTest {
         PageData<EdgeId> edgePageData = new PageData<>(List.of(edgeId), 1, 1, false);
         Mockito.when(edgeService.findRelatedEdgeIdsByEntityId(tenantId, userId, new PageLink(RELATED_EDGES_CACHE_ITEMS))).thenReturn(edgePageData);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.ATTRIBUTES_UPDATED, userId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, TbMsg.EMPTY_JSON_OBJECT, null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.ATTRIBUTES_UPDATED)
+                .originator(userId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -137,8 +147,13 @@ public class TbMsgPushToEdgeNodeTest {
         Mockito.when(ctx.getDbCallbackExecutor()).thenReturn(dbCallbackExecutor);
         Mockito.when(edgeEventService.saveAsync(any())).thenReturn(SettableFuture.create());
 
-        TbMsg msg = TbMsg.newMsg(event, new EdgeId(UUID.randomUUID()), metaData,
-                TbMsgDataType.JSON, "{\"lastConnectTs\":1}", null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(event)
+                .originator(new EdgeId(UUID.randomUUID()))
+                .copyMetaData(metaData)
+                .dataType(TbMsgDataType.JSON)
+                .data("{\"lastConnectTs\":1}")
+                .build();
 
         node.onMsg(ctx, msg);
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
index f072eb1723..15519e18ee 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
@@ -118,7 +118,13 @@ class TbAssetTypeSwitchNodeTest {
     }
 
     private TbMsg getTbMsg(EntityId entityId) {
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT, callback);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .callback(callback)
+                .build();
     }
 
 }
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 5b71db5dfb..0068289080 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
@@ -174,7 +174,12 @@ class TbCheckAlarmStatusNodeTest {
     }
 
     private TbMsg getTbMsg(String msgData) {
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, msgData);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(msgData)
+                .build();
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckMessageNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckMessageNodeTest.java
index ce8afbbe99..9ecac1a271 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckMessageNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckMessageNodeTest.java
@@ -44,7 +44,12 @@ import static org.mockito.Mockito.verify;
 class TbCheckMessageNodeTest {
 
     private static final DeviceId DEVICE_ID = new DeviceId(UUID.randomUUID());
-    private static final TbMsg EMPTY_POST_ATTRIBUTES_MSG = TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+    private static final TbMsg EMPTY_POST_ATTRIBUTES_MSG = TbMsg.newMsg()
+            .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+            .originator(DEVICE_ID)
+            .copyMetaData(TbMsgMetaData.EMPTY)
+            .data(TbMsg.EMPTY_JSON_OBJECT)
+            .build();
 
     private TbCheckMessageNode node;
 
@@ -196,7 +201,12 @@ class TbCheckMessageNodeTest {
         metadata.putValue(DataConstants.DEVICE_NAME, "Test Device");
         metadata.putValue(DataConstants.DEVICE_TYPE, DataConstants.DEFAULT_DEVICE_TYPE);
         metadata.putValue("ts", String.valueOf(System.currentTimeMillis()));
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, DEVICE_ID, metadata, data);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(data)
+                .build();
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
index e445b93455..72a78b73a0 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
@@ -66,7 +66,12 @@ class TbCheckRelationNodeTest extends AbstractRuleNodeUpgradeTest {
     private final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
     private final DeviceId ORIGINATOR_ID = new DeviceId(UUID.randomUUID());
     private final TestDbCallbackExecutor DB_EXECUTOR = new TestDbCallbackExecutor();
-    private final TbMsg EMPTY_POST_ATTRIBUTES_MSG = TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, ORIGINATOR_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+    private final TbMsg EMPTY_POST_ATTRIBUTES_MSG = TbMsg.newMsg()
+            .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+            .originator(ORIGINATOR_ID)
+            .copyMetaData(TbMsgMetaData.EMPTY)
+            .data(TbMsg.EMPTY_JSON_OBJECT)
+            .build();
 
     private TbCheckRelationNode node;
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
index 707df26d0f..31bddccb21 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
@@ -118,6 +118,12 @@ class TbDeviceTypeSwitchNodeTest {
     }
 
     private TbMsg getTbMsg(EntityId entityId) {
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT, callback);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .callback(callback)
+                .build();
     }
 }
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 b991b7b220..79bd3fa710 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
@@ -59,7 +59,15 @@ public class TbJsFilterNodeTest {
     @Test
     public void falseEvaluationDoNotSendMsg() throws TbNodeException {
         initWithScript();
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, null, TbMsgMetaData.EMPTY, TbMsgDataType.JSON, TbMsg.EMPTY_JSON_OBJECT, ruleChainId, ruleNodeId);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(null)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .ruleChainId(ruleChainId)
+                .ruleNodeId(ruleNodeId)
+                .build();
         when(scriptEngine.executeFilterAsync(msg)).thenReturn(Futures.immediateFuture(false));
 
         node.onMsg(ctx, msg);
@@ -71,7 +79,15 @@ public class TbJsFilterNodeTest {
     public void exceptionInJsThrowsException() throws TbNodeException {
         initWithScript();
         TbMsgMetaData metaData = new TbMsgMetaData();
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, null, metaData, TbMsgDataType.JSON, TbMsg.EMPTY_JSON_OBJECT, ruleChainId, ruleNodeId);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(null)
+                .copyMetaData(metaData)
+                .dataType(TbMsgDataType.JSON)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .ruleChainId(ruleChainId)
+                .ruleNodeId(ruleNodeId)
+                .build();
         when(scriptEngine.executeFilterAsync(msg)).thenReturn(Futures.immediateFailedFuture(new ScriptException("error")));
 
 
@@ -83,7 +99,15 @@ public class TbJsFilterNodeTest {
     public void metadataConditionCanBeTrue() throws TbNodeException {
         initWithScript();
         TbMsgMetaData metaData = new TbMsgMetaData();
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, null, metaData, TbMsgDataType.JSON, TbMsg.EMPTY_JSON_OBJECT, ruleChainId, ruleNodeId);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(null)
+                .copyMetaData(metaData)
+                .dataType(TbMsgDataType.JSON)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .ruleChainId(ruleChainId)
+                .ruleNodeId(ruleNodeId)
+                .build();
         when(scriptEngine.executeFilterAsync(msg)).thenReturn(Futures.immediateFuture(true));
 
         node.onMsg(ctx, msg);
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 ff7a40644b..74cd7e4f4f 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
@@ -59,7 +59,15 @@ public class TbJsSwitchNodeTest {
         metaData.putValue("humidity", "99");
         String rawJson = "{\"name\": \"Vit\", \"passed\": 5}";
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, null, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(null)
+                .copyMetaData(metaData)
+                .dataType(TbMsgDataType.JSON)
+                .data(rawJson)
+                .ruleChainId(ruleChainId)
+                .ruleNodeId(ruleNodeId)
+                .build();
         when(scriptEngine.executeSwitchAsync(msg)).thenReturn(Futures.immediateFuture(Sets.newHashSet("one", "three")));
 
         node.onMsg(ctx, msg);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeTest.java
index c760a295e2..2d9cf75e22 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeTest.java
@@ -97,7 +97,12 @@ class TbMsgTypeFilterNodeTest {
     }
 
     private TbMsg getTbMsg(EntityId entityId, TbMsgType msgType) {
-        return TbMsg.newMsg(msgType, entityId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        return TbMsg.newMsg()
+                .type(msgType)
+                .originator(entityId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNodeTest.java
index cc771de1d1..1d8bb285af 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNodeTest.java
@@ -89,7 +89,12 @@ class TbMsgTypeSwitchNodeTest {
     }
 
     private TbMsg getTbMsg(TbMsgType msgType) {
-        return TbMsg.newMsg(msgType, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        return TbMsg.newMsg()
+                .type(msgType)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeTest.java
index b1f6c59407..378e5d53bf 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeTest.java
@@ -96,7 +96,12 @@ class TbOriginatorTypeFilterNodeTest {
     }
 
     private TbMsg getTbMsg(EntityId entityId) {
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNodeTest.java
index fd67fa16b8..4782c1bdee 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNodeTest.java
@@ -90,7 +90,12 @@ class TbOriginatorTypeSwitchNodeTest {
     }
 
     private TbMsg getTbMsg(EntityId entityId) {
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbAckNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbAckNodeTest.java
index 49e92f2d74..f712a607d0 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbAckNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbAckNodeTest.java
@@ -67,7 +67,12 @@ public class TbAckNodeTest {
     public void givenMsg_whenOnMsg_thenAckAndTellSuccess() throws TbNodeException {
         node.init(ctxMock, nodeConfiguration);
         DeviceId deviceId = new DeviceId(UUID.fromString("5770153d-6ca2-4447-8a54-5d8a4538e052"));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should().ack(msg);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java
index e596c71d1e..8c3c72fb2d 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java
@@ -87,7 +87,12 @@ public class TbCheckpointNodeTest extends AbstractRuleNodeUpgradeTest {
         given(ctxMock.getQueueName()).willReturn(queueName);
 
         node.init(ctxMock, nodeConfiguration);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<Runnable> onSuccess = ArgumentCaptor.forClass(Runnable.class);
@@ -101,7 +106,12 @@ public class TbCheckpointNodeTest extends AbstractRuleNodeUpgradeTest {
         given(ctxMock.getQueueName()).willReturn(DataConstants.HP_QUEUE_NAME);
 
         node.init(ctxMock, nodeConfiguration);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<Consumer<Throwable>> onFailure = ArgumentCaptor.forClass(Consumer.class);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
index 680d106d1e..4457b3c671 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
@@ -300,6 +300,11 @@ public class TbRuleChainInputNodeTest extends AbstractRuleNodeUpgradeTest {
     }
 
     private TbMsg getMsg(EntityId entityId) {
-        return TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, entityId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(entityId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
     }
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNodeTest.java
index 5c678e5c50..49d24f579f 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNodeTest.java
@@ -74,7 +74,12 @@ public class TbRuleChainOutputNodeTest {
 
         node.init(ctxMock, nodeConfiguration);
         DeviceId deviceId = new DeviceId(UUID.fromString("f514da88-79b3-46da-9f02-1747c5e84f44"));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should().output(msg, "test");
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNodeTest.java
index 309023b3c6..49fc03f784 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNodeTest.java
@@ -118,7 +118,12 @@ class TbPubSubNodeTest {
         given(ctxMock.getExternalCallExecutor()).willReturn(executor);
 
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(data)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should().ack(msg);
@@ -133,7 +138,9 @@ class TbPubSubNodeTest {
         ArgumentCaptor<TbMsg> actualMsg = ArgumentCaptor.forClass(TbMsg.class);
         then(ctxMock).should().enqueueForTellNext(actualMsg.capture(), eq(TbNodeConnectionType.SUCCESS));
         metaData.putValue("messageId", messageId);
-        TbMsg expectedMsg = TbMsg.transformMsgMetadata(msg, metaData);
+        TbMsg expectedMsg = msg.transform()
+                .metaData(metaData)
+                .build();
         assertThat(actualMsg.getValue())
                 .usingRecursiveComparison()
                 .ignoringFields("ctx")
@@ -164,7 +171,12 @@ class TbPubSubNodeTest {
 
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
         TbMsgMetaData metadata = new TbMsgMetaData();
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metadata, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should(never()).ack(msg);
@@ -174,7 +186,9 @@ class TbPubSubNodeTest {
         ArgumentCaptor<TbMsg> actualMsg = ArgumentCaptor.forClass(TbMsg.class);
         then(ctxMock).should().tellSuccess(actualMsg.capture());
         metadata.putValue("messageId", messageId);
-        TbMsg expectedMsg = TbMsg.transformMsgMetadata(msg, metadata);
+        TbMsg expectedMsg = msg.transform()
+                .metaData(metadata)
+                .build();
         assertThat(actualMsg.getValue())
                 .usingRecursiveComparison()
                 .ignoringFields("ctx")
@@ -193,7 +207,12 @@ class TbPubSubNodeTest {
 
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
         TbMsgMetaData metaData = new TbMsgMetaData();
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should(never()).ack(any());
@@ -201,7 +220,9 @@ class TbPubSubNodeTest {
         ArgumentCaptor<Throwable> actualError = ArgumentCaptor.forClass(Throwable.class);
         then(ctxMock).should().tellFailure(actualMsg.capture(), actualError.capture());
         metaData.putValue("error", RuntimeException.class + ": " + errorMsg);
-        TbMsg expectedMsg = TbMsg.transformMsgMetadata(msg, metaData);
+        TbMsg expectedMsg = msg.transform()
+                .metaData(metaData)
+                .build();
         assertThat(actualMsg.getValue())
                 .usingRecursiveComparison()
                 .ignoringFields("ctx")
@@ -221,7 +242,12 @@ class TbPubSubNodeTest {
 
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
         TbMsgMetaData metaData = new TbMsgMetaData();
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should().ack(msg);
@@ -229,7 +255,9 @@ class TbPubSubNodeTest {
         ArgumentCaptor<Throwable> actualError = ArgumentCaptor.forClass(Throwable.class);
         then(ctxMock).should().enqueueForTellFailure(actualMsg.capture(), actualError.capture());
         metaData.putValue("error", RuntimeException.class + ": " + errorMsg);
-        TbMsg expectedMsg = TbMsg.transformMsgMetadata(msg, metaData);
+        TbMsg expectedMsg = msg.transform()
+                .metaData(metaData)
+                .build();
         assertThat(actualMsg.getValue())
                 .usingRecursiveComparison()
                 .ignoringFields("ctx")
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 a0b57ba948..872225243b 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
@@ -164,7 +164,12 @@ class TbGpsGeofencingActionNodeTest extends AbstractRuleNodeUpgradeTest {
 
     private TbMsg getTbMsg(EntityId entityId, TbMsgMetaData metadata, double latitude, double longitude) {
         String data = "{\"latitude\": " + latitude + ", \"longitude\": " + longitude + "}";
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, metadata, data);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(metadata)
+                .data(data)
+                .build();
     }
 
     private TbMsgMetaData getMetadataForNewVersionPolygonPerimeter() {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNodeTest.java
index 10968516e6..9a7a79b9ad 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNodeTest.java
@@ -448,11 +448,21 @@ class TbGpsGeofencingFilterNodeTest {
 
     private TbMsg getTbMsg(EntityId entityId, TbMsgMetaData metadata, double latitude, double longitude) {
         String data = "{\"latitude\": " + latitude + ", \"longitude\": " + longitude + "}";
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, metadata, data);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(metadata)
+                .data(data)
+                .build();
     }
 
     private TbMsg getEmptyArrayTbMsg(EntityId entityId) {
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_ARRAY);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_ARRAY)
+                .build();
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java
index add12dcec2..1d7635476e 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java
@@ -188,7 +188,12 @@ public class TbKafkaNodeTest {
         ReflectionTestUtils.setField(node, "initError", new ThingsboardKafkaClientError(errorMsg));
 
         // WHEN
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -212,7 +217,12 @@ public class TbKafkaNodeTest {
 
         // WHEN
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -232,7 +242,12 @@ public class TbKafkaNodeTest {
         // GIVEN
         config.setTopicPattern(topicPattern);
         config.setKeyPattern(keyPattern);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(data)
+                .build();
         String topic = TbNodeUtils.processPattern(topicPattern, msg);
         String key = TbNodeUtils.processPattern(keyPattern, msg);
 
@@ -278,7 +293,12 @@ public class TbKafkaNodeTest {
 
         // WHEN
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -303,7 +323,12 @@ public class TbKafkaNodeTest {
 
         // WHEN
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -331,7 +356,12 @@ public class TbKafkaNodeTest {
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
         TbMsgMetaData metaData = new TbMsgMetaData();
         metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -406,7 +436,9 @@ public class TbKafkaNodeTest {
         metaData.putValue("offset", String.valueOf(OFFSET));
         metaData.putValue("partition", String.valueOf(PARTITION));
         metaData.putValue("topic", expectedTopic);
-        TbMsg expectedMsg = TbMsg.transformMsgMetadata(originalMsg, metaData);
+        TbMsg expectedMsg = originalMsg.transform()
+                .metaData(metaData)
+                .build();
         assertThat(actualMsg)
                 .usingRecursiveComparison()
                 .ignoringFields("ctx")
@@ -416,7 +448,9 @@ public class TbKafkaNodeTest {
     private void verifyOutgoingFailureMsg(String errorMsg, TbMsg actualMsg, TbMsg originalMsg) {
         TbMsgMetaData metaData = originalMsg.getMetaData();
         metaData.putValue("error", RuntimeException.class + ": " + errorMsg);
-        TbMsg expectedMsg = TbMsg.transformMsgMetadata(originalMsg, metaData);
+        TbMsg expectedMsg = originalMsg.transform()
+                .metaData(metaData)
+                .build();
         assertThat(actualMsg).usingRecursiveComparison().ignoringFields("ctx").isEqualTo(expectedMsg);
     }
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeTest.java
index 5ea816a1eb..86d90ec9c0 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeTest.java
@@ -103,7 +103,12 @@ public class TbMsgToEmailNodeTest {
         }
 
         var msgDataStr = "{\"temperature\": " + EXPECTED_TEMPERATURE + "}";
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, md, msgDataStr);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(md)
+                .data(msgDataStr)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
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 ba81fbad20..63432afc37 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
@@ -34,10 +34,12 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.verification.Timeout;
 import org.thingsboard.common.util.AbstractListeningExecutor;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 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.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -46,8 +48,8 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
 import org.thingsboard.server.common.data.kv.DoubleDataEntry;
+import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
-import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.msg.TbMsgType;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
@@ -70,13 +72,13 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyDouble;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.assertArg;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.BDDMockito.willReturn;
 import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -173,7 +175,12 @@ public class TbMathNodeTest {
         metaData.putValue("key2", "argumentA");
         ObjectNode msgNode = JacksonUtil.newObjectNode()
                 .put("key3", "argumentB").put("argumentA", 2).put("argumentB", 2);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, msgNode.toString());
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(metaData)
+                .data(msgNode.toString())
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -181,7 +188,12 @@ public class TbMathNodeTest {
         metaData.putValue("key2", "argumentC");
         msgNode = JacksonUtil.newObjectNode()
                 .put("key3", "argumentD").put("argumentC", 4).put("argumentD", 3);
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, msgNode.toString());
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(metaData)
+                .data(msgNode.toString())
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -228,7 +240,12 @@ public class TbMathNodeTest {
                 new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "b")
         );
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", arg1).put("b", arg2).toString());
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.newObjectNode().put("a", arg1).put("b", arg2).toString())
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -291,7 +308,12 @@ public class TbMathNodeTest {
                 new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "a")
         );
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", arg1).toString());
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.newObjectNode().put("a", arg1).toString())
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -314,7 +336,12 @@ public class TbMathNodeTest {
                 new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "b")
         );
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString());
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString())
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -337,7 +364,12 @@ public class TbMathNodeTest {
                 new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "b")
         );
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString());
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString())
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -361,7 +393,12 @@ public class TbMathNodeTest {
                 new TbMathArgument(TbMathArgumentType.TIME_SERIES, "b")
         );
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().toString());
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.newObjectNode().toString())
+                .build();
 
         when(attributesService.find(tenantId, originator, AttributeScope.SERVER_SCOPE, "a"))
                 .thenReturn(Futures.immediateFuture(Optional.of(new BaseAttributeKvEntry(System.currentTimeMillis(), new DoubleDataEntry("a", 2.0)))));
@@ -389,7 +426,12 @@ public class TbMathNodeTest {
                 new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "a")
         );
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", 5).toString());
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.newObjectNode().put("a", 5).toString())
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -411,7 +453,12 @@ public class TbMathNodeTest {
                 new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "a")
         );
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", 5).toString());
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.newObjectNode().put("a", 5).toString())
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -433,16 +480,25 @@ public class TbMathNodeTest {
                 new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "a")
         );
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", 5).toString());
-
-        when(telemetryService.saveAttrAndNotify(any(), any(), any(AttributeScope.class), anyString(), anyDouble()))
-                .thenReturn(Futures.immediateFuture(null));
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.newObjectNode().put("a", 5).toString())
+                .build();
+        doAnswer(invocation -> {
+            AttributesSaveRequest request = invocation.getArgument(0);
+            request.getCallback().onSuccess(null);
+            return null;
+        }).when(telemetryService).saveAttributes(any(AttributesSaveRequest.class));
 
         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(), any(AttributeScope.class), anyString(), anyDouble());
+        verify(telemetryService, times(1)).saveAttributes(assertArg(request -> {
+            assertThat(request.getEntries()).singleElement().extracting(KvEntry::getValue).isInstanceOf(Double.class);
+        }));
 
         TbMsg resultMsg = msgCaptor.getValue();
         assertNotNull(resultMsg);
@@ -459,15 +515,26 @@ public class TbMathNodeTest {
                 new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "a")
         );
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", 5).toString());
-        when(telemetryService.saveAndNotify(any(), any(), any(TsKvEntry.class)))
-                .thenReturn(Futures.immediateFuture(null));
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.newObjectNode().put("a", 5).toString())
+                .build();
+        doAnswer(invocation -> {
+            TimeseriesSaveRequest request = invocation.getArgument(0);
+            request.getCallback().onSuccess(null);
+            return null;
+        }).when(telemetryService).saveTimeseries(any(TimeseriesSaveRequest.class));
 
         node.onMsg(ctx, msg);
 
         ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         verify(ctx, timeout(TIMEOUT)).tellSuccess(msgCaptor.capture());
-        verify(telemetryService, times(1)).saveAndNotify(any(), any(), any(TsKvEntry.class));
+        verify(telemetryService, times(1)).saveTimeseries(assertArg(request -> {
+            assertThat(request.getEntries()).size().isOne();
+            assertThat(request.getStrategy()).isEqualTo(TimeseriesSaveRequest.Strategy.SAVE_ALL);
+        }));
 
         TbMsg resultMsg = msgCaptor.getValue();
         assertNotNull(resultMsg);
@@ -484,15 +551,26 @@ public class TbMathNodeTest {
                 new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "a")
         );
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", 5).toString());
-        when(telemetryService.saveAndNotify(any(), any(), any(TsKvEntry.class)))
-                .thenReturn(Futures.immediateFuture(null));
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.newObjectNode().put("a", 5).toString())
+                .build();
+        doAnswer(invocation -> {
+            TimeseriesSaveRequest request = invocation.getArgument(0);
+            request.getCallback().onSuccess(null);
+            return null;
+        }).when(telemetryService).saveTimeseries(any(TimeseriesSaveRequest.class));
 
         node.onMsg(ctx, msg);
 
         ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         verify(ctx, timeout(TIMEOUT)).tellSuccess(msgCaptor.capture());
-        verify(telemetryService, times(1)).saveAndNotify(any(), any(), any(TsKvEntry.class));
+        verify(telemetryService, times(1)).saveTimeseries(assertArg(request -> {
+            assertThat(request.getEntries()).size().isOne();
+            assertThat(request.getStrategy()).isEqualTo(TimeseriesSaveRequest.Strategy.SAVE_ALL);
+        }));
 
         TbMsg resultMsg = msgCaptor.getValue();
         assertNotNull(resultMsg);
@@ -515,7 +593,12 @@ public class TbMathNodeTest {
                 new TbMathResult(TbMathArgumentType.MESSAGE_METADATA, "result", 3, false, false, null),
                 tbMathArgument
         );
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", 10).toString());
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.newObjectNode().put("a", 10).toString())
+                .build();
 
         node.onMsg(ctx, msg);
         ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
@@ -535,7 +618,12 @@ public class TbMathNodeTest {
                 new TbMathResult(TbMathArgumentType.TIME_SERIES, "result", 3, true, false, DataConstants.SERVER_SCOPE),
                 new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey")
         );
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", 10).toString());
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.newObjectNode().put("a", 10).toString())
+                .build();
         node.onMsg(ctx, msg);
 
         ArgumentCaptor<Throwable> tCaptor = ArgumentCaptor.forClass(Throwable.class);
@@ -550,7 +638,12 @@ public class TbMathNodeTest {
                 new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "a")
         );
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY,  TbMsg.EMPTY_JSON_ARRAY);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_ARRAY)
+                .build();
         node.onMsg(ctx, msg);
 
         ArgumentCaptor<Throwable> tCaptor = ArgumentCaptor.forClass(Throwable.class);
@@ -570,10 +663,20 @@ public class TbMathNodeTest {
         CountDownLatch slowProcessingLatch = new CountDownLatch(1);
 
         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()))
+                .mapToObj(x -> TbMsg.newMsg()
+                        .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                        .originator(originatorSlow)
+                        .copyMetaData(TbMsgMetaData.EMPTY)
+                        .data(JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString())
+                        .build())
                 .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()))
+                .mapToObj(x -> TbMsg.newMsg()
+                        .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                        .originator(originatorFast)
+                        .copyMetaData(TbMsgMetaData.EMPTY)
+                        .data(JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString())
+                        .build())
                 .toList();
 
         assertThat(slowMsgList.size()).as("slow msgs >= rule-dispatcher pool size").isGreaterThanOrEqualTo(RULE_DISPATCHER_POOL_SIZE);
@@ -640,7 +743,12 @@ public class TbMathNodeTest {
         CountDownLatch slowProcessingLatch = new CountDownLatch(1);
 
         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()))
+                .mapToObj(x -> TbMsg.newMsg()
+                        .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                        .originator(originatorSlow)
+                        .copyMetaData(TbMsgMetaData.EMPTY)
+                        .data(JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString())
+                        .build())
                 .collect(Collectors.toList());
 
         assertThat(slowMsgList.size()).as("slow msgs >= rule-dispatcher pool size").isGreaterThanOrEqualTo(RULE_DISPATCHER_POOL_SIZE);
@@ -713,7 +821,12 @@ public class TbMathNodeTest {
                 })
                 .toList();
         ctxNodes.forEach(ctxNode -> ruleEngineDispatcherExecutor.executeAsync(() -> ctxNode.getRight()
-                .onMsg(ctxNode.getLeft(), TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, "{\"a\":2,\"b\":2}"))));
+                .onMsg(ctxNode.getLeft(), TbMsg.newMsg()
+                        .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                        .originator(originator)
+                        .copyMetaData(TbMsgMetaData.EMPTY)
+                        .data("{\"a\":2,\"b\":2}")
+                        .build())));
         ctxNodes.forEach(ctxNode -> verify(ctxNode.getRight(), timeout(TIMEOUT)).onMsg(eq(ctxNode.getLeft()), any()));
         processingLatch.countDown();
 
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 1b2ff4f2bf..823b02fe59 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
@@ -169,7 +169,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
         // GIVEN
         node.init(ctxMock, nodeConfiguration);
         var msgData = "{\"pulseCounter\": 42}";
-        var msg = TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -184,7 +189,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
     public void givenInvalidMsgDataType_whenOnMsg_thenShouldTellNextOther() throws TbNodeException {
         // GIVEN
         node.init(ctxMock, nodeConfiguration);
-        var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_ARRAY);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_ARRAY)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -200,7 +210,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
     public void givenInputKeyIsNotPresent_whenOnMsg_thenShouldTellNextOther() throws TbNodeException {
         // GIVEN
         node.init(ctxMock, nodeConfiguration);
-        var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -224,7 +239,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
         mockFindLatestAsync(new BasicTsKvEntry(System.currentTimeMillis(), new DoubleDataEntry("temperature", 40.5)));
 
         var msgData = "{\"temperature\": 42,\"airPressure\":123}";
-        var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -254,7 +274,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
         mockFindLatestAsync(new BasicTsKvEntry(System.currentTimeMillis(), new LongDataEntry("temperature", 40L)));
 
         var msgData = "{\"temperature\": 42,\"airPressure\":123}";
-        var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -284,7 +309,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
         mockFindLatestAsync(new BasicTsKvEntry(System.currentTimeMillis(), new StringDataEntry("temperature", "40.0")));
 
         var msgData = "{\"temperature\": 42,\"airPressure\":123}";
-        var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -318,7 +348,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
         var msgData = "{\"temperature\": 42,\"airPressure\":123}";
         var firstMsgMetaData = new TbMsgMetaData();
         firstMsgMetaData.putValue("ts", String.valueOf(3L));
-        var firstMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, firstMsgMetaData, msgData);
+        var firstMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(firstMsgMetaData)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, firstMsg);
@@ -344,7 +379,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
 
         var secondMsgMetaData = new TbMsgMetaData();
         secondMsgMetaData.putValue("ts", String.valueOf(6L));
-        var secondMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, secondMsgMetaData, msgData);
+        var secondMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(secondMsgMetaData)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, secondMsg);
@@ -375,7 +415,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
         mockFindLatestAsync(new BasicTsKvEntry(System.currentTimeMillis(), new DoubleDataEntry("temperature", null)));
 
         var msgData = "{\"temperature\": 42,\"airPressure\":123}";
-        var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -403,7 +448,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -435,7 +485,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -459,7 +514,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -484,7 +544,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -509,7 +574,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
@@ -552,7 +622,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
 
         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);
+            return TbMsg.newMsg()
+                    .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                    .originator(DUMMY_DEVICE_ORIGINATOR)
+                    .copyMetaData(TbMsgMetaData.EMPTY)
+                    .data(msgData)
+                    .build();
         }).toList();
 
         CountDownLatch processingLatch = new CountDownLatch(tbMsgList.size());
@@ -597,7 +672,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(msgData)
+                .build();
 
         // WHEN
         node.onMsg(ctxMock, msg);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java
index 5cbe20fc5e..ecb9ab80ee 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java
@@ -173,7 +173,13 @@ public class TbFetchDeviceCredentialsNodeTest {
         final var metaData = new TbMsgMetaData(mdMap);
         final String data = "{\"TestAttribute_1\": \"humidity\", \"TestAttribute_2\": \"voltage\"}";
 
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, metaData, data, callbackMock);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(metaData)
+                .data(data)
+                .callback(callbackMock)
+                .build();
     }
 
 }
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 fb08dff8e2..22144ff32e 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
@@ -17,7 +17,6 @@ package org.thingsboard.rule.engine.metadata;
 
 import com.google.common.util.concurrent.Futures;
 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;
@@ -247,7 +246,12 @@ public class TbGetAttributesNodeTest extends AbstractRuleNodeUpgradeTest {
     public void givenFetchLatestTimeseriesToDataAndDataIsNotJsonObject_whenOnMsg_thenException() throws Exception {
         // GIVEN
         node = initNode(TbMsgSource.DATA, true, true);
-        var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, ORIGINATOR_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_ARRAY);
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(ORIGINATOR_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_ARRAY)
+                .build();
 
         // WHEN
         var exception = assertThrows(IllegalArgumentException.class, () -> node.onMsg(ctxMock, msg));
@@ -343,7 +347,12 @@ public class TbGetAttributesNodeTest extends AbstractRuleNodeUpgradeTest {
         msgMetaData.putValue("client_attr_metadata", "client_attr_3");
         msgMetaData.putValue("server_attr_metadata", "server_attr_3");
 
-        return TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, entityId, msgMetaData, JacksonUtil.toString(msgData));
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(entityId)
+                .copyMetaData(msgMetaData)
+                .data(JacksonUtil.toString(msgData))
+                .build();
     }
 
     private List<String> getAttributeNames(String prefix) {
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 894a538c80..e8e0b42a76 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
@@ -210,7 +210,12 @@ public class TbGetCustomerAttributeNodeTest {
     public void givenMsgDataIsNotAnJsonObjectAndFetchToData_whenOnMsg_thenException() {
         // GIVEN
         node.fetchTo = TbMsgSource.DATA;
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_ARRAY);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_ARRAY)
+                .build();
 
         // WHEN
         var exception = assertThrows(IllegalArgumentException.class, () -> node.onMsg(ctxMock, msg));
@@ -225,7 +230,12 @@ public class TbGetCustomerAttributeNodeTest {
         // GIVEN
         var userId = new UserId(UUID.randomUUID());
 
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, userId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(userId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
 
@@ -469,7 +479,12 @@ public class TbGetCustomerAttributeNodeTest {
 
         var msgData = "{\"temp\":42,\"humidity\":77,\"messageBodyPattern1\":\"targetKey2\",\"messageBodyPattern2\":\"sourceKey3\"}";
 
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, msgMetaData, msgData);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(msgMetaData)
+                .data(msgData)
+                .build();
     }
 
     @RequiredArgsConstructor
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
index fa4df10609..47c78bc106 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
@@ -159,7 +159,12 @@ public class TbGetCustomerDetailsNodeTest {
     public void givenMsgDataIsNotAnJsonObjectAndFetchToData_whenOnMsg_thenException() {
         // GIVEN
         node.fetchTo = TbMsgSource.DATA;
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_ARRAY);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_ARRAY)
+                .build();
 
         // WHEN
         var exception = assertThrows(IllegalArgumentException.class, () -> node.onMsg(ctxMock, msg));
@@ -458,7 +463,12 @@ public class TbGetCustomerDetailsNodeTest {
 
         var msgData = "{\"dataKey1\":123,\"dataKey2\":\"dataValue2\"}";
 
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, msgMetaData, msgData);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(msgMetaData)
+                .data(msgData)
+                .build();
     }
 
     private void mockFindCustomer() {
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 8cacf33f79..212fa7993c 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
@@ -115,7 +115,12 @@ public class TbGetDeviceAttrNodeTest extends AbstractRuleNodeUpgradeTest {
         given(deviceServiceMock.findDevicesByQuery(any(TenantId.class), any(DeviceSearchQuery.class))).willReturn(Futures.immediateFuture(Collections.emptyList()));
         given(ctxMock.getDbCallbackExecutor()).willReturn(executor);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<Throwable> actualException = ArgumentCaptor.forClass(Throwable.class);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
index fdb73279c0..54da7e6e78 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
@@ -135,7 +135,12 @@ public class TbGetOriginatorFieldsNodeTest {
     public void givenMsgDataIsNotAnJsonObjectAndFetchToData_whenOnMsg_thenException() {
         // GIVEN
         node.fetchTo = TbMsgSource.DATA;
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_ARRAY);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_ARRAY)
+                .build();
 
         // WHEN
         var exception = assertThrows(IllegalArgumentException.class, () -> node.onMsg(ctxMock, msg));
@@ -164,7 +169,12 @@ public class TbGetOriginatorFieldsNodeTest {
         node.fetchTo = TbMsgSource.DATA;
         var msgMetaData = new TbMsgMetaData();
         var msgData = "{\"temp\":42,\"humidity\":77}";
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, msgMetaData, msgData);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(msgMetaData)
+                .data(msgData)
+                .build();
 
         when(ctxMock.getDeviceService()).thenReturn(deviceServiceMock);
         when(ctxMock.getTenantId()).thenReturn(DUMMY_TENANT_ID);
@@ -206,7 +216,12 @@ public class TbGetOriginatorFieldsNodeTest {
         node.fetchTo = TbMsgSource.DATA;
         var msgMetaData = new TbMsgMetaData();
         var msgData = "{\"temp\":42,\"humidity\":77}";
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, msgMetaData, msgData);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(msgMetaData)
+                .data(msgData)
+                .build();
 
         when(ctxMock.getDeviceService()).thenReturn(deviceServiceMock);
         when(ctxMock.getTenantId()).thenReturn(DUMMY_TENANT_ID);
@@ -249,7 +264,12 @@ public class TbGetOriginatorFieldsNodeTest {
                 "testKey1", "testValue1",
                 "testKey2", "123"));
         var msgData = "[\"value1\",\"value2\"]";
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, msgMetaData, msgData);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(msgMetaData)
+                .data(msgData)
+                .build();
 
         when(ctxMock.getDeviceService()).thenReturn(deviceServiceMock);
         when(ctxMock.getTenantId()).thenReturn(DUMMY_TENANT_ID);
@@ -297,7 +317,12 @@ public class TbGetOriginatorFieldsNodeTest {
                 "testKey1", "testValue1",
                 "testKey2", "123"));
         var msgData = "[\"value1\",\"value2\"]";
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, msgMetaData, msgData);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(msgMetaData)
+                .data(msgData)
+                .build();
 
         when(ctxMock.getDeviceService()).thenReturn(deviceServiceMock);
         when(ctxMock.getTenantId()).thenReturn(DUMMY_TENANT_ID);
@@ -355,7 +380,12 @@ public class TbGetOriginatorFieldsNodeTest {
                 "testKey1", "testValue1",
                 "testKey2", "123"));
         var msgData = "[\"value1\",\"value2\"]";
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, new DashboardId(UUID.randomUUID()), msgMetaData, msgData);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(new DashboardId(UUID.randomUUID()))
+                .copyMetaData(msgMetaData)
+                .data(msgData)
+                .build();
 
         when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR);
 
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 3b6b1eb3c6..9ca0d64307 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
@@ -223,7 +223,12 @@ public class TbGetRelatedAttributeNodeTest {
     public void givenMsgDataIsNotAnJsonObjectAndFetchToData_whenOnMsg_thenException() {
         // GIVEN
         node.fetchTo = TbMsgSource.DATA;
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_ARRAY);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_ARRAY)
+                .build();
 
         // WHEN
         var exception = assertThrows(IllegalArgumentException.class, () -> node.onMsg(ctxMock, msg));
@@ -592,7 +597,12 @@ public class TbGetRelatedAttributeNodeTest {
             msgData = "{\"temp\":42,\"humidity\":77,\"messageBodyPattern1\":\"targetKey2\",\"messageBodyPattern2\":\"sourceKey3\"}";
         }
 
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, msgMetaData, msgData);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(msgMetaData)
+                .data(msgData)
+                .build();
     }
 
     @RequiredArgsConstructor
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 87f273df93..f2f4f572dc 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
@@ -182,7 +182,12 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
 
         // WHEN-THEN
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         assertThatThrownBy(() -> node.onMsg(ctxMock, msg))
                 .isInstanceOf(RuntimeException.class)
                 .hasMessage("Interval start should be less than Interval end");
@@ -205,7 +210,12 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         long endTs = 1719220353000L;
         TbMsgMetaData metaData = new TbMsgMetaData();
         metaData.putValue("mdStartInterval", String.valueOf(startTs));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, "{\"msgEndInterval\":\"" + endTs + "\"}");
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data("{\"msgEndInterval\":\"" + endTs + "\"}")
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -227,7 +237,12 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         given(timeseriesServiceMock.findAll(any(TenantId.class), any(EntityId.class), anyList())).willReturn(Futures.immediateFuture(Collections.emptyList()));
 
         // WHEN
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -251,7 +266,12 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         // WHEN
         TbMsgMetaData metaData = new TbMsgMetaData();
         metaData.putValue("mdTsKey", "humidity");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, "{\"msgTsKey\":\"pressure\"}");
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data("{\"msgTsKey\":\"pressure\"}")
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -276,7 +296,12 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         given(timeseriesServiceMock.findAll(any(TenantId.class), any(EntityId.class), anyList())).willReturn(Futures.immediateFuture(Collections.emptyList()));
 
         // WHEN
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -306,7 +331,12 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         given(timeseriesServiceMock.findAll(any(TenantId.class), any(EntityId.class), anyList())).willReturn(Futures.immediateFuture(Collections.emptyList()));
 
         // WHEN
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -346,7 +376,12 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         given(timeseriesServiceMock.findAll(any(TenantId.class), any(EntityId.class), anyList())).willReturn(Futures.immediateFuture(Collections.emptyList()));
 
         // WHEN
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -382,7 +417,12 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
 
         // WHEN-THEN
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, "{\"msgStartInterval\":\"start\"}");
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data("{\"msgStartInterval\":\"start\"}")
+                .build();
         assertThatThrownBy(() -> node.onMsg(ctxMock, msg)).isInstanceOf(IllegalArgumentException.class).hasMessage(errorMsg);
     }
 
@@ -411,7 +451,12 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         given(timeseriesServiceMock.findAll(any(TenantId.class), any(EntityId.class), anyList())).willReturn(Futures.immediateFuture(tsKvEntries));
 
         // WHEN
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -420,7 +465,9 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         TbMsgMetaData metaData = new TbMsgMetaData();
         metaData.putValue("temperature", "[{\"ts\":" + (ts - 5) + ",\"value\":23.1},{\"ts\":" + (ts - 4) + ",\"value\":22.4}]");
         metaData.putValue("humidity", "[{\"ts\":" + (ts - 4) + ",\"value\":55.5}]");
-        TbMsg expectedMsg = TbMsg.transformMsgMetadata(msg, metaData);
+        TbMsg expectedMsg = msg.transform()
+                .metaData(metaData)
+                .build();
         assertThat(actualMsg.getValue()).usingRecursiveComparison().ignoringFields("ctx").isEqualTo(expectedMsg);
     }
 
@@ -442,7 +489,12 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         given(timeseriesServiceMock.findAll(any(TenantId.class), any(EntityId.class), anyList())).willReturn(Futures.immediateFuture(tsKvEntries));
 
         // WHEN
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         // THEN
@@ -451,7 +503,9 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         TbMsgMetaData metaData = new TbMsgMetaData();
         metaData.putValue("temperature", "\"22.4\"");
         metaData.putValue("humidity", "\"55.5\"");
-        TbMsg expectedMsg = TbMsg.transformMsgMetadata(msg, metaData);
+        TbMsg expectedMsg = msg.transform()
+                .metaData(metaData)
+                .build();
         assertThat(actualMsg.getValue()).usingRecursiveComparison().ignoringFields("ctx").isEqualTo(expectedMsg);
     }
 
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 9f20301b46..7dd69e051e 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
@@ -190,7 +190,12 @@ public class TbGetTenantAttributeNodeTest {
     public void givenMsgDataIsNotAnJsonObjectAndFetchToData_whenOnMsg_thenException() {
         // GIVEN
         node.fetchTo = TbMsgSource.DATA;
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_ARRAY);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_ARRAY)
+                .build();
 
         // WHEN
         var exception = assertThrows(IllegalArgumentException.class, () -> node.onMsg(ctxMock, msg));
@@ -398,7 +403,12 @@ public class TbGetTenantAttributeNodeTest {
 
         var msgData = "{\"temp\":42,\"humidity\":77,\"messageBodyPattern1\":\"targetKey2\",\"messageBodyPattern2\":\"sourceKey3\"}";
 
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, msgMetaData, msgData);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(msgMetaData)
+                .data(msgData)
+                .build();
     }
 
     @RequiredArgsConstructor
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
index 6649cf49de..4dc37c824e 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
@@ -129,7 +129,12 @@ public class TbGetTenantDetailsNodeTest {
     public void givenMsgDataIsNotAnJsonObjectAndFetchToData_whenOnMsg_thenException() {
         // GIVEN
         node.fetchTo = TbMsgSource.DATA;
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_ARRAY);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_ARRAY)
+                .build();
 
         // WHEN
         var exception = assertThrows(IllegalArgumentException.class, () -> node.onMsg(ctxMock, msg));
@@ -289,7 +294,12 @@ public class TbGetTenantDetailsNodeTest {
 
         var msgData = "{\"dataKey1\":123,\"dataKey2\":\"dataValue2\"}";
 
-        msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, msgMetaData, msgData);
+        msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DUMMY_DEVICE_ORIGINATOR)
+                .copyMetaData(msgMetaData)
+                .data(msgData)
+                .build();
     }
 
     private void mockFindTenant() {
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
index 8fa8c387fd..0cd8308ded 100644
--- 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
@@ -283,7 +283,12 @@ public class TbMqttNodeTest extends AbstractRuleNodeUpgradeTest {
             return null;
         }).given(future).addListener(any());
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(data)
+                .build();
         mqttNode.onMsg(ctxMock, msg);
 
         then(ctxMock).should().ack(msg);
@@ -322,7 +327,12 @@ public class TbMqttNodeTest extends AbstractRuleNodeUpgradeTest {
             return null;
         }).given(future).addListener(any());
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, "\"string\"");
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data("\"string\"")
+                .build();
         mqttNode.onMsg(ctxMock, msg);
 
         then(ctxMock).should(never()).ack(msg);
@@ -330,7 +340,9 @@ public class TbMqttNodeTest extends AbstractRuleNodeUpgradeTest {
         then(mqttClientMock).should().publish(mqttNodeConfig.getTopicPattern(), Unpooled.wrappedBuffer(expectedData.getBytes(StandardCharsets.UTF_8)), MqttQoS.AT_LEAST_ONCE, false);
         TbMsgMetaData metaData = new TbMsgMetaData();
         metaData.putValue("error", RuntimeException.class + ": " + errorMsg);
-        TbMsg expectedMsg = TbMsg.transformMsgMetadata(msg, metaData);
+        TbMsg expectedMsg = msg.transform()
+                .metaData(metaData)
+                .build();
         ArgumentCaptor<TbMsg> actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         then(ctxMock).should().tellFailure(actualMsgCaptor.capture(), eq(exception));
         TbMsg actualMsg = actualMsgCaptor.getValue();
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 5cee1aa5b3..99cec83cfc 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
@@ -95,7 +95,11 @@ public class DeviceStateTest {
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), any())).thenAnswer(invocationOnMock -> {
             TbMsgType type = invocationOnMock.getArgument(1);
             String data = invocationOnMock.getArgument(invocationOnMock.getArguments().length - 1);
-            return TbMsg.newMsg(type, null, TbMsgMetaData.EMPTY, data);
+            return TbMsg.newMsg()
+                    .type(type)
+                    .copyMetaData(TbMsgMetaData.EMPTY)
+                    .data(data)
+                    .build();
         });
 
     }
@@ -107,8 +111,12 @@ public class DeviceStateTest {
         DeviceId deviceId = new DeviceId(UUID.randomUUID());
         DeviceState deviceState = createDeviceState(deviceId, alarmConfig);
 
-        TbMsg attributeUpdateMsg = TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST,
-                deviceId, TbMsgMetaData.EMPTY, "{ \"enabled\": false }");
+        TbMsg attributeUpdateMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data("{ \"enabled\": false }")
+                .build();
 
         deviceState.process(ctx, attributeUpdateMsg);
 
@@ -116,11 +124,21 @@ public class DeviceStateTest {
         verify(ctx).enqueueForTellNext(resultMsgCaptor.capture(), eq("Alarm Created"));
         Alarm alarm = JacksonUtil.fromString(resultMsgCaptor.getValue().getData(), Alarm.class);
 
-        deviceState.process(ctx, TbMsg.newMsg(TbMsgType.ALARM_CLEAR, deviceId, TbMsgMetaData.EMPTY, JacksonUtil.toString(alarm)));
+        deviceState.process(ctx, TbMsg.newMsg()
+                .type(TbMsgType.ALARM_CLEAR)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.toString(alarm))
+                .build());
         reset(ctx);
 
         String deletedAttributes = "{ \"attributes\": [ \"other\" ] }";
-        deviceState.process(ctx, TbMsg.newMsg(TbMsgType.ATTRIBUTES_DELETED, deviceId, TbMsgMetaData.EMPTY, deletedAttributes));
+        deviceState.process(ctx, TbMsg.newMsg()
+                .type(TbMsgType.ATTRIBUTES_DELETED)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(deletedAttributes)
+                .build());
         verify(ctx, never()).enqueueForTellNext(any(), anyString());
     }
 
@@ -130,17 +148,31 @@ public class DeviceStateTest {
         DeviceId deviceId = new DeviceId(UUID.randomUUID());
         DeviceState deviceState = createDeviceState(deviceId, alarmConfig);
 
-        TbMsg attributeUpdateMsg = TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST,
-                deviceId, TbMsgMetaData.EMPTY, "{ \"enabled\": false }");
+        TbMsg attributeUpdateMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data("{ \"enabled\": false }")
+                .build();
 
         deviceState.process(ctx, attributeUpdateMsg);
         ArgumentCaptor<TbMsg> resultMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         verify(ctx).enqueueForTellNext(resultMsgCaptor.capture(), eq("Alarm Created"));
         Alarm alarm = JacksonUtil.fromString(resultMsgCaptor.getValue().getData(), Alarm.class);
 
-        deviceState.process(ctx, TbMsg.newMsg(TbMsgType.ALARM_CLEAR, deviceId, TbMsgMetaData.EMPTY, JacksonUtil.toString(alarm)));
-
-        TbMsg alarmDeleteNotification = TbMsg.newMsg(TbMsgType.ALARM_DELETE, deviceId, TbMsgMetaData.EMPTY, JacksonUtil.toString(alarm));
+        deviceState.process(ctx, TbMsg.newMsg()
+                .type(TbMsgType.ALARM_CLEAR)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.toString(alarm))
+                .build());
+
+        TbMsg alarmDeleteNotification = TbMsg.newMsg()
+                .type(TbMsgType.ALARM_DELETE)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(JacksonUtil.toString(alarm))
+                .build();
         assertDoesNotThrow(() -> {
             deviceState.process(ctx, alarmDeleteNotification);
         });
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 04371c23a0..876b75ecc0 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
@@ -127,8 +127,13 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 42);
-        TbMsg msg = TbMsg.newMsg("123456789", deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data));
+        TbMsg msg = TbMsg.newMsg()
+                .type("123456789")
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
         verify(ctx, Mockito.never()).tellFailure(Mockito.any(), Mockito.any());
@@ -146,8 +151,13 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 42);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
         verify(ctx, Mockito.never()).tellFailure(Mockito.any(), Mockito.any());
@@ -198,26 +208,46 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm")).thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
 
-        TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())).thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 42);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
         verify(ctx).enqueueForTellNext(theMsg, "Alarm Created");
         verify(ctx, Mockito.never()).tellFailure(Mockito.any(), Mockito.any());
 
-        TbMsg theMsg2 = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, "2");
+        TbMsg theMsg2 = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data("2")
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())).thenReturn(theMsg2);
 
         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);
+        TbMsg msg2 = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
         node.onMsg(ctx, msg2);
         verify(ctx).tellSuccess(msg2);
         verify(ctx).enqueueForTellNext(theMsg2, "Alarm Updated");
@@ -274,19 +304,34 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm1")).thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
 
-        TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())).thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 42);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
         verify(ctx).enqueueForTellNext(theMsg, "Alarm Created");
         verify(ctx, Mockito.never()).tellFailure(Mockito.any(), Mockito.any());
 
-        TbMsg theMsg2 = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
+        TbMsg theMsg2 = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())).thenReturn(theMsg2);
 
         AlarmInfo alarm = new AlarmInfo(new Alarm(new AlarmId(UUID.randomUUID())));
@@ -305,8 +350,13 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         when(alarmService.updateAlarm(any())).thenReturn(result);
 
         data.put("temperature", 52);
-        TbMsg msg2 = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg2 = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
         node.onMsg(ctx, msg2);
         verify(ctx).tellSuccess(msg2);
         verify(ctx).enqueueForTellNext(theMsg2, "Alarm Severity Updated");
@@ -380,14 +430,24 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         Mockito.when(ctx.newMsg(Mockito.any(), Mockito.any(TbMsgType.class), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 21);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -468,14 +528,24 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 21);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -538,14 +608,24 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 35);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -634,14 +714,24 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 35);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -655,8 +745,13 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
 
         Thread.sleep(halfOfAlarmDelay + 1);
 
-        TbMsg msg2 = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg2 = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg2);
         verify(ctx).tellSuccess(msg2);
@@ -760,14 +855,24 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 150);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -781,8 +886,13 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
 
         Thread.sleep(halfOfAlarmDelay + 1);
 
-        TbMsg msg2 = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg2 = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg2);
         verify(ctx).tellSuccess(msg2);
@@ -871,14 +981,24 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 150);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -886,8 +1006,13 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         verify(ctx, Mockito.never()).tellNext(theMsg, "Alarm Created");
 
         data.put("temperature", 151);
-        TbMsg msg2 = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg2 = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg2);
         verify(ctx).tellSuccess(msg2);
@@ -989,14 +1114,24 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 150);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -1004,8 +1139,13 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         verify(ctx, Mockito.never()).tellNext(theMsg, "Alarm Created");
 
         data.put("temperature", 151);
-        TbMsg msg2 = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg2 = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg2);
         verify(ctx).tellSuccess(msg2);
@@ -1086,14 +1226,24 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 35);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -1107,8 +1257,13 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
 
         Thread.sleep(halfOfAlarmDelay + 1);
 
-        TbMsg msg2 = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg2 = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg2);
         verify(ctx).tellSuccess(msg2);
@@ -1185,14 +1340,24 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 35);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -1268,14 +1433,25 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 35);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+
+                .build();
 
 //        Mockito.reset(ctx);
 
@@ -1365,12 +1541,22 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 35);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -1444,14 +1630,24 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 25);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -1518,14 +1714,24 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 40);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -1597,19 +1803,29 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
                 .thenReturn(device);
         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.any(AttributeScope.class), 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(AttributeScope.SERVER_SCOPE), Mockito.anyString()))
                 .thenReturn(optionalListenableFutureWithLess);
 
-        TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 150L);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
@@ -1688,14 +1904,24 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest {
         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);
+        TbMsg theMsg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString()))
                 .thenReturn(theMsg);
 
         ObjectNode data = JacksonUtil.newObjectNode();
         data.put("temperature", 150L);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
-                TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .dataType(TbMsgDataType.JSON)
+                .data(JacksonUtil.toString(data))
+                .build();
 
         node.onMsg(ctx, msg);
         verify(ctx).tellSuccess(msg);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeTest.java
index 8ce71f684c..3bcfe9f387 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeTest.java
@@ -103,7 +103,7 @@ public class TbRabbitMqNodeTest {
         assertThat(config.getExchangeNamePattern()).isEqualTo("");
         assertThat(config.getRoutingKeyPattern()).isEqualTo("");
         assertThat(config.getMessageProperties()).isNull();
-        assertThat(config.getHost()).isEqualTo(ConnectionFactory.DEFAULT_HOST);
+        assertThat(config.getHost()).isNull();
         assertThat(config.getPort()).isEqualTo(ConnectionFactory.DEFAULT_AMQP_PORT);
         assertThat(config.getVirtualHost()).isEqualTo(ConnectionFactory.DEFAULT_VHOST);
         assertThat(config.getUsername()).isEqualTo(ConnectionFactory.DEFAULT_USER);
@@ -147,7 +147,12 @@ public class TbRabbitMqNodeTest {
         given(ctxMock.getExternalCallExecutor()).willReturn(executor);
 
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(data)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should().ack(msg);
@@ -178,7 +183,12 @@ public class TbRabbitMqNodeTest {
         given(ctxMock.getExternalCallExecutor()).willReturn(executor);
 
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should(never()).ack(any(TbMsg.class));
@@ -201,7 +211,12 @@ public class TbRabbitMqNodeTest {
 
         node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
         TbMsgMetaData metaData = new TbMsgMetaData();
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should(forceAck ? times(1) : never()).ack(any(TbMsg.class));
@@ -212,7 +227,9 @@ public class TbRabbitMqNodeTest {
                 () -> then(ctxMock).should().tellFailure(actualMsg.capture(), throwable.capture());
         verifyTellFailure.run();
         metaData.putValue("error", RuntimeException.class + ": " + errorMsg);
-        TbMsg expectedMsg = TbMsg.transformMsgMetadata(msg, metaData);
+        TbMsg expectedMsg = msg.transform()
+                .metaData(metaData)
+                .build();
         assertThat(actualMsg.getValue()).usingRecursiveComparison().ignoringFields("ctx").isEqualTo(expectedMsg);
         assertThat(throwable.getValue()).isInstanceOf(RuntimeException.class).hasMessage(errorMsg);
     }
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 2eb65c1787..b42fa8662f 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
@@ -140,11 +140,18 @@ public class TbHttpClientTest {
 
         var httpClient = new TbHttpClient(config, eventLoop);
 
-        var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, new DeviceId(EntityId.NULL_UUID), TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
-        var successMsg = TbMsg.newMsg(
-                TbMsgType.POST_TELEMETRY_REQUEST, msg.getOriginator(),
-                msg.getMetaData(), msg.getData()
-        );
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(new DeviceId(EntityId.NULL_UUID))
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
+        var successMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(msg.getOriginator())
+                .copyMetaData(msg.getMetaData())
+                .data(msg.getData())
+                .build();
 
         var ctx = mock(TbContext.class);
         when(ctx.transformMsg(
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 e7d541d587..9f5834cd46 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
@@ -142,7 +142,15 @@ public class TbRestApiCallNodeTest extends AbstractRuleNodeUpgradeTest {
         config.setRestEndpointUrlPattern(String.format("http://localhost:%d%s", server.getLocalPort(), path));
         initWithConfig(config);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, TbMsg.EMPTY_JSON_OBJECT, ruleChainId, ruleNodeId);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(metaData)
+                .dataType(TbMsgDataType.JSON)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .ruleChainId(ruleChainId)
+                .ruleNodeId(ruleNodeId)
+                .build();
         restNode.onMsg(ctx, msg);
 
         assertTrue(latch.await(10, TimeUnit.SECONDS), "Server handled request");
@@ -203,7 +211,15 @@ public class TbRestApiCallNodeTest extends AbstractRuleNodeUpgradeTest {
         config.setRestEndpointUrlPattern(String.format("http://localhost:%d%s", server.getLocalPort(), path));
         initWithConfig(config);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, TbMsg.EMPTY_JSON_OBJECT, ruleChainId, ruleNodeId);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(originator)
+                .copyMetaData(metaData)
+                .dataType(TbMsgDataType.JSON)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .ruleChainId(ruleChainId)
+                .ruleNodeId(ruleNodeId)
+                .build();
         restNode.onMsg(ctx, msg);
 
         assertTrue(latch.await(10, TimeUnit.SECONDS), "Server handled request");
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNodeTest.java
index c603e111e2..6bf34de3b1 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNodeTest.java
@@ -89,7 +89,12 @@ public class TbSendRestApiCallReplyNodeTest {
         Map<String, String> metadata = Map.of(
                 requestIdAttribute, requestUUIDStr,
                 serviceIdAttribute, serviceIdStr);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.REST_API_REQUEST, DEVICE_ID, new TbMsgMetaData(metadata), data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(new TbMsgMetaData(metadata))
+                .data(data)
+                .build();
 
         node.onMsg(ctxMock, msg);
 
@@ -109,7 +114,12 @@ public class TbSendRestApiCallReplyNodeTest {
     @ParameterizedTest
     @MethodSource
     public void givenInvalidRequest_whenOnMsg_thenTellFailure(TbMsgMetaData metaData, String data, String errorMsg) {
-        TbMsg msg = TbMsg.newMsg(TbMsgType.REST_API_REQUEST, DEVICE_ID, metaData, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.REST_API_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(data)
+                .build();
 
         node.onMsg(ctxMock, msg);
 
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 9cab33fcdd..11a29c67ba 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
@@ -92,8 +92,13 @@ public class TbSendRPCReplyNodeTest {
     public void sendReplyToTransport() {
         when(ctx.getRpcService()).thenReturn(rpcService);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, getDefaultMetadata(),
-                TbMsgDataType.JSON, DUMMY_DATA, null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(getDefaultMetadata())
+                .dataType(TbMsgDataType.JSON)
+                .data(DUMMY_DATA)
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -111,8 +116,13 @@ public class TbSendRPCReplyNodeTest {
         TbMsgMetaData defaultMetadata = getDefaultMetadata();
         defaultMetadata.putValue(DataConstants.EDGE_ID, UUID.randomUUID().toString());
         defaultMetadata.putValue(DataConstants.DEVICE_ID, UUID.randomUUID().toString());
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, defaultMetadata,
-                TbMsgDataType.JSON, DUMMY_DATA, null, null);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(defaultMetadata)
+                .dataType(TbMsgDataType.JSON)
+                .data(DUMMY_DATA)
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -124,7 +134,12 @@ public class TbSendRPCReplyNodeTest {
     @EnumSource(EntityType.class)
     public void testOriginatorEntityTypes(EntityType entityType) {
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(entityType, "0f386739-210f-4e23-8739-23f84a172adc");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, entityId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(entityId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         node.onMsg(ctx, msg);
 
@@ -138,7 +153,12 @@ public class TbSendRPCReplyNodeTest {
     @ParameterizedTest
     @MethodSource
     public void testForAvailabilityOfMetadataAndDataValues(TbMsgMetaData metaData, String errorMsg) {
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, metaData, TbMsg.EMPTY_STRING);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(metaData)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
 
         node.onMsg(ctx, msg);
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNodeTest.java
index e9d25e0d5e..4aa38b230a 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNodeTest.java
@@ -107,7 +107,12 @@ public class TbSendRPCRequestNodeTest {
 
         TbMsgMetaData msgMetadata = new TbMsgMetaData();
         msgMetadata.putValue("oneway", mdKeyValue);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, msgMetadata, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(msgMetadata)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         var ruleEngineDeviceRpcRequestCaptor = captureRequest();
@@ -128,7 +133,12 @@ public class TbSendRPCRequestNodeTest {
         given(ctxMock.getRpcService()).willReturn(rpcServiceMock);
         given(ctxMock.getTenantId()).willReturn(TENANT_ID);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, TbMsgMetaData.EMPTY, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = ArgumentCaptor.forClass(RuleEngineDeviceRpcRequest.class);
@@ -149,7 +159,12 @@ public class TbSendRPCRequestNodeTest {
         given(ctxMock.getRpcService()).willReturn(rpcServiceMock);
         given(ctxMock.getTenantId()).willReturn(TENANT_ID);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.TO_SERVER_RPC_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.TO_SERVER_RPC_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = captureRequest();
@@ -170,7 +185,12 @@ public class TbSendRPCRequestNodeTest {
                   "requestId": 12345
                 }
                 """;
-        TbMsg msg = TbMsg.newMsg(TbMsgType.TO_SERVER_RPC_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.TO_SERVER_RPC_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(data)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = captureRequest();
@@ -185,7 +205,12 @@ public class TbSendRPCRequestNodeTest {
         String requestUUID = "b795a241-5a30-48fb-92d5-46b864d47130";
         TbMsgMetaData metadata = new TbMsgMetaData();
         metadata.putValue("requestUUID", requestUUID);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, metadata, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = captureRequest();
@@ -200,7 +225,12 @@ public class TbSendRPCRequestNodeTest {
 
         TbMsgMetaData metadata = new TbMsgMetaData();
         metadata.putValue("requestUUID", requestUUID);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, metadata, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = captureRequest();
@@ -215,7 +245,12 @@ public class TbSendRPCRequestNodeTest {
         String originServiceId = "service-id-123";
         TbMsgMetaData metadata = new TbMsgMetaData();
         metadata.putValue("originServiceId", originServiceId);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, metadata, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = captureRequest();
@@ -230,7 +265,12 @@ public class TbSendRPCRequestNodeTest {
 
         TbMsgMetaData metadata = new TbMsgMetaData();
         metadata.putValue("originServiceId", originServiceId);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, metadata, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = captureRequest();
@@ -245,7 +285,12 @@ public class TbSendRPCRequestNodeTest {
         String expirationTime = "2000000000000";
         TbMsgMetaData metadata = new TbMsgMetaData();
         metadata.putValue(DataConstants.EXPIRATION_TIME, expirationTime);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, metadata, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = captureRequest();
@@ -260,7 +305,12 @@ public class TbSendRPCRequestNodeTest {
 
         TbMsgMetaData metadata = new TbMsgMetaData();
         metadata.putValue(DataConstants.EXPIRATION_TIME, expirationTime);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, metadata, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = captureRequest();
@@ -275,7 +325,12 @@ public class TbSendRPCRequestNodeTest {
         Integer retries = 3;
         TbMsgMetaData metadata = new TbMsgMetaData();
         metadata.putValue(DataConstants.RETRIES, String.valueOf(retries));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, metadata, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = captureRequest();
@@ -290,7 +345,12 @@ public class TbSendRPCRequestNodeTest {
 
         TbMsgMetaData metadata = new TbMsgMetaData();
         metadata.putValue(DataConstants.RETRIES, retries);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, metadata, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = captureRequest();
@@ -303,7 +363,12 @@ public class TbSendRPCRequestNodeTest {
         given(ctxMock.getRpcService()).willReturn(rpcServiceMock);
         given(ctxMock.getTenantId()).willReturn(TENANT_ID);
 
-        TbMsg msg = TbMsg.newMsg(msgType, DEVICE_ID, TbMsgMetaData.EMPTY, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(msgType)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = captureRequest();
@@ -322,7 +387,12 @@ public class TbSendRPCRequestNodeTest {
 
         TbMsgMetaData metadata = new TbMsgMetaData();
         metadata.putValue(DataConstants.PERSISTENT, isPersisted);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, metadata, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<RuleEngineDeviceRpcRequest> requestCaptor = captureRequest();
@@ -346,7 +416,12 @@ public class TbSendRPCRequestNodeTest {
 
     @Test
     public void givenRpcResponseWithoutError_whenOnMsg_thenSendsRpcRequest() {
-        TbMsg outMsg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg outMsg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         given(ctxMock.getRpcService()).willReturn(rpcServiceMock);
         given(ctxMock.getTenantId()).willReturn(TENANT_ID);
@@ -361,7 +436,12 @@ public class TbSendRPCRequestNodeTest {
             return null;
         }).given(rpcServiceMock).sendRpcRequestToDevice(any(RuleEngineDeviceRpcRequest.class), any(Consumer.class));
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, TbMsgMetaData.EMPTY, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should().enqueueForTellNext(outMsg, TbNodeConnectionType.SUCCESS);
@@ -370,7 +450,12 @@ public class TbSendRPCRequestNodeTest {
 
     @Test
     public void givenRpcResponseWithError_whenOnMsg_thenTellFailure() {
-        TbMsg outMsg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg outMsg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         given(ctxMock.getRpcService()).willReturn(rpcServiceMock);
         given(ctxMock.getTenantId()).willReturn(TENANT_ID);
@@ -384,7 +469,12 @@ public class TbSendRPCRequestNodeTest {
             return null;
         }).given(rpcServiceMock).sendRpcRequestToDevice(any(RuleEngineDeviceRpcRequest.class), any(Consumer.class));
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE, DEVICE_ID, TbMsgMetaData.EMPTY, MSG_DATA);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(MSG_DATA)
+                .build();
         node.onMsg(ctxMock, msg);
 
         then(ctxMock).should().enqueueForTellFailure(outMsg, RpcError.NO_ACTIVE_CONNECTION.name());
@@ -396,7 +486,12 @@ public class TbSendRPCRequestNodeTest {
     public void givenOriginatorIsNotDevice_whenOnMsg_thenThrowsException(EntityType entityType) {
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(entityType, "ac21a1bb-eabf-4463-8313-24bea1f498d9");
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, entityId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(entityId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
         node.onMsg(ctxMock, msg);
 
         ArgumentCaptor<Throwable> throwableCaptor = ArgumentCaptor.forClass(Throwable.class);
@@ -409,7 +504,12 @@ public class TbSendRPCRequestNodeTest {
     @ParameterizedTest
     @ValueSource(strings = {"method", "params"})
     public void givenMethodOrParamsAreNotPresent_whenOnMsg_thenThrowsException(String key) {
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, "{\"" + key + "\": \"value\"}");
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data("{\"" + key + "\": \"value\"}")
+                .build();
 
         node.onMsg(ctxMock, msg);
 
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 b5cf5533b8..12c59f3873 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
@@ -22,7 +22,6 @@ 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 org.mockito.ArgumentCaptor;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.AbstractRuleNodeUpgradeTest;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
@@ -53,6 +52,7 @@ import java.util.stream.Stream;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.assertArg;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.willCallRealMethod;
 import static org.mockito.Mockito.mock;
@@ -164,22 +164,25 @@ class TbMsgAttributesNodeTest extends AbstractRuleNodeUpgradeTest {
             md.putValue(NOTIFY_DEVICE_METADATA_KEY, mdValue);
         }
         // dummy list with one ts kv to pass the empty list check.
-        var testTbMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, md, TbMsg.EMPTY_STRING);
+        var testTbMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(md)
+                .data(TbMsg.EMPTY_STRING)
+                .build();
         List<AttributeKvEntry> testAttrList = List.of(new BaseAttributeKvEntry(0L, new StringDataEntry("testKey", "testValue")));
 
         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(AttributeScope.SHARED_SCOPE),
-                eq(testAttrList), notifyDeviceCaptor.capture(), any()
-        );
-        boolean notifyDevice = notifyDeviceCaptor.getValue();
-        assertThat(notifyDevice).isEqualTo(expectedArgumentValue);
+        verify(telemetryServiceMock, times(1)).saveAttributes(assertArg(request -> {
+            assertThat(request.getTenantId()).isEqualTo(tenantId);
+            assertThat(request.getEntityId()).isEqualTo(deviceId);
+            assertThat(request.getScope()).isEqualTo(AttributeScope.SHARED_SCOPE);
+            assertThat(request.getEntries()).isEqualTo(testAttrList);
+            assertThat(request.isNotifyDevice()).isEqualTo(expectedArgumentValue);
+        }));
     }
 
-
     // Rule nodes upgrade
     private static Stream<Arguments> givenFromVersionAndConfig_whenUpgrade_thenVerifyHasChangesAndConfig() {
         return Stream.of(
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 3d546c80f7..198e12ecb6 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
@@ -21,11 +21,11 @@ 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.AttributesDeleteRequest;
 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;
@@ -41,10 +41,9 @@ import java.util.function.Consumer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.assertArg;
 import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.BDDMockito.willReturn;
 import static org.mockito.Mockito.mock;
@@ -78,11 +77,10 @@ public class TbMsgDeleteAttributesNodeTest {
 
         willReturn(telemetryService).given(ctx).getTelemetryService();
         willAnswer(invocation -> {
-            TelemetryNodeCallback callBack = invocation.getArgument(5);
-            callBack.onSuccess(null);
+            AttributesDeleteRequest request = invocation.getArgument(0);
+            request.getCallback().onSuccess(null);
             return null;
-        }).given(telemetryService).deleteAndNotify(
-                any(), any(), any(AttributeScope.class), anyList(), anyBoolean(), any());
+        }).given(telemetryService).deleteAttributes(any());
     }
 
     @AfterEach
@@ -139,7 +137,13 @@ public class TbMsgDeleteAttributesNodeTest {
         }
         final String data = "{\"TestAttribute_2\": \"humidity\", \"TestAttribute_3\": \"voltage\"}";
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, deviceId, metaData, data, callback);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(metaData)
+                .data(data)
+                .callback(callback)
+                .build();
         node.onMsg(ctx, msg);
 
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
@@ -153,6 +157,8 @@ public class TbMsgDeleteAttributesNodeTest {
         }
         verify(ctx, times(1)).tellSuccess(newMsgCaptor.capture());
         verify(ctx, never()).tellFailure(any(), any());
-        verify(telemetryService, times(1)).deleteAndNotify(any(), any(), any(AttributeScope.class), anyList(), eq(notifyDevice || notifyDeviceMetadata), any());
+        verify(telemetryService, times(1)).deleteAttributes(assertArg(request -> {
+            assertThat(request.isNotifyDevice()).isEqualTo(notifyDevice || notifyDeviceMetadata);
+        }));
     }
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeTest.java
index 1fb4e9eefd..892e217414 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeTest.java
@@ -27,16 +27,21 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.AbstractRuleNodeUpgradeTest;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
 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.rule.engine.api.TimeseriesSaveRequest;
+import org.thingsboard.rule.engine.telemetry.strategy.ProcessingStrategy;
 import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.DoubleDataEntry;
 import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.msg.TbMsgType;
@@ -44,6 +49,8 @@ import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileCon
 import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.service.ConstraintValidator;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,26 +60,30 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
 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.anyList;
-import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.assertArg;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.BDDMockito.then;
+import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.never;
+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;
 
 @ExtendWith(MockitoExtension.class)
-public class TbMsgTimeseriesNodeTest {
+public class TbMsgTimeseriesNodeTest extends AbstractRuleNodeUpgradeTest {
 
     private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("c8f34868-603a-4433-876a-7d356e5cf377"));
     private final DeviceId DEVICE_ID = new DeviceId(UUID.fromString("e5095e9a-04f4-44c9-b443-1cf1b97d3384"));
-    private final TenantProfileId TENANT_PROFILE_ID = new TenantProfileId(UUID.fromString("ab78dd78-83d0-43fa-869f-d42ec9ed1744"));
+
+    private TenantProfile tenantProfile;
 
     private TbMsgTimeseriesNode node;
     private TbMsgTimeseriesNodeConfiguration config;
-    private long tenantProfileDefaultStorageTtl;
 
     @Mock
     private TbContext ctxMock;
@@ -81,24 +92,68 @@ public class TbMsgTimeseriesNodeTest {
 
     @BeforeEach
     public void setUp() throws TbNodeException {
-        node = new TbMsgTimeseriesNode();
+        tenantProfile = new TenantProfile(new TenantProfileId(UUID.fromString("ab78dd78-83d0-43fa-869f-d42ec9ed1744")));
+        var tenantProfileConfiguration = new DefaultTenantProfileConfiguration();
+        tenantProfileConfiguration.setDefaultStorageTtlDays(5);
+        var tenantProfileData = new TenantProfileData();
+        tenantProfileData.setConfiguration(tenantProfileConfiguration);
+        tenantProfile.setProfileData(tenantProfileData);
+        lenient().when(ctxMock.getTenantProfile()).thenReturn(tenantProfile);
+
+        lenient().when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
+        lenient().when(ctxMock.getTelemetryService()).thenReturn(telemetryServiceMock);
+
+        node = spy(new TbMsgTimeseriesNode());
         config = new TbMsgTimeseriesNodeConfiguration().defaultConfiguration();
     }
 
     @Test
     public void verifyDefaultConfig() {
         assertThat(config.getDefaultTTL()).isEqualTo(0L);
-        assertThat(config.isSkipLatestPersistence()).isFalse();
+        assertThat(config.getProcessingSettings()).isInstanceOf(TbMsgTimeseriesNodeConfiguration.ProcessingSettings.OnEveryMessage.class);
         assertThat(config.isUseServerTs()).isFalse();
     }
 
+    @Test
+    public void whenInit_thenShouldAddTenantProfileListener() throws Exception {
+        // GIVEN-WHEN
+        node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // THEN
+        then(ctxMock).should().addTenantProfileListener(any());
+    }
+
+    @Test
+    public void givenProcessingSettingsAreNull_whenValidatingConstraints_thenThrowsException() {
+        // GIVEN
+        config.setProcessingSettings(null);
+
+        // WHEN-THEN
+        assertThatThrownBy(() -> ConstraintValidator.validateFields(config))
+                .isInstanceOf(DataValidationException.class)
+                .hasMessage("Validation error: processingSettings must not be null");
+    }
+
     @ParameterizedTest
     @EnumSource(TbMsgType.class)
     public void givenMsgTypeAndEmptyMsgData_whenOnMsg_thenVerifyFailureMsg(TbMsgType msgType) throws TbNodeException {
-        init();
-        TbMsg msg = TbMsg.newMsg(msgType, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_ARRAY);
+        // GIVEN
+        node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        TbMsg msg = TbMsg.newMsg()
+                .type(msgType)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_ARRAY)
+                .build();
+
+        // WHEN
         node.onMsg(ctxMock, msg);
 
+        // THEN
+        then(ctxMock).should().addTenantProfileListener(any());
+        then(ctxMock).should().getTenantProfile();
+
         ArgumentCaptor<Throwable> throwableCaptor = ArgumentCaptor.forClass(Throwable.class);
         verify(ctxMock).tellFailure(eq(msg), throwableCaptor.capture());
 
@@ -112,9 +167,11 @@ public class TbMsgTimeseriesNodeTest {
     }
 
     @Test
-    public void givenTtlFromConfigIsZeroAndUseServiceTsIsTrue_whenOnMsg_thenSaveTimeseriesUsingTenantProfileDefaultTtl() throws TbNodeException {
+    public void givenTtlFromConfigIsZeroAndUseServerTsIsTrue_whenOnMsg_thenSaveTimeseriesUsingTenantProfileDefaultTtl() throws TbNodeException {
+        // GIVEN
         config.setUseServerTs(true);
-        init();
+
+        node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
 
         String data = """
                 {
@@ -122,34 +179,54 @@ public class TbMsgTimeseriesNodeTest {
                     "humidity": 77
                 }
                 """;
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(data)
+                .build();
 
-        when(ctxMock.getTelemetryService()).thenReturn(telemetryServiceMock);
-        when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
         doAnswer(invocation -> {
-            TelemetryNodeCallback callback = invocation.getArgument(5);
-            callback.onSuccess(null);
+            TimeseriesSaveRequest request = invocation.getArgument(0);
+            request.getCallback().onSuccess(null);
             return null;
-        }).when(telemetryServiceMock).saveAndNotify(any(), any(), any(), anyList(), anyLong(), any());
+        }).when(telemetryServiceMock).saveTimeseries(any(TimeseriesSaveRequest.class));
 
+        // WHEN
         node.onMsg(ctxMock, msg);
 
+        // THEN
+        then(ctxMock).should().getTenantId();
+        then(ctxMock).should().getTelemetryService();
+        then(ctxMock).should().addTenantProfileListener(any());
+        then(ctxMock).should().getTenantProfile();
+
         List<TsKvEntry> expectedList = getTsKvEntriesListWithTs(data, System.currentTimeMillis());
-        ArgumentCaptor<List<TsKvEntry>> entryListCaptor = ArgumentCaptor.forClass(List.class);
-        verify(telemetryServiceMock).saveAndNotify(eq(TENANT_ID), isNull(), eq(DEVICE_ID), entryListCaptor.capture(),
-                eq(tenantProfileDefaultStorageTtl), any(TelemetryNodeCallback.class));
-        assertThat(entryListCaptor.getValue()).usingRecursiveFieldByFieldElementComparatorIgnoringFields("ts")
-                .containsExactlyElementsOf(expectedList);
+        verify(telemetryServiceMock).saveTimeseries(assertArg(request -> {
+            assertThat(request.getTenantId()).isEqualTo(TENANT_ID);
+            assertThat(request.getCustomerId()).isNull();
+            assertThat(request.getEntityId()).isEqualTo(DEVICE_ID);
+            assertThat(request.getEntries()).usingRecursiveFieldByFieldElementComparatorIgnoringFields("ts").containsExactlyElementsOf(expectedList);
+            assertThat(request.getTtl()).isEqualTo(extractTtlAsSeconds(tenantProfile));
+            assertThat(request.getStrategy()).isEqualTo(TimeseriesSaveRequest.Strategy.SAVE_ALL);
+            assertThat(request.getCallback()).isInstanceOf(TelemetryNodeCallback.class);
+        }));
         verify(ctxMock).tellSuccess(msg);
         verifyNoMoreInteractions(ctxMock, telemetryServiceMock);
     }
 
     @Test
-    public void givenSkipLatestPersistenceIsTrueAndTtlFromConfig_whenOnMsg_thenSaveTimeseriesUsingTtlFromConfig() throws TbNodeException {
-        long ttlFromConfig = 5L;
-        config.setDefaultTTL(ttlFromConfig);
-        config.setSkipLatestPersistence(true);
-        init();
+    public void givenSkipLatestProcessingSettingsAndTtlFromConfig_whenOnMsg_thenSaveTimeseriesUsingTtlFromConfig() throws TbNodeException {
+        // GIVEN
+        config.setDefaultTTL(10L);
+
+        var timeseriesStrategy = ProcessingStrategy.onEveryMessage();
+        var latestStrategy = ProcessingStrategy.skip();
+        var webSockets = ProcessingStrategy.onEveryMessage();
+        var processingSettings = new TbMsgTimeseriesNodeConfiguration.ProcessingSettings.Advanced(timeseriesStrategy, latestStrategy, webSockets);
+        config.setProcessingSettings(processingSettings);
+
+        node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
 
         String data = """
                 {
@@ -159,23 +236,38 @@ public class TbMsgTimeseriesNodeTest {
                 """;
         long ts = System.currentTimeMillis();
         var metadata = Map.of("ts", String.valueOf(ts));
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, new TbMsgMetaData(metadata), data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(new TbMsgMetaData(metadata))
+                .data(data)
+                .build();
 
-        when(ctxMock.getTelemetryService()).thenReturn(telemetryServiceMock);
-        when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
         doAnswer(invocation -> {
-            TelemetryNodeCallback callback = invocation.getArgument(5);
-            callback.onSuccess(null);
+            TimeseriesSaveRequest request = invocation.getArgument(0);
+            request.getCallback().onSuccess(null);
             return null;
-        }).when(telemetryServiceMock).saveWithoutLatestAndNotify(any(), any(), any(), anyList(), anyLong(), any());
+        }).when(telemetryServiceMock).saveTimeseries(any(TimeseriesSaveRequest.class));
 
+        // WHEN
         node.onMsg(ctxMock, msg);
 
+        // THEN
+        then(ctxMock).should().getTenantId();
+        then(ctxMock).should().getTelemetryService();
+        then(ctxMock).should().addTenantProfileListener(any());
+        then(ctxMock).should().getTenantProfile();
+
         List<TsKvEntry> expectedList = getTsKvEntriesListWithTs(data, ts);
-        ArgumentCaptor<List<TsKvEntry>> entryListCaptor = ArgumentCaptor.forClass(List.class);
-        verify(telemetryServiceMock).saveWithoutLatestAndNotify(
-                eq(TENANT_ID), isNull(), eq(DEVICE_ID), entryListCaptor.capture(), eq(ttlFromConfig), any(TelemetryNodeCallback.class));
-        assertThat(entryListCaptor.getValue()).containsExactlyElementsOf(expectedList);
+        verify(telemetryServiceMock).saveTimeseries(assertArg(request -> {
+            assertThat(request.getTenantId()).isEqualTo(TENANT_ID);
+            assertThat(request.getCustomerId()).isNull();
+            assertThat(request.getEntityId()).isEqualTo(DEVICE_ID);
+            assertThat(request.getEntries()).containsExactlyElementsOf(expectedList);
+            assertThat(request.getTtl()).isEqualTo(config.getDefaultTTL());
+            assertThat(request.getStrategy()).isEqualTo(new TimeseriesSaveRequest.Strategy(true, false, true));
+            assertThat(request.getCallback()).isInstanceOf(TelemetryNodeCallback.class);
+        }));
         verify(ctxMock).tellSuccess(msg);
         verifyNoMoreInteractions(ctxMock, telemetryServiceMock);
     }
@@ -183,11 +275,10 @@ public class TbMsgTimeseriesNodeTest {
     @ParameterizedTest
     @MethodSource
     public void givenTtlFromConfigAndTtlFromMd_whenOnMsg_thenVerifyTtl(String ttlFromMd, long ttlFromConfig, long expectedTtl) throws TbNodeException {
+        // GIVEN
         config.setDefaultTTL(ttlFromConfig);
-        init();
 
-        when(ctxMock.getTelemetryService()).thenReturn(telemetryServiceMock);
-        when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
+        node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
 
         String data = """
                 {
@@ -197,10 +288,25 @@ public class TbMsgTimeseriesNodeTest {
                 """;
         var metadata = new TbMsgMetaData();
         metadata.putValue("TTL", ttlFromMd);
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metadata, data);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metadata)
+                .data(data)
+                .build();
+
+        // WHEN
         node.onMsg(ctxMock, msg);
 
-        verify(telemetryServiceMock).saveAndNotify(eq(TENANT_ID), isNull(), eq(DEVICE_ID), anyList(), eq(expectedTtl), any(TelemetryNodeCallback.class));
+        // THEN
+        verify(telemetryServiceMock).saveTimeseries(assertArg(request -> {
+            assertThat(request.getTenantId()).isEqualTo(TENANT_ID);
+            assertThat(request.getCustomerId()).isNull();
+            assertThat(request.getEntityId()).isEqualTo(DEVICE_ID);
+            assertThat(request.getTtl()).isEqualTo(expectedTtl);
+            assertThat(request.getStrategy()).isEqualTo(TimeseriesSaveRequest.Strategy.SAVE_ALL);
+            assertThat(request.getCallback()).isInstanceOf(TelemetryNodeCallback.class);
+        }));
     }
 
     private static Stream<Arguments> givenTtlFromConfigAndTtlFromMd_whenOnMsg_thenVerifyTtl() {
@@ -215,26 +321,6 @@ public class TbMsgTimeseriesNodeTest {
         );
     }
 
-    private void init() throws TbNodeException {
-        var configuration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-        var tenantProfile = getTenantProfile();
-        when(ctxMock.getTenantProfile()).thenReturn(tenantProfile);
-        tenantProfile.getProfileConfiguration().ifPresent(profileConfiguration ->
-                tenantProfileDefaultStorageTtl = TimeUnit.DAYS.toSeconds(profileConfiguration.getDefaultStorageTtlDays()));
-        node.init(ctxMock, configuration);
-        verify(ctxMock).addTenantProfileListener(any());
-    }
-
-    private TenantProfile getTenantProfile() {
-        var tenantProfile = new TenantProfile(TENANT_PROFILE_ID);
-        var tenantProfileData = new TenantProfileData();
-        var tenantProfileConfiguration = new DefaultTenantProfileConfiguration();
-        tenantProfileConfiguration.setDefaultStorageTtlDays(5);
-        tenantProfileData.setConfiguration(tenantProfileConfiguration);
-        tenantProfile.setProfileData(tenantProfileData);
-        return tenantProfile;
-    }
-
     private static List<TsKvEntry> getTsKvEntriesListWithTs(String data, long ts) {
         Map<Long, List<KvEntry>> tsKvMap = JsonConverter.convertToTelemetry(JsonParser.parseString(data), ts);
         List<TsKvEntry> expectedList = new ArrayList<>();
@@ -246,4 +332,309 @@ public class TbMsgTimeseriesNodeTest {
         return expectedList;
     }
 
+    @Test
+    public void givenOnEveryMessageProcessingSettingsAndSameMessageTwoTimes_whenOnMsg_thenPersistSameMessageTwoTimes() throws TbNodeException {
+        // GIVEN
+        config.setProcessingSettings(new TbMsgTimeseriesNodeConfiguration.ProcessingSettings.OnEveryMessage());
+
+        node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .data(JacksonUtil.newObjectNode().put("temperature", 22.3).toString())
+                .metaData(new TbMsgMetaData(Map.of("ts", "123")))
+                .build();
+
+        // WHEN-THEN
+        var expectedSaveRequest = TimeseriesSaveRequest.builder()
+                .tenantId(TENANT_ID)
+                .customerId(msg.getCustomerId())
+                .entityId(msg.getOriginator())
+                .entry(new BasicTsKvEntry(123L, new DoubleDataEntry("temperature", 22.3)))
+                .ttl(extractTtlAsSeconds(tenantProfile))
+                .strategy(TimeseriesSaveRequest.Strategy.SAVE_ALL)
+                .build();
+
+        node.onMsg(ctxMock, msg);
+        then(telemetryServiceMock).should(times(1)).saveTimeseries(assertArg(
+                actualSaveRequest -> assertThat(actualSaveRequest).usingRecursiveComparison().ignoringFields("callback").isEqualTo(expectedSaveRequest)
+        ));
+
+        node.onMsg(ctxMock, msg);
+        then(telemetryServiceMock).should(times(2)).saveTimeseries(assertArg(
+                actualSaveRequest -> assertThat(actualSaveRequest).usingRecursiveComparison().ignoringFields("callback").isEqualTo(expectedSaveRequest)
+        ));
+    }
+
+    @Test
+    public void givenDeduplicateProcessingSettingsAndSameMessageTwoTimes_whenOnMsg_thenPersistThisMessageOnlyFirstTime() throws TbNodeException {
+        // GIVEN
+        config.setProcessingSettings(new TbMsgTimeseriesNodeConfiguration.ProcessingSettings.Deduplicate(10));
+
+        node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .data(JacksonUtil.newObjectNode().put("temperature", 22.3).toString())
+                .metaData(new TbMsgMetaData(Map.of("ts", "123")))
+                .build();
+
+        // WHEN-THEN
+        var expectedSaveRequest = TimeseriesSaveRequest.builder()
+                .tenantId(TENANT_ID)
+                .customerId(msg.getCustomerId())
+                .entityId(msg.getOriginator())
+                .entry(new BasicTsKvEntry(123L, new DoubleDataEntry("temperature", 22.3)))
+                .ttl(extractTtlAsSeconds(tenantProfile))
+                .strategy(TimeseriesSaveRequest.Strategy.SAVE_ALL)
+                .build();
+
+        node.onMsg(ctxMock, msg);
+        then(telemetryServiceMock).should().saveTimeseries(assertArg(
+                actualSaveRequest -> assertThat(actualSaveRequest).usingRecursiveComparison().ignoringFields("callback").isEqualTo(expectedSaveRequest)
+        ));
+
+        clearInvocations(telemetryServiceMock, ctxMock);
+
+        node.onMsg(ctxMock, msg);
+        then(telemetryServiceMock).should(never()).saveTimeseries(any());
+    }
+
+    @Test
+    public void givenWebSocketsOnlyProcessingSettingsAndSameMessageTwoTimes_whenOnMsg_thenSendsOnlyWsUpdateTwoTimes() throws TbNodeException {
+        // GIVEN
+        config.setProcessingSettings(new TbMsgTimeseriesNodeConfiguration.ProcessingSettings.WebSocketsOnly());
+
+        node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .data(JacksonUtil.newObjectNode().put("temperature", 22.3).toString())
+                .metaData(new TbMsgMetaData(Map.of("ts", "123")))
+                .build();
+
+        // WHEN-THEN
+        var expectedSaveRequest = TimeseriesSaveRequest.builder()
+                .tenantId(TENANT_ID)
+                .customerId(msg.getCustomerId())
+                .entityId(msg.getOriginator())
+                .entry(new BasicTsKvEntry(123L, new DoubleDataEntry("temperature", 22.3)))
+                .ttl(extractTtlAsSeconds(tenantProfile))
+                .strategy(TimeseriesSaveRequest.Strategy.WS_ONLY)
+                .build();
+
+        node.onMsg(ctxMock, msg);
+        then(telemetryServiceMock).should(times(1)).saveTimeseries(assertArg(
+                actualSaveRequest -> assertThat(actualSaveRequest).usingRecursiveComparison().ignoringFields("callback").isEqualTo(expectedSaveRequest)
+        ));
+
+        node.onMsg(ctxMock, msg);
+        then(telemetryServiceMock).should(times(2)).saveTimeseries(assertArg(
+                actualSaveRequest -> assertThat(actualSaveRequest).usingRecursiveComparison().ignoringFields("callback").isEqualTo(expectedSaveRequest)
+        ));
+    }
+
+    @Test
+    public void givenAdvancedProcessingSettingsWithOnEveryMessageStrategiesForAllActionsAndSameMessageTwoTimes_whenOnMsg_thenPersistSameMessageTwoTimes() throws TbNodeException {
+        // GIVEN
+        config.setProcessingSettings(new TbMsgTimeseriesNodeConfiguration.ProcessingSettings.Advanced(
+                ProcessingStrategy.onEveryMessage(),
+                ProcessingStrategy.onEveryMessage(),
+                ProcessingStrategy.onEveryMessage()
+        ));
+
+        node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .data(JacksonUtil.newObjectNode().put("temperature", 22.3).toString())
+                .metaData(new TbMsgMetaData(Map.of("ts", "123")))
+                .build();
+
+        // WHEN-THEN
+        var expectedSaveRequest = TimeseriesSaveRequest.builder()
+                .tenantId(TENANT_ID)
+                .customerId(msg.getCustomerId())
+                .entityId(msg.getOriginator())
+                .entry(new BasicTsKvEntry(123L, new DoubleDataEntry("temperature", 22.3)))
+                .ttl(extractTtlAsSeconds(tenantProfile))
+                .strategy(TimeseriesSaveRequest.Strategy.SAVE_ALL)
+                .build();
+
+        node.onMsg(ctxMock, msg);
+        then(telemetryServiceMock).should(times(1)).saveTimeseries(assertArg(
+                actualSaveRequest -> assertThat(actualSaveRequest).usingRecursiveComparison().ignoringFields("callback").isEqualTo(expectedSaveRequest)
+        ));
+
+        node.onMsg(ctxMock, msg);
+        then(telemetryServiceMock).should(times(2)).saveTimeseries(assertArg(
+                actualSaveRequest -> assertThat(actualSaveRequest).usingRecursiveComparison().ignoringFields("callback").isEqualTo(expectedSaveRequest)
+        ));
+    }
+
+    @Test
+    public void givenAdvancedProcessingSettingsWithDifferentDeduplicateStrategyForEachAction_whenOnMsg_thenEvaluatesStrategiesForEachActionsIndependently() throws TbNodeException {
+        // GIVEN
+        config.setProcessingSettings(new TbMsgTimeseriesNodeConfiguration.ProcessingSettings.Advanced(
+                ProcessingStrategy.deduplicate(1),
+                ProcessingStrategy.deduplicate(2),
+                ProcessingStrategy.deduplicate(3)
+        ));
+
+        node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        long ts1 = 500L;
+        long ts2 = 1500L;
+        long ts3 = 2500L;
+
+        // WHEN-THEN
+        node.onMsg(ctxMock, TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .data(JacksonUtil.newObjectNode().put("temperature", 22.3).toString())
+                .metaData(new TbMsgMetaData(Map.of("ts", Long.toString(ts1))))
+                .build());
+        then(telemetryServiceMock).should().saveTimeseries(assertArg(
+                actualSaveRequest -> assertThat(actualSaveRequest.getStrategy()).isEqualTo(TimeseriesSaveRequest.Strategy.SAVE_ALL)
+        ));
+
+        clearInvocations(telemetryServiceMock);
+
+        node.onMsg(ctxMock, TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .data(JacksonUtil.newObjectNode().put("temperature", 22.3).toString())
+                .metaData(new TbMsgMetaData(Map.of("ts", Long.toString(ts2))))
+                .build());
+        then(telemetryServiceMock).should().saveTimeseries(assertArg(
+                actualSaveRequest -> assertThat(actualSaveRequest.getStrategy()).isEqualTo(new TimeseriesSaveRequest.Strategy(true, false, false))
+        ));
+
+        clearInvocations(telemetryServiceMock);
+
+        node.onMsg(ctxMock, TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .data(JacksonUtil.newObjectNode().put("temperature", 22.3).toString())
+                .metaData(new TbMsgMetaData(Map.of("ts", Long.toString(ts3))))
+                .build());
+        then(telemetryServiceMock).should().saveTimeseries(assertArg(
+                actualSaveRequest -> assertThat(actualSaveRequest.getStrategy()).isEqualTo(new TimeseriesSaveRequest.Strategy(true, true, false))
+        ));
+    }
+
+    @Test
+    public void givenAdvancedProcessingSettingsWithSkipStrategiesForAllActionsAndSameMessageTwoTimes_whenOnMsg_thenSkipsSameMessageTwoTimes() throws TbNodeException {
+        // GIVEN
+        config.setProcessingSettings(new TbMsgTimeseriesNodeConfiguration.ProcessingSettings.Advanced(
+                ProcessingStrategy.skip(),
+                ProcessingStrategy.skip(),
+                ProcessingStrategy.skip()
+        ));
+
+        node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        var msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .data(JacksonUtil.newObjectNode().put("temperature", 22.3).toString())
+                .metaData(new TbMsgMetaData(Map.of("ts", "123")))
+                .build();
+
+        // WHEN-THEN
+        node.onMsg(ctxMock, msg);
+        then(telemetryServiceMock).should(never()).saveTimeseries(any());
+        then(ctxMock).should(times(1)).tellSuccess(msg);
+
+        node.onMsg(ctxMock, msg);
+        then(telemetryServiceMock).should(never()).saveTimeseries(any());
+        then(ctxMock).should(times(2)).tellSuccess(msg);
+    }
+
+    private static long extractTtlAsSeconds(TenantProfile tenantProfile) {
+        return TimeUnit.DAYS.toSeconds(tenantProfile.getDefaultProfileConfiguration().getDefaultStorageTtlDays());
+    }
+
+    @Override
+    protected TbNode getTestNode() {
+        return node;
+    }
+
+    private static Stream<Arguments> givenFromVersionAndConfig_whenUpgrade_thenVerifyHasChangesAndConfig() {
+        return Stream.of(
+                Arguments.of(0, """
+                                {
+                                  "defaultTTL": 0,
+                                  "useServerTs": false,
+                                  "skipLatestPersistence": false
+                                }""",
+                        true,
+                        """
+                                {
+                                    "defaultTTL": 0,
+                                    "useServerTs": false,
+                                    "processingSettings": {
+                                        "type": "ON_EVERY_MESSAGE"
+                                    }
+                                }"""),
+                Arguments.of(0, """
+                                {
+                                  "defaultTTL": 0,
+                                  "useServerTs": false
+                                }""",
+                        true,
+                        """
+                                {
+                                    "defaultTTL": 0,
+                                    "useServerTs": false,
+                                    "processingSettings": {
+                                        "type": "ON_EVERY_MESSAGE"
+                                    }
+                                }"""),
+                Arguments.of(0, """
+                                {
+                                  "defaultTTL": 0,
+                                  "useServerTs": false,
+                                  "skipLatestPersistence": null
+                                }""",
+                        true,
+                        """
+                                {
+                                    "defaultTTL": 0,
+                                    "useServerTs": false,
+                                    "processingSettings": {
+                                        "type": "ON_EVERY_MESSAGE"
+                                    }
+                                }"""),
+                Arguments.of(0, """
+                                {
+                                  "defaultTTL": 0,
+                                  "useServerTs": false,
+                                  "skipLatestPersistence": true
+                                }""",
+                        true,
+                        """
+                                {
+                                    "defaultTTL": 0,
+                                    "useServerTs": false,
+                                    "processingSettings": {
+                                        "type": "ADVANCED",
+                                        "timeseries": {
+                                            "type": "ON_EVERY_MESSAGE"
+                                        },
+                                        "latest": {
+                                            "type": "SKIP"
+                                        },
+                                        "webSockets": {
+                                            "type": "ON_EVERY_MESSAGE"
+                                        }
+                                    }
+                                }""")
+        );
+    }
+
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/strategy/DeduplicateProcessingStrategyTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/strategy/DeduplicateProcessingStrategyTest.java
new file mode 100644
index 0000000000..2c81ecd0a1
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/strategy/DeduplicateProcessingStrategyTest.java
@@ -0,0 +1,260 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.telemetry.strategy;
+
+import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.github.benmanes.caffeine.cache.Policy;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.time.Duration;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class DeduplicateProcessingStrategyTest {
+
+    final int deduplicationIntervalSecs = 10;
+
+    DeduplicateProcessingStrategy strategy;
+
+    @BeforeEach
+    void setup() {
+        strategy = new DeduplicateProcessingStrategy(deduplicationIntervalSecs);
+    }
+
+    @Test
+    void shouldThrowWhenDeduplicationIntervalIsLessThanOneSecond() {
+        assertThatThrownBy(() -> new DeduplicateProcessingStrategy(0))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("Deduplication interval must be at least 1 second(s) and at most 86400 second(s), was 0 second(s)");
+    }
+
+    @Test
+    void shouldThrowWhenDeduplicationIntervalIsMoreThan24Hours() {
+        assertThatThrownBy(() -> new DeduplicateProcessingStrategy(86401))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("Deduplication interval must be at least 1 second(s) and at most 86400 second(s), was 86401 second(s)");
+    }
+
+    @Test
+    void shouldUseAtLeastTenMinutesForExpireAfterAccess() {
+        // GIVEN
+        int deduplicationIntervalSecs = 1; // min deduplication interval duration
+
+        // WHEN
+        strategy = new DeduplicateProcessingStrategy(deduplicationIntervalSecs);
+
+        // THEN
+        var deduplicationCache = (LoadingCache<Long, Set<UUID>>) ReflectionTestUtils.getField(strategy, "deduplicationCache");
+
+        assertThat(deduplicationCache.policy().expireAfterAccess())
+                .isPresent()
+                .map(Policy.FixedExpiration::getExpiresAfter)
+                .hasValue(Duration.ofMinutes(10L));
+    }
+
+    @Test
+    void shouldCalculateExpireAfterAccessAsIntervalDurationMultipliedByTen() {
+        // GIVEN
+        int deduplicationIntervalSecs = (int) Duration.ofHours(1L).toSeconds(); // max deduplication interval duration
+
+        // WHEN
+        strategy = new DeduplicateProcessingStrategy(deduplicationIntervalSecs);
+
+        // THEN
+        var deduplicationCache = (LoadingCache<Long, Set<UUID>>) ReflectionTestUtils.getField(strategy, "deduplicationCache");
+
+        assertThat(deduplicationCache.policy().expireAfterAccess())
+                .isPresent()
+                .map(Policy.FixedExpiration::getExpiresAfter)
+                .hasValue(Duration.ofHours(10L));
+    }
+
+    @Test
+    void shouldUseAtMostTwoDaysForExpireAfterAccess() {
+        // GIVEN
+        int deduplicationIntervalSecs = (int) Duration.ofDays(1L).toSeconds(); // max deduplication interval duration
+
+        // WHEN
+        strategy = new DeduplicateProcessingStrategy(deduplicationIntervalSecs);
+
+        // THEN
+        var deduplicationCache = (LoadingCache<Long, Set<UUID>>) ReflectionTestUtils.getField(strategy, "deduplicationCache");
+
+        assertThat(deduplicationCache.policy().expireAfterAccess())
+                .isPresent()
+                .map(Policy.FixedExpiration::getExpiresAfter)
+                .hasValue(Duration.ofDays(2L));
+    }
+
+    @Test
+    void shouldNotAllowMoreThan100DeduplicationIntervals() {
+        // GIVEN
+        int deduplicationIntervalSecs = 1; // min deduplication interval duration
+
+        // WHEN
+        strategy = new DeduplicateProcessingStrategy(deduplicationIntervalSecs);
+
+        // THEN
+        var deduplicationCache = (LoadingCache<Long, Set<UUID>>) ReflectionTestUtils.getField(strategy, "deduplicationCache");
+
+        assertThat(deduplicationCache.policy().eviction())
+                .isPresent()
+                .map(Policy.Eviction::getMaximum)
+                .hasValue(100L);
+    }
+
+    @Test
+    void shouldCalculateMaxIntervalsAsTwoDaysDividedByIntervalDuration() {
+        // GIVEN
+        int deduplicationIntervalSecs = (int) Duration.ofHours(1L).toSeconds();
+
+        // WHEN
+        strategy = new DeduplicateProcessingStrategy(deduplicationIntervalSecs);
+
+        // THEN
+        var deduplicationCache = (LoadingCache<Long, Set<UUID>>) ReflectionTestUtils.getField(strategy, "deduplicationCache");
+
+        assertThat(deduplicationCache.policy().eviction())
+                .isPresent()
+                .map(Policy.Eviction::getMaximum)
+                .hasValue(48L);
+    }
+
+    @Test
+    void shouldKeepAtLeastTwoDeduplicationIntervals() {
+        // GIVEN
+        int deduplicationIntervalSecs = (int) Duration.ofDays(1L).toSeconds(); // max deduplication interval duration
+
+        // WHEN
+        strategy = new DeduplicateProcessingStrategy(deduplicationIntervalSecs);
+
+        // THEN
+        var deduplicationCache = (LoadingCache<Long, Set<UUID>>) ReflectionTestUtils.getField(strategy, "deduplicationCache");
+
+        assertThat(deduplicationCache.policy().eviction())
+                .isPresent()
+                .map(Policy.Eviction::getMaximum)
+                .hasValue(2L);
+    }
+
+    @Test
+    void shouldReturnTrueForFirstCallInInterval() {
+        long ts = 1_000_000L;
+        UUID originator = UUID.randomUUID();
+
+        assertThat(strategy.shouldProcess(ts, originator)).isTrue();
+    }
+
+    @Test
+    void shouldReturnFalseForSubsequentCallsInInterval() {
+        long baseTs = 1_000_000L;
+        UUID originator = UUID.randomUUID();
+
+        // Initial call should return true
+        assertThat(strategy.shouldProcess(baseTs, originator)).isTrue();
+
+        // Subsequent call within the same interval should return false for the same originator
+        long withinSameIntervalTs = baseTs + 1000L;
+        assertThat(strategy.shouldProcess(withinSameIntervalTs, originator)).isFalse();
+    }
+
+    @Test
+    void shouldHandleMultipleOriginatorsIndependently() {
+        long baseTs = 1_000_000L;
+        UUID originator1 = UUID.randomUUID();
+        UUID originator2 = UUID.randomUUID();
+
+        // First call for different originators in the same interval should return true independently
+        assertThat(strategy.shouldProcess(baseTs, originator1)).isTrue();
+        assertThat(strategy.shouldProcess(baseTs, originator2)).isTrue();
+
+        // Subsequent calls for the same originators within the same interval should return false
+        assertThat(strategy.shouldProcess(baseTs + 500L, originator1)).isFalse();
+        assertThat(strategy.shouldProcess(baseTs + 500L, originator2)).isFalse();
+    }
+
+    @Test
+    void shouldHandleEdgeCaseTimestamps() {
+        long minTs = Long.MIN_VALUE;
+        long maxTs = Long.MAX_VALUE;
+        UUID originator = UUID.randomUUID();
+
+        assertThat(strategy.shouldProcess(minTs, originator)).isTrue();
+        assertThat(strategy.shouldProcess(minTs + 1L, originator)).isFalse();
+
+        assertThat(strategy.shouldProcess(maxTs, originator)).isTrue();
+        assertThat(strategy.shouldProcess(maxTs - 1L, originator)).isFalse();
+    }
+
+    @Test
+    void shouldResetDeduplicationAtIntervalBoundaries() {
+        UUID originator = UUID.randomUUID();
+
+        // check 1st interval
+        long firstIntervalStart = 0L;
+        long firstIntervalEnd = firstIntervalStart + Duration.ofSeconds(deduplicationIntervalSecs).toMillis() - 1L;
+        long firstIntervalMiddle = calculateMiddle(firstIntervalStart, firstIntervalEnd);
+
+        assertThat(strategy.shouldProcess(firstIntervalStart, originator)).isTrue();
+        assertThat(strategy.shouldProcess(firstIntervalStart + 1, originator)).isFalse();
+        assertThat(strategy.shouldProcess(firstIntervalMiddle, originator)).isFalse();
+        assertThat(strategy.shouldProcess(firstIntervalEnd - 1, originator)).isFalse();
+        assertThat(strategy.shouldProcess(firstIntervalEnd, originator)).isFalse();
+
+        // check 2nd interval
+        long secondIntervalStart = firstIntervalEnd + 1L;
+        long secondIntervalEnd = secondIntervalStart + Duration.ofSeconds(deduplicationIntervalSecs).toMillis() - 1L;
+        long secondIntervalMiddle = calculateMiddle(secondIntervalStart, secondIntervalEnd);
+
+        assertThat(strategy.shouldProcess(secondIntervalStart, originator)).isTrue();
+        assertThat(strategy.shouldProcess(secondIntervalStart + 1, originator)).isFalse();
+        assertThat(strategy.shouldProcess(secondIntervalMiddle, originator)).isFalse();
+        assertThat(strategy.shouldProcess(secondIntervalEnd - 1, originator)).isFalse();
+        assertThat(strategy.shouldProcess(secondIntervalEnd, originator)).isFalse();
+    }
+
+    @Test
+    void shouldHandleMultipleOriginatorsOverMultipleIntervals() {
+        UUID originator1 = UUID.randomUUID();
+        UUID originator2 = UUID.randomUUID();
+        long baseTs = 0L;
+
+        // First interval for both originators
+        assertThat(strategy.shouldProcess(baseTs, originator1)).isTrue();
+        assertThat(strategy.shouldProcess(baseTs, originator2)).isTrue();
+
+        // Move to the next interval
+        long nextIntervalTs = baseTs + Duration.ofSeconds(10).toMillis();
+
+        // Each originator should be allowed again in the new interval
+        assertThat(strategy.shouldProcess(nextIntervalTs, originator1)).isTrue();
+        assertThat(strategy.shouldProcess(nextIntervalTs, originator2)).isTrue();
+
+        // Subsequent calls in the same new interval should return false
+        assertThat(strategy.shouldProcess(nextIntervalTs + 500L, originator1)).isFalse();
+        assertThat(strategy.shouldProcess(nextIntervalTs + 500L, originator2)).isFalse();
+    }
+
+    private static long calculateMiddle(long start, long end) {
+        return start + (end - start) / 2;
+    }
+
+}
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/strategy/OnEveryMessageProcessingStrategyTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/strategy/OnEveryMessageProcessingStrategyTest.java
new file mode 100644
index 0000000000..36858418c3
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/strategy/OnEveryMessageProcessingStrategyTest.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.rule.engine.telemetry.strategy;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.UUID;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class OnEveryMessageProcessingStrategyTest {
+
+    @ParameterizedTest
+    @MethodSource("edgeCaseProvider")
+    void shouldAlwaysReturnTrueForAnyInput(long timestamp, UUID originator) {
+        var onEveryMessage = OnEveryMessageProcessingStrategy.getInstance();
+        assertThat(onEveryMessage.shouldProcess(timestamp, originator)).isTrue();
+    }
+
+    private static Stream<Arguments> edgeCaseProvider() {
+        return Stream.of(
+                Arguments.of(Long.MIN_VALUE, new UUID(0L, 0L)),
+                Arguments.of(Long.MAX_VALUE, new UUID(Long.MAX_VALUE, Long.MAX_VALUE)),
+                Arguments.of(0L, new UUID(0L, 0L)),
+                Arguments.of(-1L, new UUID(-1L, -1L)),
+                Arguments.of(1L, new UUID(1L, 1L)),
+                Arguments.of(42L, UUID.randomUUID()),
+                Arguments.of(1000L, null)
+        );
+    }
+
+}
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/strategy/ProcessingStrategyTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/strategy/ProcessingStrategyTest.java
new file mode 100644
index 0000000000..45fed469d2
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/strategy/ProcessingStrategyTest.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.rule.engine.telemetry.strategy;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.time.Duration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ProcessingStrategyTest {
+
+    @Test
+    void testOnEveryMessageReturnsCorrectInstance() {
+        ProcessingStrategy strategy = ProcessingStrategy.onEveryMessage();
+        assertThat(strategy)
+                .isNotNull()
+                .isInstanceOf(OnEveryMessageProcessingStrategy.class);
+    }
+
+    @Test
+    void testDeduplicateReturnsCorrectInstance() {
+        int validDeduplicationIntervalSecs = 5;
+        ProcessingStrategy strategy = ProcessingStrategy.deduplicate(validDeduplicationIntervalSecs);
+        assertThat(strategy)
+                .isNotNull()
+                .isInstanceOf(DeduplicateProcessingStrategy.class);
+
+        long actualDeduplicationIntervalMillis = (long) ReflectionTestUtils.getField(strategy, "deduplicationIntervalMillis");
+        assertThat(actualDeduplicationIntervalMillis).isEqualTo(Duration.ofSeconds(validDeduplicationIntervalSecs).toMillis());
+    }
+
+    @Test
+    void testSkipReturnsCorrectInstance() {
+        ProcessingStrategy strategy = ProcessingStrategy.skip();
+        assertThat(strategy)
+                .isNotNull()
+                .isInstanceOf(SkipProcessingStrategy.class);
+    }
+
+}
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/strategy/SkipProcessingStrategyTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/strategy/SkipProcessingStrategyTest.java
new file mode 100644
index 0000000000..ffdf2fc87e
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/strategy/SkipProcessingStrategyTest.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.rule.engine.telemetry.strategy;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.UUID;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class SkipProcessingStrategyTest {
+
+    @ParameterizedTest
+    @MethodSource("edgeCaseProvider")
+    void shouldAlwaysReturnFalseForAnyInput(long timestamp, UUID originator) {
+        var skipStrategy = SkipProcessingStrategy.getInstance();
+        assertThat(skipStrategy.shouldProcess(timestamp, originator)).isFalse();
+    }
+
+    private static Stream<Arguments> edgeCaseProvider() {
+        return Stream.of(
+                Arguments.of(Long.MIN_VALUE, new UUID(0L, 0L)),
+                Arguments.of(Long.MAX_VALUE, new UUID(Long.MAX_VALUE, Long.MAX_VALUE)),
+                Arguments.of(0L, new UUID(0L, 0L)),
+                Arguments.of(-1L, new UUID(-1L, -1L)),
+                Arguments.of(1L, new UUID(1L, 1L)),
+                Arguments.of(42L, UUID.randomUUID()),
+                Arguments.of(1000L, null)
+        );
+    }
+
+}
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 098fe3efda..2a0e0b73f7 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
@@ -176,8 +176,15 @@ public class TbChangeOriginatorNodeTest {
         Device device = new Device(DEVICE_ID);
         device.setCustomerId(CUSTOMER_ID);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
-        TbMsg expectedMsg = TbMsg.transformMsgOriginator(msg, CUSTOMER_ID);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
+        TbMsg expectedMsg = msg.transform()
+                .originator(CUSTOMER_ID)
+                .build();
 
         given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
         given(ctxMock.getDeviceService()).willReturn(deviceServiceMock);
@@ -199,8 +206,15 @@ public class TbChangeOriginatorNodeTest {
     public void givenOriginatorSourceIsTenant_whenOnMsg_thenTellSuccess() throws TbNodeException {
         config.setOriginatorSource(TENANT);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, ASSET_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
-        TbMsg expectedMsg = TbMsg.transformMsgOriginator(msg, TENANT_ID);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(ASSET_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
+        TbMsg expectedMsg = msg.transform()
+                .originator(TENANT_ID)
+                .build();
 
         given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
         given(ctxMock.getTenantId()).willReturn(TENANT_ID);
@@ -219,7 +233,12 @@ public class TbChangeOriginatorNodeTest {
     public void givenOriginatorSourceIsRelatedAndNewOriginatorIsNull_whenOnMsg_thenTellFailure() throws TbNodeException {
         config.setOriginatorSource(RELATED);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, ASSET_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(ASSET_ID)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
         given(ctxMock.getRelationService()).willReturn(relationServiceMock);
@@ -253,8 +272,15 @@ public class TbChangeOriginatorNodeTest {
         Alarm alarm = new Alarm(alarmId);
         alarm.setOriginator(DEVICE_ID);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.ALARM, alarmId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
-        TbMsg expectedMsg = TbMsg.transformMsgOriginator(msg, DEVICE_ID);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.ALARM)
+                .originator(alarmId)
+                .copyMetaData(TbMsgMetaData.EMPTY)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
+        TbMsg expectedMsg = msg.transform()
+                .originator(DEVICE_ID)
+                .build();
 
         given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
         given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
@@ -279,8 +305,15 @@ public class TbChangeOriginatorNodeTest {
         config.setEntityType(EntityType.ASSET.name());
         config.setEntityNamePattern(entityNamePattern);
 
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, data);
-        TbMsg expectedMsg = TbMsg.transformMsgOriginator(msg, ASSET_ID);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(data)
+                .build();
+        TbMsg expectedMsg = msg.transform()
+                .originator(ASSET_ID)
+                .build();
 
         given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
         given(ctxMock.getAssetService()).willReturn(assetServiceMock);
@@ -315,7 +348,12 @@ public class TbChangeOriginatorNodeTest {
 
         TbMsgMetaData metaData = new TbMsgMetaData();
         metaData.putValue("md-name-pattern", "test-asset");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, TbMsg.EMPTY_JSON_OBJECT);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(DEVICE_ID)
+                .copyMetaData(metaData)
+                .data(TbMsg.EMPTY_JSON_OBJECT)
+                .build();
 
         given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
         given(ctxMock.getAssetService()).willReturn(assetServiceMock);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyKeysNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyKeysNodeTest.java
index b680981e34..3e214d534d 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyKeysNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyKeysNodeTest.java
@@ -196,7 +196,13 @@ public class TbCopyKeysNodeTest {
                 "voltageDataValue", "220",
                 "city", "NY"
         );
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, new TbMsgMetaData(mdMap), data, callback);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(new TbMsgMetaData(mdMap))
+                .data(data)
+                .callback(callback)
+                .build();
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java
index 670b117a2c..036dc5440b 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java
@@ -173,7 +173,13 @@ public class TbDeleteKeysNodeTest {
                 "voltageDataValue", "220",
                 "city", "NY"
         );
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, new TbMsgMetaData(mdMap), data, callback);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(new TbMsgMetaData(mdMap))
+                .data(data)
+                .callback(callback)
+                .build();
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbJsonPathNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbJsonPathNodeTest.java
index 2c09bf555c..ab8c9a44ba 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbJsonPathNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbJsonPathNodeTest.java
@@ -171,6 +171,12 @@ public class TbJsonPathNodeTest {
         Map<String, String> mdMap = Map.of("country", "US",
                 "city", "NY"
         );
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, new TbMsgMetaData(mdMap), data, callback);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(new TbMsgMetaData(mdMap))
+                .data(data)
+                .callback(callback)
+                .build();
     }
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java
index 26fd9081a9..cbff064ec3 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java
@@ -103,7 +103,12 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest {
             EntityId originator = (EntityId) (invocationOnMock.getArguments())[2];
             TbMsgMetaData metaData = (TbMsgMetaData) (invocationOnMock.getArguments())[3];
             String data = (String) (invocationOnMock.getArguments())[4];
-            return TbMsg.newMsg(type, originator, metaData.copy(), data);
+            return TbMsg.newMsg()
+                    .type(type)
+                    .originator(originator)
+                    .copyMetaData(metaData)
+                    .data(data)
+                    .build();
         }).when(ctx).newMsg(isNull(), eq(TbMsgType.DEDUPLICATION_TIMEOUT_SELF_MSG), nullable(EntityId.class), any(TbMsgMetaData.class), any(String.class));
         node = spy(new TbMsgDeduplicationNode());
         config = new TbMsgDeduplicationNodeConfiguration().defaultConfiguration();
@@ -452,12 +457,13 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest {
         dataNode.put("deviceId", deviceId.getId().toString());
         TbMsgMetaData metaData = new TbMsgMetaData();
         metaData.putValue("ts", String.valueOf(ts));
-        return TbMsg.newMsg(
-                DataConstants.MAIN_QUEUE_NAME,
-                TbMsgType.POST_TELEMETRY_REQUEST,
-                deviceId,
-                metaData,
-                JacksonUtil.toString(dataNode));
+        return TbMsg.newMsg()
+                .queueName(DataConstants.MAIN_QUEUE_NAME)
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(deviceId)
+                .copyMetaData(metaData)
+                .data(JacksonUtil.toString(dataNode))
+                .build();
     }
 
     private String getMergedData(List<TbMsg> msgs) {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java
index 03580920ce..0c7f291db1 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java
@@ -188,6 +188,12 @@ public class TbRenameKeysNodeTest {
                 "country", "US",
                 "city", "NY"
         );
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, new TbMsgMetaData(mdMap), data, callback);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(new TbMsgMetaData(mdMap))
+                .data(data)
+                .callback(callback)
+                .build();
     }
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java
index 8abf83fa48..895ae96db8 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java
@@ -132,6 +132,12 @@ public class TbSplitArrayMsgNodeTest {
                 "country", "US",
                 "city", "NY"
         );
-        return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, new TbMsgMetaData(mdMap), data, callback);
+        return TbMsg.newMsg()
+                .type(TbMsgType.POST_ATTRIBUTES_REQUEST)
+                .originator(entityId)
+                .copyMetaData(new TbMsgMetaData(mdMap))
+                .data(data)
+                .callback(callback)
+                .build();
     }
 }
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 98ecc237b6..72f893aa86 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
@@ -61,8 +61,24 @@ public class TbTransformMsgNodeTest {
 
         RuleChainId ruleChainId = new RuleChainId(Uuids.timeBased());
         RuleNodeId ruleNodeId = new RuleNodeId(Uuids.timeBased());
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, null, metaData, TbMsgDataType.JSON,rawJson, ruleChainId, ruleNodeId);
-        TbMsg transformedMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, null, metaData, TbMsgDataType.JSON, "{new}", ruleChainId, ruleNodeId);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(null)
+                .copyMetaData(metaData)
+                .dataType(TbMsgDataType.JSON)
+                .data(rawJson)
+                .ruleChainId(ruleChainId)
+                .ruleNodeId(ruleNodeId)
+                .build();
+        TbMsg transformedMsg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(null)
+                .copyMetaData(metaData)
+                .dataType(TbMsgDataType.JSON)
+                .data("{new}")
+                .ruleChainId(ruleChainId)
+                .ruleNodeId(ruleNodeId)
+                .build();
         when(scriptEngine.executeUpdateAsync(msg)).thenReturn(Futures.immediateFuture(Collections.singletonList(transformedMsg)));
 
         node.onMsg(ctx, msg);
@@ -81,7 +97,15 @@ public class TbTransformMsgNodeTest {
 
         RuleChainId ruleChainId = new RuleChainId(Uuids.timeBased());
         RuleNodeId ruleNodeId = new RuleNodeId(Uuids.timeBased());
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, null, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
+        TbMsg msg = TbMsg.newMsg()
+                .type(TbMsgType.POST_TELEMETRY_REQUEST)
+                .originator(null)
+                .copyMetaData(metaData)
+                .dataType(TbMsgDataType.JSON)
+                .data(rawJson)
+                .ruleChainId(ruleChainId)
+                .ruleNodeId(ruleNodeId)
+                .build();
         when(scriptEngine.executeUpdateAsync(msg)).thenReturn(Futures.immediateFailedFuture(new IllegalStateException("error")));
 
         node.onMsg(ctx, msg);
diff --git a/tools/pom.xml b/tools/pom.xml
index dce8e1606d..4f7c3f48a6 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>tools</artifactId>
diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml
index eef23eae9b..452ef6ec9a 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.9.0-RC</version>
+        <version>4.0.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 0c7ff4e43e..66ab703a54 100644
--- a/transport/coap/src/main/resources/tb-coap-transport.yml
+++ b/transport/coap/src/main/resources/tb-coap-transport.yml
@@ -256,9 +256,7 @@ coap:
 
 # Queue configuration parameters
 queue:
-  # kafka (Apache Kafka). The following queue types are deprecated and will no longer be supported in ThingsBoard 4.0:
-  # aws-sqs (AWS SQS), pubsub (PubSub), service-bus (Azure Service Bus), rabbitmq (RabbitMQ)
-  type: "${TB_QUEUE_TYPE:kafka}"
+  type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka).
   kafka:
     # Kafka Bootstrap Servers
@@ -333,94 +331,6 @@ queue:
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:52428800;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:52428800;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}"
-    # Access key ID from AWS IAM user
-    access_key_id: "${TB_QUEUE_AWS_SQS_ACCESS_KEY_ID:YOUR_KEY}"
-    # Secret access key from AWS IAM user
-    secret_access_key: "${TB_QUEUE_AWS_SQS_SECRET_ACCESS_KEY:YOUR_SECRET}"
-    # Region from AWS account
-    region: "${TB_QUEUE_AWS_SQS_REGION:YOUR_REGION}"
-    # Number of threads per each AWS SQS queue in consumer
-    threads_per_topic: "${TB_QUEUE_AWS_SQS_THREADS_PER_TOPIC:1}"
-    # Thread pool size for aws_sqs queue producer executor provider. Default value equals to AmazonSQSAsyncClient.DEFAULT_THREAD_POOL_SIZE
-    producer_thread_pool_size: "${TB_QUEUE_AWS_SQS_EXECUTOR_THREAD_POOL_SIZE:50}"
-    queue-properties:
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      rule-engine: "${TB_QUEUE_AWS_SQS_RE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      core: "${TB_QUEUE_AWS_SQS_CORE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      transport-api: "${TB_QUEUE_AWS_SQS_TA_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      notifications: "${TB_QUEUE_AWS_SQS_NOTIFICATIONS_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-  pubsub:
-    # Project ID from Google Cloud
-    project_id: "${TB_QUEUE_PUBSUB_PROJECT_ID:YOUR_PROJECT_ID}"
-    # API Credentials in JSON format
-    service_account: "${TB_QUEUE_PUBSUB_SERVICE_ACCOUNT:YOUR_SERVICE_ACCOUNT}"
-    # Message size for PubSub queue. Value in bytes
-    max_msg_size: "${TB_QUEUE_PUBSUB_MAX_MSG_SIZE:1048576}"
-    # Number of messages per consumer
-    max_messages: "${TB_QUEUE_PUBSUB_MAX_MESSAGES:1000}"
-    # Thread pool size for pubsub queue executor provider. If not set - default pubsub executor provider value will be used (5 * number of available processors)
-    executor_thread_pool_size: "${TB_QUEUE_PUBSUB_EXECUTOR_THREAD_POOL_SIZE:0}"
-    queue-properties:
-      # Pub/Sub properties for Rule Engine subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      rule-engine: "${TB_QUEUE_PUBSUB_RE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Core subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      core: "${TB_QUEUE_PUBSUB_CORE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Transport API subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      transport-api: "${TB_QUEUE_PUBSUB_TA_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Version Control subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      notifications: "${TB_QUEUE_PUBSUB_NOTIFICATIONS_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-  service_bus:
-    # Azure namespace
-    namespace_name: "${TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME:YOUR_NAMESPACE_NAME}"
-    # Azure Service Bus Shared Access Signatures key name
-    sas_key_name: "${TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME:YOUR_SAS_KEY_NAME}"
-    # Azure Service Bus Shared Access Signatures key
-    sas_key: "${TB_QUEUE_SERVICE_BUS_SAS_KEY:YOUR_SAS_KEY}"
-    # Number of messages per a consumer
-    max_messages: "${TB_QUEUE_SERVICE_BUS_MAX_MESSAGES:1000}"
-    queue-properties:
-      # Azure Service Bus properties for Rule Engine queues
-      rule-engine: "${TB_QUEUE_SERVICE_BUS_RE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Core queues
-      core: "${TB_QUEUE_SERVICE_BUS_CORE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Transport Api queues
-      transport-api: "${TB_QUEUE_SERVICE_BUS_TA_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Notification queues
-      notifications: "${TB_QUEUE_SERVICE_BUS_NOTIFICATIONS_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-  rabbitmq:
-    # By default empty
-    exchange_name: "${TB_QUEUE_RABBIT_MQ_EXCHANGE_NAME:}"
-    # RabbitMQ host used to establish connection
-    host: "${TB_QUEUE_RABBIT_MQ_HOST:localhost}"
-    # RabbitMQ host used to establish a connection
-    port: "${TB_QUEUE_RABBIT_MQ_PORT:5672}"
-    # Virtual hosts provide logical grouping and separation of resources
-    virtual_host: "${TB_QUEUE_RABBIT_MQ_VIRTUAL_HOST:/}"
-    # Username for RabbitMQ user account
-    username: "${TB_QUEUE_RABBIT_MQ_USERNAME:YOUR_USERNAME}"
-    # User password for RabbitMQ user account
-    password: "${TB_QUEUE_RABBIT_MQ_PASSWORD:YOUR_PASSWORD}"
-    # Network connection between clients and RabbitMQ nodes can fail. RabbitMQ Java client supports automatic recovery of connections and topology (queues, exchanges, bindings, and consumers)
-    automatic_recovery_enabled: "${TB_QUEUE_RABBIT_MQ_AUTOMATIC_RECOVERY_ENABLED:false}"
-    # The connection timeout for the RabbitMQ connection factory
-    connection_timeout: "${TB_QUEUE_RABBIT_MQ_CONNECTION_TIMEOUT:60000}"
-    # RabbitMQ has a timeout for connection handshake. When clients run in heavily constrained environments, it may be necessary to increase the timeout
-    handshake_timeout: "${TB_QUEUE_RABBIT_MQ_HANDSHAKE_TIMEOUT:10000}"
-    queue-properties:
-      # RabbitMQ properties for Rule Engine queues
-      rule-engine: "${TB_QUEUE_RABBIT_MQ_RE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Core queues
-      core: "${TB_QUEUE_RABBIT_MQ_CORE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Transport API queues
-      transport-api: "${TB_QUEUE_RABBIT_MQ_TA_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Notification queues
-      notifications: "${TB_QUEUE_RABBIT_MQ_NOTIFICATIONS_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
   partitions:
     hash_function_name: "${TB_QUEUE_PARTITIONS_HASH_FUNCTION_NAME:murmur3_128}" # murmur3_32, murmur3_128 or sha256
   transport_api:
@@ -439,7 +349,7 @@ queue:
     # Interval in milliseconds to poll api response from transport microservices
     response_poll_interval: "${TB_QUEUE_TRANSPORT_RESPONSE_POLL_INTERVAL_MS:25}"
   core:
-    # Default topic name of Kafka, RabbitMQ, etc. queue
+    # Default topic name
     topic: "${TB_QUEUE_CORE_TOPIC:tb_core}"
     # Interval in milliseconds to poll messages by Core microservices
     poll-interval: "${TB_QUEUE_CORE_POLL_INTERVAL_MS:25}"
@@ -447,7 +357,7 @@ queue:
     partitions: "${TB_QUEUE_CORE_PARTITIONS:10}"
     # Timeout for processing a message pack by Core microservices
     pack-processing-timeout: "${TB_QUEUE_CORE_PACK_PROCESSING_TIMEOUT_MS:60000}"
-    # Default topic name for queue Kafka, RabbitMQ, etc.
+    # Default topic name
     usage-stats-topic: "${TB_QUEUE_US_TOPIC:tb_usage_stats}"
     stats:
       # Enable/disable statistics for Core microservices
diff --git a/transport/http/pom.xml b/transport/http/pom.xml
index d841c56da7..2408340792 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.9.0-RC</version>
+        <version>4.0.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 3c28c6ddf6..be91e4fe67 100644
--- a/transport/http/src/main/resources/tb-http-transport.yml
+++ b/transport/http/src/main/resources/tb-http-transport.yml
@@ -202,9 +202,7 @@ transport:
 
 # Queue configuration parameters
 queue:
-  # kafka (Apache Kafka). The following queue types are deprecated and will no longer be supported in ThingsBoard 4.0:
-  # aws-sqs (AWS SQS), pubsub (PubSub), service-bus (Azure Service Bus), rabbitmq (RabbitMQ)
-  type: "${TB_QUEUE_TYPE:kafka}"
+  type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka) .
   kafka:
     # Kafka Bootstrap Servers
@@ -278,95 +276,6 @@ queue:
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:52428800;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:52428800;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}"
-    # Access key ID from AWS IAM user
-    access_key_id: "${TB_QUEUE_AWS_SQS_ACCESS_KEY_ID:YOUR_KEY}"
-    # Secret access key from AWS IAM user
-    secret_access_key: "${TB_QUEUE_AWS_SQS_SECRET_ACCESS_KEY:YOUR_SECRET}"
-    # Region from AWS account
-    region: "${TB_QUEUE_AWS_SQS_REGION:YOUR_REGION}"
-    # Number of threads per each AWS SQS queue in consumer
-    threads_per_topic: "${TB_QUEUE_AWS_SQS_THREADS_PER_TOPIC:1}"
-    # Thread pool size for aws_sqs queue producer executor provider. Default value equals to AmazonSQSAsyncClient.DEFAULT_THREAD_POOL_SIZE
-    producer_thread_pool_size: "${TB_QUEUE_AWS_SQS_EXECUTOR_THREAD_POOL_SIZE:50}"
-    queue-properties:
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      rule-engine: "${TB_QUEUE_AWS_SQS_RE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      core: "${TB_QUEUE_AWS_SQS_CORE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      transport-api: "${TB_QUEUE_AWS_SQS_TA_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      notifications: "${TB_QUEUE_AWS_SQS_NOTIFICATIONS_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      #    VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-  pubsub:
-    # Project ID from Google Cloud
-    project_id: "${TB_QUEUE_PUBSUB_PROJECT_ID:YOUR_PROJECT_ID}"
-    # API Credentials in JSON format
-    service_account: "${TB_QUEUE_PUBSUB_SERVICE_ACCOUNT:YOUR_SERVICE_ACCOUNT}"
-    # Message size for PubSub queue.Value in bytes
-    max_msg_size: "${TB_QUEUE_PUBSUB_MAX_MSG_SIZE:1048576}"
-    # Number of messages per a consumer
-    max_messages: "${TB_QUEUE_PUBSUB_MAX_MESSAGES:1000}"
-    # Thread pool size for pubsub queue executor provider. If not set - default pubsub executor provider value will be used (5 * number of available processors)
-    executor_thread_pool_size: "${TB_QUEUE_PUBSUB_EXECUTOR_THREAD_POOL_SIZE:0}"
-    queue-properties:
-      # Pub/Sub properties for Rule Engine subscribers, messages which will commit after ackDeadlineInSec period can be consume again
-      rule-engine: "${TB_QUEUE_PUBSUB_RE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Core subscribers, messages which will commit after ackDeadlineInSec period can be consume again
-      core: "${TB_QUEUE_PUBSUB_CORE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Transport API subscribers, messages which will commit after ackDeadlineInSec period can be consume again
-      transport-api: "${TB_QUEUE_PUBSUB_TA_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Version Control subscribers, messages which will commit after ackDeadlineInSec period can be consume again
-      notifications: "${TB_QUEUE_PUBSUB_NOTIFICATIONS_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-  service_bus:
-    # Azure namespace
-    namespace_name: "${TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME:YOUR_NAMESPACE_NAME}"
-    # Azure Service Bus Shared Access Signatures key name
-    sas_key_name: "${TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME:YOUR_SAS_KEY_NAME}"
-    # Azure Service Bus Shared Access Signatures key
-    sas_key: "${TB_QUEUE_SERVICE_BUS_SAS_KEY:YOUR_SAS_KEY}"
-    # Number of messages per a consumer
-    max_messages: "${TB_QUEUE_SERVICE_BUS_MAX_MESSAGES:1000}"
-    queue-properties:
-      # Azure Service Bus properties for Rule Engine queues
-      rule-engine: "${TB_QUEUE_SERVICE_BUS_RE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Core queues
-      core: "${TB_QUEUE_SERVICE_BUS_CORE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Transport Api queues
-      transport-api: "${TB_QUEUE_SERVICE_BUS_TA_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Notification queues
-      notifications: "${TB_QUEUE_SERVICE_BUS_NOTIFICATIONS_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-  rabbitmq:
-    # By default empty
-    exchange_name: "${TB_QUEUE_RABBIT_MQ_EXCHANGE_NAME:}"
-    # RabbitMQ host used to establish connection
-    host: "${TB_QUEUE_RABBIT_MQ_HOST:localhost}"
-    # RabbitMQ host used to establish a connection
-    port: "${TB_QUEUE_RABBIT_MQ_PORT:5672}"
-    # Virtual hosts provide logical grouping and separation of resources
-    virtual_host: "${TB_QUEUE_RABBIT_MQ_VIRTUAL_HOST:/}"
-    # Username for RabbitMQ user account
-    username: "${TB_QUEUE_RABBIT_MQ_USERNAME:YOUR_USERNAME}"
-    # User password for RabbitMQ user account
-    password: "${TB_QUEUE_RABBIT_MQ_PASSWORD:YOUR_PASSWORD}"
-    # Network connection between clients and RabbitMQ nodes can fail. RabbitMQ Java client supports automatic recovery of connections and topology (queues, exchanges, bindings, and consumers)
-    automatic_recovery_enabled: "${TB_QUEUE_RABBIT_MQ_AUTOMATIC_RECOVERY_ENABLED:false}"
-    # The connection timeout for the RabbitMQ connection factory
-    connection_timeout: "${TB_QUEUE_RABBIT_MQ_CONNECTION_TIMEOUT:60000}"
-    # RabbitMQ has a timeout for connection handshake. When clients run in heavily constrained environments, it may be necessary to increase the timeout
-    handshake_timeout: "${TB_QUEUE_RABBIT_MQ_HANDSHAKE_TIMEOUT:10000}"
-    queue-properties:
-      # RabbitMQ properties for Rule Engine queues
-      rule-engine: "${TB_QUEUE_RABBIT_MQ_RE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Core queues
-      core: "${TB_QUEUE_RABBIT_MQ_CORE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Transport API queues
-      transport-api: "${TB_QUEUE_RABBIT_MQ_TA_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Notification queues
-      notifications: "${TB_QUEUE_RABBIT_MQ_NOTIFICATIONS_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
   partitions:
     hash_function_name: "${TB_QUEUE_PARTITIONS_HASH_FUNCTION_NAME:murmur3_128}" # murmur3_32, murmur3_128 or sha256
   transport_api:
@@ -385,7 +294,7 @@ queue:
     # Interval in milliseconds to poll api response from transport microservices
     response_poll_interval: "${TB_QUEUE_TRANSPORT_RESPONSE_POLL_INTERVAL_MS:25}"
   core:
-    # Default topic name of Kafka, RabbitMQ, etc. queue
+    # Default topic name
     topic: "${TB_QUEUE_CORE_TOPIC:tb_core}"
     # Interval in milliseconds to poll messages by Core microservices
     poll-interval: "${TB_QUEUE_CORE_POLL_INTERVAL_MS:25}"
@@ -393,7 +302,7 @@ queue:
     partitions: "${TB_QUEUE_CORE_PARTITIONS:10}"
     # Timeout for processing a message pack by Core microservices
     pack-processing-timeout: "${TB_QUEUE_CORE_PACK_PROCESSING_TIMEOUT_MS:60000}"
-    # Default topic name for queue Kafka, RabbitMQ, etc.
+    # Default topic name
     usage-stats-topic: "${TB_QUEUE_US_TOPIC:tb_usage_stats}"
     stats:
       # Enable/disable statistics for Core microservices
diff --git a/transport/lwm2m/pom.xml b/transport/lwm2m/pom.xml
index cec30fcbc5..3ba43f5b53 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.9.0-RC</version>
+        <version>4.0.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 bafe77ee92..7bdd68baf1 100644
--- a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
+++ b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
@@ -302,9 +302,7 @@ transport:
 
 # Queue configuration properties
 queue:
-  # kafka (Apache Kafka). The following queue types are deprecated and will no longer be supported in ThingsBoard 4.0:
-  # aws-sqs (AWS SQS), pubsub (PubSub), service-bus (Azure Service Bus), rabbitmq (RabbitMQ)
-  type: "${TB_QUEUE_TYPE:kafka}"
+  type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka).
   kafka:
     # Kafka Bootstrap Servers
@@ -379,94 +377,6 @@ queue:
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:52428800;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:52428800;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}"
-    # Access key ID from AWS IAM user
-    access_key_id: "${TB_QUEUE_AWS_SQS_ACCESS_KEY_ID:YOUR_KEY}"
-    # Secret access key from AWS IAM user
-    secret_access_key: "${TB_QUEUE_AWS_SQS_SECRET_ACCESS_KEY:YOUR_SECRET}"
-    # Region from AWS account
-    region: "${TB_QUEUE_AWS_SQS_REGION:YOUR_REGION}"
-    # Number of threads per each AWS SQS queue in consumer
-    threads_per_topic: "${TB_QUEUE_AWS_SQS_THREADS_PER_TOPIC:1}"
-    # Thread pool size for aws_sqs queue producer executor provider. Default value equals to AmazonSQSAsyncClient.DEFAULT_THREAD_POOL_SIZE
-    producer_thread_pool_size: "${TB_QUEUE_AWS_SQS_EXECUTOR_THREAD_POOL_SIZE:50}"
-    queue-properties:
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      rule-engine: "${TB_QUEUE_AWS_SQS_RE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      core: "${TB_QUEUE_AWS_SQS_CORE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      transport-api: "${TB_QUEUE_AWS_SQS_TA_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      notifications: "${TB_QUEUE_AWS_SQS_NOTIFICATIONS_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-  pubsub:
-    # Project ID from Google Cloud
-    project_id: "${TB_QUEUE_PUBSUB_PROJECT_ID:YOUR_PROJECT_ID}"
-    # API Credentials in JSON format
-    service_account: "${TB_QUEUE_PUBSUB_SERVICE_ACCOUNT:YOUR_SERVICE_ACCOUNT}"
-    # Message size for PubSub queue. Value in bytes
-    max_msg_size: "${TB_QUEUE_PUBSUB_MAX_MSG_SIZE:1048576}"
-    # Number of messages per consumer
-    max_messages: "${TB_QUEUE_PUBSUB_MAX_MESSAGES:1000}"
-    # Thread pool size for pubsub queue executor provider. If not set - default pubsub executor provider value will be used (5 * number of available processors)
-    executor_thread_pool_size: "${TB_QUEUE_PUBSUB_EXECUTOR_THREAD_POOL_SIZE:0}"
-    queue-properties:
-      # Pub/Sub properties for Rule Engine subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      rule-engine: "${TB_QUEUE_PUBSUB_RE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Core subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      core: "${TB_QUEUE_PUBSUB_CORE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Transport API subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      transport-api: "${TB_QUEUE_PUBSUB_TA_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Version Control subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      notifications: "${TB_QUEUE_PUBSUB_NOTIFICATIONS_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-  service_bus:
-    # Azure namespace
-    namespace_name: "${TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME:YOUR_NAMESPACE_NAME}"
-    # Azure Service Bus Shared Access Signatures key name
-    sas_key_name: "${TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME:YOUR_SAS_KEY_NAME}"
-    # Azure Service Bus Shared Access Signatures key
-    sas_key: "${TB_QUEUE_SERVICE_BUS_SAS_KEY:YOUR_SAS_KEY}"
-    # Number of messages per a consumer
-    max_messages: "${TB_QUEUE_SERVICE_BUS_MAX_MESSAGES:1000}"
-    queue-properties:
-      # Azure Service Bus properties for Rule Engine queues
-      rule-engine: "${TB_QUEUE_SERVICE_BUS_RE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Core queues
-      core: "${TB_QUEUE_SERVICE_BUS_CORE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Transport Api queues
-      transport-api: "${TB_QUEUE_SERVICE_BUS_TA_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Notification queues
-      notifications: "${TB_QUEUE_SERVICE_BUS_NOTIFICATIONS_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-  rabbitmq:
-    # By default empty
-    exchange_name: "${TB_QUEUE_RABBIT_MQ_EXCHANGE_NAME:}"
-    # RabbitMQ host used to establish connection
-    host: "${TB_QUEUE_RABBIT_MQ_HOST:localhost}"
-    # RabbitMQ host used to establish a connection
-    port: "${TB_QUEUE_RABBIT_MQ_PORT:5672}"
-    # Virtual hosts provide logical grouping and separation of resources
-    virtual_host: "${TB_QUEUE_RABBIT_MQ_VIRTUAL_HOST:/}"
-    # Username for RabbitMQ user account
-    username: "${TB_QUEUE_RABBIT_MQ_USERNAME:YOUR_USERNAME}"
-    # User password for RabbitMQ user account
-    password: "${TB_QUEUE_RABBIT_MQ_PASSWORD:YOUR_PASSWORD}"
-    # Network connection between clients and RabbitMQ nodes can fail. RabbitMQ Java client supports automatic recovery of connections and topology (queues, exchanges, bindings, and consumers)
-    automatic_recovery_enabled: "${TB_QUEUE_RABBIT_MQ_AUTOMATIC_RECOVERY_ENABLED:false}"
-    # The connection timeout for the RabbitMQ connection factory
-    connection_timeout: "${TB_QUEUE_RABBIT_MQ_CONNECTION_TIMEOUT:60000}"
-    # RabbitMQ has a timeout for connection handshake. When clients run in heavily constrained environments, it may be necessary to increase the timeout
-    handshake_timeout: "${TB_QUEUE_RABBIT_MQ_HANDSHAKE_TIMEOUT:10000}"
-    queue-properties:
-      # RabbitMQ properties for Rule Engine queues
-      rule-engine: "${TB_QUEUE_RABBIT_MQ_RE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Core queues
-      core: "${TB_QUEUE_RABBIT_MQ_CORE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Transport API queues
-      transport-api: "${TB_QUEUE_RABBIT_MQ_TA_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Notification queues
-      notifications: "${TB_QUEUE_RABBIT_MQ_NOTIFICATIONS_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
   partitions:
     hash_function_name: "${TB_QUEUE_PARTITIONS_HASH_FUNCTION_NAME:murmur3_128}"  # murmur3_32, murmur3_128 or sha256
   transport_api:
@@ -485,7 +395,7 @@ queue:
     # Interval in milliseconds to poll api response from transport microservices
     response_poll_interval: "${TB_QUEUE_TRANSPORT_RESPONSE_POLL_INTERVAL_MS:25}"
   core:
-    # Default topic name of Kafka, RabbitMQ, etc. queue
+    # Default topic name
     topic: "${TB_QUEUE_CORE_TOPIC:tb_core}"
     # Interval in milliseconds to poll messages by Core microservices
     poll-interval: "${TB_QUEUE_CORE_POLL_INTERVAL_MS:25}"
diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml
index edf3727320..e31d618890 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.9.0-RC</version>
+        <version>4.0.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 51a2c173a7..8d9a60a319 100644
--- a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
+++ b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
@@ -235,9 +235,7 @@ transport:
 
 # Queue configuration parameters
 queue:
-  # kafka (Apache Kafka). The following queue types are deprecated and will no longer be supported in ThingsBoard 4.0:
-  # aws-sqs (AWS SQS), pubsub (PubSub), service-bus (Azure Service Bus), rabbitmq (RabbitMQ)
-  type: "${TB_QUEUE_TYPE:kafka}"
+  type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka).
   kafka:
     # Kafka Bootstrap Servers
@@ -312,94 +310,6 @@ queue:
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:52428800;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:52428800;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}"
-    # Access key ID from AWS IAM user
-    access_key_id: "${TB_QUEUE_AWS_SQS_ACCESS_KEY_ID:YOUR_KEY}"
-    # Secret access key from AWS IAM user
-    secret_access_key: "${TB_QUEUE_AWS_SQS_SECRET_ACCESS_KEY:YOUR_SECRET}"
-    # Region from AWS account
-    region: "${TB_QUEUE_AWS_SQS_REGION:YOUR_REGION}"
-    # Number of threads per each AWS SQS queue in consumer
-    threads_per_topic: "${TB_QUEUE_AWS_SQS_THREADS_PER_TOPIC:1}"
-    # Thread pool size for aws_sqs queue producer executor provider. Default value equals to AmazonSQSAsyncClient.DEFAULT_THREAD_POOL_SIZE
-    producer_thread_pool_size: "${TB_QUEUE_AWS_SQS_EXECUTOR_THREAD_POOL_SIZE:50}"
-    queue-properties:
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      rule-engine: "${TB_QUEUE_AWS_SQS_RE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      core: "${TB_QUEUE_AWS_SQS_CORE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      transport-api: "${TB_QUEUE_AWS_SQS_TA_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      notifications: "${TB_QUEUE_AWS_SQS_NOTIFICATIONS_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-  pubsub:
-    # Project ID from Google Cloud
-    project_id: "${TB_QUEUE_PUBSUB_PROJECT_ID:YOUR_PROJECT_ID}"
-    # API Credentials in JSON format
-    service_account: "${TB_QUEUE_PUBSUB_SERVICE_ACCOUNT:YOUR_SERVICE_ACCOUNT}"
-    # Message size for PubSub queue.Value in bytes
-    max_msg_size: "${TB_QUEUE_PUBSUB_MAX_MSG_SIZE:1048576}"
-    # Number of messages per consumer
-    max_messages: "${TB_QUEUE_PUBSUB_MAX_MESSAGES:1000}"
-    # Thread pool size for pubsub queue executor provider. If not set - default pubsub executor provider value will be used (5 * number of available processors)
-    executor_thread_pool_size: "${TB_QUEUE_PUBSUB_EXECUTOR_THREAD_POOL_SIZE:0}"
-    queue-properties:
-      # Pub/Sub properties for Rule Engine subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      rule-engine: "${TB_QUEUE_PUBSUB_RE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Core subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      core: "${TB_QUEUE_PUBSUB_CORE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Transport API subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      transport-api: "${TB_QUEUE_PUBSUB_TA_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Version Control subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      notifications: "${TB_QUEUE_PUBSUB_NOTIFICATIONS_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-  service_bus:
-    # Azure namespace
-    namespace_name: "${TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME:YOUR_NAMESPACE_NAME}"
-    # Azure Service Bus Shared Access Signatures key name
-    sas_key_name: "${TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME:YOUR_SAS_KEY_NAME}"
-    # Azure Service Bus Shared Access Signatures key
-    sas_key: "${TB_QUEUE_SERVICE_BUS_SAS_KEY:YOUR_SAS_KEY}"
-    # Number of messages per a consumer
-    max_messages: "${TB_QUEUE_SERVICE_BUS_MAX_MESSAGES:1000}"
-    queue-properties:
-      # Azure Service Bus properties for Rule Engine queues
-      rule-engine: "${TB_QUEUE_SERVICE_BUS_RE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Core queues
-      core: "${TB_QUEUE_SERVICE_BUS_CORE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Transport Api queues
-      transport-api: "${TB_QUEUE_SERVICE_BUS_TA_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Notification queues
-      notifications: "${TB_QUEUE_SERVICE_BUS_NOTIFICATIONS_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-  rabbitmq:
-    # By default empty
-    exchange_name: "${TB_QUEUE_RABBIT_MQ_EXCHANGE_NAME:}"
-    # RabbitMQ host used to establish connection
-    host: "${TB_QUEUE_RABBIT_MQ_HOST:localhost}"
-    # RabbitMQ host used to establish a connection
-    port: "${TB_QUEUE_RABBIT_MQ_PORT:5672}"
-    # Virtual hosts provide logical grouping and separation of resources
-    virtual_host: "${TB_QUEUE_RABBIT_MQ_VIRTUAL_HOST:/}"
-    # Username for RabbitMQ user account
-    username: "${TB_QUEUE_RABBIT_MQ_USERNAME:YOUR_USERNAME}"
-    # User password for RabbitMQ user account
-    password: "${TB_QUEUE_RABBIT_MQ_PASSWORD:YOUR_PASSWORD}"
-    # Network connection between clients and RabbitMQ nodes can fail. RabbitMQ Java client supports automatic recovery of connections and topology (queues, exchanges, bindings, and consumers)
-    automatic_recovery_enabled: "${TB_QUEUE_RABBIT_MQ_AUTOMATIC_RECOVERY_ENABLED:false}"
-    # The connection timeout for the RabbitMQ connection factory
-    connection_timeout: "${TB_QUEUE_RABBIT_MQ_CONNECTION_TIMEOUT:60000}"
-    # RabbitMQ has a timeout for connection handshake. When clients run in heavily constrained environments, it may be necessary to increase the timeout
-    handshake_timeout: "${TB_QUEUE_RABBIT_MQ_HANDSHAKE_TIMEOUT:10000}"
-    queue-properties:
-      # RabbitMQ properties for Rule Engine queues
-      rule-engine: "${TB_QUEUE_RABBIT_MQ_RE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Core queues
-      core: "${TB_QUEUE_RABBIT_MQ_CORE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Transport API queues
-      transport-api: "${TB_QUEUE_RABBIT_MQ_TA_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Notification queues
-      notifications: "${TB_QUEUE_RABBIT_MQ_NOTIFICATIONS_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
   partitions:
     hash_function_name: "${TB_QUEUE_PARTITIONS_HASH_FUNCTION_NAME:murmur3_128}" # murmur3_32, murmur3_128 or sha256
   transport_api:
@@ -418,7 +328,7 @@ queue:
     # Interval in milliseconds to poll api response from transport microservices
     response_poll_interval: "${TB_QUEUE_TRANSPORT_RESPONSE_POLL_INTERVAL_MS:25}"
   core:
-    # Default topic name of Kafka, RabbitMQ, etc. queue
+    # Default topic name
     topic: "${TB_QUEUE_CORE_TOPIC:tb_core}"
     # Interval in milliseconds to poll messages by Core microservices
     poll-interval: "${TB_QUEUE_CORE_POLL_INTERVAL_MS:25}"
@@ -426,7 +336,7 @@ queue:
     partitions: "${TB_QUEUE_CORE_PARTITIONS:10}"
     # Timeout for processing a message pack by Core microservices
     pack-processing-timeout: "${TB_QUEUE_CORE_PACK_PROCESSING_TIMEOUT_MS:60000}"
-    # Default topic name for queue Kafka, RabbitMQ, etc.
+    # Default topic name
     usage-stats-topic: "${TB_QUEUE_US_TOPIC:tb_usage_stats}"
     stats:
       # Enable/disable statistics for Core microservices
diff --git a/transport/pom.xml b/transport/pom.xml
index d744f7eb2f..dd1c415e6c 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>transport</artifactId>
diff --git a/transport/snmp/pom.xml b/transport/snmp/pom.xml
index dcd08c10af..08f23d2c2d 100644
--- a/transport/snmp/pom.xml
+++ b/transport/snmp/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-RC</version>
+        <version>4.0.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 df222fe09f..4c11bd0018 100644
--- a/transport/snmp/src/main/resources/tb-snmp-transport.yml
+++ b/transport/snmp/src/main/resources/tb-snmp-transport.yml
@@ -181,9 +181,7 @@ transport:
 
 # Queue configuration parameters
 queue:
-  # kafka (Apache Kafka). The following queue types are deprecated and will no longer be supported in ThingsBoard 4.0:
-  # aws-sqs (AWS SQS), pubsub (PubSub), service-bus (Azure Service Bus), rabbitmq (RabbitMQ)
-  type: "${TB_QUEUE_TYPE:kafka}"
+  type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka).
   kafka:
     # Kafka Bootstrap Servers
@@ -265,94 +263,6 @@ queue:
       print-interval-ms: "${TB_QUEUE_KAFKA_CONSUMER_STATS_MIN_PRINT_INTERVAL_MS:60000}"
       # Time to wait for the stats-loading requests to Kafka to finis
       kafka-response-timeout-ms: "${TB_QUEUE_KAFKA_CONSUMER_STATS_RESPONSE_TIMEOUT_MS:1000}"
-  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}"
-    # Access key ID from AWS IAM user
-    access_key_id: "${TB_QUEUE_AWS_SQS_ACCESS_KEY_ID:YOUR_KEY}"
-    # Secret access key from AWS IAM user
-    secret_access_key: "${TB_QUEUE_AWS_SQS_SECRET_ACCESS_KEY:YOUR_SECRET}"
-    # Region from AWS account
-    region: "${TB_QUEUE_AWS_SQS_REGION:YOUR_REGION}"
-    # Number of threads per each AWS SQS queue in consumer
-    threads_per_topic: "${TB_QUEUE_AWS_SQS_THREADS_PER_TOPIC:1}"
-    # Thread pool size for aws_sqs queue producer executor provider. Default value equals to AmazonSQSAsyncClient.DEFAULT_THREAD_POOL_SIZE
-    producer_thread_pool_size: "${TB_QUEUE_AWS_SQS_EXECUTOR_THREAD_POOL_SIZE:50}"
-    queue-properties:
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      rule-engine: "${TB_QUEUE_AWS_SQS_RE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      core: "${TB_QUEUE_AWS_SQS_CORE_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      transport-api: "${TB_QUEUE_AWS_SQS_TA_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-      # AWS SQS queue properties. VisibilityTimeout in seconds;MaximumMessageSize in bytes;MessageRetentionPeriod in seconds
-      notifications: "${TB_QUEUE_AWS_SQS_NOTIFICATIONS_QUEUE_PROPERTIES:VisibilityTimeout:30;MaximumMessageSize:262144;MessageRetentionPeriod:604800}"
-  pubsub:
-    # Project ID from Google Cloud
-    project_id: "${TB_QUEUE_PUBSUB_PROJECT_ID:YOUR_PROJECT_ID}"
-    # API Credentials in JSON format
-    service_account: "${TB_QUEUE_PUBSUB_SERVICE_ACCOUNT:YOUR_SERVICE_ACCOUNT}"
-    # Message size for PubSub queue. Value in bytes
-    max_msg_size: "${TB_QUEUE_PUBSUB_MAX_MSG_SIZE:1048576}"
-    # Number of messages per consumer
-    max_messages: "${TB_QUEUE_PUBSUB_MAX_MESSAGES:1000}"
-    # Thread pool size for pubsub queue executor provider. If not set - default pubsub executor provider value will be used (5 * number of available processors)
-    executor_thread_pool_size: "${TB_QUEUE_PUBSUB_EXECUTOR_THREAD_POOL_SIZE:0}"
-    queue-properties:
-      # Pub/Sub properties for Rule Engine subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      rule-engine: "${TB_QUEUE_PUBSUB_RE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Core subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      core: "${TB_QUEUE_PUBSUB_CORE_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Transport API subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      transport-api: "${TB_QUEUE_PUBSUB_TA_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-      # Pub/Sub properties for Version Control subscribers, messages which will commit after ackDeadlineInSec period can be consumed again
-      notifications: "${TB_QUEUE_PUBSUB_NOTIFICATIONS_QUEUE_PROPERTIES:ackDeadlineInSec:30;messageRetentionInSec:604800}"
-  service_bus:
-    # Azure namespace
-    namespace_name: "${TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME:YOUR_NAMESPACE_NAME}"
-    # Azure Service Bus Shared Access Signatures key name
-    sas_key_name: "${TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME:YOUR_SAS_KEY_NAME}"
-    # Azure Service Bus Shared Access Signatures key
-    sas_key: "${TB_QUEUE_SERVICE_BUS_SAS_KEY:YOUR_SAS_KEY}"
-    # Number of messages per a consumer
-    max_messages: "${TB_QUEUE_SERVICE_BUS_MAX_MESSAGES:1000}"
-    queue-properties:
-      # Azure Service Bus properties for Rule Engine queues
-      rule-engine: "${TB_QUEUE_SERVICE_BUS_RE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Core queues
-      core: "${TB_QUEUE_SERVICE_BUS_CORE_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Transport Api queues
-      transport-api: "${TB_QUEUE_SERVICE_BUS_TA_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-      # Azure Service Bus properties for Notification queues
-      notifications: "${TB_QUEUE_SERVICE_BUS_NOTIFICATIONS_QUEUE_PROPERTIES:lockDurationInSec:30;maxSizeInMb:1024;messageTimeToLiveInSec:604800}"
-  rabbitmq:
-    # By default empty
-    exchange_name: "${TB_QUEUE_RABBIT_MQ_EXCHANGE_NAME:}"
-    # RabbitMQ host used to establish connection
-    host: "${TB_QUEUE_RABBIT_MQ_HOST:localhost}"
-    # RabbitMQ host used to establish a connection
-    port: "${TB_QUEUE_RABBIT_MQ_PORT:5672}"
-    # Virtual hosts provide logical grouping and separation of resources
-    virtual_host: "${TB_QUEUE_RABBIT_MQ_VIRTUAL_HOST:/}"
-    # Username for RabbitMQ user account
-    username: "${TB_QUEUE_RABBIT_MQ_USERNAME:YOUR_USERNAME}"
-    # User password for RabbitMQ user account
-    password: "${TB_QUEUE_RABBIT_MQ_PASSWORD:YOUR_PASSWORD}"
-    # Network connection between clients and RabbitMQ nodes can fail. RabbitMQ Java client supports automatic recovery of connections and topology (queues, exchanges, bindings, and consumers)
-    automatic_recovery_enabled: "${TB_QUEUE_RABBIT_MQ_AUTOMATIC_RECOVERY_ENABLED:false}"
-    # The connection timeout for the RabbitMQ connection factory
-    connection_timeout: "${TB_QUEUE_RABBIT_MQ_CONNECTION_TIMEOUT:60000}"
-    # RabbitMQ has a timeout for connection handshake. When clients run in heavily constrained environments, it may be necessary to increase the timeout
-    handshake_timeout: "${TB_QUEUE_RABBIT_MQ_HANDSHAKE_TIMEOUT:10000}"
-    queue-properties:
-      # RabbitMQ properties for Rule Engine queues
-      rule-engine: "${TB_QUEUE_RABBIT_MQ_RE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Core queues
-      core: "${TB_QUEUE_RABBIT_MQ_CORE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Transport API queues
-      transport-api: "${TB_QUEUE_RABBIT_MQ_TA_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
-      # RabbitMQ properties for Notification queues
-      notifications: "${TB_QUEUE_RABBIT_MQ_NOTIFICATIONS_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
   partitions:
     hash_function_name: "${TB_QUEUE_PARTITIONS_HASH_FUNCTION_NAME:murmur3_128}"  # murmur3_32, murmur3_128 or sha256
   transport_api:
@@ -371,7 +281,7 @@ queue:
     # Interval in milliseconds to poll api response from transport microservices
     response_poll_interval: "${TB_QUEUE_TRANSPORT_RESPONSE_POLL_INTERVAL_MS:25}"
   core:
-    # Default topic name of Kafka, RabbitMQ, etc. queue
+    # Default topic name
     topic: "${TB_QUEUE_CORE_TOPIC:tb_core}"
     # Interval in milliseconds to poll messages by Core microservices
     poll-interval: "${TB_QUEUE_CORE_POLL_INTERVAL_MS:25}"
@@ -379,7 +289,7 @@ queue:
     partitions: "${TB_QUEUE_CORE_PARTITIONS:10}"
     # Timeout for processing a message pack by Core microservices
     pack-processing-timeout: "${TB_QUEUE_CORE_PACK_PROCESSING_TIMEOUT_MS:60000}"
-    # Stats topic name for queue Kafka, RabbitMQ, etc.
+    # Stats topic name
     usage-stats-topic: "${TB_QUEUE_US_TOPIC:tb_usage_stats}"
     stats:
       # Enable/disable statistics for Core microservices
diff --git a/ui-ngx/.eslintrc.json b/ui-ngx/.eslintrc.json
deleted file mode 100644
index 2d17064e40..0000000000
--- a/ui-ngx/.eslintrc.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "root": true,
-  "ignorePatterns": [
-    "projects/**/*"
-  ],
-  "overrides": [
-    {
-      "files": [
-        "*.ts",
-        "*.tsx"
-      ],
-      "parserOptions": {
-        "project": [
-          "tsconfig.json"
-        ],
-        "createDefaultProgram": true
-      },
-      "extends": [
-        "plugin:@angular-eslint/recommended",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
-      "rules": {
-        "@typescript-eslint/explicit-member-accessibility": [
-          "off",
-          {
-            "accessibility": "explicit"
-          }
-        ],
-        "arrow-parens": [
-          "off",
-          "always"
-        ],
-        "@angular-eslint/component-selector": [
-          "error",
-          {
-            "prefix": [
-              "tb"
-            ]
-          }
-        ],
-        "id-blacklist": [
-          "error",
-          "any",
-          "Number",
-          "String",
-          "string",
-          "Boolean",
-          "boolean",
-          "Undefined",
-          "undefined"
-        ],
-        "import/order": "off",
-        "@typescript-eslint/member-ordering": "off",
-        "no-underscore-dangle": "off",
-        "@typescript-eslint/naming-convention": "off",
-        "jsdoc/newline-after-description": 0
-      }
-    },
-    {
-      "files": [
-        "*.html"
-      ],
-      "extends": [
-        "plugin:@angular-eslint/template/recommended",
-        "plugin:tailwindcss/recommended"
-      ],
-      "rules": {
-          "tailwindcss/no-custom-classname": "off",
-          "tailwindcss/migration-from-tailwind-2": "off",
-          "tailwindcss/enforces-negative-arbitrary-values": "off"
-      }
-    }
-  ]
-}
diff --git a/ui-ngx/angular.json b/ui-ngx/angular.json
index f1efd8943a..8f98a6cf07 100644
--- a/ui-ngx/angular.json
+++ b/ui-ngx/angular.json
@@ -99,8 +99,6 @@
               "node_modules/jquery.terminal/css/jquery.terminal.min.css",
               "node_modules/tooltipster/dist/css/tooltipster.bundle.min.css",
               "node_modules/tooltipster/dist/css/plugins/tooltipster/sideTip/themes/tooltipster-sideTip-shadow.min.css",
-              "src/app/shared/components/json-form/react/json-form.scss",
-              "node_modules/rc-select/assets/index.less",
               "node_modules/jstree-bootstrap-theme/dist/themes/proton/style.min.css",
               "node_modules/leaflet/dist/leaflet.css",
               "src/app/modules/home/components/widget/lib/maps/markers.scss",
@@ -181,7 +179,8 @@
           "builder": "@angular-builders/custom-esbuild:dev-server",
           "options": {
             "buildTarget": "thingsboard:build",
-            "proxyConfig": "proxy.conf.js"
+            "proxyConfig": "proxy.conf.js",
+            "middlewares": ["./esbuild/tb-html-fallback-middleware.ts"]
           },
           "configurations": {
             "production": {
diff --git a/ui-ngx/esbuild/tb-html-fallback-middleware.ts b/ui-ngx/esbuild/tb-html-fallback-middleware.ts
new file mode 100644
index 0000000000..22acf6b2b7
--- /dev/null
+++ b/ui-ngx/esbuild/tb-html-fallback-middleware.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 type { ServerResponse } from 'node:http';
+import type { Connect } from 'vite';
+import type { NextHandleFunction } from 'connect';
+
+const tbHtmlFallbackMiddleware: NextHandleFunction = (
+  req: Connect.IncomingMessage,
+  _res: ServerResponse,
+  next: Connect.NextFunction
+) => {
+  if (/^\/resources\/scada-symbols\/(?:system|tenant)\/[^/]+$/.test(req.url)) {
+    req.url = '/';
+  }
+  next();
+}
+
+export default tbHtmlFallbackMiddleware;
diff --git a/ui-ngx/eslint.config.mjs b/ui-ngx/eslint.config.mjs
new file mode 100644
index 0000000000..c446375607
--- /dev/null
+++ b/ui-ngx/eslint.config.mjs
@@ -0,0 +1,83 @@
+import eslintJS from "@eslint/js";
+import tsEslint from "typescript-eslint";
+import angular from "angular-eslint";
+import tailwind from "eslint-plugin-tailwindcss";
+
+export default tsEslint.config(
+  {
+    files: ["**/*.ts"],
+    languageOptions: {
+      parserOptions: {
+        project: true,
+        tsconfigRootDir: import.meta.dirname
+      },
+    },
+    extends: [
+      eslintJS.configs.recommended,
+      ...tsEslint.configs.recommended,
+      ...tsEslint.configs.stylistic,
+      ...angular.configs.tsRecommended,
+    ],
+    processor: angular.processInlineTemplates,
+    rules: {
+      "@typescript-eslint/explicit-member-accessibility": [
+        "off",
+        {
+          accessibility: "explicit"
+        }
+      ],
+      "arrow-parens": [
+        "off",
+        "always"
+      ],
+      "@angular-eslint/component-selector": [
+        "error",
+        {
+          prefix: [
+            "tb"
+          ]
+        }
+      ],
+      "id-blacklist": [
+        "error",
+        "any",
+        "Number",
+        "String",
+        "string",
+        "Boolean",
+        "boolean",
+        "Undefined",
+        "undefined"
+      ],
+      "import/order": "off",
+      "@typescript-eslint/member-ordering": "off",
+      "no-underscore-dangle": "off",
+      "@typescript-eslint/naming-convention": "off",
+      "jsdoc/newline-after-description": 0,
+      "@typescript-eslint/consistent-indexed-object-style": "off",
+      "@typescript-eslint/array-type": "off",
+      "no-extra-boolean-cast": "off",
+      "@typescript-eslint/no-empty-function": "off",
+      "@typescript-eslint/no-explicit-any": "off",
+      "@typescript-eslint/no-inferrable-types": "off",
+      "@typescript-eslint/no-unused-vars": "off",
+      "@typescript-eslint/ban-ts-comment": "off",
+      "no-case-declarations": "off",
+      "no-prototype-builtins": "off",
+      "@typescript-eslint/consistent-type-definitions": "off"
+    },
+  },
+  {
+    files: ["**/*.html"],
+    extends: [
+      ...angular.configs.templateRecommended,
+      ...angular.configs.templateAccessibility,
+      ...tailwind.configs["flat/recommended"]
+    ],
+    rules: {
+      "tailwindcss/no-custom-classname": "off",
+      "tailwindcss/migration-from-tailwind-2": "off",
+      "tailwindcss/enforces-negative-arbitrary-values": "off"
+    }
+  }
+);
diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index 0eff3bbd8d..f62c991187 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thingsboard",
-  "version": "3.9.0",
+  "version": "4.0.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",
@@ -25,8 +25,6 @@
     "@angular/platform-browser-dynamic": "18.2.13",
     "@angular/router": "18.2.13",
     "@auth0/angular-jwt": "^5.2.0",
-    "@emotion/react": "11.13.3",
-    "@emotion/styled": "11.13.0",
     "@flowjs/flow.js": "^2.14.1",
     "@flowjs/ngx-flow": "18.0.1",
     "@geoman-io/leaflet-geoman-free": "2.17.0",
@@ -34,12 +32,6 @@
     "@mat-datetimepicker/core": "~14.0.0",
     "@mdi/svg": "^7.4.47",
     "@messageformat/core": "^3.4.0",
-    "@mui/icons-material": "6.1.2",
-    "@mui/lab": "6.0.0-beta.10",
-    "@mui/material": "6.1.2",
-    "@mui/styles": "6.1.2",
-    "@mui/system": "6.1.2",
-    "@mui/x-date-pickers": "7.18.0",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
     "@ngrx/store-devtools": "^18.1.1",
@@ -85,16 +77,8 @@
     "ngx-sharebuttons": "^15.0.6",
     "ngx-translate-messageformat-compiler": "^7.0.0",
     "objectpath": "^2.0.0",
-    "prettier": "^2.8.3",
-    "prop-types": "^15.8.1",
     "qrcode": "^1.5.4",
     "raphael": "^2.3.0",
-    "rc-select": "14.15.2",
-    "react": "18.3.1",
-    "react-ace": "12.0.0",
-    "react-dom": "18.3.1",
-    "react-dropzone": "14.2.9",
-    "reactcss": "^1.2.3",
     "rxjs": "~7.8.1",
     "schema-inspector": "^2.1.0",
     "screenfull": "^6.0.2",
@@ -105,7 +89,6 @@
     "tinymce": "~6.8.5",
     "tooltipster": "^4.2.8",
     "tslib": "^2.7.0",
-    "tv4": "^1.3.0",
     "typeface-roboto": "^1.1.13",
     "zone.js": "~0.14.10"
   },
@@ -114,11 +97,6 @@
     "@angular-devkit/build-angular": "18.2.12",
     "@angular-devkit/core": "18.2.12",
     "@angular-devkit/schematics": "18.2.12",
-    "@angular-eslint/builder": "18.4.2",
-    "@angular-eslint/eslint-plugin": "18.4.2",
-    "@angular-eslint/eslint-plugin-template": "18.4.2",
-    "@angular-eslint/schematics": "18.4.2",
-    "@angular-eslint/template-parser": "18.4.2",
     "@angular/build": "18.2.12",
     "@angular/cli": "18.2.12",
     "@angular/compiler-cli": "18.2.13",
@@ -137,18 +115,13 @@
     "@types/lodash": "^4.17.13",
     "@types/node": "~20.17.8",
     "@types/raphael": "^2.3.9",
-    "@types/react": "18.3.10",
-    "@types/react-dom": "18.3.0",
     "@types/systemjs": "6.15.1",
     "@types/tinycolor2": "^1.4.6",
     "@types/tooltipster": "^0.0.35",
-    "@typescript-eslint/eslint-plugin": "^8.16.0",
-    "@typescript-eslint/parser": "^8.16.0",
-    "@typescript-eslint/types": "^8.16.0",
-    "@typescript-eslint/utils": "^8.16.0",
+    "angular-eslint": "~18.4.3",
     "autoprefixer": "^10.4.20",
     "directory-tree": "^3.5.2",
-    "eslint": "~9.15.0",
+    "eslint": "~9.17.0",
     "eslint-plugin-import": "latest",
     "eslint-plugin-jsdoc": "^50.6.0",
     "eslint-plugin-prefer-arrow": "latest",
@@ -159,11 +132,10 @@
     "postinstall-prepare": "^2.0.0",
     "tailwindcss": "^3.4.15",
     "ts-node": "^10.9.2",
-    "typescript": "~5.5.4"
+    "typescript": "~5.5.4",
+    "typescript-eslint": "^8.18.1"
   },
   "resolutions": {
-    "@types/react": "18.3.10",
-    "rc-virtual-list": "3.5.2",
     "ace-builds": "1.36.5",
     "tinymce": "6.8.5",
     "rollup": "4.22.4",
diff --git a/ui-ngx/pom.xml b/ui-ngx/pom.xml
index 1384b1c3e6..9515f3b3ec 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.9.0-RC</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>
diff --git a/ui-ngx/src/app/core/api/entity-data-subscription.ts b/ui-ngx/src/app/core/api/entity-data-subscription.ts
index 46cd2af7ab..daeb6b8faf 100644
--- a/ui-ngx/src/app/core/api/entity-data-subscription.ts
+++ b/ui-ngx/src/app/core/api/entity-data-subscription.ts
@@ -685,7 +685,7 @@ export class EntityDataSubscription {
       if (this.tsFields.length > 0) {
         if (this.history) {
           cmd.historyCmd = {
-            keys: this.tsFields.map(key => key.key),
+            keys: [... new Set(this.tsFields.map(key => key.key))],
             startTs: this.subsTw.fixedWindow.startTimeMs,
             endTs: this.subsTw.fixedWindow.endTimeMs,
             interval: 0,
@@ -702,7 +702,7 @@ export class EntityDataSubscription {
           }
         } else {
           cmd.tsCmd = {
-            keys: this.tsFields.map(key => key.key),
+            keys: [... new Set(this.tsFields.map(key => key.key))],
             startTs: this.subsTw.startTs,
             timeWindow: this.subsTw.aggregation.timeWindow,
             interval: 0,
diff --git a/ui-ngx/src/app/core/http/domain.service.ts b/ui-ngx/src/app/core/http/domain.service.ts
index bb6cd4a16b..fe05305c6f 100644
--- a/ui-ngx/src/app/core/http/domain.service.ts
+++ b/ui-ngx/src/app/core/http/domain.service.ts
@@ -32,9 +32,12 @@ export class DomainService {
   ) {
   }
 
-  public saveDomain(domain: Domain, oauth2ClientIds: Array<string>, config?: RequestConfig): Observable<Domain> {
-    return this.http.post<Domain>(`/api/domain?oauth2ClientIds=${oauth2ClientIds.join(',')}`,
-      domain, defaultHttpOptionsFromConfig(config));
+  public saveDomain(domain: Domain, oauth2ClientIds?: Array<string>, config?: RequestConfig): Observable<Domain> {
+    let url = '/api/domain';
+    if (oauth2ClientIds?.length) {
+      url += `?oauth2ClientIds=${oauth2ClientIds.join(',')}`;
+    }
+    return this.http.post<Domain>(url, domain, defaultHttpOptionsFromConfig(config));
   }
 
   public updateOauth2Clients(id: string, oauth2ClientIds: Array<string>, config?: RequestConfig): Observable<void> {
diff --git a/ui-ngx/src/app/core/http/rule-chain.service.ts b/ui-ngx/src/app/core/http/rule-chain.service.ts
index e3353989cc..0e857c4570 100644
--- a/ui-ngx/src/app/core/http/rule-chain.service.ts
+++ b/ui-ngx/src/app/core/http/rule-chain.service.ts
@@ -33,6 +33,7 @@ import {
   LinkLabel,
   RuleNodeComponentDescriptor,
   RuleNodeConfiguration,
+  RuleNodeConfigurationComponent,
   ScriptLanguage,
   TestScriptInputParams,
   TestScriptResult
@@ -180,6 +181,10 @@ export class RuleChainService {
     return this.http.post<TestScriptResult>(url, inputParams, defaultHttpOptionsFromConfig(config));
   }
 
+  public registerSystemRuleNodeConfigModule(module: any) {
+    Object.assign(this.ruleNodeConfigComponents, this.resourcesService.extractComponentsFromModule<IRuleNodeConfigurationComponent>(module, RuleNodeConfigurationComponent, true));
+  }
+
   private loadRuleNodeComponents(ruleChainType: RuleChainType, config?: RequestConfig): Observable<Array<RuleNodeComponentDescriptor>> {
     return this.componentDescriptorService.getComponentDescriptorsByTypes(ruleNodeTypeComponentTypes, ruleChainType, config).pipe(
       map((components) => {
@@ -211,7 +216,7 @@ export class RuleChainService {
     Observable<RuleNodeComponentDescriptor> {
     const nodeDefinition = component.configurationDescriptor.nodeDefinition;
     const uiResources = nodeDefinition.uiResources;
-    if (uiResources && uiResources.length) {
+    if (!this.ruleNodeConfigComponents[nodeDefinition.configDirective] && uiResources && uiResources.length) {
       const commonResources = uiResources.filter((resource) => !resource.endsWith('.js'));
       const moduleResource = uiResources.find((resource) => resource.endsWith('.js'));
       const tasks: Observable<any>[] = [];
diff --git a/ui-ngx/src/app/core/http/widget.service.ts b/ui-ngx/src/app/core/http/widget.service.ts
index 0d3718ee12..030d53de6f 100644
--- a/ui-ngx/src/app/core/http/widget.service.ts
+++ b/ui-ngx/src/app/core/http/widget.service.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Injectable } from '@angular/core';
+import { Injectable, Type } from '@angular/core';
 import { defaultHttpOptionsFromConfig, RequestConfig } from './http-utils';
 import { Observable, of, ReplaySubject } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
@@ -25,6 +25,9 @@ import {
   BaseWidgetType,
   DeprecatedFilter,
   fullWidgetTypeFqn,
+  IWidgetSettingsComponent,
+  migrateWidgetTypeToDynamicForms,
+  WidgetSettingsComponent,
   WidgetType,
   widgetType,
   WidgetTypeDetails,
@@ -36,6 +39,11 @@ import { filter, map, mergeMap, tap } from 'rxjs/operators';
 import { WidgetTypeId } from '@shared/models/id/widget-type-id';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
 import { ActivationEnd, Router } from '@angular/router';
+import {
+  BasicWidgetConfigComponent,
+  IBasicWidgetConfigComponent
+} from '@home/components/widget/config/widget-config.component.models';
+import { ResourcesService } from '@core/services/resources.service';
 
 @Injectable({
   providedIn: 'root'
@@ -50,9 +58,13 @@ export class WidgetService {
 
   private loadWidgetsBundleCacheSubject: ReplaySubject<void>;
 
+  private basicWidgetSettingsComponentsMap: { [key: string]: Type<IBasicWidgetConfigComponent> } = {};
+  private widgetSettingsComponentsMap: { [key: string]: Type<IWidgetSettingsComponent> } = {};
+
   constructor(
     private http: HttpClient,
-    private router: Router
+    private router: Router,
+    private resourcesService: ResourcesService,
   ) {
     this.router.events.pipe(filter(event => event instanceof ActivationEnd)).subscribe(
       () => {
@@ -271,6 +283,7 @@ export class WidgetService {
     return this.getWidgetType(templateWidgetType.template.fullFqn,
       config).pipe(
         map((result) => {
+          result = migrateWidgetTypeToDynamicForms(result);
           const widgetInfo = toWidgetInfo(result);
           widgetInfo.fullFqn = undefined;
           return widgetInfo;
@@ -286,6 +299,30 @@ export class WidgetService {
     this.widgetsInfoInMemoryCache.set(widgetInfo.fullFqn, widgetInfo);
   }
 
+  public registerBasicWidgetConfigComponents(module: any) {
+    Object.assign(this.basicWidgetSettingsComponentsMap, this.resourcesService.extractComponentsFromModule<IBasicWidgetConfigComponent>(module, BasicWidgetConfigComponent));
+  }
+
+  public getBasicWidgetSettingsComponentBySelector(selector: string): Type<IBasicWidgetConfigComponent> {
+    return this.basicWidgetSettingsComponentsMap[selector];
+  }
+
+  public putBasicWidgetSettingsComponentToMap(selector: string, compType: Type<IBasicWidgetConfigComponent>) {
+    this.basicWidgetSettingsComponentsMap[selector] = compType;
+  }
+
+  public registerWidgetSettingsComponents(module: any) {
+    Object.assign(this.widgetSettingsComponentsMap, this.resourcesService.extractComponentsFromModule<IWidgetSettingsComponent>(module, WidgetSettingsComponent));
+  }
+
+  public getWidgetSettingsComponentTypeBySelector(selector: string): Type<IWidgetSettingsComponent> {
+    return this.widgetSettingsComponentsMap[selector];
+  }
+
+  public putWidgetSettingsComponentToMap(selector: string, compType: Type<IWidgetSettingsComponent>) {
+    this.widgetSettingsComponentsMap[selector] = compType;
+  }
+
   private widgetTypeUpdated(updatedWidgetType: BaseWidgetType): void {
     this.deleteWidgetInfoFromCache(fullWidgetTypeFqn(updatedWidgetType));
   }
diff --git a/ui-ngx/src/app/core/services/resources.service.ts b/ui-ngx/src/app/core/services/resources.service.ts
index f5cba07a47..e2ee21c738 100644
--- a/ui-ngx/src/app/core/services/resources.service.ts
+++ b/ui-ngx/src/app/core/services/resources.service.ts
@@ -31,7 +31,7 @@ import { forkJoin, from, Observable, ReplaySubject, throwError } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
 import { IModulesMap } from '@modules/common/modules-map.models';
 import { TbResourceId } from '@shared/models/id/tb-resource-id';
-import { isObject } from '@core/utils';
+import { camelCase, isObject } from '@core/utils';
 import { AuthService } from '@core/auth/auth.service';
 import { select, Store } from '@ngrx/store';
 import { selectIsAuthenticated } from '@core/auth/auth.selectors';
@@ -51,6 +51,8 @@ export interface ModulesWithComponents {
   standaloneComponents: ɵComponentDef<any>[];
 }
 
+export type ComponentsSelectorMap<T> = Record<string, Type<T>>;
+
 export const flatModulesWithComponents = (modulesWithComponentsList: ModulesWithComponents[]): ModulesWithComponents => {
   const modulesWithComponents: ModulesWithComponents = {
     modules: [],
@@ -91,6 +93,17 @@ export const componentTypeBySelector = (modulesWithComponents: ModulesWithCompon
 const matchesSelector = (selectors: ɵCssSelectorList, selector: string) =>
   selectors.some(s => s.some(s1 => typeof s1 === 'string' && s1 === selector));
 
+const extractSelectorFromComponent = (comp: ɵComponentDef<any>): string => {
+  for (const selectors of comp.selectors) {
+    for (const selector of selectors) {
+      if (typeof selector === 'string') {
+        return selector;
+      }
+    }
+  }
+  return null;
+}
+
 @Injectable({
   providedIn: 'root'
 })
@@ -252,6 +265,30 @@ export class ResourcesService {
     );
   }
 
+  public extractComponentsFromModule<T>(module: any, instanceFilter?: any, isCamelCaseSelector = false): ComponentsSelectorMap<T> {
+    const modulesWithComponents = this.extractModulesWithComponents(module);
+    const componentMap: ComponentsSelectorMap<T> = {};
+
+    const processComponents = (components: Array<ɵComponentDef<T>>) => {
+      components.forEach(item => {
+        if (instanceFilter && !(item.type.prototype instanceof instanceFilter)) {
+          return;
+        }
+        let selector = extractSelectorFromComponent(item);
+        if (isCamelCaseSelector) {
+          selector = camelCase(selector);
+        }
+        componentMap[selector] = item.type;
+      });
+    };
+
+    processComponents(modulesWithComponents.standaloneComponents);
+
+    modulesWithComponents.modules.forEach(module => {
+      processComponents(module.components);
+    })
+    return componentMap;
+  }
 
   private extractModulesWithComponents(module: any,
                                        modulesWithComponents: ModulesWithComponents = {
@@ -284,7 +321,7 @@ export class ResourcesService {
               modulesWithComponents.standaloneComponents.push(component);
             }
           } else {
-            this.extractModulesWithComponents(module, modulesWithComponents, visitedModules);
+            this.extractModulesWithComponents(element, modulesWithComponents, visitedModules);
           }
         }
       } else if (ɵNG_COMP_DEF in module) {
diff --git a/ui-ngx/src/app/core/services/utils.service.ts b/ui-ngx/src/app/core/services/utils.service.ts
index 79fde27014..90c2547e09 100644
--- a/ui-ngx/src/app/core/services/utils.service.ts
+++ b/ui-ngx/src/app/core/services/utils.service.ts
@@ -23,7 +23,6 @@ import {
   baseUrl,
   createLabelFromDatasource,
   deepClone,
-  deleteNullProperties,
   guid,
   hashCode,
   isDefined,
@@ -41,7 +40,6 @@ import { DataKeyType, SharedTelemetrySubscriber } from '@app/shared/models/telem
 import { alarmFields, alarmSeverityTranslations, alarmStatusTranslations } from '@shared/models/alarm.models';
 import { materialColors } from '@app/shared/models/material.models';
 import { WidgetInfo } from '@home/models/widget-component.models';
-import jsonSchemaDefaults from 'json-schema-defaults';
 import { Observable } from 'rxjs';
 import { publishReplay, refCount } from 'rxjs/operators';
 import { WidgetContext } from '@app/modules/home/models/widget-component.models';
@@ -51,6 +49,7 @@ import { DatePipe, DOCUMENT } from '@angular/common';
 import { entityTypeTranslations } from '@shared/models/entity-type.models';
 import cssjs from '@core/css/css';
 import { isNotEmptyTbFunction } from '@shared/models/js-function.models';
+import { defaultFormProperties, FormProperty } from '@shared/models/dynamic-form.models';
 
 const i18nRegExp = new RegExp(`{${i18nPrefix}:[^{}]+}`, 'g');
 
@@ -138,10 +137,10 @@ export class UtilsService {
     return predefinedFunctions[func];
   }
 
-  public getDefaultDatasource(dataKeySchema: any): Datasource {
+  public getDefaultDatasource(dataKeyForm: FormProperty[]): Datasource {
     const datasource = deepClone(this.defaultDatasource);
-    if (isDefined(dataKeySchema)) {
-      datasource.dataKeys[0].settings = this.generateObjectFromJsonSchema(dataKeySchema);
+    if (dataKeyForm?.length) {
+      datasource.dataKeys[0].settings = defaultFormProperties(dataKeyForm);
     }
     return datasource;
   }
@@ -189,12 +188,6 @@ export class UtilsService {
     return '';
   }
 
-  public generateObjectFromJsonSchema(schema: any): any {
-    const obj = jsonSchemaDefaults(schema);
-    deleteNullProperties(obj);
-    return obj;
-  }
-
   public processWidgetException(exception: any): ExceptionData {
     const data = this.parseException(exception, -6);
     if (data.message?.startsWith('NG0')) {
diff --git a/ui-ngx/src/app/modules/common/modules-map.ts b/ui-ngx/src/app/modules/common/modules-map.ts
index 0cc3f5bb2f..257e1bf348 100644
--- a/ui-ngx/src/app/modules/common/modules-map.ts
+++ b/ui-ngx/src/app/modules/common/modules-map.ts
@@ -160,7 +160,6 @@ import * as MaterialIconsDialogComponent from '@shared/components/dialog/materia
 import * as ColorInputComponent from '@shared/components/color-input.component';
 import * as MaterialIconSelectComponent from '@shared/components/material-icon-select.component';
 import * as NodeScriptTestDialogComponent from '@shared/components/dialog/node-script-test-dialog.component';
-import * as JsonFormComponent from '@shared/components/json-form/json-form.component';
 import * as NotificationComponent from '@shared/components/notification/notification.component';
 import * as TemplateAutocompleteComponent from '@shared/components/notification/template-autocomplete.component';
 import * as ImageInputComponent from '@shared/components/image-input.component';
@@ -507,7 +506,6 @@ class ModulesMap implements IModulesMap {
     '@shared/components/color-input.component': ColorInputComponent,
     '@shared/components/material-icon-select.component': MaterialIconSelectComponent,
     '@shared/components/dialog/node-script-test-dialog.component': NodeScriptTestDialogComponent,
-    '@shared/components/json-form/json-form.component': JsonFormComponent,
     '@shared/components/notification/notification.component': NotificationComponent,
     '@shared/components/notification/template-autocomplete.component': TemplateAutocompleteComponent,
     '@shared/components/image-input.component': ImageInputComponent,
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 709159aec3..fe96529a1d 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
@@ -26,7 +26,7 @@ import { Widget, WidgetConfigMode, widgetTypesData } from '@shared/models/widget
 import { Dashboard } from '@app/shared/models/dashboard.models';
 import { IAliasController, IStateController } from '@core/api/widget-api.models';
 import { WidgetConfigComponentData, WidgetInfo } from '@home/models/widget-component.models';
-import { isDefined, isDefinedAndNotNull, isString } from '@core/utils';
+import { isDefined, isDefinedAndNotNull } 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';
@@ -101,32 +101,17 @@ export class AddWidgetDialogComponent extends DialogComponent<AddWidgetDialogCom
 
     const widgetInfo = this.data.widgetInfo;
 
-    const rawSettingsSchema = widgetInfo.typeSettingsSchema || widgetInfo.settingsSchema;
-    const rawDataKeySettingsSchema = widgetInfo.typeDataKeySettingsSchema || widgetInfo.dataKeySettingsSchema;
-    const rawLatestDataKeySettingsSchema = widgetInfo.typeLatestDataKeySettingsSchema || widgetInfo.latestDataKeySettingsSchema;
+    const settingsForm = widgetInfo.typeSettingsForm?.length ?
+      widgetInfo.typeSettingsForm : (widgetInfo.settingsForm || []);
+    const dataKeySettingsForm = widgetInfo.typeDataKeySettingsForm?.length ?
+      widgetInfo.typeDataKeySettingsForm : (widgetInfo.dataKeySettingsForm || []);
+    const latestDataKeySettingsForm = widgetInfo.typeLatestDataKeySettingsForm?.length ?
+      widgetInfo.typeLatestDataKeySettingsForm : (widgetInfo.latestDataKeySettingsForm || []);
     const typeParameters = widgetInfo.typeParameters;
     const dataKeySettingsFunction: DataKeySettingsFunction = typeParameters?.dataKeySettingsFunction;
     const actionSources = widgetInfo.actionSources;
     const isDataEnabled = isDefined(widgetInfo.typeParameters) ? !widgetInfo.typeParameters.useCustomDatasources : true;
-    let settingsSchema;
-    if (!rawSettingsSchema || rawSettingsSchema === '') {
-      settingsSchema = {};
-    } else {
-      settingsSchema = isString(rawSettingsSchema) ? JSON.parse(rawSettingsSchema) : rawSettingsSchema;
-    }
-    let dataKeySettingsSchema;
-    if (!rawDataKeySettingsSchema || rawDataKeySettingsSchema === '') {
-      dataKeySettingsSchema = {};
-    } else {
-      dataKeySettingsSchema = isString(rawDataKeySettingsSchema) ? JSON.parse(rawDataKeySettingsSchema) : rawDataKeySettingsSchema;
-    }
-    let latestDataKeySettingsSchema;
-    if (!rawLatestDataKeySettingsSchema || rawLatestDataKeySettingsSchema === '') {
-      latestDataKeySettingsSchema = {};
-    } else {
-      latestDataKeySettingsSchema = isString(rawLatestDataKeySettingsSchema) ?
-        JSON.parse(rawLatestDataKeySettingsSchema) : rawLatestDataKeySettingsSchema;
-    }
+
     this.widgetConfig = {
       widgetName: widgetInfo.widgetName,
       config: this.widget.config,
@@ -142,9 +127,9 @@ export class AddWidgetDialogComponent extends DialogComponent<AddWidgetDialogCom
       typeParameters,
       actionSources,
       isDataEnabled,
-      settingsSchema,
-      dataKeySettingsSchema,
-      latestDataKeySettingsSchema,
+      settingsForm,
+      dataKeySettingsForm,
+      latestDataKeySettingsForm,
       dataKeySettingsFunction,
       settingsDirective: widgetInfo.settingsDirective,
       dataKeySettingsDirective: widgetInfo.dataKeySettingsDirective,
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 6ef7671084..191bf17700 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
@@ -24,7 +24,7 @@ import { IAliasController, IStateController } from '@core/api/widget-api.models'
 import { Widget, WidgetConfigMode } from '@shared/models/widget.models';
 import { WidgetComponentService } from '@home/components/widget/widget-component.service';
 import { WidgetConfigComponentData } from '../../models/widget-component.models';
-import { isDefined, isDefinedAndNotNull, isString } from '@core/utils';
+import { isDefined, isDefinedAndNotNull } 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';
@@ -139,32 +139,18 @@ export class EditWidgetComponent extends PageComponent implements OnInit, OnChan
       return;
     }
     const widgetInfo = this.widgetComponentService.getInstantWidgetInfo(this.widget);
-    const rawSettingsSchema = widgetInfo.typeSettingsSchema || widgetInfo.settingsSchema;
-    const rawDataKeySettingsSchema = widgetInfo.typeDataKeySettingsSchema || widgetInfo.dataKeySettingsSchema;
-    const rawLatestDataKeySettingsSchema = widgetInfo.typeLatestDataKeySettingsSchema || widgetInfo.latestDataKeySettingsSchema;
+
+    const settingsForm = widgetInfo.typeSettingsForm?.length ?
+      widgetInfo.typeSettingsForm : (widgetInfo.settingsForm || []);
+    const dataKeySettingsForm = widgetInfo.typeDataKeySettingsForm?.length ?
+      widgetInfo.typeDataKeySettingsForm : (widgetInfo.dataKeySettingsForm || []);
+    const latestDataKeySettingsForm = widgetInfo.typeLatestDataKeySettingsForm?.length ?
+      widgetInfo.typeLatestDataKeySettingsForm : (widgetInfo.latestDataKeySettingsForm || []);
     const typeParameters = widgetInfo.typeParameters;
     const dataKeySettingsFunction: DataKeySettingsFunction = typeParameters?.dataKeySettingsFunction;
     const actionSources = widgetInfo.actionSources;
     const isDataEnabled = isDefined(widgetInfo.typeParameters) ? !widgetInfo.typeParameters.useCustomDatasources : true;
-    let settingsSchema;
-    if (!rawSettingsSchema || rawSettingsSchema === '') {
-      settingsSchema = {};
-    } else {
-      settingsSchema = isString(rawSettingsSchema) ? JSON.parse(rawSettingsSchema) : rawSettingsSchema;
-    }
-    let dataKeySettingsSchema;
-    if (!rawDataKeySettingsSchema || rawDataKeySettingsSchema === '') {
-      dataKeySettingsSchema = {};
-    } else {
-      dataKeySettingsSchema = isString(rawDataKeySettingsSchema) ? JSON.parse(rawDataKeySettingsSchema) : rawDataKeySettingsSchema;
-    }
-    let latestDataKeySettingsSchema;
-    if (!rawLatestDataKeySettingsSchema || rawLatestDataKeySettingsSchema === '') {
-      latestDataKeySettingsSchema = {};
-    } else {
-      latestDataKeySettingsSchema = isString(rawLatestDataKeySettingsSchema) ?
-        JSON.parse(rawLatestDataKeySettingsSchema) : rawLatestDataKeySettingsSchema;
-    }
+
     this.widgetConfig = {
       widgetName: widgetInfo.widgetName,
       config: this.widget.config,
@@ -173,9 +159,9 @@ export class EditWidgetComponent extends PageComponent implements OnInit, OnChan
       typeParameters,
       actionSources,
       isDataEnabled,
-      settingsSchema,
-      dataKeySettingsSchema,
-      latestDataKeySettingsSchema,
+      settingsForm,
+      dataKeySettingsForm,
+      latestDataKeySettingsForm,
       dataKeySettingsFunction,
       settingsDirective: widgetInfo.settingsDirective,
       dataKeySettingsDirective: widgetInfo.dataKeySettingsDirective,
diff --git a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
index a6b204b279..c56aae3476 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
@@ -192,7 +192,8 @@
                        (click)="$event.stopPropagation();"></a>
                   </ng-template>
                   <ng-template [ngSwitchCase]="'entityChips'">
-                    <tb-entity-chips [entity]="entity" [key]="column.key"></tb-entity-chips>
+                    <tb-entity-chips [entity]="entity" [key]="column.key"
+                                     [detailsPagePrefixUrl]="column.entityURL ? column.entityURL(entity) : ''"></tb-entity-chips>
                   </ng-template>
                   <ng-template #defaultContent ngSwitchDefault>
                     <span [innerHTML]="cellContent(entity, column, row)"></span>
diff --git a/ui-ngx/src/app/modules/home/components/entity/entity-chips.component.html b/ui-ngx/src/app/modules/home/components/entity/entity-chips.component.html
index c81857689f..c162540b0c 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entity-chips.component.html
+++ b/ui-ngx/src/app/modules/home/components/entity/entity-chips.component.html
@@ -18,5 +18,5 @@
 
 <a *ngFor="let subEntity of subEntities" class="tb-entity-chip"
    routerLink="{{entityDetailsPrefixUrl}}/{{subEntity.id.id}}" (click)="$event.stopPropagation();">
-  {{ subEntity.name }}
+  {{ subEntity.name | customTranslate }}
 </a>
diff --git a/ui-ngx/src/app/modules/home/components/entity/entity-chips.component.ts b/ui-ngx/src/app/modules/home/components/entity/entity-chips.component.ts
index 6aad28c638..ebece2186b 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entity-chips.component.ts
+++ b/ui-ngx/src/app/modules/home/components/entity/entity-chips.component.ts
@@ -18,7 +18,7 @@ import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { BaseData } from '@shared/models/base-data';
 import { EntityId } from '@shared/models/id/entity-id';
 import { baseDetailsPageByEntityType, EntityType } from '@app/shared/public-api';
-import { isEqual, isObject } from '@core/utils';
+import { isEqual, isNotEmptyStr, isObject } from '@core/utils';
 
 @Component({
   selector: 'tb-entity-chips',
@@ -33,6 +33,9 @@ export class EntityChipsComponent implements OnChanges {
   @Input()
   key: string;
 
+  @Input()
+  detailsPagePrefixUrl: string;
+
   entityDetailsPrefixUrl: string;
 
   subEntities: Array<BaseData<EntityId>> = [];
@@ -52,7 +55,9 @@ export class EntityChipsComponent implements OnChanges {
       if (isObject(entitiesList) && !Array.isArray(entitiesList)) {
         entitiesList = [entitiesList];
       }
-      if (Array.isArray(entitiesList)) {
+      if (isNotEmptyStr(this.detailsPagePrefixUrl)) {
+        this.entityDetailsPrefixUrl = this.detailsPagePrefixUrl;
+      } else if (Array.isArray(entitiesList)) {
         if (entitiesList.length) {
           this.entityDetailsPrefixUrl = baseDetailsPageByEntityType.get(entitiesList[0].id.entityType as EntityType);
         }
diff --git a/ui-ngx/src/app/modules/home/components/filter/filter-predicate-value.component.html b/ui-ngx/src/app/modules/home/components/filter/filter-predicate-value.component.html
index 3cfaf7e7be..2d8207a05e 100644
--- a/ui-ngx/src/app/modules/home/components/filter/filter-predicate-value.component.html
+++ b/ui-ngx/src/app/modules/home/components/filter/filter-predicate-value.component.html
@@ -31,8 +31,7 @@
       </ng-template>
       <ng-template [ngSwitchCase]="valueTypeEnum.DATE_TIME">
         <tb-datetime formControlName="defaultValue"
-                     dateText="filter.date"
-                     timeText="filter.time"
+                     dateText="{{ 'filter.date' | translate }}"
                      required [showLabel]="false"></tb-datetime>
       </ng-template>
       <ng-template [ngSwitchCase]="valueTypeEnum.BOOLEAN">
diff --git a/ui-ngx/src/app/modules/home/components/filter/key-filter-dialog.component.html b/ui-ngx/src/app/modules/home/components/filter/key-filter-dialog.component.html
index 2b4ed91214..bb299bc4bc 100644
--- a/ui-ngx/src/app/modules/home/components/filter/key-filter-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/filter/key-filter-dialog.component.html
@@ -101,8 +101,7 @@
             </ng-template>
             <ng-template [ngSwitchCase]="entityKeyValueTypeEnum.DATE_TIME">
               <tb-datetime formControlName="value"
-                           dateText="filter.date"
-                           timeText="filter.time"
+                           dateText="{{ 'filter.date' | translate }}"
                            required></tb-datetime>
             </ng-template>
             <ng-template [ngSwitchCase]="entityKeyValueTypeEnum.BOOLEAN">
diff --git a/ui-ngx/src/app/modules/home/components/filter/user-filter-dialog.component.html b/ui-ngx/src/app/modules/home/components/filter/user-filter-dialog.component.html
index c5b19aac1f..bc05db8c46 100644
--- a/ui-ngx/src/app/modules/home/components/filter/user-filter-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/filter/user-filter-dialog.component.html
@@ -47,8 +47,7 @@
           <ng-template [ngSwitchCase]="valueTypeEnum.DATE_TIME">
             <label class="tb-title no-padding tb-required">{{ userInputControl.get('label').value }}</label>
             <tb-datetime [formControl]="userInputControl.get('value')"
-                         dateText="filter.date"
-                         timeText="filter.time"
+                         dateText="{{ 'filter.date' | translate }}"
                          required [showLabel]="false"></tb-datetime>
           </ng-template>
           <ng-template [ngSwitchCase]="valueTypeEnum.BOOLEAN">
diff --git a/ui-ngx/src/app/modules/home/components/notification/show-notification-popover.component.html b/ui-ngx/src/app/modules/home/components/notification/show-notification-popover.component.html
index 0e40d8e6a5..edbff9ce7e 100644
--- a/ui-ngx/src/app/modules/home/components/notification/show-notification-popover.component.html
+++ b/ui-ngx/src/app/modules/home/components/notification/show-notification-popover.component.html
@@ -18,13 +18,13 @@
 <section class="flex flex-row items-center justify-between" style="margin: 0 10px 4px; min-height: 36px">
   <div style="font-weight: 500; letter-spacing: .25px" translate>notification.notification</div>
   <button mat-button color="primary"
-          *ngIf="(notifications$ | async).length"
+          *ngIf="(notifications$ | async)?.length"
           (click)="markAsAllRead($event)">
     {{ 'notification.mark-all-as-read' | translate }}
   </button>
 </section>
 <mat-divider></mat-divider>
-<ng-container *ngIf="loadNotification; else loadingNotification">
+<ng-container *ngIf="notifications$ | async; else loadingNotification">
   <div *ngIf="(notifications$ | async).length; else emptyNotification" style="overflow: auto">
     <section style="min-height: 100px; overflow: auto; padding: 6px 0;">
       <div *ngFor="let notification of (notifications$ | async); let last = last; trackBy: trackById">
diff --git a/ui-ngx/src/app/modules/home/components/notification/show-notification-popover.component.ts b/ui-ngx/src/app/modules/home/components/notification/show-notification-popover.component.ts
index 32fcf2dc4a..ad601bd33a 100644
--- a/ui-ngx/src/app/modules/home/components/notification/show-notification-popover.component.ts
+++ b/ui-ngx/src/app/modules/home/components/notification/show-notification-popover.component.ts
@@ -14,24 +14,25 @@
 /// limitations under the License.
 ///
 
-import { ChangeDetectorRef, Component, Input, NgZone, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, NgZone, OnDestroy } from '@angular/core';
 import { PageComponent } from '@shared/components/page.component';
 import { TbPopoverComponent } from '@shared/components/popover.component';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { Notification, NotificationRequest } from '@shared/models/notification.models';
 import { NotificationWebsocketService } from '@core/ws/notification-websocket.service';
-import { BehaviorSubject, Observable, ReplaySubject, Subscription } from 'rxjs';
-import { map, share, skip, tap } from 'rxjs/operators';
+import { BehaviorSubject, Observable, shareReplay } from 'rxjs';
+import { filter, skip, tap } from 'rxjs/operators';
 import { Router } from '@angular/router';
 import { NotificationSubscriber } from '@shared/models/telemetry/telemetry.models';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
   selector: 'tb-show-notification-popover',
   templateUrl: './show-notification-popover.component.html',
   styleUrls: ['show-notification-popover.component.scss']
 })
-export class ShowNotificationPopoverComponent extends PageComponent implements OnDestroy, OnInit {
+export class ShowNotificationPopoverComponent extends PageComponent implements OnDestroy {
 
   @Input()
   onClose: () => void;
@@ -42,11 +43,13 @@ export class ShowNotificationPopoverComponent extends PageComponent implements O
   @Input()
   popoverComponent: TbPopoverComponent;
 
-  private notificationSubscriber: NotificationSubscriber;
-  private notificationCountSubscriber: Subscription;
+  private notificationSubscriber = NotificationSubscriber.createNotificationsSubscription(this.notificationWsService, this.zone, 6);
 
-  notifications$: Observable<Notification[]>;
-  loadNotification = false;
+  notifications$: Observable<Notification[]> = this.notificationSubscriber.notifications$.pipe(
+    filter(value => Array.isArray(value)),
+    shareReplay(1),
+    tap(() => setTimeout(() => this.cd.markForCheck()))
+  );
 
   constructor(protected store: Store<AppState>,
               private notificationWsService: NotificationWebsocketService,
@@ -54,32 +57,15 @@ export class ShowNotificationPopoverComponent extends PageComponent implements O
               private cd: ChangeDetectorRef,
               private router: Router) {
     super(store);
-  }
-
-  ngOnInit() {
-    this.notificationSubscriber = NotificationSubscriber.createNotificationsSubscription(this.notificationWsService, this.zone, 6);
-    this.notifications$ = this.notificationSubscriber.notifications$.pipe(
-      map(value => {
-        if (Array.isArray(value)) {
-          this.loadNotification = true;
-          return value;
-        }
-        return [];
-      }),
-      share({
-        connector: () => new ReplaySubject(1)
-      }),
-      tap(() => setTimeout(() => this.cd.markForCheck()))
-    );
-    this.notificationCountSubscriber = this.notificationSubscriber.notificationCount$.pipe(
+    this.notificationSubscriber.notificationCount$.pipe(
       skip(1),
+      takeUntilDestroyed()
     ).subscribe(value => this.counter.next(value));
     this.notificationSubscriber.subscribe();
   }
 
   ngOnDestroy() {
     super.ngOnDestroy();
-    this.notificationCountSubscriber.unsubscribe();
     this.notificationSubscriber.unsubscribe();
     this.onClose();
   }
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/device-profile-transport-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/device/device-profile-transport-configuration.component.ts
index 47d782dbdb..a295ef76ab 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/device-profile-transport-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device/device-profile-transport-configuration.component.ts
@@ -103,7 +103,7 @@ export class DeviceProfileTransportConfigurationComponent implements ControlValu
       delete configuration.type;
     }
     setTimeout(() => {
-      this.deviceProfileTransportConfigurationFormGroup.patchValue({configuration});
+      this.deviceProfileTransportConfigurationFormGroup.patchValue({configuration}, {emitEvent: false});
     }, 0);
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts
index 775a5c963e..dbcd38a46f 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts
@@ -190,7 +190,7 @@ export class Lwm2mObjectListComponent implements ControlValueAccessor, OnInit, V
   private fetchListObjects = (searchText: string): Observable<Array<ObjectLwM2M>> =>  {
     this.searchText = searchText;
     const pageLink = new PageLink(PAGE_SIZE_LIMIT, 0, this.searchText, {
-      property: 'id',
+      property: 'resourceKey',
       direction: Direction.ASC
     });
     return this.deviceProfileService.getLwm2mObjectsPage(pageLink);
diff --git a/ui-ngx/src/app/modules/home/components/relation/relation-table.component.html b/ui-ngx/src/app/modules/home/components/relation/relation-table.component.html
index fb49f299e9..4b0d4307f7 100644
--- a/ui-ngx/src/app/modules/home/components/relation/relation-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/relation/relation-table.component.html
@@ -118,7 +118,7 @@
           <mat-header-cell *matHeaderCellDef mat-sort-header style="width: 33%"> {{ 'relation.to-entity-name' | translate }} </mat-header-cell>
           <mat-cell *matCellDef="let relation">
             <a class="link" [routerLink]="relation.entityURL">
-              {{ relation.toName }}
+              {{ relation.toName | customTranslate }}
             </a>
           </mat-cell>
         </ng-container>
@@ -132,7 +132,7 @@
           <mat-header-cell *matHeaderCellDef mat-sort-header style="width: 33%"> {{ 'relation.from-entity-name' | translate }} </mat-header-cell>
           <mat-cell *matCellDef="let relation">
             <a class="link" [routerLink]="relation.entityURL">
-              {{ relation.fromName }}
+              {{ relation.fromName | customTranslate }}
             </a>
           </mat-cell>
         </ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/action-rule-node-config.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/action-rule-node-config.module.ts
new file mode 100644
index 0000000000..e71055b5da
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/action-rule-node-config.module.ts
@@ -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.
+///
+
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '@shared/public-api';
+import { HomeComponentsModule } from '@home/components/public-api';
+import { AttributesConfigComponent } from './attributes-config.component';
+import { TimeseriesConfigComponent } from './timeseries-config.component';
+import { RpcRequestConfigComponent } from './rpc-request-config.component';
+import { LogConfigComponent } from './log-config.component';
+import { AssignCustomerConfigComponent } from './assign-customer-config.component';
+import { ClearAlarmConfigComponent } from './clear-alarm-config.component';
+import { CreateAlarmConfigComponent } from './create-alarm-config.component';
+import { CreateRelationConfigComponent } from './create-relation-config.component';
+import { MsgDelayConfigComponent } from './msg-delay-config.component';
+import { DeleteRelationConfigComponent } from './delete-relation-config.component';
+import { GeneratorConfigComponent } from './generator-config.component';
+import { GpsGeoActionConfigComponent } from './gps-geo-action-config.component';
+import { MsgCountConfigComponent } from './msg-count-config.component';
+import { RpcReplyConfigComponent } from './rpc-reply-config.component';
+import { SaveToCustomTableConfigComponent } from './save-to-custom-table-config.component';
+import { CommonRuleNodeConfigModule } from '../common/common-rule-node-config.module';
+import { UnassignCustomerConfigComponent } from './unassign-customer-config.component';
+import { DeviceProfileConfigComponent } from './device-profile-config.component';
+import { PushToEdgeConfigComponent } from './push-to-edge-config.component';
+import { PushToCloudConfigComponent } from './push-to-cloud-config.component';
+import { DeleteAttributesConfigComponent } from './delete-attributes-config.component';
+import { MathFunctionConfigComponent } from './math-function-config.component';
+import { DeviceStateConfigComponent } from './device-state-config.component';
+import { SendRestApiCallReplyConfigComponent } from './send-rest-api-call-reply-config.component';
+import {
+  AdvancedPersistenceSettingComponent
+} from '@home/components/rule-node/action/advanced-persistence-setting.component';
+import {
+  AdvancedPersistenceSettingRowComponent
+} from '@home/components/rule-node/action/advanced-persistence-setting-row.component';
+
+@NgModule({
+  declarations: [
+    DeleteAttributesConfigComponent,
+    AttributesConfigComponent,
+    TimeseriesConfigComponent,
+    RpcRequestConfigComponent,
+    LogConfigComponent,
+    AssignCustomerConfigComponent,
+    ClearAlarmConfigComponent,
+    CreateAlarmConfigComponent,
+    CreateRelationConfigComponent,
+    MsgDelayConfigComponent,
+    DeleteRelationConfigComponent,
+    GeneratorConfigComponent,
+    GpsGeoActionConfigComponent,
+    MsgCountConfigComponent,
+    RpcReplyConfigComponent,
+    SaveToCustomTableConfigComponent,
+    UnassignCustomerConfigComponent,
+    SendRestApiCallReplyConfigComponent,
+    DeviceProfileConfigComponent,
+    PushToEdgeConfigComponent,
+    PushToCloudConfigComponent,
+    MathFunctionConfigComponent,
+    DeviceStateConfigComponent,
+    AdvancedPersistenceSettingComponent,
+    AdvancedPersistenceSettingRowComponent,
+  ],
+  imports: [
+    CommonModule,
+    SharedModule,
+    HomeComponentsModule,
+    CommonRuleNodeConfigModule
+  ],
+  exports: [
+    DeleteAttributesConfigComponent,
+    AttributesConfigComponent,
+    TimeseriesConfigComponent,
+    RpcRequestConfigComponent,
+    LogConfigComponent,
+    AssignCustomerConfigComponent,
+    ClearAlarmConfigComponent,
+    CreateAlarmConfigComponent,
+    CreateRelationConfigComponent,
+    MsgDelayConfigComponent,
+    DeleteRelationConfigComponent,
+    GeneratorConfigComponent,
+    GpsGeoActionConfigComponent,
+    MsgCountConfigComponent,
+    RpcReplyConfigComponent,
+    SaveToCustomTableConfigComponent,
+    UnassignCustomerConfigComponent,
+    SendRestApiCallReplyConfigComponent,
+    DeviceProfileConfigComponent,
+    PushToEdgeConfigComponent,
+    PushToCloudConfigComponent,
+    MathFunctionConfigComponent,
+    DeviceStateConfigComponent
+  ]
+})
+export class ActionRuleNodeConfigModule {
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting-row.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting-row.component.html
new file mode 100644
index 0000000000..2bb51ad504
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting-row.component.html
@@ -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.
+
+-->
+<section [formGroup]="persistenceSettingRowForm" class="tb-form-panel stroked no-gap no-padding-bottom">
+  <div class="tb-form-panel-title mb-4">{{ title }}</div>
+  <mat-form-field>
+    <mat-label translate>rule-node-config.save-time-series.strategy</mat-label>
+    <mat-select formControlName="type">
+      @for (strategy of persistenceStrategies; track strategy) {
+        <mat-option [value]="strategy">{{ PersistenceTypeTranslationMap.get(strategy) | translate }}</mat-option>
+      }
+    </mat-select>
+  </mat-form-field>
+  @if(persistenceSettingRowForm.get('type').value === PersistenceType.DEDUPLICATE) {
+    <tb-time-unit-input
+      required
+      labelText="{{ 'rule-node-config.save-time-series.deduplication-interval' | translate }}"
+      requiredText="{{ 'rule-node-config.save-time-series.deduplication-interval-required' | translate }}"
+      minErrorText="{{ 'rule-node-config.save-time-series.deduplication-interval-min-max-range' | translate }}"
+      maxErrorText="{{ 'rule-node-config.save-time-series.deduplication-interval-min-max-range' | translate }}"
+      [minTime]="1"
+      [maxTime]="maxDeduplicateTime"
+      formControlName="deduplicationIntervalSecs">
+    </tb-time-unit-input>
+  }
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting-row.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting-row.component.ts
new file mode 100644
index 0000000000..bf9b48aca3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting-row.component.ts
@@ -0,0 +1,114 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 } from '@angular/core';
+import {
+  ControlValueAccessor,
+  FormBuilder,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  ValidationErrors,
+  Validator
+} from '@angular/forms';
+import {
+  AdvancedProcessingConfig,
+  defaultAdvancedProcessingConfig,
+  maxDeduplicateTimeSecs,
+  ProcessingType,
+  ProcessingTypeTranslationMap
+} from '@home/components/rule-node/action/timeseries-config.models';
+import { isDefinedAndNotNull } from '@core/utils';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-advanced-persistence-setting-row',
+  templateUrl: './advanced-persistence-setting-row.component.html',
+  providers: [{
+    provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => AdvancedPersistenceSettingRowComponent),
+    multi: true
+  },{
+    provide: NG_VALIDATORS,
+    useExisting: forwardRef(() => AdvancedPersistenceSettingRowComponent),
+    multi: true
+  }]
+})
+export class AdvancedPersistenceSettingRowComponent implements ControlValueAccessor, Validator {
+
+  @Input()
+  title: string;
+
+  persistenceSettingRowForm = this.fb.group({
+    type: [defaultAdvancedProcessingConfig.type],
+    deduplicationIntervalSecs: [{value: 60, disabled: true}]
+  });
+
+  PersistenceType = ProcessingType;
+  persistenceStrategies = [ProcessingType.ON_EVERY_MESSAGE, ProcessingType.DEDUPLICATE, ProcessingType.SKIP];
+  PersistenceTypeTranslationMap = ProcessingTypeTranslationMap;
+
+  maxDeduplicateTime = maxDeduplicateTimeSecs;
+
+  private propagateChange: (value: any) => void = () => {};
+
+  constructor(private fb: FormBuilder) {
+    this.persistenceSettingRowForm.get('type').valueChanges.pipe(
+      takeUntilDestroyed()
+    ).subscribe(() => this.updatedValidation());
+
+    this.persistenceSettingRowForm.valueChanges.pipe(
+      takeUntilDestroyed()
+    ).subscribe((value) => this.propagateChange(value));
+  }
+
+  registerOnChange(fn: any) {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any) {
+  }
+
+  setDisabledState(isDisabled: boolean) {
+    if (isDisabled) {
+      this.persistenceSettingRowForm.disable({emitEvent: false});
+    } else {
+      this.persistenceSettingRowForm.enable({emitEvent: false});
+      this.updatedValidation();
+    }
+  }
+
+  validate(): ValidationErrors | null {
+    return this.persistenceSettingRowForm.valid ? null : {
+      persistenceSettingRow: false
+    };
+  }
+
+  writeValue(value: AdvancedProcessingConfig) {
+    if (isDefinedAndNotNull(value)) {
+      this.persistenceSettingRowForm.patchValue(value, {emitEvent: false});
+    } else {
+      this.persistenceSettingRowForm.patchValue(defaultAdvancedProcessingConfig);
+    }
+  }
+
+  private updatedValidation() {
+    if (this.persistenceSettingRowForm.get('type').value === ProcessingType.DEDUPLICATE) {
+      this.persistenceSettingRowForm.get('deduplicationIntervalSecs').enable({emitEvent: false});
+    } else {
+      this.persistenceSettingRowForm.get('deduplicationIntervalSecs').disable({emitEvent: false})
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting.component.html
new file mode 100644
index 0000000000..d3cbb1cdcb
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting.component.html
@@ -0,0 +1,36 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="persistenceForm" class="tb-form-panel no-border no-padding">
+  <tb-example-hint
+    [hintText]="'rule-node-config.save-time-series.advanced-settings-hint'"
+    [popupHelpLink]="'rulenode/save_timeseries_node_advanced'"
+  >
+  </tb-example-hint>
+  <tb-advanced-persistence-setting-row
+    formControlName="timeseries"
+    title="{{ 'rule-node-config.save-time-series.time-series' | translate }}"
+  ></tb-advanced-persistence-setting-row>
+  <tb-advanced-persistence-setting-row
+    formControlName="latest"
+    title="{{ 'rule-node-config.save-time-series.latest' | translate }}"
+  ></tb-advanced-persistence-setting-row>
+  <tb-advanced-persistence-setting-row
+    formControlName="webSockets"
+    title="{{ 'rule-node-config.save-time-series.web-sockets' | translate }}"
+  ></tb-advanced-persistence-setting-row>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting.component.ts
new file mode 100644
index 0000000000..969f432f5f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-persistence-setting.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 {
+  ControlValueAccessor,
+  FormBuilder,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  ValidationErrors,
+  Validator
+} from '@angular/forms';
+import { Component, forwardRef } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { AdvancedProcessingStrategy } from '@home/components/rule-node/action/timeseries-config.models';
+
+@Component({
+  selector: 'tb-advanced-persistence-settings',
+  templateUrl: './advanced-persistence-setting.component.html',
+  providers: [{
+    provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => AdvancedPersistenceSettingComponent),
+    multi: true
+  },{
+    provide: NG_VALIDATORS,
+    useExisting: forwardRef(() => AdvancedPersistenceSettingComponent),
+    multi: true
+  }]
+})
+export class AdvancedPersistenceSettingComponent implements ControlValueAccessor, Validator {
+
+  persistenceForm = this.fb.group({
+    timeseries: [null],
+    latest: [null],
+    webSockets: [null]
+  });
+
+  private propagateChange: (value: any) => void = () => {};
+
+  constructor(private fb: FormBuilder) {
+    this.persistenceForm.valueChanges.pipe(
+      takeUntilDestroyed()
+    ).subscribe(value => this.propagateChange(value));
+  }
+
+  registerOnChange(fn: any) {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any) {
+  }
+
+  setDisabledState(isDisabled: boolean) {
+    if (isDisabled) {
+      this.persistenceForm.disable({emitEvent: false});
+    } else {
+      this.persistenceForm.enable({emitEvent: false});
+    }
+  }
+
+  validate(): ValidationErrors | null {
+    return this.persistenceForm.valid ? null : {
+      persistenceForm: false
+    };
+  }
+
+  writeValue(value: AdvancedProcessingStrategy) {
+    this.persistenceForm.patchValue(value, {emitEvent: false});
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/assign-customer-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/assign-customer-config.component.html
new file mode 100644
index 0000000000..4ec27d83e7
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/assign-customer-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="assignCustomerConfigForm" class="flex flex-col">
+  <div class="tb-form-panel no-padding no-border">
+    <mat-form-field class="mat-block" subscriptSizing="dynamic">
+      <mat-label translate>rule-node-config.customer-name-pattern</mat-label>
+      <input required matInput formControlName="customerNamePattern">
+      <mat-error *ngIf="assignCustomerConfigForm.get('customerNamePattern').hasError('required') ||
+                        assignCustomerConfigForm.get('customerNamePattern').hasError('pattern')">
+        {{ 'rule-node-config.customer-name-pattern-required' | translate }}
+      </mat-error>
+      <mat-hint translate>rule-node-config.customer-name-pattern-hint</mat-hint>
+    </mat-form-field>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="createCustomerIfNotExists">
+        {{ 'rule-node-config.create-customer-if-not-exists' | translate }}
+      </mat-slide-toggle>
+    </div>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/assign-customer-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/assign-customer-config.component.ts
new file mode 100644
index 0000000000..924cb448e3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/assign-customer-config.component.ts
@@ -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 { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-action-node-assign-to-customer-config',
+  templateUrl: './assign-customer-config.component.html',
+  styleUrls: []
+})
+export class AssignCustomerConfigComponent extends RuleNodeConfigurationComponent {
+
+  assignCustomerConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.assignCustomerConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.assignCustomerConfigForm = this.fb.group({
+      customerNamePattern: [configuration ? configuration.customerNamePattern : null, [Validators.required, Validators.pattern(/.*\S.*/)]],
+      createCustomerIfNotExists: [configuration ? configuration.createCustomerIfNotExists : false, []]
+    });
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    configuration.customerNamePattern = configuration.customerNamePattern.trim();
+    return configuration;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.component.html
new file mode 100644
index 0000000000..258f856e91
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="attributesConfigForm" class="tb-form-panel no-border no-padding">
+  <div class="tb-form-panel stroked">
+    <tb-example-hint [hintText]="'rule-node-config.attributes-scope-hint'">
+    </tb-example-hint>
+    <div class="tb-form-row no-border no-padding tb-standard-fields">
+      <mat-form-field class="flex">
+        <mat-label>{{ 'rule-node-config.attributes-scope' | translate }}</mat-label>
+        <mat-select required
+                    class="tb-entity-type-select" matInput formControlName="scope">
+          <mat-option *ngFor="let scope of attributeScopes" [value]="scope">
+            {{ telemetryTypeTranslationsMap.get(scope) | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <mat-form-field class="flex">
+        <mat-label>{{ 'rule-node-config.attributes-scope-value' | translate }}</mat-label>
+        <input type="text" matInput readonly disabled [ngModel]="attributesConfigForm.get('scope').value" [ngModelOptions]="{standalone: true}">
+        <button type="button"
+                matSuffix
+                mat-icon-button
+                aria-label="Copy"
+                ngxClipboard
+                [cbContent]="attributesConfigForm.get('scope').value"
+                matTooltip="{{ 'rule-node-config.attributes-scope-value-copy' | translate }}">
+          <mat-icon aria-hidden="false"
+                    aria-label="help-icon">content_copy
+          </mat-icon>
+        </button>
+      </mat-form-field>
+    </div>
+  </div>
+
+  <section class="tb-form-panel stroked">
+    <mat-expansion-panel class="tb-settings">
+      <mat-expansion-panel-header>
+        <mat-panel-title translate>rule-node-config.advanced-settings</mat-panel-title>
+      </mat-expansion-panel-header>
+      <div tb-hint-tooltip-icon="{{ (attributesConfigForm.get('updateAttributesOnlyOnValueChange').value
+                                     ? 'rule-node-config.update-attributes-only-on-value-change-hint-enabled'
+                                     : 'rule-node-config.update-attributes-only-on-value-change-hint') | translate }}"
+           class="tb-form-row no-border no-padding">
+        <mat-slide-toggle class="mat-slide" formControlName="updateAttributesOnlyOnValueChange">
+          {{ 'rule-node-config.update-attributes-only-on-value-change' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <div tb-hint-tooltip-icon="{{ 'rule-node-config.send-attributes-updated-notification-hint' | translate }}"
+           *ngIf="attributesConfigForm.get('scope').value !== attributeScopeMap.CLIENT_SCOPE"
+           class="tb-form-row no-border no-padding">
+        <mat-slide-toggle class="mat-slide" formControlName="sendAttributesUpdatedNotification">
+          {{ 'rule-node-config.send-attributes-updated-notification' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <div tb-hint-tooltip-icon="{{ 'rule-node-config.notify-device-on-update-hint' | translate }}"
+           *ngIf="attributesConfigForm.get('scope').value === attributeScopeMap.SHARED_SCOPE"
+           class="tb-form-row no-border no-padding">
+        <mat-slide-toggle class="mat-slide" formControlName="notifyDevice">
+          {{ 'rule-node-config.notify-device' | translate }}
+        </mat-slide-toggle>
+      </div>
+    </mat-expansion-panel>
+  </section>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.component.ts
new file mode 100644
index 0000000000..29b5dd2bc5
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.component.ts
@@ -0,0 +1,65 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+import { AttributeScope, telemetryTypeTranslations } from '@app/shared/models/telemetry/telemetry.models';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-action-node-attributes-config',
+  templateUrl: './attributes-config.component.html',
+  styleUrls: []
+})
+export class AttributesConfigComponent extends RuleNodeConfigurationComponent {
+
+  attributeScopeMap = AttributeScope;
+  attributeScopes = Object.keys(AttributeScope);
+  telemetryTypeTranslationsMap = telemetryTypeTranslations;
+
+  attributesConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.attributesConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.attributesConfigForm = this.fb.group({
+      scope: [configuration ? configuration.scope : null, [Validators.required]],
+      notifyDevice: [configuration ? configuration.notifyDevice : true, []],
+      sendAttributesUpdatedNotification: [configuration ? configuration.sendAttributesUpdatedNotification : false, []],
+      updateAttributesOnlyOnValueChange: [configuration ? configuration.updateAttributesOnlyOnValueChange : false, []]
+    });
+
+    this.attributesConfigForm.get('scope').valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe((value) => {
+      if (value !== AttributeScope.SHARED_SCOPE) {
+        this.attributesConfigForm.get('notifyDevice').patchValue(false, {emitEvent: false});
+      }
+      if (value === AttributeScope.CLIENT_SCOPE) {
+        this.attributesConfigForm.get('sendAttributesUpdatedNotification').patchValue(false, {emitEvent: false});
+      }
+      this.attributesConfigForm.get('updateAttributesOnlyOnValueChange').patchValue(false, {emitEvent: false});
+    });
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/clear-alarm-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/clear-alarm-config.component.html
new file mode 100644
index 0000000000..075978ce69
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/clear-alarm-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="clearAlarmConfigForm" class="flex flex-col">
+  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>
+  <tb-js-func *ngIf="clearAlarmConfigForm.get('scriptLang').value === scriptLanguage.JS"
+              #jsFuncComponent
+              formControlName="alarmDetailsBuildJs"
+              functionName="Details"
+              [functionArgs]="['msg', 'metadata', 'msgType']"
+              helpId="rulenode/clear_alarm_node_script_fn"
+              noValidate="true">
+    <button toolbarSuffixButton
+            mat-icon-button
+            matTooltip="{{ testScriptLabel | translate }}"
+            matTooltipPosition="above"
+            class="tb-mat-32"
+            (click)="testScript()">
+      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+    </button>
+  </tb-js-func>
+  <tb-js-func *ngIf="clearAlarmConfigForm.get('scriptLang').value === scriptLanguage.TBEL"
+              #tbelFuncComponent
+              formControlName="alarmDetailsBuildTbel"
+              functionName="Details"
+              [functionArgs]="['msg', 'metadata', 'msgType']"
+              [disableUndefinedCheck]="true"
+              [scriptLanguage]="scriptLanguage.TBEL"
+              helpId="rulenode/tbel/clear_alarm_node_script_fn"
+              noValidate="true">
+    <button toolbarSuffixButton
+            mat-icon-button
+            matTooltip="{{ testScriptLabel | translate }}"
+            matTooltipPosition="above"
+            class="tb-mat-32"
+            (click)="testScript()">
+      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+    </button>
+  </tb-js-func>
+  <div class="flex flex-row" style="padding-bottom: 16px;">
+    <button mat-button mat-raised-button color="primary" (click)="testScript()">
+      {{ testScriptLabel | translate }}
+    </button>
+  </div>
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.alarm-type</mat-label>
+    <input required matInput formControlName="alarmType">
+    <mat-error *ngIf="clearAlarmConfigForm.get('alarmType').hasError('required')">
+      {{ 'rule-node-config.alarm-type-required' | translate }}
+    </mat-error>
+    <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+  </mat-form-field>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/clear-alarm-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/clear-alarm-config.component.ts
new file mode 100644
index 0000000000..cf96982621
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/clear-alarm-config.component.ts
@@ -0,0 +1,127 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, ViewChild } from '@angular/core';
+import { AppState, getCurrentAuthState, NodeScriptTestService } from '@core/public-api';
+import { Store } from '@ngrx/store';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  RuleNodeConfiguration,
+  RuleNodeConfigurationComponent,
+  ScriptLanguage
+} from '@app/shared/models/rule-node.models';
+import type { JsFuncComponent } from '@app/shared/components/js-func.component';
+import { DebugRuleNodeEventBody } from '@shared/models/event.models';
+
+@Component({
+  selector: 'tb-action-node-clear-alarm-config',
+  templateUrl: './clear-alarm-config.component.html',
+  styleUrls: []
+})
+export class ClearAlarmConfigComponent extends RuleNodeConfigurationComponent {
+
+  @ViewChild('jsFuncComponent', {static: false}) jsFuncComponent: JsFuncComponent;
+  @ViewChild('tbelFuncComponent', {static: false}) tbelFuncComponent: JsFuncComponent;
+
+  clearAlarmConfigForm: UntypedFormGroup;
+
+  tbelEnabled = getCurrentAuthState(this.store).tbelEnabled;
+
+  scriptLanguage = ScriptLanguage;
+
+  changeScript: EventEmitter<void> = new EventEmitter<void>();
+
+  readonly hasScript = true;
+
+  readonly testScriptLabel = 'rule-node-config.test-details-function';
+
+  constructor(protected store: Store<AppState>,
+              private fb: UntypedFormBuilder,
+              private nodeScriptTestService: NodeScriptTestService,
+              private translate: TranslateService) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.clearAlarmConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.clearAlarmConfigForm = this.fb.group({
+      scriptLang: [configuration ? configuration.scriptLang : ScriptLanguage.JS, [Validators.required]],
+      alarmDetailsBuildJs: [configuration ? configuration.alarmDetailsBuildJs : null, []],
+      alarmDetailsBuildTbel: [configuration ? configuration.alarmDetailsBuildTbel : null, []],
+      alarmType: [configuration ? configuration.alarmType : null, [Validators.required]]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['scriptLang'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    let scriptLang: ScriptLanguage = this.clearAlarmConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.TBEL && !this.tbelEnabled) {
+      scriptLang = ScriptLanguage.JS;
+      this.clearAlarmConfigForm.get('scriptLang').patchValue(scriptLang, {emitEvent: false});
+      setTimeout(() => {this.clearAlarmConfigForm.updateValueAndValidity({emitEvent: true});});
+    }
+    this.clearAlarmConfigForm.get('alarmDetailsBuildJs').setValidators(scriptLang === ScriptLanguage.JS ? [Validators.required] : []);
+    this.clearAlarmConfigForm.get('alarmDetailsBuildJs').updateValueAndValidity({emitEvent});
+    this.clearAlarmConfigForm.get('alarmDetailsBuildTbel').setValidators(scriptLang === ScriptLanguage.TBEL ? [Validators.required] : []);
+    this.clearAlarmConfigForm.get('alarmDetailsBuildTbel').updateValueAndValidity({emitEvent});
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    if (configuration) {
+      if (!configuration.scriptLang) {
+        configuration.scriptLang = ScriptLanguage.JS;
+      }
+    }
+    return configuration;
+  }
+
+  testScript(debugEventBody?: DebugRuleNodeEventBody) {
+    const scriptLang: ScriptLanguage = this.clearAlarmConfigForm.get('scriptLang').value;
+    const scriptField = scriptLang === ScriptLanguage.JS ? 'alarmDetailsBuildJs' : 'alarmDetailsBuildTbel';
+    const helpId = scriptLang === ScriptLanguage.JS ? 'rulenode/clear_alarm_node_script_fn' : 'rulenode/tbel/clear_alarm_node_script_fn';
+    const script: string = this.clearAlarmConfigForm.get(scriptField).value;
+    this.nodeScriptTestService.testNodeScript(
+      script,
+      'json',
+      this.translate.instant('rule-node-config.details'),
+      'Details',
+      ['msg', 'metadata', 'msgType'],
+      this.ruleNodeId,
+      helpId,
+      scriptLang,
+      debugEventBody
+    ).subscribe((theScript) => {
+      if (theScript) {
+        this.clearAlarmConfigForm.get(scriptField).setValue(theScript);
+        this.changeScript.emit();
+      }
+    });
+  }
+
+  protected onValidate() {
+    const scriptLang: ScriptLanguage = this.clearAlarmConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.JS) {
+      this.jsFuncComponent.validateOnSubmit();
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/create-alarm-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/create-alarm-config.component.html
new file mode 100644
index 0000000000..9ec4238081
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/create-alarm-config.component.html
@@ -0,0 +1,128 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="createAlarmConfigForm" class="flex flex-col">
+  <mat-checkbox formControlName="useMessageAlarmData">
+    {{ 'rule-node-config.use-message-alarm-data' | translate }}
+  </mat-checkbox>
+  <mat-checkbox formControlName="overwriteAlarmDetails" *ngIf="createAlarmConfigForm.get('useMessageAlarmData').value === true">
+    {{ 'rule-node-config.overwrite-alarm-details' | translate }}
+  </mat-checkbox>
+  <section class="flex flex-col" *ngIf="createAlarmConfigForm.get('useMessageAlarmData').value === false ||
+                                    createAlarmConfigForm.get('overwriteAlarmDetails').value === true">
+    <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>
+    <tb-js-func *ngIf="createAlarmConfigForm.get('scriptLang').value === scriptLanguage.JS"
+                #jsFuncComponent
+                formControlName="alarmDetailsBuildJs"
+                functionName="Details"
+                [functionArgs]="['msg', 'metadata', 'msgType']"
+                helpId="rulenode/create_alarm_node_script_fn"
+                noValidate="true">
+      <button toolbarSuffixButton
+              mat-icon-button
+              matTooltip="{{ testScriptLabel | translate }}"
+              matTooltipPosition="above"
+              class="tb-mat-32"
+              (click)="testScript()">
+        <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+      </button>
+    </tb-js-func>
+    <tb-js-func *ngIf="createAlarmConfigForm.get('scriptLang').value === scriptLanguage.TBEL"
+                #tbelFuncComponent
+                formControlName="alarmDetailsBuildTbel"
+                functionName="Details"
+                [functionArgs]="['msg', 'metadata', 'msgType']"
+                [disableUndefinedCheck]="true"
+                [scriptLanguage]="scriptLanguage.TBEL"
+                helpId="rulenode/tbel/create_alarm_node_script_fn"
+                noValidate="true">
+      <button toolbarSuffixButton
+              mat-icon-button
+              matTooltip="{{ testScriptLabel | translate }}"
+              matTooltipPosition="above"
+              class="tb-mat-32"
+              (click)="testScript()">
+        <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+      </button>
+    </tb-js-func>
+    <div class="flex flex-row" style="padding-bottom: 16px;">
+      <button mat-button mat-raised-button color="primary" (click)="testScript()">
+        {{ testScriptLabel | translate }}
+      </button>
+    </div>
+  </section>
+  <section class="flex flex-col" *ngIf="createAlarmConfigForm.get('useMessageAlarmData').value === false">
+    <mat-form-field class="flex-1" subscriptSizing="dynamic">
+      <mat-label translate>rule-node-config.alarm-type</mat-label>
+      <input required matInput formControlName="alarmType">
+      <mat-error *ngIf="createAlarmConfigForm.get('alarmType').hasError('required')">
+        {{ 'rule-node-config.alarm-type-required' | translate }}
+      </mat-error>
+      <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+    </mat-form-field>
+    <mat-checkbox formControlName="dynamicSeverity">
+      {{ 'rule-node-config.use-alarm-severity-pattern' | translate }}
+    </mat-checkbox>
+    <mat-form-field class="flex-1" *ngIf="!createAlarmConfigForm.get('dynamicSeverity').value">
+      <mat-label translate>rule-node-config.alarm-severity</mat-label>
+      <mat-select formControlName="severity" required>
+        <mat-option *ngFor="let severity of alarmSeverities" [value]="severity">
+          {{ alarmSeverityTranslationMap.get(severity) | translate }}
+        </mat-option>
+      </mat-select>
+      <mat-error *ngIf="createAlarmConfigForm.get('severity').hasError('required')">
+        {{ 'rule-node-config.alarm-severity-required' | translate }}
+      </mat-error>
+    </mat-form-field>
+    <mat-form-field class="flex-1" *ngIf="createAlarmConfigForm.get('dynamicSeverity').value" subscriptSizing="dynamic">
+      <mat-label translate>rule-node-config.alarm-severity-pattern</mat-label>
+      <input matInput formControlName="severity" required>
+      <mat-error *ngIf="createAlarmConfigForm.get('severity').hasError('required')">
+        {{ 'rule-node-config.alarm-severity-required' | translate }}
+      </mat-error>
+      <mat-hint [innerHTML]="'rule-node-config.alarm-severity-pattern-hint' | translate | safe: 'html'"></mat-hint>
+    </mat-form-field>
+    <mat-checkbox formControlName="propagate">
+      {{ 'rule-node-config.propagate' | translate }}
+    </mat-checkbox>
+    <section *ngIf="createAlarmConfigForm.get('propagate').value === true">
+      <mat-form-field floatLabel="always" class="mat-block" subscriptSizing="dynamic">
+        <mat-label translate>rule-node-config.relation-types-list</mat-label>
+        <mat-chip-grid #relationTypesChipList>
+          <mat-chip-row
+            *ngFor="let key of createAlarmConfigForm.get('relationTypes').value;"
+            (removed)="removeKey(key, 'relationTypes')">
+            {{key}}
+            <mat-icon matChipRemove>close</mat-icon>
+          </mat-chip-row>
+          <input matInput type="text" placeholder="{{'rule-node-config.relation-types-list' | translate}}"
+                 [matChipInputFor]="relationTypesChipList"
+                 [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+                 (matChipInputTokenEnd)="addKey($event, 'relationTypes')"
+                 [matChipInputAddOnBlur]="true">
+        </mat-chip-grid>
+        <mat-hint translate>rule-node-config.relation-types-list-hint</mat-hint>
+      </mat-form-field>
+    </section>
+    <mat-checkbox formControlName="propagateToOwner">
+      {{ 'rule-node-config.propagate-to-owner' | translate }}
+    </mat-checkbox>
+    <mat-checkbox formControlName="propagateToTenant">
+      {{ 'rule-node-config.propagate-to-tenant' | translate }}
+    </mat-checkbox>
+  </section>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/create-alarm-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/create-alarm-config.component.ts
new file mode 100644
index 0000000000..738ec589be
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/create-alarm-config.component.ts
@@ -0,0 +1,202 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, ViewChild } from '@angular/core';
+import { AppState, getCurrentAuthState, NodeScriptTestService } from '@core/public-api';
+import { Store } from '@ngrx/store';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes';
+import { MatChipInputEvent } from '@angular/material/chips';
+import {
+  RuleNodeConfiguration,
+  RuleNodeConfigurationComponent,
+  ScriptLanguage
+} from '@app/shared/models/rule-node.models';
+import type { JsFuncComponent } from '@app/shared/components/js-func.component';
+import { AlarmSeverity, alarmSeverityTranslations } from '@app/shared/models/alarm.models';
+import { DebugRuleNodeEventBody } from '@shared/models/event.models';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-action-node-create-alarm-config',
+  templateUrl: './create-alarm-config.component.html',
+  styleUrls: []
+})
+export class CreateAlarmConfigComponent extends RuleNodeConfigurationComponent {
+
+  @ViewChild('jsFuncComponent', {static: false}) jsFuncComponent: JsFuncComponent;
+  @ViewChild('tbelFuncComponent', {static: false}) tbelFuncComponent: JsFuncComponent;
+
+  alarmSeverities = Object.keys(AlarmSeverity);
+  alarmSeverityTranslationMap = alarmSeverityTranslations;
+  createAlarmConfigForm: UntypedFormGroup;
+
+  separatorKeysCodes = [ENTER, COMMA, SEMICOLON];
+
+  tbelEnabled = getCurrentAuthState(this.store).tbelEnabled;
+
+  scriptLanguage = ScriptLanguage;
+
+  changeScript: EventEmitter<void> = new EventEmitter<void>();
+
+  readonly hasScript = true;
+
+  readonly testScriptLabel = 'rule-node-config.test-details-function';
+
+  constructor(protected store: Store<AppState>,
+              private fb: UntypedFormBuilder,
+              private nodeScriptTestService: NodeScriptTestService,
+              private translate: TranslateService) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.createAlarmConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.createAlarmConfigForm = this.fb.group({
+      scriptLang: [configuration ? configuration.scriptLang : ScriptLanguage.JS, [Validators.required]],
+      alarmDetailsBuildJs: [configuration ? configuration.alarmDetailsBuildJs : null, []],
+      alarmDetailsBuildTbel: [configuration ? configuration.alarmDetailsBuildTbel : null, []],
+      useMessageAlarmData: [configuration ? configuration.useMessageAlarmData : false, []],
+      overwriteAlarmDetails: [configuration ? configuration.overwriteAlarmDetails : false, []],
+      alarmType: [configuration ? configuration.alarmType : null, []],
+      severity: [configuration ? configuration.severity : null, []],
+      propagate: [configuration ? configuration.propagate : false, []],
+      relationTypes: [configuration ? configuration.relationTypes : null, []],
+      propagateToOwner: [configuration ? configuration.propagateToOwner : false, []],
+      propagateToTenant: [configuration ? configuration.propagateToTenant : false, []],
+      dynamicSeverity: false
+    });
+
+    this.createAlarmConfigForm.get('dynamicSeverity').valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe((dynamicSeverity) => {
+      if(dynamicSeverity){
+        this.createAlarmConfigForm.get('severity').patchValue('',{emitEvent:false});
+      } else {
+        this.createAlarmConfigForm.get('severity').patchValue(this.alarmSeverities[0],{emitEvent:false});
+      }
+    });
+
+  }
+
+
+  protected validatorTriggers(): string[] {
+    return ['useMessageAlarmData', 'overwriteAlarmDetails', 'scriptLang'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const useMessageAlarmData: boolean = this.createAlarmConfigForm.get('useMessageAlarmData').value;
+    const overwriteAlarmDetails: boolean = this.createAlarmConfigForm.get('overwriteAlarmDetails').value;
+    if (useMessageAlarmData) {
+      this.createAlarmConfigForm.get('alarmType').setValidators([]);
+      this.createAlarmConfigForm.get('severity').setValidators([]);
+    } else {
+      this.createAlarmConfigForm.get('alarmType').setValidators([Validators.required]);
+      this.createAlarmConfigForm.get('severity').setValidators([Validators.required]);
+    }
+    this.createAlarmConfigForm.get('alarmType').updateValueAndValidity({emitEvent});
+    this.createAlarmConfigForm.get('severity').updateValueAndValidity({emitEvent});
+
+    let scriptLang: ScriptLanguage = this.createAlarmConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.TBEL && !this.tbelEnabled) {
+      scriptLang = ScriptLanguage.JS;
+      this.createAlarmConfigForm.get('scriptLang').patchValue(scriptLang, {emitEvent: false});
+      setTimeout(() => {this.createAlarmConfigForm.updateValueAndValidity({emitEvent: true});});
+    }
+    const useAlarmDetailsBuildScript = useMessageAlarmData === false || overwriteAlarmDetails === true;
+    this.createAlarmConfigForm.get('alarmDetailsBuildJs')
+      .setValidators(useAlarmDetailsBuildScript && scriptLang === ScriptLanguage.JS ? [Validators.required] : []);
+    this.createAlarmConfigForm.get('alarmDetailsBuildTbel')
+      .setValidators(useAlarmDetailsBuildScript && scriptLang === ScriptLanguage.TBEL ? [Validators.required] : []);
+    this.createAlarmConfigForm.get('alarmDetailsBuildJs').updateValueAndValidity({emitEvent});
+    this.createAlarmConfigForm.get('alarmDetailsBuildTbel').updateValueAndValidity({emitEvent});
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    if (configuration) {
+      if (!configuration.scriptLang) {
+        configuration.scriptLang = ScriptLanguage.JS;
+      }
+    }
+    return configuration;
+  }
+
+  testScript(debugEventBody?: DebugRuleNodeEventBody) {
+    const scriptLang: ScriptLanguage = this.createAlarmConfigForm.get('scriptLang').value;
+    const scriptField = scriptLang === ScriptLanguage.JS ? 'alarmDetailsBuildJs' : 'alarmDetailsBuildTbel';
+    const helpId = scriptLang === ScriptLanguage.JS ? 'rulenode/create_alarm_node_script_fn' : 'rulenode/tbel/create_alarm_node_script_fn';
+    const script: string = this.createAlarmConfigForm.get(scriptField).value;
+    this.nodeScriptTestService.testNodeScript(
+      script,
+      'json',
+      this.translate.instant('rule-node-config.details'),
+      'Details',
+      ['msg', 'metadata', 'msgType'],
+      this.ruleNodeId,
+      helpId,
+      scriptLang,
+      debugEventBody
+    ).subscribe((theScript) => {
+      if (theScript) {
+        this.createAlarmConfigForm.get(scriptField).setValue(theScript);
+        this.changeScript.emit();
+      }
+    });
+  }
+
+  removeKey(key: string, keysField: string): void {
+    const keys: string[] = this.createAlarmConfigForm.get(keysField).value;
+    const index = keys.indexOf(key);
+    if (index >= 0) {
+      keys.splice(index, 1);
+      this.createAlarmConfigForm.get(keysField).setValue(keys, {emitEvent: true});
+    }
+  }
+
+  addKey(event: MatChipInputEvent, keysField: string): void {
+    const input = event.input;
+    let value = event.value;
+    if ((value || '').trim()) {
+      value = value.trim();
+      let keys: string[] = this.createAlarmConfigForm.get(keysField).value;
+      if (!keys || keys.indexOf(value) === -1) {
+        if (!keys) {
+          keys = [];
+        }
+        keys.push(value);
+        this.createAlarmConfigForm.get(keysField).setValue(keys, {emitEvent: true});
+      }
+    }
+    if (input) {
+      input.value = '';
+    }
+  }
+
+  protected onValidate() {
+    const useMessageAlarmData: boolean = this.createAlarmConfigForm.get('useMessageAlarmData').value;
+    const overwriteAlarmDetails: boolean = this.createAlarmConfigForm.get('overwriteAlarmDetails').value;
+    if (!useMessageAlarmData || overwriteAlarmDetails) {
+      const scriptLang: ScriptLanguage = this.createAlarmConfigForm.get('scriptLang').value;
+      if (scriptLang === ScriptLanguage.JS) {
+        this.jsFuncComponent.validateOnSubmit();
+      }
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/create-relation-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/create-relation-config.component.html
new file mode 100644
index 0000000000..362bb4d9b6
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/create-relation-config.component.html
@@ -0,0 +1,100 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="createRelationConfigForm" class="tb-form-panel no-padding no-border">
+  <div class="tb-form-panel stroked no-padding-bottom">
+    <div class="tb-form-panel-title" translate>rule-node-config.relation-parameters</div>
+    <div class="flex flex-col">
+      <mat-form-field class="mat-block" hideRequiredMarker>
+        <mat-label translate>relation.direction</mat-label>
+        <mat-select required matInput formControlName="direction">
+          <mat-option *ngFor="let type of directionTypes" [value]="type">
+            {{ directionTypeTranslations.get(type) | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <tb-relation-type-autocomplete
+        required
+        formControlName="relationType">
+      </tb-relation-type-autocomplete>
+    </div>
+  </div>
+
+  <div class="tb-form-panel stroked no-padding-bottom">
+    <div class="tb-form-panel-title" translate>rule-node-config.target-entity</div>
+    <div class="flex flex-row gap-4">
+      <tb-entity-type-select
+        class="flex-1"
+        showLabel
+        required
+        [allowedEntityTypes]="allowedEntityTypes"
+        formControlName="entityType">
+      </tb-entity-type-select>
+
+      <mat-form-field *ngIf="createRelationConfigForm.get('entityType').value &&
+                      createRelationConfigForm.get('entityType').value !== entityType.TENANT"
+                      class="mat-block flex-1">
+        <mat-label>{{ entityTypeNamePatternTranslation.get(createRelationConfigForm.get('entityType').value) | translate }}</mat-label>
+        <input required matInput formControlName="entityNamePattern">
+      </mat-form-field>
+
+      <mat-form-field *ngIf="createRelationConfigForm.get('entityType').value === entityType.DEVICE ||
+                           createRelationConfigForm.get('entityType').value === entityType.ASSET"
+                      class="mat-block flex-1">
+        <mat-label translate>rule-node-config.profile-name</mat-label>
+        <input matInput formControlName="entityTypePattern">
+      </mat-form-field>
+    </div>
+
+    <tb-example-hint [hintText]="'rule-node-config.kv-map-pattern-hint'"
+                     *ngIf="createRelationConfigForm.get('entityType').value === entityType.CUSTOMER ||
+                     createRelationConfigForm.get('entityType').value === entityType.DEVICE ||
+                     createRelationConfigForm.get('entityType').value === entityType.ASSET"></tb-example-hint>
+
+    <div tb-hint-tooltip-icon="{{ 'rule-node-config.create-entity-if-not-exists-hint' | translate }}"
+         *ngIf="createRelationConfigForm.get('entityType').value === entityType.CUSTOMER ||
+                  createRelationConfigForm.get('entityType').value === entityType.DEVICE ||
+                  createRelationConfigForm.get('entityType').value === entityType.ASSET"
+         style="margin-bottom: 18px"
+         class="tb-form-row no-border no-padding">
+      <mat-slide-toggle class="mat-slide" formControlName="createEntityIfNotExists">
+        {{ 'rule-node-config.create-entity-if-not-exists' | translate }}
+      </mat-slide-toggle>
+    </div>
+  </div>
+  <section class="tb-form-panel stroked no-padding">
+    <mat-expansion-panel class="tb-settings">
+      <mat-expansion-panel-header style="padding: 16px">
+        <mat-panel-title translate>rule-node-config.advanced-settings</mat-panel-title>
+      </mat-expansion-panel-header>
+      <div class="tb-form-panel no-border no-padding-top">
+        <div tb-hint-tooltip-icon="{{ 'rule-node-config.remove-current-relations-hint' | translate }}"
+             class="tb-form-row no-border no-padding">
+          <mat-slide-toggle class="mat-slide" formControlName="removeCurrentRelations">
+            {{ 'rule-node-config.remove-current-relations' | translate }}
+          </mat-slide-toggle>
+        </div>
+        <div tb-hint-tooltip-icon="{{ 'rule-node-config.change-originator-to-related-entity-hint' | translate }}"
+             class="tb-form-row no-border no-padding">
+          <mat-slide-toggle class="mat-slide" formControlName="changeOriginatorToRelatedEntity">
+            {{ 'rule-node-config.change-originator-to-related-entity' | translate }}
+          </mat-slide-toggle>
+        </div>
+      </div>
+    </mat-expansion-panel>
+  </section>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/create-relation-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/create-relation-config.component.ts
new file mode 100644
index 0000000000..b48a530b57
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/create-relation-config.component.ts
@@ -0,0 +1,107 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { EntitySearchDirection } from '@app/shared/models/relation.models';
+import { EntityType } from '@app/shared/models/entity-type.models';
+
+@Component({
+  selector: 'tb-action-node-create-relation-config',
+  templateUrl: './create-relation-config.component.html',
+  styleUrls: []
+})
+export class CreateRelationConfigComponent extends RuleNodeConfigurationComponent {
+
+  directionTypes = Object.keys(EntitySearchDirection);
+  directionTypeTranslations  = new Map<EntitySearchDirection, string>(
+    [
+      [EntitySearchDirection.FROM, 'rule-node-config.search-direction-from'],
+      [EntitySearchDirection.TO, 'rule-node-config.search-direction-to'],
+    ]
+  );
+
+  entityType = EntityType;
+
+  entityTypeNamePatternTranslation = new Map<EntityType, string>(
+    [
+      [EntityType.DEVICE, 'rule-node-config.device-name-pattern'],
+      [EntityType.ASSET, 'rule-node-config.asset-name-pattern'],
+      [EntityType.ENTITY_VIEW, 'rule-node-config.entity-view-name-pattern'],
+      [EntityType.CUSTOMER, 'rule-node-config.customer-title-pattern'],
+      [EntityType.USER, 'rule-node-config.user-name-pattern'],
+      [EntityType.DASHBOARD, 'rule-node-config.dashboard-name-pattern'],
+      [EntityType.EDGE, 'rule-node-config.edge-name-pattern']
+    ]
+  );
+
+  allowedEntityTypes = [EntityType.DEVICE, EntityType.ASSET, EntityType.ENTITY_VIEW, EntityType.TENANT,
+    EntityType.CUSTOMER, EntityType.USER, EntityType.DASHBOARD, EntityType.EDGE];
+
+  createRelationConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.createRelationConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.createRelationConfigForm = this.fb.group({
+      direction: [configuration ? configuration.direction : null, [Validators.required]],
+      entityType: [configuration ? configuration.entityType : null, [Validators.required]],
+      entityNamePattern: [configuration ? configuration.entityNamePattern : null, []],
+      entityTypePattern: [configuration ? configuration.entityTypePattern : null, []],
+      relationType: [configuration ? configuration.relationType : null, [Validators.required]],
+      createEntityIfNotExists: [configuration ? configuration.createEntityIfNotExists : false, []],
+      removeCurrentRelations: [configuration ? configuration.removeCurrentRelations : false, []],
+      changeOriginatorToRelatedEntity: [configuration ? configuration.changeOriginatorToRelatedEntity : false, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['entityType', 'createEntityIfNotExists'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const entityType: EntityType = this.createRelationConfigForm.get('entityType').value;
+    if (entityType) {
+      this.createRelationConfigForm.get('entityNamePattern').setValidators([Validators.required, Validators.pattern(/.*\S.*/)]);
+    } else {
+      this.createRelationConfigForm.get('entityNamePattern').setValidators([]);
+    }
+    if (entityType && (entityType === EntityType.DEVICE || entityType === EntityType.ASSET)) {
+      const validators = [Validators.pattern(/.*\S.*/)]
+      if (this.createRelationConfigForm.get('createEntityIfNotExists').value) {
+        validators.push(Validators.required);
+      }
+      this.createRelationConfigForm.get('entityTypePattern').setValidators(validators);
+    } else {
+      this.createRelationConfigForm.get('entityTypePattern').setValidators([]);
+    }
+    this.createRelationConfigForm.get('entityNamePattern').updateValueAndValidity({emitEvent});
+    this.createRelationConfigForm.get('entityTypePattern').updateValueAndValidity({emitEvent});
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    configuration.entityNamePattern = configuration.entityNamePattern ? configuration.entityNamePattern.trim() : null;
+    configuration.entityTypePattern = configuration.entityTypePattern ? configuration.entityTypePattern.trim() : null;
+    return configuration;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/delete-attributes-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/delete-attributes-config.component.html
new file mode 100644
index 0000000000..0f62bec757
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/delete-attributes-config.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.
+
+-->
+<section [formGroup]="deleteAttributesConfigForm" class="tb-form-panel no-border no-padding">
+  <div class="tb-form-panel stroked">
+    <tb-example-hint [hintText]="'rule-node-config.attributes-scope-hint'">
+    </tb-example-hint>
+    <div class="tb-form-row no-border no-padding tb-standard-fields">
+      <mat-form-field class="flex">
+        <mat-label>{{ 'rule-node-config.attributes-scope' | translate }}</mat-label>
+        <mat-select required
+                    class="tb-entity-type-select" matInput formControlName="scope">
+          <mat-option *ngFor="let scope of attributeScopes" [value]="scope">
+            {{ telemetryTypeTranslationsMap.get(scope) | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <mat-form-field class="flex">
+        <mat-label>{{ 'rule-node-config.attributes-scope-value' | translate }}</mat-label>
+        <input type="text" matInput readonly disabled [ngModel]="deleteAttributesConfigForm.get('scope').value" [ngModelOptions]="{standalone: true}">
+        <button type="button"
+                matSuffix
+                mat-icon-button
+                aria-label="Copy"
+                ngxClipboard
+                [cbContent]="deleteAttributesConfigForm.get('scope').value"
+                matTooltip="{{ 'rule-node-config.attributes-scope-value-copy' | translate }}">
+          <mat-icon aria-hidden="false"
+                    aria-label="help-icon">content_copy
+          </mat-icon>
+        </button>
+      </mat-form-field>
+    </div>
+  </div>
+
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label>{{ 'rule-node-config.attributes-keys' | translate }}</mat-label>
+    <mat-chip-grid formControlName="keys" #attributeChipList>
+      <mat-chip-row
+        *ngFor="let key of deleteAttributesConfigForm.get('keys').value;"
+        (removed)="removeKey(key)">
+        {{key}}
+        <mat-icon matChipRemove>close</mat-icon>
+      </mat-chip-row>
+      <input matInput type="text"
+             [matChipInputFor]="attributeChipList"
+             [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+             (matChipInputTokenEnd)="addKey($event)"
+             [matChipInputAddOnBlur]="true">
+    </mat-chip-grid>
+    <mat-error *ngIf="deleteAttributesConfigForm.get('keys').hasError('required')">{{ 'rule-node-config.attributes-keys-required' | translate }}</mat-error>
+    <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+  </mat-form-field>
+
+  <section class="tb-form-panel stroked">
+    <mat-expansion-panel class="tb-settings">
+      <mat-expansion-panel-header>
+        <mat-panel-title translate>rule-node-config.advanced-settings</mat-panel-title>
+      </mat-expansion-panel-header>
+      <div tb-hint-tooltip-icon="{{ 'rule-node-config.send-attributes-deleted-notification-hint' | translate }}"
+           class="tb-form-row no-border no-padding">
+        <mat-slide-toggle class="mat-slide" formControlName="sendAttributesDeletedNotification">
+          {{ 'rule-node-config.send-attributes-deleted-notification' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <div tb-hint-tooltip-icon="{{ 'rule-node-config.notify-device-on-delete-hint' | translate }}"
+           *ngIf="deleteAttributesConfigForm.get('scope').value === attributeScopeMap.SHARED_SCOPE"
+           class="tb-form-row no-border no-padding">
+        <mat-slide-toggle class="mat-slide" formControlName="notifyDevice">
+          {{ 'rule-node-config.notify-device' | translate }}
+        </mat-slide-toggle>
+      </div>
+    </mat-expansion-panel>
+  </section>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/delete-attributes-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/delete-attributes-config.component.ts
new file mode 100644
index 0000000000..b61f9aa7c1
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/delete-attributes-config.component.ts
@@ -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.
+///
+
+import { Component, ViewChild } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { MatChipGrid, MatChipInputEvent } from '@angular/material/chips';
+import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { AttributeScope, telemetryTypeTranslations } from '@shared/models/telemetry/telemetry.models';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-action-node-delete-attributes-config',
+  templateUrl: './delete-attributes-config.component.html',
+  styleUrls: []
+})
+export class DeleteAttributesConfigComponent extends RuleNodeConfigurationComponent {
+  @ViewChild('attributeChipList') attributeChipList: MatChipGrid;
+
+  deleteAttributesConfigForm: UntypedFormGroup;
+  attributeScopeMap = AttributeScope;
+  attributeScopes = Object.keys(AttributeScope);
+  telemetryTypeTranslationsMap = telemetryTypeTranslations;
+  separatorKeysCodes = [ENTER, COMMA, SEMICOLON];
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.deleteAttributesConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.deleteAttributesConfigForm = this.fb.group({
+      scope: [configuration ? configuration.scope : null, [Validators.required]],
+      keys: [configuration ? configuration.keys : null, [Validators.required]],
+      sendAttributesDeletedNotification: [configuration ? configuration.sendAttributesDeletedNotification : false, []],
+      notifyDevice: [configuration ? configuration.notifyDevice : false, []]
+    });
+
+    this.deleteAttributesConfigForm.get('scope').valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe((value) => {
+      if (value !== AttributeScope.SHARED_SCOPE) {
+        this.deleteAttributesConfigForm.get('notifyDevice').patchValue(false, {emitEvent: false});
+      }
+    });
+  }
+
+  removeKey(key: string): void {
+    const keys: string[] = this.deleteAttributesConfigForm.get('keys').value;
+    const index = keys.indexOf(key);
+    if (index >= 0) {
+      keys.splice(index, 1);
+      this.deleteAttributesConfigForm.get('keys').patchValue(keys, {emitEvent: true});
+    }
+  }
+
+  addKey(event: MatChipInputEvent): void {
+    const input = event.input;
+    let value = event.value;
+    if ((value || '').trim()) {
+      value = value.trim();
+      let keys: string[] = this.deleteAttributesConfigForm.get('keys').value;
+      if (!keys || keys.indexOf(value) === -1) {
+        if (!keys) {
+          keys = [];
+        }
+        keys.push(value);
+        this.deleteAttributesConfigForm.get('keys').patchValue(keys, {emitEvent: true});
+      }
+    }
+    if (input) {
+      input.value = '';
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/delete-relation-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/delete-relation-config.component.html
new file mode 100644
index 0000000000..3270f95a53
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/delete-relation-config.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.
+
+-->
+<section [formGroup]="deleteRelationConfigForm" class="tb-form-panel no-padding no-border">
+  <div class="tb-form-panel stroked no-padding-bottom">
+    <div class="tb-form-panel-title" translate>rule-node-config.relation-parameters</div>
+    <div class="flex flex-col">
+      <mat-form-field class="mat-block" hideRequiredMarker>
+        <mat-label translate>relation.direction</mat-label>
+        <mat-select required matInput formControlName="direction">
+          <mat-option *ngFor="let type of directionTypes" [value]="type">
+            {{ directionTypeTranslations.get(type) | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <tb-relation-type-autocomplete
+        required
+        formControlName="relationType">
+      </tb-relation-type-autocomplete>
+    </div>
+  </div>
+  <div class="tb-form-panel stroked">
+    <div tb-hint-tooltip-icon="{{ 'rule-node-config.delete-relation-with-specific-entity-hint' | translate }}"
+         class="tb-form-row no-border no-padding">
+      <mat-slide-toggle class="mat-slide" formControlName="deleteForSingleEntity">
+        {{ 'rule-node-config.delete-relation-with-specific-entity' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div *ngIf="deleteRelationConfigForm.get('deleteForSingleEntity').value">
+      <div class="flex flex-row gap-2.5">
+        <tb-entity-type-select
+          class="flex-1"
+          showLabel
+          required
+          [allowedEntityTypes]="allowedEntityTypes"
+          formControlName="entityType">
+        </tb-entity-type-select>
+        <mat-form-field *ngIf="deleteRelationConfigForm.get('entityType').value && deleteRelationConfigForm.get('entityType').value !== entityType.TENANT"
+                        class="mat-block flex-1">
+          <mat-label>{{ entityTypeNamePatternTranslation.get(deleteRelationConfigForm.get('entityType').value) | translate }}</mat-label>
+          <input required matInput formControlName="entityNamePattern">
+        </mat-form-field>
+      </div>
+      <tb-example-hint *ngIf="deleteRelationConfigForm.get('entityType').value && deleteRelationConfigForm.get('entityType').value !== entityType.TENANT"
+                       [hintText]="'rule-node-config.kv-map-single-pattern-hint'"></tb-example-hint>
+    </div>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/delete-relation-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/delete-relation-config.component.ts
new file mode 100644
index 0000000000..34337f95ad
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/delete-relation-config.component.ts
@@ -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 { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { EntityType } from '@app/shared/models/entity-type.models';
+import { EntitySearchDirection } from '@app/shared/models/relation.models';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-action-node-delete-relation-config',
+  templateUrl: './delete-relation-config.component.html',
+  styleUrls: []
+})
+export class DeleteRelationConfigComponent extends RuleNodeConfigurationComponent {
+
+  directionTypes = Object.keys(EntitySearchDirection);
+
+  directionTypeTranslations  = new Map<EntitySearchDirection, string>(
+    [
+      [EntitySearchDirection.FROM, 'rule-node-config.del-relation-direction-from'],
+      [EntitySearchDirection.TO, 'rule-node-config.del-relation-direction-to'],
+    ]
+  );
+
+  entityTypeNamePatternTranslation = new Map<EntityType, string>(
+    [
+      [EntityType.DEVICE, 'rule-node-config.device-name-pattern'],
+      [EntityType.ASSET, 'rule-node-config.asset-name-pattern'],
+      [EntityType.ENTITY_VIEW, 'rule-node-config.entity-view-name-pattern'],
+      [EntityType.CUSTOMER, 'rule-node-config.customer-title-pattern'],
+      [EntityType.USER, 'rule-node-config.user-name-pattern'],
+      [EntityType.DASHBOARD, 'rule-node-config.dashboard-name-pattern'],
+      [EntityType.EDGE, 'rule-node-config.edge-name-pattern']
+    ]
+  );
+
+  entityType = EntityType;
+
+  allowedEntityTypes = [EntityType.DEVICE, EntityType.ASSET, EntityType.ENTITY_VIEW, EntityType.TENANT,
+    EntityType.CUSTOMER, EntityType.USER, EntityType.DASHBOARD, EntityType.EDGE];
+
+  deleteRelationConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.deleteRelationConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.deleteRelationConfigForm = this.fb.group({
+      deleteForSingleEntity: [configuration ? configuration.deleteForSingleEntity : false, []],
+      direction: [configuration ? configuration.direction : null, [Validators.required]],
+      entityType: [configuration ? configuration.entityType : null, []],
+      entityNamePattern: [configuration ? configuration.entityNamePattern : null, []],
+      relationType: [configuration ? configuration.relationType : null, [Validators.required]]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['deleteForSingleEntity', 'entityType'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const deleteForSingleEntity: boolean = this.deleteRelationConfigForm.get('deleteForSingleEntity').value;
+    const entityType: EntityType = this.deleteRelationConfigForm.get('entityType').value;
+    if (deleteForSingleEntity) {
+      this.deleteRelationConfigForm.get('entityType').setValidators([Validators.required]);
+    } else {
+      this.deleteRelationConfigForm.get('entityType').setValidators([]);
+    }
+    if (deleteForSingleEntity && entityType && entityType !== EntityType.TENANT) {
+      this.deleteRelationConfigForm.get('entityNamePattern').setValidators([Validators.required, Validators.pattern(/.*\S.*/)]);
+    } else {
+      this.deleteRelationConfigForm.get('entityNamePattern').setValidators([]);
+    }
+    this.deleteRelationConfigForm.get('entityType').updateValueAndValidity({emitEvent: false});
+    this.deleteRelationConfigForm.get('entityNamePattern').updateValueAndValidity({emitEvent});
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    configuration.entityNamePattern = configuration.entityNamePattern ? configuration.entityNamePattern.trim() : null;
+    return configuration;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/device-profile-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/device-profile-config.component.html
new file mode 100644
index 0000000000..74594f1400
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/device-profile-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="deviceProfile" class="tb-form-panel stroked">
+  <div class="tb-form-hint tb-primary-fill" translate>rule-node-config.device-profile-node-hint</div>
+  <div tb-hint-tooltip-icon="{{'rule-node-config.persist-alarm-rules-hint' | translate }}"
+       class="tb-form-row no-border no-padding slide-toggle">
+    <mat-slide-toggle class="mat-slide" formControlName="persistAlarmRulesState">
+      {{ 'rule-node-config.persist-alarm-rules' | translate }}
+    </mat-slide-toggle>
+  </div>
+  <div tb-hint-tooltip-icon="{{'rule-node-config.fetch-alarm-rules-hint' | translate }}"
+       class="tb-form-row no-border no-padding slide-toggle">
+    <mat-slide-toggle class="mat-slide" formControlName="fetchAlarmRulesStateOnStart">
+      {{ 'rule-node-config.fetch-alarm-rules' | translate }}
+    </mat-slide-toggle>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/device-profile-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/device-profile-config.component.ts
new file mode 100644
index 0000000000..cf02cdf9b1
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/device-profile-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-action-node-device-profile-config',
+  templateUrl: './device-profile-config.component.html',
+  styleUrls: []
+})
+export class DeviceProfileConfigComponent extends RuleNodeConfigurationComponent {
+
+  deviceProfile: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.deviceProfile;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.deviceProfile = this.fb.group({
+      persistAlarmRulesState: [configuration ? configuration.persistAlarmRulesState : false],
+      fetchAlarmRulesStateOnStart: [configuration ? configuration.fetchAlarmRulesStateOnStart : false]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['persistAlarmRulesState'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    if (this.deviceProfile.get('persistAlarmRulesState').value) {
+      this.deviceProfile.get('fetchAlarmRulesStateOnStart').enable({emitEvent: false});
+    } else {
+      this.deviceProfile.get('fetchAlarmRulesStateOnStart').setValue(false, {emitEvent: false});
+      this.deviceProfile.get('fetchAlarmRulesStateOnStart').disable({emitEvent: false});
+    }
+    this.deviceProfile.get('fetchAlarmRulesStateOnStart').updateValueAndValidity({emitEvent});
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/device-state-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/device-state-config.component.html
new file mode 100644
index 0000000000..812c5e9aed
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/device-state-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="deviceState">
+    <mat-form-field class="mat-block" subscriptSizing="dynamic">
+        <mat-label>{{ 'rule-node-config.select-device-connectivity-event' | translate }}</mat-label>
+        <mat-select formControlName="event">
+            <mat-option *ngFor="let eventOption of eventOptions" [value]="eventOption">
+                {{ messageTypeNames.get(eventOption) }}
+            </mat-option>
+        </mat-select>
+    </mat-form-field>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/device-state-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/device-state-config.component.ts
new file mode 100644
index 0000000000..75335e0337
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/device-state-config.component.ts
@@ -0,0 +1,64 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import {
+  MessageType,
+  messageTypeNames,
+  RuleNodeConfiguration,
+  RuleNodeConfigurationComponent
+} from '@shared/models/rule-node.models';
+
+@Component({
+    selector: 'tb-action-node-device-state-config',
+    templateUrl: './device-state-config.component.html',
+    styleUrls: []
+})
+export class DeviceStateConfigComponent extends RuleNodeConfigurationComponent {
+
+    deviceState: FormGroup;
+
+    public messageTypeNames = messageTypeNames;
+    public eventOptions: MessageType[] = [
+        MessageType.CONNECT_EVENT,
+        MessageType.ACTIVITY_EVENT,
+        MessageType.DISCONNECT_EVENT,
+        MessageType.INACTIVITY_EVENT
+    ];
+
+    constructor(private fb: FormBuilder) {
+        super();
+    }
+
+    protected configForm(): FormGroup {
+        return this.deviceState;
+    }
+
+    protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+        return {
+            event: isDefinedAndNotNull(configuration?.event) ? configuration.event : MessageType.ACTIVITY_EVENT
+        };
+    }
+
+    protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+        this.deviceState = this.fb.group({
+            event: [configuration.event, [Validators.required]]
+        });
+    }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/generator-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/generator-config.component.html
new file mode 100644
index 0000000000..cdddbf60da
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/generator-config.component.html
@@ -0,0 +1,117 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="generatorConfigForm" class="tb-form-panel no-border no-padding">
+  <div class="tb-form-panel no-padding-bottom stroked">
+    <div class="tb-form-panel-title" translate>rule-node-config.generation-parameters</div>
+    <div class="tb-form-row no-border no-padding tb-standard-fields column-xs">
+      <mat-form-field class="flex">
+        <mat-label translate>rule-node-config.message-count</mat-label>
+        <input required type="number" min="0" step="1" matInput formControlName="msgCount">
+        <mat-error *ngIf="generatorConfigForm.get('msgCount').hasError('required')">
+          {{ 'rule-node-config.message-count-required' | translate }}
+        </mat-error>
+        <mat-error *ngIf="generatorConfigForm.get('msgCount').hasError('min')">
+          {{ 'rule-node-config.min-message-count-message' | translate }}
+        </mat-error>
+      </mat-form-field>
+      <mat-form-field class="flex">
+        <mat-label translate>rule-node-config.generation-frequency-seconds</mat-label>
+        <input required type="number" min="1" step="1" matInput formControlName="periodInSeconds">
+        <mat-error *ngIf="generatorConfigForm.get('periodInSeconds').hasError('required')">
+          {{ 'rule-node-config.generation-frequency-required' | translate }}
+        </mat-error>
+        <mat-error *ngIf="generatorConfigForm.get('periodInSeconds').hasError('min')">
+          {{ 'rule-node-config.min-generation-frequency-message' | translate }}
+        </mat-error>
+      </mat-form-field>
+    </div>
+  </div>
+
+  <div class="tb-form-panel no-padding-bottom stroked">
+    <div class="tb-form-panel-title" translate>rule-node-config.originator</div>
+    <tb-entity-select class="flex-1"
+                      required="true"
+                      useAliasEntityTypes="true"
+                      [allowedEntityTypes]="allowedEntityTypes"
+                      [additionEntityTypes]="additionEntityTypes"
+                      formControlName="originator">
+    </tb-entity-select>
+  </div>
+  <div class="tb-form-panel stroked">
+    <mat-expansion-panel class="tb-settings" expanded>
+      <mat-expansion-panel-header>
+        <mat-panel-title translate>rule-node-config.generator-function</mat-panel-title>
+      </mat-expansion-panel-header>
+      <tb-js-func *ngIf="generatorConfigForm.get('scriptLang').value === scriptLanguage.JS"
+                  #jsFuncComponent
+                  formControlName="jsScript"
+                  functionName="Generate"
+                  [functionArgs]="['prevMsg', 'prevMetadata', 'prevMsgType']"
+                  helpId="rulenode/generator_node_script_fn"
+                  noValidate="true">
+        <tb-toggle-select toolbarPrefixButton formControlName="scriptLang" appearance="fill" *ngIf="tbelEnabled">
+          <tb-toggle-option [value]="scriptLanguage.TBEL">
+            {{ 'rule-node-config.script-lang-tbel' | translate }}
+          </tb-toggle-option>
+          <tb-toggle-option [value]="scriptLanguage.JS">
+            {{ 'rule-node-config.script-lang-js' | translate }}
+          </tb-toggle-option>
+        </tb-toggle-select>
+        <button toolbarSuffixButton
+                mat-icon-button
+                matTooltip="{{ testScriptLabel | translate }}"
+                matTooltipPosition="above"
+                class="tb-mat-32"
+                (click)="testScript()">
+          <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+        </button>
+      </tb-js-func>
+      <tb-js-func *ngIf="generatorConfigForm.get('scriptLang').value === scriptLanguage.TBEL"
+                  #tbelFuncComponent
+                  formControlName="tbelScript"
+                  functionName="Generate"
+                  [functionArgs]="['prevMsg', 'prevMetadata', 'prevMsgType']"
+                  [disableUndefinedCheck]="true"
+                  [scriptLanguage]="scriptLanguage.TBEL"
+                  helpId="rulenode/tbel/generator_node_script_fn"
+                  noValidate="true">
+        <tb-toggle-select toolbarPrefixButton formControlName="scriptLang" appearance="fill">
+          <tb-toggle-option [value]="scriptLanguage.TBEL">
+            {{ 'rule-node-config.script-lang-tbel' | translate }}
+          </tb-toggle-option>
+          <tb-toggle-option [value]="scriptLanguage.JS">
+            {{ 'rule-node-config.script-lang-js' | translate }}
+          </tb-toggle-option>
+        </tb-toggle-select>
+        <button toolbarSuffixButton
+                mat-icon-button
+                matTooltip="{{ testScriptLabel | translate }}"
+                matTooltipPosition="above"
+                class="tb-mat-32"
+                (click)="testScript()">
+          <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+        </button>
+      </tb-js-func>
+      <div class="flex flex-row" style="padding-bottom: 16px;">
+        <button mat-button mat-raised-button color="primary" (click)="testScript()">
+          {{ testScriptLabel | translate }}
+        </button>
+      </div>
+    </mat-expansion-panel>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/generator-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/action/generator-config.component.scss
new file mode 100644
index 0000000000..93c7934484
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/generator-config.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.
+ */
+:host {
+  ::ng-deep {
+    .mat-button-toggle-group {
+      min-width: 120px;
+      height: 24px !important;
+      .mat-button-toggle {
+        font-size: 0;
+        .mat-button-toggle-button {
+          height: 20px!important;
+          line-height: 20px !important;
+          border: none !important;
+          .mat-button-toggle-label-content {
+            font-size: 14px !important;
+            line-height: 20px !important;
+          }
+        }
+      }
+    }
+    .tb-entity-select {
+      @media screen and (min-width: 599px) {
+        display: flex;
+        flex-direction: row;
+        gap: 16px;
+      }
+      tb-entity-type-select {
+        flex: 1;
+      }
+      tb-entity-autocomplete {
+        flex: 1;
+        mat-form-field {
+          width: 100% !important;
+        }
+      }
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/generator-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/generator-config.component.ts
new file mode 100644
index 0000000000..3db74042f7
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/generator-config.component.ts
@@ -0,0 +1,155 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, ViewChild } from '@angular/core';
+import { getCurrentAuthState, isDefinedAndNotNull, NodeScriptTestService } from '@core/public-api';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  RuleNodeConfiguration,
+  RuleNodeConfigurationComponent,
+  ScriptLanguage
+} from '@app/shared/models/rule-node.models';
+import type { JsFuncComponent } from '@app/shared/components/js-func.component';
+import { EntityType } from '@app/shared/models/entity-type.models';
+import { DebugRuleNodeEventBody } from '@shared/models/event.models';
+
+@Component({
+  selector: 'tb-action-node-generator-config',
+  templateUrl: './generator-config.component.html',
+  styleUrls: ['generator-config.component.scss']
+})
+export class GeneratorConfigComponent extends RuleNodeConfigurationComponent {
+
+  @ViewChild('jsFuncComponent', {static: false}) jsFuncComponent: JsFuncComponent;
+  @ViewChild('tbelFuncComponent', {static: false}) tbelFuncComponent: JsFuncComponent;
+
+  generatorConfigForm: UntypedFormGroup;
+
+  tbelEnabled = getCurrentAuthState(this.store).tbelEnabled;
+
+  scriptLanguage = ScriptLanguage;
+
+  changeScript: EventEmitter<void> = new EventEmitter<void>();
+
+  allowedEntityTypes = [
+    EntityType.DEVICE, EntityType.ASSET, EntityType.ENTITY_VIEW, EntityType.CUSTOMER,
+    EntityType.USER, EntityType.DASHBOARD
+  ];
+
+  additionEntityTypes = {
+    TENANT: this.translate.instant('rule-node-config.current-tenant'),
+    RULE_NODE: this.translate.instant('rule-node-config.current-rule-node')
+  };
+
+  readonly hasScript = true;
+
+  readonly testScriptLabel = 'rule-node-config.test-generator-function';
+
+  constructor(private fb: UntypedFormBuilder,
+              private nodeScriptTestService: NodeScriptTestService,
+              private translate: TranslateService) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.generatorConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.generatorConfigForm = this.fb.group({
+      msgCount: [configuration ? configuration.msgCount : null, [Validators.required, Validators.min(0)]],
+      periodInSeconds: [configuration ? configuration.periodInSeconds : null, [Validators.required, Validators.min(1)]],
+      originator: [configuration ? configuration.originator : {id: null, entityType: EntityType.RULE_NODE}, []],
+      scriptLang: [configuration ? configuration.scriptLang : ScriptLanguage.JS, [Validators.required]],
+      jsScript: [configuration ? configuration.jsScript : null, []],
+      tbelScript: [configuration ? configuration.tbelScript : null, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['scriptLang'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    let scriptLang: ScriptLanguage = this.generatorConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.TBEL && !this.tbelEnabled) {
+      scriptLang = ScriptLanguage.JS;
+      this.generatorConfigForm.get('scriptLang').patchValue(scriptLang, {emitEvent: false});
+      setTimeout(() => {this.generatorConfigForm.updateValueAndValidity({emitEvent: true});});
+    }
+    this.generatorConfigForm.get('jsScript').setValidators(scriptLang === ScriptLanguage.JS ? [Validators.required] : []);
+    this.generatorConfigForm.get('jsScript').updateValueAndValidity({emitEvent});
+    this.generatorConfigForm.get('tbelScript').setValidators(scriptLang === ScriptLanguage.TBEL ? [Validators.required] : []);
+    this.generatorConfigForm.get('tbelScript').updateValueAndValidity({emitEvent});
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      msgCount: isDefinedAndNotNull(configuration?.msgCount) ? configuration?.msgCount : 0,
+      periodInSeconds: isDefinedAndNotNull(configuration?.periodInSeconds) ? configuration?.periodInSeconds : 1,
+      originator: {
+        id: isDefinedAndNotNull(configuration?.originatorId) ? configuration?.originatorId : null,
+        entityType: isDefinedAndNotNull(configuration?.originatorType) ? configuration?.originatorType :  EntityType.RULE_NODE
+      },
+      scriptLang: isDefinedAndNotNull(configuration?.scriptLang) ? configuration?.scriptLang : ScriptLanguage.JS,
+      tbelScript: isDefinedAndNotNull(configuration?.tbelScript) ? configuration?.tbelScript : null,
+      jsScript: isDefinedAndNotNull(configuration?.jsScript) ? configuration?.jsScript : null,
+    };
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    if (configuration.originator) {
+      configuration.originatorId = configuration.originator.id;
+      configuration.originatorType = configuration.originator.entityType;
+    } else {
+      configuration.originatorId = null;
+      configuration.originatorType = null;
+    }
+    delete configuration.originator;
+    return configuration;
+  }
+
+  testScript(debugEventBody?: DebugRuleNodeEventBody) {
+    const scriptLang: ScriptLanguage = this.generatorConfigForm.get('scriptLang').value;
+    const scriptField = scriptLang === ScriptLanguage.JS ? 'jsScript' : 'tbelScript';
+    const helpId = scriptLang === ScriptLanguage.JS ? 'rulenode/generator_node_script_fn' : 'rulenode/tbel/generator_node_script_fn';
+    const script: string = this.generatorConfigForm.get(scriptField).value;
+    this.nodeScriptTestService.testNodeScript(
+      script,
+      'generate',
+      this.translate.instant('rule-node-config.generator'),
+      'Generate',
+      ['prevMsg', 'prevMetadata', 'prevMsgType'],
+      this.ruleNodeId,
+      helpId,
+      scriptLang,
+      debugEventBody
+    ).subscribe((theScript) => {
+      if (theScript) {
+        this.generatorConfigForm.get(scriptField).setValue(theScript);
+        this.changeScript.emit();
+      }
+    });
+  }
+
+  protected onValidate() {
+    const scriptLang: ScriptLanguage = this.generatorConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.JS) {
+      this.jsFuncComponent.validateOnSubmit();
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/gps-geo-action-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/gps-geo-action-config.component.html
new file mode 100644
index 0000000000..73299f1031
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/gps-geo-action-config.component.html
@@ -0,0 +1,195 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="geoActionConfigForm" class="tb-form-panel no-border no-padding">
+  <section class="tb-form-panel stroked">
+    <div class="tb-form-panel-title" translate>rule-node-config.coordinate-field-names</div>
+    <section>
+      <div class="flex flex-row gap-4">
+        <mat-form-field class="mat-block max-w-50% flex-full">
+          <mat-label>{{ 'rule-node-config.latitude-field-name' | translate }}</mat-label>
+          <input matInput formControlName="latitudeKeyName" required>
+          <mat-error *ngIf="geoActionConfigForm.get('latitudeKeyName').hasError('required')">
+            {{ 'rule-node-config.latitude-field-name-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+        <mat-form-field class="mat-block max-w-50% flex-full">
+          <mat-label>{{ 'rule-node-config.longitude-field-name' | translate }}</mat-label>
+          <input matInput formControlName="longitudeKeyName" required>
+          <mat-error *ngIf="geoActionConfigForm.get('longitudeKeyName').hasError('required')">
+            {{ 'rule-node-config.longitude-field-name-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+      </div>
+      <div class="tb-form-hint tb-primary-fill" translate>rule-node-config.coordinate-field-hint</div>
+    </section>
+  </section>
+  <section class="tb-form-panel stroked" [class.no-padding-bottom]="!defaultPaddingEnable">
+    <div class="tb-form-panel-title" translate>rule-node-config.geofence-configuration</div>
+    <section class="flex flex-col">
+      <mat-form-field class="mat-block flex-1" hideRequiredMarker>
+        <mat-label>{{ 'rule-node-config.perimeter-type' | translate }}</mat-label>
+        <mat-select formControlName="perimeterType">
+          <mat-option *ngFor="let type of perimeterTypes" [value]="type">
+            {{ perimeterTypeTranslationMap.get(type) | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <div tb-hint-tooltip-icon="{{ geoActionConfigForm.get('perimeterType').value === perimeterType.CIRCLE
+        ? ('rule-node-config.fetch-circle-parameter-info-from-metadata-hint'
+            | translate : { perimeterKeyName: geoActionConfigForm.get('perimeterKeyName').valid
+                              ? geoActionConfigForm.get('perimeterKeyName').value
+                              : 'ss_perimeter'})
+        : ('rule-node-config.fetch-poligon-parameter-info-from-metadata-hint'
+            | translate : { perimeterKeyName: geoActionConfigForm.get('perimeterKeyName').valid
+                              ? geoActionConfigForm.get('perimeterKeyName').value
+                              : 'ss_perimeter'}) }}"
+           class="tb-form-row no-border no-padding slide-toggle">
+        <mat-slide-toggle class="mat-slide" formControlName="fetchPerimeterInfoFromMessageMetadata">
+          {{ 'rule-node-config.fetch-perimeter-info-from-metadata' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <mat-form-field *ngIf="geoActionConfigForm.get('fetchPerimeterInfoFromMessageMetadata').value" class="mat-block">
+        <mat-label>{{ 'rule-node-config.perimeter-key-name' | translate }}</mat-label>
+        <input matInput formControlName="perimeterKeyName" required>
+        <mat-error *ngIf="geoActionConfigForm.get('perimeterKeyName').hasError('required')">
+          {{ 'rule-node-config.perimeter-key-name-required' | translate }}
+        </mat-error>
+        <mat-hint>{{ 'rule-node-config.perimeter-key-name-hint' | translate }}</mat-hint>
+      </mat-form-field>
+      <div class="flex flex-col"
+           *ngIf="geoActionConfigForm.get('perimeterType').value === perimeterType.CIRCLE &&
+              !geoActionConfigForm.get('fetchPerimeterInfoFromMessageMetadata').value">
+        <div class="flex flex-row gap-4">
+          <mat-form-field class="flex-1">
+            <mat-label>{{ 'rule-node-config.circle-center-latitude' | translate }}</mat-label>
+            <input type="number" min="-90" max="90" step="0.1" matInput formControlName="centerLatitude" required>
+            <mat-error *ngIf="geoActionConfigForm.get('centerLatitude').hasError('required')">
+              {{ 'rule-node-config.circle-center-latitude-required' | translate }}
+            </mat-error>
+          </mat-form-field>
+          <mat-form-field class="flex-1">
+            <mat-label>{{ 'rule-node-config.circle-center-longitude' | translate }}</mat-label>
+            <input type="number" min="-180" max="180" step="0.1" matInput formControlName="centerLongitude" required>
+            <mat-error *ngIf="geoActionConfigForm.get('centerLongitude').hasError('required')">
+              {{ 'rule-node-config.circle-center-longitude-required' | translate }}
+            </mat-error>
+          </mat-form-field>
+        </div>
+        <div class="flex flex-row gap-4">
+          <mat-form-field class="flex-1">
+            <mat-label>{{ 'rule-node-config.range' | translate }}</mat-label>
+            <input type="number" min="0" step="0.1" matInput formControlName="range" required>
+            <mat-error *ngIf="geoActionConfigForm.get('range').hasError('required')">
+              {{ 'rule-node-config.range-required' | translate }}
+            </mat-error>
+          </mat-form-field>
+          <mat-form-field class="flex-1">
+            <mat-label>{{ 'rule-node-config.range-units' | translate }}</mat-label>
+            <mat-select formControlName="rangeUnit" required>
+              <mat-option *ngFor="let type of rangeUnits" [value]="type">
+                {{ rangeUnitTranslationMap.get(type) | translate }}
+              </mat-option>
+            </mat-select>
+            <mat-error *ngIf="geoActionConfigForm.get('rangeUnit').hasError('required')">
+              {{ 'rule-node-config.range-units-required' | translate }}
+            </mat-error>
+          </mat-form-field>
+        </div>
+      </div>
+      <div class="flex flex-col" *ngIf="geoActionConfigForm.get('perimeterType').value === perimeterType.POLYGON &&
+                                 !geoActionConfigForm.get('fetchPerimeterInfoFromMessageMetadata').value">
+        <mat-form-field class="mat-block" subscriptSizing="dynamic">
+          <mat-label translate>rule-node-config.polygon-definition</mat-label>
+          <input matInput formControlName="polygonsDefinition" required>
+          <mat-icon matSuffix class="margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+                    color="primary"
+                    matTooltip="{{ 'rule-node-config.polygon-definition-hint' | translate }}">
+            help
+          </mat-icon>
+          <mat-error *ngIf="geoActionConfigForm.get('polygonsDefinition').hasError('required')">
+            {{ 'rule-node-config.polygon-definition-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+      </div>
+    </section>
+  </section>
+  <section class="tb-form-panel stroked no-padding-bottom">
+    <div class="flex flex-col items-stretch justify-between gt-sm:flex-row lt-md:gap-4">
+      <div class="tb-form-panel-title">{{ 'rule-node-config.presence-monitoring-strategy' | translate }}</div>
+      <tb-toggle-select class="fetch-to-data-toggle" formControlName="reportPresenceStatusOnEachMessage" appearance="fill" >
+        <tb-toggle-option *ngFor="let strategy of presenceMonitoringStrategyKeys" [value]="presenceMonitoringStrategies.get(strategy).value">
+          {{ presenceMonitoringStrategies.get(strategy).name | translate }}
+        </tb-toggle-option>
+      </tb-toggle-select>
+    </div>
+    <div class="tb-form-hint tb-primary-fill"> {{ geoActionConfigForm.get('reportPresenceStatusOnEachMessage').value === false ?
+        ('rule-node-config.presence-monitoring-strategy-on-first-message-hint' | translate) :
+        ('rule-node-config.presence-monitoring-strategy-on-each-message-hint' | translate) }}
+    </div>
+    <section class="flex flex-col">
+      <div *ngIf="geoActionConfigForm.get('reportPresenceStatusOnEachMessage').value === false">
+        <div class="flex flex-col gt-sm:flex-row gt-sm:gap-2">
+          <mat-form-field class="mat-block flex-1">
+            <mat-label translate>rule-node-config.min-inside-duration</mat-label>
+            <input type="number" step="1" min="1" max="2147483647" matInput formControlName="minInsideDuration" required>
+            <mat-error *ngIf="geoActionConfigForm.get('minInsideDuration').hasError('required')">
+              {{ 'rule-node-config.min-inside-duration-value-required' | translate }}
+            </mat-error>
+            <mat-error *ngIf="geoActionConfigForm.get('minInsideDuration').hasError('min')">
+              {{ 'rule-node-config.time-value-range' | translate }}
+            </mat-error>
+            <mat-error *ngIf="geoActionConfigForm.get('minInsideDuration').hasError('max')">
+              {{ 'rule-node-config.time-value-range' | translate }}
+            </mat-error>
+          </mat-form-field>
+          <mat-form-field class="mat-block flex-1">
+            <mat-label translate>rule-node-config.min-inside-duration-time-unit</mat-label>
+            <mat-select formControlName="minInsideDurationTimeUnit" required>
+              <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">
+                {{ timeUnitsTranslationMap.get(timeUnit) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <div class="flex flex-col gt-sm:flex-row gt-sm:gap-2">
+          <mat-form-field class="mat-block flex-1">
+            <mat-label translate>rule-node-config.min-outside-duration</mat-label>
+            <input type="number" step="1" min="1" max="2147483647" matInput formControlName="minOutsideDuration" required>
+            <mat-error *ngIf="geoActionConfigForm.get('minOutsideDuration').hasError('required')">
+              {{ 'rule-node-config.min-outside-duration-value-required' | translate }}
+            </mat-error>
+            <mat-error *ngIf="geoActionConfigForm.get('minOutsideDuration').hasError('min')">
+              {{ 'rule-node-config.time-value-range' | translate }}
+            </mat-error>
+            <mat-error *ngIf="geoActionConfigForm.get('minOutsideDuration').hasError('max')">
+              {{ 'rule-node-config.time-value-range' | translate }}
+            </mat-error>
+          </mat-form-field>
+          <mat-form-field class="mat-block flex-1">
+            <mat-label translate>rule-node-config.min-outside-duration-time-unit</mat-label>
+            <mat-select formControlName="minOutsideDurationTimeUnit" required>
+              <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">
+                {{ timeUnitsTranslationMap.get(timeUnit) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+      </div>
+    </section>
+  </section>
+</section>
diff --git a/ui-ngx/src/app/shared/components/json-form/json-form.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/action/gps-geo-action-config.component.scss
similarity index 87%
rename from ui-ngx/src/app/shared/components/json-form/json-form.component.scss
rename to ui-ngx/src/app/modules/home/components/rule-node/action/gps-geo-action-config.component.scss
index 3ab3d5f26b..f177555e37 100644
--- a/ui-ngx/src/app/shared/components/json-form/json-form.component.scss
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/gps-geo-action-config.component.scss
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-.tb-json-form {
-  padding: 12px;
-  padding-bottom: 14px !important;
-  overflow: auto;
+:host {
+  .slide-toggle {
+    margin-bottom: 18px;
+  }
 }
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/gps-geo-action-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/gps-geo-action-config.component.ts
new file mode 100644
index 0000000000..47347edadf
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/gps-geo-action-config.component.ts
@@ -0,0 +1,126 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+import {
+  PerimeterType,
+  perimeterTypeTranslations,
+  PresenceMonitoringStrategiesData,
+  RangeUnit,
+  rangeUnitTranslations,
+  TimeUnit,
+  timeUnitTranslations
+} from '../rule-node-config.models';
+
+@Component({
+  selector: 'tb-action-node-gps-geofencing-config',
+  templateUrl: './gps-geo-action-config.component.html',
+  styleUrls: ['./gps-geo-action-config.component.scss']
+})
+export class GpsGeoActionConfigComponent extends RuleNodeConfigurationComponent {
+
+  geoActionConfigForm: UntypedFormGroup;
+
+  perimeterType = PerimeterType;
+  perimeterTypes = Object.keys(PerimeterType);
+  perimeterTypeTranslationMap = perimeterTypeTranslations;
+
+  rangeUnits = Object.keys(RangeUnit);
+  rangeUnitTranslationMap = rangeUnitTranslations;
+
+  presenceMonitoringStrategies = PresenceMonitoringStrategiesData;
+  presenceMonitoringStrategyKeys = Array.from(this.presenceMonitoringStrategies.keys());
+
+  timeUnits = Object.keys(TimeUnit);
+  timeUnitsTranslationMap = timeUnitTranslations;
+
+  public defaultPaddingEnable = true;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.geoActionConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.geoActionConfigForm = this.fb.group({
+      reportPresenceStatusOnEachMessage: [configuration ? configuration.reportPresenceStatusOnEachMessage : true,
+        [Validators.required]],
+      latitudeKeyName: [configuration ? configuration.latitudeKeyName : null, [Validators.required]],
+      longitudeKeyName: [configuration ? configuration.longitudeKeyName : null, [Validators.required]],
+      perimeterType: [configuration ? configuration.perimeterType : null, [Validators.required]],
+      fetchPerimeterInfoFromMessageMetadata: [configuration ? configuration.fetchPerimeterInfoFromMessageMetadata : false, []],
+      perimeterKeyName: [configuration ? configuration.perimeterKeyName : null, []],
+      centerLatitude: [configuration ? configuration.centerLatitude : null, []],
+      centerLongitude: [configuration ? configuration.centerLatitude : null, []],
+      range: [configuration ? configuration.range : null, []],
+      rangeUnit: [configuration ? configuration.rangeUnit : null, []],
+      polygonsDefinition: [configuration ? configuration.polygonsDefinition : null, []],
+      minInsideDuration: [configuration ? configuration.minInsideDuration : null,
+        [Validators.required, Validators.min(1), Validators.max(2147483647)]],
+      minInsideDurationTimeUnit: [configuration ? configuration.minInsideDurationTimeUnit : null, [Validators.required]],
+      minOutsideDuration: [configuration ? configuration.minOutsideDuration : null,
+        [Validators.required, Validators.min(1), Validators.max(2147483647)]],
+      minOutsideDurationTimeUnit: [configuration ? configuration.minOutsideDurationTimeUnit : null, [Validators.required]],
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['fetchPerimeterInfoFromMessageMetadata', 'perimeterType'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const fetchPerimeterInfoFromMessageMetadata: boolean = this.geoActionConfigForm.get('fetchPerimeterInfoFromMessageMetadata').value;
+    const perimeterType: PerimeterType = this.geoActionConfigForm.get('perimeterType').value;
+    if (fetchPerimeterInfoFromMessageMetadata) {
+      this.geoActionConfigForm.get('perimeterKeyName').setValidators([Validators.required]);
+    } else {
+      this.geoActionConfigForm.get('perimeterKeyName').setValidators([]);
+    }
+    if (!fetchPerimeterInfoFromMessageMetadata && perimeterType === PerimeterType.CIRCLE) {
+      this.geoActionConfigForm.get('centerLatitude').setValidators([Validators.required,
+        Validators.min(-90), Validators.max(90)]);
+      this.geoActionConfigForm.get('centerLongitude').setValidators([Validators.required,
+        Validators.min(-180), Validators.max(180)]);
+      this.geoActionConfigForm.get('range').setValidators([Validators.required, Validators.min(0)]);
+      this.geoActionConfigForm.get('rangeUnit').setValidators([Validators.required]);
+
+      this.defaultPaddingEnable = false;
+    } else {
+      this.geoActionConfigForm.get('centerLatitude').setValidators([]);
+      this.geoActionConfigForm.get('centerLongitude').setValidators([]);
+      this.geoActionConfigForm.get('range').setValidators([]);
+      this.geoActionConfigForm.get('rangeUnit').setValidators([]);
+
+      this.defaultPaddingEnable = true;
+    }
+    if (!fetchPerimeterInfoFromMessageMetadata && perimeterType === PerimeterType.POLYGON) {
+      this.geoActionConfigForm.get('polygonsDefinition').setValidators([Validators.required]);
+    } else {
+      this.geoActionConfigForm.get('polygonsDefinition').setValidators([]);
+    }
+    this.geoActionConfigForm.get('perimeterKeyName').updateValueAndValidity({emitEvent});
+    this.geoActionConfigForm.get('centerLatitude').updateValueAndValidity({emitEvent});
+    this.geoActionConfigForm.get('centerLongitude').updateValueAndValidity({emitEvent});
+    this.geoActionConfigForm.get('range').updateValueAndValidity({emitEvent});
+    this.geoActionConfigForm.get('rangeUnit').updateValueAndValidity({emitEvent});
+    this.geoActionConfigForm.get('polygonsDefinition').updateValueAndValidity({emitEvent});
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/log-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/log-config.component.html
new file mode 100644
index 0000000000..c47644ae5f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/log-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="logConfigForm" class="flex flex-col">
+  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>
+  <tb-js-func *ngIf="logConfigForm.get('scriptLang').value === scriptLanguage.JS"
+              #jsFuncComponent
+              formControlName="jsScript"
+              functionName="ToString"
+              [functionArgs]="['msg', 'metadata', 'msgType']"
+              helpId="rulenode/log_node_script_fn"
+              noValidate="true">
+    <button toolbarSuffixButton
+            mat-icon-button
+            matTooltip="{{ testScriptLabel | translate }}"
+            matTooltipPosition="above"
+            class="tb-mat-32"
+            (click)="testScript()">
+      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+    </button>
+  </tb-js-func>
+  <tb-js-func *ngIf="logConfigForm.get('scriptLang').value === scriptLanguage.TBEL"
+              #tbelFuncComponent
+              formControlName="tbelScript"
+              functionName="ToString"
+              [functionArgs]="['msg', 'metadata', 'msgType']"
+              [disableUndefinedCheck]="true"
+              [scriptLanguage]="scriptLanguage.TBEL"
+              helpId="rulenode/tbel/log_node_script_fn"
+              noValidate="true">
+    <button toolbarSuffixButton
+            mat-icon-button
+            matTooltip="{{ testScriptLabel | translate }}"
+            matTooltipPosition="above"
+            class="tb-mat-32"
+            (click)="testScript()">
+      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+    </button>
+  </tb-js-func>
+  <div class="flex flex-row">
+    <button mat-button mat-raised-button color="primary" (click)="testScript()">
+      {{ testScriptLabel | translate }}
+    </button>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/log-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/log-config.component.ts
new file mode 100644
index 0000000000..4a8017b6ff
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/log-config.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, EventEmitter, ViewChild } from '@angular/core';
+import { getCurrentAuthState, NodeScriptTestService } from '@core/public-api';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  RuleNodeConfiguration,
+  RuleNodeConfigurationComponent,
+  ScriptLanguage
+} from '@app/shared/models/rule-node.models';
+import type { JsFuncComponent } from '@app/shared/components/js-func.component';
+import { DebugRuleNodeEventBody } from '@shared/models/event.models';
+
+@Component({
+  selector: 'tb-action-node-log-config',
+  templateUrl: './log-config.component.html',
+  styleUrls: []
+})
+export class LogConfigComponent extends RuleNodeConfigurationComponent {
+
+  @ViewChild('jsFuncComponent', {static: false}) jsFuncComponent: JsFuncComponent;
+  @ViewChild('tbelFuncComponent', {static: false}) tbelFuncComponent: JsFuncComponent;
+
+  logConfigForm: UntypedFormGroup;
+
+  tbelEnabled = getCurrentAuthState(this.store).tbelEnabled;
+
+  scriptLanguage = ScriptLanguage;
+
+  changeScript: EventEmitter<void> = new EventEmitter<void>();
+
+  readonly hasScript = true;
+
+  readonly testScriptLabel = 'rule-node-config.test-to-string-function';
+
+  constructor(private fb: UntypedFormBuilder,
+              private nodeScriptTestService: NodeScriptTestService,
+              private translate: TranslateService) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.logConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.logConfigForm = this.fb.group({
+      scriptLang: [configuration ? configuration.scriptLang : ScriptLanguage.JS, [Validators.required]],
+      jsScript: [configuration ? configuration.jsScript : null, []],
+      tbelScript: [configuration ? configuration.tbelScript : null, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['scriptLang'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    let scriptLang: ScriptLanguage = this.logConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.TBEL && !this.tbelEnabled) {
+      scriptLang = ScriptLanguage.JS;
+      this.logConfigForm.get('scriptLang').patchValue(scriptLang, {emitEvent: false});
+      setTimeout(() => {this.logConfigForm.updateValueAndValidity({emitEvent: true});});
+    }
+    this.logConfigForm.get('jsScript').setValidators(scriptLang === ScriptLanguage.JS ? [Validators.required] : []);
+    this.logConfigForm.get('jsScript').updateValueAndValidity({emitEvent});
+    this.logConfigForm.get('tbelScript').setValidators(scriptLang === ScriptLanguage.TBEL ? [Validators.required] : []);
+    this.logConfigForm.get('tbelScript').updateValueAndValidity({emitEvent});
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    if (configuration) {
+      if (!configuration.scriptLang) {
+        configuration.scriptLang = ScriptLanguage.JS;
+      }
+    }
+    return configuration;
+  }
+
+  testScript(debugEventBody?: DebugRuleNodeEventBody) {
+    const scriptLang: ScriptLanguage = this.logConfigForm.get('scriptLang').value;
+    const scriptField = scriptLang === ScriptLanguage.JS ? 'jsScript' : 'tbelScript';
+    const helpId = scriptLang === ScriptLanguage.JS ? 'rulenode/log_node_script_fn' : 'rulenode/tbel/log_node_script_fn';
+    const script: string = this.logConfigForm.get(scriptField).value;
+    this.nodeScriptTestService.testNodeScript(
+      script,
+      'string',
+      this.translate.instant('rule-node-config.to-string'),
+      'ToString',
+      ['msg', 'metadata', 'msgType'],
+      this.ruleNodeId,
+      helpId,
+      scriptLang,
+      debugEventBody
+    ).subscribe((theScript) => {
+      if (theScript) {
+        this.logConfigForm.get(scriptField).setValue(theScript);
+        this.changeScript.emit();
+      }
+    });
+  }
+
+  protected onValidate() {
+    const scriptLang: ScriptLanguage = this.logConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.JS) {
+      this.jsFuncComponent.validateOnSubmit();
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/math-function-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/math-function-config.component.html
new file mode 100644
index 0000000000..c8d7ba8b2e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/math-function-config.component.html
@@ -0,0 +1,103 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="mathFunctionConfigForm" class="flex flex-col">
+  <tb-math-function-autocomplete
+    class="flex-full max-h-30% xs:max-h-full md:max-h-full"
+    required
+    formControlName="operation">
+  </tb-math-function-autocomplete>
+  <fieldset class="fields-group flex flex-col gap-2">
+    <legend class="group-title" translate>rule-node-config.argument-tile</legend>
+    <tb-arguments-map-config formControlName="arguments"
+                             [function]="mathFunctionConfigForm.get('operation').value">
+    </tb-arguments-map-config>
+  </fieldset>
+  <fieldset *ngIf="mathFunctionConfigForm.get('operation').value === MathFunction.CUSTOM"
+            class="fields-group flex flex-col gap-2">
+    <legend class="group-title">{{'rule-node-config.custom-expression-field-input' | translate }} *</legend>
+    <mat-form-field class="mat-block no-margin-top flex-1" subscriptSizing="dynamic">
+      <input matInput formControlName="customFunction" required/>
+      <mat-error *ngIf="mathFunctionConfigForm.get('customFunction').hasError('required')" translate>
+        rule-node-config.custom-expression-field-input-required
+      </mat-error>
+      <mat-hint translate>rule-node-config.custom-expression-field-input-hint</mat-hint>
+    </mat-form-field>
+  </fieldset>
+  <fieldset class="fields-group flex flex-col gap-2">
+    <legend class="group-title" translate>rule-node-config.result-title</legend>
+    <div formGroupName="result">
+      <mat-form-field class="mat-block flex-1">
+        <mat-label translate>rule-node-config.type-field-input</mat-label>
+        <mat-select formControlName="type" required>
+          <mat-select-trigger>
+            {{ argumentTypeResultMap.get(mathFunctionConfigForm.get('result.type').value)?.name | translate }}
+          </mat-select-trigger>
+          <mat-option *ngFor="let argument of argumentsResult" [value]="argument"
+                      style="border-bottom: 1px solid #eee;">
+            {{ argumentTypeResultMap.get(argument).name | translate }}
+            <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+              {{ argumentTypeResultMap.get(argument).description | translate }}
+            </small>
+          </mat-option>
+        </mat-select>
+        <mat-error *ngIf="mathFunctionConfigForm.get('result.type').hasError('required')" translate>
+          rule-node-config.type-field-input-required
+        </mat-error>
+      </mat-form-field>
+      <div class="xs:flex-col gt-xs:gap-4 flex flex-1 flex-row">
+        <mat-form-field class="mat-block flex-1" *ngIf="mathFunctionConfigForm.get('result').get('type').value === ArgumentTypeResult.ATTRIBUTE">
+          <mat-label translate>rule-node-config.attribute-scope-field-input</mat-label>
+          <mat-select required formControlName="attributeScope">
+            <mat-option *ngFor="let scope of attributeScopeResult" [value]="scope">
+              {{ attributeScopeMap.get(scope) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-form-field floatLabel="always" class="mat-block flex-1">
+          <mat-label translate>rule-node-config.key-field-input</mat-label>
+          <input matInput formControlName="key" required/>
+          <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix
+                    color="primary"
+                    matTooltip="{{ 'rule-node-config.math-templatization-tooltip' | translate }}">help</mat-icon>
+          <mat-error *ngIf="mathFunctionConfigForm.get('result.key').hasError('required')" translate>
+            rule-node-config.key-field-input-required
+          </mat-error>
+        </mat-form-field>
+      </div>
+      <div class="xs:flex-col gt-xs:gap-4 flex flex-1 flex-row">
+        <mat-form-field floatLabel="always" class="mat-block flex-1" subscriptSizing="dynamic">
+          <mat-label translate>rule-node-config.number-floating-point-field-input</mat-label>
+          <input formControlName="resultValuePrecision"
+                 matInput
+                 step="1" min="0"
+                 type="number"/>
+          <mat-hint [innerHTML]="'rule-node-config.number-floating-point-field-input-hint' | translate | safe: 'html'"></mat-hint>
+        </mat-form-field>
+      </div>
+      <div *ngIf="[ArgumentTypeResult.ATTRIBUTE, ArgumentTypeResult.TIME_SERIES].includes(mathFunctionConfigForm.get('result').get('type').value)"
+           class="xs:flex-col gt-xs:gap-4 flex flex-1 flex-row items-stretch justify-start" style="padding-top: 16px;">
+        <mat-checkbox formControlName="addToBody">
+          {{'rule-node-config.add-to-message-field-input' | translate }}
+        </mat-checkbox>
+        <mat-checkbox formControlName="addToMetadata">
+          {{'rule-node-config.add-to-metadata-field-input' | translate}}
+        </mat-checkbox>
+      </div>
+    </div>
+  </fieldset>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/math-function-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/action/math-function-config.component.scss
new file mode 100644
index 0000000000..d96fbe7578
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/math-function-config.component.scss
@@ -0,0 +1,41 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 ::ng-deep {
+  .fields-group {
+    padding: 0 16px 8px;
+    margin: 10px 0;
+    border: 1px groove rgba(0, 0, 0, .25);
+    border-radius: 4px;
+
+    .mat-mdc-form-field {
+      .mat-mdc-form-field-infix {
+        width: 100%;
+      }
+    }
+
+    legend {
+      color: rgba(0, 0, 0, .7);
+      width: fit-content;
+    }
+
+    legend + * {
+      display: block;
+      &.no-margin-top {
+        margin-top: 0;
+      }
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/math-function-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/math-function-config.component.ts
new file mode 100644
index 0000000000..2ff796840e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/math-function-config.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 } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import {
+  ArgumentTypeResult,
+  ArgumentTypeResultMap,
+  AttributeScopeMap,
+  AttributeScopeResult,
+  MathFunction
+} from '../rule-node-config.models';
+
+
+@Component({
+  selector: 'tb-action-node-math-function-config',
+  templateUrl: './math-function-config.component.html',
+  styleUrls: ['./math-function-config.component.scss']
+})
+export class MathFunctionConfigComponent extends RuleNodeConfigurationComponent {
+
+  mathFunctionConfigForm: UntypedFormGroup;
+
+  MathFunction = MathFunction;
+  ArgumentTypeResult = ArgumentTypeResult;
+  argumentTypeResultMap = ArgumentTypeResultMap;
+  attributeScopeMap = AttributeScopeMap;
+  argumentsResult = Object.values(ArgumentTypeResult);
+  attributeScopeResult = Object.values(AttributeScopeResult);
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.mathFunctionConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.mathFunctionConfigForm = this.fb.group({
+      operation: [configuration ? configuration.operation : null, [Validators.required]],
+      arguments: [configuration ? configuration.arguments : null, [Validators.required]],
+      customFunction: [configuration ? configuration.customFunction : '', [Validators.required]],
+      result: this.fb.group({
+        type: [configuration ? configuration.result.type: null, [Validators.required]],
+        attributeScope: [configuration ? configuration.result.attributeScope : null, [Validators.required]],
+        key: [configuration ? configuration.result.key : '', [Validators.required]],
+        resultValuePrecision: [configuration ? configuration.result.resultValuePrecision : 0],
+        addToBody: [configuration ? configuration.result.addToBody : false],
+        addToMetadata: [configuration ? configuration.result.addToMetadata : false]
+      })
+    });
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const operation: MathFunction = this.mathFunctionConfigForm.get('operation').value;
+    const resultType: ArgumentTypeResult = this.mathFunctionConfigForm.get('result.type').value;
+    if (operation === MathFunction.CUSTOM) {
+      this.mathFunctionConfigForm.get('customFunction').enable({emitEvent: false});
+      if (this.mathFunctionConfigForm.get('customFunction').value === null) {
+        this.mathFunctionConfigForm.get('customFunction').patchValue('(x - 32) / 1.8', {emitEvent: false});
+      }
+    } else {
+      this.mathFunctionConfigForm.get('customFunction').disable({emitEvent: false});
+    }
+    if (resultType === ArgumentTypeResult.ATTRIBUTE) {
+      this.mathFunctionConfigForm.get('result.attributeScope').enable({emitEvent: false});
+    } else {
+      this.mathFunctionConfigForm.get('result.attributeScope').disable({emitEvent: false});
+    }
+    this.mathFunctionConfigForm.get('customFunction').updateValueAndValidity({emitEvent});
+    this.mathFunctionConfigForm.get('result.attributeScope').updateValueAndValidity({emitEvent});
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['operation', 'result.type'];
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/msg-count-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/msg-count-config.component.html
new file mode 100644
index 0000000000..586addf563
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/msg-count-config.component.html
@@ -0,0 +1,36 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="msgCountConfigForm" class="flex flex-col">
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.interval-seconds</mat-label>
+    <input required type="number" min="1" step="1" matInput formControlName="interval">
+    <mat-error *ngIf="msgCountConfigForm.get('interval').hasError('required')">
+      {{ 'rule-node-config.interval-seconds-required' | translate }}
+    </mat-error>
+    <mat-error *ngIf="msgCountConfigForm.get('interval').hasError('min')">
+      {{ 'rule-node-config.min-interval-seconds-message' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.output-timeseries-key-prefix</mat-label>
+    <input required matInput formControlName="telemetryPrefix">
+    <mat-error *ngIf="msgCountConfigForm.get('telemetryPrefix').hasError('required')">
+      {{ 'rule-node-config.output-timeseries-key-prefix-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/msg-count-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/msg-count-config.component.ts
new file mode 100644
index 0000000000..5380c569a0
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/msg-count-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-action-node-msg-count-config',
+  templateUrl: './msg-count-config.component.html',
+  styleUrls: []
+})
+export class MsgCountConfigComponent extends RuleNodeConfigurationComponent {
+
+  msgCountConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.msgCountConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.msgCountConfigForm = this.fb.group({
+      interval: [configuration ? configuration.interval : null, [Validators.required, Validators.min(1)]],
+      telemetryPrefix: [configuration ? configuration.telemetryPrefix : null, [Validators.required]]
+    });
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/msg-delay-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/msg-delay-config.component.html
new file mode 100644
index 0000000000..9f549a0d6d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/msg-delay-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="msgDelayConfigForm" class="flex flex-col">
+  <mat-checkbox formControlName="useMetadataPeriodInSecondsPatterns">
+    {{ 'rule-node-config.use-metadata-period-in-seconds-patterns' | translate }}
+  </mat-checkbox>
+  <div class="tb-hint" translate>rule-node-config.use-metadata-period-in-seconds-patterns-hint</div>
+  <mat-form-field *ngIf="msgDelayConfigForm.get('useMetadataPeriodInSecondsPatterns').value !== true; else periodInSecondsPattern"
+                  class="mat-block">
+    <mat-label translate>rule-node-config.period-seconds</mat-label>
+    <input required type="number" min="0" step="1" matInput formControlName="periodInSeconds">
+    <mat-error *ngIf="msgDelayConfigForm.get('periodInSeconds').hasError('required')">
+      {{ 'rule-node-config.period-seconds-required' | translate }}
+    </mat-error>
+    <mat-error *ngIf="msgDelayConfigForm.get('periodInSeconds').hasError('min')">
+      {{ 'rule-node-config.min-period-0-seconds-message' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <ng-template #periodInSecondsPattern>
+    <mat-form-field class="mat-block" subscriptSizing="dynamic">
+      <mat-label translate>rule-node-config.period-in-seconds-pattern</mat-label>
+      <input required matInput formControlName="periodInSecondsPattern">
+      <mat-error *ngIf="msgDelayConfigForm.get('periodInSecondsPattern').hasError('required')">
+        {{ 'rule-node-config.period-in-seconds-pattern-required' | translate }}
+      </mat-error>
+      <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+    </mat-form-field>
+  </ng-template>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.max-pending-messages</mat-label>
+    <input required type="number" min="1" max="100000" step="1" matInput formControlName="maxPendingMsgs">
+    <mat-error *ngIf="msgDelayConfigForm.get('maxPendingMsgs').hasError('required')">
+      {{ 'rule-node-config.max-pending-messages-required' | translate }}
+    </mat-error>
+    <mat-error *ngIf="msgDelayConfigForm.get('maxPendingMsgs').hasError('min')">
+      {{ 'rule-node-config.max-pending-messages-range' | translate }}
+    </mat-error>
+    <mat-error *ngIf="msgDelayConfigForm.get('maxPendingMsgs').hasError('max')">
+      {{ 'rule-node-config.max-pending-messages-range' | translate }}
+    </mat-error>
+  </mat-form-field>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/msg-delay-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/msg-delay-config.component.ts
new file mode 100644
index 0000000000..cabf2e67af
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/msg-delay-config.component.ts
@@ -0,0 +1,65 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-action-node-msg-delay-config',
+  templateUrl: './msg-delay-config.component.html',
+  styleUrls: []
+})
+export class MsgDelayConfigComponent extends RuleNodeConfigurationComponent {
+
+  msgDelayConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.msgDelayConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.msgDelayConfigForm = this.fb.group({
+      useMetadataPeriodInSecondsPatterns: [configuration ? configuration.useMetadataPeriodInSecondsPatterns : false, []],
+      periodInSeconds: [configuration ? configuration.periodInSeconds : null, []],
+      periodInSecondsPattern: [configuration ? configuration.periodInSecondsPattern : null, []],
+      maxPendingMsgs: [configuration ? configuration.maxPendingMsgs : null,
+        [Validators.required, Validators.min(1), Validators.max(100000)]],
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['useMetadataPeriodInSecondsPatterns'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const useMetadataPeriodInSecondsPatterns: boolean = this.msgDelayConfigForm.get('useMetadataPeriodInSecondsPatterns').value;
+    if (useMetadataPeriodInSecondsPatterns) {
+      this.msgDelayConfigForm.get('periodInSecondsPattern').setValidators([Validators.required]);
+      this.msgDelayConfigForm.get('periodInSeconds').setValidators([]);
+    } else {
+      this.msgDelayConfigForm.get('periodInSecondsPattern').setValidators([]);
+      this.msgDelayConfigForm.get('periodInSeconds').setValidators([Validators.required, Validators.min(0)]);
+    }
+    this.msgDelayConfigForm.get('periodInSecondsPattern').updateValueAndValidity({emitEvent});
+    this.msgDelayConfigForm.get('periodInSeconds').updateValueAndValidity({emitEvent});
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/push-to-cloud-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/push-to-cloud-config.component.html
new file mode 100644
index 0000000000..a8c1975e6b
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/push-to-cloud-config.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.
+
+-->
+<section [formGroup]="pushToCloudConfigForm" class="tb-form-panel no-border no-padding">
+  <div class="tb-form-panel stroked">
+    <tb-example-hint [hintText]="'rule-node-config.attributes-scope-hint'">
+    </tb-example-hint>
+    <div class="tb-form-row no-border no-padding tb-standard-fields">
+      <mat-form-field class="flex">
+        <mat-label>{{ 'rule-node-config.attributes-scope' | translate }}</mat-label>
+        <mat-select required
+                    class="tb-entity-type-select" matInput formControlName="scope">
+          <mat-option *ngFor="let scope of attributeScopes" [value]="scope">
+            {{ telemetryTypeTranslationsMap.get(scope) | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <mat-form-field class="flex">
+        <mat-label>{{ 'rule-node-config.attributes-scope-value' | translate }}</mat-label>
+        <input type="text" matInput readonly disabled [ngModel]="pushToCloudConfigForm.get('scope').value" [ngModelOptions]="{standalone: true}">
+        <button type="button"
+                matSuffix
+                mat-icon-button
+                aria-label="Copy"
+                ngxClipboard
+                [cbContent]="pushToCloudConfigForm.get('scope').value"
+                matTooltip="{{ 'rule-node-config.attributes-scope-value-copy' | translate }}">
+          <mat-icon aria-hidden="false"
+                    aria-label="help-icon">content_copy
+          </mat-icon>
+        </button>
+      </mat-form-field>
+    </div>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/push-to-cloud-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/push-to-cloud-config.component.ts
new file mode 100644
index 0000000000..07082ebabe
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/push-to-cloud-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+import { AttributeScope, telemetryTypeTranslations } from '@shared/models/telemetry/telemetry.models';
+
+@Component({
+  selector: 'tb-action-node-push-to-cloud-config',
+  templateUrl: './push-to-cloud-config.component.html',
+  styleUrls: []
+})
+export class PushToCloudConfigComponent extends RuleNodeConfigurationComponent {
+
+  attributeScopes = Object.keys(AttributeScope);
+  telemetryTypeTranslationsMap = telemetryTypeTranslations;
+
+  pushToCloudConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.pushToCloudConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.pushToCloudConfigForm = this.fb.group({
+      scope: [configuration ? configuration.scope : null, [Validators.required]]
+    });
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/push-to-edge-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/push-to-edge-config.component.html
new file mode 100644
index 0000000000..4e79a763c0
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/push-to-edge-config.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.
+
+-->
+<section [formGroup]="pushToEdgeConfigForm" class="tb-form-panel no-border no-padding">
+  <div class="tb-form-panel stroked">
+    <tb-example-hint [hintText]="'rule-node-config.attributes-scope-hint'">
+    </tb-example-hint>
+    <div class="tb-form-row no-border no-padding tb-standard-fields">
+      <mat-form-field class="flex">
+        <mat-label>{{ 'rule-node-config.attributes-scope' | translate }}</mat-label>
+        <mat-select required
+                    class="tb-entity-type-select" matInput formControlName="scope">
+          <mat-option *ngFor="let scope of attributeScopes" [value]="scope">
+            {{ telemetryTypeTranslationsMap.get(scope) | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <mat-form-field class="flex">
+        <mat-label>{{ 'rule-node-config.attributes-scope-value' | translate }}</mat-label>
+        <input type="text" matInput readonly disabled [ngModel]="pushToEdgeConfigForm.get('scope').value" [ngModelOptions]="{standalone: true}">
+        <button type="button"
+                matSuffix
+                mat-icon-button
+                aria-label="Copy"
+                ngxClipboard
+                [cbContent]="pushToEdgeConfigForm.get('scope').value"
+                matTooltip="{{ 'rule-node-config.attributes-scope-value-copy' | translate }}">
+          <mat-icon aria-hidden="false"
+                    aria-label="help-icon">content_copy
+          </mat-icon>
+        </button>
+      </mat-form-field>
+    </div>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/push-to-edge-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/push-to-edge-config.component.ts
new file mode 100644
index 0000000000..bbefcd3d76
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/push-to-edge-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+import { AttributeScope, telemetryTypeTranslations } from '@shared/models/telemetry/telemetry.models';
+
+@Component({
+  selector: 'tb-action-node-push-to-edge-config',
+  templateUrl: './push-to-edge-config.component.html',
+  styleUrls: []
+})
+export class PushToEdgeConfigComponent extends RuleNodeConfigurationComponent {
+
+  attributeScopes = Object.keys(AttributeScope);
+  telemetryTypeTranslationsMap = telemetryTypeTranslations;
+
+  pushToEdgeConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.pushToEdgeConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.pushToEdgeConfigForm = this.fb.group({
+      scope: [configuration ? configuration.scope : null, [Validators.required]]
+    });
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/rpc-reply-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/rpc-reply-config.component.html
new file mode 100644
index 0000000000..be1ac0a0eb
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/rpc-reply-config.component.html
@@ -0,0 +1,36 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="rpcReplyConfigForm" class="tb-form-panel stroked no-padding-bottom">
+  <div class="tb-form-panel-title" translate>rule-node-config.reply-routing-configuration</div>
+  <tb-example-hint [hintText]="'rule-node-config.rpc-reply-routing-configuration-hint'">
+  </tb-example-hint>
+  <div class="tb-form-row no-border no-padding tb-standard-fields column-xs">
+    <mat-form-field class="flex">
+      <mat-label translate>rule-node-config.service-id-metadata-attribute</mat-label>
+      <input matInput formControlName="serviceIdMetaDataAttribute">
+    </mat-form-field>
+    <mat-form-field class="flex">
+      <mat-label translate>rule-node-config.session-id-metadata-attribute</mat-label>
+      <input matInput formControlName="sessionIdMetaDataAttribute">
+    </mat-form-field>
+    <mat-form-field class="flex">
+      <mat-label translate>rule-node-config.request-id-metadata-attribute</mat-label>
+      <input matInput formControlName="requestIdMetaDataAttribute">
+    </mat-form-field>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/rpc-reply-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/rpc-reply-config.component.ts
new file mode 100644
index 0000000000..840c6eb9c3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/rpc-reply-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-action-node-rpc-reply-config',
+  templateUrl: './rpc-reply-config.component.html',
+  styleUrls: []
+})
+export class RpcReplyConfigComponent extends RuleNodeConfigurationComponent {
+
+  rpcReplyConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.rpcReplyConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.rpcReplyConfigForm = this.fb.group({
+      serviceIdMetaDataAttribute: [configuration ? configuration.serviceIdMetaDataAttribute : null, []],
+      sessionIdMetaDataAttribute: [configuration ? configuration.sessionIdMetaDataAttribute : null, []],
+      requestIdMetaDataAttribute: [configuration ? configuration.requestIdMetaDataAttribute : null, []]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/rpc-request-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/rpc-request-config.component.html
new file mode 100644
index 0000000000..306565590e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/rpc-request-config.component.html
@@ -0,0 +1,29 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="rpcRequestConfigForm" class="flex flex-col">
+  <mat-form-field class="mat-block flex-1">
+    <mat-label translate>rule-node-config.timeout-sec</mat-label>
+    <input type="number" min="0" step="1" matInput formControlName="timeoutInSeconds" required>
+    <mat-error *ngIf="rpcRequestConfigForm.get('timeoutInSeconds').hasError('required')">
+      {{ 'rule-node-config.timeout-required' | translate }}
+    </mat-error>
+    <mat-error *ngIf="rpcRequestConfigForm.get('timeoutInSeconds').hasError('min')">
+      {{ 'rule-node-config.min-timeout-message' | translate }}
+    </mat-error>
+  </mat-form-field>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/rpc-request-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/rpc-request-config.component.ts
new file mode 100644
index 0000000000..d54677b237
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/rpc-request-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-action-node-rpc-request-config',
+  templateUrl: './rpc-request-config.component.html',
+  styleUrls: []
+})
+export class RpcRequestConfigComponent extends RuleNodeConfigurationComponent {
+
+  rpcRequestConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.rpcRequestConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.rpcRequestConfigForm = this.fb.group({
+      timeoutInSeconds: [configuration ? configuration.timeoutInSeconds : null, [Validators.required, Validators.min(0)]]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/save-to-custom-table-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/save-to-custom-table-config.component.html
new file mode 100644
index 0000000000..5f2d7f823d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/save-to-custom-table-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="saveToCustomTableConfigForm" class="tb-form-panel no-border no-padding">
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.custom-table-name</mat-label>
+    <input required matInput formControlName="tableName">
+    <mat-icon class="help-icon margin-8 cursor-pointer"
+              aria-hidden="false"
+              aria-label="help-icon"
+              matSuffix
+              matTooltip="{{ 'rule-node-config.custom-table-hint' | translate }}">
+      help
+    </mat-icon>
+    <mat-error *ngIf="saveToCustomTableConfigForm.get('tableName').hasError('required') ||
+                      saveToCustomTableConfigForm.get('tableName').hasError('pattern')">
+      {{ 'rule-node-config.custom-table-name-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <tb-kv-map-config
+    required
+    formControlName="fieldsMapping"
+    [labelText]="'rule-node-config.fields-mapping' | translate"
+    [requiredText]="'rule-node-config.fields-mapping-required' | translate"
+    [keyText]="'rule-node-config.message-field' | translate"
+    [keyRequiredText]="'rule-node-config.message-field-required' | translate"
+    [valText]="'rule-node-config.table-col' | translate"
+    [valRequiredText]="'rule-node-config.table-col-required' | translate"
+    [hintText]="'rule-node-config.fields-mapping-hint'">
+  </tb-kv-map-config>
+  <mat-form-field class="mat-block flex-1">
+    <mat-label translate>rule-node-config.default-ttl</mat-label>
+    <input type="number" min="0" step="1" matInput formControlName="defaultTtl" required>
+    <mat-hint translate>rule-node-config.default-ttl-zero-hint</mat-hint>
+    <mat-error *ngIf="saveToCustomTableConfigForm.get('defaultTtl').hasError('min')">
+      {{ 'rule-node-config.min-default-ttl-message' | translate }}
+    </mat-error>
+    <mat-error *ngIf="saveToCustomTableConfigForm.get('defaultTtl').hasError('required')">
+      {{ 'rule-node-config.default-ttl-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/save-to-custom-table-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/save-to-custom-table-config.component.ts
new file mode 100644
index 0000000000..27d40dd4b9
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/save-to-custom-table-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-action-node-custom-table-config',
+  templateUrl: './save-to-custom-table-config.component.html',
+  styleUrls: []
+})
+export class SaveToCustomTableConfigComponent extends RuleNodeConfigurationComponent {
+
+  saveToCustomTableConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.saveToCustomTableConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.saveToCustomTableConfigForm = this.fb.group({
+      tableName: [configuration ? configuration.tableName : null, [Validators.required, Validators.pattern(/.*\S.*/)]],
+      fieldsMapping: [configuration ? configuration.fieldsMapping : null, [Validators.required]],
+      defaultTtl: [configuration ? configuration.defaultTtl : 0, [Validators.required, Validators.min(0)]]
+    });
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    configuration.tableName = configuration.tableName.trim();
+    return configuration;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/send-rest-api-call-reply-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/send-rest-api-call-reply-config.component.html
new file mode 100644
index 0000000000..3a8be8d22f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/send-rest-api-call-reply-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="sendRestApiCallReplyConfigForm" class="tb-form-panel stroked no-padding-bottom">
+  <div class="tb-form-panel-title" translate>rule-node-config.reply-routing-configuration</div>
+  <tb-example-hint [hintText]="'rule-node-config.reply-routing-configuration-hint'">
+  </tb-example-hint>
+  <div class="tb-form-row no-border no-padding tb-standard-fields column-xs">
+    <mat-form-field class="flex">
+      <mat-label translate>rule-node-config.service-id-metadata-attribute</mat-label>
+      <input matInput formControlName="serviceIdMetaDataAttribute">
+    </mat-form-field>
+    <mat-form-field class="flex">
+      <mat-label translate>rule-node-config.request-id-metadata-attribute</mat-label>
+      <input matInput formControlName="requestIdMetaDataAttribute">
+    </mat-form-field>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/send-rest-api-call-reply-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/send-rest-api-call-reply-config.component.ts
new file mode 100644
index 0000000000..ad4e148658
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/send-rest-api-call-reply-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-action-node-send-rest-api-call-reply-config',
+  templateUrl: './send-rest-api-call-reply-config.component.html',
+  styleUrls: []
+})
+export class SendRestApiCallReplyConfigComponent extends RuleNodeConfigurationComponent {
+
+  sendRestApiCallReplyConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.sendRestApiCallReplyConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.sendRestApiCallReplyConfigForm = this.fb.group({
+      requestIdMetaDataAttribute: [configuration ? configuration.requestIdMetaDataAttribute : null, []],
+      serviceIdMetaDataAttribute: [configuration ? configuration.serviceIdMetaDataAttribute : null, []]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/timeseries-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/timeseries-config.component.html
new file mode 100644
index 0000000000..715776d780
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/timeseries-config.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.
+
+-->
+<section [formGroup]="timeseriesConfigForm" class="tb-form-panel no-border no-padding">
+  <div class="tb-form-panel stroked no-padding-bottom no-gap" formGroupName="processingSettings">
+    <div class="mb-4 flex flex-row items-center justify-between">
+      <div class="tb-form-panel-title" tb-hint-tooltip-icon="{{ 'rule-node-config.save-time-series.processing-settings-hint' | translate}}" translate>
+        rule-node-config.save-time-series.processing-settings
+      </div>
+      <tb-toggle-select appearance="fill" selectMediaBreakpoint="xs"
+                        formControlName="isAdvanced">
+        <tb-toggle-option [value]=false>{{ 'rule-node-config.basic-mode' | translate}}</tb-toggle-option>
+        <tb-toggle-option [value]=true>{{ 'rule-node-config.advanced-mode' | translate }}</tb-toggle-option>
+      </tb-toggle-select>
+    </div>
+    @if(!timeseriesConfigForm.get('processingSettings.isAdvanced').value) {
+      <mat-form-field>
+        <mat-label translate>rule-node-config.save-time-series.strategy</mat-label>
+        <mat-select formControlName="type">
+          @for (strategy of persistenceStrategies; track strategy) {
+            <mat-option [value]="strategy">{{ PersistenceTypeTranslationMap.get(strategy) | translate }}</mat-option>
+          }
+        </mat-select>
+      </mat-form-field>
+
+      @if(timeseriesConfigForm.get('processingSettings.type').value === PersistenceType.DEDUPLICATE) {
+        <tb-time-unit-input
+          required
+          labelText="{{ 'rule-node-config.save-time-series.deduplication-interval' | translate }}"
+          requiredText="{{ 'rule-node-config.save-time-series.deduplication-interval-required' | translate }}"
+          minErrorText="{{ 'rule-node-config.save-time-series.deduplication-interval-min-max-range' | translate }}"
+          maxErrorText="{{ 'rule-node-config.save-time-series.deduplication-interval-min-max-range' | translate }}"
+          [maxTime]="maxDeduplicateTime"
+          [minTime]="1"
+          formControlName="deduplicationIntervalSecs">
+        </tb-time-unit-input>
+      }
+    } @else {
+      <tb-advanced-persistence-settings
+        class="mb-4"
+        formControlName="advanced"
+      ></tb-advanced-persistence-settings>
+    }
+  </div>
+  <section class="tb-form-panel stroked">
+    <mat-expansion-panel class="tb-settings">
+      <mat-expansion-panel-header>
+        <mat-panel-title translate>rule-node-config.advanced-settings</mat-panel-title>
+      </mat-expansion-panel-header>
+      <ng-template matExpansionPanelContent>
+        <div tb-hint-tooltip-icon="{{ 'rule-node-config.use-server-ts-hint' | translate}}"
+             class="tb-form-row no-border no-padding">
+          <mat-slide-toggle class="mat-slide" formControlName="useServerTs">
+            {{ 'rule-node-config.use-server-ts' | translate }}
+          </mat-slide-toggle>
+        </div>
+        <tb-time-unit-input
+          required
+          subscriptSizing="dynamic"
+          labelText="{{ 'rule-node-config.default-ttl' | translate }}"
+          requiredText="{{ 'rule-node-config.default-ttl-required' | translate }}"
+          minErrorText="{{ 'rule-node-config.min-default-ttl-message' | translate }}"
+          formControlName="defaultTTL">
+          <mat-icon class="mr-2 cursor-pointer"
+                    aria-hidden="false"
+                    aria-label="help-icon"
+                    matSuffix
+                    matTooltip="{{ 'rule-node-config.default-ttl-hint' | translate }}">
+            help
+          </mat-icon>
+        </tb-time-unit-input>
+      </ng-template>
+    </mat-expansion-panel>
+  </section>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/timeseries-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/timeseries-config.component.ts
new file mode 100644
index 0000000000..d5e1d998a8
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/timeseries-config.component.ts
@@ -0,0 +1,132 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+import {
+  defaultAdvancedPersistenceStrategy,
+  maxDeduplicateTimeSecs,
+  ProcessingSettings,
+  ProcessingSettingsForm,
+  ProcessingType,
+  ProcessingTypeTranslationMap,
+  TimeseriesNodeConfiguration,
+  TimeseriesNodeConfigurationForm
+} from '@home/components/rule-node/action/timeseries-config.models';
+
+@Component({
+  selector: 'tb-action-node-timeseries-config',
+  templateUrl: './timeseries-config.component.html',
+  styleUrls: []
+})
+export class TimeseriesConfigComponent extends RuleNodeConfigurationComponent {
+
+  timeseriesConfigForm: FormGroup;
+
+  PersistenceType = ProcessingType;
+  persistenceStrategies = [ProcessingType.ON_EVERY_MESSAGE, ProcessingType.DEDUPLICATE, ProcessingType.WEBSOCKETS_ONLY];
+  PersistenceTypeTranslationMap = ProcessingTypeTranslationMap;
+
+  maxDeduplicateTime = maxDeduplicateTimeSecs
+
+  constructor(private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.timeseriesConfigForm;
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['processingSettings.isAdvanced', 'processingSettings.type'];
+  }
+
+  protected prepareInputConfig(config: TimeseriesNodeConfiguration): TimeseriesNodeConfigurationForm {
+    let processingSettings: ProcessingSettingsForm;
+    if (config?.processingSettings) {
+      const isAdvanced = config?.processingSettings?.type === ProcessingType.ADVANCED;
+      processingSettings = {
+        type: isAdvanced ? ProcessingType.ON_EVERY_MESSAGE : config.processingSettings.type,
+        isAdvanced: isAdvanced,
+        deduplicationIntervalSecs: config.processingSettings?.deduplicationIntervalSecs ?? 60,
+        advanced: isAdvanced ? config.processingSettings : defaultAdvancedPersistenceStrategy
+      }
+    } else {
+      processingSettings = {
+        type: ProcessingType.ON_EVERY_MESSAGE,
+        isAdvanced: false,
+        deduplicationIntervalSecs: 60,
+        advanced: defaultAdvancedPersistenceStrategy
+      };
+    }
+    return {
+      ...config,
+      processingSettings: processingSettings
+    }
+  }
+
+  protected prepareOutputConfig(config: TimeseriesNodeConfigurationForm): TimeseriesNodeConfiguration {
+    let processingSettings: ProcessingSettings;
+    if (config.processingSettings.isAdvanced) {
+      processingSettings = {
+        ...config.processingSettings.advanced,
+        type: ProcessingType.ADVANCED
+      };
+    } else {
+      processingSettings = {
+        type: config.processingSettings.type,
+        deduplicationIntervalSecs: config.processingSettings?.deduplicationIntervalSecs
+      };
+    }
+    return {
+      ...config,
+      processingSettings
+    };
+  }
+
+  protected onConfigurationSet(config: TimeseriesNodeConfigurationForm) {
+    this.timeseriesConfigForm = this.fb.group({
+      processingSettings: this.fb.group({
+        isAdvanced: [config?.processingSettings?.isAdvanced ?? false],
+        type: [config?.processingSettings?.type ?? ProcessingType.ON_EVERY_MESSAGE],
+        deduplicationIntervalSecs: [
+          {value: config?.processingSettings?.deduplicationIntervalSecs ?? 60, disabled: true},
+          [Validators.required, Validators.max(maxDeduplicateTimeSecs)]
+        ],
+        advanced: [{value: null, disabled: true}]
+      }),
+      defaultTTL: [config?.defaultTTL ?? null, [Validators.required, Validators.min(0)]],
+      useServerTs: [config?.useServerTs ?? false]
+    });
+  }
+
+  protected updateValidators(emitEvent: boolean, _trigger?: string) {
+    const processingForm = this.timeseriesConfigForm.get('processingSettings') as FormGroup;
+    const isAdvanced: boolean = processingForm.get('isAdvanced').value;
+    const type: ProcessingType = processingForm.get('type').value;
+    if (!isAdvanced && type === ProcessingType.DEDUPLICATE) {
+      processingForm.get('deduplicationIntervalSecs').enable({emitEvent});
+    } else {
+      processingForm.get('deduplicationIntervalSecs').disable({emitEvent});
+    }
+    if (isAdvanced) {
+      processingForm.get('advanced').enable({emitEvent});
+    } else {
+      processingForm.get('advanced').disable({emitEvent});
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/timeseries-config.models.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/timeseries-config.models.ts
new file mode 100644
index 0000000000..e9d024663d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/timeseries-config.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 { DAY, SECOND } from '@shared/models/time/time.models';
+
+export const maxDeduplicateTimeSecs = DAY / SECOND;
+
+export interface TimeseriesNodeConfiguration {
+  processingSettings: ProcessingSettings;
+  defaultTTL: number;
+  useServerTs: boolean;
+}
+
+export interface TimeseriesNodeConfigurationForm extends Omit<TimeseriesNodeConfiguration, 'processingSettings'> {
+  processingSettings: ProcessingSettingsForm
+}
+
+export type ProcessingSettings = BasicProcessingSettings & Partial<DeduplicateProcessingStrategy> & Partial<AdvancedProcessingStrategy>;
+
+export type ProcessingSettingsForm = Omit<ProcessingSettings, keyof AdvancedProcessingStrategy> & {
+  isAdvanced: boolean;
+  advanced?: Partial<AdvancedProcessingStrategy>;
+  type: ProcessingType;
+};
+
+export enum ProcessingType {
+  ON_EVERY_MESSAGE = 'ON_EVERY_MESSAGE',
+  DEDUPLICATE = 'DEDUPLICATE',
+  WEBSOCKETS_ONLY = 'WEBSOCKETS_ONLY',
+  ADVANCED = 'ADVANCED',
+  SKIP = 'SKIP'
+}
+
+export const ProcessingTypeTranslationMap = new Map<ProcessingType, string>([
+  [ProcessingType.ON_EVERY_MESSAGE, 'rule-node-config.save-time-series.strategy-type.every-message'],
+  [ProcessingType.DEDUPLICATE, 'rule-node-config.save-time-series.strategy-type.deduplicate'],
+  [ProcessingType.WEBSOCKETS_ONLY, 'rule-node-config.save-time-series.strategy-type.web-sockets-only'],
+  [ProcessingType.SKIP, 'rule-node-config.save-time-series.strategy-type.skip'],
+])
+
+export interface BasicProcessingSettings {
+  type: ProcessingType;
+}
+
+export interface DeduplicateProcessingStrategy extends BasicProcessingSettings{
+  deduplicationIntervalSecs: number;
+}
+
+export interface AdvancedProcessingStrategy extends BasicProcessingSettings{
+  timeseries: AdvancedProcessingConfig;
+  latest: AdvancedProcessingConfig;
+  webSockets: AdvancedProcessingConfig;
+}
+
+export type AdvancedProcessingConfig = WithOptional<DeduplicateProcessingStrategy, 'deduplicationIntervalSecs'>;
+
+export const defaultAdvancedProcessingConfig: AdvancedProcessingConfig = {
+  type: ProcessingType.ON_EVERY_MESSAGE
+}
+
+export const defaultAdvancedPersistenceStrategy: Omit<AdvancedProcessingStrategy, 'type'> = {
+  timeseries: defaultAdvancedProcessingConfig,
+  latest: defaultAdvancedProcessingConfig,
+  webSockets: defaultAdvancedProcessingConfig,
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/unassign-customer-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/unassign-customer-config.component.html
new file mode 100644
index 0000000000..4b2df342ab
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/unassign-customer-config.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.
+
+-->
+<section [formGroup]="unassignCustomerConfigForm" class="flex flex-col">
+  <div class="tb-form-panel no-padding no-border">
+
+    <div class="tb-form-panel stroked" [class.no-padding-bottom]="unassignCustomerConfigForm.get('unassignFromCustomer').value">
+      <div tb-hint-tooltip-icon="{{ 'rule-node-config.unassign-from-customer-tooltip' | translate }}"
+           class="tb-form-row no-border no-padding">
+        <mat-slide-toggle class="mat-slide" formControlName="unassignFromCustomer">
+          {{ 'rule-node-config.unassign-from-customer' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <mat-form-field class="mat-block" subscriptSizing="dynamic" *ngIf="unassignCustomerConfigForm.get('unassignFromCustomer').value">
+        <mat-label translate>rule-node-config.customer-name-pattern</mat-label>
+        <input required matInput formControlName="customerNamePattern">
+        <mat-error *ngIf="unassignCustomerConfigForm.get('customerNamePattern').hasError('required') ||
+                        unassignCustomerConfigForm.get('customerNamePattern').hasError('pattern')">
+          {{ 'rule-node-config.customer-name-pattern-required' | translate }}
+        </mat-error>
+        <mat-hint translate>rule-node-config.customer-name-pattern-hint</mat-hint>
+      </mat-form-field>
+    </div>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/unassign-customer-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/unassign-customer-config.component.ts
new file mode 100644
index 0000000000..a514a5b495
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/unassign-customer-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { isDefinedAndNotNull } from '@core/public-api';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-action-node-un-assign-to-customer-config',
+  templateUrl: './unassign-customer-config.component.html',
+  styleUrls: []
+})
+export class UnassignCustomerConfigComponent extends RuleNodeConfigurationComponent {
+
+  unassignCustomerConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.unassignCustomerConfigForm;
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      customerNamePattern: isDefinedAndNotNull(configuration?.customerNamePattern) ? configuration.customerNamePattern : null,
+      unassignFromCustomer: isDefinedAndNotNull(configuration?.customerNamePattern),
+    };
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.unassignCustomerConfigForm = this.fb.group({
+      customerNamePattern: [configuration.customerNamePattern , []],
+      unassignFromCustomer: [configuration.unassignFromCustomer, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['unassignFromCustomer'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const unassignFromCustomer: boolean = this.unassignCustomerConfigForm.get('unassignFromCustomer').value;
+    if (unassignFromCustomer) {
+      this.unassignCustomerConfigForm.get('customerNamePattern').setValidators([Validators.required, Validators.pattern(/.*\S.*/)]);
+    } else {
+      this.unassignCustomerConfigForm.get('customerNamePattern').setValidators([]);
+    }
+    this.unassignCustomerConfigForm.get('customerNamePattern').updateValueAndValidity({emitEvent});
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      customerNamePattern: configuration.unassignFromCustomer ? configuration.customerNamePattern.trim() : null
+    };
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/alarm-status-select.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/alarm-status-select.component.html
new file mode 100644
index 0000000000..3406218f10
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/alarm-status-select.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.
+
+-->
+<section [formGroup]="alarmStatusGroup" class="flex flex-col items-center justify-center">
+  <mat-chip-listbox multiple formControlName="alarmStatus" class="chip-listbox flex flex-col">
+    <div class="toggle-column">
+      <mat-chip-option class="option flex-1" [value]="alarmStatus.ACTIVE_UNACK">
+        {{ alarmStatusTranslations.get(alarmStatus.ACTIVE_UNACK) | translate }}
+      </mat-chip-option>
+      <mat-chip-option class="option flex-1" [value]="alarmStatus.ACTIVE_ACK">
+        {{ alarmStatusTranslations.get(alarmStatus.ACTIVE_ACK) | translate }}
+      </mat-chip-option>
+    </div>
+    <div class="toggle-column">
+      <mat-chip-option class="option flex-1" [value]="alarmStatus.CLEARED_UNACK">
+        {{ alarmStatusTranslations.get(alarmStatus.CLEARED_UNACK) | translate }}
+      </mat-chip-option>
+      <mat-chip-option class="option flex-1" [value]="alarmStatus.CLEARED_ACK">
+        {{ alarmStatusTranslations.get(alarmStatus.CLEARED_ACK) | translate }}
+      </mat-chip-option>
+    </div>
+  </mat-chip-listbox>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/alarm-status-select.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/common/alarm-status-select.component.scss
new file mode 100644
index 0000000000..4eca381bff
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/alarm-status-select.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.
+ */
+:host {
+  .chip-listbox {
+    max-width: 460px;
+    width: 100%;
+
+    .toggle-column {
+      display: flex;
+      flex: 1 1 100%;
+      gap: 8px;
+    }
+
+    .option {
+      margin: 0;
+    }
+  }
+
+  @media screen and (max-width: 959px) {
+    .chip-listbox {
+      max-width: 360px;
+
+      .toggle-column {
+        flex-direction: column;
+      }
+    }
+  }
+}
+
+:host ::ng-deep {
+  .chip-listbox {
+    .mdc-evolution-chip-set__chips {
+      gap: 8px;
+    }
+
+    .option {
+      button {
+        flex-basis: 100%;
+        justify-content: start;
+      }
+
+      .mdc-evolution-chip__graphic {
+        flex-grow: 0;
+      }
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/alarm-status-select.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/alarm-status-select.component.ts
new file mode 100644
index 0000000000..f92f09b428
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/alarm-status-select.component.ts
@@ -0,0 +1,77 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, DestroyRef, forwardRef, OnInit } from '@angular/core';
+import { AlarmStatus, alarmStatusTranslations, PageComponent } from '@shared/public-api';
+import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-alarm-status-select',
+  templateUrl: './alarm-status-select.component.html',
+  styleUrls: ['./alarm-status-select.component.scss'],
+  providers: [{
+    provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => AlarmStatusSelectComponent),
+    multi: true
+  }]
+})
+
+export class AlarmStatusSelectComponent extends PageComponent implements OnInit, ControlValueAccessor {
+
+  public alarmStatusGroup: FormGroup;
+
+  private propagateChange = null;
+
+  readonly alarmStatus = AlarmStatus;
+  readonly alarmStatusTranslations = alarmStatusTranslations;
+
+  constructor(private fb: FormBuilder,
+              private destroyRef: DestroyRef) {
+    super();
+  }
+
+  ngOnInit(): void {
+    this.alarmStatusGroup = this.fb.group({
+      alarmStatus: [null, []]
+    });
+
+    this.alarmStatusGroup.get('alarmStatus').valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe((value) => {
+      this.propagateChange(value);
+    });
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    if (isDisabled) {
+      this.alarmStatusGroup.disable({emitEvent: false});
+    } else {
+      this.alarmStatusGroup.enable({emitEvent: false});
+    }
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  writeValue(value: Array<AlarmStatus>): void {
+    this.alarmStatusGroup.get('alarmStatus').patchValue(value, {emitEvent: false});
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/arguments-map-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/arguments-map-config.component.html
new file mode 100644
index 0000000000..dcf7bd896e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/arguments-map-config.component.html
@@ -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.
+
+-->
+<section class="flex flex-col">
+
+  <div [class.readonly]="disabled"
+       style="max-height: 500px; overflow: auto;">
+    <mat-list class="tb-drop-list arguments-list" cdkDropList cdkDropListOrientation="vertical"
+              [formGroup]="argumentsFormGroup"
+              (cdkDropListDropped)="onDrop($event)"
+              [cdkDropListDisabled]="disabled">
+      <mat-list-item *ngFor="let argumentControl of argumentsFormArray.controls; let $index = index"
+                     formArrayName="arguments"
+                     cdkDrag class="tb-argument tb-draggable"
+                     [cdkDragDisabled]="disabled"
+                     style="height: 100%">
+        <div class="flex flex-1 flex-row items-center justify-start">
+          <button *ngIf="!disabled" mat-icon-button color="primary"
+                  cdkDragHandle
+                  class="tb-drag-handle handle"
+                  style="min-width: 40px; margin: 0"
+                  matTooltip="{{ 'action.drag' | translate }}"
+                  matTooltipPosition="above">
+            <mat-icon>drag_handle</mat-icon>
+          </button>
+          <div class="flex flex-1 flex-row items-center justify-start gap-4">
+            <span *ngIf="displayArgumentName"
+                  style="padding: 0 10px; min-width: 20px;">{{argumentControl.get('name').value}}.</span>
+            <div class="flex flex-1 flex-col">
+              <mat-form-field class="mat-block">
+                <mat-label translate>rule-node-config.argument-source-field-input</mat-label>
+                <mat-select [formControl]="argumentControl.get('type')" required>
+                  <mat-select-trigger>
+                    {{ argumentTypeMap.get(argumentControl.get('type').value)?.name | translate }}
+                  </mat-select-trigger>
+                  <mat-option *ngFor="let argument of arguments" [value]="argument"
+                              style="border-bottom: 1px solid #eee;">
+                    {{ argumentTypeMap.get(argument).name | translate }}
+                    <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+                      {{ argumentTypeMap.get(argument).description |  translate }}
+                    </small>
+                  </mat-option>
+                </mat-select>
+                <mat-error *ngIf="argumentControl.get('type').hasError('required')" translate>
+                  rule-node-config.argument-source-field-input-required
+                </mat-error>
+              </mat-form-field>
+              <div class="flex flex-1 flex-row xs:flex-col gt-xs:gap-4">
+                <mat-form-field floatLabel="always" class="mat-block gt-xs:max-w-50% gt-xs:flex-full"
+                                *ngIf="argumentControl.get('type').value && argumentControl.get('type').value !== ArgumentType.CONSTANT">
+                  <mat-label translate>rule-node-config.argument-key-field-input</mat-label>
+                  <input [formControl]="argumentControl.get('key')" matInput required/>
+                  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix
+                            color="primary"
+                            matTooltip="{{ 'rule-node-config.math-templatization-tooltip' | translate }}">
+                    help
+                  </mat-icon>
+                  <mat-error *ngIf="argumentControl.get('key').hasError('required')" translate>
+                    rule-node-config.argument-key-field-input-required
+                  </mat-error>
+                </mat-form-field>
+                <mat-form-field floatLabel="always" class="mat-block flex-1"
+                                *ngIf="argumentControl.get('type').value === ArgumentType.CONSTANT">
+                  <mat-label translate>rule-node-config.constant-value-field-input</mat-label>
+                  <input [formControl]="argumentControl.get('key')"
+                         matInput
+                         required
+                         step="1" min="0"
+                         type="number"/>
+                  <mat-error *ngIf="argumentControl.get('key').hasError('required')" translate>
+                    rule-node-config.constant-value-field-input-required
+                  </mat-error>
+                </mat-form-field>
+                <mat-form-field *ngIf="argumentControl.get('type').value && argumentControl.get('type').value !== ArgumentType.CONSTANT"
+                                floatLabel="always" class="mat-block gt-xs:max-w-50% gt-xs:flex-full">
+                  <mat-label translate>rule-node-config.default-value-field-input</mat-label>
+                  <input [formControl]="argumentControl.get('defaultValue')" matInput step="1" type="number"/>
+                </mat-form-field>
+              </div>
+              <mat-form-field *ngIf="argumentControl.get('type').value === ArgumentType.ATTRIBUTE" class="mat-block">
+                <mat-label translate>rule-node-config.attribute-scope-field-input</mat-label>
+                <mat-select required [formControl]="argumentControl.get('attributeScope')">
+                  <mat-option *ngFor="let scope of attributeScope" [value]="scope">
+                    {{ attributeScopeMap.get(scope) | translate }}
+                  </mat-option>
+                </mat-select>
+                <mat-error *ngIf="argumentControl.get('attributeScope').hasError('required')" translate>
+                  rule-node-config.attribute-scope-field-input-required
+                </mat-error>
+              </mat-form-field>
+            </div>
+            <button *ngIf="!disabled" mat-icon-button color="primary" style="min-width: 40px;"
+                    (click)="removeArgument($index)"
+                    matTooltip="{{ 'action.remove' | translate }}"
+                    matTooltipPosition="above">
+              <mat-icon>close</mat-icon>
+            </button>
+          </div>
+        </div>
+      </mat-list-item>
+    </mat-list>
+  </div>
+  <div *ngIf="!argumentsFormArray.length">
+      <span translate
+            class="tb-prompt flex items-center justify-center">rule-node-config.no-arguments-prompt</span>
+  </div>
+  <button mat-button mat-raised-button color="primary"
+          [disabled]="argumentsFormArray.length >= maxArgs"
+          (click)="addArgument()"
+          type="button"
+          matTooltipPosition="above">
+    <mat-icon>add</mat-icon>
+    {{ 'action.add' | translate }}
+  </button>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/arguments-map-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/common/arguments-map-config.component.scss
new file mode 100644
index 0000000000..9f6893b5df
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/arguments-map-config.component.scss
@@ -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.
+ */
+:host {
+  .mat-mdc-list-item.tb-argument {
+    border: solid rgba(0, 0, 0, .25) 1px;
+    border-radius: 4px;
+    padding: 10px 0;
+    margin-bottom: 16px;
+  }
+
+  .arguments-list {
+    padding: 0px;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/arguments-map-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/arguments-map-config.component.ts
new file mode 100644
index 0000000000..3e6d5826f8
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/arguments-map-config.component.ts
@@ -0,0 +1,238 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, DestroyRef, forwardRef, Input, OnInit } from '@angular/core';
+import {
+  ControlValueAccessor,
+  FormArray,
+  FormBuilder,
+  FormGroup,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  Validator,
+  Validators
+} from '@angular/forms';
+import { PageComponent } from '@shared/public-api';
+import { CdkDragDrop } from '@angular/cdk/drag-drop';
+import {
+  ArgumentName,
+  ArgumentType,
+  ArgumentTypeMap,
+  AttributeScope,
+  AttributeScopeMap,
+  MathFunction,
+  MathFunctionMap
+} from './../rule-node-config.models';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-arguments-map-config',
+  templateUrl: './arguments-map-config.component.html',
+  styleUrls: ['./arguments-map-config.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => ArgumentsMapConfigComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => ArgumentsMapConfigComponent),
+      multi: true,
+    }
+  ]
+})
+export class ArgumentsMapConfigComponent extends PageComponent implements ControlValueAccessor, OnInit, Validator {
+
+  @Input() disabled: boolean;
+
+  private functionValue: MathFunction;
+
+  get function(): MathFunction {
+    return this.functionValue;
+  }
+
+  @Input()
+  set function(funcName: MathFunction) {
+    if (funcName && this.functionValue !== funcName) {
+      this.functionValue = funcName;
+      this.setupArgumentsFormGroup(true);
+    }
+  }
+
+  maxArgs = 16;
+  minArgs = 1;
+  displayArgumentName = false;
+
+  mathFunctionMap = MathFunctionMap;
+  ArgumentType = ArgumentType;
+
+  argumentsFormGroup: FormGroup;
+
+  attributeScopeMap = AttributeScopeMap;
+  argumentTypeMap = ArgumentTypeMap;
+  arguments = Object.values(ArgumentType);
+  attributeScope = Object.values(AttributeScope);
+
+  private propagateChange = null;
+
+  constructor(private fb: FormBuilder,
+              private destroyRef: DestroyRef) {
+    super();
+  }
+
+  ngOnInit(): void {
+    this.argumentsFormGroup = this.fb.group({
+      arguments: this.fb.array([])
+    });
+
+    this.argumentsFormGroup.valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(() => {
+      this.updateModel();
+    });
+
+    this.setupArgumentsFormGroup();
+  }
+
+  public onDrop(event: CdkDragDrop<string[]>) {
+    const columnsFormArray = this.argumentsFormArray;
+    const columnForm = columnsFormArray.at(event.previousIndex);
+    columnsFormArray.removeAt(event.previousIndex);
+    columnsFormArray.insert(event.currentIndex, columnForm);
+    this.updateArgumentNames();
+  }
+
+  get argumentsFormArray(): FormArray {
+    return this.argumentsFormGroup.get('arguments') as FormArray;
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (this.disabled) {
+      this.argumentsFormGroup.disable({emitEvent: false});
+    } else {
+      this.argumentsFormGroup.enable({emitEvent: false});
+      this.argumentsFormArray.controls
+        .forEach((control: FormGroup) => this.updateArgumentControlValidators(control));
+    }
+  }
+
+  writeValue(argumentsList: Array<any>): void {
+    const argumentsControls: Array<FormGroup> = [];
+    if (argumentsList) {
+      argumentsList.forEach((property, index) => {
+        argumentsControls.push(this.createArgumentControl(property, index));
+      });
+    }
+    this.argumentsFormGroup.setControl('arguments', this.fb.array(argumentsControls), {emitEvent: false});
+    this.setupArgumentsFormGroup();
+  }
+
+
+  public removeArgument(index: number) {
+    this.argumentsFormArray.removeAt(index);
+    this.updateArgumentNames();
+  }
+
+  public addArgument(emitEvent = true) {
+    const argumentsFormArray = this.argumentsFormArray;
+    const argumentControl = this.createArgumentControl(null, argumentsFormArray.length);
+    argumentsFormArray.push(argumentControl, {emitEvent});
+  }
+
+  public validate() {
+    if (!this.argumentsFormGroup.valid) {
+      return {
+        argumentsRequired: true
+      };
+    }
+    return null;
+  }
+
+  private setupArgumentsFormGroup(emitEvent = false) {
+    if (this.function) {
+      this.maxArgs = this.mathFunctionMap.get(this.function).maxArgs;
+      this.minArgs = this.mathFunctionMap.get(this.function).minArgs;
+      this.displayArgumentName = this.function === MathFunction.CUSTOM;
+    }
+    if (this.argumentsFormGroup) {
+      this.argumentsFormGroup.get('arguments').setValidators([Validators.minLength(this.minArgs), Validators.maxLength(this.maxArgs)]);
+      while (this.argumentsFormArray.length > this.maxArgs) {
+        this.removeArgument(this.maxArgs - 1);
+      }
+      while (this.argumentsFormArray.length < this.minArgs) {
+        this.addArgument(emitEvent);
+      }
+      this.argumentsFormGroup.get('arguments').updateValueAndValidity({emitEvent: false});
+    }
+  }
+
+  private createArgumentControl(property: any, index: number): FormGroup {
+    const argumentControl = this.fb.group({
+      type: [property?.type, [Validators.required]],
+      key: [property?.key, [Validators.required]],
+      name: [ArgumentName[index], [Validators.required]],
+      attributeScope: [property?.attributeScope ?? AttributeScope.SERVER_SCOPE, [Validators.required]],
+      defaultValue: [property?.defaultValue ? property?.defaultValue : null]
+    });
+    this.updateArgumentControlValidators(argumentControl);
+    argumentControl.get('type').valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(() => {
+      this.updateArgumentControlValidators(argumentControl);
+      argumentControl.get('attributeScope').updateValueAndValidity({emitEvent: false});
+      argumentControl.get('defaultValue').updateValueAndValidity({emitEvent: false});
+    });
+    return argumentControl;
+  }
+
+  private updateArgumentControlValidators(control: FormGroup) {
+    const argumentType: ArgumentType = control.get('type').value;
+    if (argumentType === ArgumentType.ATTRIBUTE) {
+      control.get('attributeScope').enable({emitEvent: false});
+    } else {
+      control.get('attributeScope').disable({emitEvent: false});
+    }
+    if (argumentType && argumentType !== ArgumentType.CONSTANT) {
+      control.get('defaultValue').enable({emitEvent: false});
+    } else {
+      control.get('defaultValue').disable({emitEvent: false});
+    }
+  }
+
+  private updateArgumentNames() {
+    this.argumentsFormArray.controls.forEach((argumentControl, argumentIndex) => {
+      argumentControl.get('name').setValue(ArgumentName[argumentIndex]);
+    });
+  }
+
+  private updateModel() {
+    const argumentsForm = this.argumentsFormArray.value;
+    if (!argumentsForm.length || !this.argumentsFormGroup.valid) {
+      this.propagateChange(null);
+    } else {
+      this.propagateChange(argumentsForm);
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/common-rule-node-config.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/common-rule-node-config.module.ts
new file mode 100644
index 0000000000..b6370be318
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/common-rule-node-config.module.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 { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '@shared/public-api';
+import { HomeComponentsModule } from '@home/components/public-api';
+import { KvMapConfigComponent } from './kv-map-config.component';
+import { DeviceRelationsQueryConfigComponent } from './device-relations-query-config.component';
+import { RelationsQueryConfigComponent } from './relations-query-config.component';
+import { MessageTypesConfigComponent } from './message-types-config.component';
+import { CredentialsConfigComponent } from './credentials-config.component';
+import { ArgumentsMapConfigComponent } from './arguments-map-config.component';
+import { MathFunctionAutocompleteComponent } from './math-function-autocomplete.component';
+import { OutputMessageTypeAutocompleteComponent } from './output-message-type-autocomplete.component';
+import { KvMapConfigOldComponent } from './kv-map-config-old.component';
+import { MsgMetadataChipComponent } from './msg-metadata-chip.component';
+import { SvMapConfigComponent } from './sv-map-config.component';
+import { RelationsQueryConfigOldComponent } from './relations-query-config-old.component';
+import { SelectAttributesComponent } from './select-attributes.component';
+import { AlarmStatusSelectComponent } from './alarm-status-select.component';
+import { ExampleHintComponent } from './example-hint.component';
+import { TimeUnitInputComponent } from './time-unit-input.component';
+
+@NgModule({
+  declarations: [
+    KvMapConfigComponent,
+    DeviceRelationsQueryConfigComponent,
+    RelationsQueryConfigComponent,
+    MessageTypesConfigComponent,
+    CredentialsConfigComponent,
+    ArgumentsMapConfigComponent,
+    MathFunctionAutocompleteComponent,
+    OutputMessageTypeAutocompleteComponent,
+    KvMapConfigOldComponent,
+    MsgMetadataChipComponent,
+    SvMapConfigComponent,
+    RelationsQueryConfigOldComponent,
+    SelectAttributesComponent,
+    AlarmStatusSelectComponent,
+    ExampleHintComponent,
+    TimeUnitInputComponent
+  ],
+  imports: [
+    CommonModule,
+    SharedModule,
+    HomeComponentsModule
+  ],
+  exports: [
+    KvMapConfigComponent,
+    DeviceRelationsQueryConfigComponent,
+    RelationsQueryConfigComponent,
+    MessageTypesConfigComponent,
+    CredentialsConfigComponent,
+    ArgumentsMapConfigComponent,
+    MathFunctionAutocompleteComponent,
+    OutputMessageTypeAutocompleteComponent,
+    KvMapConfigOldComponent,
+    MsgMetadataChipComponent,
+    SvMapConfigComponent,
+    RelationsQueryConfigOldComponent,
+    SelectAttributesComponent,
+    AlarmStatusSelectComponent,
+    ExampleHintComponent,
+    TimeUnitInputComponent
+  ]
+})
+
+export class CommonRuleNodeConfigModule {
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/credentials-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/credentials-config.component.html
new file mode 100644
index 0000000000..d4a168aa53
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/credentials-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="credentialsConfigFormGroup" class="flex flex-col">
+  <mat-expansion-panel class="tb-credentials-config-panel-group">
+    <mat-expansion-panel-header>
+      <mat-panel-title translate>rule-node-config.credentials</mat-panel-title>
+      <mat-panel-description>
+        {{ credentialsTypeTranslationsMap.get(credentialsConfigFormGroup.get('type').value) | translate }}
+      </mat-panel-description>
+    </mat-expansion-panel-header>
+    <ng-template matExpansionPanelContent>
+      <mat-form-field class="mat-block">
+        <mat-label translate>rule-node-config.credentials-type</mat-label>
+        <mat-select formControlName="type" required>
+          <mat-option *ngFor="let credentialsType of allCredentialsTypes" [value]="credentialsType"
+                      [disabled]="credentialsType === 'cert.PEM' && disableCertPemCredentials">
+            {{ credentialsTypeTranslationsMap.get(credentialsType) | translate }}
+          </mat-option>
+        </mat-select>
+        <mat-error *ngIf="credentialsConfigFormGroup.get('type').hasError('required')">
+          {{ 'rule-node-config.credentials-type-required' | translate }}
+        </mat-error>
+      </mat-form-field>
+      <section class="flex flex-col" [ngSwitch]="credentialsConfigFormGroup.get('type').value">
+        <ng-template ngSwitchCase="anonymous">
+        </ng-template>
+        <ng-template ngSwitchCase="basic">
+          <mat-form-field class="mat-block">
+            <mat-label translate>rule-node-config.username</mat-label>
+            <input required matInput formControlName="username">
+            <mat-error *ngIf="credentialsConfigFormGroup.get('username').hasError('required')">
+              {{ 'rule-node-config.username-required' | translate }}
+            </mat-error>
+          </mat-form-field>
+          <mat-form-field class="mat-block">
+            <mat-label translate>rule-node-config.password</mat-label>
+            <input type="password" [required]="passwordFieldRequired" matInput formControlName="password">
+            <tb-toggle-password matSuffix></tb-toggle-password>
+            <mat-error *ngIf="credentialsConfigFormGroup.get('password').hasError('required')">
+              {{ 'rule-node-config.password-required' | translate }}
+            </mat-error>
+          </mat-form-field>
+        </ng-template>
+        <ng-template ngSwitchCase="cert.PEM">
+          <div class="tb-hint">{{ 'rule-node-config.credentials-pem-hint' | translate }}</div>
+          <tb-file-input formControlName="caCert"
+                         inputId="caCertSelect"
+                         [existingFileName]="credentialsConfigFormGroup.get('caCertFileName').value"
+                         (fileNameChanged)="credentialsConfigFormGroup.get('caCertFileName').setValue($event)"
+                         label="{{'rule-node-config.ca-cert' | translate}}"
+                         noFileText="rule-node-config.no-file"
+                         dropLabel="{{'rule-node-config.drop-file' | translate}}">
+          </tb-file-input>
+          <tb-file-input formControlName="cert"
+                         inputId="CertSelect"
+                         [existingFileName]="credentialsConfigFormGroup.get('certFileName').value"
+                         (fileNameChanged)="credentialsConfigFormGroup.get('certFileName').setValue($event)"
+                         label="{{'rule-node-config.cert' | translate}}"
+                         noFileText="rule-node-config.no-file"
+                         dropLabel="{{'rule-node-config.drop-file' | translate}}">
+          </tb-file-input>
+          <tb-file-input style="padding-bottom: 8px;"
+                         formControlName="privateKey"
+                         inputId="privateKeySelect"
+                         [existingFileName]="credentialsConfigFormGroup.get('privateKeyFileName').value"
+                         (fileNameChanged)="credentialsConfigFormGroup.get('privateKeyFileName').setValue($event)"
+                         label="{{'rule-node-config.private-key' | translate}}"
+                         noFileText="rule-node-config.no-file"
+                         dropLabel="{{'rule-node-config.drop-file' | translate}}">
+          </tb-file-input>
+          <mat-form-field class="mat-block">
+            <mat-label translate>rule-node-config.private-key-password</mat-label>
+            <input type="password" matInput formControlName="password">
+            <tb-toggle-password matSuffix></tb-toggle-password>
+          </mat-form-field>
+        </ng-template>
+      </section>
+    </ng-template>
+  </mat-expansion-panel>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/credentials-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/credentials-config.component.ts
new file mode 100644
index 0000000000..95ed59683d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/credentials-config.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, DestroyRef, forwardRef, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
+import {
+  ControlValueAccessor,
+  FormBuilder,
+  FormGroup,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  ValidationErrors,
+  Validator,
+  ValidatorFn,
+  Validators
+} from '@angular/forms';
+import { isDefinedAndNotNull } from '@core/public-api';
+import { PageComponent } from '@shared/public-api';
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
+import { credentialsType, credentialsTypes, credentialsTypeTranslations } from '../rule-node-config.models';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+interface CredentialsConfig {
+  type: credentialsType;
+  username?: string;
+  password?: string;
+  caCert?: string;
+  caCertFileName?: string;
+  privateKey?: string;
+  privateKeyFileName?: string;
+  cert?: string;
+  certFileName?: string;
+}
+
+@Component({
+  selector: 'tb-credentials-config',
+  templateUrl: './credentials-config.component.html',
+  styleUrls: [],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => CredentialsConfigComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => CredentialsConfigComponent),
+      multi: true,
+    }
+  ]
+})
+export class CredentialsConfigComponent extends PageComponent implements ControlValueAccessor, OnInit, Validator, OnChanges {
+
+  credentialsConfigFormGroup: FormGroup;
+
+  private requiredValue: boolean;
+
+  get required(): boolean {
+    return this.requiredValue;
+  }
+
+  @Input()
+  set required(value: boolean) {
+    this.requiredValue = coerceBooleanProperty(value);
+  }
+
+  @Input()
+  disableCertPemCredentials = false;
+
+  @Input()
+  passwordFieldRequired = true;
+
+  allCredentialsTypes = credentialsTypes;
+  credentialsTypeTranslationsMap = credentialsTypeTranslations;
+
+  private propagateChange = (_: any) => {};
+
+  constructor(private fb: FormBuilder,
+              private destroyRef: DestroyRef) {
+    super();
+  }
+
+  ngOnInit(): void {
+    this.credentialsConfigFormGroup = this.fb.group(
+      {
+        type: [null, [Validators.required]],
+        username: [null, []],
+        password: [null, []],
+        caCert: [null, []],
+        caCertFileName: [null, []],
+        privateKey: [null, []],
+        privateKeyFileName: [null, []],
+        cert: [null, []],
+        certFileName: [null, []]
+      }
+    );
+    this.credentialsConfigFormGroup.valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(() => {
+      this.updateView();
+    });
+    this.credentialsConfigFormGroup.get('type').valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(() => {
+      this.credentialsTypeChanged();
+    });
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    for (const propName of Object.keys(changes)) {
+      const change = changes[propName];
+      if (!change.firstChange && change.currentValue !== change.previousValue) {
+        if (change.currentValue && propName === 'disableCertPemCredentials') {
+          const credentialsTypeValue: credentialsType = this.credentialsConfigFormGroup.get('type').value;
+          if (credentialsTypeValue === 'cert.PEM') {
+            setTimeout(() => {
+              this.credentialsConfigFormGroup.get('type').patchValue('anonymous', {emitEvent: true});
+            });
+          }
+        }
+      }
+    }
+  }
+
+  writeValue(credentials: CredentialsConfig | null): void {
+    if (isDefinedAndNotNull(credentials)) {
+      this.credentialsConfigFormGroup.reset(credentials, {emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    if (isDisabled) {
+      this.credentialsConfigFormGroup.disable({emitEvent: false});
+    } else {
+      this.credentialsConfigFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  updateView() {
+    let credentialsConfigValue = this.credentialsConfigFormGroup.value;
+    const credentialsTypeValue: credentialsType = credentialsConfigValue.type;
+    switch (credentialsTypeValue) {
+      case 'anonymous':
+        credentialsConfigValue = {
+          type: credentialsTypeValue
+        };
+        break;
+      case 'basic':
+        credentialsConfigValue = {
+          type: credentialsTypeValue,
+          username: credentialsConfigValue.username,
+          password: credentialsConfigValue.password,
+        };
+        break;
+      case 'cert.PEM':
+        delete credentialsConfigValue.username;
+        break;
+    }
+    this.propagateChange(credentialsConfigValue);
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(): void {
+  }
+
+  public validate() {
+    return this.credentialsConfigFormGroup.valid ? null : {
+      credentialsConfig: {
+        valid: false,
+      },
+    };
+  }
+
+  credentialsTypeChanged(): void {
+    this.credentialsConfigFormGroup.patchValue({
+      username: null,
+      password: null,
+      caCert: null,
+      caCertFileName: null,
+      privateKey: null,
+      privateKeyFileName: null,
+      cert: null,
+      certFileName: null,
+    });
+    this.updateValidators();
+  }
+
+  protected updateValidators(emitEvent: boolean = false) {
+    const credentialsTypeValue: credentialsType = this.credentialsConfigFormGroup.get('type').value;
+    if (emitEvent) {
+      this.credentialsConfigFormGroup.reset({type: credentialsTypeValue}, {emitEvent: false});
+    }
+    this.credentialsConfigFormGroup.setValidators([]);
+    this.credentialsConfigFormGroup.get('username').setValidators([]);
+    this.credentialsConfigFormGroup.get('password').setValidators([]);
+    switch (credentialsTypeValue) {
+      case 'anonymous':
+        break;
+      case 'basic':
+        this.credentialsConfigFormGroup.get('username').setValidators([Validators.required]);
+        this.credentialsConfigFormGroup.get('password').setValidators(this.passwordFieldRequired ? [Validators.required] : []);
+        break;
+      case 'cert.PEM':
+        this.credentialsConfigFormGroup.setValidators([this.requiredFilesSelected(
+          Validators.required,
+          [['caCert', 'caCertFileName'], ['privateKey', 'privateKeyFileName', 'cert', 'certFileName']]
+        )]);
+        break;
+    }
+    this.credentialsConfigFormGroup.get('username').updateValueAndValidity({emitEvent});
+    this.credentialsConfigFormGroup.get('password').updateValueAndValidity({emitEvent});
+    this.credentialsConfigFormGroup.updateValueAndValidity({emitEvent});
+  }
+
+  private requiredFilesSelected(validator: ValidatorFn,
+                                requiredFieldsSet: string[][] = null) {
+    return (group: FormGroup): ValidationErrors | null => {
+      if (!requiredFieldsSet) {
+        requiredFieldsSet = [Object.keys(group.controls)];
+      }
+      const allRequiredFilesSelected = group?.controls &&
+        requiredFieldsSet.some(arrFields => arrFields.every(k => !validator(group.controls[k])));
+
+      return allRequiredFilesSelected ? null : {notAllRequiredFilesSelected: true};
+    };
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/device-relations-query-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/device-relations-query-config.component.html
new file mode 100644
index 0000000000..b1f33c1937
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/device-relations-query-config.component.html
@@ -0,0 +1,66 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section class="flex flex-col" [formGroup]="deviceRelationsQueryFormGroup">
+  <div class="flex flex-row gap-5">
+    <mat-form-field class="mat-block max-w-50% flex-full" subscriptSizing="dynamic" style="min-width: 100px;" hideRequiredMarker>
+      <mat-label translate>relation.direction</mat-label>
+      <mat-select required formControlName="direction">
+        <mat-option *ngFor="let type of directionTypes" [value]="type">
+          {{ directionTypeTranslations.get(type) | translate }} <span translate>rule-node-config.relations-query-config-direction-suffix</span>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+    <mat-form-field floatLabel="always" class="mat-block max-w-50% flex-full">
+      <mat-label translate>rule-node-config.max-relation-level</mat-label>
+      <input matInput
+             type="text"
+             pattern="[0-9]*"
+             inputmode="numeric"
+             min="1"
+             placeholder="{{ 'rule-node-config.unlimited-level' | translate }}"
+             formControlName="maxLevel">
+      <mat-error *ngIf="deviceRelationsQueryFormGroup.get('maxLevel').hasError('min')">
+        {{ 'rule-node-config.max-relation-level-error' | translate }}
+      </mat-error>
+      <mat-error *ngIf="deviceRelationsQueryFormGroup.get('maxLevel').invalid">
+        {{ 'rule-node-config.max-relation-level-invalid' | translate }}
+      </mat-error>
+    </mat-form-field>
+  </div>
+  <div tb-hint-tooltip-icon="{{ 'rule-node-config.last-level-device-relation-tooltip' | translate }}"
+       *ngIf="deviceRelationsQueryFormGroup.get('maxLevel').value > 1"
+       class="tb-form-row no-border no-padding last-level-slide-toggle">
+    <mat-slide-toggle class="mat-slide" formControlName="fetchLastLevelOnly">
+      {{ 'alias.last-level-relation' | translate }}
+    </mat-slide-toggle>
+  </div>
+  <tb-relation-type-autocomplete
+    class="flex-1"
+    formControlName="relationType">
+  </tb-relation-type-autocomplete>
+  <tb-entity-subtype-list
+    required
+    [label]="'rule-node-config.device-profiles' | translate"
+    [entityType]="entityType.DEVICE"
+    [emptyInputPlaceholder]="'rule-node-config.add-device-profile' | translate"
+    [filledInputPlaceholder]="'rule-node-config.add-device-profile' | translate"
+    formControlName="deviceTypes">
+    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" color="primary"
+              matTooltip="{{ 'rule-node-config.chip-help' | translate: { inputName: 'rule-node-config.device-profile' | translate } }}">help</mat-icon>
+  </tb-entity-subtype-list>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/device-relations-query-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/common/device-relations-query-config.component.scss
new file mode 100644
index 0000000000..95cfd96f20
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/device-relations-query-config.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.
+ */
+:host {
+  .last-level-slide-toggle {
+    margin: 8px 0 24px;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/device-relations-query-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/device-relations-query-config.component.ts
new file mode 100644
index 0000000000..bc9f524a75
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/device-relations-query-config.component.ts
@@ -0,0 +1,112 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, DestroyRef, forwardRef, Input, OnInit } from '@angular/core';
+import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
+import { PageComponent } from '@shared/components/page.component';
+import { EntitySearchDirection, entitySearchDirectionTranslations } from '@app/shared/models/relation.models';
+import { EntityType } from '@shared/models/entity-type.models';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+interface DeviceRelationsQuery {
+  fetchLastLevelOnly: boolean;
+  direction: EntitySearchDirection;
+  maxLevel?: number;
+  relationType?: string;
+  deviceTypes: string[];
+}
+
+@Component({
+  selector: 'tb-device-relations-query-config',
+  templateUrl: './device-relations-query-config.component.html',
+  styleUrls: ['./device-relations-query-config.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => DeviceRelationsQueryConfigComponent),
+      multi: true
+    }
+  ]
+})
+export class DeviceRelationsQueryConfigComponent extends PageComponent implements ControlValueAccessor, OnInit {
+
+  @Input() disabled: boolean;
+
+  private requiredValue: boolean;
+
+  get required(): boolean {
+    return this.requiredValue;
+  }
+
+  @Input()
+  set required(value: boolean) {
+    this.requiredValue = coerceBooleanProperty(value);
+  }
+
+  directionTypes: Array<EntitySearchDirection> = Object.values(EntitySearchDirection);
+  directionTypeTranslations = entitySearchDirectionTranslations;
+
+  entityType = EntityType;
+
+  deviceRelationsQueryFormGroup: FormGroup;
+
+  private propagateChange = null;
+
+  constructor(private fb: FormBuilder,
+              private destroyRef: DestroyRef) {
+    super();
+  }
+
+  ngOnInit(): void {
+    this.deviceRelationsQueryFormGroup = this.fb.group({
+      fetchLastLevelOnly: [false, []],
+      direction: [null, [Validators.required]],
+      maxLevel: [null, [Validators.min(1)]],
+      relationType: [null],
+      deviceTypes: [null, [Validators.required]]
+    });
+    this.deviceRelationsQueryFormGroup.valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe((query: DeviceRelationsQuery) => {
+      if (this.deviceRelationsQueryFormGroup.valid) {
+        this.propagateChange(query);
+      } else {
+        this.propagateChange(null);
+      }
+    });
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (this.disabled) {
+      this.deviceRelationsQueryFormGroup.disable({emitEvent: false});
+    } else {
+      this.deviceRelationsQueryFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(query: DeviceRelationsQuery): void {
+    this.deviceRelationsQueryFormGroup.reset(query, {emitEvent: false});
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/example-hint.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/example-hint.component.html
new file mode 100644
index 0000000000..0981daa5cb
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/example-hint.component.html
@@ -0,0 +1,29 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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 [hidden]="!hintText" class="tb-form-hint tb-primary-fill flex justify-between gap-5">
+  <div [innerHTML]=" hintText | translate | safe: 'html'"
+       [style.text-align]="textAlign"
+       class="w-full"></div>
+  <div *ngIf="popupHelpLink" class="flex shrink-0" tb-help-popup="{{ popupHelpLink }}"
+       hintMode
+       tb-help-popup-placement="right"
+       trigger-style="letter-spacing:0.25px; font-size:12px"
+       [tb-help-popup-style]="{maxWidth: '820px'}"
+       trigger-text="{{ 'rule-node-config.key-val.see-examples' | translate }}">
+  </div>
+</div>
diff --git a/ui-ngx/src/app/shared/components/json-form/json-form-component.models.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/example-hint.component.ts
similarity index 67%
rename from ui-ngx/src/app/shared/components/json-form/json-form-component.models.ts
rename to ui-ngx/src/app/modules/home/components/rule-node/common/example-hint.component.ts
index 75bcf2d1fd..1bcb4ea714 100644
--- a/ui-ngx/src/app/shared/components/json-form/json-form-component.models.ts
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/example-hint.component.ts
@@ -14,10 +14,19 @@
 /// limitations under the License.
 ///
 
+import { Component, Input } from '@angular/core';
 
-import { JsonSettingsSchema } from '@shared/models/widget.models';
+@Component({
+  selector: 'tb-example-hint',
+  templateUrl: './example-hint.component.html',
+  styleUrls: []
+})
+export class ExampleHintComponent {
+  @Input() hintText: string;
 
-export interface JsonFormComponentData extends JsonSettingsSchema {
-  model?: any;
-  settingsDirective?: string;
+  @Input() popupHelpLink: string;
+
+  @Input() textAlign: string = 'left';
 }
+
+
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config-old.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config-old.component.html
new file mode 100644
index 0000000000..6678008fd0
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config-old.component.html
@@ -0,0 +1,70 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section class="tb-kv-map-config flex flex-col" [formGroup]="kvListFormGroup">
+  <div class="header flex flex-1 flex-row gap-2">
+    <span class="cell tb-required flex-1">{{ keyText | translate }}</span>
+    <span class="cell tb-required flex-1">{{ valText | translate }}</span>
+    <span [class.!hidden]="disabled" style="width: 52px;" innerHTML="&nbsp"></span>
+  </div>
+  <div class="body">
+    <div class="row flex flex-row items-center justify-start gap-2"
+         formArrayName="keyVals"
+         *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index">
+      <mat-form-field class="cell mat-block flex-1">
+        <input [formControl]="keyValControl.get('key')" matInput required
+               placeholder="{{ keyText | translate }}"/>
+        <mat-error *ngIf="keyValControl.get('key').hasError('required')">
+          {{ keyRequiredText | translate }}
+        </mat-error>
+      </mat-form-field>
+      <mat-form-field class="cell mat-block flex-1">
+        <input [formControl]="keyValControl.get('value')" matInput required
+               placeholder="{{ valText | translate }}"/>
+        <mat-error *ngIf="keyValControl.get('value').hasError('required')">
+          {{ valRequiredText | translate }}
+        </mat-error>
+      </mat-form-field>
+      <button mat-icon-button color="primary"
+              [class.!hidden]="disabled"
+              type="button"
+              (click)="removeKeyVal($index)"
+              [disabled]="isLoading$ | async"
+              matTooltip="{{ 'rule-node-config.key-val.remove-entry' | translate }}"
+              matTooltipPosition="above">
+        <mat-icon>close</mat-icon>
+      </button>
+    </div>
+    <div *ngIf="hintText" class="tb-hint" [innerHTML]="hintText | translate | safe: 'html'"></div>
+  </div>
+  <tb-error [error]="ngControl.hasError('kvMapRequired') || ngControl.hasError('uniqueKeyValuePair') ?
+                     (ngControl.hasError('kvMapRequired') ? translate.instant(requiredText) :
+                     translate.instant('rule-node-config.key-val.unique-key-value-pair-error', {keyText: translate.instant(keyText),
+                     valText: translate.instant(valText)})) : ''"></tb-error>
+  <div style="margin-top: 16px;">
+    <button mat-button mat-raised-button color="primary"
+            [class.!hidden]="disabled"
+            [disabled]="isLoading$ | async"
+            (click)="addKeyVal()"
+            type="button"
+            matTooltip="{{ 'rule-node-config.key-val.add-entry' | translate }}"
+            matTooltipPosition="above">
+      <mat-icon>add</mat-icon>
+      {{ 'action.add' | translate }}
+    </button>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config-old.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config-old.component.scss
new file mode 100644
index 0000000000..fad3641ba4
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config-old.component.scss
@@ -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.
+ */
+:host {
+  .tb-kv-map-config {
+    margin-bottom: 16px;
+
+    .header {
+      padding-left: 5px;
+      padding-right: 5px;
+      padding-bottom: 5px;
+
+      .cell {
+        padding-left: 5px;
+        padding-right: 5px;
+        color: #757575;
+        font-size: 12px;
+        font-weight: 700;
+        white-space: nowrap;
+      }
+
+      .tb-required::after {
+        color: #757575;
+        font-size: 12px;
+        font-weight: 700;
+      }
+    }
+
+    .body {
+      padding-left: 5px;
+      padding-right: 5px;
+      padding-bottom: 0;
+      max-height: 300px;
+      overflow: auto;
+
+      .cell {
+        padding-left: 5px;
+        padding-right: 5px;
+      }
+    }
+
+    tb-error {
+      display: block;
+      margin-top: -12px;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config-old.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config-old.component.ts
new file mode 100644
index 0000000000..1f7407c5e3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config-old.component.ts
@@ -0,0 +1,193 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, DestroyRef, forwardRef, Injector, Input, OnInit } from '@angular/core';
+import {
+  AbstractControl,
+  ControlValueAccessor,
+  FormArray,
+  FormBuilder,
+  FormGroup,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  NgControl,
+  Validator,
+  Validators
+} from '@angular/forms';
+import { PageComponent } from '@shared/public-api';
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
+import { TranslateService } from '@ngx-translate/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-kv-map-config-old',
+  templateUrl: './kv-map-config-old.component.html',
+  styleUrls: ['./kv-map-config-old.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => KvMapConfigOldComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => KvMapConfigOldComponent),
+      multi: true,
+    }
+  ]
+})
+export class KvMapConfigOldComponent extends PageComponent implements ControlValueAccessor, OnInit, Validator {
+
+  @Input() disabled: boolean;
+
+  @Input() uniqueKeyValuePairValidator: boolean;
+
+  @Input() requiredText: string;
+
+  @Input() keyText: string;
+
+  @Input() keyRequiredText: string;
+
+  @Input() valText: string;
+
+  @Input() valRequiredText: string;
+
+  @Input() hintText: string;
+
+  private requiredValue: boolean;
+
+  get required(): boolean {
+    return this.requiredValue;
+  }
+
+  @Input()
+  set required(value: boolean) {
+    this.requiredValue = coerceBooleanProperty(value);
+  }
+
+  kvListFormGroup: FormGroup;
+
+  ngControl: NgControl;
+
+  private propagateChange = null;
+
+  constructor(public translate: TranslateService,
+              private injector: Injector,
+              private fb: FormBuilder,
+              private destroyRef: DestroyRef) {
+    super();
+  }
+
+  ngOnInit(): void {
+    this.ngControl = this.injector.get(NgControl);
+    if (this.ngControl != null) {
+      this.ngControl.valueAccessor = this;
+    }
+    this.kvListFormGroup = this.fb.group({
+      keyVals: this.fb.array([])
+    });
+
+    this.kvListFormGroup.valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(() => {
+      this.updateModel();
+    });
+  }
+
+  keyValsFormArray(): FormArray {
+    return this.kvListFormGroup.get('keyVals') as FormArray;
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (this.disabled) {
+      this.kvListFormGroup.disable({emitEvent: false});
+    } else {
+      this.kvListFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(keyValMap: { [key: string]: string }): void {
+    const keyValsControls: Array<AbstractControl> = [];
+    if (keyValMap) {
+      for (const property of Object.keys(keyValMap)) {
+        if (Object.prototype.hasOwnProperty.call(keyValMap, property)) {
+          keyValsControls.push(this.fb.group({
+            key: [property, [Validators.required]],
+            value: [keyValMap[property], [Validators.required]]
+          }));
+        }
+      }
+    }
+    this.kvListFormGroup.setControl('keyVals', this.fb.array(keyValsControls), {emitEvent: false});
+  }
+
+  public removeKeyVal(index: number) {
+    (this.kvListFormGroup.get('keyVals') as FormArray).removeAt(index);
+  }
+
+  public addKeyVal() {
+    const keyValsFormArray = this.kvListFormGroup.get('keyVals') as FormArray;
+    keyValsFormArray.push(this.fb.group({
+      key: ['', [Validators.required]],
+      value: ['', [Validators.required]]
+    }));
+  }
+
+  public validate() {
+    const kvList: { key: string; value: string }[] = this.kvListFormGroup.get('keyVals').value;
+    if (!kvList.length && this.required) {
+      return {
+        kvMapRequired: true
+      };
+    }
+    if (!this.kvListFormGroup.valid) {
+      return {
+        kvFieldsRequired: true
+      };
+    }
+    if (this.uniqueKeyValuePairValidator) {
+      for (const kv of kvList) {
+        if (kv.key === kv.value) {
+          return {
+            uniqueKeyValuePair: true
+          };
+        }
+      }
+    }
+    return null;
+  }
+
+  private updateModel() {
+    const kvList: { key: string; value: string }[] = this.kvListFormGroup.get('keyVals').value;
+    if (this.required && !kvList.length || !this.kvListFormGroup.valid) {
+      this.propagateChange(null);
+    } else {
+      const keyValMap: { [key: string]: string } = {};
+      kvList.forEach((entry) => {
+        keyValMap[entry.key] = entry.value;
+      });
+      this.propagateChange(keyValMap);
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config.component.html
new file mode 100644
index 0000000000..f2b4a5ee2a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config.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.
+
+-->
+<section [formGroup]="kvListFormGroup" class="tb-form-panel stroked">
+  <div class="tb-form-row no-padding no-border space-between">
+    <div class="tb-form-panel-title">{{ labelText }}</div>
+    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError('kvMapRequired')">
+      {{ requiredText }}
+    </div>
+    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError('required')">
+      rule-node-config.map-fields-required
+    </div>
+    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError('uniqueKeyValuePair')">
+      {{ 'rule-node-config.key-val.unique-key-value-pair-error' | translate:
+            {
+              valText: valText,
+              keyText: keyText
+            } }}
+    </div>
+  </div>
+  <div class="tb-form-panel no-border no-padding">
+    <div class="tb-form-table">
+      <div class="tb-form-table-header">
+        <div class="tb-form-table-header-cell field-space">{{ keyText }}</div>
+        <div class="tb-form-table-header-cell field-space">{{ valText }}</div>
+        <div class="tb-form-table-header-cell actions-header"></div>
+      </div>
+      <div class="tb-form-table-body">
+        <div class="tb-form-table-row"
+             *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index;">
+          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">
+            <input [placeholder]="keyText+'*'" [formControl]="keyValControl.get('key')" matInput/>
+          </mat-form-field>
+          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">
+            <input [placeholder]="valText+'*'" [formControl]="keyValControl.get('value')" matInput/>
+          </mat-form-field>
+          <div class="tb-form-table-row-cell-buttons">
+            <button [class.tb-hidden]="keyValsFormArray().controls.length === 1"
+                    type="button"
+                    mat-icon-button
+                    (click)="removeKeyVal($index)"
+                    [disabled]="disabled"
+                    matTooltip="{{ 'rule-node-config.key-val.remove-mapping-entry' | translate }}"
+                    matTooltipPosition="above">
+              <mat-icon>delete</mat-icon>
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div>
+    <button type="button" mat-stroked-button color="primary" (click)="addKeyVal()">
+      {{ 'rule-node-config.key-val.add-mapping-entry' | translate }}
+    </button>
+  </div>
+  <tb-example-hint [hintText]="hintText" [popupHelpLink]="popupHelpLink" *ngIf="popupHelpLink || hintText"></tb-example-hint>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config.component.scss
new file mode 100644
index 0000000000..132a1f882c
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config.component.scss
@@ -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.
+ */
+:host {
+  .field-space {
+    flex: 1 1 50%;
+  }
+
+  .actions-header {
+    width: 40px
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config.component.ts
new file mode 100644
index 0000000000..f46b5e9923
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/kv-map-config.component.ts
@@ -0,0 +1,235 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, DestroyRef, forwardRef, Injector, Input, OnInit } from '@angular/core';
+import {
+  AbstractControl,
+  ControlValueAccessor,
+  FormArray,
+  FormBuilder,
+  FormGroup,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  NgControl,
+  ValidationErrors,
+  Validator,
+  ValidatorFn,
+  Validators
+} from '@angular/forms';
+import { coerceBoolean } from '@shared/public-api';
+import { isEqual } from '@core/public-api';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-kv-map-config',
+  templateUrl: './kv-map-config.component.html',
+  styleUrls: ['./kv-map-config.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => KvMapConfigComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => KvMapConfigComponent),
+      multi: true,
+    }
+  ]
+})
+export class KvMapConfigComponent implements ControlValueAccessor, OnInit, Validator {
+
+  private propagateChange: (value: any) => void = () => {};
+
+  kvListFormGroup: FormGroup;
+  ngControl: NgControl;
+
+  @Input()
+  @coerceBoolean()
+  disabled = false;
+
+  @Input()
+  @coerceBoolean()
+  uniqueKeyValuePairValidator = false;
+
+  @Input() labelText: string;
+
+  @Input() requiredText: string;
+
+  @Input() keyText: string;
+
+  @Input() keyRequiredText: string;
+
+  @Input() valText: string;
+
+  @Input() valRequiredText: string;
+
+  @Input() hintText: string;
+
+  @Input() popupHelpLink: string;
+
+  @Input()
+  @coerceBoolean()
+  required = false;
+
+  constructor(private injector: Injector,
+              private fb: FormBuilder,
+              private destroyRef: DestroyRef) {
+  }
+
+  ngOnInit(): void {
+    this.ngControl = this.injector.get(NgControl);
+    if (this.ngControl != null) {
+      this.ngControl.valueAccessor = this;
+    }
+
+    this.kvListFormGroup = this.fb.group({
+      keyVals: this.fb.array([])
+    }, {validators: [this.propagateNestedErrors, this.oneMapRequiredValidator]});
+
+    this.kvListFormGroup.valueChanges
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe(() => {
+        this.updateModel();
+      });
+  }
+
+  keyValsFormArray(): FormArray {
+    return this.kvListFormGroup.get('keyVals') as FormArray;
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (this.disabled) {
+      this.kvListFormGroup.disable({emitEvent: false});
+    } else {
+      this.kvListFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  private duplicateValuesValidator: ValidatorFn = (control: FormGroup): ValidationErrors | null =>
+    control.controls.key.value === control.controls.value.value
+      ? control.controls.key.value && control.controls.value.value ? { uniqueKeyValuePair: true } : null
+      : null;
+
+  private oneMapRequiredValidator: ValidatorFn = (control: FormGroup): ValidationErrors | null => control.get('keyVals').value.length;
+
+
+  private propagateNestedErrors: ValidatorFn = (controls: FormArray | FormGroup | AbstractControl): ValidationErrors | null => {
+    if (this.kvListFormGroup && this.kvListFormGroup.get('keyVals') && this.kvListFormGroup.get('keyVals')?.status === 'VALID') {
+      return null;
+    }
+    const errors = {};
+    if (this.kvListFormGroup) {
+      this.kvListFormGroup.setErrors(null);
+    }
+    if (controls instanceof FormArray || controls instanceof FormGroup) {
+      if (controls.errors) {
+        for (const errorKey of Object.keys(controls.errors)) {
+          errors[errorKey] = true;
+        }
+      }
+      for (const control of Object.keys(controls.controls)) {
+        const innerErrors = this.propagateNestedErrors(controls.controls[control]);
+        if (innerErrors && Object.keys(innerErrors).length) {
+          for (const errorKey of Object.keys(innerErrors)) {
+            errors[errorKey] = true;
+          }
+        }
+      }
+      return errors;
+    } else {
+      if (controls.errors) {
+        for (const errorKey of Object.keys(controls.errors)) {
+          errors[errorKey] = true;
+        }
+      }
+    }
+
+    return !isEqual(errors, {}) ? errors : null;
+  };
+
+  writeValue(keyValMap: { [key: string]: string }): void {
+    const keyValuesData = Object.keys(keyValMap).map(key => ({key, value: keyValMap[key]}));
+    if (this.keyValsFormArray().length === keyValuesData.length) {
+      this.keyValsFormArray().patchValue(keyValuesData, {emitEvent: false});
+    } else {
+      const keyValsControls: Array<FormGroup> = [];
+      keyValuesData.forEach(data => {
+        keyValsControls.push(this.fb.group({
+          key: [data.key, [Validators.required, Validators.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],
+          value: [data.value, [Validators.required, Validators.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]
+        }, {validators: this.uniqueKeyValuePairValidator ? [this.duplicateValuesValidator] : []}));
+      });
+      this.kvListFormGroup.setControl('keyVals', this.fb.array(keyValsControls, this.propagateNestedErrors), {emitEvent: false});
+    }
+  }
+
+  public removeKeyVal(index: number) {
+    this.keyValsFormArray().removeAt(index);
+  }
+
+  public addKeyVal() {
+    this.keyValsFormArray().push(this.fb.group({
+      key: ['', [Validators.required, Validators.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],
+      value: ['', [Validators.required, Validators.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]
+    }, {validators: this.uniqueKeyValuePairValidator ? [this.duplicateValuesValidator] : []}));
+  }
+
+  public validate() {
+    const kvList: { key: string; value: string }[] = this.kvListFormGroup.get('keyVals').value;
+    if (!kvList.length && this.required) {
+      return {
+        kvMapRequired: true
+      };
+    }
+    if (!this.kvListFormGroup.valid) {
+      return {
+        kvFieldsRequired: true
+      };
+    }
+    if (this.uniqueKeyValuePairValidator) {
+      for (const kv of kvList) {
+        if (kv.key === kv.value) {
+          return {
+            uniqueKeyValuePair: true
+          };
+        }
+      }
+    }
+    return null;
+  }
+
+  private updateModel() {
+    const kvList: { key: string; value: string }[] = this.kvListFormGroup.get('keyVals').value;
+    if (this.required && !kvList.length || !this.kvListFormGroup.valid) {
+      this.propagateChange(null);
+    } else {
+      const keyValMap: { [key: string]: string } = {};
+      kvList.forEach((entry) => {
+        keyValMap[entry.key] = entry.value;
+      });
+      this.propagateChange(keyValMap);
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/math-function-autocomplete.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/math-function-autocomplete.component.html
new file mode 100644
index 0000000000..eb122fe028
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/math-function-autocomplete.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.
+
+-->
+<mat-form-field [formGroup]="mathFunctionForm" class="mat-block">
+  <mat-label translate>rule-node-config.functions-field-input</mat-label>
+  <input [required]="required"
+         (focusin)="onFocus()"
+         type="text"
+         #operationInput matInput
+         formControlName="operation"
+         [matAutocomplete]="auto">
+  <button *ngIf="mathFunctionForm.get('operation').value"
+          type="button"
+          matSuffix mat-icon-button aria-label="Clear"
+          (click)="clear()">
+    <mat-icon class="material-icons">close</mat-icon>
+  </button>
+  <mat-autocomplete #auto="matAutocomplete" class="tb-autocomplete" [displayWith]="mathFunctionDisplayFn">
+    <mat-option *ngFor="let option of filteredOptions | async" [value]="option.value">
+      <span [innerHTML]="option.value + ' | ' + option.name | highlight:searchText"></span>
+      <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+        {{ option.description }}
+      </small>
+    </mat-option>
+    <mat-option *ngIf="!(filteredOptions | async)?.length" [value]="null">
+      <span translate>rule-node-config.no-option-found</span>
+    </mat-option>
+  </mat-autocomplete>
+</mat-form-field>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/math-function-autocomplete.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/math-function-autocomplete.component.ts
new file mode 100644
index 0000000000..fb34cf4418
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/math-function-autocomplete.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, ElementRef, forwardRef, Input, OnInit, ViewChild } from '@angular/core';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { Observable } from 'rxjs';
+import { TranslateService } from '@ngx-translate/core';
+import { FunctionData, MathFunction, MathFunctionMap } from '../rule-node-config.models';
+import { map, tap } from 'rxjs/operators';
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
+
+@Component({
+  selector: 'tb-math-function-autocomplete',
+  templateUrl: './math-function-autocomplete.component.html',
+  styleUrls: [],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => MathFunctionAutocompleteComponent),
+      multi: true
+    }
+  ]
+})
+export class MathFunctionAutocompleteComponent implements ControlValueAccessor, OnInit {
+
+  private requiredValue: boolean;
+
+  get required(): boolean {
+    return this.requiredValue;
+  }
+
+  @Input()
+  set required(value: boolean) {
+    this.requiredValue = coerceBooleanProperty(value);
+  }
+
+  @Input() disabled: boolean;
+
+  @ViewChild('operationInput', {static: true}) operationInput: ElementRef;
+
+  mathFunctionForm: UntypedFormGroup;
+
+  modelValue: MathFunction | null;
+
+  searchText = '';
+
+  filteredOptions: Observable<FunctionData[]>;
+
+  private dirty = false;
+
+  private mathOperation = [...MathFunctionMap.values()];
+
+  private propagateChange = null;
+
+  constructor(public translate: TranslateService,
+              private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit(): void {
+    this.mathFunctionForm = this.fb.group({
+      operation: ['']
+    });
+    this.filteredOptions = this.mathFunctionForm.get('operation').valueChanges.pipe(
+      tap(value => {
+        let modelValue: MathFunction;
+        if (typeof value === 'string' && MathFunction[value]) {
+          modelValue = MathFunction[value];
+        } else {
+          modelValue = null;
+        }
+        this.updateView(modelValue);
+      }),
+      map(value => {
+        this.searchText = value || '';
+        return value ? this._filter(value) : this.mathOperation.slice();
+      }),
+    );
+  }
+
+  private _filter(searchText: string) {
+    const filterValue = searchText.toLowerCase();
+
+    return this.mathOperation.filter(option => option.name.toLowerCase().includes(filterValue)
+      || option.value.toLowerCase().includes(filterValue));
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (this.disabled) {
+      this.mathFunctionForm.disable({emitEvent: false});
+    } else {
+      this.mathFunctionForm.enable({emitEvent: false});
+    }
+  }
+
+  mathFunctionDisplayFn(value: MathFunction | null) {
+    if (value) {
+      const funcData = MathFunctionMap.get(value)
+      return funcData.value + ' | ' + funcData.name;
+    }
+    return '';
+  }
+
+  writeValue(value: MathFunction | null): void {
+    this.modelValue = value;
+    this.mathFunctionForm.get('operation').setValue(value, {emitEvent: false});
+    this.dirty = true;
+  }
+
+  updateView(value: MathFunction | null) {
+    if (this.modelValue !== value) {
+      this.modelValue = value;
+      this.propagateChange(this.modelValue);
+    }
+  }
+
+  onFocus() {
+    if (this.dirty) {
+      this.mathFunctionForm.get('operation').updateValueAndValidity({onlySelf: true});
+      this.dirty = false;
+    }
+  }
+
+  clear() {
+    this.mathFunctionForm.get('operation').patchValue('');
+    setTimeout(() => {
+      this.operationInput.nativeElement.blur();
+      this.operationInput.nativeElement.focus();
+    }, 0);
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/message-types-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/message-types-config.component.html
new file mode 100644
index 0000000000..174933847e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/message-types-config.component.html
@@ -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.
+
+-->
+<mat-form-field [formGroup]="messageTypeConfigForm" style="width: 100%;">
+  <mat-label *ngIf="label">{{ label }}</mat-label>
+  <mat-chip-grid #chipList [required]="required">
+    <mat-chip-row
+      *ngFor="let messageType of messageTypes"
+      [removable]="true"
+      (removed)="remove(messageType)">
+      {{messageType.name}}
+      <mat-icon matChipRemove>close</mat-icon>
+    </mat-chip-row>
+    <input matInput type="text" placeholder="{{ placeholder | translate }}"
+           #messageTypeInput
+           (focusin)="onFocus()"
+           formControlName="messageType"
+           matAutocompleteOrigin
+           #origin="matAutocompleteOrigin"
+           [matAutocompleteConnectedTo]="origin"
+           [matAutocomplete]="messageTypeAutocomplete"
+           [matChipInputFor]="chipList"
+           [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+           (matChipInputTokenEnd)="add($event)">
+  </mat-chip-grid>
+  <mat-autocomplete #messageTypeAutocomplete="matAutocomplete"
+                    class="tb-autocomplete"
+                    (optionSelected)="selected($event)"
+                    [displayWith]="displayMessageTypeFn">
+    <mat-option *ngFor="let messageType of filteredMessageTypes | async" [value]="messageType">
+      <span [innerHTML]="messageType.name | highlight:searchText"></span>
+    </mat-option>
+    <mat-option *ngIf="(filteredMessageTypes | async)?.length === 0" [value]="null" class="tb-not-found">
+      <div class="tb-not-found-content" (click)="$event.stopPropagation()">
+        <div *ngIf="!textIsNotEmpty(searchText); else searchNotEmpty">
+          <span translate>rule-node-config.no-message-types-found</span>
+        </div>
+        <ng-template #searchNotEmpty>
+                <span>
+                  {{ 'rule-node-config.no-message-type-matching' | translate :
+                  {messageType: truncate.transform(searchText, true, 6, &apos;...&apos;)}
+                  }}
+                </span>
+        </ng-template>
+        <span>
+          <a translate (click)="createMessageType($event, searchText)">rule-node-config.create-new-message-type</a>
+        </span>
+      </div>
+    </mat-option>
+  </mat-autocomplete>
+  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix
+            color="primary"
+            matTooltip="{{ 'rule-node-config.chip-help' | translate: { inputName: 'rule-node-config.message-type' | translate } }}">help</mat-icon>
+  <mat-error *ngIf="chipList.errorState">
+    {{ 'rule-node-config.select-message-types-required' | translate }}
+  </mat-error>
+</mat-form-field>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/message-types-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/message-types-config.component.ts
new file mode 100644
index 0000000000..c5d10a2d25
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/message-types-config.component.ts
@@ -0,0 +1,239 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, ElementRef, forwardRef, Input, OnInit, ViewChild } from '@angular/core';
+import { LinkLabel, MessageType, messageTypeNames, PageComponent, TruncatePipe } from '@shared/public-api';
+import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { MatChipGrid, MatChipInputEvent } from '@angular/material/chips';
+import { MatAutocomplete, MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes';
+import { Observable, of } from 'rxjs';
+import { map, mergeMap, share, startWith } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
+
+@Component({
+  selector: 'tb-message-types-config',
+  templateUrl: './message-types-config.component.html',
+  styleUrls: [],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => MessageTypesConfigComponent),
+      multi: true
+    }
+  ]
+})
+export class MessageTypesConfigComponent extends PageComponent implements ControlValueAccessor, OnInit {
+
+  messageTypeConfigForm: FormGroup;
+
+  private requiredValue: boolean;
+
+  get required(): boolean {
+    return this.requiredValue;
+  }
+
+  @Input()
+  set required(value: boolean) {
+    this.requiredValue = coerceBooleanProperty(value);
+  }
+
+  @Input()
+  label: string;
+
+  @Input()
+  placeholder = 'rule-node-config.add-message-type';
+
+  @Input()
+  disabled: boolean;
+
+  @ViewChild('chipList', {static: false}) chipList: MatChipGrid;
+  @ViewChild('messageTypeAutocomplete', {static: false}) matAutocomplete: MatAutocomplete;
+  @ViewChild('messageTypeInput', {static: false}) messageTypeInput: ElementRef<HTMLInputElement>;
+
+  separatorKeysCodes = [ENTER, COMMA, SEMICOLON];
+
+  filteredMessageTypes: Observable<Array<LinkLabel>>;
+
+  messageTypes: Array<LinkLabel> = [];
+
+  private messageTypesList: Array<LinkLabel> = [];
+
+  searchText = '';
+
+  private propagateChange = (v: any) => { };
+
+  constructor(public translate: TranslateService,
+              public truncate: TruncatePipe,
+              private fb: FormBuilder) {
+    super();
+    this.messageTypeConfigForm = this.fb.group({
+      messageType: [null]
+    });
+    for (const type of Object.keys(MessageType)) {
+      this.messageTypesList.push(
+        {
+          name: messageTypeNames.get(MessageType[type]),
+          value: type
+        }
+      );
+    }
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  ngOnInit() {
+    this.filteredMessageTypes = this.messageTypeConfigForm.get('messageType').valueChanges
+      .pipe(
+        startWith(''),
+        map((value) => value ? value : ''),
+        mergeMap(name => this.fetchMessageTypes(name)),
+        share()
+      );
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (this.disabled) {
+      this.messageTypeConfigForm.disable({emitEvent: false});
+    } else {
+      this.messageTypeConfigForm.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(value: Array<string> | null): void {
+    this.searchText = '';
+    this.messageTypes.length = 0;
+    if (value) {
+      value.forEach((type: string) => {
+        const found = this.messageTypesList.find((messageType => messageType.value === type));
+        if (found) {
+          this.messageTypes.push({
+            name: found.name,
+            value: found.value
+          });
+        } else {
+          this.messageTypes.push({
+            name: type,
+            value: type
+          });
+        }
+      });
+    }
+  }
+
+  displayMessageTypeFn(messageType?: LinkLabel): string | undefined {
+    return messageType ? messageType.name : undefined;
+  }
+
+  textIsNotEmpty(text: string): boolean {
+    return text && text.length > 0;
+  }
+
+  createMessageType($event: Event, value: string) {
+    $event.preventDefault();
+    this.transformMessageType(value);
+  }
+
+  add(event: MatChipInputEvent): void {
+    this.transformMessageType(event.value);
+  }
+
+  private fetchMessageTypes(searchText?: string): Observable<Array<LinkLabel>> {
+    this.searchText = searchText;
+    if (this.searchText && this.searchText.length) {
+      const search = this.searchText.toUpperCase();
+      return of(this.messageTypesList.filter(messageType => messageType.name.toUpperCase().includes(search)));
+    } else {
+      return of(this.messageTypesList);
+    }
+  }
+
+  private transformMessageType(value: string) {
+    if ((value || '').trim()) {
+      let newMessageType: LinkLabel;
+      const messageTypeName = value.trim();
+      const existingMessageType = this.messageTypesList.find(messageType => messageType.name === messageTypeName);
+      if (existingMessageType) {
+        newMessageType = {
+          name: existingMessageType.name,
+          value: existingMessageType.value
+        };
+      } else {
+        newMessageType = {
+          name: messageTypeName,
+          value: messageTypeName
+        };
+      }
+      if (newMessageType) {
+        this.addMessageType(newMessageType);
+      }
+    }
+    this.clear('');
+  }
+
+  remove(messageType: LinkLabel) {
+    const index = this.messageTypes.indexOf(messageType);
+    if (index >= 0) {
+      this.messageTypes.splice(index, 1);
+      this.updateModel();
+    }
+  }
+
+  selected(event: MatAutocompleteSelectedEvent): void {
+    this.addMessageType(event.option.value);
+    this.clear('');
+  }
+
+  addMessageType(messageType: LinkLabel): void {
+    const index = this.messageTypes.findIndex(existingMessageType => existingMessageType.value === messageType.value);
+    if (index === -1) {
+      this.messageTypes.push(messageType);
+      this.updateModel();
+    }
+  }
+
+  onFocus() {
+    this.messageTypeConfigForm.get('messageType').updateValueAndValidity({onlySelf: true, emitEvent: true});
+  }
+
+  clear(value: string = '') {
+    this.messageTypeInput.nativeElement.value = value;
+    this.messageTypeConfigForm.get('messageType').patchValue(null, {emitEvent: true});
+    setTimeout(() => {
+      this.messageTypeInput.nativeElement.blur();
+      this.messageTypeInput.nativeElement.focus();
+    }, 0);
+  }
+
+  private updateModel() {
+    const value = this.messageTypes.map((messageType => messageType.value));
+    if (this.required) {
+      this.chipList.errorState = !value.length;
+      this.propagateChange(value.length > 0 ? value : null);
+    } else {
+      this.chipList.errorState = false;
+      this.propagateChange(value);
+    }
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/msg-metadata-chip.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/msg-metadata-chip.component.html
new file mode 100644
index 0000000000..d3fcba933c
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/msg-metadata-chip.component.html
@@ -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.
+
+-->
+<div [formGroup]="chipControlGroup" class="tb-form-row space-between">
+  <div class="fixed-title-width">{{ labelText }}</div>
+  <mat-chip-listbox formControlName="chipControl">
+    <mat-chip-option *ngFor="let option of selectOptions"
+                     selectable="{{ chipControlGroup.get('chipControl').value !== option.value }}"
+                     color="primary"
+                     [value]="option.value">{{ option.name }}</mat-chip-option>
+  </mat-chip-listbox>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/msg-metadata-chip.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/msg-metadata-chip.component.ts
new file mode 100644
index 0000000000..a8e00a68e4
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/msg-metadata-chip.component.ts
@@ -0,0 +1,90 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, DestroyRef, forwardRef, Input, OnInit } from '@angular/core';
+import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { FetchTo, FetchToTranslation } from '../rule-node-config.models';
+import { TranslateService } from '@ngx-translate/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-msg-metadata-chip',
+  templateUrl: './msg-metadata-chip.component.html',
+  providers: [{
+    provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => MsgMetadataChipComponent),
+    multi: true
+  }]
+})
+
+export class MsgMetadataChipComponent implements OnInit, ControlValueAccessor {
+
+  @Input() labelText: string;
+  @Input() translation: Map<FetchTo, string> = FetchToTranslation;
+
+  private propagateChange: (value: any) => void = () => {};
+
+  public chipControlGroup: FormGroup;
+  public selectOptions = [];
+
+  constructor(private fb: FormBuilder,
+              private translate: TranslateService,
+              private destroyRef: DestroyRef) {}
+
+  ngOnInit(): void {
+    this.initOptions();
+    this.chipControlGroup = this.fb.group({
+      chipControl: [null, []]
+    });
+
+    this.chipControlGroup.get('chipControl').valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe((value) => {
+        if (value) {
+          this.propagateChange(value);
+        }
+      }
+    );
+  }
+
+  initOptions() {
+    for (const key of this.translation.keys()) {
+      this.selectOptions.push({
+        value: key,
+        name: this.translate.instant(this.translation.get(key))
+      });
+    }
+  }
+
+  writeValue(value: string | null): void {
+    this.chipControlGroup.get('chipControl').patchValue(value, {emitEvent: false});
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    if (isDisabled) {
+      this.chipControlGroup.disable({emitEvent: false});
+    } else {
+      this.chipControlGroup.enable({emitEvent: false});
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/output-message-type-autocomplete.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/output-message-type-autocomplete.component.html
new file mode 100644
index 0000000000..83e2547286
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/output-message-type-autocomplete.component.html
@@ -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.
+
+-->
+<section class="tb-form-row no-border no-padding tb-standard-fields column-xs" [formGroup]="messageTypeFormGroup">
+  <mat-form-field class="flex" subscriptSizing="{{ subscriptSizing }}" hideRequiredMarker>
+    <mat-label>{{'rule-node-config.output-message-type' | translate}}</mat-label>
+    <mat-select formControlName="messageTypeAlias">
+      <mat-option *ngFor="let msgType of messageTypes" [value]="msgType">
+        {{msgType.name}}
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
+  <mat-form-field class="flex" subscriptSizing="{{ subscriptSizing }}" [hideRequiredMarker]="messageTypeFormGroup.get('messageType').disabled">
+    <mat-label>{{'rule-node-config.message-type-value' | translate}}</mat-label>
+    <input matInput type="text" formControlName="messageType">
+    <button type="button"
+            matSuffix
+            mat-icon-button
+            aria-label="Copy"
+            *ngIf="messageTypeFormGroup.get('messageType').value"
+            ngxClipboard
+            [cbContent]="messageTypeFormGroup.get('messageType').value"
+            matTooltip="{{ 'rule-node-config.copy-message-type' | translate }}">
+      <mat-icon aria-hidden="false"
+                aria-label="help-icon">content_copy
+      </mat-icon>
+    </button>
+    <mat-error *ngIf="messageTypeFormGroup.get('messageType').hasError('required')">
+      {{ 'rule-node-config.message-type-value-required' | translate }}
+    </mat-error>
+    <mat-error *ngIf="messageTypeFormGroup.get('messageType').hasError('maxlength')">
+      {{ 'rule-node-config.message-type-value-max-length' | translate }}
+    </mat-error>
+  </mat-form-field>
+</section>
+
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/output-message-type-autocomplete.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/output-message-type-autocomplete.component.ts
new file mode 100644
index 0000000000..b824240968
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/output-message-type-autocomplete.component.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 { Component, forwardRef, Input } from '@angular/core';
+import {
+  ControlValueAccessor,
+  FormBuilder,
+  FormGroup,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  Validator,
+  Validators
+} from '@angular/forms';
+import { SubscriptSizing } from '@angular/material/form-field';
+import { coerceBoolean } from '@shared/public-api';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+interface MessageType {
+  name: string;
+  value: string;
+}
+
+@Component({
+  selector: 'tb-output-message-type-autocomplete',
+  templateUrl: './output-message-type-autocomplete.component.html',
+  styleUrls: [],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => OutputMessageTypeAutocompleteComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => OutputMessageTypeAutocompleteComponent),
+      multi: true
+    }
+  ]
+})
+
+export class OutputMessageTypeAutocompleteComponent implements ControlValueAccessor, Validator {
+
+  @Input()
+  subscriptSizing: SubscriptSizing = 'fixed';
+
+  @Input()
+  @coerceBoolean()
+  disabled: boolean;
+
+  @Input()
+  @coerceBoolean()
+  set required(value) {
+    if (this.requiredValue !== value) {
+      this.requiredValue = value;
+      this.updateValidators();
+    }
+  }
+
+  get required() {
+    return this.requiredValue;
+  }
+
+  messageTypeFormGroup: FormGroup;
+
+  messageTypes: MessageType[] = [
+    {
+      name: 'Post attributes',
+      value: 'POST_ATTRIBUTES_REQUEST'
+    },
+    {
+      name: 'Post telemetry',
+      value: 'POST_TELEMETRY_REQUEST'
+    },
+    {
+      name: 'Custom',
+      value: ''
+    },
+  ];
+
+  private modelValue: string | null;
+  private requiredValue: boolean;
+  private propagateChange: (value: any) => void = () => {};
+
+  constructor(private fb: FormBuilder) {
+    this.messageTypeFormGroup = this.fb.group({
+      messageTypeAlias: [null, [Validators.required]],
+      messageType: [{value: null, disabled: true}, [Validators.maxLength(255)]]
+    });
+    this.messageTypeFormGroup.get('messageTypeAlias').valueChanges
+      .pipe(takeUntilDestroyed())
+      .subscribe(value => this.updateMessageTypeValue(value));
+    this.messageTypeFormGroup.valueChanges
+      .pipe(takeUntilDestroyed())
+      .subscribe(() => this.updateView());
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  writeValue(value: string | null): void {
+    this.modelValue = value;
+    let findMessage = this.messageTypes.find(msgType => msgType.value === value);
+    if (!findMessage) {
+      findMessage = this.messageTypes.find(msgType => msgType.value === '');
+    }
+    this.messageTypeFormGroup.get('messageTypeAlias').patchValue(findMessage, {emitEvent: false});
+    this.messageTypeFormGroup.get('messageType').patchValue(value, {emitEvent: false});
+  }
+
+  validate() {
+    if (!this.messageTypeFormGroup.valid) {
+      return {
+        messageTypeInvalid: true
+      };
+    }
+    return null;
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.messageTypeFormGroup.disable({emitEvent: false});
+    } else {
+      this.messageTypeFormGroup.enable({emitEvent: false});
+      if (this.messageTypeFormGroup.get('messageTypeAlias').value?.name !== 'Custom') {
+        this.messageTypeFormGroup.get('messageType').disable({emitEvent: false});
+      }
+    }
+  }
+
+  private updateView() {
+    const value = this.messageTypeFormGroup.getRawValue().messageType;
+    if (this.modelValue !== value) {
+      this.modelValue = value;
+      this.propagateChange(this.modelValue);
+    }
+  }
+
+  private updateValidators() {
+    this.messageTypeFormGroup.get('messageType').setValidators(
+        this.required ? [Validators.required, Validators.maxLength(255)] : [Validators.maxLength(255)]
+    );
+    this.messageTypeFormGroup.get('messageType').updateValueAndValidity({emitEvent: false});
+  }
+
+  private updateMessageTypeValue(choseMessageType: MessageType) {
+    if (choseMessageType?.name !== 'Custom') {
+      this.messageTypeFormGroup.get('messageType').disable({emitEvent: false});
+    } else {
+      this.messageTypeFormGroup.get('messageType').enable({emitEvent: false});
+    }
+    this.messageTypeFormGroup.get('messageType').patchValue(choseMessageType.value ?? null);
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/relations-query-config-old.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/relations-query-config-old.component.html
new file mode 100644
index 0000000000..6fb7a86005
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/relations-query-config-old.component.html
@@ -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.
+
+-->
+<section class="flex flex-col" [formGroup]="relationsQueryFormGroup">
+  <mat-checkbox formControlName="fetchLastLevelOnly">
+    {{ 'alias.last-level-relation' | translate }}
+  </mat-checkbox>
+  <div class="flex flex-row gap-2">
+    <mat-form-field class="mat-block" style="min-width: 100px;">
+      <mat-label translate>relation.direction</mat-label>
+      <mat-select required matInput formControlName="direction">
+        <mat-option *ngFor="let type of directionTypes" [value]="type">
+          {{ directionTypeTranslations.get(type) | translate }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+    <mat-form-field floatLabel="always" class="mat-block flex-1">
+      <mat-label translate>rule-node-config.max-relation-level</mat-label>
+      <input matInput
+             type="number"
+             min="1"
+             step="1"
+             placeholder="{{ 'rule-node-config.unlimited-level' | translate }}"
+             formControlName="maxLevel">
+    </mat-form-field>
+  </div>
+  <div class="mat-caption" style="color: #6e6e6e;" translate>relation.relation-filters</div>
+  <tb-relation-filters
+    formControlName="filters"
+  ></tb-relation-filters>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/relations-query-config-old.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/relations-query-config-old.component.ts
new file mode 100644
index 0000000000..261b2aadc3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/relations-query-config-old.component.ts
@@ -0,0 +1,100 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, DestroyRef, forwardRef, Input, OnInit } from '@angular/core';
+import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
+import { EntitySearchDirection, entitySearchDirectionTranslations, PageComponent } from '@shared/public-api';
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
+import { RelationsQuery } from '../rule-node-config.models';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-relations-query-config-old',
+  templateUrl: './relations-query-config-old.component.html',
+  styleUrls: [],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => RelationsQueryConfigOldComponent),
+      multi: true
+    }
+  ]
+})
+export class RelationsQueryConfigOldComponent extends PageComponent implements ControlValueAccessor, OnInit {
+
+  @Input() disabled: boolean;
+
+  private requiredValue: boolean;
+
+  get required(): boolean {
+    return this.requiredValue;
+  }
+
+  @Input()
+  set required(value: boolean) {
+    this.requiredValue = coerceBooleanProperty(value);
+  }
+
+  directionTypes = Object.keys(EntitySearchDirection);
+  directionTypeTranslations = entitySearchDirectionTranslations;
+
+  relationsQueryFormGroup: FormGroup;
+
+  private propagateChange = null;
+
+  constructor(private fb: FormBuilder,
+              private destroyRef: DestroyRef) {
+    super();
+  }
+
+  ngOnInit(): void {
+    this.relationsQueryFormGroup = this.fb.group({
+      fetchLastLevelOnly: [false, []],
+      direction: [null, [Validators.required]],
+      maxLevel: [null, []],
+      filters: [null]
+    });
+    this.relationsQueryFormGroup.valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe((query: RelationsQuery) => {
+      if (this.relationsQueryFormGroup.valid) {
+        this.propagateChange(query);
+      } else {
+        this.propagateChange(null);
+      }
+    });
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (this.disabled) {
+      this.relationsQueryFormGroup.disable({emitEvent: false});
+    } else {
+      this.relationsQueryFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(query: RelationsQuery): void {
+    this.relationsQueryFormGroup.reset(query || {}, {emitEvent: false});
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/relations-query-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/relations-query-config.component.html
new file mode 100644
index 0000000000..01afac76b6
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/relations-query-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="relationsQueryFormGroup" class="tb-form-panel stroked">
+  <div class="tb-form-panel-title tb-required" translate>rule-node-config.relations-query</div>
+  <section>
+    <div class="flex flex-row gap-4">
+      <mat-form-field class="mat-block max-w-50% flex-full" style="min-width: 100px;" hideRequiredMarker>
+        <mat-label translate>relation.direction</mat-label>
+        <mat-select required formControlName="direction">
+          <mat-option *ngFor="let type of directionTypes" [value]="type">
+            {{ directionTypeTranslations.get(type) | translate }} <span translate>rule-node-config.relations-query-config-direction-suffix</span>
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <mat-form-field floatLabel="always" class="mat-block max-w-50% flex-full">
+        <mat-label translate>rule-node-config.max-relation-level</mat-label>
+        <input matInput
+               type="text"
+               pattern="[0-9]*"
+               min="1"
+               inputmode="numeric"
+               placeholder="{{ 'rule-node-config.unlimited-level' | translate }}"
+               formControlName="maxLevel">
+        <mat-error *ngIf="relationsQueryFormGroup.get('maxLevel').hasError('min')">
+          {{ 'rule-node-config.max-relation-level-error' | translate }}
+        </mat-error>
+        <mat-error *ngIf="relationsQueryFormGroup.get('maxLevel').invalid">
+          {{ 'rule-node-config.max-relation-level-invalid' | translate }}
+        </mat-error>
+      </mat-form-field>
+    </div>
+    <div tb-hint-tooltip-icon="{{ 'rule-node-config.last-level-relation-tooltip' | translate }}"
+         *ngIf="relationsQueryFormGroup.get('maxLevel').value > 1"
+         class="tb-form-row no-border no-padding last-level-slide-toggle">
+      <mat-slide-toggle class="mat-slide" formControlName="fetchLastLevelOnly">
+        {{ 'alias.last-level-relation' | translate }}
+      </mat-slide-toggle>
+    </div>
+  </section>
+  <section [formGroup]="relationsQueryFormGroup" class="tb-form-panel stroked">
+    <div class="tb-form-panel-title" translate>relation.relation-filters</div>
+    <tb-relation-filters
+      formControlName="filters">
+    </tb-relation-filters>
+  </section>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/relations-query-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/relations-query-config.component.ts
new file mode 100644
index 0000000000..5ed0eadbcc
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/relations-query-config.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, DestroyRef, forwardRef, Input, OnInit } from '@angular/core';
+import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
+import { EntitySearchDirection, entitySearchDirectionTranslations, PageComponent } from '@shared/public-api';
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
+import { RelationsQuery } from '../rule-node-config.models';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-relations-query-config',
+  templateUrl: './relations-query-config.component.html',
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => RelationsQueryConfigComponent),
+      multi: true
+    }
+  ]
+})
+export class RelationsQueryConfigComponent extends PageComponent implements ControlValueAccessor, OnInit {
+
+  @Input() disabled: boolean;
+
+  private requiredValue: boolean;
+
+  get required(): boolean {
+    return this.requiredValue;
+  }
+
+  @Input()
+  set required(value: boolean) {
+    this.requiredValue = coerceBooleanProperty(value);
+  }
+
+  directionTypes: Array<EntitySearchDirection> = Object.values(EntitySearchDirection);
+  directionTypeTranslations = entitySearchDirectionTranslations;
+
+  relationsQueryFormGroup: FormGroup;
+
+  private propagateChange = null;
+
+  constructor(private fb: FormBuilder,
+              private destroyRef: DestroyRef) {
+    super();
+  }
+
+  ngOnInit(): void {
+    this.relationsQueryFormGroup = this.fb.group({
+      fetchLastLevelOnly: [false, []],
+      direction: [null, [Validators.required]],
+      maxLevel: [null, [Validators.min(1)]],
+      filters: [null]
+    });
+    this.relationsQueryFormGroup.valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe((query: RelationsQuery) => {
+      if (this.relationsQueryFormGroup.valid) {
+        this.propagateChange(query);
+      } else {
+        this.propagateChange(null);
+      }
+    });
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (this.disabled) {
+      this.relationsQueryFormGroup.disable({emitEvent: false});
+    } else {
+      this.relationsQueryFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(query: RelationsQuery): void {
+    this.relationsQueryFormGroup.reset(query || {}, {emitEvent: false});
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/select-attributes.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/select-attributes.component.html
new file mode 100644
index 0000000000..08de169272
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/select-attributes.component.html
@@ -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.
+
+-->
+<div class="tb-form-panel no-padding no-border" [formGroup]="attributeControlGroup">
+  <tb-example-hint [hintText]="'rule-node-config.kv-map-pattern-hint'"
+                   [popupHelpLink]="popupHelpLink"></tb-example-hint>
+  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable
+                        (focusout)="onTouched()"
+                        [placeholder]="'rule-node-config.add-attribute-key' | translate"
+                        [label]="'rule-node-config.client-attributes' | translate" formControlName="clientAttributeNames">
+    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>
+  </tb-string-items-list>
+  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable
+                        (focusout)="onTouched()"
+                        [placeholder]="'rule-node-config.add-attribute-key' | translate"
+                        [label]="'rule-node-config.shared-attributes' | translate" formControlName="sharedAttributeNames">
+    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>
+  </tb-string-items-list>
+  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable
+                        (focusout)="onTouched()"
+                        [placeholder]="'rule-node-config.add-attribute-key' | translate"
+                        [label]="'rule-node-config.server-attributes' | translate" formControlName="serverAttributeNames">
+    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>
+  </tb-string-items-list>
+  <tb-string-items-list subscriptSizing="dynamic" editable class="mat-block"
+                        (focusout)="onTouched()"
+                        [placeholder]="'rule-node-config.add-telemetry-key' | translate"
+                        [label]="'rule-node-config.latest-telemetry' | translate" formControlName="latestTsKeyNames">
+    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>
+  </tb-string-items-list>
+  <div tb-hint-tooltip-icon="{{ 'rule-node-config.fetch-latest-telemetry-with-timestamp-tooltip' | translate:
+                         { latestTsKeyName:  attributeControlGroup.get('latestTsKeyNames').value[0]} }}"
+       *ngIf="attributeControlGroup.get('latestTsKeyNames').value?.length > 0"
+       class="tb-form-row no-border no-padding">
+    <mat-slide-toggle class="mat-slide" formControlName="getLatestValueWithTs">
+      {{ 'rule-node-config.fetch-latest-telemetry-with-timestamp' | translate }}
+    </mat-slide-toggle>
+  </div>
+</div>
+
+<ng-template #helpIcon>
+  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+            color="primary"
+            matTooltip="{{ 'rule-node-config.chip-help' | translate: { inputName: 'rule-node-config.field-name' | translate } }}">help</mat-icon>
+</ng-template>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/select-attributes.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/select-attributes.component.ts
new file mode 100644
index 0000000000..2bebd875ae
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/select-attributes.component.ts
@@ -0,0 +1,133 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, DestroyRef, forwardRef, Input, OnInit } from '@angular/core';
+import {
+  ControlValueAccessor,
+  FormBuilder,
+  FormGroup,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  ValidationErrors,
+  ValidatorFn,
+  Validators
+} from '@angular/forms';
+import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes';
+import { TranslateService } from '@ngx-translate/core';
+import { isDefinedAndNotNull } from '@core/public-api';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-select-attributes',
+  templateUrl: './select-attributes.component.html',
+  styleUrls: [],
+  providers: [{
+    provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => SelectAttributesComponent),
+    multi: true
+  }, {
+    provide: NG_VALIDATORS,
+    useExisting: SelectAttributesComponent,
+    multi: true
+  }]
+})
+
+export class SelectAttributesComponent implements OnInit, ControlValueAccessor {
+
+  private propagateChange = (v: any) => { };
+
+  public attributeControlGroup: FormGroup;
+  public separatorKeysCodes = [ENTER, COMMA, SEMICOLON];
+  public onTouched = () => {};
+
+  @Input() popupHelpLink: string;
+
+  constructor(public translate: TranslateService,
+              private fb: FormBuilder,
+              private destroyRef: DestroyRef) {
+  }
+
+  ngOnInit(): void {
+    this.attributeControlGroup = this.fb.group({
+      clientAttributeNames: [[], []],
+      sharedAttributeNames: [[], []],
+      serverAttributeNames: [[], []],
+      latestTsKeyNames: [[], []],
+      getLatestValueWithTs: [false, []]
+    }, {
+      validators: this.atLeastOne(Validators.required, ['clientAttributeNames', 'sharedAttributeNames',
+        'serverAttributeNames', 'latestTsKeyNames'])
+    });
+
+    this.attributeControlGroup.valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe((value) => {
+      this.propagateChange(this.preparePropagateValue(value));
+    });
+  }
+
+  private preparePropagateValue(propagateValue: {[key: string]: string[] | boolean | null}): {[key: string]: string[] | boolean } {
+    const formatValue = {};
+    for (const key in propagateValue) {
+      if (key === 'getLatestValueWithTs') {
+        formatValue[key] = propagateValue[key];
+      } else {
+        formatValue[key] = isDefinedAndNotNull(propagateValue[key]) ? propagateValue[key] : [];
+      }
+    }
+
+    return formatValue;
+  };
+
+  validate() {
+    if (this.attributeControlGroup.valid) {
+      return null;
+    } else {
+      return {atLeastOneRequired: true};
+    }
+  }
+
+  private atLeastOne(validator: ValidatorFn, controls: string[] = null) {
+    return (group: FormGroup): ValidationErrors | null => {
+      if (!controls) {
+        controls = Object.keys(group.controls);
+      }
+      const hasAtLeastOne = group?.controls && controls.some(k => !validator(group.controls[k]));
+
+      return hasAtLeastOne ? null : {atLeastOne: true};
+    };
+  }
+
+  writeValue(value): void {
+    this.attributeControlGroup.setValue(value, {emitEvent: false});
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(fn: any): void {
+    this.onTouched = fn;
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    if (isDisabled) {
+      this.attributeControlGroup.disable({emitEvent: false});
+    } else {
+      this.attributeControlGroup.enable({emitEvent: false});
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/sv-map-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/sv-map-config.component.html
new file mode 100644
index 0000000000..21ed014ec3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/sv-map-config.component.html
@@ -0,0 +1,70 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="svListFormGroup" class="tb-form-panel stroked">
+  <div class="tb-form-row no-padding no-border space-between">
+    <div class="tb-form-panel-title">{{ labelText }}</div>
+    <div class="tb-form-panel-hint tb-error" translate *ngIf="svListFormGroup.hasError('required')">
+      rule-node-config.map-fields-required
+    </div>
+    <div class="tb-form-panel-hint tb-error" translate *ngIf="svListFormGroup.hasError('svMapRequired')">
+      {{ requiredText }}
+    </div>
+  </div>
+  <div class="tb-form-panel no-border no-padding">
+    <div class="tb-form-table">
+      <div class="tb-form-table-header">
+        <div class="tb-form-table-header-cell field-space">{{ selectText }}</div>
+        <div class="tb-form-table-header-cell field-space">{{ valText }}</div>
+        <div class="tb-form-table-header-cell actions-header"></div>
+      </div>
+      <div class="tb-form-table-body">
+        <div class="tb-form-table-row"
+             *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index;">
+          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">
+            <mat-select [placeholder]="selectText" [formControl]="keyValControl.get('key')" required>
+              <mat-option *ngFor="let option of filterSelectOptions(keyValControl)" [value]="option.value">
+                {{option.name}}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">
+            <input [placeholder]="valText" [formControl]="keyValControl.get('value')" matInput/>
+          </mat-form-field>
+          <div class="tb-form-table-row-cell-buttons">
+            <button [class.tb-hidden]="keyValsFormArray().controls.length === 1"
+                    type="button"
+                    mat-icon-button
+                    (click)="removeKeyVal($index)"
+                    [disabled]="isLoading$ | async"
+                    matTooltip="{{ 'rule-node-config.key-val.remove-mapping-entry' | translate }}"
+                    matTooltipPosition="above">
+              <mat-icon>delete</mat-icon>
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div>
+    <button [disabled]="(isLoading$ | async) || keyValsFormArray().length >= selectOptions.length"
+            type="button" mat-stroked-button color="primary" (click)="addKeyVal()">
+      {{ 'rule-node-config.key-val.add-mapping-entry' | translate }}
+    </button>
+  </div>
+  <tb-example-hint [hintText]="hintText" [popupHelpLink]="popupHelpLink"></tb-example-hint>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/sv-map-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/common/sv-map-config.component.scss
new file mode 100644
index 0000000000..132a1f882c
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/sv-map-config.component.scss
@@ -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.
+ */
+:host {
+  .field-space {
+    flex: 1 1 50%;
+  }
+
+  .actions-header {
+    width: 40px
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/sv-map-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/sv-map-config.component.ts
new file mode 100644
index 0000000000..0a836fc508
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/sv-map-config.component.ts
@@ -0,0 +1,254 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, DestroyRef, forwardRef, Injector, Input, OnInit } from '@angular/core';
+import {
+  AbstractControl,
+  ControlValueAccessor,
+  FormArray,
+  FormBuilder,
+  FormGroup,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  NgControl,
+  ValidationErrors,
+  Validator,
+  ValidatorFn,
+  Validators
+} from '@angular/forms';
+import { coerceBoolean, PageComponent } from '@shared/public-api';
+import { isDefinedAndNotNull, isEqual } from '@core/public-api';
+import { TranslateService } from '@ngx-translate/core';
+import { OriginatorFieldsMappingValues, SvMapOption } from '../rule-node-config.models';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-sv-map-config',
+  templateUrl: './sv-map-config.component.html',
+  styleUrls: ['./sv-map-config.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => SvMapConfigComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => SvMapConfigComponent),
+      multi: true,
+    }
+  ]
+})
+export class SvMapConfigComponent extends PageComponent implements ControlValueAccessor, OnInit, Validator {
+
+  private propagateChange = null;
+
+  svListFormGroup: FormGroup;
+  ngControl: NgControl;
+
+  @Input() selectOptions: SvMapOption[];
+
+  @Input()
+  @coerceBoolean()
+  disabled = false;
+
+  @Input() labelText: string;
+
+  @Input() requiredText: string;
+
+  @Input() targetKeyPrefix: string;
+
+  @Input() selectText: string;
+
+  @Input() selectRequiredText: string;
+
+  @Input() valText: string;
+
+  @Input() valRequiredText: string;
+
+  @Input() hintText: string;
+
+  @Input() popupHelpLink: string;
+
+  @Input()
+  @coerceBoolean()
+  required = false;
+
+  constructor(public translate: TranslateService,
+              private injector: Injector,
+              private fb: FormBuilder,
+              private destroyRef: DestroyRef) {
+    super();
+  }
+
+  ngOnInit(): void {
+    this.ngControl = this.injector.get(NgControl);
+    if (this.ngControl != null) {
+      this.ngControl.valueAccessor = this;
+    }
+
+    this.svListFormGroup = this.fb.group({
+      keyVals: this.fb.array([])
+    }, {validators: [this.propagateNestedErrors, this.oneMapRequiredValidator]});
+
+    this.svListFormGroup.valueChanges
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe(() => {
+        this.updateModel();
+      });
+  }
+
+  keyValsFormArray(): FormArray {
+    return this.svListFormGroup.get('keyVals') as FormArray;
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (this.disabled) {
+      this.svListFormGroup.disable({emitEvent: false});
+    } else {
+      this.svListFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  private oneMapRequiredValidator: ValidatorFn = (control: FormGroup): ValidationErrors | null => control.get('keyVals').value.length;
+
+  private propagateNestedErrors: ValidatorFn = (controls: FormArray | FormGroup | AbstractControl): ValidationErrors | null => {
+    if (this.svListFormGroup && this.svListFormGroup.get('keyVals') && this.svListFormGroup.get('keyVals')?.status === 'VALID') {
+      return null;
+    }
+    const errors = {};
+    if (this.svListFormGroup) {this.svListFormGroup.setErrors(null);}
+    if (controls instanceof FormArray || controls instanceof FormGroup) {
+      if (controls.errors) {
+        for (const errorKey of Object.keys(controls.errors)) {
+          errors[errorKey] = true;
+        }
+      }
+      for (const control of Object.keys(controls.controls)) {
+        const innerErrors = this.propagateNestedErrors(controls.controls[control]);
+        if (innerErrors && Object.keys(innerErrors).length) {
+          for (const errorKey of Object.keys(innerErrors)) {
+            errors[errorKey] = true;
+          }
+        }
+      }
+      return errors;
+    } else {
+      if (controls.errors) {
+        for (const errorKey of Object.keys(controls.errors)) {
+          errors[errorKey] = true;
+        }
+      }
+    }
+    return !isEqual(errors, {}) ? errors : null;
+  };
+
+  writeValue(keyValMap: { [key: string]: string }): void {
+    const keyValuesData = Object.keys(keyValMap).map(key => ({key, value: keyValMap[key]}));
+    if (this.keyValsFormArray().length === keyValuesData.length) {
+      this.keyValsFormArray().patchValue(keyValuesData, {emitEvent: false})
+    } else {
+      const keyValsControls: Array<FormGroup> = [];
+      keyValuesData.forEach(data => {
+        keyValsControls.push(this.fb.group({
+          key: [data.key, [Validators.required, ]],
+          value: [data.value, [Validators.required, Validators.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]
+        }));
+      });
+      this.svListFormGroup.setControl('keyVals', this.fb.array(keyValsControls, this.propagateNestedErrors), {emitEvent: false});
+      for (const formGroup of this.keyValsFormArray().controls) {
+        this.keyChangeSubscribe(formGroup as FormGroup);
+      }
+    }
+  }
+
+  public filterSelectOptions(keyValControl?: AbstractControl) {
+    const deleteFieldsArray = [];
+    for (const fieldMap of this.svListFormGroup.get('keyVals').value) {
+      const findDeleteField = this.selectOptions.find((field) => field.value === fieldMap.key);
+      if (findDeleteField) {
+        deleteFieldsArray.push(findDeleteField);
+      }
+    }
+
+    const filterSelectOptions = [];
+    for (const selectOption of this.selectOptions) {
+      if (!isDefinedAndNotNull(deleteFieldsArray.find((deleteField) => deleteField.value === selectOption.value)) ||
+        selectOption.value === keyValControl?.get('key').value) {
+        filterSelectOptions.push(selectOption);
+      }
+    }
+
+    return filterSelectOptions;
+  }
+
+  public removeKeyVal(index: number) {
+    this.keyValsFormArray().removeAt(index);
+  }
+
+  public addKeyVal() {
+    this.keyValsFormArray().push(this.fb.group({
+      key: ['', [Validators.required]],
+      value: ['', [Validators.required, Validators.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]
+    }));
+    this.keyChangeSubscribe(this.keyValsFormArray().at(this.keyValsFormArray().length - 1) as FormGroup);
+  }
+
+  private keyChangeSubscribe(formGroup: FormGroup) {
+    formGroup.get('key').valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe((value) => {
+      const mappedValue = OriginatorFieldsMappingValues.get(value);
+      formGroup.get('value').patchValue(this.targetKeyPrefix + mappedValue[0].toUpperCase() + mappedValue.slice(1));
+    });
+  }
+
+  public validate() {
+    const svList: { key: string; value: string }[] = this.svListFormGroup.get('keyVals').value;
+    if (!svList.length && this.required) {
+      return {
+        svMapRequired: true
+      };
+    }
+    if (!this.svListFormGroup.valid) {
+      return {
+        svFieldsRequired: true
+      };
+    }
+    return null;
+  }
+
+  private updateModel() {
+    const svList: { key: string; value: string }[] = this.svListFormGroup.get('keyVals').value;
+    if (this.required && !svList.length || !this.svListFormGroup.valid) {
+      this.propagateChange(null);
+    } else {
+      const keyValMap: { [key: string]: string } = {};
+      svList.forEach((entry) => {
+        keyValMap[entry.key] = entry.value;
+      });
+      this.propagateChange(keyValMap);
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/time-unit-input.component.html b/ui-ngx/src/app/modules/home/components/rule-node/common/time-unit-input.component.html
new file mode 100644
index 0000000000..8fe112f62c
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/time-unit-input.component.html
@@ -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.
+
+-->
+<section [formGroup]="timeInputForm" class="flex gap-4">
+  <mat-form-field class="max-w-66% flex-full" subscriptSizing="dynamic">
+    <mat-label *ngIf="labelText">{{ labelText }}</mat-label>
+    <input type="number" min="0" step="1" matInput formControlName="time">
+    <div matSuffix>
+      <ng-content select="[matSuffix]"></ng-content>
+    </div>
+    <mat-hint *ngIf="subscriptSizing === 'fixed'"></mat-hint>
+    <mat-error *ngIf="timeInputForm.get('time').hasError('required') && requiredText">
+      {{ requiredText }}
+    </mat-error>
+    <mat-error *ngIf="timeInputForm.get('time').hasError('min') && minErrorText">
+      {{ minErrorText }}
+    </mat-error>
+    <mat-error *ngIf="timeInputForm.get('time').hasError('max') && maxErrorText">
+      {{ maxErrorText }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="h-fit max-w-33% flex-full" [subscriptSizing]="subscriptSizing">
+    <mat-label translate>rule-node-config.units</mat-label>
+    <mat-select formControlName="timeUnit">
+      @for (timeUnit of timeUnits; track timeUnit) {
+        <mat-option [value]="timeUnit">{{ timeUnitTranslations.get(timeUnit) | translate }}</mat-option>
+      }
+    </mat-select>
+  </mat-form-field>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/common/time-unit-input.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/common/time-unit-input.component.ts
new file mode 100644
index 0000000000..11358ae6eb
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/common/time-unit-input.component.ts
@@ -0,0 +1,199 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, DestroyRef, forwardRef, Input, OnInit } from '@angular/core';
+import {
+  AbstractControl,
+  ControlValueAccessor,
+  FormBuilder,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  ValidationErrors,
+  Validator,
+  Validators
+} from '@angular/forms';
+import { TimeUnit, timeUnitTranslations } from '../rule-node-config.models';
+import { isDefinedAndNotNull, isNumeric } from '@core/utils';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { coerceBoolean, coerceNumber } from '@shared/decorators/coercion';
+import { DAY, HOUR, MINUTE, SECOND } from '@shared/models/time/time.models';
+import { SubscriptSizing } from '@angular/material/form-field';
+
+interface TimeUnitInputModel {
+  time: number;
+  timeUnit: TimeUnit
+}
+
+@Component({
+  selector: 'tb-time-unit-input',
+  templateUrl: './time-unit-input.component.html',
+  providers: [{
+    provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => TimeUnitInputComponent),
+    multi: true
+  },{
+    provide: NG_VALIDATORS,
+    useExisting: forwardRef(() => TimeUnitInputComponent),
+    multi: true
+  }]
+})
+export class TimeUnitInputComponent implements ControlValueAccessor, Validator, OnInit {
+
+  @Input()
+  labelText: string;
+
+  @Input()
+  @coerceBoolean()
+  required: boolean;
+
+  @Input()
+  requiredText: string;
+
+  @Input()
+  @coerceNumber()
+  minTime = 0;
+
+  @Input()
+  minErrorText: string;
+
+  @Input()
+  @coerceNumber()
+  maxTime: number;
+
+  @Input()
+  maxErrorText: string;
+
+  @Input()
+  subscriptSizing: SubscriptSizing = 'fixed';
+
+  timeUnits = Object.values(TimeUnit).filter(item => item !== TimeUnit.MILLISECONDS) as TimeUnit[];
+
+  timeUnitTranslations = timeUnitTranslations;
+
+  timeInputForm = this.fb.group({
+    time: [0],
+    timeUnit: [TimeUnit.SECONDS]
+  });
+
+  private timeIntervalsInSec = new Map<TimeUnit, number>([
+    [TimeUnit.DAYS, DAY/SECOND],
+    [TimeUnit.HOURS, HOUR/SECOND],
+    [TimeUnit.MINUTES, MINUTE/SECOND],
+    [TimeUnit.SECONDS, SECOND/SECOND],
+  ]);
+
+  private modelValue: number;
+
+  private propagateChange: (value: any) => void = () => {};
+
+  constructor(private fb: FormBuilder,
+              private destroyRef: DestroyRef) {
+  }
+
+  ngOnInit() {
+    if(this.required || this.maxTime) {
+      const timeControl = this.timeInputForm.get('time');
+      const validators = [Validators.pattern(/^\d*$/)];
+      if (this.required) {
+        validators.push(Validators.required);
+      }
+      if (this.maxTime) {
+        validators.push((control: AbstractControl) =>
+          Validators.max(Math.floor(this.maxTime / this.timeIntervalsInSec.get(this.timeInputForm.get('timeUnit').value)))(control)
+        );
+      }
+      if (isDefinedAndNotNull(this.minTime)) {
+        validators.push(Validators.min(this.minTime));
+      }
+
+      timeControl.setValidators(validators);
+      timeControl.updateValueAndValidity({ emitEvent: false });
+    }
+
+    this.timeInputForm.get('timeUnit').valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(() => {
+      this.timeInputForm.get('time').updateValueAndValidity({onlySelf: true});
+      this.timeInputForm.get('time').markAsTouched({onlySelf: true});
+    });
+
+    this.timeInputForm.valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(value => {
+      this.updatedModel(value);
+    });
+  }
+
+  registerOnChange(fn: any) {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any) {
+  }
+
+  setDisabledState(isDisabled: boolean) {
+    if (isDisabled) {
+      this.timeInputForm.disable({emitEvent: false});
+    } else {
+      this.timeInputForm.enable({emitEvent: false});
+      if(this.timeInputForm.invalid) {
+        setTimeout(() => this.updatedModel(this.timeInputForm.value, true))
+      }
+    }
+  }
+
+  writeValue(sec: number) {
+    if (sec !== this.modelValue) {
+      if (isDefinedAndNotNull(sec) && isNumeric(sec) && Number(sec) !== 0) {
+        this.timeInputForm.patchValue(this.parseTime(sec), {emitEvent: false});
+        this.modelValue = sec;
+      } else {
+        this.timeInputForm.patchValue({
+          time: 0,
+          timeUnit: TimeUnit.SECONDS
+        }, {emitEvent: false});
+        this.modelValue = 0;
+      }
+    }
+  }
+
+  validate(): ValidationErrors | null {
+    return this.timeInputForm.valid ? null : {
+      timeInput: false
+    };
+  }
+
+  private updatedModel(value: Partial<TimeUnitInputModel>, forceUpdated = false) {
+    const time = value.time * this.timeIntervalsInSec.get(value.timeUnit);
+    if (this.modelValue !== time || forceUpdated) {
+      this.modelValue = time;
+      this.propagateChange(time);
+    }
+  }
+
+  private parseTime(value: number): TimeUnitInputModel {
+    for (const [timeUnit, timeValue] of this.timeIntervalsInSec) {
+      const calc = value / timeValue;
+      if (Number.isInteger(calc)) {
+        return {
+          time: calc,
+          timeUnit: timeUnit
+        }
+      }
+    }
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/empty-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/empty-config.component.ts
new file mode 100644
index 0000000000..48f350157f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/empty-config.component.ts
@@ -0,0 +1,42 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-node-empty-config',
+  template: '<div></div>',
+  styleUrls: []
+})
+export class EmptyConfigComponent extends RuleNodeConfigurationComponent {
+
+  emptyConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.emptyConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.emptyConfigForm = this.fb.group({});
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/calculate-delta-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/calculate-delta-config.component.html
new file mode 100644
index 0000000000..6d9924f4f8
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/calculate-delta-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="calculateDeltaConfigForm">
+  <div class="gt-sm:flex gt-sm:flex-row gt-sm:gap-5.5">
+    <mat-form-field class="mat-block flex-1">
+      <mat-label>{{ 'rule-node-config.input-value-key' | translate }}</mat-label>
+      <input matInput formControlName="inputValueKey">
+      <mat-error *ngIf="calculateDeltaConfigForm.get('inputValueKey').hasError('required') ||
+      calculateDeltaConfigForm.get('inputValueKey').hasError('pattern')">
+        {{ 'rule-node-config.input-value-key-required' | translate }}
+      </mat-error>
+    </mat-form-field>
+    <mat-form-field class="mat-block flex-1">
+      <mat-label>{{ 'rule-node-config.output-value-key' | translate }}</mat-label>
+      <input matInput formControlName="outputValueKey">
+      <mat-error *ngIf="calculateDeltaConfigForm.get('outputValueKey').hasError('required') ||
+      calculateDeltaConfigForm.get('outputValueKey').hasError('pattern')">
+        {{ 'rule-node-config.output-value-key-required' | translate }}
+      </mat-error>
+    </mat-form-field>
+  </div>
+  <mat-form-field class="mat-block flex-1">
+    <mat-label>{{ 'rule-node-config.number-of-digits-after-floating-point' | translate }}</mat-label>
+    <input type="number" min="0" max="15" step="1" matInput formControlName="round">
+    <mat-error *ngIf="calculateDeltaConfigForm.get('round').hasError('min')">
+      {{ 'rule-node-config.number-of-digits-after-floating-point-range' | translate }}
+    </mat-error>
+    <mat-error *ngIf="calculateDeltaConfigForm.get('round').hasError('max')">
+      {{ 'rule-node-config.number-of-digits-after-floating-point-range' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <div class="tb-form-panel no-padding no-border">
+    <div tb-hint-tooltip-icon="{{ 'rule-node-config.failure-if-delta-negative-tooltip' | translate }}"
+         class="tb-form-row same-padding">
+      <mat-slide-toggle class="mat-slide margin" formControlName="tellFailureIfDeltaIsNegative">
+        {{ 'rule-node-config.failure-if-delta-negative' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div tb-hint-tooltip-icon="{{ 'rule-node-config.use-caching-tooltip' | translate :
+                       { inputValueKey: calculateDeltaConfigForm.get('inputValueKey').valid ?
+                                calculateDeltaConfigForm.get('inputValueKey').value : 'rule-node-config.input-value-key' | translate } }}"
+         class="tb-form-row same-padding">
+      <mat-slide-toggle class="mat-slide margin" formControlName="useCache">
+        {{ 'rule-node-config.use-caching' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div class="tb-form-panel stroked" [class.no-padding-bottom]="calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value">
+      <div tb-hint-tooltip-icon="{{ 'rule-node-config.add-time-difference-between-readings-tooltip' | translate:
+                           { periodValueKey: (calculateDeltaConfigForm.get('periodValueKey').valid &&
+                           calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value) ? calculateDeltaConfigForm.get('periodValueKey').value :
+                           'periodInMs' } }}"
+           class="tb-form-row no-border no-padding">
+        <mat-slide-toggle class="mat-slide" formControlName="addPeriodBetweenMsgs">
+          {{ 'rule-node-config.add-time-difference-between-readings' | translate:
+          { inputValueKey: calculateDeltaConfigForm.get('inputValueKey').valid ?
+                     calculateDeltaConfigForm.get('inputValueKey').value : 'rule-node-config.input-value-key' | translate } }}
+        </mat-slide-toggle>
+      </div>
+      <mat-form-field class="mat-block" *ngIf="calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value">
+        <mat-label>{{ 'rule-node-config.period-value-key' | translate }}</mat-label>
+        <input required matInput formControlName="periodValueKey">
+        <mat-error *ngIf="calculateDeltaConfigForm.get('periodValueKey').hasError('required')">
+          {{ 'rule-node-config.period-value-key-required' | translate }}
+        </mat-error>
+      </mat-form-field>
+    </div>
+    <div tb-hint-tooltip-icon="{{ calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value ? ('rule-node-config.exclude-zero-deltas-time-difference-hint'  | translate :{
+            outputValueKey: calculateDeltaConfigForm.get('outputValueKey').valid ? calculateDeltaConfigForm.get('outputValueKey').value : 'rule-node-config.output-value-key' | translate,
+            periodValueKey: calculateDeltaConfigForm.get('periodValueKey').valid ? calculateDeltaConfigForm.get('periodValueKey').value : 'rule-node-config.period-value-key' | translate
+            }) : ('rule-node-config.exclude-zero-deltas-hint' | translate :{ outputValueKey: calculateDeltaConfigForm.get('outputValueKey').valid ? calculateDeltaConfigForm.get('outputValueKey').value : 'rule-node-config.output-value-key' | translate }) }}"
+         class="tb-form-row same-padding">
+      <mat-slide-toggle class="mat-slide margin" formControlName="excludeZeroDeltas">
+        {{ 'rule-node-config.exclude-zero-deltas' | translate }}
+      </mat-slide-toggle>
+    </div>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/calculate-delta-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/calculate-delta-config.component.ts
new file mode 100644
index 0000000000..1721b5dfb0
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/calculate-delta-config.component.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 { Component } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes';
+import { TranslateService } from '@ngx-translate/core';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+import { deepTrim, isDefinedAndNotNull } from '@app/core/utils';
+
+@Component({
+  selector: 'tb-enrichment-node-calculate-delta-config',
+  templateUrl: './calculate-delta-config.component.html'
+})
+export class CalculateDeltaConfigComponent extends RuleNodeConfigurationComponent {
+
+  calculateDeltaConfigForm: FormGroup;
+
+  separatorKeysCodes = [ENTER, COMMA, SEMICOLON];
+
+  constructor(public translate: TranslateService,
+              private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.calculateDeltaConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.calculateDeltaConfigForm = this.fb.group({
+      inputValueKey: [configuration.inputValueKey, [Validators.required, Validators.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],
+      outputValueKey: [configuration.outputValueKey, [Validators.required, Validators.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],
+      useCache: [configuration.useCache, []],
+      addPeriodBetweenMsgs: [configuration.addPeriodBetweenMsgs, []],
+      periodValueKey: [configuration.periodValueKey, []],
+      round: [configuration.round, [Validators.min(0), Validators.max(15)]],
+      tellFailureIfDeltaIsNegative: [configuration.tellFailureIfDeltaIsNegative, []],
+      excludeZeroDeltas: [configuration.excludeZeroDeltas, []]
+    });
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      inputValueKey: isDefinedAndNotNull(configuration?.inputValueKey) ? configuration.inputValueKey : null,
+      outputValueKey: isDefinedAndNotNull(configuration?.outputValueKey) ? configuration.outputValueKey : null,
+      useCache: isDefinedAndNotNull(configuration?.useCache) ? configuration.useCache : true,
+      addPeriodBetweenMsgs: isDefinedAndNotNull(configuration?.addPeriodBetweenMsgs) ? configuration.addPeriodBetweenMsgs : false,
+      periodValueKey: isDefinedAndNotNull(configuration?.periodValueKey) ? configuration.periodValueKey : null,
+      round: isDefinedAndNotNull(configuration?.round) ? configuration.round : null,
+      tellFailureIfDeltaIsNegative: isDefinedAndNotNull(configuration?.tellFailureIfDeltaIsNegative) ?
+        configuration.tellFailureIfDeltaIsNegative : true,
+      excludeZeroDeltas: isDefinedAndNotNull(configuration?.excludeZeroDeltas) ? configuration.excludeZeroDeltas : false
+    };
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return deepTrim(configuration);
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const addPeriodBetweenMsgs: boolean = this.calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value;
+    if (addPeriodBetweenMsgs) {
+      this.calculateDeltaConfigForm.get('periodValueKey').setValidators([Validators.required]);
+    } else {
+      this.calculateDeltaConfigForm.get('periodValueKey').setValidators([]);
+    }
+    this.calculateDeltaConfigForm.get('periodValueKey').updateValueAndValidity({emitEvent});
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['addPeriodBetweenMsgs'];
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/customer-attributes-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/customer-attributes-config.component.html
new file mode 100644
index 0000000000..20377be84b
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/customer-attributes-config.component.html
@@ -0,0 +1,46 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="customerAttributesConfigForm" class="tb-form-panel stroked">
+  <div class="tb-form-panel-title" translate>rule-node-config.mapping-of-customers</div>
+  <div class="flex flex-1 items-center justify-center">
+    <div class="fetch-to-data-toggle">
+      <tb-toggle-select class="fetch-to-data-toggle" formControlName="dataToFetch" appearance="fill">
+        <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">
+          {{ data.name }}
+        </tb-toggle-option>
+      </tb-toggle-select>
+    </div>
+  </div>
+  <tb-kv-map-config
+    required
+    formControlName="dataMapping"
+    [requiredText]="'rule-node-config.attr-mapping-required' | translate"
+    [labelText]="selectTranslation('rule-node-config.latest-telemetry-mapping','rule-node-config.attributes-mapping') | translate"
+    [keyText]="selectTranslation('rule-node-config.source-telemetry','rule-node-config.source-attribute') | translate"
+    [keyRequiredText]="selectTranslation('rule-node-config.source-telemetry-required','rule-node-config.source-attribute-required') | translate"
+    [valText]="'rule-node-config.target-key' | translate"
+    [valRequiredText]="'rule-node-config.target-key-required' | translate"
+    [hintText]="'rule-node-config.kv-map-pattern-hint'"
+    popupHelpLink="rulenode/customer_attributes_node_fields_templatization">
+  </tb-kv-map-config>
+  <tb-msg-metadata-chip
+    [labelText]="customerAttributesConfigForm.get('dataToFetch').value === DataToFetch.LATEST_TELEMETRY ?
+    ('rule-node-config.add-mapped-latest-telemetry-to' | translate) : ('rule-node-config.add-mapped-attribute-to' | translate)"
+    formControlName="fetchTo">
+  </tb-msg-metadata-chip>
+</section>
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/AwsSqsTbQueueMsgMetadata.java b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/customer-attributes-config.component.scss
similarity index 64%
rename from common/queue/src/main/java/org/thingsboard/server/queue/sqs/AwsSqsTbQueueMsgMetadata.java
rename to ui-ngx/src/app/modules/home/components/rule-node/enrichment/customer-attributes-config.component.scss
index 8d13a543d3..aea1da60f3 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/AwsSqsTbQueueMsgMetadata.java
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/customer-attributes-config.component.scss
@@ -13,16 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.queue.sqs;
-
-import com.amazonaws.http.SdkHttpMetadata;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import org.thingsboard.server.queue.TbQueueMsgMetadata;
+:host {
+  .fetch-to-data-toggle {
+    max-width: 420px;
+    width: 100%;
+  }
+}
 
-@Data
-@AllArgsConstructor
-public class AwsSqsTbQueueMsgMetadata implements TbQueueMsgMetadata {
 
-    private final SdkHttpMetadata metadata;
-}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/customer-attributes-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/customer-attributes-config.component.ts
new file mode 100644
index 0000000000..3eabe0ab4f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/customer-attributes-config.component.ts
@@ -0,0 +1,100 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { deepTrim, isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { DataToFetch, dataToFetchTranslations, FetchTo } from '@home/components/rule-node/rule-node-config.models';
+
+@Component({
+  selector: 'tb-enrichment-node-customer-attributes-config',
+  templateUrl: './customer-attributes-config.component.html',
+  styleUrls: ['./customer-attributes-config.component.scss']
+})
+export class CustomerAttributesConfigComponent extends RuleNodeConfigurationComponent {
+
+  customerAttributesConfigForm: FormGroup;
+
+  public fetchToData = [];
+
+  constructor(private fb: FormBuilder,
+              private translate: TranslateService) {
+    super();
+    for (const key of dataToFetchTranslations.keys()) {
+      if (key !== DataToFetch.FIELDS) {
+        this.fetchToData.push({
+          value: key,
+          name: this.translate.instant(dataToFetchTranslations.get(key as DataToFetch))
+        });
+      }
+    }
+  }
+
+  protected configForm(): FormGroup {
+    return this.customerAttributesConfigForm;
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    const filteDataMapping = {};
+    for (const key of Object.keys(configuration.dataMapping)) {
+      filteDataMapping[key.trim()] = configuration.dataMapping[key];
+    }
+    configuration.dataMapping = filteDataMapping;
+    return deepTrim(configuration);
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    let dataToFetch: DataToFetch;
+    if (isDefinedAndNotNull(configuration?.telemetry)) {
+      dataToFetch = configuration.telemetry ? DataToFetch.LATEST_TELEMETRY : DataToFetch.ATTRIBUTES;
+    } else {
+      dataToFetch = isDefinedAndNotNull(configuration?.dataToFetch) ? configuration.dataToFetch : DataToFetch.ATTRIBUTES;
+    }
+
+    let dataMapping;
+    if (isDefinedAndNotNull(configuration?.attrMapping)) {
+      dataMapping = configuration.attrMapping;
+    } else {
+      dataMapping = isDefinedAndNotNull(configuration?.dataMapping) ? configuration.dataMapping : null;
+    }
+
+    return {
+      dataToFetch,
+      dataMapping,
+      fetchTo: isDefinedAndNotNull(configuration?.fetchTo) ? configuration.fetchTo : FetchTo.METADATA
+    };
+  }
+
+  public selectTranslation(latestTelemetryTranslation: string, attributesTranslation: string) {
+    if (this.customerAttributesConfigForm.get('dataToFetch').value === DataToFetch.LATEST_TELEMETRY) {
+      return latestTelemetryTranslation;
+    } else {
+      return attributesTranslation;
+    }
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.customerAttributesConfigForm = this.fb.group({
+      dataToFetch: [configuration.dataToFetch, []],
+      dataMapping: [configuration.dataMapping, [Validators.required]],
+      fetchTo: [configuration.fetchTo]
+    });
+  }
+
+  protected readonly DataToFetch = DataToFetch;
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/device-attributes-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/device-attributes-config.component.html
new file mode 100644
index 0000000000..f2c33cf0b5
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/device-attributes-config.component.html
@@ -0,0 +1,46 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="deviceAttributesConfigForm" class="tb-form-panel no-padding no-border">
+  <div class="tb-form-panel stroked no-padding-bottom">
+    <div class="tb-form-panel-title" translate>rule-node-config.device-relations-query</div>
+    <tb-device-relations-query-config
+      required
+      formControlName="deviceRelationsQuery">
+    </tb-device-relations-query-config>
+  </div>
+  <div class="tb-form-panel stroked">
+    <div class="tb-form-row no-padding no-border space-between">
+      <div class="tb-form-panel-title tb-required" translate>rule-node-config.related-device-attributes</div>
+      <div class="tb-form-panel-hint tb-error" translate
+           [hidden]="!(deviceAttributesConfigForm.get('attributesControl').touched &&
+                        deviceAttributesConfigForm.get('attributesControl').hasError('atLeastOneRequired'))">
+        rule-node-config.at-least-one-field-required
+      </div>
+    </div>
+    <tb-select-attributes formControlName="attributesControl"
+                          popupHelpLink="rulenode/related_device_attributes_node_fields_templatization"></tb-select-attributes>
+    <tb-msg-metadata-chip formControlName="fetchTo"
+                          [labelText]="'rule-node-config.add-selected-attributes-to' | translate"></tb-msg-metadata-chip>
+  </div>
+  <div tb-hint-tooltip-icon="{{ 'rule-node-config.tell-failure-tooltip' | translate }}"
+       class="tb-form-row same-padding">
+    <mat-slide-toggle class="mat-slide margin" formControlName="tellFailureIfAbsent">
+      {{ 'rule-node-config.tell-failure' | translate }}
+    </mat-slide-toggle>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/device-attributes-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/device-attributes-config.component.ts
new file mode 100644
index 0000000000..876e672b13
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/device-attributes-config.component.ts
@@ -0,0 +1,77 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { isDefinedAndNotNull, isObject } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { FetchTo } from '@home/components/rule-node/rule-node-config.models';
+
+@Component({
+  selector: 'tb-enrichment-node-device-attributes-config',
+  templateUrl: './device-attributes-config.component.html',
+  styleUrls: []
+})
+export class DeviceAttributesConfigComponent extends RuleNodeConfigurationComponent {
+
+  deviceAttributesConfigForm: FormGroup;
+
+  constructor(public translate: TranslateService,
+              private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.deviceAttributesConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.deviceAttributesConfigForm = this.fb.group({
+      deviceRelationsQuery: [configuration.deviceRelationsQuery, [Validators.required]],
+      tellFailureIfAbsent: [configuration.tellFailureIfAbsent, []],
+      fetchTo: [configuration.fetchTo, []],
+      attributesControl: [configuration.attributesControl, []]
+    });
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    if (isObject(configuration)) {
+      configuration.attributesControl = {
+        clientAttributeNames: isDefinedAndNotNull(configuration?.clientAttributeNames) ? configuration.clientAttributeNames : [],
+        latestTsKeyNames: isDefinedAndNotNull(configuration?.latestTsKeyNames) ? configuration.latestTsKeyNames : [],
+        serverAttributeNames: isDefinedAndNotNull(configuration?.serverAttributeNames) ? configuration.serverAttributeNames : [],
+        sharedAttributeNames: isDefinedAndNotNull(configuration?.sharedAttributeNames) ? configuration.sharedAttributeNames : [],
+        getLatestValueWithTs: isDefinedAndNotNull(configuration?.getLatestValueWithTs) ? configuration.getLatestValueWithTs : false,
+      };
+    }
+
+    return {
+      deviceRelationsQuery: isDefinedAndNotNull(configuration?.deviceRelationsQuery) ? configuration.deviceRelationsQuery : null,
+      tellFailureIfAbsent: isDefinedAndNotNull(configuration?.tellFailureIfAbsent) ? configuration.tellFailureIfAbsent : true,
+      fetchTo: isDefinedAndNotNull(configuration?.fetchTo) ? configuration.fetchTo : FetchTo.METADATA,
+      attributesControl: configuration ? configuration.attributesControl : null
+    };
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    for (const key of Object.keys(configuration.attributesControl)) {
+      configuration[key] = configuration.attributesControl[key];
+    }
+    delete configuration.attributesControl;
+    return configuration;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/enrichment-rule-node-core.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/enrichment-rule-node-core.module.ts
new file mode 100644
index 0000000000..a20f387e34
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/enrichment-rule-node-core.module.ts
@@ -0,0 +1,64 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '@shared/public-api';
+import { CustomerAttributesConfigComponent } from './customer-attributes-config.component';
+import { CommonRuleNodeConfigModule } from '../common/common-rule-node-config.module';
+import { EntityDetailsConfigComponent } from './entity-details-config.component';
+import { DeviceAttributesConfigComponent } from './device-attributes-config.component';
+import { OriginatorAttributesConfigComponent } from './originator-attributes-config.component';
+import { OriginatorFieldsConfigComponent } from './originator-fields-config.component';
+import { GetTelemetryFromDatabaseConfigComponent } from './get-telemetry-from-database-config.component';
+import { RelatedAttributesConfigComponent } from './related-attributes-config.component';
+import { TenantAttributesConfigComponent } from './tenant-attributes-config.component';
+import { CalculateDeltaConfigComponent } from './calculate-delta-config.component';
+import { FetchDeviceCredentialsConfigComponent } from './fetch-device-credentials-config.component';
+
+@NgModule({
+  declarations: [
+    CustomerAttributesConfigComponent,
+    EntityDetailsConfigComponent,
+    DeviceAttributesConfigComponent,
+    OriginatorAttributesConfigComponent,
+    OriginatorFieldsConfigComponent,
+    GetTelemetryFromDatabaseConfigComponent,
+    RelatedAttributesConfigComponent,
+    TenantAttributesConfigComponent,
+    CalculateDeltaConfigComponent,
+    FetchDeviceCredentialsConfigComponent
+  ],
+  imports: [
+    CommonModule,
+    SharedModule,
+    CommonRuleNodeConfigModule
+  ],
+  exports: [
+    CustomerAttributesConfigComponent,
+    EntityDetailsConfigComponent,
+    DeviceAttributesConfigComponent,
+    OriginatorAttributesConfigComponent,
+    OriginatorFieldsConfigComponent,
+    GetTelemetryFromDatabaseConfigComponent,
+    RelatedAttributesConfigComponent,
+    TenantAttributesConfigComponent,
+    CalculateDeltaConfigComponent,
+    FetchDeviceCredentialsConfigComponent
+  ]
+})
+export class EnrichmentRuleNodeCoreModule {
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/entity-details-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/entity-details-config.component.html
new file mode 100644
index 0000000000..07fc97a716
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/entity-details-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="entityDetailsConfigForm">
+  <tb-string-items-list [predefinedValues]="predefinedValues"
+                        class="mat-block" required
+                        [label]="'rule-node-config.select-details' | translate"
+                        [placeholder]="'rule-node-config.add-detail' | translate"
+                        [requiredText]="'rule-node-config.entity-details-list-empty' | translate"
+                        formControlName="detailsList">
+    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+              color="primary"
+              matTooltip="{{ 'rule-node-config.chip-help' | translate: { inputName: 'rule-node-config.detail' | translate } }}">
+      help
+    </mat-icon>
+  </tb-string-items-list>
+  <tb-msg-metadata-chip
+    [labelText]="'rule-node-config.add-selected-details-to' | translate"
+    formControlName="fetchTo">
+  </tb-msg-metadata-chip>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/entity-details-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/entity-details-config.component.ts
new file mode 100644
index 0000000000..808eaf35b2
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/entity-details-config.component.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 { Component, OnInit } from '@angular/core';
+import { isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import {
+  EntityDetailsField,
+  entityDetailsTranslations,
+  FetchTo
+} from '@home/components/rule-node/rule-node-config.models';
+
+@Component({
+  selector: 'tb-enrichment-node-entity-details-config',
+  templateUrl: './entity-details-config.component.html',
+  styleUrls: []
+})
+
+export class EntityDetailsConfigComponent extends RuleNodeConfigurationComponent implements OnInit {
+
+  entityDetailsConfigForm: FormGroup;
+
+  public predefinedValues = [];
+
+  constructor(public translate: TranslateService,
+              private fb: FormBuilder) {
+    super();
+    for (const field of Object.keys(EntityDetailsField)) {
+      this.predefinedValues.push({
+        value: EntityDetailsField[field],
+        name: this.translate.instant(entityDetailsTranslations.get(EntityDetailsField[field]))
+      });
+    }
+  }
+
+  ngOnInit() {
+    super.ngOnInit();
+  }
+
+  protected configForm(): FormGroup {
+    return this.entityDetailsConfigForm;
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    let fetchTo: FetchTo;
+    if (isDefinedAndNotNull(configuration?.addToMetadata)) {
+      if (configuration.addToMetadata) {
+        fetchTo = FetchTo.METADATA;
+      } else {
+        fetchTo = FetchTo.DATA;
+      }
+    } else {
+      if (configuration?.fetchTo) {
+        fetchTo = configuration.fetchTo;
+      } else {
+        fetchTo = FetchTo.DATA;
+      }
+    }
+
+    return {
+      detailsList: isDefinedAndNotNull(configuration?.detailsList) ? configuration.detailsList : null,
+      fetchTo
+    };
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.entityDetailsConfigForm = this.fb.group({
+      detailsList: [configuration.detailsList, [Validators.required]],
+      fetchTo: [configuration.fetchTo, []]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/shared/components/json-form/json-form.component.html b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/fetch-device-credentials-config.component.html
similarity index 69%
rename from ui-ngx/src/app/shared/components/json-form/json-form.component.html
rename to ui-ngx/src/app/modules/home/components/rule-node/enrichment/fetch-device-credentials-config.component.html
index 0ed848ded5..aa210dfcc1 100644
--- a/ui-ngx/src/app/shared/components/json-form/json-form.component.html
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/fetch-device-credentials-config.component.html
@@ -15,9 +15,9 @@
     limitations under the License.
 
 -->
-<div class="tb-json-form" style="background: #fff;" tb-fullscreen [fullscreenElement]="reactFullscreen"
-     [fullscreen]="isFullscreen"
-     (fullscreenChanged)="onFullscreenChanged($event)">
-  <div #reactRoot></div>
-  <div class="tb-json-form" #reactFullscreen></div>
-</div>
+<section [formGroup]="fetchDeviceCredentialsConfigForm">
+  <tb-msg-metadata-chip
+    [labelText]="'rule-node-config.fetch-credentials-to' | translate"
+    formControlName="fetchTo">
+  </tb-msg-metadata-chip>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/fetch-device-credentials-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/fetch-device-credentials-config.component.ts
new file mode 100644
index 0000000000..1b16674566
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/fetch-device-credentials-config.component.ts
@@ -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 { Component } from '@angular/core';
+import { isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+import { FetchTo } from '@home/components/rule-node/rule-node-config.models';
+
+@Component({
+  selector: 'tb-enrichment-node-fetch-device-credentials-config',
+  templateUrl: './fetch-device-credentials-config.component.html'
+})
+
+export class FetchDeviceCredentialsConfigComponent extends RuleNodeConfigurationComponent {
+
+  fetchDeviceCredentialsConfigForm: FormGroup;
+
+  constructor(private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.fetchDeviceCredentialsConfigForm;
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      fetchTo: isDefinedAndNotNull(configuration?.fetchTo) ? configuration.fetchTo : FetchTo.METADATA
+    };
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.fetchDeviceCredentialsConfigForm = this.fb.group({
+      fetchTo: [configuration.fetchTo, []]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/get-telemetry-from-database-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/get-telemetry-from-database-config.component.html
new file mode 100644
index 0000000000..6dafe65457
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/get-telemetry-from-database-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="getTelemetryFromDatabaseConfigForm" class="tb-form-panel no-padding no-border">
+  <tb-string-items-list class="mat-block" editable [placeholder]="'rule-node-config.add-timeseries-key' | translate"
+                        subscriptSizing="dynamic" required
+                        [requiredText]="'rule-node-config.timeseries-keys-required' | translate"
+                        [label]="'rule-node-config.timeseries-keys' | translate" formControlName="latestTsKeyNames"
+                        [hint]="'rule-node-config.general-pattern-hint' | translate">
+    <div matHintEnd class="see-example" tb-help-popup="{{'rulenode/originator_telemetry_node_fields_templatization'}}"
+         hintMode
+         tb-help-popup-placement="right"
+         trigger-style="letter-spacing:0.25px; font-size:12px"
+         [tb-help-popup-style]="{maxWidth: '820px'}"
+         trigger-text="{{ 'rule-node-config.key-val.see-examples' | translate }}"></div>
+    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" color="primary"
+              matTooltip="{{ 'rule-node-config.chip-help' | translate: { inputName: 'rule-node-config.timeseries-key' | translate } }}">help
+    </mat-icon>
+  </tb-string-items-list>
+  <div class="tb-form-panel stroked">
+    <div class="tb-form-panel-title" translate>rule-node-config.fetch-interval</div>
+    <div tb-hint-tooltip-icon="{{ 'rule-node-config.use-metadata-dynamic-interval-tooltip' | translate }}"
+         class="tb-form-row no-border no-padding">
+      <mat-slide-toggle class="mat-slide" formControlName="useMetadataIntervalPatterns">
+        {{ 'rule-node-config.use-metadata-dynamic-interval' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div formGroupName="interval" class="flex flex-col"
+         *ngIf="getTelemetryFromDatabaseConfigForm.get('useMetadataIntervalPatterns').value === false; else intervalPattern">
+      <div class="flex flex-col gap-0 gt-sm:flex-row gt-sm:gap-4">
+        <mat-form-field class="mat-block gt-sm:max-w-50% gt-sm:flex-full">
+          <mat-label>{{ 'rule-node-config.interval-start' | translate }}</mat-label>
+          <input type="number" step="1" min="1" max="2147483647" matInput formControlName="startInterval" required>
+          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get('interval.startInterval').hasError('required')">
+            {{ 'rule-node-config.start-interval-value-required' | translate }}
+          </mat-error>
+          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get('interval.startInterval').hasError('min')">
+            {{ 'rule-node-config.time-value-range' | translate }}
+          </mat-error>
+          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get('interval.startInterval').hasError('max')">
+            {{ 'rule-node-config.time-value-range' | translate }}
+          </mat-error>
+        </mat-form-field>
+        <mat-form-field class="mat-block gt-sm:max-w-50% gt-sm:flex-full" hideRequiredMarker>
+          <mat-label>{{ 'rule-node-config.time-unit' | translate }}</mat-label>
+          <mat-select formControlName="startIntervalTimeUnit" required>
+            <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">
+              {{ timeUnitsTranslationMap.get(timeUnit) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div class="flex flex-col gap-0 gt-sm:flex-row gt-sm:gap-4">
+        <mat-form-field class="mat-block gt-sm:max-w-50% gt-sm:flex-full">
+          <mat-label>{{ 'rule-node-config.interval-end' | translate }}</mat-label>
+          <input type="number" step="1" min="1" max="2147483647" matInput formControlName="endInterval" required>
+          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get('interval.endInterval').hasError('required')">
+            {{ 'rule-node-config.end-interval-value-required' | translate }}
+          </mat-error>
+          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get('interval.endInterval').hasError('min')">
+            {{ 'rule-node-config.time-value-range' | translate }}
+          </mat-error>
+          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get('interval.endInterval').hasError('max')">
+            {{ 'rule-node-config.time-value-range' | translate }}
+          </mat-error>
+        </mat-form-field>
+        <mat-form-field class="mat-block gt-sm:max-w-50% gt-sm:flex-full" hideRequiredMarker>
+          <mat-label>{{ 'rule-node-config.time-unit' | translate }}</mat-label>
+          <mat-select formControlName="endIntervalTimeUnit" required>
+            <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">
+              {{ timeUnitsTranslationMap.get(timeUnit) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div class="description-block tb-primary-fill" [class.error]="getTelemetryFromDatabaseConfigForm.get('interval').invalid">
+        <mat-icon class="description-icon">error_outline</mat-icon>
+        <div class="description-text">
+          <ng-container *ngIf="getTelemetryFromDatabaseConfigForm.get('interval').valid; else invalidText">
+            {{ 'rule-node-config.fetch-timeseries-from-to' | translate:
+            {
+              startInterval: getTelemetryFromDatabaseConfigForm.get('interval.startInterval').value,
+              endInterval: getTelemetryFromDatabaseConfigForm.get('interval.endInterval').value,
+              startIntervalTimeUnit: getTelemetryFromDatabaseConfigForm.get('interval.startIntervalTimeUnit').value.toLowerCase(),
+              endIntervalTimeUnit: getTelemetryFromDatabaseConfigForm.get('interval.endIntervalTimeUnit').value.toLowerCase()
+            } }}
+          </ng-container>
+          <ng-template #invalidText>
+            {{ "rule-node-config.fetch-timeseries-from-to-invalid" | translate }}
+          </ng-template>
+        </div>
+      </div>
+    </div>
+    <ng-template #intervalPattern>
+      <div class="input-block flex flex-col">
+        <mat-form-field class="mat-block flex-1">
+          <mat-label>{{ 'rule-node-config.start-interval' | translate }}</mat-label>
+          <input matInput formControlName="startIntervalPattern" required>
+          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get('startIntervalPattern').hasError('required') ||
+            getTelemetryFromDatabaseConfigForm.get('startIntervalPattern').hasError('pattern')">
+            {{ 'rule-node-config.start-interval-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+        <mat-form-field class="mat-block flex-1">
+          <mat-label>{{ 'rule-node-config.end-interval' | translate }}</mat-label>
+          <input matInput formControlName="endIntervalPattern" required>
+          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get('endIntervalPattern').hasError('required') ||
+          getTelemetryFromDatabaseConfigForm.get('endIntervalPattern').hasError('pattern')">
+            {{ 'rule-node-config.end-interval-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+        <tb-example-hint [hintText]="'rule-node-config.metadata-dynamic-interval-hint'"
+                         popupHelpLink="rulenode/originator_telemetry_node_fields_templatization">
+        </tb-example-hint>
+      </div>
+    </ng-template>
+  </div>
+  <div class="tb-form-panel stroked">
+    <div class="tb-form-panel-title" translate>rule-node-config.fetch-strategy</div>
+    <div class="tb-form-panel no-border no-padding item-center">
+      <div class="fetch-mod-toggle">
+        <tb-toggle-select formControlName="fetchMode" appearance="fill">
+          <tb-toggle-option *ngFor="let data of headerOptions" [value]="data.value">
+            {{ data.name }}
+          </tb-toggle-option>
+        </tb-toggle-select>
+      </div>
+      <div class="tb-form-hint tb-primary-fill hint-container">
+        {{ deduplicationStrategiesHintTranslations.get(getTelemetryFromDatabaseConfigForm.get('fetchMode').value) | translate }}
+      </div>
+    </div>
+    <div *ngIf="getTelemetryFromDatabaseConfigForm.get('fetchMode').value === fetchMode.ALL">
+      <mat-form-field class="mat-block" hideRequiredMarker
+                      [subscriptSizing]="defaultPaddingEnable() ? 'fixed' : 'dynamic'">
+        <mat-label>{{ 'aggregation.function' | translate }}</mat-label>
+        <mat-select formControlName="aggregation" required>
+          <mat-option *ngFor="let aggregation of aggregations" [value]="aggregation">
+            {{ aggregationTypesTranslations.get(aggregationTypes[aggregation]) | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <div *ngIf="getTelemetryFromDatabaseConfigForm.get('aggregation').value === aggregationTypes.NONE">
+        <mat-form-field class="mat-block" hideRequiredMarker>
+          <mat-label> {{ "rule-node-config.order-by-timestamp" | translate }} </mat-label>
+          <mat-select formControlName="orderBy" required>
+            <mat-option *ngFor="let order of samplingOrders" [value]="order">
+              {{ samplingOrdersTranslate.get(order) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-form-field class="mat-block">
+          <mat-label>{{ "rule-node-config.limit" | translate }}</mat-label>
+          <input type="number" min="2" max="1000" step="1" matInput formControlName="limit" required>
+          <mat-hint>{{ "rule-node-config.limit-hint" | translate }}</mat-hint>
+          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get('limit').hasError('required')">
+            {{ 'rule-node-config.limit-required' | translate }}
+          </mat-error>
+          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get('limit').hasError('min')">
+            {{ 'rule-node-config.limit-range' | translate }}
+          </mat-error>
+          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get('limit').hasError('max')">
+            {{ 'rule-node-config.limit-range' | translate }}
+          </mat-error>
+        </mat-form-field>
+      </div>
+    </div>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/get-telemetry-from-database-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/get-telemetry-from-database-config.component.scss
new file mode 100644
index 0000000000..f1fe8725e3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/get-telemetry-from-database-config.component.scss
@@ -0,0 +1,66 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+:host {
+
+  .see-example {
+    display: inline-block;
+  }
+
+  .description-block {
+    display: flex;
+    align-items: center;
+    border-radius: 6px;
+    border: 1px solid #EAEAEA;
+
+    .description-icon {
+      font-size: 24px;
+      height: 24px;
+      min-height: 24px;
+      width: 24px;
+      min-width: 24px;
+      line-height: 24px;
+      color: #D9D9D9;
+      margin: 4px;
+    }
+
+    .description-text {
+      font-size: 12px;
+      line-height: 16px;
+      letter-spacing: 0.25px;
+      margin: 6px;
+    }
+
+    &.error {
+      color: var(--mdc-theme-error, #f44336);
+
+      .description-icon {
+        color: var(--mdc-theme-error, #f44336);
+      }
+    }
+  }
+  .item-center {
+    align-items: center;
+
+    .fetch-mod-toggle {
+      width: 100%;
+    }
+  }
+
+  .hint-container {
+    width: 100%;
+  }
+}
+
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/get-telemetry-from-database-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/get-telemetry-from-database-config.component.ts
new file mode 100644
index 0000000000..13aeae87ed
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/get-telemetry-from-database-config.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 { Component } from '@angular/core';
+import { deepTrim, isDefinedAndNotNull, isObject } from '@core/public-api';
+import { AbstractControl, FormBuilder, FormGroup, ValidationErrors, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { aggregationTranslations, AggregationType } from '@app/shared/models/time/time.models';
+import {
+  deduplicationStrategiesHintTranslations,
+  deduplicationStrategiesTranslations,
+  FetchMode,
+  SamplingOrder,
+  samplingOrderTranslations,
+  TimeUnit,
+  timeUnitTranslations
+} from '../rule-node-config.models';
+
+@Component({
+  selector: 'tb-enrichment-node-get-telemetry-from-database',
+  templateUrl: './get-telemetry-from-database-config.component.html',
+  styleUrls: ['./get-telemetry-from-database-config.component.scss']
+})
+export class GetTelemetryFromDatabaseConfigComponent extends RuleNodeConfigurationComponent {
+
+  getTelemetryFromDatabaseConfigForm: FormGroup;
+
+  aggregationTypes = AggregationType;
+  aggregations: Array<AggregationType> = Object.values(AggregationType);
+  aggregationTypesTranslations = aggregationTranslations;
+
+  fetchMode = FetchMode;
+
+  samplingOrders: Array<SamplingOrder> = Object.values(SamplingOrder);
+  samplingOrdersTranslate = samplingOrderTranslations;
+
+  timeUnits: Array<TimeUnit> = Object.values(TimeUnit);
+  timeUnitsTranslationMap = timeUnitTranslations;
+
+  public deduplicationStrategiesHintTranslations = deduplicationStrategiesHintTranslations;
+
+  headerOptions = [];
+
+
+  timeUnitMap = {
+    [TimeUnit.MILLISECONDS]: 1,
+    [TimeUnit.SECONDS]: 1000,
+    [TimeUnit.MINUTES]: 60000,
+    [TimeUnit.HOURS]: 3600000,
+    [TimeUnit.DAYS]: 86400000,
+  };
+
+  constructor(public translate: TranslateService,
+              private fb: FormBuilder) {
+    super();
+    for (const key of deduplicationStrategiesTranslations.keys()) {
+      this.headerOptions.push({
+        value: key,
+        name: this.translate.instant(deduplicationStrategiesTranslations.get(key))
+      });
+    }
+  }
+
+  protected configForm(): FormGroup {
+    return this.getTelemetryFromDatabaseConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.getTelemetryFromDatabaseConfigForm = this.fb.group({
+      latestTsKeyNames: [configuration.latestTsKeyNames, [Validators.required]],
+      aggregation: [configuration.aggregation, [Validators.required]],
+      fetchMode: [configuration.fetchMode, [Validators.required]],
+      orderBy: [configuration.orderBy, []],
+      limit: [configuration.limit, []],
+      useMetadataIntervalPatterns: [configuration.useMetadataIntervalPatterns, []],
+      interval: this.fb.group({
+        startInterval: [configuration.interval.startInterval, []],
+        startIntervalTimeUnit: [configuration.interval.startIntervalTimeUnit, []],
+        endInterval: [configuration.interval.endInterval, []],
+        endIntervalTimeUnit: [configuration.interval.endIntervalTimeUnit, []],
+      }),
+      startIntervalPattern: [configuration.startIntervalPattern, []],
+      endIntervalPattern: [configuration.endIntervalPattern, []],
+    });
+  }
+
+
+  private intervalValidator = () => (control: AbstractControl): ValidationErrors | null => {
+    if (control.get('startInterval').value * this.timeUnitMap[control.get('startIntervalTimeUnit').value] <=
+      control.get('endInterval').value * this.timeUnitMap[control.get('endIntervalTimeUnit').value]) {
+      return {intervalError: true};
+    } else {
+      return null;
+    }
+  };
+
+
+  protected validatorTriggers(): string[] {
+    return ['fetchMode', 'useMetadataIntervalPatterns'];
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    configuration.startInterval = configuration.interval.startInterval;
+    configuration.startIntervalTimeUnit = configuration.interval.startIntervalTimeUnit;
+    configuration.endInterval = configuration.interval.endInterval;
+    configuration.endIntervalTimeUnit = configuration.interval.endIntervalTimeUnit;
+    delete configuration.interval;
+    return deepTrim(configuration);
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    if (isObject(configuration)) {
+      configuration.interval = {
+        startInterval: configuration.startInterval,
+        startIntervalTimeUnit: configuration.startIntervalTimeUnit,
+        endInterval: configuration.endInterval,
+        endIntervalTimeUnit: configuration.endIntervalTimeUnit
+      };
+    }
+
+    return {
+      latestTsKeyNames: isDefinedAndNotNull(configuration?.latestTsKeyNames) ? configuration.latestTsKeyNames : null,
+      aggregation: isDefinedAndNotNull(configuration?.aggregation) ? configuration.aggregation : AggregationType.NONE,
+      fetchMode: isDefinedAndNotNull(configuration?.fetchMode) ? configuration.fetchMode : FetchMode.FIRST,
+      orderBy: isDefinedAndNotNull(configuration?.orderBy) ? configuration.orderBy : SamplingOrder.ASC,
+      limit: isDefinedAndNotNull(configuration?.limit) ? configuration.limit : 1000,
+      useMetadataIntervalPatterns: isDefinedAndNotNull(configuration?.useMetadataIntervalPatterns) ?
+        configuration.useMetadataIntervalPatterns : false,
+      interval: {
+        startInterval: isDefinedAndNotNull(configuration?.interval?.startInterval) ? configuration.interval.startInterval : 2,
+        startIntervalTimeUnit: isDefinedAndNotNull(configuration?.interval?.startIntervalTimeUnit) ?
+          configuration.interval.startIntervalTimeUnit : TimeUnit.MINUTES,
+        endInterval: isDefinedAndNotNull(configuration?.interval?.endInterval) ? configuration.interval.endInterval : 1,
+        endIntervalTimeUnit: isDefinedAndNotNull(configuration?.interval?.endIntervalTimeUnit) ?
+          configuration.interval.endIntervalTimeUnit : TimeUnit.MINUTES,
+      },
+      startIntervalPattern: isDefinedAndNotNull(configuration?.startIntervalPattern) ? configuration.startIntervalPattern : null,
+      endIntervalPattern: isDefinedAndNotNull(configuration?.endIntervalPattern) ? configuration.endIntervalPattern : null
+    };
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const fetchMode: FetchMode = this.getTelemetryFromDatabaseConfigForm.get('fetchMode').value;
+    const useMetadataIntervalPatterns: boolean = this.getTelemetryFromDatabaseConfigForm.get('useMetadataIntervalPatterns').value;
+    if (fetchMode && fetchMode === FetchMode.ALL) {
+      this.getTelemetryFromDatabaseConfigForm.get('aggregation').setValidators([Validators.required]);
+      this.getTelemetryFromDatabaseConfigForm.get('orderBy').setValidators([Validators.required]);
+      this.getTelemetryFromDatabaseConfigForm.get('limit').setValidators([Validators.required, Validators.min(2), Validators.max(1000)]);
+    } else {
+      this.getTelemetryFromDatabaseConfigForm.get('aggregation').setValidators([]);
+      this.getTelemetryFromDatabaseConfigForm.get('orderBy').setValidators([]);
+      this.getTelemetryFromDatabaseConfigForm.get('limit').setValidators([]);
+    }
+    if (useMetadataIntervalPatterns) {
+      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([Validators.required,
+        Validators.pattern(/(?:.|\s)*\S(&:.|\s)*/)]);
+      this.getTelemetryFromDatabaseConfigForm.get('endIntervalPattern').setValidators([Validators.required,
+        Validators.pattern(/(?:.|\s)*\S(&:.|\s)*/)]);
+    } else {
+      this.getTelemetryFromDatabaseConfigForm.get('interval.startInterval').setValidators([Validators.required,
+        Validators.min(1), Validators.max(2147483647)]);
+      this.getTelemetryFromDatabaseConfigForm.get('interval.startIntervalTimeUnit').setValidators([Validators.required]);
+      this.getTelemetryFromDatabaseConfigForm.get('interval.endInterval').setValidators([Validators.required,
+        Validators.min(1), Validators.max(2147483647)]);
+      this.getTelemetryFromDatabaseConfigForm.get('interval.endIntervalTimeUnit').setValidators([Validators.required]);
+      this.getTelemetryFromDatabaseConfigForm.get('interval').setValidators([this.intervalValidator()]);
+      this.getTelemetryFromDatabaseConfigForm.get('startIntervalPattern').setValidators([]);
+      this.getTelemetryFromDatabaseConfigForm.get('endIntervalPattern').setValidators([]);
+    }
+    this.getTelemetryFromDatabaseConfigForm.get('aggregation').updateValueAndValidity({emitEvent});
+    this.getTelemetryFromDatabaseConfigForm.get('orderBy').updateValueAndValidity({emitEvent});
+    this.getTelemetryFromDatabaseConfigForm.get('limit').updateValueAndValidity({emitEvent});
+    this.getTelemetryFromDatabaseConfigForm.get('interval.startInterval').updateValueAndValidity({emitEvent});
+    this.getTelemetryFromDatabaseConfigForm.get('interval.startIntervalTimeUnit').updateValueAndValidity({emitEvent});
+    this.getTelemetryFromDatabaseConfigForm.get('interval.endInterval').updateValueAndValidity({emitEvent});
+    this.getTelemetryFromDatabaseConfigForm.get('interval.endIntervalTimeUnit').updateValueAndValidity({emitEvent});
+    this.getTelemetryFromDatabaseConfigForm.get('interval').updateValueAndValidity({emitEvent});
+    this.getTelemetryFromDatabaseConfigForm.get('startIntervalPattern').updateValueAndValidity({emitEvent});
+    this.getTelemetryFromDatabaseConfigForm.get('endIntervalPattern').updateValueAndValidity({emitEvent});
+  }
+
+  public defaultPaddingEnable() {
+    return this.getTelemetryFromDatabaseConfigForm.get('fetchMode').value === FetchMode.ALL &&
+      this.getTelemetryFromDatabaseConfigForm.get('aggregation').value === AggregationType.NONE;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/originator-attributes-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/originator-attributes-config.component.html
new file mode 100644
index 0000000000..6c767c3664
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/originator-attributes-config.component.html
@@ -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.
+
+-->
+<section class="tb-form-panel no-padding no-border" [formGroup]="originatorAttributesConfigForm">
+  <div class="tb-form-panel stroked">
+    <div class="tb-form-row no-padding no-border space-between">
+      <div class="tb-form-panel-title tb-required" translate>rule-node-config.originator-attributes</div>
+      <div class="tb-form-panel-hint tb-error" translate
+           [hidden]="!(originatorAttributesConfigForm.get('attributesControl').touched &&
+                        originatorAttributesConfigForm.get('attributesControl').hasError('atLeastOneRequired'))">
+        rule-node-config.at-least-one-field-required
+      </div>
+    </div>
+    <tb-select-attributes formControlName="attributesControl"
+                          popupHelpLink="rulenode/originator_attributes_node_fields_templatization">
+    </tb-select-attributes>
+    <tb-msg-metadata-chip [labelText]="'rule-node-config.add-originator-attributes-to' | translate"
+                          formControlName="fetchTo">
+    </tb-msg-metadata-chip>
+  </div>
+  <div tb-hint-tooltip-icon="{{ 'rule-node-config.tell-failure-tooltip' | translate }}" class="tb-form-row same-padding">
+    <mat-slide-toggle class="mat-slide margin" formControlName="tellFailureIfAbsent">
+      {{ 'rule-node-config.tell-failure' | translate }}
+    </mat-slide-toggle>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/originator-attributes-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/originator-attributes-config.component.ts
new file mode 100644
index 0000000000..b0ff9e0098
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/originator-attributes-config.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 } from '@angular/core';
+import { isDefinedAndNotNull, isObject, } from '@core/public-api';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { FetchTo } from '@home/components/rule-node/rule-node-config.models';
+
+@Component({
+  selector: 'tb-enrichment-node-originator-attributes-config',
+  templateUrl: './originator-attributes-config.component.html',
+  styleUrls: []
+})
+export class OriginatorAttributesConfigComponent extends RuleNodeConfigurationComponent {
+
+  originatorAttributesConfigForm: FormGroup;
+
+  constructor(public translate: TranslateService,
+              private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.originatorAttributesConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.originatorAttributesConfigForm = this.fb.group({
+      tellFailureIfAbsent: [configuration.tellFailureIfAbsent, []],
+      fetchTo: [configuration.fetchTo, []],
+      attributesControl: [configuration.attributesControl, []]
+    });
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    if (isObject(configuration)) {
+      configuration.attributesControl = {
+        clientAttributeNames: isDefinedAndNotNull(configuration?.clientAttributeNames) ? configuration.clientAttributeNames : [],
+        latestTsKeyNames: isDefinedAndNotNull(configuration?.latestTsKeyNames) ? configuration.latestTsKeyNames : [],
+        serverAttributeNames: isDefinedAndNotNull(configuration?.serverAttributeNames) ? configuration.serverAttributeNames : [],
+        sharedAttributeNames: isDefinedAndNotNull(configuration?.sharedAttributeNames) ? configuration.sharedAttributeNames : [],
+        getLatestValueWithTs: isDefinedAndNotNull(configuration?.getLatestValueWithTs) ? configuration.getLatestValueWithTs : false
+      };
+    }
+
+    return {
+      fetchTo: isDefinedAndNotNull(configuration?.fetchTo) ? configuration.fetchTo : FetchTo.METADATA,
+      tellFailureIfAbsent: isDefinedAndNotNull(configuration?.tellFailureIfAbsent) ? configuration.tellFailureIfAbsent : false,
+      attributesControl: isDefinedAndNotNull(configuration?.attributesControl) ? configuration.attributesControl : null
+    };
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    for (const key of Object.keys(configuration.attributesControl)) {
+      configuration[key] = configuration.attributesControl[key];
+    }
+    delete configuration.attributesControl;
+    return configuration;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/originator-fields-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/originator-fields-config.component.html
new file mode 100644
index 0000000000..4f5ed6cf13
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/originator-fields-config.component.html
@@ -0,0 +1,41 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="originatorFieldsConfigForm" class="tb-form-panel no-padding no-border">
+  <tb-sv-map-config
+    required
+    [selectOptions]="originatorFields"
+    targetKeyPrefix="originator"
+    formControlName="dataMapping"
+    [requiredText]="'rule-node-config.attr-mapping-required' | translate"
+    [labelText]="'rule-node-config.originator-fields-mapping' | translate"
+    [selectText]="'rule-node-config.source-field' | translate"
+    [selectRequiredText]="'rule-node-config.source-field-required' | translate"
+    [valText]="'rule-node-config.target-key' | translate"
+    [valRequiredText]="'rule-node-config.target-key-required' | translate"
+    [hintText]="'rule-node-config.originator-fields-sv-map-hint' | translate"
+    popupHelpLink="rulenode/originator_fields_node_fields_templatization">
+  </tb-sv-map-config>
+  <tb-msg-metadata-chip [labelText]="'rule-node-config.add-mapped-originator-fields-to' | translate"
+                        formControlName="fetchTo">
+  </tb-msg-metadata-chip>
+  <div tb-hint-tooltip-icon="{{ 'rule-node-config.skip-empty-fields-tooltip' | translate }}" class="tb-form-row same-padding">
+    <mat-slide-toggle class="mat-slide margin" formControlName="ignoreNullStrings">
+      {{ 'rule-node-config.skip-empty-fields' | translate }}
+    </mat-slide-toggle>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/originator-fields-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/originator-fields-config.component.ts
new file mode 100644
index 0000000000..d291bb56d3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/originator-fields-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { deepTrim, isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { allowedOriginatorFields, FetchTo, SvMapOption } from '@home/components/rule-node/rule-node-config.models';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-enrichment-node-originator-fields-config',
+  templateUrl: './originator-fields-config.component.html'
+})
+export class OriginatorFieldsConfigComponent extends RuleNodeConfigurationComponent {
+
+  originatorFieldsConfigForm: FormGroup;
+  public originatorFields: SvMapOption[] = [];
+
+  constructor(private fb: FormBuilder,
+              private translate: TranslateService) {
+    super();
+    for (const field of allowedOriginatorFields) {
+      this.originatorFields.push({
+        value: field.value,
+        name: this.translate.instant(field.name)
+      });
+    }
+  }
+
+  protected configForm(): FormGroup {
+    return this.originatorFieldsConfigForm;
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return deepTrim(configuration);
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      dataMapping: isDefinedAndNotNull(configuration?.dataMapping) ? configuration.dataMapping : null,
+      ignoreNullStrings: isDefinedAndNotNull(configuration?.ignoreNullStrings) ? configuration.ignoreNullStrings : null,
+      fetchTo: isDefinedAndNotNull(configuration?.fetchTo) ? configuration.fetchTo : FetchTo.METADATA
+    };
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.originatorFieldsConfigForm = this.fb.group({
+      dataMapping: [configuration.dataMapping, [Validators.required]],
+      ignoreNullStrings: [configuration.ignoreNullStrings, []],
+      fetchTo: [configuration.fetchTo, []]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/related-attributes-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/related-attributes-config.component.html
new file mode 100644
index 0000000000..677ffb52eb
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/related-attributes-config.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.
+
+-->
+<section [formGroup]="relatedAttributesConfigForm" class="tb-form-panel no-padding no-border">
+  <tb-relations-query-config
+    required
+    formControlName="relationsQuery">
+  </tb-relations-query-config>
+  <div class="tb-form-panel stroked">
+    <div class="tb-form-panel-title" translate>rule-node-config.data-to-fetch</div>
+    <tb-toggle-select formControlName="dataToFetch" appearance="fill">
+      <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">
+        {{ data.name }}
+      </tb-toggle-option>
+    </tb-toggle-select>
+    <tb-kv-map-config
+      [hidden]="relatedAttributesConfigForm.get('dataToFetch').value === DataToFetch.FIELDS"
+      required
+      formControlName="kvMap"
+      [requiredText]="'rule-node-config.attr-mapping-required' | translate"
+      [labelText]="selectTranslation('rule-node-config.latest-telemetry-mapping','rule-node-config.attributes-mapping') | translate"
+      [keyText]="selectTranslation('rule-node-config.source-telemetry','rule-node-config.source-attribute') | translate"
+      [keyRequiredText]="selectTranslation('rule-node-config.source-telemetry-required','rule-node-config.source-attribute-required') | translate"
+      [valText]="'rule-node-config.target-key' | translate"
+      [valRequiredText]="'rule-node-config.target-key-required' | translate"
+      [hintText]="'rule-node-config.kv-map-pattern-hint'"
+      popupHelpLink="rulenode/related_entity_data_node_fields_templatization">
+    </tb-kv-map-config>
+    <tb-sv-map-config
+      [hidden]="relatedAttributesConfigForm.get('dataToFetch').value !== DataToFetch.FIELDS"
+      required
+      [labelText]="'rule-node-config.fields-mapping' | translate"
+      targetKeyPrefix="relatedEntity"
+      [selectOptions]="originatorFields"
+      formControlName="svMap"
+      [requiredText]="'rule-node-config.attr-mapping-required' | translate"
+      [selectText]="'rule-node-config.source-field' | translate"
+      [selectRequiredText]="'rule-node-config.source-field-required' | translate"
+      [valText]="'rule-node-config.target-key' | translate"
+      [valRequiredText]="'rule-node-config.target-key-required' | translate"
+      [hintText]="'rule-node-config.sv-map-hint' | translate"
+      popupHelpLink="rulenode/related_entity_data_node_fields_templatization">
+    </tb-sv-map-config>
+    <tb-msg-metadata-chip formControlName="fetchTo"
+                          [labelText]="msgMetadataLabelTranslations.get(relatedAttributesConfigForm.get('dataToFetch').value) | translate">
+    </tb-msg-metadata-chip>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/related-attributes-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/related-attributes-config.component.ts
new file mode 100644
index 0000000000..8446479cf4
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/related-attributes-config.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 { deepTrim, isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import {
+  allowedOriginatorFields,
+  DataToFetch,
+  dataToFetchTranslations,
+  FetchTo,
+  msgMetadataLabelTranslations,
+  SvMapOption
+} from '../rule-node-config.models';
+import { entityFields } from '@shared/models/entity.models';
+
+@Component({
+  selector: 'tb-enrichment-node-related-attributes-config',
+  templateUrl: './related-attributes-config.component.html',
+  styleUrls: []
+})
+export class RelatedAttributesConfigComponent extends RuleNodeConfigurationComponent {
+
+  relatedAttributesConfigForm: FormGroup;
+
+  protected readonly DataToFetch = DataToFetch;
+
+  public msgMetadataLabelTranslations = msgMetadataLabelTranslations;
+  public originatorFields: SvMapOption[] = [];
+  public fetchToData = [];
+
+  constructor(private fb: FormBuilder,
+              private translate: TranslateService) {
+    super();
+    for (const field of Object.keys(allowedOriginatorFields)) {
+      this.originatorFields.push({
+        value: allowedOriginatorFields[field].value,
+        name: this.translate.instant(allowedOriginatorFields[field].name)
+      });
+    }
+    for (const key of dataToFetchTranslations.keys()) {
+      this.fetchToData.push({
+        value: key,
+        name: this.translate.instant(dataToFetchTranslations.get(key as DataToFetch))
+      });
+    }
+  }
+
+  protected configForm(): FormGroup {
+    return this.relatedAttributesConfigForm;
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    if (configuration.dataToFetch === DataToFetch.FIELDS) {
+      configuration.dataMapping = configuration.svMap;
+      delete configuration.svMap;
+    } else {
+      configuration.dataMapping = configuration.kvMap;
+      delete configuration.kvMap;
+    }
+
+    const filteDataMapping = {};
+    if (configuration && configuration.dataMapping) {
+      for (const key of Object.keys(configuration.dataMapping)) {
+        filteDataMapping[key.trim()] = configuration.dataMapping[key];
+      }
+    }
+    configuration.dataMapping = filteDataMapping;
+    delete configuration.svMap;
+    delete configuration.kvMap;
+
+    return deepTrim(configuration);
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    let svMap = {
+      [entityFields.name.value]: `relatedEntity${this.translate.instant(entityFields.name.name)}`
+    };
+    let kvMap = {
+      serialNumber: 'sn'
+    };
+
+    let dataToFetch: DataToFetch;
+    if (isDefinedAndNotNull(configuration?.telemetry)) {
+      dataToFetch = configuration.telemetry ? DataToFetch.LATEST_TELEMETRY : DataToFetch.ATTRIBUTES;
+    } else {
+      dataToFetch = isDefinedAndNotNull(configuration?.dataToFetch) ? configuration.dataToFetch : DataToFetch.ATTRIBUTES;
+    }
+
+    let dataMapping;
+    if (isDefinedAndNotNull(configuration?.attrMapping)) {
+      dataMapping = configuration.attrMapping;
+    } else {
+      dataMapping = isDefinedAndNotNull(configuration?.dataMapping) ? configuration.dataMapping : null;
+    }
+
+    if (dataToFetch === DataToFetch.FIELDS) {
+      svMap = dataMapping;
+    } else {
+      kvMap = dataMapping;
+    }
+
+    return {
+      relationsQuery: isDefinedAndNotNull(configuration?.relationsQuery) ? configuration.relationsQuery : null,
+      dataToFetch,
+      svMap,
+      kvMap,
+      fetchTo: isDefinedAndNotNull(configuration?.fetchTo) ? configuration.fetchTo : FetchTo.METADATA
+    };
+  }
+
+  public selectTranslation(latestTelemetryTranslation: string, attributesTranslation: string) {
+    if (this.relatedAttributesConfigForm.get('dataToFetch').value === DataToFetch.LATEST_TELEMETRY) {
+      return latestTelemetryTranslation;
+    } else {
+      return attributesTranslation;
+    }
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.relatedAttributesConfigForm = this.fb.group({
+      relationsQuery: [configuration.relationsQuery, [Validators.required]],
+      dataToFetch: [configuration.dataToFetch, []],
+      kvMap: [configuration.kvMap, [Validators.required]],
+      svMap: [configuration.svMap, [Validators.required]],
+      fetchTo: [configuration.fetchTo, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['dataToFetch'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    if (this.relatedAttributesConfigForm.get('dataToFetch').value === DataToFetch.FIELDS) {
+      this.relatedAttributesConfigForm.get('svMap').enable({emitEvent: false});
+      this.relatedAttributesConfigForm.get('kvMap').disable({emitEvent: false});
+      this.relatedAttributesConfigForm.get('svMap').updateValueAndValidity();
+    } else {
+      this.relatedAttributesConfigForm.get('svMap').disable({emitEvent: false});
+      this.relatedAttributesConfigForm.get('kvMap').enable({emitEvent: false});
+      this.relatedAttributesConfigForm.get('kvMap').updateValueAndValidity();
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/tenant-attributes-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/tenant-attributes-config.component.html
new file mode 100644
index 0000000000..c690e2b855
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/tenant-attributes-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="tenantAttributesConfigForm" class="tb-form-panel stroked">
+  <div class="tb-form-panel-title" translate>rule-node-config.mapping-of-tenant</div>
+  <div class="flex flex-1 items-center justify-center">
+    <div class="fetch-to-data-toggle">
+      <tb-toggle-select class="fetch-to-data-toggle" formControlName="dataToFetch" appearance="fill">
+        <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">
+          {{ data.name }}
+        </tb-toggle-option>
+      </tb-toggle-select>
+    </div>
+  </div>
+  <tb-kv-map-config
+    required
+    formControlName="dataMapping"
+    [requiredText]="'rule-node-config.attr-mapping-required' | translate"
+    [labelText]="selectTranslation('rule-node-config.latest-telemetry-mapping', 'rule-node-config.attributes-mapping') | translate"
+    [keyText]="selectTranslation('rule-node-config.source-telemetry', 'rule-node-config.source-attribute') | translate"
+    [keyRequiredText]="selectTranslation('rule-node-config.source-telemetry-required', 'rule-node-config.source-attribute-required') | translate"
+    [valText]="'rule-node-config.target-key' | translate"
+    [valRequiredText]="'rule-node-config.target-key-required' | translate"
+    [hintText]="'rule-node-config.kv-map-pattern-hint'"
+    popupHelpLink="rulenode/tenant_attributes_node_fields_templatization">
+  </tb-kv-map-config>
+  <tb-msg-metadata-chip formControlName="fetchTo"
+                        [labelText]="tenantAttributesConfigForm.get('dataToFetch').value === DataToFetch.LATEST_TELEMETRY ?
+                        ('rule-node-config.add-mapped-latest-telemetry-to' | translate) : ('rule-node-config.add-mapped-attribute-to' | translate)">
+  </tb-msg-metadata-chip>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/tenant-attributes-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/tenant-attributes-config.component.scss
new file mode 100644
index 0000000000..4943a8fa07
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/tenant-attributes-config.component.scss
@@ -0,0 +1,21 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 {
+  .fetch-to-data-toggle {
+    max-width: 420px;
+    width: 100%;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/enrichment/tenant-attributes-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/tenant-attributes-config.component.ts
new file mode 100644
index 0000000000..2c05d3369f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/enrichment/tenant-attributes-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { DataToFetch, dataToFetchTranslations, FetchTo } from '../rule-node-config.models';
+
+@Component({
+  selector: 'tb-enrichment-node-tenant-attributes-config',
+  templateUrl: './tenant-attributes-config.component.html',
+  styleUrls: ['./tenant-attributes-config.component.scss']
+})
+export class TenantAttributesConfigComponent extends RuleNodeConfigurationComponent {
+
+  tenantAttributesConfigForm: FormGroup;
+  public fetchToData = [];
+
+  constructor(private fb: FormBuilder,
+              private translate: TranslateService) {
+    super();
+    for (const key of dataToFetchTranslations.keys()) {
+      if (key !== DataToFetch.FIELDS) {
+        this.fetchToData.push({
+          value: key,
+          name: this.translate.instant(dataToFetchTranslations.get(key as DataToFetch))
+        });
+      }
+    }
+  }
+
+  protected configForm(): FormGroup {
+    return this.tenantAttributesConfigForm;
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    let dataToFetch: DataToFetch;
+    if (isDefinedAndNotNull(configuration?.telemetry)) {
+      dataToFetch = configuration.telemetry ? DataToFetch.LATEST_TELEMETRY : DataToFetch.ATTRIBUTES;
+    } else {
+      dataToFetch = isDefinedAndNotNull(configuration?.dataToFetch) ? configuration.dataToFetch : DataToFetch.ATTRIBUTES;
+    }
+
+    let dataMapping;
+    if (isDefinedAndNotNull(configuration?.attrMapping)) {
+      dataMapping = configuration.attrMapping;
+    } else {
+      dataMapping = isDefinedAndNotNull(configuration?.dataMapping) ? configuration.dataMapping : null;
+    }
+
+    return {
+      dataToFetch,
+      dataMapping,
+      fetchTo: isDefinedAndNotNull(configuration?.fetchTo) ? configuration.fetchTo : FetchTo.METADATA
+    };
+  }
+
+  public selectTranslation(latestTelemetryTranslation: string, attributesTranslation: string) {
+    if (this.tenantAttributesConfigForm.get('dataToFetch').value === DataToFetch.LATEST_TELEMETRY) {
+      return latestTelemetryTranslation;
+    } else {
+      return attributesTranslation;
+    }
+  }
+
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.tenantAttributesConfigForm = this.fb.group({
+      dataToFetch: [configuration.dataToFetch, []],
+      dataMapping: [configuration.dataMapping, [Validators.required]],
+      fetchTo: [configuration.fetchTo, []]
+    });
+  }
+
+  protected readonly DataToFetch = DataToFetch;
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/azure-iot-hub-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/azure-iot-hub-config.component.html
new file mode 100644
index 0000000000..59dcb40fec
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/azure-iot-hub-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="azureIotHubConfigForm"  class="flex flex-col">
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.topic</mat-label>
+    <input required matInput formControlName="topicPattern">
+    <mat-error *ngIf="azureIotHubConfigForm.get('topicPattern').hasError('required')">
+      {{ 'rule-node-config.topic-required' | translate }}
+    </mat-error>
+    <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.hostname</mat-label>
+    <input required matInput formControlName="host">
+    <mat-error *ngIf="azureIotHubConfigForm.get('host').hasError('required')">
+      {{ 'rule-node-config.hostname-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.device-id</mat-label>
+    <input required matInput formControlName="clientId" autocomplete="new-clientId">
+    <mat-error *ngIf="azureIotHubConfigForm.get('clientId').hasError('required')">
+      {{ 'rule-node-config.device-id-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-accordion>
+    <mat-expansion-panel class="tb-mqtt-credentials-panel-group">
+      <mat-expansion-panel-header>
+        <mat-panel-title class="tb-required" translate>rule-node-config.credentials</mat-panel-title>
+        <mat-panel-description>
+          {{ azureIotHubCredentialsTypeTranslationsMap.get(azureIotHubConfigForm.get('credentials.type').value) | translate }}
+        </mat-panel-description>
+      </mat-expansion-panel-header>
+      <section formGroupName="credentials" class="flex flex-col">
+        <mat-form-field class="mat-block">
+          <mat-label translate>rule-node-config.credentials-type</mat-label>
+          <mat-select formControlName="type" required>
+            <mat-option *ngFor="let credentialsType of allAzureIotHubCredentialsTypes" [value]="credentialsType">
+              {{ azureIotHubCredentialsTypeTranslationsMap.get(credentialsType) | translate }}
+            </mat-option>
+          </mat-select>
+          <mat-error *ngIf="azureIotHubConfigForm.get('credentials.type').hasError('required')">
+            {{ 'rule-node-config.credentials-type-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+        <section class="flex flex-col" [ngSwitch]="azureIotHubConfigForm.get('credentials.type').value">
+          <ng-template ngSwitchCase="anonymous">
+          </ng-template>
+          <ng-template ngSwitchCase="sas">
+            <mat-form-field class="mat-block">
+              <mat-label translate>rule-node-config.sas-key</mat-label>
+              <input type="password" required matInput formControlName="sasKey" autocomplete="new-password">
+              <tb-toggle-password matSuffix></tb-toggle-password>
+              <mat-error *ngIf="azureIotHubConfigForm.get('credentials.sasKey').hasError('required')">
+                {{ 'rule-node-config.sas-key-required' | translate }}
+              </mat-error>
+            </mat-form-field>
+            <tb-file-input formControlName="caCert"
+                           inputId="caCertSelect"
+                           [existingFileName]="azureIotHubConfigForm.get('credentials.caCertFileName').value"
+                           (fileNameChanged)="azureIotHubConfigForm.get('credentials.caCertFileName').setValue($event)"
+                           label="{{'rule-node-config.azure-ca-cert' | translate}}"
+                           noFileText="rule-node-config.no-file"
+                           dropLabel="{{'rule-node-config.drop-file' | translate}}">
+            </tb-file-input>
+          </ng-template>
+          <ng-template ngSwitchCase="cert.PEM">
+            <tb-file-input formControlName="caCert"
+                           inputId="caCertSelect"
+                           [existingFileName]="azureIotHubConfigForm.get('credentials.caCertFileName').value"
+                           (fileNameChanged)="azureIotHubConfigForm.get('credentials.caCertFileName').setValue($event)"
+                           label="{{'rule-node-config.azure-ca-cert' | translate}}"
+                           noFileText="rule-node-config.no-file"
+                           dropLabel="{{'rule-node-config.drop-file' | translate}}">
+            </tb-file-input>
+            <tb-file-input formControlName="cert"
+                           inputId="CertSelect"
+                           [existingFileName]="azureIotHubConfigForm.get('credentials.certFileName').value"
+                           (fileNameChanged)="azureIotHubConfigForm.get('credentials.certFileName').setValue($event)"
+                           required
+                           requiredAsError
+                           label="{{'rule-node-config.cert' | translate}}"
+                           noFileText="rule-node-config.no-file"
+                           dropLabel="{{'rule-node-config.drop-file' | translate}}">
+            </tb-file-input>
+            <tb-file-input style="padding-bottom: 8px;"
+                           formControlName="privateKey"
+                           inputId="privateKeySelect"
+                           [existingFileName]="azureIotHubConfigForm.get('credentials.privateKeyFileName').value"
+                           (fileNameChanged)="azureIotHubConfigForm.get('credentials.privateKeyFileName').setValue($event)"
+                           required
+                           requiredAsError
+                           label="{{'rule-node-config.private-key' | translate}}"
+                           noFileText="rule-node-config.no-file"
+                           dropLabel="{{'rule-node-config.drop-file' | translate}}">
+            </tb-file-input>
+            <mat-form-field class="mat-block">
+              <mat-label translate>rule-node-config.private-key-password</mat-label>
+              <input type="password" matInput formControlName="password" autocomplete="new-password">
+              <tb-toggle-password matSuffix></tb-toggle-password>
+            </mat-form-field>
+          </ng-template>
+        </section>
+      </section>
+    </mat-expansion-panel>
+  </mat-accordion>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/azure-iot-hub-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/azure-iot-hub-config.component.ts
new file mode 100644
index 0000000000..72864610f5
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/azure-iot-hub-config.component.ts
@@ -0,0 +1,117 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import {
+  AzureIotHubCredentialsType,
+  azureIotHubCredentialsTypes,
+  azureIotHubCredentialsTypeTranslations
+} from '@home/components/rule-node/rule-node-config.models';
+
+@Component({
+  selector: 'tb-external-node-azure-iot-hub-config',
+  templateUrl: './azure-iot-hub-config.component.html',
+  styleUrls: ['./mqtt-config.component.scss']
+})
+export class AzureIotHubConfigComponent extends RuleNodeConfigurationComponent {
+
+  azureIotHubConfigForm: UntypedFormGroup;
+
+  allAzureIotHubCredentialsTypes = azureIotHubCredentialsTypes;
+  azureIotHubCredentialsTypeTranslationsMap = azureIotHubCredentialsTypeTranslations;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.azureIotHubConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.azureIotHubConfigForm = this.fb.group({
+      topicPattern: [configuration ? configuration.topicPattern : null, [Validators.required]],
+      host: [configuration ? configuration.host : null, [Validators.required]],
+      port: [configuration ? configuration.port : null, [Validators.required, Validators.min(1), Validators.max(65535)]],
+      connectTimeoutSec: [configuration ? configuration.connectTimeoutSec : null,
+        [Validators.required, Validators.min(1), Validators.max(200)]],
+      clientId: [configuration ? configuration.clientId : null, [Validators.required]],
+      cleanSession: [configuration ? configuration.cleanSession : false, []],
+      ssl: [configuration ? configuration.ssl : false, []],
+      credentials: this.fb.group(
+        {
+          type: [configuration && configuration.credentials ? configuration.credentials.type : null, [Validators.required]],
+          sasKey: [configuration && configuration.credentials ? configuration.credentials.sasKey : null, []],
+          caCert: [configuration && configuration.credentials ? configuration.credentials.caCert : null, []],
+          caCertFileName: [configuration && configuration.credentials ? configuration.credentials.caCertFileName : null, []],
+          privateKey: [configuration && configuration.credentials ? configuration.credentials.privateKey : null, []],
+          privateKeyFileName: [configuration && configuration.credentials ? configuration.credentials.privateKeyFileName : null, []],
+          cert: [configuration && configuration.credentials ? configuration.credentials.cert : null, []],
+          certFileName: [configuration && configuration.credentials ? configuration.credentials.certFileName : null, []],
+          password: [configuration && configuration.credentials ? configuration.credentials.password : null, []],
+        }
+      )
+    });
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    const credentialsType: AzureIotHubCredentialsType = configuration.credentials.type;
+      if (credentialsType === 'sas') {
+        configuration.credentials = {
+          type: credentialsType,
+          sasKey: configuration.credentials.sasKey,
+          caCert: configuration.credentials.caCert,
+          caCertFileName: configuration.credentials.caCertFileName
+        };
+    }
+    return configuration;
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['credentials.type'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const credentialsControl = this.azureIotHubConfigForm.get('credentials');
+    const credentialsType: AzureIotHubCredentialsType = credentialsControl.get('type').value;
+    if (emitEvent) {
+      credentialsControl.reset({ type: credentialsType }, {emitEvent: false});
+    }
+    credentialsControl.get('sasKey').setValidators([]);
+    credentialsControl.get('privateKey').setValidators([]);
+    credentialsControl.get('privateKeyFileName').setValidators([]);
+    credentialsControl.get('cert').setValidators([]);
+    credentialsControl.get('certFileName').setValidators([]);
+    switch (credentialsType) {
+      case 'sas':
+        credentialsControl.get('sasKey').setValidators([Validators.required]);
+        break;
+      case 'cert.PEM':
+        credentialsControl.get('privateKey').setValidators([Validators.required]);
+        credentialsControl.get('privateKeyFileName').setValidators([Validators.required]);
+        credentialsControl.get('cert').setValidators([Validators.required]);
+        credentialsControl.get('certFileName').setValidators([Validators.required]);
+        break;
+    }
+    credentialsControl.get('sasKey').updateValueAndValidity({emitEvent});
+    credentialsControl.get('privateKey').updateValueAndValidity({emitEvent});
+    credentialsControl.get('privateKeyFileName').updateValueAndValidity({emitEvent});
+    credentialsControl.get('cert').updateValueAndValidity({emitEvent});
+    credentialsControl.get('certFileName').updateValueAndValidity({emitEvent});
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/external-rule-node-config.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/external-rule-node-config.module.ts
new file mode 100644
index 0000000000..ef550d8460
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/external-rule-node-config.module.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 { NgModule } from '@angular/core';
+import { SnsConfigComponent } from './sns-config.component';
+import { SqsConfigComponent } from './sqs-config.component';
+import { PubSubConfigComponent } from './pubsub-config.component';
+import { KafkaConfigComponent } from './kafka-config.component';
+import { MqttConfigComponent } from './mqtt-config.component';
+import { NotificationConfigComponent } from './notification-config.component';
+import { RabbitMqConfigComponent } from './rabbit-mq-config.component';
+import { RestApiCallConfigComponent } from './rest-api-call-config.component';
+import { SendEmailConfigComponent } from './send-email-config.component';
+import { AzureIotHubConfigComponent } from './azure-iot-hub-config.component';
+import { SendSmsConfigComponent } from './send-sms-config.component';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '@shared/public-api';
+import { HomeComponentsModule } from '@home/components/public-api';
+import { CommonRuleNodeConfigModule } from '../common/common-rule-node-config.module';
+import { SlackConfigComponent } from './slack-config.component';
+import { LambdaConfigComponent } from './lambda-config.component';
+
+@NgModule({
+  declarations: [
+    SnsConfigComponent,
+    SqsConfigComponent,
+    LambdaConfigComponent,
+    PubSubConfigComponent,
+    KafkaConfigComponent,
+    MqttConfigComponent,
+    NotificationConfigComponent,
+    RabbitMqConfigComponent,
+    RestApiCallConfigComponent,
+    SendEmailConfigComponent,
+    AzureIotHubConfigComponent,
+    SendSmsConfigComponent,
+    SlackConfigComponent
+  ],
+  imports: [
+    CommonModule,
+    SharedModule,
+    HomeComponentsModule,
+    CommonRuleNodeConfigModule
+  ],
+  exports: [
+    SnsConfigComponent,
+    SqsConfigComponent,
+    LambdaConfigComponent,
+    PubSubConfigComponent,
+    KafkaConfigComponent,
+    MqttConfigComponent,
+    NotificationConfigComponent,
+    RabbitMqConfigComponent,
+    RestApiCallConfigComponent,
+    SendEmailConfigComponent,
+    AzureIotHubConfigComponent,
+    SendSmsConfigComponent,
+    SlackConfigComponent
+  ]
+})
+export class ExternalRuleNodeConfigModule {
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/kafka-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/kafka-config.component.html
new file mode 100644
index 0000000000..f23bbd353c
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/kafka-config.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.
+
+-->
+<section [formGroup]="kafkaConfigForm" class="flex flex-col">
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.topic-pattern</mat-label>
+    <input required matInput formControlName="topicPattern">
+    <mat-error *ngIf="kafkaConfigForm.get('topicPattern').hasError('required')">
+      {{ 'rule-node-config.topic-pattern-required' | translate }}
+    </mat-error>
+    <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+  </mat-form-field>
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.key-pattern</mat-label>
+    <input matInput formControlName="keyPattern">
+    <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+  </mat-form-field>
+  <div class="tb-hint" translate>rule-node-config.key-pattern-hint</div>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.bootstrap-servers</mat-label>
+    <input required matInput formControlName="bootstrapServers">
+    <mat-error *ngIf="kafkaConfigForm.get('bootstrapServers').hasError('required')">
+      {{ 'rule-node-config.bootstrap-servers-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.retries</mat-label>
+    <input type="number" step="1" min="0" matInput formControlName="retries">
+    <mat-error *ngIf="kafkaConfigForm.get('retries').hasError('min')">
+      {{ 'rule-node-config.min-retries-message' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.batch-size-bytes</mat-label>
+    <input type="number" step="1" min="0" matInput formControlName="batchSize">
+    <mat-error *ngIf="kafkaConfigForm.get('batchSize').hasError('min')">
+      {{ 'rule-node-config.min-batch-size-bytes-message' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.linger-ms</mat-label>
+    <input type="number" step="1" min="0" matInput formControlName="linger">
+    <mat-error *ngIf="kafkaConfigForm.get('linger').hasError('min')">
+      {{ 'rule-node-config.min-linger-ms-message' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.buffer-memory-bytes</mat-label>
+    <input type="number" step="1" min="0" matInput formControlName="bufferMemory">
+    <mat-error *ngIf="kafkaConfigForm.get('bufferMemory').hasError('min')">
+      {{ 'rule-node-config.min-buffer-memory-bytes-message' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.acks</mat-label>
+    <mat-select formControlName="acks" required>
+      <mat-option *ngFor="let ackValue of ackValues" [value]="ackValue">
+        {{ ackValue }}
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.key-serializer</mat-label>
+    <input required matInput formControlName="keySerializer">
+    <mat-error *ngIf="kafkaConfigForm.get('keySerializer').hasError('required')">
+      {{ 'rule-node-config.key-serializer-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.value-serializer</mat-label>
+    <input required matInput formControlName="valueSerializer">
+    <mat-error *ngIf="kafkaConfigForm.get('valueSerializer').hasError('required')">
+      {{ 'rule-node-config.value-serializer-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <label translate class="tb-title">rule-node-config.other-properties</label>
+  <tb-kv-map-config-old
+    required="false"
+    formControlName="otherProperties"
+    keyText="rule-node-config.key"
+    keyRequiredText="rule-node-config.key-required"
+    valText="rule-node-config.value"
+    valRequiredText="rule-node-config.value-required">
+  </tb-kv-map-config-old>
+  <mat-checkbox class="flex-1" formControlName="addMetadataKeyValuesAsKafkaHeaders">
+    {{ 'rule-node-config.add-metadata-key-values-as-kafka-headers' | translate }}
+  </mat-checkbox>
+  <div class="tb-hint" translate>rule-node-config.add-metadata-key-values-as-kafka-headers-hint</div>
+  <mat-form-field class="mat-block flex-1" *ngIf="kafkaConfigForm.get('addMetadataKeyValuesAsKafkaHeaders').value">
+    <mat-label translate>rule-node-config.charset-encoding</mat-label>
+    <mat-select formControlName="kafkaHeadersCharset" required>
+      <mat-option *ngFor="let charset of ToByteStandartCharsetTypesValues" [value]="charset">
+        {{ ToByteStandartCharsetTypeTranslationMap.get(charset) | translate }}
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/kafka-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/kafka-config.component.ts
new file mode 100644
index 0000000000..d0f97a8f9d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/kafka-config.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 } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+import {
+  ToByteStandartCharsetTypes,
+  ToByteStandartCharsetTypeTranslations
+} from '@home/components/rule-node/rule-node-config.models';
+
+@Component({
+  selector: 'tb-external-node-kafka-config',
+  templateUrl: './kafka-config.component.html',
+  styleUrls: []
+})
+export class KafkaConfigComponent extends RuleNodeConfigurationComponent {
+
+  kafkaConfigForm: UntypedFormGroup;
+
+  ackValues: string[] = ['all', '-1', '0', '1'];
+
+  ToByteStandartCharsetTypesValues = ToByteStandartCharsetTypes;
+  ToByteStandartCharsetTypeTranslationMap = ToByteStandartCharsetTypeTranslations;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.kafkaConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.kafkaConfigForm = this.fb.group({
+      topicPattern: [configuration ? configuration.topicPattern : null, [Validators.required]],
+      keyPattern: [configuration ? configuration.keyPattern : null],
+      bootstrapServers: [configuration ? configuration.bootstrapServers : null, [Validators.required]],
+      retries: [configuration ? configuration.retries : null, [Validators.min(0)]],
+      batchSize: [configuration ? configuration.batchSize : null, [Validators.min(0)]],
+      linger: [configuration ? configuration.linger : null, [Validators.min(0)]],
+      bufferMemory: [configuration ? configuration.bufferMemory : null, [Validators.min(0)]],
+      acks: [configuration ? configuration.acks : null, [Validators.required]],
+      keySerializer: [configuration ? configuration.keySerializer : null, [Validators.required]],
+      valueSerializer: [configuration ? configuration.valueSerializer : null, [Validators.required]],
+      otherProperties: [configuration ? configuration.otherProperties : null, []],
+      addMetadataKeyValuesAsKafkaHeaders: [configuration ? configuration.addMetadataKeyValuesAsKafkaHeaders : false, []],
+      kafkaHeadersCharset: [configuration ? configuration.kafkaHeadersCharset : null, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['addMetadataKeyValuesAsKafkaHeaders'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const addMetadataKeyValuesAsKafkaHeaders: boolean = this.kafkaConfigForm.get('addMetadataKeyValuesAsKafkaHeaders').value;
+    if (addMetadataKeyValuesAsKafkaHeaders) {
+      this.kafkaConfigForm.get('kafkaHeadersCharset').setValidators([Validators.required]);
+    } else {
+      this.kafkaConfigForm.get('kafkaHeadersCharset').setValidators([]);
+    }
+    this.kafkaConfigForm.get('kafkaHeadersCharset').updateValueAndValidity({emitEvent});
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/lambda-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/lambda-config.component.html
new file mode 100644
index 0000000000..2ea8fa3957
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/lambda-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="lambdaConfigForm" class="tb-form-panel no-padding no-border">
+  <div class="tb-form-panel stroked">
+    <div class="tb-form-row no-padding no-border">
+      <div class="tb-form-panel-title tb-required" translate>rule-node-config.function-configuration</div>
+    </div>
+    <tb-example-hint [hintText]="'rule-node-config.template-rules-hint'"
+                     popupHelpLink="rulenode/node-templatization-doc">
+    </tb-example-hint>
+    <div class="tb-standard-fields">
+      <mat-form-field class="mat-block">
+        <mat-label>{{'rule-node-config.function-name' | translate}}</mat-label>
+        <input required matInput formControlName="functionName">
+        <mat-error *ngIf="lambdaConfigForm.get('functionName').hasError('required')">
+          {{'rule-node-config.function-name-required' | translate}}
+        </mat-error>
+      </mat-form-field>
+      <mat-form-field class="mat-block">
+        <mat-label>{{'rule-node-config.qualifier' | translate}}</mat-label>
+        <input matInput formControlName="qualifier">
+        <mat-hint translate>rule-node-config.qualifier-hint</mat-hint>
+      </mat-form-field>
+    </div>
+  </div>
+
+  <div class="tb-form-panel stroked">
+    <mat-expansion-panel class="tb-settings" expanded>
+      <mat-expansion-panel-header>
+        <mat-panel-title class="tb-form-panel-title tb-required" translate>rule-node-config.aws-credentials</mat-panel-title>
+      </mat-expansion-panel-header>
+      <div class="tb-standard-fields">
+        <mat-form-field class="mat-block">
+          <mat-label translate>rule-node-config.aws-access-key-id</mat-label>
+          <input required matInput formControlName="accessKey">
+          <mat-error *ngIf="lambdaConfigForm.get('accessKey').hasError('required')">
+            {{ 'rule-node-config.aws-access-key-id-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+        <mat-form-field class="mat-block">
+          <mat-label translate>rule-node-config.aws-secret-access-key</mat-label>
+          <input required matInput formControlName="secretKey">
+          <mat-error *ngIf="lambdaConfigForm.get('secretKey').hasError('required')">
+            {{ 'rule-node-config.aws-secret-access-key-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+        <mat-form-field class="mat-block">
+          <mat-label translate>rule-node-config.aws-region</mat-label>
+          <input required matInput formControlName="region">
+          <mat-error *ngIf="lambdaConfigForm.get('region').hasError('required')">
+            {{ 'rule-node-config.aws-region-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+      </div>
+    </mat-expansion-panel>
+  </div>
+  <div class="tb-form-panel stroked no-padding">
+    <mat-expansion-panel class="tb-settings">
+      <mat-expansion-panel-header style="padding: 16px">
+        <mat-panel-title translate>rule-node-config.advanced-settings</mat-panel-title>
+      </mat-expansion-panel-header>
+      <div class="tb-form-panel no-border no-padding no-gap" style="margin-top: 0">
+        <div class="tb-form-row no-border same-padding tb-standard-fields">
+          <mat-form-field class="flex">
+            <mat-label translate>rule-node-config.connection-timeout</mat-label>
+            <input type="number" required min="0" matInput formControlName="connectionTimeout">
+            <mat-error *ngIf="lambdaConfigForm.get('connectionTimeout').hasError('required')">
+              {{ 'rule-node-config.connection-timeout-required' | translate }}
+            </mat-error>
+            <mat-error *ngIf="lambdaConfigForm.get('connectionTimeout').hasError('min')">
+              {{ 'rule-node-config.connection-timeout-min' | translate }}
+            </mat-error>
+            <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+                      color="primary"
+                      matTooltip="{{ 'rule-node-config.connection-timeout-hint' | translate }}">help</mat-icon>
+          </mat-form-field>
+          <mat-form-field class="flex">
+            <mat-label translate>rule-node-config.request-timeout</mat-label>
+            <input type="number" required min="0" matInput formControlName="requestTimeout">
+            <mat-error *ngIf="lambdaConfigForm.get('requestTimeout').hasError('required')">
+              {{ 'rule-node-config.request-timeout-required' | translate }}
+            </mat-error>
+            <mat-error *ngIf="lambdaConfigForm.get('requestTimeout').hasError('min')">
+              {{ 'rule-node-config.request-timeout-min' | translate }}
+            </mat-error>
+            <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+                      color="primary"
+                      matTooltip="{{ 'rule-node-config.request-timeout-hint' | translate }}">help</mat-icon>
+          </mat-form-field>
+        </div>
+        <div tb-hint-tooltip-icon="{{ 'rule-node-config.tell-failure-aws-lambda-hint' | translate }}"
+             class="tb-form-row no-border" style="margin-bottom: 16px">
+          <mat-slide-toggle class="mat-slide" formControlName="tellFailureIfFuncThrowsExc">
+            {{ 'rule-node-config.tell-failure-aws-lambda' | translate }}
+          </mat-slide-toggle>
+        </div>
+      </div>
+    </mat-expansion-panel>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/lambda-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/lambda-config.component.ts
new file mode 100644
index 0000000000..3270e3b51e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/lambda-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-external-node-lambda-config',
+  templateUrl: './lambda-config.component.html',
+  styleUrls: []
+})
+export class LambdaConfigComponent extends RuleNodeConfigurationComponent {
+
+  lambdaConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.lambdaConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.lambdaConfigForm = this.fb.group({
+      functionName: [configuration ? configuration.functionName : null, [Validators.required]],
+      qualifier: [configuration ? configuration.qualifier : null, []],
+      accessKey: [configuration ? configuration.accessKey : null, [Validators.required]],
+      secretKey: [configuration ? configuration.secretKey : null, [Validators.required]],
+      region: [configuration ? configuration.region : null, [Validators.required]],
+      connectionTimeout: [configuration ? configuration.connectionTimeout : null, [Validators.required, Validators.min(0)]],
+      requestTimeout: [configuration ? configuration.requestTimeout : null, [Validators.required, Validators.min(0)]],
+      tellFailureIfFuncThrowsExc: [configuration ? configuration.tellFailureIfFuncThrowsExc : false, []]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/mqtt-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/mqtt-config.component.html
new file mode 100644
index 0000000000..a57da12587
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/mqtt-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="mqttConfigForm" class="flex flex-col">
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.topic-pattern</mat-label>
+    <input required matInput formControlName="topicPattern">
+    <mat-error *ngIf="mqttConfigForm.get('topicPattern').hasError('required')">
+      {{ 'rule-node-config.topic-pattern-required' | translate }}
+    </mat-error>
+    <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+  </mat-form-field>
+  <div class="flex flex-1 flex-col gt-sm:flex-row gt-sm:gap-2">
+    <mat-form-field class="mat-block gt-sm:max-w-60% gt-sm:flex-full">
+      <mat-label translate>rule-node-config.host</mat-label>
+      <input required matInput formControlName="host">
+      <mat-error *ngIf="mqttConfigForm.get('host').hasError('required')">
+        {{ 'rule-node-config.host-required' | translate }}
+      </mat-error>
+    </mat-form-field>
+    <mat-form-field class="mat-block gt-sm:max-w-40% gt-sm:flex-full">
+      <mat-label translate>rule-node-config.port</mat-label>
+      <input required type="number" step="1" min="1" max="65535" matInput formControlName="port">
+      <mat-error *ngIf="mqttConfigForm.get('port').hasError('required')">
+        {{ 'rule-node-config.port-required' | translate }}
+      </mat-error>
+      <mat-error *ngIf="mqttConfigForm.get('port').hasError('min')">
+        {{ 'rule-node-config.port-range' | translate }}
+      </mat-error>
+      <mat-error *ngIf="mqttConfigForm.get('port').hasError('max')">
+        {{ 'rule-node-config.port-range' | translate }}
+      </mat-error>
+    </mat-form-field>
+    <mat-form-field class="mat-block gt-sm:max-w-40% gt-sm:flex-full">
+      <mat-label translate>rule-node-config.connect-timeout</mat-label>
+      <input required type="number" step="1" min="1" max="200" matInput formControlName="connectTimeoutSec">
+      <mat-error *ngIf="mqttConfigForm.get('connectTimeoutSec').hasError('required')">
+        {{ 'rule-node-config.connect-timeout-required' | translate }}
+      </mat-error>
+      <mat-error *ngIf="mqttConfigForm.get('connectTimeoutSec').hasError('min')">
+        {{ 'rule-node-config.connect-timeout-range' | translate }}
+      </mat-error>
+      <mat-error *ngIf="mqttConfigForm.get('connectTimeoutSec').hasError('max')">
+        {{ 'rule-node-config.connect-timeout-range' | translate }}
+      </mat-error>
+    </mat-form-field>
+  </div>
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.client-id</mat-label>
+    <input matInput formControlName="clientId">
+    <mat-hint>{{'rule-node-config.client-id-hint' | translate}}</mat-hint>
+  </mat-form-field>
+  <mat-checkbox formControlName="appendClientIdSuffix">
+    {{ 'rule-node-config.append-client-id-suffix' | translate }}
+  </mat-checkbox>
+  <div class="tb-hint">{{ "rule-node-config.client-id-suffix-hint" | translate }}</div>
+  <mat-checkbox formControlName="parseToPlainText">
+    {{ 'rule-node-config.parse-to-plain-text' | translate }}
+  </mat-checkbox>
+  <div class="tb-hint">{{ "rule-node-config.parse-to-plain-text-hint" | translate }}</div>
+  <mat-checkbox formControlName="cleanSession">
+    {{ 'rule-node-config.clean-session' | translate }}
+  </mat-checkbox>
+  <mat-checkbox formControlName="retainedMessage">
+    {{ "rule-node-config.retained-message" | translate }}
+  </mat-checkbox>
+  <mat-checkbox formControlName="ssl">
+    {{ 'rule-node-config.enable-ssl' | translate }}
+  </mat-checkbox>
+  <tb-credentials-config formControlName="credentials" [passwordFieldRequired]="false"></tb-credentials-config>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/mqtt-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/external/mqtt-config.component.scss
new file mode 100644
index 0000000000..0bd9d8e62c
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/mqtt-config.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.
+ */
+:host {
+  .tb-mqtt-credentials-panel-group {
+    margin: 0 6px;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/mqtt-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/mqtt-config.component.ts
new file mode 100644
index 0000000000..7edfc6f14d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/mqtt-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { isNotEmptyStr } from '@core/public-api';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-external-node-mqtt-config',
+  templateUrl: './mqtt-config.component.html',
+  styleUrls: ['./mqtt-config.component.scss']
+})
+export class MqttConfigComponent extends RuleNodeConfigurationComponent {
+
+  mqttConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.mqttConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.mqttConfigForm = this.fb.group({
+      topicPattern: [configuration ? configuration.topicPattern : null, [Validators.required]],
+      host: [configuration ? configuration.host : null, [Validators.required]],
+      port: [configuration ? configuration.port : null, [Validators.required, Validators.min(1), Validators.max(65535)]],
+      connectTimeoutSec: [configuration ? configuration.connectTimeoutSec : null,
+        [Validators.required, Validators.min(1), Validators.max(200)]],
+      clientId: [configuration ? configuration.clientId : null, []],
+      appendClientIdSuffix: [{
+        value: configuration ? configuration.appendClientIdSuffix : false,
+        disabled: !(configuration && isNotEmptyStr(configuration.clientId))
+      }, []],
+      parseToPlainText: [configuration ? configuration.parseToPlainText : false, []],
+      cleanSession: [configuration ? configuration.cleanSession : false, []],
+      retainedMessage: [configuration ? configuration.retainedMessage : false, []],
+      ssl: [configuration ? configuration.ssl : false, []],
+      credentials: [configuration ? configuration.credentials : null, []]
+    });
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    if (isNotEmptyStr(this.mqttConfigForm.get('clientId').value)) {
+      this.mqttConfigForm.get('appendClientIdSuffix').enable({emitEvent: false});
+    } else {
+      this.mqttConfigForm.get('appendClientIdSuffix').disable({emitEvent: false});
+    }
+    this.mqttConfigForm.get('appendClientIdSuffix').updateValueAndValidity({emitEvent});
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['clientId'];
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/notification-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/notification-config.component.html
new file mode 100644
index 0000000000..ee031b1237
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/notification-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="notificationConfigForm" class="flex flex-col">
+  <tb-template-autocomplete
+    required
+    allowCreate
+    formControlName="templateId"
+    [notificationTypes]="notificationType.RULE_NODE">
+  </tb-template-autocomplete>
+  <tb-entity-list
+    required
+    formControlName="targets"
+    labelText="{{ 'notification.recipients' | translate }}"
+    placeholderText="{{ 'notification.recipient' | translate }}"
+    requiredText="{{ 'notification.recipients-required' | translate }}"
+    entityType="{{ entityType.NOTIFICATION_TARGET }}"
+    subType="{{ notificationType.RULE_NODE }}">
+  </tb-entity-list>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/notification-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/notification-config.component.ts
new file mode 100644
index 0000000000..2b2fcfb319
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/notification-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+import { NotificationType } from '@shared/models/notification.models';
+import { EntityType } from '@shared/models/entity-type.models';
+
+@Component({
+  selector: 'tb-external-node-notification-config',
+  templateUrl: './notification-config.component.html',
+  styleUrls: []
+})
+export class NotificationConfigComponent extends RuleNodeConfigurationComponent {
+
+  notificationConfigForm: FormGroup;
+  notificationType = NotificationType;
+  entityType = EntityType;
+
+  constructor(private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.notificationConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.notificationConfigForm = this.fb.group({
+      templateId: [configuration ? configuration.templateId : null, [Validators.required]],
+      targets: [configuration ? configuration.targets : [], [Validators.required]],
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/pubsub-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/pubsub-config.component.html
new file mode 100644
index 0000000000..b3d303765a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/pubsub-config.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.
+
+-->
+<section [formGroup]="pubSubConfigForm" class="flex flex-col">
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.gcp-project-id</mat-label>
+    <input required matInput formControlName="projectId">
+    <mat-error *ngIf="pubSubConfigForm.get('projectId').hasError('required')">
+      {{ 'rule-node-config.gcp-project-id-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.pubsub-topic-name</mat-label>
+    <input required matInput formControlName="topicName">
+    <mat-error *ngIf="pubSubConfigForm.get('topicName').hasError('required')">
+      {{ 'rule-node-config.pubsub-topic-name-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <tb-file-input style="padding-bottom: 24px;"
+                 formControlName="serviceAccountKey"
+                 [existingFileName]="pubSubConfigForm.get('serviceAccountKeyFileName').value"
+                 (fileNameChanged)="pubSubConfigForm.get('serviceAccountKeyFileName').setValue($event)"
+                 required
+                 requiredAsError
+                 label="{{'rule-node-config.gcp-service-account-key' | translate}}"
+                 noFileText="rule-node-config.no-file"
+                 dropLabel="{{'rule-node-config.drop-file' | translate}}">
+  </tb-file-input>
+  <label translate class="tb-title">rule-node-config.message-attributes</label>
+  <div class="tb-hint" [innerHTML]="'rule-node-config.message-attributes-hint' | translate | safe: 'html'"></div>
+  <tb-kv-map-config-old
+    required="false"
+    formControlName="messageAttributes"
+    keyText="rule-node-config.name"
+    keyRequiredText="rule-node-config.name-required"
+    valText="rule-node-config.value"
+    valRequiredText="rule-node-config.value-required">
+  </tb-kv-map-config-old>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/pubsub-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/pubsub-config.component.ts
new file mode 100644
index 0000000000..f7c65537e0
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/pubsub-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-external-node-pub-sub-config',
+  templateUrl: './pubsub-config.component.html',
+  styleUrls: []
+})
+export class PubSubConfigComponent extends RuleNodeConfigurationComponent {
+
+  pubSubConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.pubSubConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.pubSubConfigForm = this.fb.group({
+      projectId: [configuration ? configuration.projectId : null, [Validators.required]],
+      topicName: [configuration ? configuration.topicName : null, [Validators.required]],
+      serviceAccountKey: [configuration ? configuration.serviceAccountKey : null, [Validators.required]],
+      serviceAccountKeyFileName: [configuration ? configuration.serviceAccountKeyFileName : null, [Validators.required]],
+      messageAttributes: [configuration ? configuration.messageAttributes : null, []]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/rabbit-mq-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/rabbit-mq-config.component.html
new file mode 100644
index 0000000000..c04b0be902
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/rabbit-mq-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="rabbitMqConfigForm" class="flex flex-col">
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.exchange-name-pattern</mat-label>
+    <input matInput formControlName="exchangeNamePattern">
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.routing-key-pattern</mat-label>
+    <input matInput formControlName="routingKeyPattern">
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.message-properties</mat-label>
+    <mat-select formControlName="messageProperties">
+      <mat-option *ngFor="let property of messageProperties" [value]="property">
+        {{ property }}
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
+  <div class="gt-sm:flex gt-sm:flex-row gt-sm:gap-2">
+    <mat-form-field class="mat-block gt-sm:max-w-60% gt-sm:flex-full">
+      <mat-label translate>rule-node-config.host</mat-label>
+      <input required matInput formControlName="host">
+      <mat-error *ngIf="rabbitMqConfigForm.get('host').hasError('required')">
+        {{ 'rule-node-config.host-required' | translate }}
+      </mat-error>
+    </mat-form-field>
+    <mat-form-field class="mat-block gt-sm:max-w-40% gt-sm:flex-full">
+      <mat-label translate>rule-node-config.port</mat-label>
+      <input required type="number" step="1" min="1" max="65535" matInput formControlName="port">
+      <mat-error *ngIf="rabbitMqConfigForm.get('port').hasError('required')">
+        {{ 'rule-node-config.port-required' | translate }}
+      </mat-error>
+      <mat-error *ngIf="rabbitMqConfigForm.get('port').hasError('min')">
+        {{ 'rule-node-config.port-range' | translate }}
+      </mat-error>
+      <mat-error *ngIf="rabbitMqConfigForm.get('port').hasError('max')">
+        {{ 'rule-node-config.port-range' | translate }}
+      </mat-error>
+    </mat-form-field>
+  </div>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.virtual-host</mat-label>
+    <input matInput formControlName="virtualHost">
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.username</mat-label>
+    <input matInput formControlName="username">
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.password</mat-label>
+    <input type="password" matInput formControlName="password">
+    <tb-toggle-password matSuffix></tb-toggle-password>
+  </mat-form-field>
+  <mat-checkbox formControlName="automaticRecoveryEnabled">
+    {{ 'rule-node-config.automatic-recovery' | translate }}
+  </mat-checkbox>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.connection-timeout-ms</mat-label>
+    <input type="number" step="1" min="0" matInput formControlName="connectionTimeout">
+    <mat-error *ngIf="rabbitMqConfigForm.get('connectionTimeout').hasError('min')">
+      {{ 'rule-node-config.min-connection-timeout-ms-message' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.handshake-timeout-ms</mat-label>
+    <input type="number" step="1" min="0" matInput formControlName="handshakeTimeout">
+    <mat-error *ngIf="rabbitMqConfigForm.get('handshakeTimeout').hasError('min')">
+      {{ 'rule-node-config.min-handshake-timeout-ms-message' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <label translate class="tb-title">rule-node-config.client-properties</label>
+  <tb-kv-map-config-old
+    required="false"
+    formControlName="clientProperties"
+    keyText="rule-node-config.key"
+    keyRequiredText="rule-node-config.key-required"
+    valText="rule-node-config.value"
+    valRequiredText="rule-node-config.value-required">
+  </tb-kv-map-config-old>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/rabbit-mq-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/rabbit-mq-config.component.ts
new file mode 100644
index 0000000000..89558bbe7f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/rabbit-mq-config.component.ts
@@ -0,0 +1,64 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-external-node-rabbit-mq-config',
+  templateUrl: './rabbit-mq-config.component.html',
+  styleUrls: []
+})
+export class RabbitMqConfigComponent extends RuleNodeConfigurationComponent {
+
+  rabbitMqConfigForm: UntypedFormGroup;
+
+  messageProperties: string[] = [
+    null,
+    'BASIC',
+    'TEXT_PLAIN',
+    'MINIMAL_BASIC',
+    'MINIMAL_PERSISTENT_BASIC',
+    'PERSISTENT_BASIC',
+    'PERSISTENT_TEXT_PLAIN'
+  ];
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.rabbitMqConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.rabbitMqConfigForm = this.fb.group({
+      exchangeNamePattern: [configuration ? configuration.exchangeNamePattern : null, []],
+      routingKeyPattern: [configuration ? configuration.routingKeyPattern : null, []],
+      messageProperties: [configuration ? configuration.messageProperties : null, []],
+      host: [configuration ? configuration.host : null, [Validators.required]],
+      port: [configuration ? configuration.port : null, [Validators.required, Validators.min(1), Validators.max(65535)]],
+      virtualHost: [configuration ? configuration.virtualHost : null, []],
+      username: [configuration ? configuration.username : null, []],
+      password: [configuration ? configuration.password : null, []],
+      automaticRecoveryEnabled: [configuration ? configuration.automaticRecoveryEnabled : false, []],
+      connectionTimeout: [configuration ? configuration.connectionTimeout : null, [Validators.min(0)]],
+      handshakeTimeout: [configuration ? configuration.handshakeTimeout : null, [Validators.min(0)]],
+      clientProperties: [configuration ? configuration.clientProperties : null, []]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/rest-api-call-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/rest-api-call-config.component.html
new file mode 100644
index 0000000000..0bae38471f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/rest-api-call-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="restApiCallConfigForm" class="flex flex-col">
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.endpoint-url-pattern</mat-label>
+    <input required matInput formControlName="restEndpointUrlPattern">
+    <mat-error *ngIf="restApiCallConfigForm.get('restEndpointUrlPattern').hasError('required')">
+      {{ 'rule-node-config.endpoint-url-pattern-required' | translate }}
+    </mat-error>
+    <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.request-method</mat-label>
+    <mat-select formControlName="requestMethod">
+      <mat-option *ngFor="let requestType of httpRequestTypes" [value]="requestType">
+        {{ requestType }}
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
+  <mat-checkbox formControlName="enableProxy">
+    {{ 'rule-node-config.enable-proxy' | translate }}
+  </mat-checkbox>
+  <mat-checkbox *ngIf="!restApiCallConfigForm.get('enableProxy').value" formControlName="useSimpleClientHttpFactory">
+    {{ 'rule-node-config.use-simple-client-http-factory' | translate }}
+  </mat-checkbox>
+  <mat-checkbox formControlName="parseToPlainText">
+    {{ 'rule-node-config.parse-to-plain-text' | translate }}
+  </mat-checkbox>
+  <div class="tb-hint" style="padding-bottom: 5px;" translate>rule-node-config.parse-to-plain-text-hint</div>
+  <mat-checkbox formControlName="ignoreRequestBody">
+    {{ 'rule-node-config.ignore-request-body' | translate }}
+  </mat-checkbox>
+  <div *ngIf="restApiCallConfigForm.get('enableProxy').value">
+    <mat-checkbox formControlName="useSystemProxyProperties">
+      {{ 'rule-node-config.use-system-proxy-properties' | translate }}
+    </mat-checkbox>
+    <div *ngIf="!restApiCallConfigForm.get('useSystemProxyProperties').value">
+      <div class="gt-sm:flex gt-sm:flex-row gt-sm:gap-2">
+        <mat-form-field class="mat-block gt-sm:max-w-10% gt-sm:flex-full">
+          <mat-label translate>rule-node-config.proxy-scheme</mat-label>
+          <mat-select formControlName="proxyScheme">
+            <mat-option *ngFor="let proxyScheme of proxySchemes" [value]="proxyScheme">
+              {{ proxyScheme }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-form-field class="md-block gt-sm:max-w-50% gt-sm:flex-full">
+          <mat-label translate>rule-node-config.proxy-host</mat-label>
+          <input matInput required formControlName="proxyHost">
+          <mat-error *ngIf="restApiCallConfigForm.get('proxyHost').hasError('required')">
+            {{ 'rule-node-config.proxy-host-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+        <mat-form-field class="mat-block gt-sm:max-w-40% gt-sm:flex-full">
+          <mat-label translate>rule-node-config.proxy-port</mat-label>
+          <input matInput required formControlName="proxyPort" type="number" step="1">
+          <mat-error *ngIf="restApiCallConfigForm.get('proxyPort').hasError('required')">
+            {{ 'rule-node-config.proxy-port-required' | translate }}
+          </mat-error>
+          <mat-error
+            *ngIf="restApiCallConfigForm.get('proxyPort').hasError('min') || restApiCallConfigForm.get('proxyPort').hasError('max')">
+            {{ 'rule-node-config.proxy-port-range' | translate }}
+          </mat-error>
+        </mat-form-field>
+      </div>
+      <mat-form-field class="mat-block">
+        <mat-label translate>rule-node-config.proxy-user</mat-label>
+        <input matInput formControlName="proxyUser">
+      </mat-form-field>
+      <mat-form-field class="mat-block">
+        <mat-label translate>rule-node-config.proxy-password</mat-label>
+        <input matInput formControlName="proxyPassword">
+      </mat-form-field>
+    </div>
+  </div>
+  <mat-form-field *ngIf="!restApiCallConfigForm.get('useSimpleClientHttpFactory').value || restApiCallConfigForm.get('enableProxy').value" class="mat-block"
+                  subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.read-timeout</mat-label>
+    <input type="text" min="0" [max]="IntLimit" inputmode="numeric" pattern="[0-9]*" matInput formControlName="readTimeoutMs">
+    <mat-hint translate>rule-node-config.read-timeout-hint</mat-hint>
+    <mat-error
+      *ngIf="restApiCallConfigForm.get('readTimeoutMs').hasError('max')">
+      {{ 'rule-node-config.int-range' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.max-parallel-requests-count</mat-label>
+    <input type="text" min="0" [max]="IntLimit" inputmode="numeric" pattern="[0-9]*" matInput formControlName="maxParallelRequestsCount">
+    <mat-hint translate>rule-node-config.max-parallel-requests-count-hint</mat-hint>
+    <mat-error
+      *ngIf="restApiCallConfigForm.get('maxParallelRequestsCount').hasError('max')">
+      {{ 'rule-node-config.int-range' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.max-response-size</mat-label>
+    <input type="text" min="1" [max]="MemoryBufferSizeInKbLimit" inputmode="numeric" pattern="[0-9]*" matInput formControlName="maxInMemoryBufferSizeInKb">
+    <mat-hint translate>rule-node-config.max-response-size-hint</mat-hint>
+    <mat-error
+      *ngIf="restApiCallConfigForm.get('maxInMemoryBufferSizeInKb').hasError('min') || restApiCallConfigForm.get('maxInMemoryBufferSizeInKb').hasError('max')">
+      {{ 'rule-node-config.memory-buffer-size-range' | translate: { max: MemoryBufferSizeInKbLimit } }}
+    </mat-error>
+  </mat-form-field>
+  <label translate class="tb-title">rule-node-config.headers</label>
+  <div class="tb-hint" [innerHTML]="'rule-node-config.headers-hint' | translate | safe: 'html'">  </div>
+  <tb-kv-map-config-old
+    required="false"
+    formControlName="headers"
+    keyText="rule-node-config.header"
+    keyRequiredText="rule-node-config.header-required"
+    valText="rule-node-config.value"
+    valRequiredText="rule-node-config.value-required">
+  </tb-kv-map-config-old>
+  <tb-credentials-config formControlName="credentials" [disableCertPemCredentials]="restApiCallConfigForm.get('useSimpleClientHttpFactory').value"></tb-credentials-config>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/rest-api-call-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/rest-api-call-config.component.ts
new file mode 100644
index 0000000000..fc6583c096
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/rest-api-call-config.component.ts
@@ -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 { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { HttpRequestType, IntLimit } from '../rule-node-config.models';
+
+@Component({
+  selector: 'tb-external-node-rest-api-call-config',
+  templateUrl: './rest-api-call-config.component.html',
+  styleUrls: []
+})
+export class RestApiCallConfigComponent extends RuleNodeConfigurationComponent {
+
+  restApiCallConfigForm: UntypedFormGroup;
+
+  readonly proxySchemes: string[] = ['http', 'https'];
+  readonly httpRequestTypes = Object.keys(HttpRequestType);
+  readonly MemoryBufferSizeInKbLimit = 25000;
+  readonly IntLimit = IntLimit;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.restApiCallConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.restApiCallConfigForm = this.fb.group({
+      restEndpointUrlPattern: [configuration ? configuration.restEndpointUrlPattern : null, [Validators.required]],
+      requestMethod: [configuration ? configuration.requestMethod : null, [Validators.required]],
+      useSimpleClientHttpFactory: [configuration ? configuration.useSimpleClientHttpFactory : false, []],
+      parseToPlainText: [configuration ? configuration.parseToPlainText : false, []],
+      ignoreRequestBody: [configuration ? configuration.ignoreRequestBody : false, []],
+      enableProxy: [configuration ? configuration.enableProxy : false, []],
+      useSystemProxyProperties: [configuration ? configuration.enableProxy : false, []],
+      proxyScheme: [configuration ? configuration.proxyHost : null, []],
+      proxyHost: [configuration ? configuration.proxyHost : null, []],
+      proxyPort: [configuration ? configuration.proxyPort : null, []],
+      proxyUser: [configuration ? configuration.proxyUser :null, []],
+      proxyPassword: [configuration ? configuration.proxyPassword :null, []],
+      readTimeoutMs: [configuration ? configuration.readTimeoutMs : null, [Validators.min(0), Validators.max(IntLimit)]],
+      maxParallelRequestsCount: [configuration ? configuration.maxParallelRequestsCount : null, [Validators.min(0), Validators.max(IntLimit)]],
+      headers: [configuration ? configuration.headers : null, []],
+      credentials: [configuration ? configuration.credentials : null, []],
+      maxInMemoryBufferSizeInKb: [configuration ? configuration.maxInMemoryBufferSizeInKb : null, [Validators.min(1), Validators.max(this.MemoryBufferSizeInKbLimit)]]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['useSimpleClientHttpFactory', 'enableProxy', 'useSystemProxyProperties'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const useSimpleClientHttpFactory: boolean = this.restApiCallConfigForm.get('useSimpleClientHttpFactory').value;
+    const enableProxy: boolean = this.restApiCallConfigForm.get('enableProxy').value;
+    const useSystemProxyProperties: boolean = this.restApiCallConfigForm.get('useSystemProxyProperties').value;
+
+    if (enableProxy && !useSystemProxyProperties) {
+      this.restApiCallConfigForm.get('proxyHost').setValidators(enableProxy ? [Validators.required] : []);
+      this.restApiCallConfigForm.get('proxyPort').setValidators(enableProxy ?
+        [Validators.required, Validators.min(1), Validators.max(65535)] : []);
+    } else {
+      this.restApiCallConfigForm.get('proxyHost').setValidators([]);
+      this.restApiCallConfigForm.get('proxyPort').setValidators([]);
+
+      if (useSimpleClientHttpFactory) {
+        this.restApiCallConfigForm.get('readTimeoutMs').setValidators([]);
+      } else {
+        this.restApiCallConfigForm.get('readTimeoutMs').setValidators([Validators.min(0), Validators.max(IntLimit)]);
+      }
+    }
+
+    this.restApiCallConfigForm.get('readTimeoutMs').updateValueAndValidity({emitEvent});
+    this.restApiCallConfigForm.get('proxyHost').updateValueAndValidity({emitEvent});
+    this.restApiCallConfigForm.get('proxyPort').updateValueAndValidity({emitEvent});
+    this.restApiCallConfigForm.get('credentials').updateValueAndValidity({emitEvent});
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/send-email-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/send-email-config.component.html
new file mode 100644
index 0000000000..f24c20038b
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/send-email-config.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.
+
+-->
+<section [formGroup]="sendEmailConfigForm" class="flex flex-col">
+  <mat-checkbox formControlName="useSystemSmtpSettings">
+    {{ 'rule-node-config.use-system-smtp-settings' | translate }}
+  </mat-checkbox>
+  <section class="flex flex-col" *ngIf="sendEmailConfigForm.get('useSystemSmtpSettings').value === false">
+    <mat-form-field class="mat-block">
+      <mat-label translate>rule-node-config.smtp-protocol</mat-label>
+      <mat-select formControlName="smtpProtocol">
+        <mat-option *ngFor="let smtpProtocol of smtpProtocols" [value]="smtpProtocol">
+          {{ smtpProtocol.toUpperCase() }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+    <div class="gt-sm:flex gt-sm:flex-row gt-sm:gap-2">
+      <mat-form-field class="mat-block gt-sm:max-w-60% gt-sm:flex-full">
+        <mat-label translate>rule-node-config.smtp-host</mat-label>
+        <input required matInput formControlName="smtpHost">
+        <mat-error *ngIf="sendEmailConfigForm.get('smtpHost').hasError('required')">
+          {{ 'rule-node-config.smtp-host-required' | translate }}
+        </mat-error>
+      </mat-form-field>
+      <mat-form-field class="mat-block gt-sm:max-w-40% gt-sm:flex-full">
+        <mat-label translate>rule-node-config.smtp-port</mat-label>
+        <input required type="number" step="1" min="1" max="65535" matInput formControlName="smtpPort">
+        <mat-error *ngIf="sendEmailConfigForm.get('smtpPort').hasError('required')">
+          {{ 'rule-node-config.smtp-port-required' | translate }}
+        </mat-error>
+        <mat-error *ngIf="sendEmailConfigForm.get('smtpPort').hasError('min')">
+          {{ 'rule-node-config.smtp-port-range' | translate }}
+        </mat-error>
+        <mat-error *ngIf="sendEmailConfigForm.get('smtpPort').hasError('max')">
+          {{ 'rule-node-config.smtp-port-range' | translate }}
+        </mat-error>
+      </mat-form-field>
+    </div>
+    <mat-form-field class="mat-block">
+      <mat-label translate>rule-node-config.timeout-msec</mat-label>
+      <input required type="number" step="1" min="0" matInput formControlName="timeout">
+      <mat-error *ngIf="sendEmailConfigForm.get('timeout').hasError('required')">
+        {{ 'rule-node-config.timeout-required' | translate }}
+      </mat-error>
+      <mat-error *ngIf="sendEmailConfigForm.get('timeout').hasError('min')">
+        {{ 'rule-node-config.min-timeout-msec-message' | translate }}
+      </mat-error>
+    </mat-form-field>
+    <mat-checkbox formControlName="enableTls">
+      {{ 'rule-node-config.enable-tls' | translate }}
+    </mat-checkbox>
+    <mat-form-field class="mat-block" *ngIf="sendEmailConfigForm.get('enableTls').value === true">
+      <mat-label translate>rule-node-config.tls-version</mat-label>
+      <mat-select formControlName="tlsVersion">
+        <mat-option *ngFor="let tlsVersion of tlsVersions" [value]="tlsVersion">
+          {{ tlsVersion }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+    <tb-checkbox formControlName="enableProxy">
+      {{ 'rule-node-config.enable-proxy' | translate }}
+    </tb-checkbox>
+    <div *ngIf="sendEmailConfigForm.get('enableProxy').value">
+      <div class="gt-sm:flex gt-sm:flex-row gt-sm:gap-2">
+        <mat-form-field class="mat-block gt-sm:max-w-60% gt-sm:flex-full">
+          <mat-label translate>rule-node-config.proxy-host</mat-label>
+          <input matInput required formControlName="proxyHost">
+          <mat-error *ngIf="sendEmailConfigForm.get('proxyHost').hasError('required')">
+            {{ 'rule-node-config.proxy-host-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+        <mat-form-field class="mat-block gt-sm:max-w-40% gt-sm:flex-full">
+          <mat-label translate>rule-node-config.proxy-port</mat-label>
+          <input matInput required formControlName="proxyPort" type="number" step="1" min="1" max="65535">
+          <mat-error *ngIf="sendEmailConfigForm.get('proxyPort').hasError('required')">
+            {{ 'rule-node-config.proxy-port-required' | translate }}
+          </mat-error>
+          <mat-error *ngIf="sendEmailConfigForm.get('proxyPort').hasError('min') || sendEmailConfigForm.get('proxyPort').hasError('max')">
+            {{ 'rule-node-config.proxy-port-range' | translate }}
+          </mat-error>
+        </mat-form-field>
+      </div>
+      <mat-form-field class="mat-block">
+        <mat-label translate>rule-node-config.proxy-user</mat-label>
+        <input matInput formControlName="proxyUser">
+      </mat-form-field>
+      <mat-form-field class="mat-block">
+        <mat-label translate>rule-node-config.proxy-password</mat-label>
+        <input matInput formControlName="proxyPassword">
+      </mat-form-field>
+    </div>
+    <mat-form-field class="mat-block" floatLabel="always">
+      <mat-label translate>rule-node-config.username</mat-label>
+      <input matInput placeholder="{{ 'rule-node-config.enter-username' | translate }}" formControlName="username">
+    </mat-form-field>
+    <mat-form-field class="mat-block" floatLabel="always">
+      <mat-label translate>rule-node-config.password</mat-label>
+      <input matInput type="password" placeholder="{{ 'rule-node-config.enter-password' | translate }}" formControlName="password">
+      <tb-toggle-password matSuffix></tb-toggle-password>
+    </mat-form-field>
+  </section>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/send-email-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/send-email-config.component.ts
new file mode 100644
index 0000000000..b0e77d6649
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/send-email-config.component.ts
@@ -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 { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-external-node-send-email-config',
+  templateUrl: './send-email-config.component.html',
+  styleUrls: []
+})
+export class SendEmailConfigComponent extends RuleNodeConfigurationComponent {
+
+  sendEmailConfigForm: UntypedFormGroup;
+
+  smtpProtocols: string[] = [
+    'smtp',
+    'smtps'
+  ];
+
+  tlsVersions = ['TLSv1', 'TLSv1.1', 'TLSv1.2', 'TLSv1.3'];
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.sendEmailConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.sendEmailConfigForm = this.fb.group({
+      useSystemSmtpSettings: [configuration ? configuration.useSystemSmtpSettings : false, []],
+      smtpProtocol: [configuration ? configuration.smtpProtocol : null, []],
+      smtpHost: [configuration ? configuration.smtpHost : null, []],
+      smtpPort: [configuration ? configuration.smtpPort : null, []],
+      timeout: [configuration ? configuration.timeout : null, []],
+      enableTls: [configuration ? configuration.enableTls : false, []],
+      tlsVersion: [configuration ? configuration.tlsVersion : null, []],
+      enableProxy: [configuration ? configuration.enableProxy : false, []],
+      proxyHost: [configuration ? configuration.proxyHost : null, []],
+      proxyPort: [configuration ? configuration.proxyPort : null, []],
+      proxyUser: [configuration ? configuration.proxyUser :null, []],
+      proxyPassword: [configuration ? configuration.proxyPassword :null, []],
+      username: [configuration ? configuration.username : null, []],
+      password: [configuration ? configuration.password : null, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['useSystemSmtpSettings', 'enableProxy'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const useSystemSmtpSettings: boolean = this.sendEmailConfigForm.get('useSystemSmtpSettings').value;
+    const enableProxy: boolean = this.sendEmailConfigForm.get('enableProxy').value;
+    if (useSystemSmtpSettings) {
+      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([]);
+    } else {
+      this.sendEmailConfigForm.get('smtpProtocol').setValidators([Validators.required]);
+      this.sendEmailConfigForm.get('smtpHost').setValidators([Validators.required]);
+      this.sendEmailConfigForm.get('smtpPort').setValidators([Validators.required, Validators.min(1), Validators.max(65535)]);
+      this.sendEmailConfigForm.get('timeout').setValidators([Validators.required, Validators.min(0)]);
+      this.sendEmailConfigForm.get('proxyHost').setValidators(enableProxy ? [Validators.required] : []);
+      this.sendEmailConfigForm.get('proxyPort').setValidators(enableProxy ?
+        [Validators.required, Validators.min(1), Validators.max(65535)] : []);
+    }
+    this.sendEmailConfigForm.get('smtpProtocol').updateValueAndValidity({emitEvent});
+    this.sendEmailConfigForm.get('smtpHost').updateValueAndValidity({emitEvent});
+    this.sendEmailConfigForm.get('smtpPort').updateValueAndValidity({emitEvent});
+    this.sendEmailConfigForm.get('timeout').updateValueAndValidity({emitEvent});
+    this.sendEmailConfigForm.get('proxyHost').updateValueAndValidity({emitEvent});
+    this.sendEmailConfigForm.get('proxyPort').updateValueAndValidity({emitEvent});
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/send-sms-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/send-sms-config.component.html
new file mode 100644
index 0000000000..3b4e63308a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/send-sms-config.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.
+
+-->
+<section [formGroup]="sendSmsConfigForm" class="flex flex-col">
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.numbers-to-template</mat-label>
+    <input required matInput formControlName="numbersToTemplate">
+    <mat-error *ngIf="sendSmsConfigForm.get('numbersToTemplate').hasError('required')">
+      {{ 'rule-node-config.numbers-to-template-required' | translate }}
+    </mat-error>
+    <mat-hint [innerHTML]="'rule-node-config.numbers-to-template-hint' | translate | safe: 'html'"></mat-hint>
+  </mat-form-field>
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.sms-message-template</mat-label>
+    <textarea required matInput formControlName="smsMessageTemplate" rows="6"></textarea>
+    <mat-error *ngIf="sendSmsConfigForm.get('smsMessageTemplate').hasError('required')">
+      {{ 'rule-node-config.sms-message-template-required' | translate }}
+    </mat-error>
+    <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+  </mat-form-field>
+  <mat-checkbox formControlName="useSystemSmsSettings">
+    {{ 'rule-node-config.use-system-sms-settings' | translate }}
+  </mat-checkbox>
+  <tb-sms-provider-configuration
+    *ngIf="sendSmsConfigForm.get('useSystemSmsSettings').value === false"
+    formControlName="smsProviderConfiguration"
+    required>
+  </tb-sms-provider-configuration>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/send-sms-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/send-sms-config.component.ts
new file mode 100644
index 0000000000..aef2077e1c
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/send-sms-config.component.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 { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-external-node-send-sms-config',
+  templateUrl: './send-sms-config.component.html',
+  styleUrls: []
+})
+export class SendSmsConfigComponent extends RuleNodeConfigurationComponent {
+
+  sendSmsConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.sendSmsConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.sendSmsConfigForm = this.fb.group({
+      numbersToTemplate: [configuration ? configuration.numbersToTemplate : null, [Validators.required]],
+      smsMessageTemplate: [configuration ? configuration.smsMessageTemplate : null, [Validators.required]],
+      useSystemSmsSettings: [configuration ? configuration.useSystemSmsSettings : false, []],
+      smsProviderConfiguration: [configuration ? configuration.smsProviderConfiguration : null, []],
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['useSystemSmsSettings'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const useSystemSmsSettings: boolean = this.sendSmsConfigForm.get('useSystemSmsSettings').value;
+    if (useSystemSmsSettings) {
+      this.sendSmsConfigForm.get('smsProviderConfiguration').setValidators([]);
+    } else {
+      this.sendSmsConfigForm.get('smsProviderConfiguration').setValidators([Validators.required]);
+    }
+    this.sendSmsConfigForm.get('smsProviderConfiguration').updateValueAndValidity({emitEvent});
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/slack-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/slack-config.component.html
new file mode 100644
index 0000000000..c5cf2b9d2f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/slack-config.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.
+
+-->
+<section [formGroup]="slackConfigForm" class="flex flex-col">
+  <mat-form-field class="mat-block flex-1">
+    <mat-label translate>rule-node-config.message-template</mat-label>
+    <input required matInput formControlName="messageTemplate">
+    <mat-error *ngIf="slackConfigForm.get('messageTemplate').hasError('required')">
+      {{ 'rule-node-config.message-template-required' | translate }}
+    </mat-error>
+    <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+  </mat-form-field>
+  <mat-checkbox formControlName="useSystemSettings">
+    {{ 'rule-node-config.use-system-slack-settings' | translate }}
+  </mat-checkbox>
+  <mat-form-field *ngIf="!slackConfigForm.get('useSystemSettings').value" class="mat-block">
+    <mat-label translate>rule-node-config.slack-api-token</mat-label>
+    <input required matInput formControlName="botToken">
+    <mat-error *ngIf="slackConfigForm.get('botToken').hasError('required')">
+      {{ 'rule-node-config.slack-api-token-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <label class="tb-title">{{ 'notification.slack-chanel-type' | translate }}</label>
+  <mat-radio-group formControlName="conversationType">
+    <mat-radio-button *ngFor="let slackChanelType of slackChanelTypes" [value]="slackChanelType">
+      {{ slackChanelTypesTranslateMap.get(slackChanelType) | translate }}
+    </mat-radio-button>
+  </mat-radio-group>
+  <tb-slack-conversation-autocomplete
+    formControlName="conversation"
+    required
+    [token]="slackConfigForm.get('useSystemSettings').value ? '' : slackConfigForm.get('botToken').value"
+    [slackChanelType]="slackConfigForm.get('conversationType').value">
+  </tb-slack-conversation-autocomplete>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/slack-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/external/slack-config.component.scss
new file mode 100644
index 0000000000..524b588874
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/slack-config.component.scss
@@ -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.
+ */
+: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;
+
+    .mat-mdc-radio-button {
+      flex: 1 1 100%;
+      padding: 4px;
+      border: 1px solid rgba(0, 0, 0, 0.12);
+      border-radius: 6px;
+    }
+  }
+
+  @media screen and (max-width: 599px) {
+    .mat-mdc-radio-group {
+      flex-direction: column;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/slack-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/slack-config.component.ts
new file mode 100644
index 0000000000..4d8cfc7a32
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/slack-config.component.ts
@@ -0,0 +1,64 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, SlackChanelType, SlackChanelTypesTranslateMap } from '@app/shared/public-api';
+import { RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-external-node-slack-config',
+  templateUrl: './slack-config.component.html',
+  styleUrls: ['./slack-config.component.scss']
+})
+export class SlackConfigComponent extends RuleNodeConfigurationComponent {
+
+  slackConfigForm: FormGroup;
+  slackChanelTypes = Object.keys(SlackChanelType) as SlackChanelType[];
+  slackChanelTypesTranslateMap = SlackChanelTypesTranslateMap;
+
+  constructor(private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.slackConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.slackConfigForm = this.fb.group({
+      botToken: [configuration ? configuration.botToken : null],
+      useSystemSettings: [configuration ? configuration.useSystemSettings : false],
+      messageTemplate: [configuration ? configuration.messageTemplate : null, [Validators.required]],
+      conversationType: [configuration ? configuration.conversationType : null, [Validators.required]],
+      conversation: [configuration ? configuration.conversation : null, [Validators.required]],
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['useSystemSettings'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const useSystemSettings: boolean = this.slackConfigForm.get('useSystemSettings').value;
+    if (useSystemSettings) {
+      this.slackConfigForm.get('botToken').clearValidators();
+    } else {
+      this.slackConfigForm.get('botToken').setValidators([Validators.required]);
+    }
+    this.slackConfigForm.get('botToken').updateValueAndValidity({emitEvent});
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/sns-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/sns-config.component.html
new file mode 100644
index 0000000000..a5be9017a3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/sns-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="snsConfigForm" class="flex flex-col">
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.topic-arn-pattern</mat-label>
+    <input required matInput formControlName="topicArnPattern">
+    <mat-error *ngIf="snsConfigForm.get('topicArnPattern').hasError('required')">
+      {{ 'rule-node-config.topic-arn-pattern-required' | translate }}
+    </mat-error>
+    <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.aws-access-key-id</mat-label>
+    <input required matInput formControlName="accessKeyId">
+    <mat-error *ngIf="snsConfigForm.get('accessKeyId').hasError('required')">
+      {{ 'rule-node-config.aws-access-key-id-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.aws-secret-access-key</mat-label>
+    <input required matInput formControlName="secretAccessKey">
+    <mat-error *ngIf="snsConfigForm.get('secretAccessKey').hasError('required')">
+      {{ 'rule-node-config.aws-secret-access-key-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.aws-region</mat-label>
+    <input required matInput formControlName="region">
+    <mat-error *ngIf="snsConfigForm.get('region').hasError('required')">
+      {{ 'rule-node-config.aws-region-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/sns-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/sns-config.component.ts
new file mode 100644
index 0000000000..9c2159c2a9
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/sns-config.component.ts
@@ -0,0 +1,46 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-external-node-sns-config',
+  templateUrl: './sns-config.component.html',
+  styleUrls: []
+})
+export class SnsConfigComponent extends RuleNodeConfigurationComponent {
+
+  snsConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.snsConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.snsConfigForm = this.fb.group({
+      topicArnPattern: [configuration ? configuration.topicArnPattern : null, [Validators.required]],
+      accessKeyId: [configuration ? configuration.accessKeyId : null, [Validators.required]],
+      secretAccessKey: [configuration ? configuration.secretAccessKey : null, [Validators.required]],
+      region: [configuration ? configuration.region : null, [Validators.required]]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/sqs-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/sqs-config.component.html
new file mode 100644
index 0000000000..2956cc4ab0
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/sqs-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="sqsConfigForm" class="flex flex-col">
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.queue-type</mat-label>
+    <mat-select formControlName="queueType" required>
+      <mat-option *ngFor="let type of sqsQueueTypes" [value]="type">
+        {{ sqsQueueTypeTranslationsMap.get(type) | translate }}
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>rule-node-config.queue-url-pattern</mat-label>
+    <input required matInput formControlName="queueUrlPattern">
+    <mat-error *ngIf="sqsConfigForm.get('queueUrlPattern').hasError('required')">
+      {{ 'rule-node-config.queue-url-pattern-required' | translate }}
+    </mat-error>
+    <mat-hint translate>rule-node-config.general-pattern-hint</mat-hint>
+  </mat-form-field>
+  <mat-form-field *ngIf="sqsConfigForm.get('queueType').value === sqsQueueType.STANDARD" class="mat-block">
+    <mat-label translate>rule-node-config.delay-seconds</mat-label>
+    <input required type="number" min="0" max="900" step="1" matInput formControlName="delaySeconds">
+    <mat-error *ngIf="sqsConfigForm.get('delaySeconds').hasError('min')">
+      {{ 'rule-node-config.min-delay-seconds-message' | translate }}
+    </mat-error>
+    <mat-error *ngIf="sqsConfigForm.get('delaySeconds').hasError('max')">
+      {{ 'rule-node-config.max-delay-seconds-message' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <label translate class="tb-title">rule-node-config.message-attributes</label>
+  <div class="tb-hint" [innerHTML]="'rule-node-config.message-attributes-hint' | translate | safe: 'html'"></div>
+  <tb-kv-map-config-old
+    required="false"
+    formControlName="messageAttributes"
+    keyText="rule-node-config.name"
+    keyRequiredText="rule-node-config.name-required"
+    valText="rule-node-config.value"
+    valRequiredText="rule-node-config.value-required">
+  </tb-kv-map-config-old>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.aws-access-key-id</mat-label>
+    <input required matInput formControlName="accessKeyId">
+    <mat-error *ngIf="sqsConfigForm.get('accessKeyId').hasError('required')">
+      {{ 'rule-node-config.aws-access-key-id-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.aws-secret-access-key</mat-label>
+    <input required matInput formControlName="secretAccessKey">
+    <mat-error *ngIf="sqsConfigForm.get('secretAccessKey').hasError('required')">
+      {{ 'rule-node-config.aws-secret-access-key-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>rule-node-config.aws-region</mat-label>
+    <input required matInput formControlName="region">
+    <mat-error *ngIf="sqsConfigForm.get('region').hasError('required')">
+      {{ 'rule-node-config.aws-region-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/sqs-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/sqs-config.component.ts
new file mode 100644
index 0000000000..8e77682c4f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/sqs-config.component.ts
@@ -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 { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { SqsQueueType, sqsQueueTypeTranslations } from '@home/components/rule-node/rule-node-config.models';
+
+@Component({
+  selector: 'tb-external-node-sqs-config',
+  templateUrl: './sqs-config.component.html',
+  styleUrls: []
+})
+export class SqsConfigComponent extends RuleNodeConfigurationComponent {
+
+  sqsConfigForm: UntypedFormGroup;
+
+  sqsQueueType = SqsQueueType;
+  sqsQueueTypes = Object.keys(SqsQueueType);
+  sqsQueueTypeTranslationsMap = sqsQueueTypeTranslations;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.sqsConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.sqsConfigForm = this.fb.group({
+      queueType: [configuration ? configuration.queueType : null, [Validators.required]],
+      queueUrlPattern: [configuration ? configuration.queueUrlPattern : null, [Validators.required]],
+      delaySeconds: [configuration ? configuration.delaySeconds : null, [Validators.min(0), Validators.max(900)]],
+      messageAttributes: [configuration ? configuration.messageAttributes : null, []],
+      accessKeyId: [configuration ? configuration.accessKeyId : null, [Validators.required]],
+      secretAccessKey: [configuration ? configuration.secretAccessKey : null, [Validators.required]],
+      region: [configuration ? configuration.region : null, [Validators.required]]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/check-alarm-status.component.html b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-alarm-status.component.html
new file mode 100644
index 0000000000..b8f0faf15f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-alarm-status.component.html
@@ -0,0 +1,29 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="alarmStatusConfigForm" class="tb-form-panel stroked">
+  <div class="tb-form-row no-padding no-border space-between">
+    <div class="tb-form-panel-title tb-required" translate>rule-node-config.alarm-status</div>
+    <div class="tb-form-panel-hint tb-error" translate [hidden]="alarmStatusConfigForm.get('alarmStatusList').valid">
+      rule-node-config.alarm-required
+    </div>
+  </div>
+  <tb-alarm-status-select formControlName="alarmStatusList"></tb-alarm-status-select>
+</section>
+
+
+
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/check-alarm-status.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-alarm-status.component.ts
new file mode 100644
index 0000000000..125fde1bd6
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-alarm-status.component.ts
@@ -0,0 +1,52 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-filter-node-check-alarm-status-config',
+  templateUrl: './check-alarm-status.component.html',
+  styleUrls: []
+})
+export class CheckAlarmStatusComponent extends RuleNodeConfigurationComponent {
+  alarmStatusConfigForm: FormGroup;
+
+  searchText = '';
+
+  constructor(private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.alarmStatusConfigForm;
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      alarmStatusList: isDefinedAndNotNull(configuration?.alarmStatusList) ? configuration.alarmStatusList : null
+    };
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.alarmStatusConfigForm = this.fb.group({
+      alarmStatusList: [configuration.alarmStatusList, [Validators.required]],
+    });
+  }
+}
+
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/check-message-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-message-config.component.html
new file mode 100644
index 0000000000..6566912570
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-message-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="checkMessageConfigForm" class="tb-form-panel stroked">
+  <div class="tb-form-row no-padding no-border space-between">
+    <div class="tb-form-panel-title tb-required" translate>rule-node-config.fields-to-check</div>
+    <div class="tb-form-panel-hint tb-error" translate [hidden]="!(touchedValidationControl && checkMessageConfigForm.hasError('atLeastOne'))">
+      rule-node-config.at-least-one-field-required
+    </div>
+  </div>
+  <tb-string-items-list editable subscriptSizing="dynamic"
+                        [label]="'rule-node-config.data-keys' | translate"
+                        [placeholder]="'rule-node-config.add-message-field' | translate"
+                        formControlName="messageNames">
+    <mat-icon matSuffix color="primary" class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+              matTooltip="{{ 'rule-node-config.chip-help' | translate: { inputName: 'rule-node-config.field-name' | translate } }}">help</mat-icon>
+  </tb-string-items-list>
+  <tb-string-items-list editable subscriptSizing="dynamic"
+                        [label]="'rule-node-config.metadata-keys' | translate"
+                        [placeholder]="'rule-node-config.add-metadata-field' | translate"
+                        formControlName="metadataNames">
+    <mat-icon matSuffix color="primary" class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+              matTooltip="{{ 'rule-node-config.chip-help' | translate: { inputName: 'rule-node-config.field-name' | translate } }}">help</mat-icon>
+  </tb-string-items-list>
+  <div tb-hint-tooltip-icon="{{ 'rule-node-config.check-all-keys-tooltip' | translate }}"
+       class="tb-form-row no-border no-padding">
+    <mat-slide-toggle class="mat-slide" formControlName="checkAllKeys">
+      {{ 'rule-node-config.check-all-keys' | translate }}
+    </mat-slide-toggle>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/check-message-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-message-config.component.ts
new file mode 100644
index 0000000000..2904c8eee2
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-message-config.component.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 { Component } from '@angular/core';
+import { isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup, ValidationErrors, ValidatorFn, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-filter-node-check-message-config',
+  templateUrl: './check-message-config.component.html',
+  styleUrls: []
+})
+export class CheckMessageConfigComponent extends RuleNodeConfigurationComponent {
+
+  checkMessageConfigForm: FormGroup;
+
+  constructor(private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.checkMessageConfigForm;
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      messageNames: isDefinedAndNotNull(configuration?.messageNames) ? configuration.messageNames : [],
+      metadataNames: isDefinedAndNotNull(configuration?.metadataNames) ? configuration.metadataNames : [],
+      checkAllKeys: isDefinedAndNotNull(configuration?.checkAllKeys) ? configuration.checkAllKeys : false
+    };
+  }
+
+  protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      messageNames: isDefinedAndNotNull(configuration?.messageNames) ? configuration.messageNames : [],
+      metadataNames: isDefinedAndNotNull(configuration?.metadataNames) ? configuration.metadataNames : [],
+      checkAllKeys: configuration.checkAllKeys
+    };
+  }
+
+
+  private atLeastOne(validator: ValidatorFn, controls: string[] = null) {
+    return (group: FormGroup): ValidationErrors | null => {
+      if (!controls) {
+        controls = Object.keys(group.controls);
+      }
+      const hasAtLeastOne = group?.controls && controls.some(k => !validator(group.controls[k]));
+
+      return hasAtLeastOne ? null : {atLeastOne: true};
+    };
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.checkMessageConfigForm = this.fb.group({
+      messageNames: [configuration.messageNames, []],
+      metadataNames: [configuration.metadataNames, []],
+      checkAllKeys: [configuration.checkAllKeys, []]
+    }, {validators: this.atLeastOne(Validators.required, ['messageNames', 'metadataNames'])});
+  }
+
+  get touchedValidationControl(): boolean {
+    return ['messageNames', 'metadataNames'].some(name => this.checkMessageConfigForm.get(name).touched);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/check-relation-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-relation-config.component.html
new file mode 100644
index 0000000000..b9763b280f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-relation-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="checkRelationConfigForm" class="tb-form-panel stroked no-padding-bottom">
+  <div class="tb-form-panel-title" translate>rule-node-config.relation-search-parameters</div>
+  <div class="flex flex-col">
+    <mat-form-field class="mat-block" hideRequiredMarker>
+      <mat-label>{{ 'relation.direction' | translate }}</mat-label>
+      <mat-select formControlName="direction" required>
+        <mat-option *ngFor="let direction of entitySearchDirection" [value]="direction">
+          {{ entitySearchDirectionTranslationsMap.get(direction) | translate }} <span translate>rule-node-config.relations-query-config-direction-suffix</span>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+    <tb-relation-type-autocomplete
+      required
+      formControlName="relationType">
+    </tb-relation-type-autocomplete>
+    <div tb-hint-tooltip-icon="{{ 'rule-node-config.check-relation-to-specific-entity-tooltip' | translate }}"
+         class="tb-form-row no-border no-padding slide-toggle">
+      <mat-slide-toggle class="mat-slide" formControlName="checkForSingleEntity">
+        {{ 'rule-node-config.check-relation-to-specific-entity' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div *ngIf="checkRelationConfigForm.get('checkForSingleEntity').value" class="same-width-component-row">
+      <tb-entity-type-select
+        style="min-width: 100px; flex: 1;"
+        showLabel
+        required
+        formControlName="entityType">
+      </tb-entity-type-select>
+      <tb-entity-autocomplete
+        class="flex-1"
+        required
+        *ngIf="checkRelationConfigForm.get('entityType').value"
+        [entityType]="checkRelationConfigForm.get('entityType').value"
+        formControlName="entityId">
+      </tb-entity-autocomplete>
+    </div>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/check-relation-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-relation-config.component.scss
new file mode 100644
index 0000000000..b61d0a5bb5
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-relation-config.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.
+ */
+:host {
+  .slide-toggle {
+    margin-bottom: 18px
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/check-relation-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-relation-config.component.ts
new file mode 100644
index 0000000000..6c8a01050f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/check-relation-config.component.ts
@@ -0,0 +1,77 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { isDefinedAndNotNull } from '@core/public-api';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { EntitySearchDirection, entitySearchDirectionTranslations } from '@app/shared/models/relation.models';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-filter-node-check-relation-config',
+  templateUrl: './check-relation-config.component.html',
+  styleUrls: ['./check-relation-config.component.scss']
+})
+export class CheckRelationConfigComponent extends RuleNodeConfigurationComponent {
+
+  checkRelationConfigForm: UntypedFormGroup;
+
+  entitySearchDirection: Array<EntitySearchDirection> = Object.values(EntitySearchDirection);
+  entitySearchDirectionTranslationsMap = entitySearchDirectionTranslations;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.checkRelationConfigForm;
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      checkForSingleEntity: isDefinedAndNotNull(configuration?.checkForSingleEntity) ? configuration.checkForSingleEntity : false,
+      direction: isDefinedAndNotNull(configuration?.direction) ? configuration.direction : null,
+      entityType: isDefinedAndNotNull(configuration?.entityType) ? configuration.entityType : null,
+      entityId: isDefinedAndNotNull(configuration?.entityId) ? configuration.entityId : null,
+      relationType: isDefinedAndNotNull(configuration?.relationType) ? configuration.relationType : null
+    };
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.checkRelationConfigForm = this.fb.group({
+      checkForSingleEntity: [configuration.checkForSingleEntity, []],
+      direction: [configuration.direction, []],
+      entityType: [configuration.entityType,
+        configuration && configuration.checkForSingleEntity ? [Validators.required] : []],
+      entityId: [configuration.entityId,
+        configuration && configuration.checkForSingleEntity ? [Validators.required] : []],
+      relationType: [configuration.relationType, [Validators.required]]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['checkForSingleEntity'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const checkForSingleEntity: boolean = this.checkRelationConfigForm.get('checkForSingleEntity').value;
+    this.checkRelationConfigForm.get('entityType').setValidators(checkForSingleEntity ? [Validators.required] : []);
+    this.checkRelationConfigForm.get('entityType').updateValueAndValidity({emitEvent});
+    this.checkRelationConfigForm.get('entityId').setValidators(checkForSingleEntity ? [Validators.required] : []);
+    this.checkRelationConfigForm.get('entityId').updateValueAndValidity({emitEvent});
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/filter-rule-node-config.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/filter/filter-rule-node-config.module.ts
new file mode 100644
index 0000000000..2b26991a16
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/filter-rule-node-config.module.ts
@@ -0,0 +1,58 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '@shared/public-api';
+import { CheckMessageConfigComponent } from './check-message-config.component';
+import { CheckRelationConfigComponent } from './check-relation-config.component';
+import { GpsGeoFilterConfigComponent } from './gps-geo-filter-config.component';
+import { MessageTypeConfigComponent } from './message-type-config.component';
+import { OriginatorTypeConfigComponent } from './originator-type-config.component';
+import { ScriptConfigComponent } from './script-config.component';
+import { SwitchConfigComponent } from './switch-config.component';
+import { CheckAlarmStatusComponent } from './check-alarm-status.component';
+import { CommonRuleNodeConfigModule } from '../common/common-rule-node-config.module';
+
+@NgModule({
+  declarations: [
+    CheckMessageConfigComponent,
+    CheckRelationConfigComponent,
+    GpsGeoFilterConfigComponent,
+    MessageTypeConfigComponent,
+    OriginatorTypeConfigComponent,
+    ScriptConfigComponent,
+    SwitchConfigComponent,
+    CheckAlarmStatusComponent
+  ],
+  imports: [
+    CommonModule,
+    SharedModule,
+    CommonRuleNodeConfigModule
+  ],
+  exports: [
+    CheckMessageConfigComponent,
+    CheckRelationConfigComponent,
+    GpsGeoFilterConfigComponent,
+    MessageTypeConfigComponent,
+    OriginatorTypeConfigComponent,
+    ScriptConfigComponent,
+    SwitchConfigComponent,
+    CheckAlarmStatusComponent
+  ]
+})
+export class FilterRuleNodeConfigModule {
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/gps-geo-filter-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/filter/gps-geo-filter-config.component.html
new file mode 100644
index 0000000000..ac09e2156a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/gps-geo-filter-config.component.html
@@ -0,0 +1,126 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="geoFilterConfigForm" class="tb-form-panel no-border no-padding">
+  <section class="tb-form-panel stroked">
+    <div class="tb-form-panel-title" translate>rule-node-config.coordinate-field-names</div>
+    <section>
+      <div class="flex flex-row gap-4">
+        <mat-form-field class="mat-block max-w-50% flex-full">
+          <mat-label>{{ 'rule-node-config.latitude-field-name' | translate }}</mat-label>
+          <input matInput formControlName="latitudeKeyName" required>
+          <mat-error *ngIf="geoFilterConfigForm.get('latitudeKeyName').hasError('required')">
+            {{ 'rule-node-config.latitude-field-name-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+        <mat-form-field class="mat-block max-w-50% flex-full">
+          <mat-label>{{ 'rule-node-config.longitude-field-name' | translate }}</mat-label>
+          <input matInput formControlName="longitudeKeyName" required>
+          <mat-error *ngIf="geoFilterConfigForm.get('longitudeKeyName').hasError('required')">
+            {{ 'rule-node-config.longitude-field-name-required' | translate }}
+          </mat-error>
+        </mat-form-field>
+      </div>
+    <div class="tb-form-hint tb-primary-fill" translate>rule-node-config.coordinate-field-hint</div>
+    </section>
+  </section>
+  <section class="tb-form-panel stroked" [class.no-padding-bottom]="!defaultPaddingEnable">
+    <div class="tb-form-panel-title" translate>rule-node-config.geofence-configuration</div>
+    <section class="flex flex-col">
+      <mat-form-field class="mat-block flex-1" hideRequiredMarker>
+        <mat-label>{{ 'rule-node-config.perimeter-type' | translate }}</mat-label>
+        <mat-select formControlName="perimeterType">
+          <mat-option *ngFor="let type of perimeterTypes" [value]="type">
+            {{ perimeterTypeTranslationMap.get(type) | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <div tb-hint-tooltip-icon="{{ geoFilterConfigForm.get('perimeterType').value === perimeterType.CIRCLE
+        ? ('rule-node-config.fetch-circle-parameter-info-from-metadata-hint'
+            | translate : { perimeterKeyName: geoFilterConfigForm.get('perimeterKeyName').valid
+                              ? geoFilterConfigForm.get('perimeterKeyName').value
+                              : 'ss_perimeter'})
+        : ('rule-node-config.fetch-poligon-parameter-info-from-metadata-hint'
+            | translate : { perimeterKeyName: geoFilterConfigForm.get('perimeterKeyName').valid
+                              ? geoFilterConfigForm.get('perimeterKeyName').value
+                              : 'ss_perimeter'}) }}"
+           class="tb-form-row no-border no-padding slide-toggle">
+        <mat-slide-toggle class="mat-slide" formControlName="fetchPerimeterInfoFromMessageMetadata">
+          {{ 'rule-node-config.fetch-perimeter-info-from-metadata' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <mat-form-field *ngIf="geoFilterConfigForm.get('fetchPerimeterInfoFromMessageMetadata').value" class="mat-block">
+        <mat-label>{{ 'rule-node-config.perimeter-key-name' | translate }}</mat-label>
+        <input matInput formControlName="perimeterKeyName" required>
+        <mat-error *ngIf="geoFilterConfigForm.get('perimeterKeyName').hasError('required')">
+          {{ 'rule-node-config.perimeter-key-name-required' | translate }}
+        </mat-error>
+        <mat-hint>{{ 'rule-node-config.perimeter-key-name-hint' | translate }}</mat-hint>
+      </mat-form-field>
+      <div class="flex flex-col"
+           *ngIf="geoFilterConfigForm.get('perimeterType').value === perimeterType.CIRCLE &&
+                    !geoFilterConfigForm.get('fetchPerimeterInfoFromMessageMetadata').value">
+        <div class="flex flex-row gap-4">
+          <mat-form-field class="flex-1">
+            <mat-label>{{ 'rule-node-config.circle-center-latitude' | translate }}</mat-label>
+            <input type="number" min="-90" max="90" step="0.1" matInput formControlName="centerLatitude" required>
+            <mat-error *ngIf="geoFilterConfigForm.get('centerLatitude').hasError('required')">
+              {{ 'rule-node-config.circle-center-latitude-required' | translate }}
+            </mat-error>
+          </mat-form-field>
+          <mat-form-field class="flex-1">
+            <mat-label>{{ 'rule-node-config.circle-center-longitude' | translate }}</mat-label>
+            <input type="number" min="-180" max="180" step="0.1" matInput formControlName="centerLongitude" required>
+            <mat-error *ngIf="geoFilterConfigForm.get('centerLongitude').hasError('required')">
+              {{ 'rule-node-config.circle-center-longitude-required' | translate }}
+            </mat-error>
+          </mat-form-field>
+        </div>
+        <div class="flex flex-row gap-4">
+          <mat-form-field class="flex-1">
+            <mat-label>{{ 'rule-node-config.range' | translate }}</mat-label>
+            <input type="number" min="0" step="0.1" matInput formControlName="range" required>
+            <mat-error *ngIf="geoFilterConfigForm.get('range').hasError('required')">
+              {{ 'rule-node-config.range-required' | translate }}
+            </mat-error>
+          </mat-form-field>
+          <mat-form-field class="flex-1">
+            <mat-label>{{ 'rule-node-config.range-units' | translate }}</mat-label>
+            <mat-select formControlName="rangeUnit" required>
+              <mat-option *ngFor="let type of rangeUnits" [value]="type">
+                {{ rangeUnitTranslationMap.get(type) | translate }}
+              </mat-option>
+            </mat-select>
+            <mat-error *ngIf="geoFilterConfigForm.get('rangeUnit').hasError('required')">
+              {{ 'rule-node-config.range-units-required' | translate }}
+            </mat-error>
+          </mat-form-field>
+        </div>
+      </div>
+      <mat-form-field class="mat-block" subscriptSizing="dynamic"
+                      *ngIf="geoFilterConfigForm.get('perimeterType').value === perimeterType.POLYGON &&
+                         !geoFilterConfigForm.get('fetchPerimeterInfoFromMessageMetadata').value">
+        <mat-label>{{ 'rule-node-config.polygon-definition' | translate }}</mat-label>
+        <input matInput formControlName="polygonsDefinition" required>
+        <mat-hint>{{ 'rule-node-config.polygon-definition-hint' | translate }}</mat-hint>
+        <mat-error *ngIf="geoFilterConfigForm.get('polygonsDefinition').hasError('required')">
+          {{ 'rule-node-config.polygon-definition-required' | translate }}
+        </mat-error>
+      </mat-form-field>
+    </section>
+  </section>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/gps-geo-filter-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/filter/gps-geo-filter-config.component.scss
new file mode 100644
index 0000000000..f177555e37
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/gps-geo-filter-config.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.
+ */
+:host {
+  .slide-toggle {
+    margin-bottom: 18px;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/gps-geo-filter-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/filter/gps-geo-filter-config.component.ts
new file mode 100644
index 0000000000..6fb2158e7a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/gps-geo-filter-config.component.ts
@@ -0,0 +1,121 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { PerimeterType, perimeterTypeTranslations, RangeUnit, rangeUnitTranslations } from '../rule-node-config.models';
+
+@Component({
+  selector: 'tb-filter-node-gps-geofencing-config',
+  templateUrl: './gps-geo-filter-config.component.html',
+  styleUrls: ['./gps-geo-filter-config.component.scss']
+})
+export class GpsGeoFilterConfigComponent extends RuleNodeConfigurationComponent {
+
+  geoFilterConfigForm: FormGroup;
+
+  perimeterType = PerimeterType;
+  perimeterTypes: Array<PerimeterType> = Object.values(PerimeterType);
+  perimeterTypeTranslationMap = perimeterTypeTranslations;
+
+  rangeUnits: Array<RangeUnit> = Object.values(RangeUnit);
+  rangeUnitTranslationMap = rangeUnitTranslations;
+
+  public defaultPaddingEnable = true;
+
+  constructor(private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.geoFilterConfigForm;
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      latitudeKeyName: isDefinedAndNotNull(configuration?.latitudeKeyName) ? configuration.latitudeKeyName : null,
+      longitudeKeyName: isDefinedAndNotNull(configuration?.longitudeKeyName) ? configuration.longitudeKeyName : null,
+      perimeterType: isDefinedAndNotNull(configuration?.perimeterType) ? configuration.perimeterType : null,
+      fetchPerimeterInfoFromMessageMetadata: isDefinedAndNotNull(configuration?.fetchPerimeterInfoFromMessageMetadata) ?
+        configuration.fetchPerimeterInfoFromMessageMetadata : false,
+      perimeterKeyName: isDefinedAndNotNull(configuration?.perimeterKeyName) ? configuration.perimeterKeyName : null,
+      centerLatitude: isDefinedAndNotNull(configuration?.centerLatitude) ? configuration.centerLatitude : null,
+      centerLongitude: isDefinedAndNotNull(configuration?.centerLongitude) ? configuration.centerLongitude : null,
+      range: isDefinedAndNotNull(configuration?.range) ? configuration.range : null,
+      rangeUnit: isDefinedAndNotNull(configuration?.rangeUnit) ? configuration.rangeUnit : null,
+      polygonsDefinition: isDefinedAndNotNull(configuration?.polygonsDefinition) ? configuration.polygonsDefinition : null
+    };
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.geoFilterConfigForm = this.fb.group({
+      latitudeKeyName: [configuration.latitudeKeyName, [Validators.required]],
+      longitudeKeyName: [configuration.longitudeKeyName, [Validators.required]],
+      perimeterType: [configuration.perimeterType, [Validators.required]],
+      fetchPerimeterInfoFromMessageMetadata: [configuration.fetchPerimeterInfoFromMessageMetadata, []],
+      perimeterKeyName: [configuration.perimeterKeyName, []],
+      centerLatitude: [configuration.centerLatitude, []],
+      centerLongitude: [configuration.centerLongitude, []],
+      range: [configuration.range, []],
+      rangeUnit: [configuration.rangeUnit, []],
+      polygonsDefinition: [configuration.polygonsDefinition, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['fetchPerimeterInfoFromMessageMetadata', 'perimeterType'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const fetchPerimeterInfoFromMessageMetadata: boolean = this.geoFilterConfigForm.get('fetchPerimeterInfoFromMessageMetadata').value;
+    const perimeterType: PerimeterType = this.geoFilterConfigForm.get('perimeterType').value;
+    if (fetchPerimeterInfoFromMessageMetadata) {
+      this.geoFilterConfigForm.get('perimeterKeyName').setValidators([Validators.required]);
+    } else {
+      this.geoFilterConfigForm.get('perimeterKeyName').setValidators([]);
+    }
+    if (!fetchPerimeterInfoFromMessageMetadata && perimeterType === PerimeterType.CIRCLE) {
+      this.geoFilterConfigForm.get('centerLatitude').setValidators([Validators.required,
+        Validators.min(-90), Validators.max(90)]);
+      this.geoFilterConfigForm.get('centerLongitude').setValidators([Validators.required,
+        Validators.min(-180), Validators.max(180)]);
+      this.geoFilterConfigForm.get('range').setValidators([Validators.required, Validators.min(0)]);
+      this.geoFilterConfigForm.get('rangeUnit').setValidators([Validators.required]);
+
+      this.defaultPaddingEnable = false;
+    } else {
+      this.geoFilterConfigForm.get('centerLatitude').setValidators([]);
+      this.geoFilterConfigForm.get('centerLongitude').setValidators([]);
+      this.geoFilterConfigForm.get('range').setValidators([]);
+      this.geoFilterConfigForm.get('rangeUnit').setValidators([]);
+
+      this.defaultPaddingEnable = true;
+    }
+    if (!fetchPerimeterInfoFromMessageMetadata && perimeterType === PerimeterType.POLYGON) {
+      this.geoFilterConfigForm.get('polygonsDefinition').setValidators([Validators.required]);
+    } else {
+      this.geoFilterConfigForm.get('polygonsDefinition').setValidators([]);
+    }
+    this.geoFilterConfigForm.get('perimeterKeyName').updateValueAndValidity({emitEvent});
+    this.geoFilterConfigForm.get('centerLatitude').updateValueAndValidity({emitEvent});
+    this.geoFilterConfigForm.get('centerLongitude').updateValueAndValidity({emitEvent});
+    this.geoFilterConfigForm.get('range').updateValueAndValidity({emitEvent});
+    this.geoFilterConfigForm.get('rangeUnit').updateValueAndValidity({emitEvent});
+    this.geoFilterConfigForm.get('polygonsDefinition').updateValueAndValidity({emitEvent});
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/message-type-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/filter/message-type-config.component.html
new file mode 100644
index 0000000000..847ab255f5
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/message-type-config.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.
+
+-->
+<section [formGroup]="messageTypeConfigForm">
+  <tb-message-types-config
+    required
+    [label]="'rule-node-config.select-message-types' | translate"
+    formControlName="messageTypes">
+  </tb-message-types-config>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/message-type-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/filter/message-type-config.component.ts
new file mode 100644
index 0000000000..61cc018aab
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/message-type-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { isDefinedAndNotNull } from '@core/public-api';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-filter-node-message-type-config',
+  templateUrl: './message-type-config.component.html',
+  styleUrls: []
+})
+export class MessageTypeConfigComponent extends RuleNodeConfigurationComponent {
+
+  messageTypeConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.messageTypeConfigForm;
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      messageTypes: isDefinedAndNotNull(configuration?.messageTypes) ? configuration.messageTypes : null
+    };
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.messageTypeConfigForm = this.fb.group({
+      messageTypes: [configuration.messageTypes, [Validators.required]]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/originator-type-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/filter/originator-type-config.component.html
new file mode 100644
index 0000000000..1dc3cf34a2
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/originator-type-config.component.html
@@ -0,0 +1,31 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="originatorTypeConfigForm">
+  <tb-entity-type-list class="flex-1"
+                       formControlName="originatorTypes"
+                       [allowedEntityTypes]="allowedEntityTypes"
+                       [ignoreAuthorityFilter]="true"
+                       [emptyInputPlaceholder]="'rule-node-config.add-entity-type' | translate"
+                       [filledInputPlaceholder]="'rule-node-config.add-entity-type' | translate"
+                       [label]="'rule-node-config.select-entity-types' | translate"
+                       required>
+    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+              color="primary"
+              matTooltip="{{ 'rule-node-config.chip-help' | translate: { inputName: 'rule-node-config.entity-type' | translate } }}">help</mat-icon>
+  </tb-entity-type-list>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/originator-type-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/filter/originator-type-config.component.ts
new file mode 100644
index 0000000000..91e945ee0f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/originator-type-config.component.ts
@@ -0,0 +1,65 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { isDefinedAndNotNull } from '@core/public-api';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { EntityType } from '@app/shared/models/entity-type.models';
+
+@Component({
+  selector: 'tb-filter-node-originator-type-config',
+  templateUrl: './originator-type-config.component.html',
+  styleUrls: []
+})
+export class OriginatorTypeConfigComponent extends RuleNodeConfigurationComponent {
+
+  originatorTypeConfigForm: UntypedFormGroup;
+
+  allowedEntityTypes: EntityType[] = [
+    EntityType.DEVICE,
+    EntityType.ASSET,
+    EntityType.ENTITY_VIEW,
+    EntityType.TENANT,
+    EntityType.CUSTOMER,
+    EntityType.USER,
+    EntityType.DASHBOARD,
+    EntityType.RULE_CHAIN,
+    EntityType.RULE_NODE,
+    EntityType.EDGE
+  ];
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.originatorTypeConfigForm;
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      originatorTypes: isDefinedAndNotNull(configuration?.originatorTypes) ? configuration.originatorTypes : null
+    };
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.originatorTypeConfigForm = this.fb.group({
+      originatorTypes: [configuration.originatorTypes, [Validators.required]]
+    });
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/script-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/filter/script-config.component.html
new file mode 100644
index 0000000000..c0b39f77b7
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/script-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="scriptConfigForm">
+  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>
+  <tb-js-func *ngIf="scriptConfigForm.get('scriptLang').value === scriptLanguage.JS"
+              #jsFuncComponent
+              formControlName="jsScript"
+              functionName="Filter"
+              [functionArgs]="['msg', 'metadata', 'msgType']"
+              helpId="rulenode/filter_node_script_fn"
+              noValidate="true">
+    <button toolbarSuffixButton
+            mat-icon-button
+            matTooltip="{{ testScriptLabel | translate }}"
+            matTooltipPosition="above"
+            class="tb-mat-32"
+            (click)="testScript()">
+      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+    </button>
+  </tb-js-func>
+  <tb-js-func *ngIf="scriptConfigForm.get('scriptLang').value === scriptLanguage.TBEL"
+              #tbelFuncComponent
+              formControlName="tbelScript"
+              functionName="Filter"
+              [functionArgs]="['msg', 'metadata', 'msgType']"
+              [disableUndefinedCheck]="true"
+              [scriptLanguage]="scriptLanguage.TBEL"
+              helpId="rulenode/tbel/filter_node_script_fn"
+              noValidate="true">
+    <button toolbarSuffixButton
+            mat-icon-button
+            matTooltip="{{ testScriptLabel | translate }}"
+            matTooltipPosition="above"
+            class="tb-mat-32"
+            (click)="testScript()">
+      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+    </button>
+  </tb-js-func>
+  <button mat-button mat-raised-button color="primary" (click)="testScript()">
+    {{ testScriptLabel | translate }}
+  </button>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/script-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/filter/script-config.component.ts
new file mode 100644
index 0000000000..a5e4ffdea6
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/script-config.component.ts
@@ -0,0 +1,128 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, ViewChild } from '@angular/core';
+import { AppState, getCurrentAuthState, isDefinedAndNotNull, NodeScriptTestService } from '@core/public-api';
+import { Store } from '@ngrx/store';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent, ScriptLanguage } from '@shared/models/rule-node.models';
+import type { JsFuncComponent } from '@app/shared/components/js-func.component';
+import { DebugRuleNodeEventBody } from '@app/shared/models/event.models';
+
+@Component({
+  selector: 'tb-filter-node-script-config',
+  templateUrl: './script-config.component.html',
+  styleUrls: []
+})
+export class ScriptConfigComponent extends RuleNodeConfigurationComponent {
+
+  @ViewChild('jsFuncComponent', {static: false}) jsFuncComponent: JsFuncComponent;
+  @ViewChild('tbelFuncComponent', {static: false}) tbelFuncComponent: JsFuncComponent;
+
+  scriptConfigForm: UntypedFormGroup;
+
+  tbelEnabled = getCurrentAuthState(this.store).tbelEnabled;
+
+  scriptLanguage = ScriptLanguage;
+
+  changeScript: EventEmitter<void> = new EventEmitter<void>();
+
+  readonly hasScript = true;
+
+  readonly testScriptLabel = 'rule-node-config.test-filter-function';
+
+  constructor(protected store: Store<AppState>,
+              private fb: UntypedFormBuilder,
+              private nodeScriptTestService: NodeScriptTestService,
+              private translate: TranslateService) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.scriptConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.scriptConfigForm = this.fb.group({
+      scriptLang: [configuration.scriptLang, [Validators.required]],
+      jsScript: [configuration.jsScript, []],
+      tbelScript: [configuration.tbelScript, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['scriptLang'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    let scriptLang: ScriptLanguage = this.scriptConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.TBEL && !this.tbelEnabled) {
+      scriptLang = ScriptLanguage.JS;
+      this.scriptConfigForm.get('scriptLang').patchValue(scriptLang, {emitEvent: false});
+      setTimeout(() => {
+        this.scriptConfigForm.updateValueAndValidity({emitEvent: true});
+      });
+    }
+    this.scriptConfigForm.get('jsScript').setValidators(scriptLang === ScriptLanguage.JS ? [Validators.required] : []);
+    this.scriptConfigForm.get('jsScript').updateValueAndValidity({emitEvent});
+    this.scriptConfigForm.get('tbelScript').setValidators(scriptLang === ScriptLanguage.TBEL ? [Validators.required] : []);
+    this.scriptConfigForm.get('tbelScript').updateValueAndValidity({emitEvent});
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    if (configuration) {
+      if (!configuration.scriptLang) {
+        configuration.scriptLang = ScriptLanguage.JS;
+      }
+    }
+    return {
+      scriptLang: isDefinedAndNotNull(configuration?.scriptLang) ? configuration.scriptLang : ScriptLanguage.JS,
+      jsScript: isDefinedAndNotNull(configuration?.jsScript) ? configuration.jsScript : null,
+      tbelScript: isDefinedAndNotNull(configuration?.tbelScript) ? configuration.tbelScript : null
+    };
+  }
+
+  testScript(debugEventBody?: DebugRuleNodeEventBody) {
+    const scriptLang: ScriptLanguage = this.scriptConfigForm.get('scriptLang').value;
+    const scriptField = scriptLang === ScriptLanguage.JS ? 'jsScript' : 'tbelScript';
+    const helpId = scriptLang === ScriptLanguage.JS ? 'rulenode/filter_node_script_fn' : 'rulenode/tbel/filter_node_script_fn';
+    const script: string = this.scriptConfigForm.get(scriptField).value;
+    this.nodeScriptTestService.testNodeScript(
+      script,
+      'filter',
+      this.translate.instant('rule-node-config.filter'),
+      'Filter',
+      ['msg', 'metadata', 'msgType'],
+      this.ruleNodeId,
+      helpId,
+      scriptLang,
+      debugEventBody
+    ).subscribe((theScript) => {
+      if (theScript) {
+        this.scriptConfigForm.get(scriptField).setValue(theScript);
+        this.changeScript.emit();
+      }
+    });
+  }
+
+  protected onValidate() {
+    const scriptLang: ScriptLanguage = this.scriptConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.JS) {
+      this.jsFuncComponent.validateOnSubmit();
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/switch-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/filter/switch-config.component.html
new file mode 100644
index 0000000000..83034e2e43
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/switch-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="switchConfigForm">
+  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>
+  <tb-js-func *ngIf="switchConfigForm.get('scriptLang').value === scriptLanguage.JS"
+              #jsFuncComponent
+              formControlName="jsScript"
+              functionName="Switch"
+              [functionArgs]="['msg', 'metadata', 'msgType']"
+              helpId="rulenode/switch_node_script_fn"
+              noValidate="true">
+    <button toolbarSuffixButton
+            mat-icon-button
+            matTooltip="{{ testScriptLabel | translate }}"
+            matTooltipPosition="above"
+            class="tb-mat-32"
+            (click)="testScript()">
+      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+    </button>
+  </tb-js-func>
+  <tb-js-func *ngIf="switchConfigForm.get('scriptLang').value === scriptLanguage.TBEL"
+              #tbelFuncComponent
+              formControlName="tbelScript"
+              functionName="Switch"
+              [functionArgs]="['msg', 'metadata', 'msgType']"
+              [disableUndefinedCheck]="true"
+              [scriptLanguage]="scriptLanguage.TBEL"
+              helpId="rulenode/tbel/switch_node_script_fn"
+              noValidate="true">
+    <button toolbarSuffixButton
+            mat-icon-button
+            matTooltip="{{ testScriptLabel | translate }}"
+            matTooltipPosition="above"
+            class="tb-mat-32"
+            (click)="testScript()">
+      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+    </button>
+  </tb-js-func>
+  <button mat-button mat-raised-button color="primary" (click)="testScript()">
+    {{ testScriptLabel | translate }}
+  </button>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/filter/switch-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/filter/switch-config.component.ts
new file mode 100644
index 0000000000..c444effd08
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/filter/switch-config.component.ts
@@ -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.
+///
+
+import { Component, EventEmitter, ViewChild } from '@angular/core';
+import { getCurrentAuthState, isDefinedAndNotNull, NodeScriptTestService } from '@core/public-api';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  RuleNodeConfiguration,
+  RuleNodeConfigurationComponent,
+  ScriptLanguage
+} from '@app/shared/models/rule-node.models';
+import type { JsFuncComponent } from '@app/shared/components/js-func.component';
+import { DebugRuleNodeEventBody } from '@shared/models/event.models';
+
+@Component({
+  selector: 'tb-filter-node-switch-config',
+  templateUrl: './switch-config.component.html',
+  styleUrls: []
+})
+export class SwitchConfigComponent extends RuleNodeConfigurationComponent {
+
+  @ViewChild('jsFuncComponent', {static: false}) jsFuncComponent: JsFuncComponent;
+  @ViewChild('tbelFuncComponent', {static: false}) tbelFuncComponent: JsFuncComponent;
+
+  switchConfigForm: UntypedFormGroup;
+
+  tbelEnabled = getCurrentAuthState(this.store).tbelEnabled;
+
+  scriptLanguage = ScriptLanguage;
+
+  changeScript: EventEmitter<void> = new EventEmitter<void>();
+
+  readonly hasScript = true;
+
+  readonly testScriptLabel = 'rule-node-config.test-switch-function';
+
+  constructor(private fb: UntypedFormBuilder,
+              private nodeScriptTestService: NodeScriptTestService,
+              private translate: TranslateService) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.switchConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.switchConfigForm = this.fb.group({
+      scriptLang: [configuration.scriptLang, [Validators.required]],
+      jsScript: [configuration.jsScript, []],
+      tbelScript: [configuration.tbelScript, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['scriptLang'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    let scriptLang: ScriptLanguage = this.switchConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.TBEL && !this.tbelEnabled) {
+      scriptLang = ScriptLanguage.JS;
+      this.switchConfigForm.get('scriptLang').patchValue(scriptLang, {emitEvent: false});
+      setTimeout(() => {
+        this.switchConfigForm.updateValueAndValidity({emitEvent: true});
+      });
+    }
+    this.switchConfigForm.get('jsScript').setValidators(scriptLang === ScriptLanguage.JS ? [Validators.required] : []);
+    this.switchConfigForm.get('jsScript').updateValueAndValidity({emitEvent});
+    this.switchConfigForm.get('tbelScript').setValidators(scriptLang === ScriptLanguage.TBEL ? [Validators.required] : []);
+    this.switchConfigForm.get('tbelScript').updateValueAndValidity({emitEvent});
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    if (configuration) {
+      if (!configuration.scriptLang) {
+        configuration.scriptLang = ScriptLanguage.JS;
+      }
+    }
+    return {
+      scriptLang: isDefinedAndNotNull(configuration?.scriptLang) ? configuration.scriptLang : ScriptLanguage.JS,
+      jsScript: isDefinedAndNotNull(configuration?.jsScript) ? configuration.jsScript : null,
+      tbelScript: isDefinedAndNotNull(configuration?.tbelScript) ? configuration.tbelScript : null
+    };
+  }
+
+  testScript(debugEventBody?: DebugRuleNodeEventBody) {
+    const scriptLang: ScriptLanguage = this.switchConfigForm.get('scriptLang').value;
+    const scriptField = scriptLang === ScriptLanguage.JS ? 'jsScript' : 'tbelScript';
+    const helpId = scriptLang === ScriptLanguage.JS ? 'rulenode/switch_node_script_fn' : 'rulenode/tbel/switch_node_script_fn';
+    const script: string = this.switchConfigForm.get(scriptField).value;
+    this.nodeScriptTestService.testNodeScript(
+      script,
+      'switch',
+      this.translate.instant('rule-node-config.switch'),
+      'Switch',
+      ['msg', 'metadata', 'msgType'],
+      this.ruleNodeId,
+      helpId,
+      scriptLang,
+      debugEventBody
+    ).subscribe((theScript) => {
+      if (theScript) {
+        this.switchConfigForm.get(scriptField).setValue(theScript);
+        this.changeScript.emit();
+      }
+    });
+  }
+
+  protected onValidate() {
+    const scriptLang: ScriptLanguage = this.switchConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.JS) {
+      this.jsFuncComponent.validateOnSubmit();
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/flow/flow-rule-node-config.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/flow/flow-rule-node-config.module.ts
new file mode 100644
index 0000000000..95668cf19e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/flow/flow-rule-node-config.module.ts
@@ -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.
+///
+
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '@shared/public-api';
+import { RuleChainInputComponent } from './rule-chain-input.component';
+import { RuleChainOutputComponent } from './rule-chain-output.component';
+
+@NgModule({
+  declarations: [
+    RuleChainInputComponent,
+    RuleChainOutputComponent
+  ],
+  imports: [
+    CommonModule,
+    SharedModule
+  ],
+  exports: [
+    RuleChainInputComponent,
+    RuleChainOutputComponent
+  ]
+})
+export class FlowRuleNodeConfigModule {
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-chain-input.component.html b/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-chain-input.component.html
new file mode 100644
index 0000000000..6bee899138
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-chain-input.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.
+
+-->
+<section [formGroup]="ruleChainInputConfigForm" class="flex flex-col">
+  <div class="tb-form-panel no-padding no-border">
+    <div tb-hint-tooltip-icon="{{ 'rule-node-config.forward-msg-default-rule-chain-tooltip' | translate }}"
+         class="tb-form-row no-border">
+      <mat-slide-toggle class="mat-slide" formControlName="forwardMsgToDefaultRuleChain">
+        {{ 'rule-node-config.forward-msg-default-rule-chain' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <tb-entity-autocomplete required
+                            [excludeEntityIds]="[ruleChainId]"
+                            [entityType]="entityType.RULE_CHAIN"
+                            [entitySubtype]="ruleChainType"
+                            formControlName="ruleChainId">
+    </tb-entity-autocomplete>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-chain-input.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-chain-input.component.ts
new file mode 100644
index 0000000000..9e5316841a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-chain-input.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+import { EntityType } from '@shared/models/entity-type.models';
+
+@Component({
+  selector: 'tb-flow-node-rule-chain-input-config',
+  templateUrl: './rule-chain-input.component.html',
+  styleUrls: []
+})
+export class RuleChainInputComponent extends RuleNodeConfigurationComponent {
+
+  entityType = EntityType;
+
+  ruleChainInputConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.ruleChainInputConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.ruleChainInputConfigForm = this.fb.group({
+      forwardMsgToDefaultRuleChain: [configuration ? configuration?.forwardMsgToDefaultRuleChain : false, []],
+      ruleChainId: [configuration ? configuration.ruleChainId : null, [Validators.required]]
+    });
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-chain-output.component.html b/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-chain-output.component.html
new file mode 100644
index 0000000000..8fafa22061
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-chain-output.component.html
@@ -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.
+
+-->
+<section [formGroup]="ruleChainOutputConfigForm" class="flex flex-col">
+  <div innerHTML="{{ 'rule-node-config.output-node-name-hint' | translate }}"></div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-chain-output.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-chain-output.component.ts
new file mode 100644
index 0000000000..153272f374
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/flow/rule-chain-output.component.ts
@@ -0,0 +1,42 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-flow-node-rule-chain-output-config',
+  templateUrl: './rule-chain-output.component.html',
+  styleUrls: []
+})
+export class RuleChainOutputComponent extends RuleNodeConfigurationComponent {
+
+  ruleChainOutputConfigForm: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+    super();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.ruleChainOutputConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.ruleChainOutputConfigForm = this.fb.group({});
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/rule-node-config.models.ts b/ui-ngx/src/app/modules/home/components/rule-node/rule-node-config.models.ts
new file mode 100644
index 0000000000..a358bbaf12
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/rule-node-config.models.ts
@@ -0,0 +1,862 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { EntityField, entityFields } from '@shared/models/entity.models';
+import { EntitySearchDirection } from '@shared/models/relation.models';
+import { EntityTypeFilter } from '@shared/models/alias.models';
+
+export enum OriginatorSource {
+  CUSTOMER = 'CUSTOMER',
+  TENANT = 'TENANT',
+  RELATED = 'RELATED',
+  ALARM_ORIGINATOR = 'ALARM_ORIGINATOR',
+  ENTITY = 'ENTITY'
+}
+
+export interface OriginatorValuesDescriptions {
+  value: OriginatorSource;
+  name: string;
+  description: string;
+}
+
+export const originatorSourceTranslations = new Map<OriginatorSource, string>(
+  [
+    [OriginatorSource.CUSTOMER, 'rule-node-config.originator-customer'],
+    [OriginatorSource.TENANT, 'rule-node-config.originator-tenant'],
+    [OriginatorSource.RELATED, 'rule-node-config.originator-related'],
+    [OriginatorSource.ALARM_ORIGINATOR, 'rule-node-config.originator-alarm-originator'],
+    [OriginatorSource.ENTITY, 'rule-node-config.originator-entity'],
+  ]
+);
+
+export const originatorSourceDescTranslations = new Map<OriginatorSource, string>(
+  [
+    [OriginatorSource.CUSTOMER, 'rule-node-config.originator-customer-desc'],
+    [OriginatorSource.TENANT, 'rule-node-config.originator-tenant-desc'],
+    [OriginatorSource.RELATED, 'rule-node-config.originator-related-entity-desc'],
+    [OriginatorSource.ALARM_ORIGINATOR, 'rule-node-config.originator-alarm-originator-desc'],
+    [OriginatorSource.ENTITY, 'rule-node-config.originator-entity-by-name-pattern-desc'],
+  ]
+);
+export const allowedOriginatorFields: EntityField[] = [
+  entityFields.createdTime,
+  entityFields.name,
+  {value: 'type', name: 'rule-node-config.profile-name', keyName: 'originatorProfileName'},
+  entityFields.firstName,
+  entityFields.lastName,
+  entityFields.email,
+  entityFields.title,
+  entityFields.country,
+  entityFields.state,
+  entityFields.city,
+  entityFields.address,
+  entityFields.address2,
+  entityFields.zip,
+  entityFields.phone,
+  entityFields.label,
+  {value: 'id', name: 'rule-node-config.id', keyName: 'id'},
+  {value: 'additionalInfo', name: 'rule-node-config.additional-info', keyName: 'additionalInfo'}
+];
+
+export const OriginatorFieldsMappingValues = new Map<string, string>(
+  [
+    ['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'],
+  ]
+);
+
+export enum PerimeterType {
+  CIRCLE = 'CIRCLE',
+  POLYGON = 'POLYGON'
+}
+
+export const perimeterTypeTranslations = new Map<PerimeterType, string>(
+  [
+    [PerimeterType.CIRCLE, 'rule-node-config.perimeter-circle'],
+    [PerimeterType.POLYGON, 'rule-node-config.perimeter-polygon'],
+  ]
+);
+
+export enum TimeUnit {
+  MILLISECONDS = 'MILLISECONDS',
+  SECONDS = 'SECONDS',
+  MINUTES = 'MINUTES',
+  HOURS = 'HOURS',
+  DAYS = 'DAYS'
+}
+
+export const timeUnitTranslations = new Map<TimeUnit, string>(
+  [
+    [TimeUnit.MILLISECONDS, 'rule-node-config.time-unit-milliseconds'],
+    [TimeUnit.SECONDS, 'rule-node-config.time-unit-seconds'],
+    [TimeUnit.MINUTES, 'rule-node-config.time-unit-minutes'],
+    [TimeUnit.HOURS, 'rule-node-config.time-unit-hours'],
+    [TimeUnit.DAYS, 'rule-node-config.time-unit-days']
+  ]
+);
+
+export enum RangeUnit {
+  METER = 'METER',
+  KILOMETER = 'KILOMETER',
+  FOOT = 'FOOT',
+  MILE = 'MILE',
+  NAUTICAL_MILE = 'NAUTICAL_MILE'
+}
+
+export const rangeUnitTranslations = new Map<RangeUnit, string>(
+  [
+    [RangeUnit.METER, 'rule-node-config.range-unit-meter'],
+    [RangeUnit.KILOMETER, 'rule-node-config.range-unit-kilometer'],
+    [RangeUnit.FOOT, 'rule-node-config.range-unit-foot'],
+    [RangeUnit.MILE, 'rule-node-config.range-unit-mile'],
+    [RangeUnit.NAUTICAL_MILE, 'rule-node-config.range-unit-nautical-mile']
+  ]
+);
+
+export enum EntityDetailsField {
+  ID = 'ID',
+  TITLE = 'TITLE',
+  COUNTRY = 'COUNTRY',
+  STATE = 'STATE',
+  CITY = 'CITY',
+  ZIP = 'ZIP',
+  ADDRESS = 'ADDRESS',
+  ADDRESS2 = 'ADDRESS2',
+  PHONE = 'PHONE',
+  EMAIL = 'EMAIL',
+  ADDITIONAL_INFO = 'ADDITIONAL_INFO'
+}
+
+export interface SvMapOption {
+  name: string;
+  value: any;
+}
+
+export const entityDetailsTranslations = new Map<EntityDetailsField, string>(
+  [
+    [EntityDetailsField.ID, 'rule-node-config.entity-details-id'],
+    [EntityDetailsField.TITLE, 'rule-node-config.entity-details-title'],
+    [EntityDetailsField.COUNTRY, 'rule-node-config.entity-details-country'],
+    [EntityDetailsField.STATE, 'rule-node-config.entity-details-state'],
+    [EntityDetailsField.CITY, 'rule-node-config.entity-details-city'],
+    [EntityDetailsField.ZIP, 'rule-node-config.entity-details-zip'],
+    [EntityDetailsField.ADDRESS, 'rule-node-config.entity-details-address'],
+    [EntityDetailsField.ADDRESS2, 'rule-node-config.entity-details-address2'],
+    [EntityDetailsField.PHONE, 'rule-node-config.entity-details-phone'],
+    [EntityDetailsField.EMAIL, 'rule-node-config.entity-details-email'],
+    [EntityDetailsField.ADDITIONAL_INFO, 'rule-node-config.entity-details-additional_info']
+  ]
+);
+
+export enum FetchMode {
+  FIRST = 'FIRST',
+  LAST = 'LAST',
+  ALL = 'ALL'
+}
+
+export const deduplicationStrategiesTranslations = new Map<FetchMode, string>(
+  [
+    [FetchMode.FIRST, 'rule-node-config.first'],
+    [FetchMode.LAST, 'rule-node-config.last'],
+    [FetchMode.ALL, 'rule-node-config.all']
+  ]
+);
+
+export const deduplicationStrategiesHintTranslations = new Map<FetchMode, string>(
+  [
+    [FetchMode.FIRST, 'rule-node-config.first-mode-hint'],
+    [FetchMode.LAST, 'rule-node-config.last-mode-hint'],
+    [FetchMode.ALL, 'rule-node-config.all-mode-hint']
+  ]
+);
+
+export enum SamplingOrder {
+  ASC = 'ASC',
+  DESC = 'DESC'
+}
+
+export enum DataToFetch {
+  ATTRIBUTES = 'ATTRIBUTES',
+  LATEST_TELEMETRY = 'LATEST_TELEMETRY',
+  FIELDS = 'FIELDS'
+}
+
+export const dataToFetchTranslations = new Map<DataToFetch, string>(
+  [
+    [DataToFetch.ATTRIBUTES, 'rule-node-config.attributes'],
+    [DataToFetch.LATEST_TELEMETRY, 'rule-node-config.latest-telemetry'],
+    [DataToFetch.FIELDS, 'rule-node-config.fields']
+  ]
+);
+
+export const msgMetadataLabelTranslations = new Map<DataToFetch, string>(
+  [
+    [DataToFetch.ATTRIBUTES, 'rule-node-config.add-mapped-attribute-to'],
+    [DataToFetch.LATEST_TELEMETRY, 'rule-node-config.add-mapped-latest-telemetry-to'],
+    [DataToFetch.FIELDS, 'rule-node-config.add-mapped-fields-to']
+  ]
+);
+
+export const samplingOrderTranslations = new Map<SamplingOrder, string>(
+  [
+    [SamplingOrder.ASC, 'rule-node-config.ascending'],
+    [SamplingOrder.DESC, 'rule-node-config.descending']
+  ]
+);
+
+export enum SqsQueueType {
+  STANDARD = 'STANDARD',
+  FIFO = 'FIFO'
+}
+
+export const sqsQueueTypeTranslations = new Map<SqsQueueType, string>(
+  [
+    [SqsQueueType.STANDARD, 'rule-node-config.sqs-queue-standard'],
+    [SqsQueueType.FIFO, 'rule-node-config.sqs-queue-fifo'],
+  ]
+);
+
+export type credentialsType = 'anonymous' | 'basic' | 'cert.PEM';
+export const credentialsTypes: credentialsType[] = ['anonymous', 'basic', 'cert.PEM'];
+
+export const credentialsTypeTranslations = new Map<credentialsType, string>(
+  [
+    ['anonymous', 'rule-node-config.credentials-anonymous'],
+    ['basic', 'rule-node-config.credentials-basic'],
+    ['cert.PEM', 'rule-node-config.credentials-pem']
+  ]
+);
+
+export type AzureIotHubCredentialsType = 'sas' | 'cert.PEM';
+export const azureIotHubCredentialsTypes: AzureIotHubCredentialsType[] = ['sas', 'cert.PEM'];
+
+export const azureIotHubCredentialsTypeTranslations = new Map<AzureIotHubCredentialsType, string>(
+  [
+    ['sas', 'rule-node-config.credentials-sas'],
+    ['cert.PEM', 'rule-node-config.credentials-pem']
+  ]
+);
+
+export enum HttpRequestType {
+  GET = 'GET',
+  POST = 'POST',
+  PUT = 'PUT',
+  DELETE = 'DELETE'
+}
+
+export const ToByteStandartCharsetTypes = [
+  'US-ASCII',
+  'ISO-8859-1',
+  'UTF-8',
+  'UTF-16BE',
+  'UTF-16LE',
+  'UTF-16'
+];
+
+export const ToByteStandartCharsetTypeTranslations = new Map<string, string>(
+  [
+    ['US-ASCII', 'rule-node-config.charset-us-ascii'],
+    ['ISO-8859-1', 'rule-node-config.charset-iso-8859-1'],
+    ['UTF-8', 'rule-node-config.charset-utf-8'],
+    ['UTF-16BE', 'rule-node-config.charset-utf-16be'],
+    ['UTF-16LE', 'rule-node-config.charset-utf-16le'],
+    ['UTF-16', 'rule-node-config.charset-utf-16'],
+  ]
+);
+
+export interface RelationsQuery {
+  fetchLastLevelOnly: boolean;
+  direction: EntitySearchDirection;
+  maxLevel?: number;
+  filters?: EntityTypeFilter[];
+}
+
+export interface FunctionData {
+  value: MathFunction;
+  name: string;
+  description: string;
+  minArgs: number;
+  maxArgs: number;
+}
+
+export enum MathFunction {
+  CUSTOM = 'CUSTOM',
+  ADD = 'ADD',
+  SUB = 'SUB',
+  MULT = 'MULT',
+  DIV = 'DIV',
+  SIN = 'SIN',
+  SINH = 'SINH',
+  COS = 'COS',
+  COSH = 'COSH',
+  TAN = 'TAN',
+  TANH = 'TANH',
+  ACOS = 'ACOS',
+  ASIN = 'ASIN',
+  ATAN = 'ATAN',
+  ATAN2 = 'ATAN2',
+  EXP = 'EXP',
+  EXPM1 = 'EXPM1',
+  SQRT = 'SQRT',
+  CBRT = 'CBRT',
+  GET_EXP = 'GET_EXP',
+  HYPOT = 'HYPOT',
+  LOG = 'LOG',
+  LOG10 = 'LOG10',
+  LOG1P = 'LOG1P',
+  CEIL = 'CEIL',
+  FLOOR = 'FLOOR',
+  FLOOR_DIV = 'FLOOR_DIV',
+  FLOOR_MOD = 'FLOOR_MOD',
+  ABS = 'ABS',
+  MIN = 'MIN',
+  MAX = 'MAX',
+  POW = 'POW',
+  SIGNUM = 'SIGNUM',
+  RAD = 'RAD',
+  DEG = 'DEG',
+}
+
+export const MathFunctionMap = new Map<MathFunction, FunctionData>(
+  [
+    [
+      MathFunction.CUSTOM,
+      {
+        value: MathFunction.CUSTOM,
+        name: 'Custom Function',
+        description: 'Use this function to specify complex mathematical expression.',
+        minArgs: 1,
+        maxArgs: 16
+      }
+    ],
+    [
+      MathFunction.ADD,
+      {
+        value: MathFunction.ADD,
+        name: 'Addition',
+        description: 'x + y',
+        minArgs: 2,
+        maxArgs: 2
+      }
+    ],
+    [
+      MathFunction.SUB,
+      {
+        value: MathFunction.SUB,
+        name: 'Subtraction',
+        description: 'x - y',
+        minArgs: 2,
+        maxArgs: 2
+      }
+    ],
+    [
+      MathFunction.MULT,
+      {
+        value: MathFunction.MULT,
+        name: 'Multiplication',
+        description: 'x * y',
+        minArgs: 2,
+        maxArgs: 2
+      }
+    ],
+    [
+      MathFunction.DIV,
+      {
+        value: MathFunction.DIV,
+        name: 'Division',
+        description: 'x / y',
+        minArgs: 2,
+        maxArgs: 2
+      }
+    ],
+    [
+      MathFunction.SIN,
+      {
+        value: MathFunction.SIN,
+        name: 'Sine',
+        description: 'Returns the trigonometric sine of an angle in radians.',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.SINH,
+      {
+        value: MathFunction.SINH,
+        name: 'Hyperbolic sine',
+        description: 'Returns the hyperbolic sine of an argument.',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.COS,
+      {
+        value: MathFunction.COS,
+        name: 'Cosine',
+        description: 'Returns the trigonometric cosine of an angle in radians.',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.COSH,
+      {
+        value: MathFunction.COSH,
+        name: 'Hyperbolic cosine',
+        description: 'Returns the hyperbolic cosine of an argument.',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.TAN,
+      {
+        value: MathFunction.TAN,
+        name: 'Tangent',
+        description: 'Returns the trigonometric tangent of an angle in radians',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.TANH,
+      {
+        value: MathFunction.TANH,
+        name: 'Hyperbolic tangent',
+        description: 'Returns the hyperbolic tangent of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.ACOS,
+      {
+        value: MathFunction.ACOS,
+        name: 'Arc cosine',
+        description: 'Returns the arc cosine of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.ASIN,
+      {
+        value: MathFunction.ASIN,
+        name: 'Arc sine',
+        description: 'Returns the arc sine of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.ATAN,
+      {
+        value: MathFunction.ATAN,
+        name: 'Arc tangent',
+        description: 'Returns the arc tangent of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.ATAN2,
+      {
+        value: MathFunction.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
+      }
+    ],
+    [
+      MathFunction.EXP,
+      {
+        value: MathFunction.EXP,
+        name: 'Exponential',
+        description: 'Returns Euler\'s number e raised to the power of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.EXPM1,
+      {
+        value: MathFunction.EXPM1,
+        name: 'Exponential minus one',
+        description: 'Returns Euler\'s number e raised to the power of an argument minus one',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.SQRT,
+      {
+        value: MathFunction.SQRT,
+        name: 'Square',
+        description: 'Returns the correctly rounded positive square root of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.CBRT,
+      {
+        value: MathFunction.CBRT,
+        name: 'Cube root',
+        description: 'Returns the cube root of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.GET_EXP,
+      {
+        value: MathFunction.GET_EXP,
+        name: 'Get exponent',
+        description: 'Returns the unbiased exponent used in the representation of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.HYPOT,
+      {
+        value: MathFunction.HYPOT,
+        name: 'Square root',
+        description: 'Returns the square root of the squares of the arguments',
+        minArgs: 2,
+        maxArgs: 2
+      }
+    ],
+    [
+      MathFunction.LOG,
+      {
+        value: MathFunction.LOG,
+        name: 'Logarithm',
+        description: 'Returns the natural logarithm of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.LOG10,
+      {
+        value: MathFunction.LOG10,
+        name: 'Base 10 logarithm',
+        description: 'Returns the base 10 logarithm of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.LOG1P,
+      {
+        value: MathFunction.LOG1P,
+        name: 'Logarithm of the sum',
+        description: 'Returns the natural logarithm of the sum of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.CEIL,
+      {
+        value: MathFunction.CEIL,
+        name: 'Ceiling',
+        description: 'Returns the smallest (closest to negative infinity) of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.FLOOR,
+      {
+        value: MathFunction.FLOOR,
+        name: 'Floor',
+        description: 'Returns the largest (closest to positive infinity) of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.FLOOR_DIV,
+      {
+        value: MathFunction.FLOOR_DIV,
+        name: 'Floor division',
+        description: 'Returns the largest (closest to positive infinity) of the arguments',
+        minArgs: 2,
+        maxArgs: 2
+      }
+    ],
+    [
+      MathFunction.FLOOR_MOD,
+      {
+        value: MathFunction.FLOOR_MOD,
+        name: 'Floor modulus',
+        description: 'Returns the floor modulus of the arguments',
+        minArgs: 2,
+        maxArgs: 2
+      }
+    ],
+    [
+      MathFunction.ABS,
+      {
+        value: MathFunction.ABS,
+        name: 'Absolute',
+        description: 'Returns the absolute value of an argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.MIN,
+      {
+        value: MathFunction.MIN,
+        name: 'Min',
+        description: 'Returns the smaller of the arguments',
+        minArgs: 2,
+        maxArgs: 2
+      }
+    ],
+    [
+      MathFunction.MAX,
+      {
+        value: MathFunction.MAX,
+        name: 'Max',
+        description: 'Returns the greater of the arguments',
+        minArgs: 2,
+        maxArgs: 2
+      }
+    ],
+    [
+      MathFunction.POW,
+      {
+        value: MathFunction.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
+      }
+    ],
+    [
+      MathFunction.SIGNUM,
+      {
+        value: MathFunction.SIGNUM,
+        name: 'Sign of a real number',
+        description: 'Returns the signum function of the argument',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.RAD,
+      {
+        value: MathFunction.RAD,
+        name: 'Radian',
+        description: 'Converts an angle measured in degrees to an approximately equivalent angle measured in radians',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+    [
+      MathFunction.DEG,
+      {
+        value: MathFunction.DEG,
+        name: 'Degrees',
+        description: 'Converts an angle measured in radians to an approximately equivalent angle measured in degrees.',
+        minArgs: 1,
+        maxArgs: 1
+      }
+    ],
+  ]);
+
+export enum ArgumentType {
+  MESSAGE_BODY = 'MESSAGE_BODY',
+  MESSAGE_METADATA = 'MESSAGE_METADATA',
+  ATTRIBUTE = 'ATTRIBUTE',
+  TIME_SERIES = 'TIME_SERIES',
+  CONSTANT = 'CONSTANT'
+}
+
+export enum ArgumentTypeResult {
+  MESSAGE_BODY = 'MESSAGE_BODY',
+  MESSAGE_METADATA = 'MESSAGE_METADATA',
+  ATTRIBUTE = 'ATTRIBUTE',
+  TIME_SERIES = 'TIME_SERIES'
+}
+
+export enum FetchTo {
+  DATA = 'DATA',
+  METADATA = 'METADATA'
+}
+
+export const FetchFromToTranslation = new Map<FetchTo, string>([
+  [FetchTo.DATA, 'rule-node-config.message-to-metadata'],
+  [FetchTo.METADATA, 'rule-node-config.metadata-to-message'],
+]);
+
+export const FetchFromTranslation = new Map<FetchTo, string>([
+  [FetchTo.DATA, 'rule-node-config.from-message'],
+  [FetchTo.METADATA, 'rule-node-config.from-metadata'],
+]);
+
+export const FetchToTranslation = new Map<FetchTo, string>([
+  [FetchTo.DATA, 'rule-node-config.message'],
+  [FetchTo.METADATA, 'rule-node-config.metadata'],
+]);
+
+export const FetchToRenameTranslation = new Map<FetchTo, string>([
+  [FetchTo.DATA, 'rule-node-config.message'],
+  [FetchTo.METADATA, 'rule-node-config.message-metadata'],
+]);
+
+export interface ArgumentTypeData {
+  name: string;
+  description: string;
+}
+
+export const ArgumentTypeMap = new Map<ArgumentType, ArgumentTypeData>([
+  [
+    ArgumentType.MESSAGE_BODY,
+    {
+      name: 'rule-node-config.message-body-type',
+      description: 'rule-node-config.message-body-type-description'
+    }
+  ],
+  [
+    ArgumentType.MESSAGE_METADATA,
+    {
+      name: 'rule-node-config.message-metadata-type',
+      description: 'rule-node-config.message-metadata-type-description'
+    }
+  ],
+  [
+    ArgumentType.ATTRIBUTE,
+    {
+      name: 'rule-node-config.attribute-type',
+      description: 'rule-node-config.attribute-type-description'
+    }
+  ],
+  [
+    ArgumentType.TIME_SERIES,
+    {
+      name: 'rule-node-config.time-series-type',
+      description: 'rule-node-config.time-series-type-description'
+    }
+  ],
+  [
+    ArgumentType.CONSTANT,
+    {
+      name: 'rule-node-config.constant-type',
+      description: 'rule-node-config.constant-type-description'
+    }
+  ]
+]);
+
+export const ArgumentTypeResultMap = new Map<ArgumentTypeResult, ArgumentTypeData>([
+  [
+    ArgumentTypeResult.MESSAGE_BODY,
+    {
+      name: 'rule-node-config.message-body-type',
+      description: 'rule-node-config.message-body-type-result-description'
+    }
+  ],
+  [
+    ArgumentTypeResult.MESSAGE_METADATA,
+    {
+      name: 'rule-node-config.message-metadata-type',
+      description: 'rule-node-config.message-metadata-result-description'
+    }
+  ],
+  [
+    ArgumentTypeResult.ATTRIBUTE,
+    {
+      name: 'rule-node-config.attribute-type',
+      description: 'rule-node-config.attribute-type-result-description'
+    }
+  ],
+  [
+    ArgumentTypeResult.TIME_SERIES,
+    {
+      name: 'rule-node-config.time-series-type',
+      description: 'rule-node-config.time-series-type-result-description'
+    }
+  ]
+]);
+
+export const ArgumentName = ['x', 'y', 'z', 'a', 'b', 'c', 'd', 'k', 'l', 'm', 'n', 'o', 'p', 'r', 's', 't'];
+
+export enum AttributeScope {
+  SHARED_SCOPE = 'SHARED_SCOPE',
+  SERVER_SCOPE = 'SERVER_SCOPE',
+  CLIENT_SCOPE = 'CLIENT_SCOPE'
+}
+
+export enum AttributeScopeResult {
+  SHARED_SCOPE = 'SHARED_SCOPE',
+  SERVER_SCOPE = 'SERVER_SCOPE'
+}
+
+export const AttributeScopeMap = new Map<AttributeScope, string>([
+  [AttributeScope.SHARED_SCOPE, 'rule-node-config.shared-scope'],
+  [AttributeScope.SERVER_SCOPE, 'rule-node-config.server-scope'],
+  [AttributeScope.CLIENT_SCOPE, 'rule-node-config.client-scope']
+]);
+
+export enum PresenceMonitoringStrategy {
+  ON_FIRST_MESSAGE = 'ON_FIRST_MESSAGE',
+  ON_EACH_MESSAGE = 'ON_EACH_MESSAGE'
+}
+
+export interface PresenceMonitoringStrategyData {
+  value: boolean;
+  name: string;
+}
+
+export const PresenceMonitoringStrategiesData = new Map<PresenceMonitoringStrategy, PresenceMonitoringStrategyData>([
+  [
+    PresenceMonitoringStrategy.ON_EACH_MESSAGE,
+    {
+      value: true,
+      name: 'rule-node-config.presence-monitoring-strategy-on-each-message'
+    }
+  ],
+  [
+    PresenceMonitoringStrategy.ON_FIRST_MESSAGE,
+    {
+      value: false,
+      name: 'rule-node-config.presence-monitoring-strategy-on-first-message'
+    }
+  ]
+]);
+
+export const IntLimit = 2147483648;
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/rule-node-config.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/rule-node-config.module.ts
new file mode 100644
index 0000000000..86512eceea
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/rule-node-config.module.ts
@@ -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 { NgModule } from '@angular/core';
+import { EmptyConfigComponent } from './empty-config.component';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '@shared/shared.module';
+import { ActionRuleNodeConfigModule } from '@home/components/rule-node/action/action-rule-node-config.module';
+import { FilterRuleNodeConfigModule } from '@home/components/rule-node/filter/filter-rule-node-config.module';
+import { EnrichmentRuleNodeCoreModule } from '@home/components/rule-node/enrichment/enrichment-rule-node-core.module';
+import { ExternalRuleNodeConfigModule } from '@home/components/rule-node/external/external-rule-node-config.module';
+import {
+  TransformationRuleNodeConfigModule
+} from '@home/components/rule-node/transformation/transformation-rule-node-config.module';
+import { FlowRuleNodeConfigModule } from '@home/components/rule-node/flow/flow-rule-node-config.module';
+import { RuleChainService } from '@core/http/rule-chain.service';
+
+@NgModule({
+  declarations: [
+    EmptyConfigComponent
+  ],
+  imports: [
+    CommonModule,
+    SharedModule
+  ],
+  exports: [
+    ActionRuleNodeConfigModule,
+    FilterRuleNodeConfigModule,
+    EnrichmentRuleNodeCoreModule,
+    ExternalRuleNodeConfigModule,
+    TransformationRuleNodeConfigModule,
+    FlowRuleNodeConfigModule,
+    EmptyConfigComponent
+  ]
+})
+export class RuleNodeConfigModule {
+  constructor(private ruleChainService: RuleChainService) {
+    this.ruleChainService.registerSystemRuleNodeConfigModule(this.constructor);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/change-originator-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/change-originator-config.component.html
new file mode 100644
index 0000000000..6a1d59e220
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/change-originator-config.component.html
@@ -0,0 +1,66 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="changeOriginatorConfigForm" class="tb-form-panel no-border no-padding">
+  <mat-form-field class="mat-block" subscriptSizing="dynamic" hideRequiredMarker>
+    <mat-label translate>rule-node-config.new-originator</mat-label>
+    <mat-select formControlName="originatorSource" required>
+      <mat-select-trigger>
+        <span *ngIf="originatorSourceTranslationMap.get(changeOriginatorConfigForm.get('originatorSource').value)">
+          {{ originatorSourceTranslationMap.get(changeOriginatorConfigForm.get('originatorSource').value) | translate }}
+        </span>
+      </mat-select-trigger>
+      <mat-option *ngFor="let source of originatorSources" [value]="source">
+        <span matListItemTitle>
+          {{ originatorSourceTranslationMap.get(source) | translate }}
+        </span>
+        <br>
+        <small matListItemMeta style="color: inherit">
+          {{ originatorSourceDescTranslationMap.get(source) | translate }}
+        </small>
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
+  <div class="tb-form-panel stroked no-padding-bottom"
+        *ngIf="changeOriginatorConfigForm.get('originatorSource').value === originatorSource.ENTITY">
+    <tb-example-hint [hintText]="'rule-node-config.entity-name-pattern-hint'"
+                      popupHelpLink="rulenode/change_originator_node_fields_templatization">
+    </tb-example-hint>
+    <div class="tb-form-row no-border no-padding tb-standard-fields">
+      <tb-entity-type-select
+        showLabel
+        required
+        [allowedEntityTypes] = "allowedEntityTypes"
+        formControlName="entityType"
+        class="mat-mdc-form-field flex">
+      </tb-entity-type-select>
+      <mat-form-field class="flex">
+        <mat-label translate>rule-node-config.entity-name-pattern</mat-label>
+        <input required matInput formControlName="entityNamePattern">
+        <mat-error *ngIf="changeOriginatorConfigForm.get('entityNamePattern').hasError('required') ||
+                          changeOriginatorConfigForm.get('entityNamePattern').hasError('pattern')">
+          {{ 'rule-node-config.entity-name-pattern-required' | translate }}
+        </mat-error>
+      </mat-form-field>
+    </div>
+  </div>
+  <tb-relations-query-config
+    required
+    *ngIf="changeOriginatorConfigForm.get('originatorSource').value === originatorSource.RELATED"
+    formControlName="relationsQuery">
+  </tb-relations-query-config>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/change-originator-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/change-originator-config.component.ts
new file mode 100644
index 0000000000..954dd412e5
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/change-originator-config.component.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 { Component } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import {
+  OriginatorSource,
+  originatorSourceDescTranslations,
+  originatorSourceTranslations
+} from '@home/components/rule-node/rule-node-config.models';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { EntityType } from '@app/shared/models/entity-type.models';
+
+@Component({
+  selector: 'tb-transformation-node-change-originator-config',
+  templateUrl: './change-originator-config.component.html'
+})
+export class ChangeOriginatorConfigComponent extends RuleNodeConfigurationComponent {
+
+  originatorSource = OriginatorSource;
+  originatorSources = Object.keys(OriginatorSource) as OriginatorSource[];
+  originatorSourceTranslationMap = originatorSourceTranslations;
+  originatorSourceDescTranslationMap = originatorSourceDescTranslations;
+
+  changeOriginatorConfigForm: FormGroup;
+
+  allowedEntityTypes = [EntityType.DEVICE, EntityType.ASSET, EntityType.ENTITY_VIEW, EntityType.USER, EntityType.EDGE];
+
+  constructor(private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.changeOriginatorConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.changeOriginatorConfigForm = this.fb.group({
+      originatorSource: [configuration ? configuration.originatorSource : null, [Validators.required]],
+      entityType: [configuration ? configuration.entityType : null, []],
+      entityNamePattern: [configuration ? configuration.entityNamePattern : null, []],
+      relationsQuery: [configuration ? configuration.relationsQuery : null, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['originatorSource'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const originatorSource: OriginatorSource = this.changeOriginatorConfigForm.get('originatorSource').value;
+    if (originatorSource === OriginatorSource.RELATED) {
+      this.changeOriginatorConfigForm.get('relationsQuery').setValidators([Validators.required]);
+    } else {
+      this.changeOriginatorConfigForm.get('relationsQuery').setValidators([]);
+    }
+    if (originatorSource === OriginatorSource.ENTITY) {
+      this.changeOriginatorConfigForm.get('entityType').setValidators([Validators.required]);
+      this.changeOriginatorConfigForm.get('entityNamePattern').setValidators([Validators.required, Validators.pattern(/.*\S.*/)]);
+    } else {
+      this.changeOriginatorConfigForm.get('entityType').patchValue(null, {emitEvent});
+      this.changeOriginatorConfigForm.get('entityNamePattern').patchValue(null, {emitEvent});
+      this.changeOriginatorConfigForm.get('entityType').setValidators([]);
+      this.changeOriginatorConfigForm.get('entityNamePattern').setValidators([]);
+    }
+    this.changeOriginatorConfigForm.get('relationsQuery').updateValueAndValidity({emitEvent});
+    this.changeOriginatorConfigForm.get('entityType').updateValueAndValidity({emitEvent});
+    this.changeOriginatorConfigForm.get('entityNamePattern').updateValueAndValidity({emitEvent});
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/copy-keys-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/copy-keys-config.component.html
new file mode 100644
index 0000000000..ccaa44bea1
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/copy-keys-config.component.html
@@ -0,0 +1,36 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="copyKeysConfigForm" class="tb-form-panel no-padding no-border">
+  <tb-msg-metadata-chip
+    [labelText]="('rule-node-config.key-val.copy-key-values-from' | translate)"
+    [translation]="translation"
+    formControlName="copyFrom">
+  </tb-msg-metadata-chip>
+  <tb-string-items-list class="mat-block"
+                        required
+                        [label]="'rule-node-config.keys' | translate"
+                        [placeholder]="'rule-node-config.add-key' | translate"
+                        [requiredText]="'rule-node-config.key-val.at-least-one-key-error' | translate"
+                        formControlName="keys">
+    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+              color="primary"
+              matTooltip="{{ 'rule-node-config.use-regular-expression-hint' | translate }}">
+      help
+    </mat-icon>
+  </tb-string-items-list>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/copy-keys-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/copy-keys-config.component.ts
new file mode 100644
index 0000000000..1fcf4a7053
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/copy-keys-config.component.ts
@@ -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 { Component } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { isDefinedAndNotNull } from '@core/public-api';
+import { TranslateService } from '@ngx-translate/core';
+import { FetchFromToTranslation, FetchTo } from '../rule-node-config.models';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-transformation-node-copy-keys-config',
+  templateUrl: './copy-keys-config.component.html',
+  styleUrls: []
+})
+
+export class CopyKeysConfigComponent extends RuleNodeConfigurationComponent{
+  copyKeysConfigForm: FormGroup;
+  copyFrom = [];
+  translation = FetchFromToTranslation;
+
+  constructor(private fb: FormBuilder,
+              private translate: TranslateService) {
+    super();
+    for (const key of this.translation.keys()) {
+      this.copyFrom.push({
+        value: key,
+        name: this.translate.instant(this.translation.get(key))
+      });
+    }
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.copyKeysConfigForm = this.fb.group({
+      copyFrom: [configuration.copyFrom , [Validators.required]],
+      keys: [configuration ? configuration.keys : null, [Validators.required]]
+    });
+  }
+
+  protected configForm(): FormGroup {
+    return this.copyKeysConfigForm;
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    let copyFrom: FetchTo;
+
+    if (isDefinedAndNotNull(configuration?.fromMetadata)) {
+      copyFrom = configuration.copyFrom ? FetchTo.METADATA : FetchTo.DATA;
+    } else if (isDefinedAndNotNull(configuration?.copyFrom)) {
+      copyFrom = configuration.copyFrom;
+    } else {
+      copyFrom = FetchTo.DATA;
+    }
+
+    return {
+      keys: isDefinedAndNotNull(configuration?.keys) ? configuration.keys : null,
+      copyFrom
+    };
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/deduplication-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/deduplication-config.component.html
new file mode 100644
index 0000000000..e85ea71399
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/deduplication-config.component.html
@@ -0,0 +1,100 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="deduplicationConfigForm">
+  <mat-form-field class="mat-block">
+    <mat-label>{{'rule-node-config.interval' | translate}}</mat-label>
+    <input type='number' required matInput formControlName="interval">
+    <mat-error *ngIf="deduplicationConfigForm.get('interval').hasError('required')">
+      {{'rule-node-config.interval-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="deduplicationConfigForm.get('interval').hasError('min')">
+      {{'rule-node-config.interval-min-error' | translate}}
+    </mat-error>
+    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+              color="primary"
+              matTooltip="{{ 'rule-node-config.interval-hint' | translate }}">help</mat-icon>
+  </mat-form-field>
+  <div class="tb-form-panel no-padding no-border">
+    <div class="tb-form-panel stroked">
+      <div class="tb-form-panel-title  tb-required" translate>rule-node-config.strategy</div>
+      <tb-toggle-select class="fetch-to-data-toggle" formControlName="strategy" appearance="fill">
+        <tb-toggle-option *ngFor="let strategy of deduplicationStrategies" [value]="strategy">
+          {{ deduplicationStrategiesTranslations.get(strategy) | translate }}
+        </tb-toggle-option>
+      </tb-toggle-select>
+      <tb-example-hint [hintText]="'rule-node-config.strategy-all-hint'"
+                       *ngIf="deduplicationConfigForm.get('strategy').value === 'ALL'">
+      </tb-example-hint>
+      <tb-example-hint [hintText]="'rule-node-config.strategy-first-hint'"
+                        textAlign="'center'"
+                       *ngIf="deduplicationConfigForm.get('strategy').value === 'FIRST'">
+      </tb-example-hint>
+      <tb-example-hint [hintText]="'rule-node-config.strategy-last-hint'"
+                        textAlign="'center'"
+                       *ngIf="deduplicationConfigForm.get('strategy').value === 'LAST'">
+      </tb-example-hint>
+      <div *ngIf="deduplicationConfigForm.get('strategy').value === deduplicationStrategie.ALL">
+        <tb-output-message-type-autocomplete
+          required
+          formControlName="outMsgType">
+        </tb-output-message-type-autocomplete>
+      </div>
+    </div>
+    <section class="tb-form-panel stroked">
+      <mat-expansion-panel class="tb-settings">
+        <mat-expansion-panel-header>
+          <mat-panel-title translate>rule-node-config.advanced-settings</mat-panel-title>
+        </mat-expansion-panel-header>
+        <div class="tb-form-row no-border no-padding tb-standard-fields">
+          <mat-form-field class="flex">
+            <mat-label>{{'rule-node-config.max-pending-msgs' | translate}}</mat-label>
+            <input type = 'number' required matInput formControlName="maxPendingMsgs">
+            <mat-error *ngIf="deduplicationConfigForm.get('maxPendingMsgs').hasError('required')">
+              {{'rule-node-config.max-pending-msgs-required' | translate}}
+            </mat-error>
+            <mat-error *ngIf="deduplicationConfigForm.get('maxPendingMsgs').hasError('max')">
+              {{'rule-node-config.max-pending-msgs-max-error' | translate}}
+            </mat-error>
+            <mat-error *ngIf="deduplicationConfigForm.get('maxPendingMsgs').hasError('min')">
+              {{'rule-node-config.max-pending-msgs-min-error' | translate}}
+            </mat-error>
+            <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+                      color="primary"
+                      matTooltip="{{ 'rule-node-config.max-pending-msgs-hint' | translate }}">help</mat-icon>
+          </mat-form-field>
+          <mat-form-field class="flex">
+            <mat-label>{{'rule-node-config.max-retries' | translate}}</mat-label>
+            <input type = 'number' required matInput formControlName="maxRetries">
+            <mat-error *ngIf="deduplicationConfigForm.get('maxRetries').hasError('required')">
+              {{'rule-node-config.max-retries-required' | translate}}
+            </mat-error>
+            <mat-error *ngIf="deduplicationConfigForm.get('maxRetries').hasError('max')">
+              {{'rule-node-config.max-retries-max-error' | translate}}
+            </mat-error>
+            <mat-error *ngIf="deduplicationConfigForm.get('maxRetries').hasError('min')">
+              {{'rule-node-config.max-retries-min-error' | translate}}
+            </mat-error>
+            <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+                      color="primary"
+                      matTooltip="{{ 'rule-node-config.max-retries-hint' | translate }}">help</mat-icon>
+          </mat-form-field>
+        </div>
+      </mat-expansion-panel>
+    </section>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/deduplication-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/deduplication-config.component.ts
new file mode 100644
index 0000000000..bf50b36f3a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/deduplication-config.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 } from '@angular/core';
+import { isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { deduplicationStrategiesTranslations, FetchMode } from '@home/components/rule-node/rule-node-config.models';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-transformation-node-deduplication-config',
+  templateUrl: './deduplication-config.component.html',
+  styleUrls: []
+})
+
+export class DeduplicationConfigComponent extends RuleNodeConfigurationComponent {
+
+  deduplicationConfigForm: FormGroup;
+  deduplicationStrategie = FetchMode;
+  deduplicationStrategies = Object.keys(this.deduplicationStrategie);
+  deduplicationStrategiesTranslations = deduplicationStrategiesTranslations;
+
+  constructor(private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.deduplicationConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.deduplicationConfigForm = this.fb.group({
+      interval: [isDefinedAndNotNull(configuration?.interval) ? configuration.interval : null, [Validators.required,
+        Validators.min(1)]],
+      strategy: [isDefinedAndNotNull(configuration?.strategy) ? configuration.strategy : null, [Validators.required]],
+      outMsgType: [isDefinedAndNotNull(configuration?.outMsgType) ? configuration.outMsgType : null, [Validators.required]],
+      maxPendingMsgs: [isDefinedAndNotNull(configuration?.maxPendingMsgs) ? configuration.maxPendingMsgs : null, [Validators.required,
+        Validators.min(1), Validators.max(1000)]],
+      maxRetries: [isDefinedAndNotNull(configuration?.maxRetries) ? configuration.maxRetries : null,
+        [Validators.required, Validators.min(0), Validators.max(100)]]
+    });
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    if (!configuration) {
+      configuration = {};
+    }
+    if (!configuration.outMsgType) {
+      configuration.outMsgType = 'POST_TELEMETRY_REQUEST';
+    }
+    return super.prepareInputConfig(configuration);
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    if (this.deduplicationConfigForm.get('strategy').value === this.deduplicationStrategie.ALL) {
+      this.deduplicationConfigForm.get('outMsgType').enable({emitEvent: false});
+    } else {
+      this.deduplicationConfigForm.get('outMsgType').disable({emitEvent: false});
+    }
+    this.deduplicationConfigForm.get('outMsgType').updateValueAndValidity({emitEvent});
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['strategy'];
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/delete-keys-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/delete-keys-config.component.html
new file mode 100644
index 0000000000..2bab63f4d6
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/delete-keys-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="deleteKeysConfigForm" class="tb-form-panel no-border no-padding">
+  <tb-msg-metadata-chip
+    [labelText]="('rule-node-config.key-val.delete-key-values-from' | translate)"
+    formControlName="deleteFrom">
+  </tb-msg-metadata-chip>
+  <tb-string-items-list class="mat-block"
+                        required
+                        [label]="'rule-node-config.keys' | translate"
+                        [placeholder]="'rule-node-config.add-key' | translate"
+                        [requiredText]="'rule-node-config.key-val.at-least-one-key-error' | translate"
+                        formControlName="keys">
+    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"
+              color="primary"
+              matTooltip="{{ 'rule-node-config.use-regular-expression-delete-hint' | translate }}">
+      help
+    </mat-icon>
+  </tb-string-items-list>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/delete-keys-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/delete-keys-config.component.ts
new file mode 100644
index 0000000000..a5e95ef6ce
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/delete-keys-config.component.ts
@@ -0,0 +1,74 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { isDefinedAndNotNull } from '@core/public-api';
+import { TranslateService } from '@ngx-translate/core';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+import { FetchTo, FetchToTranslation } from '@home/components/rule-node/rule-node-config.models';
+
+@Component({
+  selector: 'tb-transformation-node-delete-keys-config',
+  templateUrl: './delete-keys-config.component.html',
+  styleUrls: []
+})
+
+export class DeleteKeysConfigComponent extends RuleNodeConfigurationComponent {
+
+  deleteKeysConfigForm: FormGroup;
+  deleteFrom = [];
+  translation = FetchToTranslation;
+
+  constructor(private fb: FormBuilder,
+              private translate: TranslateService) {
+    super();
+    for (const key of this.translation.keys()) {
+      this.deleteFrom.push({
+        value: key,
+        name: this.translate.instant(this.translation.get(key))
+      });
+    }
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.deleteKeysConfigForm = this.fb.group({
+      deleteFrom: [configuration.deleteFrom, [Validators.required]],
+      keys: [configuration ? configuration.keys : null, [Validators.required]]
+    });
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    let deleteFrom: FetchTo;
+
+    if (isDefinedAndNotNull(configuration?.fromMetadata)) {
+      deleteFrom = configuration.fromMetadata ? FetchTo.METADATA : FetchTo.DATA;
+    } else if (isDefinedAndNotNull(configuration?.deleteFrom)) {
+      deleteFrom = configuration?.deleteFrom;
+    } else {
+      deleteFrom = FetchTo.DATA;
+    }
+
+    return {
+      keys: isDefinedAndNotNull(configuration?.keys) ? configuration.keys : null,
+      deleteFrom
+    };
+  }
+
+  protected configForm(): FormGroup {
+    return this.deleteKeysConfigForm;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/node-json-path-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/node-json-path-config.component.html
new file mode 100644
index 0000000000..94f8046b1b
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/node-json-path-config.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.
+
+-->
+<section [formGroup]="jsonPathConfigForm">
+  <mat-form-field subscriptSizing="dynamic" class="mat-block">
+    <mat-label>{{ 'rule-node-config.json-path-expression' | translate }}</mat-label>
+    <input matInput formControlName="jsonPath" required/>
+    <mat-hint>{{ 'rule-node-config.json-path-expression-hint' | translate }}</mat-hint>
+    <mat-error *ngIf="jsonPathConfigForm.get('jsonPath').hasError('required')">{{ 'rule-node-config.json-path-expression-required' | translate }}</mat-error>
+  </mat-form-field>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/node-json-path-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/node-json-path-config.component.ts
new file mode 100644
index 0000000000..47185b1d51
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/node-json-path-config.component.ts
@@ -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.
+///
+
+import { Component } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-transformation-node-json-path-config',
+  templateUrl: './node-json-path-config.component.html',
+  styleUrls: []
+})
+
+export class NodeJsonPathConfigComponent extends RuleNodeConfigurationComponent {
+
+  jsonPathConfigForm: FormGroup;
+
+  constructor(private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.jsonPathConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.jsonPathConfigForm = this.fb.group({
+      jsonPath: [configuration ? configuration.jsonPath : null, [Validators.required]],
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.html
new file mode 100644
index 0000000000..7543875f19
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="renameKeysConfigForm" class="tb-form-panel stroked">
+  <div class="tb-form-panel-title" translate>rule-node-config.rename-keys-in</div>
+  <div class="fx-centered">
+    <div class="fetch-to-data-toggle">
+      <tb-toggle-select class="fetch-to-data-toggle" formControlName="renameIn" appearance="fill">
+        <tb-toggle-option *ngFor="let data of renameIn" [value]="data.value">
+          {{ data.name }}
+        </tb-toggle-option>
+      </tb-toggle-select>
+    </div>
+  </div>
+  <tb-kv-map-config
+    required
+    labelText="{{ translation.get(renameKeysConfigForm.get('renameIn').value) | translate }} {{'rule-node-config.keys-mapping' | translate}}"
+    formControlName="renameKeysMapping"
+    uniqueKeyValuePairValidator
+    requiredText="{{'rule-node-config.attr-mapping-required' | translate}}"
+    keyText="{{'rule-node-config.current-key-name' | translate}}"
+    keyRequiredText="{{'rule-node-config.key-name-required' | translate}}"
+    valText="{{'rule-node-config.new-key-name' | translate}}"
+    valRequiredText="{{'rule-node-config.new-key-name-required' | translate}}">
+  </tb-kv-map-config>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.scss b/ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.scss
new file mode 100644
index 0000000000..1c767d5d68
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.scss
@@ -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.
+ */
+:host {
+  .fetch-to-data-toggle {
+    max-width: 420px;
+    width: 100%;
+  }
+
+  .fx-centered {
+    display: flex;
+    width: 100%;
+    justify-content: space-around;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.ts
new file mode 100644
index 0000000000..ebc7393b05
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/rename-keys-config.component.ts
@@ -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 { Component } from '@angular/core';
+import { isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { FetchTo, FetchToRenameTranslation } from '../rule-node-config.models';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@shared/models/rule-node.models';
+
+
+@Component({
+  selector: 'tb-transformation-node-rename-keys-config',
+  templateUrl: './rename-keys-config.component.html',
+  styleUrls: ['./rename-keys-config.component.scss']
+})
+export class RenameKeysConfigComponent extends RuleNodeConfigurationComponent {
+  renameKeysConfigForm: FormGroup;
+  renameIn = [];
+  translation = FetchToRenameTranslation;
+
+  constructor(private fb: FormBuilder,
+              private translate: TranslateService) {
+    super();
+    for (const key of this.translation.keys()) {
+      this.renameIn.push({
+        value: key,
+        name: this.translate.instant(this.translation.get(key))
+      });
+    }
+  }
+
+  protected configForm(): FormGroup {
+    return this.renameKeysConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.renameKeysConfigForm = this.fb.group({
+      renameIn: [configuration ? configuration.renameIn : null, [Validators.required]],
+      renameKeysMapping: [configuration ? configuration.renameKeysMapping : null, [Validators.required]]
+    });
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    let renameIn: FetchTo;
+
+    if (isDefinedAndNotNull(configuration?.fromMetadata)) {
+      renameIn = configuration.fromMetadata ? FetchTo.METADATA : FetchTo.DATA;
+    } else if (isDefinedAndNotNull(configuration?.renameIn)) {
+      renameIn = configuration?.renameIn;
+    } else {
+      renameIn = FetchTo.DATA;
+    }
+
+    return {
+      renameKeysMapping: isDefinedAndNotNull(configuration?.renameKeysMapping) ? configuration.renameKeysMapping : null,
+      renameIn
+    };
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/script-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/script-config.component.html
new file mode 100644
index 0000000000..efabc8d940
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/script-config.component.html
@@ -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.
+
+-->
+<section [formGroup]="scriptConfigForm">
+  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>
+  <tb-js-func *ngIf="scriptConfigForm.get('scriptLang').value === scriptLanguage.JS"
+              #jsFuncComponent
+              formControlName="jsScript"
+              functionName="Transform"
+              helpId="rulenode/transformation_node_script_fn"
+              [functionArgs]="['msg', 'metadata', 'msgType']"
+              noValidate="true">
+    <button toolbarSuffixButton
+            mat-icon-button
+            matTooltip="{{ testScriptLabel | translate }}"
+            matTooltipPosition="above"
+            class="tb-mat-32"
+            (click)="testScript()">
+      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+    </button>
+  </tb-js-func>
+  <tb-js-func *ngIf="scriptConfigForm.get('scriptLang').value === scriptLanguage.TBEL"
+              #tbelFuncComponent
+              formControlName="tbelScript"
+              functionName="Transform"
+              helpId="rulenode/tbel/transformation_node_script_fn"
+              [functionArgs]="['msg', 'metadata', 'msgType']"
+              [disableUndefinedCheck]="true"
+              [scriptLanguage]="scriptLanguage.TBEL"
+              noValidate="true">
+    <button toolbarSuffixButton
+            mat-icon-button
+            matTooltip="{{ testScriptLabel | translate }}"
+            matTooltipPosition="above"
+            class="tb-mat-32"
+            (click)="testScript()">
+      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+    </button>
+  </tb-js-func>
+  <div>
+    <button mat-button mat-raised-button color="primary" (click)="testScript()">
+      {{ testScriptLabel | translate }}
+    </button>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/script-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/script-config.component.ts
new file mode 100644
index 0000000000..848a9dd2e9
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/script-config.component.ts
@@ -0,0 +1,128 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, ViewChild } from '@angular/core';
+import { getCurrentAuthState, NodeScriptTestService } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import type { JsFuncComponent } from '@shared/components/js-func.component';
+import {
+  RuleNodeConfiguration,
+  RuleNodeConfigurationComponent,
+  ScriptLanguage
+} from '@app/shared/models/rule-node.models';
+import { DebugRuleNodeEventBody } from '@shared/models/event.models';
+
+@Component({
+  selector: 'tb-transformation-node-script-config',
+  templateUrl: './script-config.component.html',
+  styleUrls: []
+})
+export class TransformScriptConfigComponent extends RuleNodeConfigurationComponent {
+
+  @ViewChild('jsFuncComponent', {static: false}) jsFuncComponent: JsFuncComponent;
+  @ViewChild('tbelFuncComponent', {static: false}) tbelFuncComponent: JsFuncComponent;
+
+  scriptConfigForm: FormGroup;
+
+  tbelEnabled = getCurrentAuthState(this.store).tbelEnabled;
+
+  scriptLanguage = ScriptLanguage;
+
+  changeScript: EventEmitter<void> = new EventEmitter<void>();
+
+  readonly hasScript = true;
+
+  readonly testScriptLabel = 'rule-node-config.test-transformer-function';
+
+  constructor(private fb: FormBuilder,
+              private nodeScriptTestService: NodeScriptTestService,
+              private translate: TranslateService) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.scriptConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.scriptConfigForm = this.fb.group({
+      scriptLang: [configuration ? configuration.scriptLang : ScriptLanguage.JS, [Validators.required]],
+      jsScript: [configuration ? configuration.jsScript : null, [Validators.required]],
+      tbelScript: [configuration ? configuration.tbelScript : null, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['scriptLang'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    let scriptLang: ScriptLanguage = this.scriptConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.TBEL && !this.tbelEnabled) {
+      scriptLang = ScriptLanguage.JS;
+      this.scriptConfigForm.get('scriptLang').patchValue(scriptLang, {emitEvent: false});
+      setTimeout(() => {
+        this.scriptConfigForm.updateValueAndValidity({emitEvent: true});
+      });
+    }
+    this.scriptConfigForm.get('jsScript').setValidators(scriptLang === ScriptLanguage.JS ? [Validators.required] : []);
+    this.scriptConfigForm.get('jsScript').updateValueAndValidity({emitEvent});
+    this.scriptConfigForm.get('tbelScript').setValidators(scriptLang === ScriptLanguage.TBEL ? [Validators.required] : []);
+    this.scriptConfigForm.get('tbelScript').updateValueAndValidity({emitEvent});
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    if (configuration) {
+      if (!configuration.scriptLang) {
+        configuration.scriptLang = ScriptLanguage.JS;
+      }
+    }
+    return configuration;
+  }
+
+  testScript(debugEventBody?: DebugRuleNodeEventBody) {
+    const scriptLang: ScriptLanguage = this.scriptConfigForm.get('scriptLang').value;
+    const scriptField = scriptLang === ScriptLanguage.JS ? 'jsScript' : 'tbelScript';
+    const helpId = scriptLang === ScriptLanguage.JS
+      ? 'rulenode/transformation_node_script_fn'
+      : 'rulenode/tbel/transformation_node_script_fn';
+    const script: string = this.scriptConfigForm.get(scriptField).value;
+    this.nodeScriptTestService.testNodeScript(
+      script,
+      'update',
+      this.translate.instant('rule-node-config.transformer'),
+      'Transform',
+      ['msg', 'metadata', 'msgType'],
+      this.ruleNodeId,
+      helpId,
+      scriptLang,
+      debugEventBody
+    ).subscribe((theScript) => {
+      if (theScript) {
+        this.scriptConfigForm.get(scriptField).setValue(theScript);
+        this.changeScript.emit();
+      }
+    });
+  }
+
+  protected onValidate() {
+    const scriptLang: ScriptLanguage = this.scriptConfigForm.get('scriptLang').value;
+    if (scriptLang === ScriptLanguage.JS) {
+      this.jsFuncComponent.validateOnSubmit();
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.html
new file mode 100644
index 0000000000..373a4c6b57
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.html
@@ -0,0 +1,139 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section [formGroup]="toEmailConfigForm" class="tb-form-panel no-border no-padding">
+  <div class="tb-form-panel stroked">
+    <div class="tb-form-panel-title" translate>rule-node-config.email-sender</div>
+    <div class="tb-form-row no-border no-padding tb-standard-fields">
+      <mat-form-field class="flex" subscriptSizing="dynamic">
+        <mat-label translate>rule-node-config.from-template</mat-label>
+        <input required matInput formControlName="fromTemplate">
+        <mat-hint align="start">
+          {{ 'rule-node-config.email-from-template-hint' | translate }}
+        </mat-hint>
+        <mat-hint align="end">
+          <div class="input-bottom-double-hint">
+            <div class="see-example"
+                hintMode
+                tb-help-popup="{{'rulenode/to_email_node_fields_templatization'}}"
+                tb-help-popup-placement="right"
+                trigger-style="letter-spacing:0.25px; font-size:12px;"
+                [tb-help-popup-style]="{maxWidth: '820px'}"
+                trigger-text="{{ 'rule-node-config.key-val.see-examples' | translate }}"></div>
+          </div>
+        </mat-hint>
+        <mat-error *ngIf="toEmailConfigForm.get('fromTemplate').hasError('required')">
+          {{ 'rule-node-config.from-template-required' | translate }}
+        </mat-error>
+      </mat-form-field>
+    </div>
+  </div>
+  <div class="tb-form-panel stroked">
+    <div class="tb-form-panel no-padding no-border">
+      <div class="tb-form-panel-title" translate>rule-node-config.recipients</div>
+      <tb-example-hint [hintText]="'rule-node-config.recipients-block-main-hint'"
+                        popupHelpLink="rulenode/to_email_node_fields_templatization">
+      </tb-example-hint>
+    </div>
+    <div class="tb-form-row no-border no-padding tb-standard-fields">
+      <mat-form-field class="flex">
+        <mat-label translate>rule-node-config.to-template</mat-label>
+        <textarea required
+                  matInput
+                  class="tb-enable-vertical-resize"
+                  formControlName="toTemplate"
+                  cdkTextareaAutosize
+                  cdkAutosizeMinRows="1"></textarea>
+        <mat-error *ngIf="toEmailConfigForm.get('toTemplate').hasError('required')">
+          {{ 'rule-node-config.to-template-required' | translate }}
+        </mat-error>
+      </mat-form-field>
+      <mat-form-field class="flex">
+        <mat-label translate>rule-node-config.cc-template</mat-label>
+        <textarea matInput
+                  formControlName="ccTemplate"
+                  class="tb-enable-vertical-resize"
+                  cdkTextareaAutosize
+                  cdkAutosizeMinRows="1"></textarea>
+      </mat-form-field>
+      <mat-form-field class="flex">
+        <mat-label translate>rule-node-config.bcc-template</mat-label>
+        <textarea matInput
+                  formControlName="bccTemplate"
+                  class="tb-enable-vertical-resize"
+                  cdkTextareaAutosize
+                  cdkAutosizeMinRows="1"></textarea>
+      </mat-form-field>
+    </div>
+  </div>
+  <div class="tb-form-panel stroked">
+    <div class="tb-form-panel-title" translate>rule-node-config.message-subject-and-content</div>
+    <tb-example-hint [hintText]="'rule-node-config.kv-map-pattern-hint'"
+                      popupHelpLink="rulenode/to_email_node_fields_templatization">
+    </tb-example-hint>
+    <section>
+      <mat-form-field class="mat-block">
+        <mat-label translate>rule-node-config.subject-template</mat-label>
+        <textarea required
+                  matInput
+                  formControlName="subjectTemplate"
+                  class="tb-enable-vertical-resize"
+                  cdkTextareaAutosize
+                  cdkAutosizeMinRows="1"></textarea>
+        <mat-error *ngIf="toEmailConfigForm.get('subjectTemplate').hasError('required')">
+          {{ 'rule-node-config.subject-template-required' | translate }}
+        </mat-error>
+      </mat-form-field>
+      <mat-form-field class="mat-block">
+        <mat-label translate>rule-node-config.mail-body-type</mat-label>
+        <mat-select formControlName="mailBodyType">
+          <mat-select-trigger>
+            <span *ngIf="toEmailConfigForm.get('mailBodyType').value">
+              {{ getBodyTypeName() | translate }}
+            </span>
+          </mat-select-trigger>
+          <mat-option *ngFor="let type of mailBodyTypes" [value]="type.value">
+            <span matListItemTitle>
+              {{ type.name | translate }}
+            </span>
+            <br>
+            <small matListItemMeta style="color: inherit">
+              {{ type.description | translate }}
+            </small>
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <mat-form-field class="mat-block" *ngIf="toEmailConfigForm.get('mailBodyType').value === 'dynamic'">
+        <mat-label translate>rule-node-config.body-type-template</mat-label>
+        <input required matInput formControlName="isHtmlTemplate">
+        <mat-hint translate>rule-node-config.mail-body-types.after-template-evaluation-hint</mat-hint>
+      </mat-form-field>
+      <mat-form-field class="mat-block">
+        <mat-label translate>rule-node-config.body-template</mat-label>
+        <textarea required
+                  matInput
+                  formControlName="bodyTemplate"
+                  class="tb-enable-vertical-resize"
+                  cdkTextareaAutosize
+                  cdkAutosizeMinRows="2"></textarea>
+        <mat-error *ngIf="toEmailConfigForm.get('bodyTemplate').hasError('required')">
+          {{ 'rule-node-config.body-template-required' | translate }}
+        </mat-error>
+      </mat-form-field>
+    </section>
+  </div>
+</section>
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-help.tsx b/ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.scss
similarity index 59%
rename from ui-ngx/src/app/shared/components/json-form/react/json-form-help.tsx
rename to ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.scss
index 68536f457e..2a0c2e6ea3 100644
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-help.tsx
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.scss
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright © 2016-2024 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,15 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
+:host {
+  .input-bottom-double-hint {
+    display: inline-flex;
 
-class ThingsboardHelp extends React.Component<JsonFormFieldProps, JsonFormFieldState> {
-  render() {
-    return (
-      <div className={this.props.form.htmlClass} dangerouslySetInnerHTML={{__html: this.props.form.description}} ></div>
-    );
+    & .see-example {
+      flex-shrink: 0;
+      padding-right: 16px;
+    }
   }
-}
 
-export default ThingsboardHelp;
+  textarea.tb-enable-vertical-resize {
+    resize: vertical;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.ts
new file mode 100644
index 0000000000..97282025fd
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/to-email-config.component.ts
@@ -0,0 +1,98 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { isDefinedAndNotNull } from '@core/public-api';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { RuleNodeConfiguration, RuleNodeConfigurationComponent } from '@app/shared/models/rule-node.models';
+
+@Component({
+  selector: 'tb-transformation-node-to-email-config',
+  templateUrl: './to-email-config.component.html',
+  styleUrls: ['./to-email-config.component.scss']
+})
+export class ToEmailConfigComponent extends RuleNodeConfigurationComponent {
+
+  toEmailConfigForm: FormGroup;
+  mailBodyTypes = [
+    {
+      name: 'rule-node-config.mail-body-types.plain-text',
+      description: 'rule-node-config.mail-body-types.plain-text-description',
+      value: 'false',
+    },
+    {
+      name: 'rule-node-config.mail-body-types.html',
+      description: 'rule-node-config.mail-body-types.html-text-description',
+      value: 'true',
+    },
+    {
+      name: 'rule-node-config.mail-body-types.use-body-type-template',
+      description: 'rule-node-config.mail-body-types.dynamic-text-description',
+      value: 'dynamic',
+    }
+  ];
+
+  constructor(private fb: FormBuilder) {
+    super();
+  }
+
+  protected configForm(): FormGroup {
+    return this.toEmailConfigForm;
+  }
+
+  protected onConfigurationSet(configuration: RuleNodeConfiguration) {
+    this.toEmailConfigForm = this.fb.group({
+      fromTemplate: [configuration ? configuration.fromTemplate : null, [Validators.required]],
+      toTemplate: [configuration ? configuration.toTemplate : null, [Validators.required]],
+      ccTemplate: [configuration ? configuration.ccTemplate : null, []],
+      bccTemplate: [configuration ? configuration.bccTemplate : null, []],
+      subjectTemplate: [configuration ? configuration.subjectTemplate : null, [Validators.required]],
+      mailBodyType: [configuration ? configuration.mailBodyType : null],
+      isHtmlTemplate: [configuration ? configuration.isHtmlTemplate : null, [Validators.required]],
+      bodyTemplate: [configuration ? configuration.bodyTemplate : null, [Validators.required]],
+    });
+  }
+
+  protected prepareInputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
+    return {
+      fromTemplate: isDefinedAndNotNull(configuration?.fromTemplate) ? configuration.fromTemplate : null,
+      toTemplate: isDefinedAndNotNull(configuration?.toTemplate) ? configuration.toTemplate : null,
+      ccTemplate: isDefinedAndNotNull(configuration?.ccTemplate) ? configuration.ccTemplate : null,
+      bccTemplate: isDefinedAndNotNull(configuration?.bccTemplate) ? configuration.bccTemplate : null,
+      subjectTemplate: isDefinedAndNotNull(configuration?.subjectTemplate) ? configuration.subjectTemplate : null,
+      mailBodyType: isDefinedAndNotNull(configuration?.mailBodyType) ? configuration.mailBodyType : null,
+      isHtmlTemplate: isDefinedAndNotNull(configuration?.isHtmlTemplate) ? configuration.isHtmlTemplate : null,
+      bodyTemplate: isDefinedAndNotNull(configuration?.bodyTemplate) ? configuration.bodyTemplate : null,
+    };
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    if (this.toEmailConfigForm.get('mailBodyType').value === 'dynamic') {
+      this.toEmailConfigForm.get('isHtmlTemplate').enable({emitEvent: false});
+    } else {
+      this.toEmailConfigForm.get('isHtmlTemplate').disable({emitEvent: false});
+    }
+    this.toEmailConfigForm.get('isHtmlTemplate').updateValueAndValidity({emitEvent});
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['mailBodyType'];
+  }
+
+  getBodyTypeName(): string {
+    return this.mailBodyTypes.find(type => type.value === this.toEmailConfigForm.get('mailBodyType').value).name;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/transformation/transformation-rule-node-config.module.ts b/ui-ngx/src/app/modules/home/components/rule-node/transformation/transformation-rule-node-config.module.ts
new file mode 100644
index 0000000000..5104d3ac81
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/rule-node/transformation/transformation-rule-node-config.module.ts
@@ -0,0 +1,58 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '@shared/public-api';
+import { ChangeOriginatorConfigComponent } from './change-originator-config.component';
+import { CommonRuleNodeConfigModule } from '../common/common-rule-node-config.module';
+import { TransformScriptConfigComponent } from './script-config.component';
+import { ToEmailConfigComponent } from './to-email-config.component';
+import { CopyKeysConfigComponent } from './copy-keys-config.component';
+import { RenameKeysConfigComponent } from './rename-keys-config.component';
+import { NodeJsonPathConfigComponent } from './node-json-path-config.component';
+import { DeleteKeysConfigComponent } from './delete-keys-config.component';
+import { DeduplicationConfigComponent } from './deduplication-config.component';
+
+@NgModule({
+  declarations: [
+    ChangeOriginatorConfigComponent,
+    TransformScriptConfigComponent,
+    ToEmailConfigComponent,
+    CopyKeysConfigComponent,
+    RenameKeysConfigComponent,
+    NodeJsonPathConfigComponent,
+    DeleteKeysConfigComponent,
+    DeduplicationConfigComponent
+  ],
+  imports: [
+    CommonModule,
+    SharedModule,
+    CommonRuleNodeConfigModule
+  ],
+  exports: [
+    ChangeOriginatorConfigComponent,
+    TransformScriptConfigComponent,
+    ToEmailConfigComponent,
+    CopyKeysConfigComponent,
+    RenameKeysConfigComponent,
+    NodeJsonPathConfigComponent,
+    DeleteKeysConfigComponent,
+    DeduplicationConfigComponent
+  ]
+})
+export class TransformationRuleNodeConfigModule {
+}
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 800deec7e5..8a71e04e1e 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
@@ -14,10 +14,10 @@
 /// limitations under the License.
 ///
 
-import { NgModule, Type } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { SharedModule } from '@shared/shared.module';
-import { IBasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models';
+import { WidgetService } from '@core/http/widget.service';
 import { WidgetConfigComponentsModule } from '@home/components/widget/config/widget-config-components.module';
 import {
   SimpleCardBasicConfigComponent
@@ -146,6 +146,9 @@ import { ScadaSymbolBasicConfigComponent } from '@home/components/widget/config/
 import {
   SegmentedButtonBasicConfigComponent
 } from '@home/components/widget/config/basic/button/segmented-button-basic-config.component';
+import {
+  ValueStepperBasicConfigComponent
+} from '@home/components/widget/config/basic/rpc/value-stepper-basic-config.component';
 
 @NgModule({
   declarations: [
@@ -182,6 +185,7 @@ import {
     PowerButtonBasicConfigComponent,
     SliderBasicConfigComponent,
     ToggleButtonBasicConfigComponent,
+    ValueStepperBasicConfigComponent,
     TimeSeriesChartBasicConfigComponent,
     ComparisonKeyRowComponent,
     ComparisonKeysTableComponent,
@@ -236,6 +240,7 @@ import {
     PowerButtonBasicConfigComponent,
     SliderBasicConfigComponent,
     ToggleButtonBasicConfigComponent,
+    ValueStepperBasicConfigComponent,
     TimeSeriesChartBasicConfigComponent,
     StatusWidgetBasicConfigComponent,
     PieChartBasicConfigComponent,
@@ -251,47 +256,7 @@ import {
   ]
 })
 export class BasicWidgetConfigModule {
+  constructor(private widgetService: WidgetService) {
+    this.widgetService.registerBasicWidgetConfigComponents(this.constructor)
+  }
 }
-
-export const basicWidgetConfigComponentsMap: {[key: string]: Type<IBasicWidgetConfigComponent>} = {
-  'tb-simple-card-basic-config': SimpleCardBasicConfigComponent,
-  'tb-entities-table-basic-config': EntitiesTableBasicConfigComponent,
-  'tb-timeseries-table-basic-config': TimeseriesTableBasicConfigComponent,
-  'tb-flot-basic-config': FlotBasicConfigComponent,
-  'tb-alarms-table-basic-config': AlarmsTableBasicConfigComponent,
-  'tb-value-card-basic-config': ValueCardBasicConfigComponent,
-  'tb-aggregated-value-card-basic-config': AggregatedValueCardBasicConfigComponent,
-  'tb-alarm-count-basic-config': AlarmCountBasicConfigComponent,
-  'tb-entity-count-basic-config': EntityCountBasicConfigComponent,
-  'tb-battery-level-basic-config': BatteryLevelBasicConfigComponent,
-  'tb-wind-speed-direction-basic-config': WindSpeedDirectionBasicConfigComponent,
-  'tb-signal-strength-basic-config': SignalStrengthBasicConfigComponent,
-  'tb-value-chart-card-basic-config': ValueChartCardBasicConfigComponent,
-  'tb-progress-bar-basic-config': ProgressBarBasicConfigComponent,
-  'tb-radial-gauge-basic-config': RadialGaugeBasicConfigComponent,
-  'tb-thermometer-scale-gauge-basic-config': ThermometerScaleGaugeBasicConfigComponent,
-  'tb-compass-gauge-basic-config': CompassGaugeBasicConfigComponent,
-  'tb-liquid-level-card-basic-config': LiquidLevelCardBasicConfigComponent,
-  'tb-doughnut-basic-config': DoughnutBasicConfigComponent,
-  'tb-range-chart-basic-config': RangeChartBasicConfigComponent,
-  'tb-bar-chart-with-labels-basic-config': BarChartWithLabelsBasicConfigComponent,
-  'tb-single-switch-basic-config': SingleSwitchBasicConfigComponent,
-  'tb-action-button-basic-config': ActionButtonBasicConfigComponent,
-  'tb-segmented-button-basic-config': SegmentedButtonBasicConfigComponent,
-  'tb-command-button-basic-config': CommandButtonBasicConfigComponent,
-  'tb-power-button-basic-config': PowerButtonBasicConfigComponent,
-  'tb-slider-basic-config': SliderBasicConfigComponent,
-  'tb-toggle-button-basic-config': ToggleButtonBasicConfigComponent,
-  'tb-time-series-chart-basic-config': TimeSeriesChartBasicConfigComponent,
-  'tb-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,
-  'tb-digital-simple-gauge-basic-config': DigitalSimpleGaugeBasicConfigComponent,
-  'tb-mobile-app-qr-code-basic-config': MobileAppQrCodeBasicConfigComponent,
-  'tb-label-card-basic-config': LabelCardBasicConfigComponent,
-  'tb-label-value-card-basic-config': LabelValueCardBasicConfigComponent,
-  'tb-unread-notification-basic-config': UnreadNotificationBasicConfigComponent,
-  'tb-scada-symbol-basic-config': ScadaSymbolBasicConfigComponent
-};
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.html
index 75fcf791b0..a2e3f90aee 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.html
@@ -116,6 +116,38 @@
         </tb-color-input>
       </div>
     </div>
+    <div class="tb-form-row column-xs" formGroupName="onButtonIcon">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showIcon">
+        {{ 'widgets.power-button.button-icon-on' | translate }}
+      </mat-slide-toggle>
+      <div class="flex flex-1 flex-row items-center justify-start gap-2">
+        <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+          <input matInput type="number" min="0" formControlName="iconSize" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+        <tb-css-unit-select class="flex-1" formControlName="iconSizeUnit"></tb-css-unit-select>
+        <tb-material-icon-select asBoxInput
+                                 iconClearButton
+                                 [color]="powerButtonWidgetConfigForm.get('mainColorOn').value"
+                                 formControlName="icon">
+        </tb-material-icon-select>
+      </div>
+    </div>
+    <div class="tb-form-row column-xs" formGroupName="offButtonIcon">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showIcon">
+        {{ 'widgets.power-button.button-icon-off' | translate }}
+      </mat-slide-toggle>
+      <div class="flex flex-1 flex-row items-center justify-start gap-2">
+        <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+          <input matInput type="number" min="0" formControlName="iconSize" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+        <tb-css-unit-select class="flex-1" formControlName="iconSizeUnit"></tb-css-unit-select>
+        <tb-material-icon-select asBoxInput
+                                 iconClearButton
+                                 [color]="powerButtonWidgetConfigForm.get('mainColorOff').value"
+                                 formControlName="icon">
+        </tb-material-icon-select>
+      </div>
+    </div>
     <div class="tb-form-row space-between column-xs">
       <div>{{ 'widgets.power-button.power-on-colors' | translate }}</div>
       <div class="flex flex-row items-center justify-start gap-3">
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.ts
index 2c92936141..00b0a41e18 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.ts
@@ -87,6 +87,19 @@ export class PowerButtonBasicConfigComponent extends BasicWidgetConfigComponent
       icon: [configData.config.titleIcon, []],
       iconColor: [configData.config.iconColor, []],
 
+      onButtonIcon: this.fb.group({
+        showIcon: [settings.onButtonIcon.showIcon, []],
+        iconSize: [settings.onButtonIcon.iconSize, [Validators.min(0)]],
+        iconSizeUnit: [settings.onButtonIcon.iconSizeUnit, []],
+        icon: [settings.onButtonIcon.icon, []],
+      }),
+      offButtonIcon: this.fb.group({
+        showIcon: [settings.offButtonIcon.showIcon, []],
+        iconSize: [settings.offButtonIcon.iconSize, [Validators.min(0)]],
+        iconSizeUnit: [settings.offButtonIcon.iconSizeUnit, []],
+        icon: [settings.offButtonIcon.icon, []],
+      }),
+
       mainColorOn: [settings.mainColorOn, []],
       backgroundColorOn: [settings.backgroundColorOn, []],
 
@@ -128,6 +141,9 @@ export class PowerButtonBasicConfigComponent extends BasicWidgetConfigComponent
 
     this.widgetConfig.config.settings.layout = config.layout;
 
+    this.widgetConfig.config.settings.onButtonIcon = config.onButtonIcon;
+    this.widgetConfig.config.settings.offButtonIcon = config.offButtonIcon;
+
     this.widgetConfig.config.settings.mainColorOn = config.mainColorOn;
     this.widgetConfig.config.settings.backgroundColorOn = config.backgroundColorOn;
 
@@ -148,12 +164,14 @@ export class PowerButtonBasicConfigComponent extends BasicWidgetConfigComponent
   }
 
   protected validatorTriggers(): string[] {
-    return ['showTitle', 'showIcon'];
+    return ['showTitle', 'showIcon', 'onButtonIcon.showIcon', 'offButtonIcon.showIcon'];
   }
 
   protected updateValidators(emitEvent: boolean, trigger?: string) {
     const showTitle: boolean = this.powerButtonWidgetConfigForm.get('showTitle').value;
     const showIcon: boolean = this.powerButtonWidgetConfigForm.get('showIcon').value;
+    const onButtonIcon: boolean = this.powerButtonWidgetConfigForm.get('onButtonIcon').get('showIcon').value;
+    const offButtonIcon: boolean = this.powerButtonWidgetConfigForm.get('offButtonIcon').get('showIcon').value;
     if (showTitle) {
       this.powerButtonWidgetConfigForm.get('title').enable();
       this.powerButtonWidgetConfigForm.get('titleFont').enable();
@@ -180,6 +198,24 @@ export class PowerButtonBasicConfigComponent extends BasicWidgetConfigComponent
       this.powerButtonWidgetConfigForm.get('icon').disable();
       this.powerButtonWidgetConfigForm.get('iconColor').disable();
     }
+    if (onButtonIcon) {
+      this.powerButtonWidgetConfigForm.get('onButtonIcon').get('iconSize').enable();
+      this.powerButtonWidgetConfigForm.get('onButtonIcon').get('iconSizeUnit').enable();
+      this.powerButtonWidgetConfigForm.get('onButtonIcon').get('icon').enable();
+    } else {
+      this.powerButtonWidgetConfigForm.get('onButtonIcon').get('iconSize').disable();
+      this.powerButtonWidgetConfigForm.get('onButtonIcon').get('iconSizeUnit').disable();
+      this.powerButtonWidgetConfigForm.get('onButtonIcon').get('icon').disable();
+    }
+    if (offButtonIcon) {
+      this.powerButtonWidgetConfigForm.get('offButtonIcon').get('iconSize').enable();
+      this.powerButtonWidgetConfigForm.get('offButtonIcon').get('iconSizeUnit').enable();
+      this.powerButtonWidgetConfigForm.get('offButtonIcon').get('icon').enable();
+    } else {
+      this.powerButtonWidgetConfigForm.get('offButtonIcon').get('iconSize').disable();
+      this.powerButtonWidgetConfigForm.get('offButtonIcon').get('iconSizeUnit').disable();
+      this.powerButtonWidgetConfigForm.get('offButtonIcon').get('icon').disable();
+    }
   }
 
   private getCardButtons(config: WidgetConfig): string[] {
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/aggregated-data-key-row.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/aggregated-data-key-row.component.ts
index 3fb9c42449..5f100dbe3e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/aggregated-data-key-row.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/aggregated-data-key-row.component.ts
@@ -35,7 +35,6 @@ import {
   DataKey,
   DataKeyConfigMode,
   DatasourceType,
-  JsonSettingsSchema,
   Widget,
   widgetType
 } from '@shared/models/widget.models';
@@ -54,6 +53,7 @@ import {
   AggregatedValueCardKeySettings
 } from '@home/components/widget/lib/cards/aggregated-value-card.models';
 import { WidgetConfigCallbacks } from '@home/components/widget/config/widget-config.component.models';
+import { FormProperty } from '@shared/models/dynamic-form.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
@@ -111,8 +111,8 @@ export class AggregatedDataKeyRowComponent implements ControlValueAccessor, OnIn
     return this.widgetConfigComponent.widget;
   }
 
-  get latestDataKeySettingsSchema(): JsonSettingsSchema {
-    return this.widgetConfigComponent.modelValue?.latestDataKeySettingsSchema;
+  get latestDataKeySettingsForm(): FormProperty[] {
+    return this.widgetConfigComponent.modelValue?.latestDataKeySettingsForm;
   }
 
   get latestDataKeySettingsDirective(): string {
@@ -210,7 +210,7 @@ export class AggregatedDataKeyRowComponent implements ControlValueAccessor, OnIn
         data: {
           dataKey: deepClone(this.modelValue),
           dataKeyConfigMode: DataKeyConfigMode.general,
-          dataKeySettingsSchema: this.latestDataKeySettingsSchema,
+          dataKeySettingsForm: this.latestDataKeySettingsForm,
           dataKeySettingsDirective: this.latestDataKeySettingsDirective,
           dashboard: null,
           aliasController: null,
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 d64fe7af27..95332c3791 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
@@ -39,14 +39,7 @@ import {
 } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
-import {
-  DataKey,
-  DataKeyConfigMode,
-  DatasourceType,
-  JsonSettingsSchema,
-  Widget,
-  widgetType
-} from '@shared/models/widget.models';
+import { DataKey, DataKeyConfigMode, DatasourceType, Widget, widgetType } from '@shared/models/widget.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 import { merge } from 'rxjs';
@@ -67,6 +60,7 @@ import {
   TimeSeriesChartYAxisId
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { WidgetConfigCallbacks } from '@home/components/widget/config/widget-config.component.models';
+import { FormProperty } from '@shared/models/dynamic-form.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 export const dataKeyValid = (key: DataKey): boolean => !!key && !!key.type && !!key.name;
@@ -199,16 +193,16 @@ export class DataKeyRowComponent implements ControlValueAccessor, OnInit, OnChan
     return this.widgetConfigComponent.aliasController;
   }
 
-  get dataKeySettingsSchema(): JsonSettingsSchema {
-    return this.widgetConfigComponent.modelValue?.dataKeySettingsSchema;
+  get dataKeySettingsForm(): FormProperty[] {
+    return this.widgetConfigComponent.modelValue?.dataKeySettingsForm;
   }
 
   get dataKeySettingsDirective(): string {
     return this.widgetConfigComponent.modelValue?.dataKeySettingsDirective;
   }
 
-  get latestDataKeySettingsSchema(): JsonSettingsSchema {
-    return this.widgetConfigComponent.modelValue?.latestDataKeySettingsSchema;
+  get latestDataKeySettingsForm(): FormProperty[] {
+    return this.widgetConfigComponent.modelValue?.latestDataKeySettingsForm;
   }
 
   get latestDataKeySettingsDirective(): string {
@@ -330,7 +324,7 @@ export class DataKeyRowComponent implements ControlValueAccessor, OnInit, OnChan
         data: {
           dataKey: deepClone(this.modelValue),
           dataKeyConfigMode: advanced ? DataKeyConfigMode.advanced : DataKeyConfigMode.general,
-          dataKeySettingsSchema: this.isLatestDataKeys ? this.latestDataKeySettingsSchema : this.dataKeySettingsSchema,
+          dataKeySettingsForm: this.isLatestDataKeys ? this.latestDataKeySettingsForm : this.dataKeySettingsForm,
           dataKeySettingsDirective: this.isLatestDataKeys ? this.latestDataKeySettingsDirective : this.dataKeySettingsDirective,
           dashboard: this.dashboard,
           aliasController: this.aliasController,
@@ -364,7 +358,7 @@ export class DataKeyRowComponent implements ControlValueAccessor, OnInit, OnChan
   }
 
   private _generateDataKey(key: DataKey): DataKey {
-    key = this.callbacks.generateDataKey(key.name, key.type, this.dataKeySettingsSchema, this.isLatestDataKeys,
+    key = this.callbacks.generateDataKey(key.name, key.type, this.dataKeySettingsForm, this.isLatestDataKeys,
       this.dataKeySettingsFunction);
     if (!this.keyRowFormGroup.get('label').value) {
       this.keyRowFormGroup.get('label').patchValue(key.label, {emitEvent: false});
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 c23bcfed7b..a9bea410ab 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
@@ -38,7 +38,7 @@ import {
 } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
-import { DataKey, DatasourceType, JsonSettingsSchema, widgetType } from '@shared/models/widget.models';
+import { DataKey, DatasourceType, widgetType } from '@shared/models/widget.models';
 import { dataKeyRowValidator, dataKeyValid } from '@home/components/widget/config/basic/common/data-key-row.component';
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
@@ -46,6 +46,7 @@ import { UtilsService } from '@core/services/utils.service';
 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';
+import { FormProperty } from '@shared/models/dynamic-form.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
@@ -156,8 +157,8 @@ export class DataKeysPanelComponent implements ControlValueAccessor, OnInit, OnC
       this.widgetConfigComponent.modelValue?.typeParameters?.hasAdditionalLatestDataKeys;
   }
 
-  get datakeySettingsSchema(): JsonSettingsSchema {
-    return this.widgetConfigComponent.modelValue?.dataKeySettingsSchema;
+  get dataKeySettingsForm(): FormProperty[] {
+    return this.widgetConfigComponent.modelValue?.dataKeySettingsForm;
   }
 
   get dataKeySettingsFunction(): DataKeySettingsFunction {
@@ -281,7 +282,7 @@ export class DataKeysPanelComponent implements ControlValueAccessor, OnInit, OnC
   }
 
   addKey() {
-    const dataKey = this.callbacks.generateDataKey('', null, this.datakeySettingsSchema,
+    const dataKey = this.callbacks.generateDataKey('', null, this.dataKeySettingsForm,
       false, this.dataKeySettingsFunction);
     dataKey.label = '';
     dataKey.decimals = 0;
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.ts
index 3f7baa5d7c..0b06c062ef 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.ts
@@ -66,7 +66,7 @@ import { UtilsService } from '@core/services/utils.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
-  selector: 'liquid-level-card-basic-config',
+  selector: 'tb-liquid-level-card-basic-config',
   templateUrl: './liquid-level-card-basic-config.component.html',
   styleUrls: ['../basic-config.scss']
 })
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/value-stepper-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/value-stepper-basic-config.component.html
new file mode 100644
index 0000000000..748cf64c7f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/value-stepper-basic-config.component.html
@@ -0,0 +1,297 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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]="valueStepperWidgetConfigForm">
+  <tb-target-device formControlName="targetDevice"></tb-target-device>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.value-stepper.behavior</div>
+    <div class="tb-form-row">
+      <div class="fixed-title-width" tb-hint-tooltip-icon="{{'widgets.value-stepper.initial-state-hint' | translate}}" translate>widgets.value-stepper.initial-state</div>
+      <tb-get-value-action-settings class="flex-1"
+                                    panelTitle="{{ 'widgets.value-stepper.initial-state' | translate }}"
+                                    [valueType]="valueType.DOUBLE"
+                                    [aliasController]="aliasController"
+                                    [targetDevice]="targetDevice"
+                                    [widgetType]="widgetType"
+                                    formControlName="initialState"></tb-get-value-action-settings>
+    </div>
+    <div class="tb-form-row space-between">
+      <div class="fixed-title-width" tb-hint-tooltip-icon="{{'widgets.value-stepper.left-button-click-hint' | translate}}" translate>widgets.value-stepper.left-button-click</div>
+      <tb-set-value-action-settings class="flex-1"
+                                    panelTitle="{{ 'widgets.value-stepper.left-button-click' | translate }}"
+                                    [valueType]="valueType.DOUBLE"
+                                    [aliasController]="aliasController"
+                                    [targetDevice]="targetDevice"
+                                    [widgetType]="widgetType"
+                                    formControlName="leftButtonClick"></tb-set-value-action-settings>
+    </div>
+    <div class="tb-form-row space-between">
+      <div class="fixed-title-width" tb-hint-tooltip-icon="{{'widgets.value-stepper.right-button-click-hint' | translate}}" translate>widgets.value-stepper.right-button-click</div>
+      <tb-set-value-action-settings class="flex-1"
+                                    panelTitle="{{ 'widgets.value-stepper.right-button-click' | translate }}"
+                                    [valueType]="valueType.DOUBLE"
+                                    [aliasController]="aliasController"
+                                    [targetDevice]="targetDevice"
+                                    [widgetType]="widgetType"
+                                    formControlName="rightButtonClick"></tb-set-value-action-settings>
+    </div>
+    <div class="tb-form-row">
+      <div class="fixed-title-width" tb-hint-tooltip-icon="{{'widgets.button-state.disabled-state-hint' | translate}}" translate>widgets.button-state.disabled-state</div>
+      <tb-get-value-action-settings class="flex-1"
+                                    panelTitle="{{ 'widgets.button-state.disabled-state' | translate }}"
+                                    [valueType]="valueType.BOOLEAN"
+                                    stateLabel="{{ 'widgets.button-state.disabled' | translate }}"
+                                    [aliasController]="aliasController"
+                                    [targetDevice]="targetDevice"
+                                    [widgetType]="widgetType"
+                                    formControlName="disabledState"></tb-get-value-action-settings>
+    </div>
+  </div>
+  <div class="tb-form-panel" formGroupName="appearance">
+    <div class="tb-form-panel-title" translate>widget-config.appearance</div>
+    <tb-image-cards-select rowHeight="2:1"
+                           [cols]="{columns:  3,
+                                    breakpoints: {
+                                      'lt-sm': 1,
+                                      'lt-md': 2
+                                    }}"
+                           label="{{ 'widgets.button.layout' | translate }}" formControlName="type">
+      <tb-image-cards-select-option *ngFor="let type of valueStepperTypes"
+                                    [value]="type"
+                                    [image]="valueStepperTypeImageMap.get(type)">
+        {{ valueStepperTypeTranslationMap.get(type) | translate }}
+      </tb-image-cards-select-option>
+    </tb-image-cards-select>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="autoScale">
+        {{ 'widgets.value-stepper.auto-scale' | translate }}
+      </mat-slide-toggle>
+    </div>
+
+    <div class="tb-form-row space-between column-xs">
+      <div>{{ 'widgets.value-stepper.value-range' | translate }}</div>
+      <div class="flex flex-row items-center justify-start gap-2">
+        <div class="tb-small-label" translate>widgets.value-stepper.min-range</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="minValueRange" type="number" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+        <div class="tb-small-label" translate>widgets.value-stepper.max-range</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="maxValueRange" type="number" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+      </div>
+    </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.value-stepper.value-increment-decrement-step' | translate }}</div>
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <input matInput formControlName="valueStep" type="number" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+    <div class="tb-form-row column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showValueBox">
+        {{ 'widgets.value-stepper.value' | translate }}
+      </mat-slide-toggle>
+      <div class="flex flex-1 flex-row items-center justify-start gap-2">
+        <tb-unit-input class="flex" formControlName="valueUnits"></tb-unit-input>
+        <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+          <input matInput formControlName="valueDecimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+          <div matSuffix class="lt-md:!hidden" translate>widget-config.decimals-suffix</div>
+        </mat-form-field>
+        <tb-font-settings formControlName="valueFont"
+                          [previewText]="valuePreviewFn">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="valueColor">
+        </tb-color-input>
+      </div>
+    </div>
+
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.value-stepper.value-box-background' | translate }}</div>
+      <tb-color-input asBoxInput
+                      colorClearButton
+                      formControlName="valueBoxBackground">
+      </tb-color-input>
+    </div>
+    <div class="tb-form-row space-between column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showBorder">
+        {{ 'widgets.value-stepper.border' | translate }}
+      </mat-slide-toggle>
+      <div class="flex flex-1 flex-row items-center justify-end gap-2">
+        <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 class="lt-md:!hidden">px</div>
+        </mat-form-field>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="borderColor">
+        </tb-color-input>
+      </div>
+    </div>
+  </div>
+  <div class="tb-form-panel" formGroupName="buttonAppearance">
+    <div class="flex flex-row items-center justify-between">
+      <div class="tb-form-panel-title" translate>widgets.value-stepper.button-appearance</div>
+      <tb-toggle-select [(ngModel)]="buttonAppearanceType" [ngModelOptions]="{standalone: true}">
+        <tb-toggle-option value="left">{{ 'widgets.value-stepper.left' | translate }}</tb-toggle-option>
+        <tb-toggle-option value="right">{{ 'widgets.value-stepper.right' | translate }}</tb-toggle-option>
+      </tb-toggle-select>
+    </div>
+    <div class="tb-form-panel no-border no-padding" formGroupName="leftButton" [class.!hidden]="buttonAppearanceType !== 'left'">
+      <div class="tb-form-row">
+        <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showButton">
+          {{ 'widgets.value-stepper.left-button' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <div class="tb-form-row">
+        <div>{{ 'widgets.value-stepper.icon' | translate }}</div>
+        <div class="flex flex-1 flex-row items-center justify-start gap-2">
+          <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+            <input matInput type="number" min="0" formControlName="iconSize" placeholder="{{ 'widget-config.set' | translate }}">
+          </mat-form-field>
+          <tb-css-unit-select class="flex-1" formControlName="iconSizeUnit"></tb-css-unit-select>
+          <tb-material-icon-select asBoxInput
+                                   iconClearButton
+                                   formControlName="icon">
+          </tb-material-icon-select>
+        </div>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div>{{ 'widgets.value-stepper.button-on-colors' | translate }}</div>
+        <div class="flex flex-row items-center justify-start gap-3">
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.value-stepper.main</div>
+            <tb-color-input asBoxInput
+                            formControlName="mainColorOn">
+            </tb-color-input>
+          </div>
+          <mat-divider vertical></mat-divider>
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.value-stepper.background</div>
+            <tb-color-input asBoxInput
+                            formControlName="backgroundColorOn">
+            </tb-color-input>
+          </div>
+        </div>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div>{{ 'widgets.value-stepper.disabled-colors' | translate }}</div>
+        <div class="flex flex-row items-center justify-start gap-3">
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.value-stepper.main</div>
+            <tb-color-input asBoxInput
+                            formControlName="mainColorDisabled">
+            </tb-color-input>
+          </div>
+          <mat-divider vertical></mat-divider>
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.value-stepper.background</div>
+            <tb-color-input asBoxInput
+                            formControlName="backgroundColorDisabled">
+            </tb-color-input>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="tb-form-panel no-border no-padding" formGroupName="rightButton" [class.!hidden]="buttonAppearanceType !== 'right'">
+      <div class="tb-form-row">
+        <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showButton">
+          {{ 'widgets.value-stepper.right-button' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <div class="tb-form-row">
+        <div>{{ 'widgets.value-stepper.icon' | translate }}</div>
+        <div class="flex flex-1 flex-row items-center justify-start gap-2">
+          <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+            <input matInput type="number" min="0" formControlName="iconSize" placeholder="{{ 'widget-config.set' | translate }}">
+          </mat-form-field>
+          <tb-css-unit-select class="flex-1" formControlName="iconSizeUnit"></tb-css-unit-select>
+          <tb-material-icon-select asBoxInput
+                                   iconClearButton
+                                   formControlName="icon">
+          </tb-material-icon-select>
+        </div>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div>{{ 'widgets.value-stepper.button-on-colors' | translate }}</div>
+        <div class="flex flex-row items-center justify-start gap-3">
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.value-stepper.main</div>
+            <tb-color-input asBoxInput
+                            formControlName="mainColorOn">
+            </tb-color-input>
+          </div>
+          <mat-divider vertical></mat-divider>
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.value-stepper.background</div>
+            <tb-color-input asBoxInput
+                            formControlName="backgroundColorOn">
+            </tb-color-input>
+          </div>
+        </div>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div>{{ 'widgets.value-stepper.disabled-colors' | translate }}</div>
+        <div class="flex flex-row items-center justify-start gap-3">
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.value-stepper.main</div>
+            <tb-color-input asBoxInput
+                            formControlName="mainColorDisabled">
+            </tb-color-input>
+          </div>
+          <mat-divider vertical></mat-divider>
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.value-stepper.background</div>
+            <tb-color-input asBoxInput
+                            formControlName="backgroundColorDisabled">
+            </tb-color-input>
+          </div>
+        </div>
+      </div>
+    </div>
+  </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">
+      <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/rpc/value-stepper-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/value-stepper-basic-config.component.ts
new file mode 100644
index 0000000000..abee223b40
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/value-stepper-basic-config.component.ts
@@ -0,0 +1,225 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { TargetDevice, WidgetConfig, } from '@shared/models/widget.models';
+import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
+import { formatValue, isUndefined } from '@core/utils';
+import { ValueType } from '@shared/models/constants';
+import {
+  valueStepperDefaultSettings,
+  valueStepperTypeImages,
+  valueStepperTypes,
+  valueStepperTypeTranslations,
+  ValueStepperWidgetSettings
+} from '@home/components/widget/lib/rpc/value-stepper-widget.models';
+
+type ButtonAppearanceType = 'left' | 'right';
+
+@Component({
+  selector: 'tb-value-stepper-basic-config',
+  templateUrl: './value-stepper-basic-config.component.html',
+  styleUrls: ['../basic-config.scss']
+})
+export class ValueStepperBasicConfigComponent extends BasicWidgetConfigComponent {
+
+  get targetDevice(): TargetDevice {
+    return this.valueStepperWidgetConfigForm.get('targetDevice').value;
+  }
+
+  valueStepperTypeTranslationMap = valueStepperTypeTranslations;
+  valueStepperTypes = valueStepperTypes;
+  valueStepperTypeImageMap = valueStepperTypeImages;
+
+  buttonAppearanceType: ButtonAppearanceType = 'left';
+
+  valueType = ValueType;
+
+  valueStepperWidgetConfigForm: UntypedFormGroup;
+
+  valuePreviewFn = this._valuePreviewFn.bind(this);
+
+  constructor(protected store: Store<AppState>,
+              protected widgetConfigComponent: WidgetConfigComponent,
+              private fb: UntypedFormBuilder) {
+    super(store, widgetConfigComponent);
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.valueStepperWidgetConfigForm;
+  }
+
+  protected onConfigSet(configData: WidgetConfigComponentData) {
+    const settings: ValueStepperWidgetSettings = {...valueStepperDefaultSettings, ...(configData.config.settings || {})};
+    this.valueStepperWidgetConfigForm = this.fb.group({
+      targetDevice: [configData.config.targetDevice, []],
+
+      initialState: [settings.initialState, []],
+      leftButtonClick: [settings.leftButtonClick, []],
+      rightButtonClick: [settings.rightButtonClick, []],
+      disabledState: [settings.disabledState, []],
+
+      appearance: this.fb.group({
+        type: [settings.appearance.type, []],
+        autoScale: [settings.appearance.autoScale, []],
+        minValueRange: [settings.appearance.minValueRange, []],
+        maxValueRange: [settings.appearance.maxValueRange, []],
+        valueStep: [settings.appearance.valueStep, [Validators.min(0)]],
+        showValueBox: [settings.appearance.showValueBox, []],
+        valueUnits: [settings.appearance.valueUnits, []],
+        valueDecimals: [settings.appearance.valueDecimals, []],
+        valueFont: [settings.appearance.valueFont, []],
+        valueColor: [settings.appearance.valueColor],
+        valueBoxBackground: [settings.appearance.valueBoxBackground, []],
+        showBorder: [settings.appearance.showBorder, []],
+        borderWidth: [settings.appearance.borderWidth, []],
+        borderColor: [settings.appearance.borderColor, []]
+      }),
+
+      buttonAppearance: this.fb.group({
+        leftButton: this.fb.group({
+          showButton: [settings.buttonAppearance.leftButton.showButton],
+          icon: [settings.buttonAppearance.leftButton.icon],
+          iconSize: [settings.buttonAppearance.leftButton.iconSize],
+          iconSizeUnit: [settings.buttonAppearance.leftButton.iconSizeUnit],
+          mainColorOn: [settings.buttonAppearance.leftButton.mainColorOn, []],
+          backgroundColorOn: [settings.buttonAppearance.leftButton.backgroundColorOn, []],
+          mainColorDisabled: [settings.buttonAppearance.leftButton.mainColorDisabled, []],
+          backgroundColorDisabled: [settings.buttonAppearance.leftButton.backgroundColorDisabled, []]
+        }),
+        rightButton: this.fb.group({
+          showButton: [settings.buttonAppearance.rightButton.showButton],
+          icon: [settings.buttonAppearance.rightButton.icon],
+          iconSize: [settings.buttonAppearance.rightButton.iconSize],
+          iconSizeUnit: [settings.buttonAppearance.rightButton.iconSizeUnit],
+          mainColorOn: [settings.buttonAppearance.rightButton.mainColorOn, []],
+          backgroundColorOn: [settings.buttonAppearance.rightButton.backgroundColorOn, []],
+          mainColorDisabled: [settings.buttonAppearance.rightButton.mainColorDisabled, []],
+          backgroundColorDisabled: [settings.buttonAppearance.rightButton.backgroundColorDisabled, []]
+        })
+      }),
+
+      background: [settings.background, []],
+      cardButtons: [this.getCardButtons(configData.config), []],
+      borderRadius: [configData.config.borderRadius, []],
+      padding: [settings.padding, []],
+
+      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.leftButtonClick = config.leftButtonClick;
+    this.widgetConfig.config.settings.rightButtonClick = config.rightButtonClick;
+    this.widgetConfig.config.settings.appearance = config.appearance;
+    this.widgetConfig.config.settings.buttonAppearance = config.buttonAppearance;
+
+    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;
+
+    return this.widgetConfig;
+  }
+
+
+  protected validatorTriggers(): string[] {
+    return ['appearance.showValueBox', 'appearance.showBorder',
+      'buttonAppearance.leftButton.showButton', 'buttonAppearance.rightButton.showButton'];
+  }
+
+  protected updateValidators(emitEvent: boolean, trigger?: string) {
+    const showValueBox: boolean = this.valueStepperWidgetConfigForm.get('appearance').get('showValueBox').value;
+    const showBorder: boolean = this.valueStepperWidgetConfigForm.get('appearance').get('showBorder').value;
+    const showLeftButton: boolean = this.valueStepperWidgetConfigForm.get('buttonAppearance').get('leftButton').get('showButton').value;
+    const showRightButton: boolean = this.valueStepperWidgetConfigForm.get('buttonAppearance').get('rightButton').get('showButton').value;
+    if (showValueBox) {
+      this.valueStepperWidgetConfigForm.get('appearance').get('valueUnits').enable();
+      this.valueStepperWidgetConfigForm.get('appearance').get('valueDecimals').enable();
+      this.valueStepperWidgetConfigForm.get('appearance').get('valueFont').enable();
+      this.valueStepperWidgetConfigForm.get('appearance').get('valueColor').enable();
+      this.valueStepperWidgetConfigForm.get('appearance').get('valueBoxBackground').enable();
+      this.valueStepperWidgetConfigForm.get('appearance').get('showBorder').enable({emitEvent: false});
+      if (showBorder) {
+        this.valueStepperWidgetConfigForm.get('appearance').get('borderWidth').enable();
+        this.valueStepperWidgetConfigForm.get('appearance').get('borderColor').enable();
+      } else {
+        this.valueStepperWidgetConfigForm.get('appearance').get('borderWidth').disable();
+        this.valueStepperWidgetConfigForm.get('appearance').get('borderColor').disable();
+      }
+    } else {
+      this.valueStepperWidgetConfigForm.get('appearance').get('valueUnits').disable();
+      this.valueStepperWidgetConfigForm.get('appearance').get('valueDecimals').disable();
+      this.valueStepperWidgetConfigForm.get('appearance').get('valueFont').disable();
+      this.valueStepperWidgetConfigForm.get('appearance').get('valueColor').disable();
+      this.valueStepperWidgetConfigForm.get('appearance').get('valueBoxBackground').disable();
+      this.valueStepperWidgetConfigForm.get('appearance').get('showBorder').disable({emitEvent: false});
+      this.valueStepperWidgetConfigForm.get('appearance').get('borderWidth').disable();
+      this.valueStepperWidgetConfigForm.get('appearance').get('borderColor').disable();
+    }
+    this.buttonValidators(showLeftButton, 'leftButton');
+    this.buttonValidators(showRightButton, 'rightButton');
+  }
+
+  private buttonValidators(showButtonValue: boolean, button: string) {
+    if (showButtonValue) {
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('icon').enable()
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('iconSize').enable()
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('iconSizeUnit').enable()
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('mainColorOn').enable()
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('backgroundColorOn').enable()
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('mainColorDisabled').enable()
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('backgroundColorDisabled').enable()
+    } else {
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('icon').disable()
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('iconSize').disable()
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('iconSizeUnit').disable()
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('mainColorOn').disable()
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('backgroundColorOn').disable()
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('mainColorDisabled').disable()
+      this.valueStepperWidgetConfigForm.get('buttonAppearance').get(button).get('backgroundColorDisabled').disable()
+    }
+  }
+
+  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.valueStepperWidgetConfigForm.get('appearance').get('valueUnits').value;
+    const decimals: number = this.valueStepperWidgetConfigForm.get('appearance').get('valueDecimals').value;
+    return formatValue(48, decimals, units, false);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/data-key-config-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/config/data-key-config-dialog.component.html
index 4d5f38d30e..ca5ae93a84 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/data-key-config-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/data-key-config-dialog.component.html
@@ -35,7 +35,7 @@
   <div mat-dialog-content style="padding: 0; height: 800px; overflow: auto;">
     <tb-data-key-config #dataKeyConfig
       [dataKeyConfigMode]="dataKeyConfigMode"
-      [dataKeySettingsSchema]="data.dataKeySettingsSchema"
+      [dataKeySettingsForm]="data.dataKeySettingsForm"
       [dataKeySettingsDirective]="data.dataKeySettingsDirective"
       [deviceId]="data.deviceId"
       [entityAliasId]="data.entityAliasId"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/data-key-config-dialog.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/data-key-config-dialog.component.ts
index 27b24fc31b..f31a7a0643 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/data-key-config-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/data-key-config-dialog.component.ts
@@ -36,11 +36,12 @@ import { IAliasController } from '@core/api/widget-api.models';
 import { ToggleHeaderOption } from '@shared/components/toggle-header.component';
 import { TranslateService } from '@ngx-translate/core';
 import { WidgetConfigCallbacks } from '@home/components/widget/config/widget-config.component.models';
+import { FormProperty } from '@shared/models/dynamic-form.models';
 
 export interface DataKeyConfigDialogData {
   dataKey: DataKey;
   dataKeyConfigMode?: DataKeyConfigMode;
-  dataKeySettingsSchema: any;
+  dataKeySettingsForm: FormProperty[];
   dataKeySettingsDirective: string;
   dashboard: Dashboard;
   aliasController: IAliasController;
@@ -92,8 +93,8 @@ export class DataKeyConfigDialogComponent extends DialogComponent<DataKeyConfigD
     this.dataKeyFormGroup = this.fb.group({
       dataKey: [this.data.dataKey, [Validators.required]]
     });
-    if (this.data.dataKeySettingsSchema && this.data.dataKeySettingsSchema.schema ||
-      this.data.dataKeySettingsDirective && this.data.dataKeySettingsDirective.length) {
+    if (this.data.dataKeySettingsForm?.length ||
+      this.data.dataKeySettingsDirective?.length) {
       this.hasAdvanced = true;
       this.dataKeyConfigHeaderOptions = [
         {
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 4c8fc5bc67..b5b6ed4333 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
@@ -24,6 +24,7 @@ import {
   DataKey,
   dataKeyAggregationTypeHintTranslationMap,
   DataKeyConfigMode,
+  DynamicFormData,
   Widget,
   widgetType
 } from '@shared/models/widget.models';
@@ -47,7 +48,6 @@ import { Observable, of } from 'rxjs';
 import { map, mergeMap, publishReplay, refCount, tap } from 'rxjs/operators';
 import { alarmFields } from '@shared/models/alarm.models';
 import { JsFuncComponent } from '@shared/components/js-func.component';
-import { JsonFormComponentData } from '@shared/components/json-form/json-form-component.models';
 import { WidgetService } from '@core/http/widget.service';
 import { Dashboard } from '@shared/models/dashboard.models';
 import { IAliasController } from '@core/api/widget-api.models';
@@ -58,6 +58,7 @@ import { WidgetConfigComponentData } from '@home/models/widget-component.models'
 import { WidgetComponentService } from '@home/components/widget/widget-component.service';
 import { WidgetConfigCallbacks } from '@home/components/widget/config/widget-config.component.models';
 import { isNotEmptyTbFunction, TbFunction } from '@shared/models/js-function.models';
+import { FormProperty } from '@shared/models/dynamic-form.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
@@ -124,7 +125,7 @@ export class DataKeyConfigComponent extends PageComponent implements OnInit, Con
   widgetType: widgetType;
 
   @Input()
-  dataKeySettingsSchema: any;
+  dataKeySettingsForm: FormProperty[];
 
   @Input()
   dataKeySettingsDirective: string;
@@ -169,7 +170,7 @@ export class DataKeyConfigComponent extends PageComponent implements OnInit, Con
 
   public dataKeySettingsFormGroup: UntypedFormGroup;
 
-  private dataKeySettingsData: JsonFormComponentData;
+  private dataKeySettingsData: DynamicFormData;
 
   private alarmKeys: Array<DataKey>;
   private functionTypeKeys: Array<DataKey>;
@@ -228,15 +229,11 @@ export class DataKeyConfigComponent extends PageComponent implements OnInit, Con
         type: DataKeyType.function
       });
     }
-    if (this.dataKeySettingsSchema && this.dataKeySettingsSchema.schema ||
+    if (this.dataKeySettingsForm?.length ||
       this.dataKeySettingsDirective && this.dataKeySettingsDirective.length) {
       this.hasAdvanced = true;
       this.dataKeySettingsData = {
-        schema: this.dataKeySettingsSchema?.schema || {
-          type: 'object',
-          properties: {}
-        },
-        form: this.dataKeySettingsSchema?.form || ['*'],
+        settingsForm: this.dataKeySettingsForm,
         settingsDirective: this.dataKeySettingsDirective
       };
       this.dataKeySettingsFormGroup = this.fb.group({
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 b0e80973f0..a0c211f32f 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
@@ -15,13 +15,14 @@
 ///
 
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
-import { DataKey, JsonSettingsSchema } from '@shared/models/widget.models';
+import { DataKey } from '@shared/models/widget.models';
 import { Observable } from 'rxjs';
+import { FormProperty } from '@shared/models/dynamic-form.models';
 
 export type DataKeySettingsFunction = (key: DataKey, isLatestDataKey: boolean) => any;
 
 export interface DataKeysCallbacks {
-  generateDataKey: (chip: any, type: DataKeyType, datakeySettingsSchema: JsonSettingsSchema,
+  generateDataKey: (chip: any, type: DataKeyType, dataKeySettingsForm: FormProperty[],
                     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 e4f0b41500..bb1647faa4 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
@@ -50,7 +50,7 @@ import { MatAutocomplete, MatAutocompleteTrigger } from '@angular/material/autoc
 import { MatChipGrid, MatChipInputEvent, MatChipRow } from '@angular/material/chips';
 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 { DataKey, DatasourceType, Widget, widgetType } from '@shared/models/widget.models';
 import { IAliasController } from '@core/api/widget-api.models';
 import { DataKeySettingsFunction } from './data-keys.component.models';
 import { alarmFields } from '@shared/models/alarm.models';
@@ -72,6 +72,7 @@ import { ColorPickerPanelComponent } from '@shared/components/color-picker/color
 import { TbPopoverService } from '@shared/components/popover.service';
 import { WidgetConfigCallbacks } from '@home/components/widget/config/widget-config.component.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { FormProperty } from '@shared/models/dynamic-form.models';
 
 @Component({
   selector: 'tb-data-keys',
@@ -151,7 +152,7 @@ export class DataKeysComponent implements ControlValueAccessor, OnInit, OnChange
   aliasController: IAliasController;
 
   @Input()
-  datakeySettingsSchema: JsonSettingsSchema;
+  dataKeySettingsForm: FormProperty[];
 
   @Input()
   datakeySettingsFunction: DataKeySettingsFunction;
@@ -375,7 +376,7 @@ 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.dataKeySettingsForm,
         this.latestDataKeys, this.datakeySettingsFunction)];
     } else {
       this.keys = [];
@@ -462,7 +463,7 @@ export class DataKeysComponent implements ControlValueAccessor, OnInit, OnChange
   }
 
   private addFromChipValue(chip: DataKey) {
-    const key = this.callbacks.generateDataKey(chip.name, chip.type, this.datakeySettingsSchema, this.latestDataKeys,
+    const key = this.callbacks.generateDataKey(chip.name, chip.type, this.dataKeySettingsForm, this.latestDataKeys,
       this.datakeySettingsFunction);
     this.addKey(key);
   }
@@ -562,7 +563,7 @@ export class DataKeysComponent implements ControlValueAccessor, OnInit, OnChange
         panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
         data: {
           dataKey: deepClone(key),
-          dataKeySettingsSchema: this.datakeySettingsSchema,
+          dataKeySettingsForm: this.dataKeySettingsForm,
           dataKeySettingsDirective: this.dataKeySettingsDirective,
           dashboard: this.dashboard,
           aliasController: this.aliasController,
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 18eb6f7a23..8af7753525 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
@@ -70,7 +70,7 @@
                   [optDataKeys]="isDataKeysOptional(datasourceFormGroup.get('type').value)"
                   [simpleDataKeysLabel]="!hasAdditionalLatestDataKeys"
                   [aliasController]="aliasController"
-                  [datakeySettingsSchema]="dataKeySettingsSchema"
+                  [dataKeySettingsForm]="dataKeySettingsForm"
                   [dataKeySettingsDirective]="dataKeySettingsDirective"
                   [datakeySettingsFunction]="dataKeySettingsFunction"
                   [dashboard]="dashboard"
@@ -86,7 +86,7 @@
                   latestDataKeys
                   [optDataKeys]="true"
                   [aliasController]="aliasController"
-                  [datakeySettingsSchema]="latestDataKeySettingsSchema"
+                  [dataKeySettingsForm]="latestDataKeySettingsForm"
                   [dataKeySettingsDirective]="latestDataKeySettingsDirective"
                   [datakeySettingsFunction]="dataKeySettingsFunction"
                   [dashboard]="dashboard"
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 a138ed491d..b62f462576 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
@@ -29,8 +29,8 @@ import {
   Datasource,
   DatasourceType,
   datasourceTypeTranslationMap,
-  JsonSettingsSchema,
-  Widget, WidgetConfigMode,
+  Widget,
+  WidgetConfigMode,
   widgetType
 } from '@shared/models/widget.models';
 import { AlarmSearchStatus } from '@shared/models/alarm.models';
@@ -43,6 +43,7 @@ import { DataKeysCallbacks, DataKeySettingsFunction } from '@home/components/wid
 import { EntityType } from '@shared/models/entity-type.models';
 import { DatasourcesComponent } from '@home/components/widget/config/datasources.component';
 import { WidgetConfigCallbacks } from '@home/components/widget/config/widget-config.component.models';
+import { FormProperty } from '@shared/models/dynamic-form.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
@@ -109,16 +110,16 @@ export class DatasourceComponent implements ControlValueAccessor, OnInit, Valida
     return this.widgetConfigComponent.modelValue?.typeParameters?.maxDataKeys;
   }
 
-  public get dataKeySettingsSchema(): JsonSettingsSchema {
-    return this.widgetConfigComponent.modelValue?.dataKeySettingsSchema;
+  public get dataKeySettingsForm(): FormProperty[] {
+    return this.widgetConfigComponent.modelValue?.dataKeySettingsForm;
   }
 
   public get dataKeySettingsDirective(): string {
     return this.widgetConfigComponent.modelValue?.dataKeySettingsDirective;
   }
 
-  public get latestDataKeySettingsSchema(): JsonSettingsSchema {
-    return this.widgetConfigComponent.modelValue?.latestDataKeySettingsSchema;
+  public get latestDataKeySettingsForm(): FormProperty[] {
+    return this.widgetConfigComponent.modelValue?.latestDataKeySettingsForm;
   }
 
   public get latestDataKeySettingsDirective(): string {
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 41198127af..65f46240c8 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
@@ -30,8 +30,8 @@ import {
 import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
 import {
   Datasource,
-  DatasourceType, datasourceValid,
-  JsonSettingsSchema,
+  DatasourceType,
+  datasourceValid,
   WidgetConfigMode,
   widgetType
 } from '@shared/models/widget.models';
@@ -42,6 +42,7 @@ import { UtilsService } from '@core/services/utils.service';
 import { DataKeysCallbacks, DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 import { TranslateService } from '@ngx-translate/core';
 import { coerceBoolean } from '@shared/decorators/coercion';
+import { FormProperty } from '@shared/models/dynamic-form.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
@@ -340,8 +341,8 @@ export class DatasourcesComponent implements ControlValueAccessor, OnInit, Valid
   public addDatasource(emitEvent = true) {
     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 = deepClone(this.utils.getDefaultDatasource(this.dataKeySettingsForm));
+      newDatasource.dataKeys = [this.dataKeysCallbacks.generateDataKey('Sin', DataKeyType.function, this.dataKeySettingsForm,
         false, this.dataKeySettingsFunction)];
     } else {
       const type = this.basicMode ? this.datasourcesMode : DatasourceType.entity;
@@ -355,8 +356,8 @@ export class DatasourcesComponent implements ControlValueAccessor, OnInit, Valid
     this.datasourcesFormArray.push(this.fb.control(newDatasource, []), {emitEvent});
   }
 
-  private get dataKeySettingsSchema(): JsonSettingsSchema {
-    return this.widgetConfigComponent.modelValue?.dataKeySettingsSchema;
+  private get dataKeySettingsForm(): FormProperty[] {
+    return this.widgetConfigComponent.modelValue?.dataKeySettingsForm;
   }
 
   private get dataKeySettingsFunction(): DataKeySettingsFunction {
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 cea4ca85c9..ec588d69ad 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
@@ -209,7 +209,7 @@ export abstract class BasicWidgetConfigComponent extends PageComponent implement
   protected constructDataKey(configData: WidgetConfigComponentData, key: DataKey, isLatestKey: boolean): DataKey {
     const dataKey =
       this.widgetConfigComponent.widgetConfigCallbacks.generateDataKey(key.name, key.type,
-        configData.dataKeySettingsSchema, isLatestKey, configData.dataKeySettingsFunction);
+        configData.dataKeySettingsForm, 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.html b/ui-ngx/src/app/modules/home/components/widget/config/widget-settings.component.html
index e029c0032d..c3490e9def 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/widget-settings.component.html
@@ -18,7 +18,8 @@
 <div [formGroup]="widgetSettingsFormGroup">
   <ng-container #definedSettingsContent></ng-container>
   <div class="tb-settings-directive-error" *ngIf="definedDirectiveError">{{definedDirectiveError}}</div>
-  <tb-json-form *ngIf="useJsonForm()" #jsonFormComponent
+  <tb-dynamic-form *ngIf="useDynamicForm()"
+    [properties]="settingsForm"
     formControlName="settings">
-  </tb-json-form>
+  </tb-dynamic-form>
 </div>
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 9e3f711ac3..1f3e9bcbc7 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
@@ -38,15 +38,13 @@ import {
 } from '@angular/forms';
 import { Subscription } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
-import { JsonFormComponent } from '@shared/components/json-form/json-form.component';
-import { JsonFormComponentData } from '@shared/components/json-form/json-form-component.models';
-import { IWidgetSettingsComponent, Widget, WidgetSettings } from '@shared/models/widget.models';
-import { widgetSettingsComponentsMap } from '@home/components/widget/lib/settings/widget-settings.module';
+import { DynamicFormData, IWidgetSettingsComponent, Widget, WidgetSettings } from '@shared/models/widget.models';
 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 { WidgetConfigCallbacks } from '@home/components/widget/config/widget-config.component.models';
+import { FormProperty } from '@shared/models/dynamic-form.models';
 
 @Component({
   selector: 'tb-widget-settings',
@@ -67,8 +65,6 @@ export class WidgetSettingsComponent implements ControlValueAccessor, OnDestroy,
 
   @ViewChild('definedSettingsContent', {read: ViewContainerRef, static: true}) definedSettingsContainer: ViewContainerRef;
 
-  @ViewChild('jsonFormComponent') jsonFormComponent: JsonFormComponent;
-
   @Input()
   disabled: boolean;
 
@@ -91,6 +87,8 @@ export class WidgetSettingsComponent implements ControlValueAccessor, OnDestroy,
 
   definedDirectiveError: string;
 
+  settingsForm?: FormProperty[];
+
   widgetSettingsFormGroup: UntypedFormGroup;
 
   changeSubscription: Subscription;
@@ -98,7 +96,7 @@ export class WidgetSettingsComponent implements ControlValueAccessor, OnDestroy,
   private definedSettingsComponentRef: ComponentRef<IWidgetSettingsComponent>;
   private definedSettingsComponent: IWidgetSettingsComponent;
 
-  private widgetSettingsFormData: JsonFormComponentData;
+  private widgetSettingsFormData: DynamicFormData;
   private propagateChange = (_v: any) => { };
 
   constructor(private translate: TranslateService,
@@ -169,8 +167,9 @@ export class WidgetSettingsComponent implements ControlValueAccessor, OnDestroy,
     }
   }
 
-  writeValue(value: JsonFormComponentData): void {
+  writeValue(value: DynamicFormData): void {
     this.widgetSettingsFormData = value;
+    this.settingsForm = this.widgetSettingsFormData.settingsForm;
     if (this.changeSubscription) {
       this.changeSubscription.unsubscribe();
       this.changeSubscription = null;
@@ -185,10 +184,10 @@ export class WidgetSettingsComponent implements ControlValueAccessor, OnDestroy,
         this.updateModel(settings);
       });
     } else {
-      this.widgetSettingsFormGroup.get('settings').patchValue(this.widgetSettingsFormData, {emitEvent: false});
+      this.widgetSettingsFormGroup.get('settings').patchValue(this.widgetSettingsFormData.model, {emitEvent: false});
       this.changeSubscription = this.widgetSettingsFormGroup.get('settings').valueChanges.subscribe(
-        (widgetSettingsFormData: JsonFormComponentData) => {
-          this.updateModel(widgetSettingsFormData.model);
+        (data: WidgetSettings) => {
+          this.updateModel(data);
         }
       );
     }
@@ -199,7 +198,7 @@ export class WidgetSettingsComponent implements ControlValueAccessor, OnDestroy,
       this.settingsDirective.length && !this.definedDirectiveError;
   }
 
-  useJsonForm(): boolean {
+  useDynamicForm(): boolean {
     return !this.settingsDirective || !this.settingsDirective.length;
   }
 
@@ -215,7 +214,7 @@ export class WidgetSettingsComponent implements ControlValueAccessor, OnDestroy,
       this.definedSettingsComponent = null;
     }
     if (this.settingsDirective && this.settingsDirective.length) {
-      const componentType = widgetSettingsComponentsMap[this.settingsDirective];
+      const componentType = this.widgetService.getWidgetSettingsComponentTypeBySelector(this.settingsDirective);
       if (!componentType) {
         this.definedDirectiveError = this.translate.instant('widget-config.settings-component-not-found',
           {selector: this.settingsDirective});
@@ -250,7 +249,7 @@ export class WidgetSettingsComponent implements ControlValueAccessor, OnDestroy,
           }
         };
       }
-    } else if (this.useJsonForm()) {
+    } else if (this.useDynamicForm()) {
       if (!this.widgetSettingsFormGroup.get('settings').valid) {
         return {
           widgetSettings: {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.models.ts
index b4a46d9592..2e02d36f04 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.models.ts
@@ -25,6 +25,7 @@ import { WidgetContext } from '@home/models/widget-component.models';
 import {
   BehaviorSubject,
   forkJoin,
+  merge,
   Observable,
   Observer,
   of,
@@ -33,7 +34,7 @@ import {
   switchMap,
   throwError
 } from 'rxjs';
-import { catchError, delay, map, share, take } from 'rxjs/operators';
+import { catchError, debounceTime, delay, map, share, take } from 'rxjs/operators';
 import { AfterViewInit, ChangeDetectorRef, Directive, Input, OnDestroy, OnInit, TemplateRef } from '@angular/core';
 import {
   DataToValueSettings,
@@ -53,10 +54,11 @@ import {
 import { ValueType } from '@shared/models/constants';
 import { EntityType, entityTypeTranslations } from '@shared/models/entity-type.models';
 import { EntityId } from '@shared/models/id/entity-id';
-import { isDefinedAndNotNull } from '@core/utils';
+import { deepClone, isDefinedAndNotNull } from '@core/utils';
 import { parseError } from '@shared/models/error.models';
 import { CompiledTbFunction, compileTbFunction } from '@shared/models/js-function.models';
 import { HttpClient } from '@angular/common/http';
+import { StateObject } from '@core/api/widget-api.models';
 
 @Directive()
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
@@ -269,6 +271,8 @@ export abstract class ValueGetter<V> extends ValueAction {
         return new AlarmStatusValueGetter<V>(ctx, settings, valueType, valueObserver, simulated);
       case GetValueAction.GET_DASHBOARD_STATE:
         return new DashboardStateGetter<V>(ctx, settings, valueType, valueObserver, simulated);
+      case GetValueAction.GET_DASHBOARD_STATE_OBJECT:
+        return new DashboardStateWithParamsGetter<V>(ctx, settings, valueType, valueObserver, simulated);
     }
   }
 
@@ -641,6 +645,33 @@ export class DashboardStateGetter<V> extends ValueGetter<V> {
   }
 }
 
+export class DashboardStateWithParamsGetter<V> extends ValueGetter<V> {
+  constructor(protected ctx: WidgetContext,
+              protected settings: GetValueSettings<V>,
+              protected valueType: ValueType,
+              protected valueObserver: Partial<Observer<V>>,
+              protected simulated: boolean) {
+    super(ctx, settings, valueType, valueObserver, simulated);
+  }
+
+  protected doGetValue(): Observable<StateObject> {
+    if (this.simulated) {
+      return of({id: 'default', params: {}});
+    } else {
+      return merge(
+        this.ctx.stateController.dashboardCtrl.dashboardCtx.stateId,
+        this.ctx.stateController.dashboardCtrl.dashboardCtx.stateChanged
+      ).pipe(
+        debounceTime(10),
+        map(() => ({
+          id: this.ctx.stateController.getStateId(),
+          params: deepClone(this.ctx.stateController.getStateParams())
+        }))
+      );
+    }
+  }
+}
+
 export class ExecuteRpcValueSetter<V> extends ValueSetter<V> {
 
   private readonly executeRpcSettings: RpcSettings;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/display-columns-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/display-columns-panel.component.scss
index 1a0ce86b89..1f92b714a9 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/display-columns-panel.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/display-columns-panel.component.scss
@@ -15,7 +15,6 @@
  */
 :host {
   width: 100%;
-  height: 100%;
   min-width: 300px;
   overflow: auto;
   background: #fff;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/doc-link.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/doc-link.component.html
index 4db770a919..dccfec03c2 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/doc-link.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/doc-link.component.html
@@ -49,7 +49,7 @@
         <div class="tb-link-icon-container">
           <tb-icon color="primary">{{ docLink.icon }}</tb-icon>
         </div>
-        <div class="tb-link-text">{{ docLink.name }}</div>
+        <div class="tb-link-text">{{ docLink.name | customTranslate }}</div>
       </div>
     </div>
     <div class="tb-edit-buttons flex flex-row items-center justify-start">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/doc-links-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/doc-links-widget.component.html
index 474824cb12..b1cb50d51b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/doc-links-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/doc-links-widget.component.html
@@ -34,7 +34,7 @@
           <div class="tb-link-icon-container">
             <tb-icon color="primary">{{ docLink.icon }}</tb-icon>
           </div>
-          <div class="tb-link-text">{{ docLink.name }}</div>
+          <div class="tb-link-text">{{ docLink.name | customTranslate }}</div>
         </div>
       </a>
     </mat-grid-tile>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.html
index 004d9807b7..c0f980ca2e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.html
@@ -26,7 +26,7 @@
       <ng-template [ngSwitchCase]="authority.SYS_ADMIN">
         <mat-step [completed]="gettingStarted.maxSelectedIndex > -1">
           <ng-template matStepLabel>
-            <div style="width: 100%;" class="flex flex-row items-center justify-between">
+            <div class="flex items-center justify-between">
               <div translate>widgets.getting-started.sys-admin.step1.title</div>
               <a *ngIf="matStepper.selectedIndex === 0" mat-button color="primary" routerLink="/tenants">{{ 'tenant.tenants' | translate }}</a>
             </div>
@@ -37,7 +37,7 @@
         </mat-step>
         <mat-step [completed]="gettingStarted.maxSelectedIndex > 0">
           <ng-template matStepLabel>
-            <div style="width: 100%;" class="flex flex-row items-center justify-between">
+            <div class="flex items-center justify-between">
               <div translate>widgets.getting-started.sys-admin.step2.title</div>
               <a *ngIf="matStepper.selectedIndex === 1" mat-button color="primary" routerLink="/settings/outgoing-mail">{{ 'admin.settings' | translate }}</a>
             </div>
@@ -48,7 +48,7 @@
         </mat-step>
         <mat-step [completed]="gettingStarted.maxSelectedIndex > 1">
           <ng-template matStepLabel>
-            <div style="width: 100%;" class="flex flex-row items-center justify-between">
+            <div class="flex items-center justify-between">
               <div translate>widgets.getting-started.sys-admin.step3.title</div>
               <a *ngIf="matStepper.selectedIndex === 2" mat-button color="primary" routerLink="/settings/notifications">{{ 'admin.settings' | translate }}</a>
             </div>
@@ -59,7 +59,7 @@
         </mat-step>
         <mat-step [completed]="gettingStarted.maxSelectedIndex > 2">
           <ng-template matStepLabel>
-            <div style="width: 100%;" class="flex flex-row items-center justify-between">
+            <div class="flex items-center justify-between">
               <div translate>widgets.getting-started.sys-admin.step4.title</div>
               <a *ngIf="matStepper.selectedIndex === 3" mat-button color="primary" routerLink="/security-settings/2fa">{{ 'admin.settings' | translate }}</a>
             </div>
@@ -70,7 +70,7 @@
         </mat-step>
         <mat-step [completed]="gettingStarted.maxSelectedIndex > 3">
           <ng-template matStepLabel>
-            <div style="width: 100%;" class="flex flex-row items-center justify-between">
+            <div class="flex items-center justify-between">
               <div translate>widgets.getting-started.sys-admin.step5.title</div>
               <a *ngIf="matStepper.selectedIndex === 4" mat-button color="primary" routerLink="/security-settings/oauth2">{{ 'admin.settings' | translate }}</a>
             </div>
@@ -81,7 +81,7 @@
         </mat-step>
         <mat-step [completed]="gettingStarted.maxSelectedIndex > 4">
           <ng-template matStepLabel>
-            <div style="width: 100%;" class="flex flex-row items-center justify-between">
+            <div class="flex items-center justify-between">
               <div translate>widgets.getting-started.sys-admin.step6.title</div>
               <a *ngIf="matStepper.selectedIndex === 5" mat-button color="primary" routerLink="/settings/notifications">{{ 'admin.settings' | translate }}</a>
             </div>
@@ -94,7 +94,7 @@
       <ng-template [ngSwitchCase]="authority.TENANT_ADMIN">
         <mat-step [completed]="gettingStarted.maxSelectedIndex > -1">
           <ng-template matStepLabel>
-            <div style="width: 100%;" class="flex flex-row items-center justify-between">
+            <div class="flex items-center justify-between">
               <div translate>widgets.getting-started.tenant-admin.step1.title</div>
               <a *ngIf="matStepper.selectedIndex === 0" mat-button color="primary" routerLink="/entities/devices">{{ 'device.devices' | translate }}</a>
             </div>
@@ -105,7 +105,7 @@
         </mat-step>
         <mat-step [completed]="gettingStarted.maxSelectedIndex > 0">
           <ng-template matStepLabel>
-            <div style="width: 100%;" class="flex flex-row items-center justify-between">
+            <div class="flex items-center justify-between">
               <div translate>widgets.getting-started.tenant-admin.step2.title</div>
             </div>
           </ng-template>
@@ -153,7 +153,7 @@
         </mat-step>
         <mat-step [completed]="gettingStarted.maxSelectedIndex > 1">
           <ng-template matStepLabel>
-            <div style="width: 100%;" class="flex flex-row items-center justify-between">
+            <div class="flex items-center justify-between">
               <div translate>widgets.getting-started.tenant-admin.step3.title</div>
               <a *ngIf="matStepper.selectedIndex === 2" mat-button color="primary" routerLink="/dashboards">{{ 'dashboard.dashboards' | translate }}</a>
             </div>
@@ -164,7 +164,7 @@
         </mat-step>
         <mat-step [completed]="gettingStarted.maxSelectedIndex > 2">
           <ng-template matStepLabel>
-            <div style="width: 100%;" class="flex flex-row items-center justify-between">
+            <div class="flex items-center justify-between">
               <div translate>widgets.getting-started.tenant-admin.step4.title</div>
               <a *ngIf="matStepper.selectedIndex === 3" mat-button color="primary" routerLink="/profiles/deviceProfiles">{{ 'widgets.getting-started.tenant-admin.step4.alarm-rules' | translate }}</a>
             </div>
@@ -175,7 +175,7 @@
         </mat-step>
         <mat-step [completed]="gettingStarted.maxSelectedIndex > 3">
           <ng-template matStepLabel>
-            <div style="width: 100%;" class="flex flex-row items-center justify-between">
+            <div class="flex items-center justify-between">
               <div translate>widgets.getting-started.tenant-admin.step5.title</div>
             </div>
           </ng-template>
@@ -193,7 +193,7 @@
         </mat-step>
         <mat-step [completed]="gettingStarted.maxSelectedIndex > 4">
           <ng-template matStepLabel>
-            <div style="width: 100%;" class="flex flex-row items-center justify-between">
+            <div class="flex items-center justify-between">
               <div translate>widgets.getting-started.tenant-admin.step6.title</div>
               <a *ngIf="matStepper.selectedIndex === 5" mat-button color="primary" routerLink="/customers">{{ 'customer.customers' | translate }}</a>
             </div>
@@ -205,7 +205,7 @@
       </ng-template>
     </ng-container>
   </mat-stepper>
-  <div *ngIf="allCompleted" class="flex flex-col items-center justify-center" style="padding-top: 24px;">
+  <div *ngIf="allCompleted" class="flex justify-center pt-6">
     <button (click)="gettingStartedCompleted()" mat-flat-button color="primary">
       <mat-icon>rocket_launch</mat-icon>{{ 'widgets.getting-started.finish' | translate }}</button>
   </div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss
index e684c094d7..4a21006cc0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss
@@ -38,6 +38,9 @@
   .tb-get-started-container {
     flex: 1;
     overflow: auto;
+    mat-stepper {
+      transform: scale(1); //fixed blur content
+    }
   }
 }
 
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 8dea835e24..4ca5d4302a 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
@@ -19,23 +19,18 @@ import LeafletMap from './leaflet-map';
 import { MapWidgetInterface, MapWidgetStaticInterface } from './map-widget.interface';
 import { WidgetContext } from '@app/modules/home/models/widget-component.models';
 import { getDefCenterPosition, parseWithTranslation } from './common-maps-utils';
-import {
-  Datasource,
-  DatasourceData,
-  FormattedData,
-  JsonSettingsSchema,
-  WidgetActionDescriptor
-} from '@shared/models/widget.models';
+import { Datasource, DatasourceData, FormattedData, WidgetActionDescriptor } from '@shared/models/widget.models';
 import { TranslateService } from '@ngx-translate/core';
 import { UtilsService } from '@core/services/utils.service';
 import { EntityDataPageLink } from '@shared/models/query/query.models';
 import { providerClass } from '@home/components/widget/lib/maps/providers/public-api';
-import { isDefined, isDefinedAndNotNull, parseFunction, parseTbFunction } from '@core/utils';
+import { isDefined, isDefinedAndNotNull, parseTbFunction } from '@core/utils';
 import L from 'leaflet';
 import { firstValueFrom, forkJoin, from, Observable, of } from 'rxjs';
 import { AttributeService } from '@core/http/attribute.service';
 import { EntityId } from '@shared/models/id/entity-id';
 import { AttributeScope, DataKeyType, LatestTelemetry } from '@shared/models/telemetry/telemetry.models';
+import { FormProperty } from '@shared/models/dynamic-form.models';
 
 // @dynamic
 export class MapWidgetController implements MapWidgetInterface {
@@ -113,7 +108,7 @@ export class MapWidgetController implements MapWidgetInterface {
 
     map: LeafletMap;
     provider: MapProviders;
-    schema: JsonSettingsSchema;
+    form: FormProperty[];
     data: DatasourceData[];
     settings: WidgetUnitedMapSettings;
     pageLink: EntityDataPageLink;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html
index 51d4ec22b1..3e1ca011fd 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html
@@ -138,6 +138,28 @@
               {{ getErrorMessageText(key.settings, 'required') }}
             </mat-error>
           </mat-form-field>
+
+          <div *ngIf="key.settings.dataKeyValueType === 'radio'">
+            <mat-label>{{key.label}}</mat-label>
+            <mat-radio-group
+              [style]="{'display': 'grid', 'grid-template-columns': 'repeat(' + key.settings.radioColumns + ', 1fr)', 'column-gap': '5px', 'row-gap': '5px'}"
+              [labelPosition]="key.settings.radioLabelPosition"
+              (change)="inputChanged(source, key)"
+              formControlName="{{key.formId}}">
+                <mat-radio-button
+                  [style]="radioButtonSelectedColor(key.settings.radioColor)"
+                  [disabled]="key.settings.isEditable === 'readonly'"
+                  *ngFor="let option of key.settings.selectOptions"
+                  [value]="option.value">
+                  <ng-container *ngIf="key.settings.icon || key.settings.customIconUrl" matIconPrefix>
+                    <ng-container *ngTemplateOutlet="iconPrefix; context: {key: key}"></ng-container>
+                  </ng-container>
+                  <span class="label-wrapper">
+                    {{ getCustomTranslationText(option.label ? option.label : option.value) }}
+                  </span>
+                </mat-radio-button>
+            </mat-radio-group>
+          </div>
           <mat-form-field *ngIf="key.settings.dataKeyValueType === 'color'"
                           class="color-input" [appearance]="key.settings.appearance" [subscriptSizing]="key.settings.subscriptSizing"
                           (click)="colorInput.openColorPickerPopup($event)">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.scss
index 4c8ffea030..b5e83a4925 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.scss
@@ -75,7 +75,7 @@
 
 :host ::ng-deep {
   .tb-multiple-input {
-    .mat-mdc-slide-toggle, .mat-mdc-checkbox {
+    .mat-mdc-slide-toggle, .mat-mdc-checkbox, .mat-mdc-radio-button {
       .mdc-form-field {
         width: 100%;
         & > label {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts
index 7a80f4904a..94b33eb9d0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts
@@ -54,7 +54,7 @@ type FieldAlignment = 'row' | 'column';
 type MultipleInputWidgetDataKeyType = 'server' | 'shared' | 'timeseries';
 export type MultipleInputWidgetDataKeyValueType = 'string' | 'double' | 'integer' |
                                                   'JSON' | 'booleanCheckbox' | 'booleanSwitch' |
-                                                  'dateTime' | 'date' | 'time' | 'select' | 'color';
+                                                  'dateTime' | 'date' | 'time' | 'select' | 'radio' | 'color';
 export type MultipleInputWidgetDataKeyEditableType = 'editable' | 'disabled' | 'readonly';
 
 type ConvertGetValueFunction = (value: any, ctx: WidgetContext) => any;
@@ -86,6 +86,9 @@ interface MultipleInputWidgetDataKeySettings {
   dataKeyValueType: MultipleInputWidgetDataKeyValueType;
   slideToggleLabelPosition?: 'after' | 'before';
   selectOptions: MultipleInputWidgetSelectOption[];
+  radioColor: string;
+  radioColumns: number;
+  radioLabelPosition?: 'after' | 'before';
   required: boolean;
   isEditable: MultipleInputWidgetDataKeyEditableType;
   disabledOnDataKey: string;
@@ -300,7 +303,7 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
 
             // For backward compatibility
 
-            if (dataKey.settings.dataKeyValueType === 'select') {
+            if (dataKey.settings.dataKeyValueType === 'select' || dataKey.settings.dataKeyValueType === 'radio') {
               dataKey.settings.selectOptions.forEach((option) => {
                 if (option.value.toLowerCase() === 'null') {
                   option.value = null;
@@ -444,6 +447,7 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
               }
               break;
             case 'select':
+            case 'radio':
               value = keyValue !== null ? keyValue.toString() : null;
               break;
             case 'JSON':
@@ -566,6 +570,12 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
     return this.getTranslatedErrorText(errorMessage, defaultMessage, messageValues);
   }
 
+  public radioButtonSelectedColor(radioColor: string) {
+    if (isDefinedAndNotNull(radioColor)) {
+      return `--mdc-radio-selected-icon-color: ${radioColor}; --mdc-radio-selected-focus-icon-color: ${radioColor}; --mdc-radio-selected-hover-icon-color: ${radioColor}; --mdc-radio-selected-pressed-icon-color: ${radioColor}; --mat-radio-checked-ripple-color: ${radioColor};`
+    }
+  }
+
   public getTranslatedErrorText(errorMessage: string, defaultMessage: string, messageValues?: object): string {
     let messageText;
     if (errorMessage && errorMessage.length) {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.ts
index 6c9072e915..cab9b9d572 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.ts
@@ -18,7 +18,8 @@ import {
   AfterViewInit,
   ChangeDetectorRef,
   Component,
-  ElementRef, NgZone,
+  ElementRef,
+  NgZone,
   OnDestroy,
   OnInit,
   Renderer2,
@@ -38,6 +39,7 @@ import {
   PowerButtonWidgetSettings
 } from '@home/components/widget/lib/rpc/power-button-widget.models';
 import { SVG, Svg } from '@svgdotjs/svg.js';
+import { MatIconRegistry } from '@angular/material/icon';
 
 @Component({
   selector: 'tb-power-button-widget',
@@ -72,6 +74,7 @@ export class PowerButtonWidgetComponent extends
   constructor(protected imagePipe: ImagePipe,
               protected sanitizer: DomSanitizer,
               private renderer: Renderer2,
+              private iconRegistry: MatIconRegistry,
               protected cd: ChangeDetectorRef,
               protected zone: NgZone) {
     super(cd);
@@ -180,7 +183,7 @@ export class PowerButtonWidgetComponent extends
     this.renderer.setStyle(this.svgShape.node, 'user-select', 'none');
 
     this.zone.run(() => {
-      this.powerButtonSvgShape = PowerButtonShape.fromSettings(this.ctx, this.svgShape,
+      this.powerButtonSvgShape = PowerButtonShape.fromSettings(this.ctx, this.svgShape, this.iconRegistry,
         this.settings, this.value, this.disabledState, () => this.onClick());
     });
 
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 503347939d..540ef8f9f3 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
@@ -28,6 +28,11 @@ import { Circle, Effect, Element, G, Gradient, Path, Runner, Svg, Text, Timeline
 import '@svgdotjs/svg.filter.js';
 import tinycolor from 'tinycolor2';
 import { WidgetContext } from '@home/models/widget-component.models';
+import { Observable, of } from 'rxjs';
+import { isSvgIcon, splitIconName } from '@shared/models/icon.models';
+import { catchError, map, take } from 'rxjs/operators';
+import { MatIconRegistry } from '@angular/material/icon';
+import { isDefinedAndNotNull } from '@core/utils';
 
 export enum PowerButtonLayout {
   default = 'default',
@@ -71,20 +76,29 @@ export const powerButtonLayoutImages = new Map<PowerButtonLayout, string>(
   ]
 );
 
+export interface ButtonIconSettings {
+  showIcon: boolean;
+  iconSize: number;
+  iconSizeUnit: string;
+  icon: string;
+}
+
 export interface PowerButtonWidgetSettings {
-  initialState: GetValueSettings<boolean>;
-  disabledState: GetValueSettings<boolean>;
-  onUpdateState: SetValueSettings;
-  offUpdateState: SetValueSettings;
+  initialState?: GetValueSettings<boolean>;
+  disabledState?: GetValueSettings<boolean>;
+  onUpdateState?: SetValueSettings;
+  offUpdateState?: SetValueSettings;
   layout: PowerButtonLayout;
+  onButtonIcon: ButtonIconSettings,
+  offButtonIcon: ButtonIconSettings,
   mainColorOn: string;
   backgroundColorOn: string;
   mainColorOff: string;
   backgroundColorOff: string;
   mainColorDisabled: string;
   backgroundColorDisabled: string;
-  background: BackgroundSettings;
-  padding: string;
+  background?: BackgroundSettings;
+  padding?: string;
 }
 
 export const powerButtonDefaultSettings: PowerButtonWidgetSettings = {
@@ -177,6 +191,18 @@ export const powerButtonDefaultSettings: PowerButtonWidgetSettings = {
     }
   },
   layout: PowerButtonLayout.default,
+  onButtonIcon: {
+    showIcon: false,
+    iconSize: 32,
+    iconSizeUnit: 'px',
+    icon: 'power_settings_new'
+  },
+  offButtonIcon: {
+    showIcon: false,
+    iconSize: 32,
+    iconSizeUnit: 'px',
+    icon: 'power_settings_new'
+  },
   mainColorOn: '#3F52DD',
   backgroundColorOn: '#FFFFFF',
   mainColorOff: '#A2A2A2',
@@ -207,6 +233,11 @@ interface PowerButtonColorState {
   backgroundColor: PowerButtonColor;
 }
 
+interface ButtonsIconSettings {
+  onButtonIcon: ButtonIconSettings;
+  offButtonIcon: ButtonIconSettings;
+}
+
 type PowerButtonShapeColors = Record<PowerButtonState, PowerButtonColorState>;
 
 const createPowerButtonShapeColors = (settings: PowerButtonWidgetSettings): PowerButtonShapeColors => {
@@ -257,33 +288,35 @@ export abstract class PowerButtonShape {
 
   static fromSettings(ctx: WidgetContext,
                       svgShape: Svg,
+                      iconRegistry: MatIconRegistry,
                       settings: PowerButtonWidgetSettings,
                       value: boolean,
                       disabled: boolean,
                       onClick: () => void): PowerButtonShape {
     switch (settings.layout) {
       case PowerButtonLayout.default:
-        return new DefaultPowerButtonShape(ctx, svgShape, settings, value, disabled, onClick);
+        return new DefaultPowerButtonShape(ctx, svgShape, iconRegistry, settings, value, disabled, onClick);
       case PowerButtonLayout.simplified:
-        return new SimplifiedPowerButtonShape(ctx, svgShape, settings, value, disabled, onClick);
+        return new SimplifiedPowerButtonShape(ctx, svgShape, iconRegistry, settings, value, disabled, onClick);
       case PowerButtonLayout.outlined:
-        return new OutlinedPowerButtonShape(ctx, svgShape, settings, value, disabled, onClick);
+        return new OutlinedPowerButtonShape(ctx, svgShape, iconRegistry, settings, value, disabled, onClick);
       case PowerButtonLayout.default_volume:
-        return new DefaultVolumePowerButtonShape(ctx, svgShape, settings, value, disabled, onClick);
+        return new DefaultVolumePowerButtonShape(ctx, svgShape, iconRegistry, settings, value, disabled, onClick);
       case PowerButtonLayout.simplified_volume:
-        return new SimplifiedVolumePowerButtonShape(ctx, svgShape, settings, value, disabled, onClick);
+        return new SimplifiedVolumePowerButtonShape(ctx, svgShape, iconRegistry, settings, value, disabled, onClick);
       case PowerButtonLayout.outlined_volume:
-        return new OutlinedVolumePowerButtonShape(ctx, svgShape, settings, value, disabled, onClick);
+        return new OutlinedVolumePowerButtonShape(ctx, svgShape, iconRegistry, settings, value, disabled, onClick);
       case PowerButtonLayout.default_icon:
-        return new DefaultIconPowerButtonShape(ctx, svgShape, settings, value, disabled, onClick);
+        return new DefaultIconPowerButtonShape(ctx, svgShape, iconRegistry, settings, value, disabled, onClick);
       case PowerButtonLayout.simplified_icon:
-        return new SimplifiedIconPowerButtonShape(ctx, svgShape, settings, value, disabled, onClick);
+        return new SimplifiedIconPowerButtonShape(ctx, svgShape, iconRegistry, settings, value, disabled, onClick);
       case PowerButtonLayout.outlined_icon:
-        return new OutlinedIconPowerButtonShape(ctx, svgShape, settings, value, disabled, onClick);
+        return new OutlinedIconPowerButtonShape(ctx, svgShape, iconRegistry, settings, value, disabled, onClick);
     }
   }
 
   protected readonly colors: PowerButtonShapeColors;
+  protected readonly icons: ButtonsIconSettings;
   protected readonly onLabel: string;
   protected readonly offLabel: string;
 
@@ -293,18 +326,67 @@ export abstract class PowerButtonShape {
   protected pressed = false;
   protected forcePressed = false;
 
+  protected offPowerSymbolIcon: Element;
+  protected onPowerSymbolIcon: Element;
+  protected offLabelShape: Text;
+  protected onLabelShape: Text;
+
+  protected offPowerSymbolCircle: Path;
+  protected offPowerSymbolLine: Path;
+  protected onPowerSymbolCircle: Path;
+  protected onPowerSymbolLine: Path;
+
   protected constructor(protected widgetContext: WidgetContext,
                         protected svgShape: Svg,
+                        protected iconRegistry: MatIconRegistry,
                         protected settings: PowerButtonWidgetSettings,
                         protected value: boolean,
                         protected disabled: boolean,
                         protected onClick: () => void) {
     this.colors = createPowerButtonShapeColors(this.settings);
+    this.icons = {onButtonIcon: this.settings.onButtonIcon, offButtonIcon: this.settings.offButtonIcon};
     this.onLabel = this.widgetContext.translate.instant('widgets.power-button.on-label').toUpperCase();
     this.offLabel = this.widgetContext.translate.instant('widgets.power-button.off-label').toUpperCase();
     this._drawShape();
   }
 
+  public createIconElement(icon: string, size: number): Observable<Element> {
+    const isSvg = isSvgIcon(icon);
+    if (isSvg) {
+      const [namespace, iconName] = splitIconName(icon);
+      return this.iconRegistry
+        .getNamedSvgIcon(iconName, namespace)
+        .pipe(
+          take(1),
+          map((svgElement) => {
+            const element = new Element(svgElement.firstChild);
+            const box = element.bbox();
+            const scale = size / box.height;
+            element.scale(scale);
+            return element;
+          }),
+          catchError(() => of(null)
+          ));
+    } else {
+      const iconName = splitIconName(icon)[1];
+      const textElement = this.svgShape.text(iconName);
+      const fontSetClasses = (
+        this.iconRegistry.getDefaultFontSetClass()
+      ).filter(className => className.length > 0);
+      fontSetClasses.forEach(className => textElement.addClass(className));
+      textElement.font({size: `${size}px`});
+      textElement.attr({
+        style: `font-size: ${size}px`,
+        'text-anchor': 'start'
+      });
+      const tspan = textElement.first();
+      tspan.attr({
+        'dominant-baseline': 'hanging'
+      });
+      return of(textElement);
+    }
+  }
+
   public setValue(value: boolean) {
     if (this.value !== value) {
       this.value = value;
@@ -330,6 +412,106 @@ export abstract class PowerButtonShape {
     }
   }
 
+  public drawOffShape(centerGroup: G, label: boolean, labelWeight?: string, circleStroke?: boolean) {
+    if (this.icons.offButtonIcon.showIcon) {
+      this.createIconElement(this.icons.offButtonIcon.icon, this.icons.offButtonIcon.iconSize).subscribe(icon =>
+        this.offPowerSymbolIcon = icon.center(cx, cy).addTo(centerGroup));
+    } else {
+      if (label) {
+        this.offLabelShape = this.createOffLabel(labelWeight).addTo(centerGroup);
+      } else {
+        this.offPowerSymbolCircle = this.svgShape.path(circleStroke ? powerCircle : powerCircleStroke).center(cx, cy).addTo(centerGroup);
+        this.offPowerSymbolLine = this.svgShape.path(circleStroke ? powerLine : powerLineStroke).center(cx, cy-12).addTo(centerGroup);
+      }
+    }
+  }
+
+  public drawOnShape(onCenterGroup?: G, label?: boolean, labelWeight?: string, circleStroke?: boolean, mask?: Circle) {
+    if (this.icons.onButtonIcon.showIcon) {
+      this.createIconElement(this.icons.onButtonIcon.icon, this.icons.onButtonIcon.iconSize).subscribe(icon => {
+        this.onPowerSymbolIcon = icon.center(cx, cy);
+        if (isDefinedAndNotNull(onCenterGroup)) {
+          this.onPowerSymbolIcon.addTo(onCenterGroup);
+        }
+        if (isDefinedAndNotNull(mask)) {
+          this.createMask(mask, [this.onPowerSymbolIcon]);
+        }
+      });
+    } else {
+      if (label) {
+        this.onLabelShape = this.createOnLabel(labelWeight);
+        if (isDefinedAndNotNull(onCenterGroup)) {
+          this.onLabelShape.addTo(onCenterGroup);
+        }
+        if (isDefinedAndNotNull(mask)) {
+          this.createMask(mask, [this.onLabelShape]);
+        }
+      } else {
+        this.onPowerSymbolCircle = this.svgShape.path(circleStroke ? powerCircle : powerCircleStroke).center(cx, cy);
+        this.onPowerSymbolLine = this.svgShape.path(circleStroke ? powerLine : powerLineStroke).center(cx, cy-12);
+        if (isDefinedAndNotNull(onCenterGroup)) {
+          this.onPowerSymbolCircle.addTo(onCenterGroup);
+          this.onPowerSymbolLine.addTo(onCenterGroup);
+        }
+        if (isDefinedAndNotNull(mask)) {
+          this.createMask(mask, [this.onPowerSymbolCircle, this.onPowerSymbolLine]);
+        }
+      }
+    }
+  }
+
+  public onCenterTimeLine(timeline: Timeline, label: boolean) {
+    if (this.icons.onButtonIcon.showIcon) {
+      this.onPowerSymbolIcon.timeline(timeline);
+    } else {
+      if (label) {
+        this.onLabelShape.timeline(timeline);
+      } else {
+        this.onPowerSymbolCircle.timeline(timeline);
+        this.onPowerSymbolLine.timeline(timeline);
+      }
+    }
+  }
+
+  public offCenterColor(mainColor: PowerButtonColor, label: boolean) {
+    if (this.icons.offButtonIcon.showIcon) {
+      this.offPowerSymbolIcon.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+    } else {
+      if (label) {
+        this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+      } else {
+        this.offPowerSymbolCircle.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+        this.offPowerSymbolLine.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+      }
+    }
+  }
+
+  public onCenterColor(mainColor: PowerButtonColor, label: boolean) {
+    if (this.icons.onButtonIcon.showIcon) {
+      this.onPowerSymbolIcon.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+    } else {
+      if (label) {
+        this.onLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+      } else {
+        this.onPowerSymbolCircle.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+        this.onPowerSymbolLine.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+      }
+    }
+  }
+
+  public buttonAnimation(scale: number, label: boolean) {
+    if (this.icons.onButtonIcon.showIcon) {
+      powerButtonAnimation(this.onPowerSymbolIcon).transform({scale});
+    } else {
+      if (label) {
+        powerButtonAnimation(this.onLabelShape).transform({scale, origin: {x: cx, y: cy}});
+      } else {
+        powerButtonAnimation(this.onPowerSymbolCircle).transform({scale, origin: {x: cx, y: cy}});
+        powerButtonAnimation(this.onPowerSymbolLine).transform({scale, origin: {x: cx, y: cy}});
+      }
+    }
+  }
+
   private _drawShape() {
 
     this.backgroundShape = this.svgShape.circle(powerButtonShapeSize).center(cx, cy)
@@ -530,9 +712,7 @@ class DefaultPowerButtonShape extends PowerButtonShape {
 
   private outerBorder: Circle;
   private outerBorderMask: Circle;
-  private offLabelShape: Text;
   private onCircleShape: Circle;
-  private onLabelShape: Text;
   private pressedShadow: InnerShadowCircle;
   private pressedTimeline: Timeline;
   private centerGroup: G;
@@ -543,22 +723,20 @@ class DefaultPowerButtonShape extends PowerButtonShape {
     this.outerBorderMask = this.svgShape.circle(powerButtonShapeSize - 20).center(cx, cy);
     this.createMask(this.outerBorder, [this.outerBorderMask]);
     this.centerGroup = this.svgShape.group();
-    this.offLabelShape = this.createOffLabel().addTo(this.centerGroup);
-    this.onCircleShape = this.svgShape.circle(powerButtonShapeSize - 20)
-    .center(cx, cy);
-    this.onLabelShape = this.createOnLabel();
-    this.createMask(this.onCircleShape, [this.onLabelShape]);
+    this.drawOffShape(this.centerGroup, true);
+    this.onCircleShape = this.svgShape.circle(powerButtonShapeSize - 20).center(cx, cy);
+    this.drawOnShape(null, true, '', false, this.onCircleShape);
     this.pressedShadow = new InnerShadowCircle(this.svgShape, powerButtonShapeSize - 20, cx, cy, 0, 0);
 
     this.pressedTimeline = new Timeline();
     this.centerGroup.timeline(this.pressedTimeline);
-    this.onLabelShape.timeline(this.pressedTimeline);
+    this.onCenterTimeLine(this.pressedTimeline, true);
     this.pressedShadow.timeline(this.pressedTimeline);
   }
 
   protected drawColorState(mainColor: PowerButtonColor) {
     this.outerBorder.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
-    this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+    this.offCenterColor(mainColor, true);
     this.onCircleShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
   }
 
@@ -578,14 +756,14 @@ class DefaultPowerButtonShape extends PowerButtonShape {
     this.pressedTimeline.finish();
     const pressedScale = 0.75;
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
-    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale, origin: {x: cx, y: cy}});
+    this.buttonAnimation(pressedScale, true);
     this.pressedShadow.animate(6, 0.6);
   }
 
   protected onPressEnd() {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
-    powerButtonAnimation(this.onLabelShape).transform({scale: 1, origin: {x: cx, y: cy}});
+    this.buttonAnimation(1, true);
     this.pressedShadow.animateRestore();
   }
 
@@ -596,8 +774,6 @@ class SimplifiedPowerButtonShape extends PowerButtonShape {
   private outerBorder: Circle;
   private outerBorderMask: Circle;
   private onCircleShape: Circle;
-  private offLabelShape: Text;
-  private onLabelShape: Text;
   private pressedShadow: InnerShadowCircle;
   private pressedTimeline: Timeline;
   private centerGroup: G;
@@ -608,22 +784,21 @@ class SimplifiedPowerButtonShape extends PowerButtonShape {
     this.outerBorderMask = this.svgShape.circle(powerButtonShapeSize - 4).center(cx, cy);
     this.createMask(this.outerBorder, [this.outerBorderMask]);
     this.centerGroup = this.svgShape.group();
-    this.offLabelShape = this.createOffLabel().addTo(this.centerGroup);
+    this.drawOffShape(this.centerGroup, true);
     this.onCircleShape = this.svgShape.circle(powerButtonShapeSize).center(cx, cy);
-    this.onLabelShape = this.createOnLabel();
-    this.createMask(this.onCircleShape, [this.onLabelShape]);
+    this.drawOnShape(null, true, '', false, this.onCircleShape)
     this.pressedShadow = new InnerShadowCircle(this.svgShape, powerButtonShapeSize - 4, cx, cy, 0, 0);
 
     this.pressedTimeline = new Timeline();
     this.centerGroup.timeline(this.pressedTimeline);
-    this.onLabelShape.timeline(this.pressedTimeline);
+    this.onCenterTimeLine(this.pressedTimeline, true);
     this.pressedShadow.timeline(this.pressedTimeline);
   }
 
   protected drawColorState(mainColor: PowerButtonColor) {
     this.outerBorder.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
     this.onCircleShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
-    this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+    this.offCenterColor(mainColor, true);
   }
 
   protected drawOff() {
@@ -642,14 +817,14 @@ class SimplifiedPowerButtonShape extends PowerButtonShape {
     this.pressedTimeline.finish();
     const pressedScale = 0.75;
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
-    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale, origin: {x: cx, y: cy}});
+    this.buttonAnimation(pressedScale, true);
     this.pressedShadow.animate(6, 0.6);
   }
 
   protected onPressEnd() {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
-    powerButtonAnimation(this.onLabelShape).transform({scale: 1, origin: {x: cx, y: cy}});
+    this.buttonAnimation(1, true);
     this.pressedShadow.animateRestore();
   }
 }
@@ -659,9 +834,7 @@ class OutlinedPowerButtonShape extends PowerButtonShape {
   private outerBorderMask: Circle;
   private innerBorder: Circle;
   private innerBorderMask: Circle;
-  private offLabelShape: Text;
   private onCircleShape: Circle;
-  private onLabelShape: Text;
   private pressedShadow: InnerShadowCircle;
   private pressedTimeline: Timeline;
   private centerGroup: G;
@@ -677,25 +850,23 @@ class OutlinedPowerButtonShape extends PowerButtonShape {
     this.innerBorderMask = this.svgShape.circle(powerButtonShapeSize - 24).center(cx, cy);
     this.createMask(this.innerBorder, [this.innerBorderMask]);
     this.centerGroup = this.svgShape.group();
-    this.offLabelShape = this.createOffLabel().addTo(this.centerGroup);
+    this.drawOffShape(this.centerGroup, true);
     this.onCenterGroup = this.svgShape.group();
-    this.onCircleShape = this.svgShape.circle(powerButtonShapeSize - 28).center(cx, cy)
-    .addTo(this.onCenterGroup);
-    this.onLabelShape = this.createOnLabel();
-    this.createMask(this.onCircleShape, [this.onLabelShape]);
+    this.onCircleShape = this.svgShape.circle(powerButtonShapeSize - 28).center(cx, cy).addTo(this.onCenterGroup);
+    this.drawOnShape(null, true, '', false, this.onCircleShape)
     this.pressedShadow = new InnerShadowCircle(this.svgShape, powerButtonShapeSize - 24, cx, cy, 0, 0);
 
     this.pressedTimeline = new Timeline();
     this.centerGroup.timeline(this.pressedTimeline);
     this.onCenterGroup.timeline(this.pressedTimeline);
-    this.onLabelShape.timeline(this.pressedTimeline);
+    this.onCenterTimeLine(this.pressedTimeline, true);
     this.pressedShadow.timeline(this.pressedTimeline);
   }
 
   protected drawColorState(mainColor: PowerButtonColor) {
     this.outerBorder.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
     this.innerBorder.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
-    this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+    this.offCenterColor(mainColor, true);
     this.onCircleShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
   }
 
@@ -714,7 +885,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, origin: {x: cx, y: cy}});
+    this.buttonAnimation(pressedScale / 0.98, true);
     this.pressedShadow.animate(6, 0.6);
   }
 
@@ -722,7 +893,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, origin: {x: cx, y: cy}});
+    this.buttonAnimation(1, true);
     this.pressedShadow.animateRestore();
   }
 }
@@ -737,35 +908,29 @@ class DefaultVolumePowerButtonShape extends PowerButtonShape {
   private innerShadow: InnerShadowCircle;
   //private innerShadowGradient: Gradient;
   //private innerShadowGradientStop: Stop;
-  private offLabelShape: Text;
-  private onCircleShape: Circle;
-  private onLabelShape: Text;
+  protected onCircleShape: Circle;
   private pressedTimeline: Timeline;
   private centerGroup: G;
 
 
   protected drawOffCenter(centerGroup: G) {
-    this.offLabelShape = this.createOffLabel('400').addTo(centerGroup);
+    this.drawOffShape(centerGroup, true, '400');
   }
 
   protected drawOnCenter() {
-    this.onLabelShape = this.createOnLabel('400');
-  }
-
-  protected addOnCenterToMask(onCircleShape: Circle) {
-    this.createMask(onCircleShape,[this.onLabelShape]);
+    this.drawOnShape(null, true, '400', false, this.onCircleShape);
   }
 
   protected addOnCenterTimeLine(pressedTimeline: Timeline) {
-    this.onLabelShape.timeline(pressedTimeline);
+    this.onCenterTimeLine(pressedTimeline, true);
   }
 
   protected drawOffCenterColor(mainColor: PowerButtonColor) {
-    this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+    this.offCenterColor(mainColor, true);
   }
 
   protected onCenterAnimation(scale: number) {
-    powerButtonAnimation(this.onLabelShape).transform({scale, origin: {x: cx, y: cy}});
+    this.buttonAnimation(scale, true);
   }
 
   protected drawShape() {
@@ -789,7 +954,6 @@ class DefaultVolumePowerButtonShape extends PowerButtonShape {
     this.drawOffCenter(this.centerGroup);
     this.onCircleShape = this.svgShape.circle(powerButtonShapeSize - 24).center(cx, cy);
     this.drawOnCenter();
-    this.addOnCenterToMask(this.onCircleShape);
     this.innerShadow = new InnerShadowCircle(this.svgShape, powerButtonShapeSize - 24, cx, cy, 3, 0.3);
 
     this.pressedTimeline = new Timeline();
@@ -857,38 +1021,25 @@ class DefaultVolumePowerButtonShape extends PowerButtonShape {
 }
 
 class DefaultIconPowerButtonShape extends DefaultVolumePowerButtonShape {
-  private offPowerSymbolCircle: Path;
-  private offPowerSymbolLine: Path;
-  private onPowerSymbolCircle: Path;
-  private onPowerSymbolLine: Path;
 
   protected drawOffCenter(centerGroup: G) {
-    this.offPowerSymbolCircle = this.svgShape.path(powerCircle).center(cx, cy).addTo(centerGroup);
-    this.offPowerSymbolLine = this.svgShape.path(powerLine).center(cx, cy-12).addTo(centerGroup);
+    this.drawOffShape(centerGroup, false);
   }
 
   protected drawOnCenter() {
-    this.onPowerSymbolCircle = this.svgShape.path(powerCircle).center(cx, cy);
-    this.onPowerSymbolLine = this.svgShape.path(powerLine).center(cx, cy-12);
-  }
-
-  protected addOnCenterToMask(onCircleShape: Circle) {
-    this.createMask(onCircleShape, [this.onPowerSymbolCircle, this.onPowerSymbolLine]);
+    this.drawOnShape(null, false, '', false, this.onCircleShape);
   }
 
   protected addOnCenterTimeLine(pressedTimeline: Timeline) {
-    this.onPowerSymbolCircle.timeline(pressedTimeline);
-    this.onPowerSymbolLine.timeline(pressedTimeline);
+    this.onCenterTimeLine(pressedTimeline, false);
   }
 
   protected drawOffCenterColor(mainColor: PowerButtonColor) {
-    this.offPowerSymbolCircle.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
-    this.offPowerSymbolLine.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+    this.offCenterColor(mainColor, false);
   }
 
   protected onCenterAnimation(scale: number) {
-    powerButtonAnimation(this.onPowerSymbolCircle).transform({scale, origin: {x: cx, y: cy}});
-    powerButtonAnimation(this.onPowerSymbolLine).transform({scale, origin: {x: cx, y: cy}});
+    this.buttonAnimation(scale, false);
   }
 }
 
@@ -896,8 +1047,6 @@ class SimplifiedVolumePowerButtonShape extends PowerButtonShape {
 
   private outerBorder: Circle;
   private outerBorderMask: Circle;
-  private offLabelShape: Text;
-  private onLabelShape: Text;
   private innerShadow: InnerShadowCircle;
   private pressedShadow: InnerShadowCircle;
   private pressedTimeline: Timeline;
@@ -905,8 +1054,8 @@ class SimplifiedVolumePowerButtonShape extends PowerButtonShape {
   private onCenterGroup: G;
 
   protected drawCenterGroup(centerGroup: G, onCenterGroup: G) {
-    this.offLabelShape = this.createOffLabel().addTo(centerGroup);
-    this.onLabelShape = this.createOnLabel().addTo(onCenterGroup);
+    this.drawOffShape(centerGroup, true);
+    this.drawOnShape(onCenterGroup, true);
   }
 
   protected drawShape() {
@@ -926,8 +1075,8 @@ class SimplifiedVolumePowerButtonShape extends PowerButtonShape {
   }
 
   protected drawColorState(mainColor: PowerButtonColor){
-    this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
-    this.onLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+    this.offCenterColor(mainColor, true);
+    this.onCenterColor(mainColor, true);
   }
 
   protected drawOff() {
@@ -970,23 +1119,15 @@ class SimplifiedVolumePowerButtonShape extends PowerButtonShape {
 }
 
 class SimplifiedIconPowerButtonShape extends SimplifiedVolumePowerButtonShape {
-  private offPowerSymbolCircle: Path;
-  private offPowerSymbolLine: Path;
-  private onPowerSymbolCircle: Path;
-  private onPowerSymbolLine: Path;
 
   protected drawCenterGroup(centerGroup: G, onCenterGroup: G) {
-    this.offPowerSymbolCircle = this.svgShape.path(powerCircle).center(cx, cy).addTo(centerGroup);
-    this.offPowerSymbolLine = this.svgShape.path(powerLine).center(cx, cy-12).addTo(centerGroup);
-    this.onPowerSymbolCircle = this.svgShape.path(powerCircle).center(cx, cy).addTo(onCenterGroup);
-    this.onPowerSymbolLine = this.svgShape.path(powerLine).center(cx, cy-12).addTo(onCenterGroup);
+    this.drawOffShape(centerGroup, false);
+    this.drawOnShape(onCenterGroup, false, '', false);
   }
 
   protected drawColorState(mainColor: PowerButtonColor) {
-    this.offPowerSymbolCircle.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
-    this.offPowerSymbolLine.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
-    this.onPowerSymbolCircle.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
-    this.onPowerSymbolLine.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+    this.offCenterColor(mainColor, false);
+    this.onCenterColor(mainColor, false);
   }
 }
 
@@ -996,36 +1137,30 @@ class OutlinedVolumePowerButtonShape extends PowerButtonShape {
   private outerBorderGradient: Gradient;
   private innerBorder: Circle;
   private innerBorderMask: Circle;
-  private offLabelShape: Text;
-  private onCircleShape: Circle;
-  private onLabelShape: Text;
+  protected onCircleShape: Circle;
   private pressedShadow: InnerShadowCircle;
   private pressedTimeline: Timeline;
   private centerGroup: G;
   private onCenterGroup: G;
 
   protected drawOffCenter(centerGroup: G) {
-    this.offLabelShape = this.createOffLabel('800').addTo(centerGroup);
+    this.drawOffShape(centerGroup, true, '800');
   }
 
   protected drawOnCenter() {
-    this.onLabelShape = this.createOnLabel('800');
-  }
-
-  protected addOnCenterToMask(onCircleShape: Circle) {
-    this.createMask(onCircleShape,[this.onLabelShape]);
+    this.drawOnShape(null, true, '800', false, this.onCircleShape);
   }
 
   protected addOnCenterTimeLine(pressedTimeline: Timeline) {
-    this.onLabelShape.timeline(pressedTimeline);
+    this.onCenterTimeLine(pressedTimeline, true);
   }
 
   protected drawOffCenterColor(mainColor: PowerButtonColor) {
-    this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+    this.offCenterColor(mainColor, true);
   }
 
   protected onCenterAnimation(scale: number) {
-    powerButtonAnimation(this.onLabelShape).transform({scale, origin: {x: cx, y: cy}});
+    this.buttonAnimation(scale, true);
   }
 
   protected drawShape() {
@@ -1047,7 +1182,6 @@ class OutlinedVolumePowerButtonShape extends PowerButtonShape {
     this.onCircleShape = this.svgShape.circle(powerButtonShapeSize - 30).center(cx, cy)
     .addTo(this.onCenterGroup);
     this.drawOnCenter();
-    this.addOnCenterToMask(this.onCircleShape);
     this.pressedShadow = new InnerShadowCircle(this.svgShape, powerButtonShapeSize - 30, cx, cy, 0, 0);
     this.backgroundShape.addClass('tb-small-shadow');
 
@@ -1102,37 +1236,24 @@ class OutlinedVolumePowerButtonShape extends PowerButtonShape {
 }
 
 class OutlinedIconPowerButtonShape extends OutlinedVolumePowerButtonShape {
-  private offPowerSymbolCircle: Path;
-  private offPowerSymbolLine: Path;
-  private onPowerSymbolCircle: Path;
-  private onPowerSymbolLine: Path;
 
   protected drawOffCenter(centerGroup: G) {
-    this.offPowerSymbolCircle = this.svgShape.path(powerCircleStroke).center(cx, cy).addTo(centerGroup);
-    this.offPowerSymbolLine = this.svgShape.path(powerLineStroke).center(cx, cy-12).addTo(centerGroup);
+    this.drawOffShape(centerGroup, false, '', true);
   }
 
   protected drawOnCenter() {
-    this.onPowerSymbolCircle = this.svgShape.path(powerCircleStroke).center(cx, cy);
-    this.onPowerSymbolLine = this.svgShape.path(powerLineStroke).center(cx, cy-12);
-  }
-
-  protected addOnCenterToMask(onCircleShape: Circle) {
-    this.createMask(onCircleShape, [this.onPowerSymbolCircle, this.onPowerSymbolLine]);
+    this.drawOnShape(null, false, '', true, this.onCircleShape);
   }
 
   protected addOnCenterTimeLine(pressedTimeline: Timeline) {
-    this.onPowerSymbolCircle.timeline(pressedTimeline);
-    this.onPowerSymbolLine.timeline(pressedTimeline);
+    this.onCenterTimeLine(pressedTimeline, false);
   }
 
   protected drawOffCenterColor(mainColor: PowerButtonColor) {
-    this.offPowerSymbolCircle.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
-    this.offPowerSymbolLine.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity});
+    this.offCenterColor(mainColor, false);
   }
 
   protected onCenterAnimation(scale: number) {
-    powerButtonAnimation(this.onPowerSymbolCircle).transform({scale, origin: {x: cx, y: cy}});
-    powerButtonAnimation(this.onPowerSymbolLine).transform({scale, origin: {x: cx, y: cy}});
+    this.buttonAnimation(scale, false);
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/value-stepper-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/value-stepper-widget.component.html
new file mode 100644
index 0000000000..6ce4387c1a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/value-stepper-widget.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-value-stepper-panel" [style.padding]="padding" [style]="backgroundStyle$ | async">
+  <div class="tb-value-stepper-overlay" [style]="overlayStyle"></div>
+  <ng-container *ngTemplateOutlet="widgetTitlePanel"></ng-container>
+  <div #stepperContent class="tb-value-stepper-content">
+    <div [class.!hidden]="!showLeftButton"
+         #leftButton
+         class="tb-button-shape tb-button-shape-left"
+         [class.tb-button-pointer]="!leftDisabledState && (loading$ | async) === false">
+    </div>
+    <div #valueBoxContainer
+         class="tb-value-stepper-value-box"
+         [class.!hidden]="!showValueBox"
+         [class.tb-value-stepper-value-box-disabled]="(disabledState$ | async) === true">
+      <div #value
+           class="tb-value-stepper-value"
+           [style.color]="(disabledState$ | async) === true ? disabledColor : valueStyleColor"
+           [style]="valueStyle">{{ valueText }}</div>
+    </div>
+    <div [class.!hidden]="!showRightButton"
+         #rightButton
+         class="tb-button-shape tb-button-shape-right"
+         [class.tb-button-pointer]="!rightDisabledState && (loading$ | async) === false">
+    </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/rpc/value-stepper-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/value-stepper-widget.component.scss
new file mode 100644
index 0000000000..0061d793a2
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/value-stepper-widget.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.
+ */
+
+.tb-value-stepper-panel {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  padding: 20px 24px 24px 24px;
+  > div:not(.tb-value-stepper-overlay) {
+    z-index: 1;
+  }
+  .tb-value-stepper-overlay {
+    position: absolute;
+    top: 12px;
+    left: 12px;
+    bottom: 12px;
+    right: 12px;
+  }
+  div.tb-widget-title {
+    padding: 0;
+  }
+  .tb-value-stepper-content {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    min-width: 0;
+    min-height: 0;
+    height: 100%;
+    .tb-value-stepper-value-box {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex: 1;
+      height: 32px;
+      padding: 0 12px;
+      border-radius: 4px;
+      &-disabled {
+        border-color: rgba(0, 0, 0, 0.38);
+      }
+    }
+    .tb-button-shape {
+      width: 32px;
+      height: 32px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      &-left {
+        margin-right: 12px;
+      }
+      &-right {
+        margin-left: 12px;
+      }
+      svg {
+        .tb-small-shadow {
+          filter: drop-shadow(0px 0px 4px rgba(0, 0, 0, 0.2));
+        }
+        .tb-shadow {
+          filter: drop-shadow(0px 0px 10px rgba(0, 0, 0, 0.15));
+        }
+      }
+      &.tb-button-pointer {
+        svg {
+          .tb-hover-circle {
+            cursor: pointer;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/value-stepper-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/value-stepper-widget.component.ts
new file mode 100644
index 0000000000..783e730326
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/value-stepper-widget.component.ts
@@ -0,0 +1,391 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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,
+  DestroyRef,
+  ElementRef,
+  inject,
+  NgZone,
+  OnDestroy,
+  OnInit,
+  Renderer2,
+  ViewChild,
+  ViewEncapsulation
+} from '@angular/core';
+import { BasicActionWidgetComponent, ValueSetter } from '@home/components/widget/lib/action/action-widget.models';
+import { backgroundStyle, ComponentStyle, overlayStyle, textStyle } from '@shared/models/widget-settings.models';
+import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
+import { ImagePipe } from '@shared/pipe/image.pipe';
+import { DomSanitizer } from '@angular/platform-browser';
+import { ValueType } from '@shared/models/constants';
+import {
+  PowerButtonLayout,
+  PowerButtonShape,
+  powerButtonShapeSize,
+  PowerButtonWidgetSettings
+} from '@home/components/widget/lib/rpc/power-button-widget.models';
+import { SVG, Svg } from '@svgdotjs/svg.js';
+import { MatIconRegistry } from '@angular/material/icon';
+import { formatValue, isDefinedAndNotNull, isNumeric } from '@core/utils';
+import {
+  valueStepperDefaultSettings,
+  ValueStepperWidgetSettings
+} from '@home/components/widget/lib/rpc/value-stepper-widget.models';
+import { UtilsService } from '@core/services/utils.service';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-value-stepper-widget',
+  templateUrl: './value-stepper-widget.component.html',
+  styleUrls: ['../action/action-widget.scss', './value-stepper-widget.component.scss'],
+  encapsulation: ViewEncapsulation.None
+})
+export class ValueStepperWidgetComponent extends
+  BasicActionWidgetComponent implements OnInit, AfterViewInit, OnDestroy {
+
+  @ViewChild('leftButton', {static: true})
+  leftButton: ElementRef<HTMLElement>;
+
+  @ViewChild('rightButton', {static: true})
+  rightButton: ElementRef<HTMLElement>;
+
+  @ViewChild('stepperContent', {static: true})
+  stepperContent: ElementRef<HTMLElement>;
+
+  @ViewChild('valueBoxContainer', {static: true})
+  valueBox: ElementRef<HTMLElement>;
+
+  @ViewChild('value', {static: true})
+  valueElement: ElementRef<HTMLElement>;
+
+  settings: ValueStepperWidgetSettings;
+
+  backgroundStyle$: Observable<ComponentStyle>;
+  overlayStyle: ComponentStyle = {};
+  padding: string;
+
+  valueStyle: ComponentStyle = {};
+  valueStyleColor = '';
+  disabledColor = 'rgba(0, 0, 0, 0.38)';
+  value: number = null;
+
+  autoScale = false;
+
+  showValueBox = true;
+  showLeftButton = true;
+  showRightButton = true;
+
+  valueText = 'N/A';
+
+  disabledState$ = new BehaviorSubject(false);
+
+  private prevValue: number = null;
+  private shapeResize$: ResizeObserver;
+  private drawSvgShapePending = false;
+  private svgShapeLeft: Svg;
+  private svgShapeRight: Svg;
+  private powerButtonSvgShapeLeft: PowerButtonShape;
+  private powerButtonSvgShapeRight: PowerButtonShape;
+
+  private disabledState = false;
+  public leftDisabledState = false;
+  public rightDisabledState = false;
+
+  private valueSetterLeft: ValueSetter<number>;
+  private valueSetterRight: ValueSetter<number>;
+
+  private leftDisabledState$ = new BehaviorSubject(false);
+  private rightDisabledState$ = new BehaviorSubject(false);
+
+  protected destroyRef = inject(DestroyRef);
+
+  constructor(protected imagePipe: ImagePipe,
+              protected sanitizer: DomSanitizer,
+              private renderer: Renderer2,
+              private iconRegistry: MatIconRegistry,
+              private utils: UtilsService,
+              private elementRef: ElementRef,
+              protected cd: ChangeDetectorRef,
+              protected zone: NgZone) {
+    super(cd);
+  }
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.settings = {...valueStepperDefaultSettings, ...this.ctx.settings};
+
+    this.autoScale = this.settings.appearance.autoScale;
+
+    this.backgroundStyle$ = backgroundStyle(this.settings.background, this.imagePipe, this.sanitizer);
+    this.overlayStyle = overlayStyle(this.settings.background.overlay);
+    this.padding = this.settings.background.overlay.enabled ? undefined : this.settings.padding;
+
+    this.showValueBox = this.settings.appearance.showValueBox;
+    this.showLeftButton = this.settings.buttonAppearance.leftButton.showButton;
+    this.showRightButton = this.settings.buttonAppearance.rightButton.showButton;
+    this.valueStyle = textStyle(this.settings.appearance.valueFont);
+    this.valueStyleColor = this.settings.appearance.valueColor;
+
+    if (this.showValueBox) {
+      const valueBoxCss = `.tb-value-stepper-value-box {\n`+
+        `border: ${this.settings.appearance.showBorder ?
+          `${this.settings.appearance.borderWidth}px solid ${this.settings.appearance.borderColor}` :
+          'none'};\n`+
+        `background-color: ${this.settings.appearance.valueBoxBackground}` +
+        `}`;
+      this.utils.applyCssToElement(this.renderer, this.elementRef.nativeElement, 'tb-value-stepper-value-box', valueBoxCss);
+    }
+
+    const getInitialStateSettings =
+      {...this.settings.initialState, actionLabel: this.ctx.translate.instant('widgets.slider.initial-value')};
+    this.createValueGetter(getInitialStateSettings, ValueType.INTEGER, {
+      next: (value) => this.onValue(value)
+    });
+    const disabledStateSettings =
+      {...this.settings.disabledState, actionLabel: this.ctx.translate.instant('widgets.rpc-state.disabled-state')};
+    this.createValueGetter(disabledStateSettings, ValueType.BOOLEAN, {
+      next: (value) => this.disabledState$.next(value)
+    });
+
+    const leftButtonClick = {...this.settings.leftButtonClick,
+      actionLabel: this.ctx.translate.instant('widgets.slider.on-value-change')};
+    this.valueSetterLeft = this.createValueSetter(leftButtonClick);
+
+    const rightButtonClick = {...this.settings.rightButtonClick,
+      actionLabel: this.ctx.translate.instant('widgets.slider.on-value-change')};
+    this.valueSetterRight = this.createValueSetter(rightButtonClick);
+
+    combineLatest([
+      this.loading$,
+      this.disabledState$.asObservable(),
+      this.leftDisabledState$.asObservable()
+    ]).pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(value => {
+      const state = value.includes(true);
+      this.updateLeftDisabledState(state)
+    });
+
+    combineLatest([
+      this.loading$,
+      this.disabledState$.asObservable(),
+      this.rightDisabledState$.asObservable()
+    ]).pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(value => {
+      const state = value.includes(true);
+      this.updateRightDisabledState(state)
+    });
+  }
+
+  ngAfterViewInit(): void {
+    if (this.drawSvgShapePending) {
+      this.drawSvg();
+    }
+    super.ngAfterViewInit();
+  }
+
+  ngOnDestroy() {
+    if (this.shapeResize$) {
+      this.shapeResize$.disconnect();
+    }
+    super.ngOnDestroy();
+  }
+
+  public onInit() {
+    super.onInit();
+    const borderRadius = this.ctx.$widgetElement.css('borderRadius');
+    this.overlayStyle = {...this.overlayStyle, ...{borderRadius}};
+    if (this.leftButton || this.rightButton) {
+      this.drawSvg();
+    } else {
+      this.drawSvgShapePending = true;
+    }
+    this.cd.detectChanges();
+  }
+
+  private onValue(value: number): void {
+    this.value = value;
+    this.prevValue = value;
+    if ((this.value + this.settings.appearance.valueStep) > this.settings.appearance.maxValueRange) {
+      this.rightDisabledState$.next(true);
+    } else {
+      this.rightDisabledState$.next(false);
+    }
+    if ((this.value - this.settings.appearance.valueStep) < this.settings.appearance.minValueRange) {
+      this.leftDisabledState$.next(true);
+    } else {
+      this.leftDisabledState$.next(false);
+    }
+    this.updateValueText();
+    this.cd.markForCheck();
+  }
+
+  private updateValueText() {
+    if (isDefinedAndNotNull(this.value) && isNumeric(this.value)) {
+      this.valueText = formatValue(this.value, this.settings.appearance.valueDecimals, this.settings.appearance.valueUnits, false);
+    } else {
+      this.valueText = 'N/A';
+    }
+  }
+
+  private onClick(rightButtonClick: boolean = false) {
+    this.updateValueText();
+    if (!this.ctx.isEdit && !this.ctx.isPreview && !this.disabledState) {
+      const prevValue = this.prevValue;
+      const targetValue = rightButtonClick ?
+        (this.value + this.settings.appearance.valueStep) :
+        (this.value - this.settings.appearance.valueStep);
+      this.updateValue(rightButtonClick ? this.valueSetterRight : this.valueSetterLeft, targetValue, {
+        next: () => this.onValue(targetValue),
+        error: () => this.onValue(prevValue)
+      });
+    }
+  }
+
+  private drawSvg() {
+    let leftButtonSetting: PowerButtonWidgetSettings;
+    let rightButtonSetting: PowerButtonWidgetSettings;
+    if (this.showLeftButton) {
+      this.svgShapeLeft = SVG().addTo(this.leftButton.nativeElement).size(powerButtonShapeSize, powerButtonShapeSize);
+      this.renderer.setStyle(this.svgShapeLeft.node, 'overflow', 'visible');
+      this.renderer.setStyle(this.svgShapeLeft.node, 'user-select', 'none');
+      leftButtonSetting = {
+        layout: PowerButtonLayout[this.settings.appearance.type],
+        onButtonIcon: {
+          showIcon: true,
+          icon: this.settings.buttonAppearance.leftButton.icon,
+          iconSize: this.settings.buttonAppearance.leftButton.iconSize * 1.7,
+          iconSizeUnit: this.settings.buttonAppearance.leftButton.iconSizeUnit
+        },
+        offButtonIcon: {
+          showIcon: true,
+          icon: this.settings.buttonAppearance.leftButton.icon,
+          iconSize: this.settings.buttonAppearance.leftButton.iconSize * 1.7,
+          iconSizeUnit: this.settings.buttonAppearance.leftButton.iconSizeUnit
+        },
+        mainColorOn: this.settings.buttonAppearance.leftButton.mainColorOn,
+        backgroundColorOn: this.settings.buttonAppearance.leftButton.backgroundColorOn,
+        mainColorOff: this.settings.buttonAppearance.leftButton.mainColorOff,
+        backgroundColorOff: this.settings.buttonAppearance.leftButton.backgroundColorOff,
+        mainColorDisabled: this.settings.buttonAppearance.leftButton.mainColorDisabled,
+        backgroundColorDisabled: this.settings.buttonAppearance.leftButton.backgroundColorDisabled
+      };
+    }
+    if (this.showRightButton) {
+      this.svgShapeRight = SVG().addTo(this.rightButton.nativeElement).size(powerButtonShapeSize, powerButtonShapeSize);
+      this.renderer.setStyle(this.svgShapeRight.node, 'overflow', 'visible');
+      this.renderer.setStyle(this.svgShapeRight.node, 'user-select', 'none');
+
+      rightButtonSetting = {
+        layout: PowerButtonLayout[this.settings.appearance.type],
+        onButtonIcon: {
+          showIcon: true,
+          icon: this.settings.buttonAppearance.rightButton.icon,
+          iconSize: this.settings.buttonAppearance.rightButton.iconSize * 1.7,
+          iconSizeUnit: this.settings.buttonAppearance.rightButton.iconSizeUnit
+        },
+        offButtonIcon: {
+          showIcon: true,
+          icon: this.settings.buttonAppearance.rightButton.icon,
+          iconSize: this.settings.buttonAppearance.rightButton.iconSize * 1.7,
+          iconSizeUnit: this.settings.buttonAppearance.rightButton.iconSizeUnit
+        },
+        mainColorOn: this.settings.buttonAppearance.rightButton.mainColorOn,
+        backgroundColorOn: this.settings.buttonAppearance.rightButton.backgroundColorOn,
+        mainColorOff: this.settings.buttonAppearance.rightButton.mainColorOff,
+        backgroundColorOff: this.settings.buttonAppearance.rightButton.backgroundColorOff,
+        mainColorDisabled: this.settings.buttonAppearance.rightButton.mainColorDisabled,
+        backgroundColorDisabled: this.settings.buttonAppearance.rightButton.backgroundColorDisabled
+      };
+    }
+
+    this.zone.run(() => {
+      if (this.showLeftButton) {
+        this.powerButtonSvgShapeLeft = PowerButtonShape.fromSettings(this.ctx, this.svgShapeLeft, this.iconRegistry,
+          leftButtonSetting , true, this.leftDisabledState, () => this.onClick());
+      }
+      if (this.showRightButton) {
+        this.powerButtonSvgShapeRight = PowerButtonShape.fromSettings(this.ctx, this.svgShapeRight, this.iconRegistry,
+          rightButtonSetting,  true, this.rightDisabledState, () => this.onClick(true));
+      }
+    });
+
+    this.shapeResize$ = new ResizeObserver(() => {
+      this.onResize();
+    });
+    if (this.autoScale) {
+      this.shapeResize$.observe(this.stepperContent.nativeElement);
+    }
+    if (this.showLeftButton) {
+      this.shapeResize$.observe(this.leftButton.nativeElement);
+    }
+    if (this.showRightButton) {
+      this.shapeResize$.observe(this.rightButton.nativeElement);
+    }
+    this.onResize();
+  }
+
+  private updateLeftDisabledState(disabled: boolean) {
+    this.leftDisabledState = disabled;
+    this.powerButtonSvgShapeLeft?.setDisabled(this.leftDisabledState);
+    this.cd.markForCheck();
+  }
+
+
+  private updateRightDisabledState(disabled: boolean) {
+    this.rightDisabledState = disabled;
+    this.powerButtonSvgShapeRight?.setDisabled(this.rightDisabledState);
+    this.cd.markForCheck();
+  }
+
+  private onResize() {
+    const panelWidth = this.stepperContent.nativeElement.getBoundingClientRect().width;
+    const panelHeight = this.stepperContent.nativeElement.getBoundingClientRect().height;
+
+    const minAspect = 0.2;
+    const avgContentHeight = 32;
+    const targetHeight = panelWidth * Math.min(panelHeight / panelWidth, minAspect);
+    const multiplier = targetHeight / avgContentHeight;
+    const size = avgContentHeight * multiplier;
+
+    if (this.showValueBox) {
+      this.renderer.setStyle(this.valueBox?.nativeElement, 'height', `${size}px`);
+      this.renderer.setStyle(this.valueElement?.nativeElement, 'font-size', `${this.settings.appearance.valueFont.size * multiplier}px`);
+    }
+    if (this.showLeftButton) {
+      this.renderer.setStyle(this.leftButton?.nativeElement, 'width', `${size}px`);
+      this.renderer.setStyle(this.leftButton?.nativeElement, 'height', `${size}px`);
+    }
+    if (this.showRightButton) {
+      this.renderer.setStyle(this.rightButton?.nativeElement, 'width', `${size}px`);
+      this.renderer.setStyle(this.rightButton?.nativeElement, 'height', `${size}px`);
+    }
+    if (size) {
+      const scale = size / powerButtonShapeSize;
+      if (this.showLeftButton) {
+        this.renderer.setStyle(this.svgShapeLeft?.node, 'transform', `scale(${scale})`);
+      }
+      if (this.showRightButton) {
+        this.renderer.setStyle(this.svgShapeRight?.node, 'transform', `scale(${scale})`);
+      }
+    }
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/value-stepper-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/value-stepper-widget.models.ts
new file mode 100644
index 0000000000..9ec5ff5d65
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/value-stepper-widget.models.ts
@@ -0,0 +1,252 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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,
+  SetValueAction,
+  SetValueSettings,
+  ValueToDataType
+} from '@shared/models/action-widget-settings.models';
+import { WidgetButtonCustomStyles } from '@shared/components/button/widget-button.models';
+import { BackgroundSettings, BackgroundType, cssUnit, Font } from '@shared/models/widget-settings.models';
+import { AttributeScope } from '@shared/models/telemetry/telemetry.models';
+
+const defaultMainColor = '#305680';
+
+export enum ValueStepperType {
+  simplified = 'simplified',
+  default = 'default',
+  default_volume = 'default_volume'
+}
+
+export const valueStepperTypes = Object.keys(ValueStepperType) as ValueStepperType[];
+
+export const valueStepperTypeTranslations = new Map<ValueStepperType, string>(
+  [
+    [ValueStepperType.simplified, 'widgets.value-stepper.simplified'],
+    [ValueStepperType.default, 'widgets.value-stepper.filled'],
+    [ValueStepperType.default_volume, 'widgets.value-stepper.volume']
+  ]
+);
+
+export const valueStepperTypeImages = new Map<ValueStepperType, string>(
+  [
+    [ValueStepperType.simplified, 'assets/widget/value-stepper/simplified.svg'],
+    [ValueStepperType.default, 'assets/widget/value-stepper/filled.svg'],
+    [ValueStepperType.default_volume, 'assets/widget/value-stepper/volume.svg']
+  ]
+);
+
+export interface ValueStepperWidgetSettings {
+  initialState: GetValueSettings<number>;
+  leftButtonClick: SetValueSettings;
+  rightButtonClick: SetValueSettings;
+  disabledState: GetValueSettings<boolean>;
+
+  appearance: ValueStepperAppearance;
+  buttonAppearance: {
+    leftButton: ValueStepperButtonAppearance;
+    rightButton: ValueStepperButtonAppearance;
+  }
+
+  background: BackgroundSettings;
+  padding: string;
+}
+
+export interface ValueStepperAppearance {
+  type: ValueStepperType;
+  autoScale: boolean;
+  minValueRange: number;
+  maxValueRange: number;
+  valueStep: number;
+  showValueBox: boolean;
+  valueUnits: string;
+  valueDecimals: number;
+  valueFont: Font;
+  valueColor: string;
+  valueBoxBackground: string;
+  showBorder: boolean;
+  borderWidth: number;
+  borderColor: string;
+}
+
+export interface ValueStepperButtonAppearance {
+  showButton: boolean;
+  icon: string;
+  iconSize: number;
+  iconSizeUnit: cssUnit;
+  mainColorOn: string;
+  backgroundColorOn: string;
+  mainColorOff: string;
+  backgroundColorOff: string;
+  mainColorDisabled: string;
+  backgroundColorDisabled: string;
+  customStyle: WidgetButtonCustomStyles;
+}
+
+export const valueStepperDefaultAppearance: ValueStepperAppearance = {
+  type: ValueStepperType.simplified,
+  autoScale: true,
+  minValueRange: -100,
+  maxValueRange: 100,
+  valueStep: 0.5,
+  showValueBox: true,
+  valueUnits: '',
+  valueDecimals: 1,
+  valueFont: {
+    family: 'Roboto',
+    weight: '500',
+    style: 'normal',
+    size: 16,
+    sizeUnit: 'px',
+    lineHeight: '24px'
+  },
+  valueColor: '#000',
+  valueBoxBackground: 'rgba(0, 0, 0, 0.12)',
+  showBorder: true,
+  borderWidth: 1,
+  borderColor: defaultMainColor
+}
+
+export const valueStepperButtonDefaultAppearance: ValueStepperButtonAppearance = {
+  showButton: true,
+  icon: '',
+  iconSize: 24,
+  iconSizeUnit: 'px',
+
+  mainColorOn: '#3F52DD',
+  backgroundColorOn: '#FFFFFF',
+  mainColorOff: '#A2A2A2',
+  backgroundColorOff: '#FFFFFF',
+  mainColorDisabled: 'rgba(0,0,0,0.12)',
+  backgroundColorDisabled: '#FFFFFF',
+  customStyle: {
+    enabled: null,
+    hovered: null,
+    pressed: null,
+    activated: null,
+    disabled: null
+  }
+}
+
+export const valueStepperDefaultSettings: ValueStepperWidgetSettings = {
+  initialState: {
+    action: GetValueAction.EXECUTE_RPC,
+    defaultValue: 0,
+    executeRpc: {
+      method: 'getState',
+      requestTimeout: 5000,
+      requestPersistent: false,
+      persistentPollingInterval: 1000
+    },
+    getAttribute: {
+      key: 'state',
+      scope: null
+    },
+    getTimeSeries: {
+      key: 'state'
+    },
+    getAlarmStatus: {
+      severityList: null,
+      typeList: null
+    },
+    dataToValue: {
+      type: DataToValueType.NONE,
+      compareToValue: true,
+      dataToValueFunction: '/* Should return integer value */\nreturn data;'
+    }
+  },
+  disabledState: {
+    action: GetValueAction.DO_NOTHING,
+    defaultValue: false,
+    getAttribute: {
+      key: 'state',
+      scope: null
+    },
+    getTimeSeries: {
+      key: 'state'
+    },
+    getAlarmStatus: {
+      severityList: null,
+      typeList: null
+    },
+    dataToValue: {
+      type: DataToValueType.NONE,
+      compareToValue: true,
+      dataToValueFunction: '/* Should return boolean value */\nreturn data;'
+    }
+  },
+  leftButtonClick: {
+    action: SetValueAction.EXECUTE_RPC,
+    executeRpc: {
+      method: 'setState',
+      requestTimeout: 5000,
+      requestPersistent: false,
+      persistentPollingInterval: 1000
+    },
+    setAttribute: {
+      key: 'state',
+      scope: AttributeScope.SERVER_SCOPE
+    },
+    putTimeSeries: {
+      key: 'state'
+    },
+    valueToData: {
+      type: ValueToDataType.VALUE,
+      constantValue: 0,
+      valueToDataFunction: '/* Convert input integer value to RPC parameters or attribute/time-series value */\nreturn value;'
+    }
+  },
+  rightButtonClick: {
+    action: SetValueAction.EXECUTE_RPC,
+    executeRpc: {
+      method: 'setState',
+      requestTimeout: 5000,
+      requestPersistent: false,
+      persistentPollingInterval: 1000
+    },
+    setAttribute: {
+      key: 'state',
+      scope: AttributeScope.SERVER_SCOPE
+    },
+    putTimeSeries: {
+      key: 'state'
+    },
+    valueToData: {
+      type: ValueToDataType.VALUE,
+      constantValue: 0,
+      valueToDataFunction: '/* Convert input integer value to RPC parameters or attribute/time-series value */\nreturn value;'
+    }
+  },
+  appearance: valueStepperDefaultAppearance,
+  buttonAppearance: {
+    leftButton: {...valueStepperButtonDefaultAppearance, icon: 'arrow_back_ios_new'},
+    rightButton: {...valueStepperButtonDefaultAppearance, icon: 'arrow_forward_ios'}
+  },
+  background: {
+    type: BackgroundType.color,
+    color: '#fff',
+    overlay: {
+      enabled: false,
+      color: 'rgba(255,255,255,0.72)',
+      blur: 3
+    }
+  },
+  padding: '12px'
+};
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/scada/scada-symbol.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/scada/scada-symbol.models.ts
index f01ffa3883..81bb27ab3c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/scada/scada-symbol.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/scada/scada-symbol.models.ts
@@ -66,6 +66,12 @@ import { catchError, map, take, takeUntil } from 'rxjs/operators';
 import { isSvgIcon, splitIconName } from '@shared/models/icon.models';
 import { MatIconRegistry } from '@angular/material/icon';
 import { RafService } from '@core/services/raf.service';
+import {
+  defaultFormPropertyValue,
+  defaultPropertyValue,
+  FormProperty,
+  FormPropertyType
+} from '@shared/models/dynamic-form.models';
 
 export interface ScadaSymbolApi {
   generateElementId: () => string;
@@ -152,60 +158,6 @@ export interface ScadaSymbolBehaviorAction extends ScadaSymbolBehaviorBase {
 
 export type ScadaSymbolBehavior = ScadaSymbolBehaviorValue & ScadaSymbolBehaviorAction;
 
-export enum ScadaSymbolPropertyType {
-  text = 'text',
-  number = 'number',
-  switch = 'switch',
-  color = 'color',
-  color_settings = 'color_settings',
-  font = 'font',
-  units = 'units',
-  icon = 'icon'
-}
-
-export const scadaSymbolPropertyTypes = Object.keys(ScadaSymbolPropertyType) as ScadaSymbolPropertyType[];
-
-export const scadaSymbolPropertyTypeTranslations = new Map<ScadaSymbolPropertyType, string>(
-  [
-    [ScadaSymbolPropertyType.text, 'scada.property.type-text'],
-    [ScadaSymbolPropertyType.number, 'scada.property.type-number'],
-    [ScadaSymbolPropertyType.switch, 'scada.property.type-switch'],
-    [ScadaSymbolPropertyType.color, 'scada.property.type-color'],
-    [ScadaSymbolPropertyType.color_settings, 'scada.property.type-color-settings'],
-    [ScadaSymbolPropertyType.font, 'scada.property.type-font'],
-    [ScadaSymbolPropertyType.units, 'scada.property.type-units'],
-    [ScadaSymbolPropertyType.icon, 'scada.property.type-icon']
-  ]
-);
-
-export const scadaSymbolPropertyRowClasses =
-  ['column', 'column-xs', 'column-lt-md', 'align-start', 'no-border', 'no-gap', 'no-padding', 'same-padding'];
-
-export const scadaSymbolPropertyFieldClasses =
-  ['medium-width', 'flex', 'flex-xs', 'flex-lt-md'];
-
-export interface ScadaSymbolPropertyBase {
-  id: string;
-  name: string;
-  type: ScadaSymbolPropertyType;
-  default: any;
-  required?: boolean;
-  subLabel?: string;
-  divider?: boolean;
-  fieldSuffix?: string;
-  disableOnProperty?: string;
-  rowClass?: string;
-  fieldClass?: string;
-}
-
-export interface ScadaSymbolNumberProperty extends ScadaSymbolPropertyBase {
-  min?: number;
-  max?: number;
-  step?: number;
-}
-
-export type ScadaSymbolProperty = ScadaSymbolPropertyBase & ScadaSymbolNumberProperty;
-
 export interface ScadaSymbolMetadata {
   title: string;
   description?: string;
@@ -216,7 +168,7 @@ export interface ScadaSymbolMetadata {
   stateRender?: ScadaSymbolStateRenderFunction;
   tags: ScadaSymbolTag[];
   behavior: ScadaSymbolBehavior[];
-  properties: ScadaSymbolProperty[];
+  properties: FormProperty[];
 }
 
 export const emptyMetadata = (width?: number, height?: number): ScadaSymbolMetadata => ({
@@ -508,7 +460,7 @@ export const defaultScadaSymbolObjectSettings = (metadata: ScadaSymbolMetadata):
     }
   }
   for (const property of metadata.properties) {
-    settings.properties[property.id] = property.default;
+    settings.properties[property.id] = defaultFormPropertyValue(property);
   }
   return settings;
 };
@@ -684,7 +636,9 @@ export class ScadaSymbolObject {
       elements.push(element);
     }
     for (const property of this.metadata.properties) {
-      this.context.properties[property.id] = this.getPropertyValue(property.id);
+      if (property.type !== FormPropertyType.htmlSection) {
+        this.context.properties[property.id] = this.getPropertyValue(this.metadata.properties, this.settings.properties, property.id);
+      }
     }
     for (const tag of this.metadata.tags) {
       if (tag.actions) {
@@ -1021,39 +975,107 @@ export class ScadaSymbolObject {
     return Array.isArray(element) ? element : [element];
   }
 
-  private getProperty(id: string): ScadaSymbolProperty {
-    return this.metadata.properties.find(p => p.id === id);
+  private getProperty(properties: FormProperty[], ...ids: string[]): FormProperty {
+    let found: FormProperty;
+    for (const id of ids) {
+      if (properties) {
+        found = properties.find(p => p.id === id);
+        if (found && found.type === FormPropertyType.fieldset) {
+          properties = found.properties;
+        } else {
+          properties = null;
+        }
+      } else {
+        found = null;
+      }
+    }
+    return found;
   }
 
-  private getPropertyValue(id: string): any {
-    const property = this.getProperty(id);
-    if (property) {
-      const value = this.settings.properties[id];
-      if (isDefinedAndNotNull(value)) {
-        if (property.type === ScadaSymbolPropertyType.color_settings) {
-          return ColorProcessor.fromSettings(value);
-        } else if (property.type === ScadaSymbolPropertyType.text) {
-          const result =  this.ctx.utilsService.customTranslation(value, value);
-          const entityInfo = this.ctx.defaultSubscription.getFirstEntityInfo();
-          return createLabelFromSubscriptionEntityInfo(entityInfo, result);
+  private getSettingsValue(settings: {[id: string]: any}, ...ids: string[]): any {
+    let found: any;
+    let properties = settings;
+    for (const id of ids) {
+      if (properties) {
+        found = properties[id];
+        if (found && typeof found === 'object') {
+          properties = found;
+        } else {
+          properties = null;
         }
-        return value;
       } else {
-        switch (property.type) {
-          case ScadaSymbolPropertyType.text:
-            return '';
-          case ScadaSymbolPropertyType.number:
-            return 0;
-          case ScadaSymbolPropertyType.color:
-            return '#000';
-          case ScadaSymbolPropertyType.color_settings:
-            return ColorProcessor.fromSettings(constantColor('#000'));
+        found = null;
+      }
+    }
+    return found;
+  }
+
+  private getPropertyValue(properties: FormProperty[], settings: {[id: string]: any}, ...ids: string[]): any {
+    const property = this.getProperty(properties, ...ids);
+    if (property) {
+      if (property.type === FormPropertyType.array) {
+        const arrayValue = [];
+        if (property.arrayItemType !== FormPropertyType.htmlSection) {
+          const settingsValue = this.getSettingsValue(settings, ...ids);
+          if (settingsValue && Array.isArray(settingsValue)) {
+            for (const settingsElement of settingsValue) {
+              let value: any;
+              if (property.arrayItemType === FormPropertyType.fieldset) {
+                const propertyValue: {[id: string]: any} = {};
+                for (const childProperty of property.properties) {
+                  if (childProperty.type !== FormPropertyType.htmlSection) {
+                    propertyValue[childProperty.id] = this.getPropertyValue(property.properties, settingsElement, childProperty.id);
+                  }
+                }
+                value = propertyValue;
+              } else {
+                value = this.convertPropertyValue(property, settingsElement);
+              }
+              arrayValue.push(value);
+            }
+          }
+        }
+        return arrayValue;
+      } else if (property.type === FormPropertyType.fieldset) {
+        const propertyValue: {[id: string]: any} = {};
+        for (const childProperty of property.properties) {
+          if (childProperty.type !== FormPropertyType.htmlSection) {
+            propertyValue[childProperty.id] = this.getPropertyValue(properties, settings, ...ids, childProperty.id);
+          }
         }
+        return propertyValue;
+      } else {
+        const value = this.getSettingsValue(settings, ...ids);
+        return this.convertPropertyValue(property, value);
       }
     } else {
       return '';
     }
   }
+
+  private convertPropertyValue(property: FormProperty, value: any): any {
+    if (isDefinedAndNotNull(value)) {
+      if (property.type === FormPropertyType.color_settings) {
+        return ColorProcessor.fromSettings(value);
+      } else if ([FormPropertyType.text, FormPropertyType.textarea].includes(property.type)) {
+        const result = this.ctx.utilsService.customTranslation(value, value);
+        const entityInfo = this.ctx.defaultSubscription.getFirstEntityInfo();
+        return createLabelFromSubscriptionEntityInfo(entityInfo, result);
+      }
+      return value;
+    } else {
+      switch (property.type) {
+        case FormPropertyType.color_settings:
+          return ColorProcessor.fromSettings(constantColor('#000'));
+        case FormPropertyType.font:
+        case FormPropertyType.units:
+        case FormPropertyType.icon:
+          return null;
+        default:
+          return defaultPropertyValue(property.type);
+      }
+    }
+  }
 }
 
 const scadaSymbolAnimationId = 'scadaSymbolAnimation';
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/get-value-action-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/get-value-action-settings-panel.component.html
index cb6cd5cbe0..9c9f45173d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/get-value-action-settings-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/get-value-action-settings-panel.component.html
@@ -131,7 +131,9 @@
           class="tb-form-panel stroked" formGroupName="dataToValue">
       <div class="tb-form-row no-padding no-border column-xs">
         <div class="fixed-title-width" translate>widgets.value-action.action-result-converter</div>
-        <tb-toggle-select class="flex-1" formControlName="type">
+        <tb-toggle-select formControlName="type"
+                          class="flex-1"
+                          [class.invisible]="getValueSettingsFormGroup.get('action').value === getValueAction.GET_DASHBOARD_STATE_OBJECT">
           <tb-toggle-option [value]="dataToValueType.NONE">{{ 'widgets.value-action.converter-none' | translate }}</tb-toggle-option>
           <tb-toggle-option [value]="dataToValueType.FUNCTION">{{ 'widgets.value-action.converter-function' | translate }}</tb-toggle-option>
         </tb-toggle-select>
@@ -143,7 +145,7 @@
                   [globalVariables]="functionScopeVariables"
                   [functionArgs]="['data']"
                   functionTitle="{{ 'widgets.value-action.parse-value-function' | translate }}"
-                  helpId="widget/lib/rpc/parse_value_fn">
+                  [helpId]="getParseValueFunctionHelpId()">
       </tb-js-func>
       <div *ngIf="valueType === ValueType.BOOLEAN" class="tb-form-row align-start no-gap column-xs">
         <div class="fixed-title-width fixed-title-height">{{ 'widgets.value-action.state-when-result-is' | translate:{state: stateLabel} }}</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/get-value-action-settings-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/get-value-action-settings-panel.component.ts
index a4339b7e12..9b8b86e626 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/get-value-action-settings-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/get-value-action-settings-panel.component.ts
@@ -99,6 +99,8 @@ export class GetValueActionSettingsPanelComponent extends PageComponent implemen
 
   getValueSettingsFormGroup: UntypedFormGroup;
 
+  entityType = EntityType;
+
   alarmSeverities = Object.keys(AlarmSeverity) as AlarmSeverity[];
   alarmSeverityTranslationMap = alarmSeverityTranslations;
 
@@ -165,9 +167,17 @@ export class GetValueActionSettingsPanelComponent extends PageComponent implemen
     this.getValueSettingsApplied.emit(getValueSettings);
   }
 
+  getParseValueFunctionHelpId(): string {
+    const action: GetValueAction = this.getValueSettingsFormGroup.get('action').value;
+    if (action === GetValueAction.GET_DASHBOARD_STATE_OBJECT) {
+      return 'widget/config/parse_value_get_dashboard_state_object_fn';
+    }
+    return 'widget/lib/rpc/parse_value_fn';
+  }
+
   private updateValidators() {
     const action: GetValueAction = this.getValueSettingsFormGroup.get('action').value;
-    const dataToValueType: DataToValueType = this.getValueSettingsFormGroup.get('dataToValue').get('type').value;
+    let dataToValueType: DataToValueType = this.getValueSettingsFormGroup.get('dataToValue').get('type').value;
 
     this.getValueSettingsFormGroup.get('defaultValue').disable({emitEvent: false});
     this.getValueSettingsFormGroup.get('executeRpc').disable({emitEvent: false});
@@ -196,6 +206,10 @@ export class GetValueActionSettingsPanelComponent extends PageComponent implemen
       case GetValueAction.GET_ALARM_STATUS:
         this.getValueSettingsFormGroup.get('getAlarmStatus').enable({emitEvent: false});
         break;
+      case GetValueAction.GET_DASHBOARD_STATE_OBJECT:
+        this.getValueSettingsFormGroup.get('dataToValue.type').setValue(DataToValueType.FUNCTION, {emitEvent: false});
+        dataToValueType = DataToValueType.FUNCTION;
+        break
     }
     if (action === GetValueAction.DO_NOTHING || action === GetValueAction.GET_ALARM_STATUS) {
       this.getValueSettingsFormGroup.get('dataToValue').disable({emitEvent: false});
@@ -208,6 +222,4 @@ export class GetValueActionSettingsPanelComponent extends PageComponent implemen
       }
     }
   }
-
-  protected readonly entityType = EntityType;
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/get-value-action-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/get-value-action-settings.component.ts
index 871923e5b7..5e2661df59 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/get-value-action-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/get-value-action-settings.component.ts
@@ -191,6 +191,14 @@ export class GetValueActionSettingsComponent implements OnInit, ControlValueAcce
           this.displayValue = this.translate.instant('widgets.value-action.get-dashboard-state-text');
         }
         break;
+      case GetValueAction.GET_DASHBOARD_STATE_OBJECT:
+        if (this.valueType === ValueType.BOOLEAN) {
+          const state = this.modelValue.dataToValue?.compareToValue;
+          this.displayValue = this.translate.instant('widgets.value-action.when-dashboard-state-object-function-is-text', {state});
+        } else {
+          this.displayValue = this.translate.instant('widgets.value-action.get-dashboard-state-object-text');
+        }
+        break;
     }
     this.cd.markForCheck();
   }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-array.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-array.component.html
new file mode 100644
index 0000000000..b15964a5af
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-array.component.html
@@ -0,0 +1,74 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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-dynamic-form-array tb-form-panel stroked" [class.no-padding-right]="!disabled || !propertiesFormArray().controls.length">
+  <mat-expansion-panel class="tb-settings" expanded>
+    <mat-expansion-panel-header class="flex flex-row flex-wrap">
+      <mat-panel-title>
+        <div class="tb-form-panel-title">{{ title }}</div>
+      </mat-panel-title>
+    </mat-expansion-panel-header>
+    <ng-template matExpansionPanelContent>
+      <div *ngIf="propertiesFormArray().controls.length; else noProperties" class="tb-dynamic-form-array-body tb-drop-list"
+           cdkDropList cdkDropListOrientation="vertical"
+           [cdkDropListDisabled]="!dragEnabled"
+           (cdkDropListDropped)="propertyDrop($event)">
+        <div cdkDrag [cdkDragDisabled]="!dragEnabled"
+             class="tb-draggable tb-dynamic-form-array-row"
+             *ngFor="let propertyControl of propertiesFormArray().controls; trackBy: trackByProperty; let $index = index;">
+          <div class="tb-dynamic-form-item-index-container">
+            <div class="tb-dynamic-form-item-index">{{$index + 1}}</div>
+          </div>
+          <tb-dynamic-form class="flex-1"
+                           [properties]="[itemProperty]"
+                           [formControl]="propertyControl"
+                           isArrayItem noPadding noBorder>
+          </tb-dynamic-form>
+          <div class="tb-dynamic-form-array-buttons">
+            <button mat-icon-button
+                    *ngIf="!disabled"
+                    type="button"
+                    (click)="removeProperty($index)"
+                    matTooltip="{{ 'action.delete' | translate }}"
+                    matTooltipPosition="above">
+              <mat-icon>delete</mat-icon>
+            </button>
+            <button mat-icon-button
+                    *ngIf="!disabled"
+                    type="button"
+                    cdkDragHandle
+                    [class.tb-hidden]="!dragEnabled"
+                    matTooltip="{{ 'action.drag' | translate }}"
+                    matTooltipPosition="above">
+              <mat-icon>drag_indicator</mat-icon>
+            </button>
+          </div>
+        </div>
+      </div>
+      <div *ngIf="!disabled || !propertiesFormArray().controls.length" [class.invisible]="disabled">
+        <button type="button" mat-stroked-button color="primary" (click)="addProperty()">
+          <mat-icon>add</mat-icon>
+          {{ 'action.add' | translate }}
+        </button>
+      </div>
+    </ng-template>
+  </mat-expansion-panel>
+</div>
+
+<ng-template #noProperties>
+  <span class="tb-prompt flex items-center justify-center">{{ 'dynamic-form.property.no-items' | translate }}</span>
+</ng-template>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-array.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-array.component.scss
new file mode 100644
index 0000000000..1935e29a26
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-array.component.scss
@@ -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.
+ */
+@import "../../../../../../../../../scss/constants";
+
+.tb-dynamic-form-array {
+  .tb-dynamic-form-array-body {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+  }
+}
+.tb-dynamic-form-array-row {
+  background: #fff;
+  display: flex;
+  flex-direction: row;
+  place-content: center flex-start;
+  align-items: flex-start;
+  .tb-dynamic-form-item-index-container {
+    width: 36px;
+    height: 56px;
+    display: flex;
+    flex-direction: row;
+    place-content: flex-start;
+    align-items: center;
+    .tb-dynamic-form-item-index {
+      width: 24px;
+      height: 24px;
+      position: relative;
+      font-weight: 400;
+      font-size: 16px;
+      display: flex;
+      align-items: center;
+      place-content: center;
+      color: $tb-primary-color;
+      &:before {
+        content: "";
+        display: block;
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        left: 0;
+        top: 0;
+        background-color: $tb-primary-color;
+        opacity: 0.06;
+        border-radius: 100%;
+      }
+    }
+  }
+  .tb-dynamic-form-array-buttons {
+    display: flex;
+    flex-direction: row;
+    button.mat-mdc-icon-button.mat-mdc-button-base {
+      color: rgba(0, 0, 0, 0.38);
+      &.tb-hidden {
+        visibility: hidden;
+      }
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-array.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-array.component.ts
new file mode 100644
index 0000000000..081adbfcea
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-array.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, DestroyRef, forwardRef, Input, OnInit, ViewEncapsulation } from '@angular/core';
+import {
+  AbstractControl,
+  ControlValueAccessor,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  UntypedFormArray,
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validator
+} from '@angular/forms';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { defaultFormPropertyValue, FormProperty } from '@shared/models/dynamic-form.models';
+import { CdkDragDrop } from '@angular/cdk/drag-drop';
+
+@Component({
+  selector: 'tb-dynamic-form-array',
+  templateUrl: './dynamic-form-array.component.html',
+  styleUrls: ['./dynamic-form-array.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => DynamicFormArrayComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => DynamicFormArrayComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class DynamicFormArrayComponent implements ControlValueAccessor, OnInit, Validator {
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  itemProperty: FormProperty;
+
+  @Input()
+  title: string;
+
+  propertiesFormGroup: UntypedFormGroup;
+
+  get dragEnabled(): boolean {
+    return !this.disabled && this.propertiesFormArray().controls.length > 1;
+  }
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder,
+              private destroyRef: DestroyRef) {
+  }
+
+  ngOnInit() {
+    this.propertiesFormGroup = this.fb.group({
+      properties: this.fb.array([])
+    });
+    this.propertiesFormGroup.valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(
+      () => {
+        const properties: {[id: string]: any}[] = this.propertiesFormGroup.get('properties').value;
+        const value = properties.map(prop => prop[this.itemProperty.id]);
+        this.propagateChange(value);
+      }
+    );
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.propertiesFormGroup.disable({emitEvent: false});
+    } else {
+      this.propertiesFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(values: any[] | undefined): void {
+    this.propertiesFormGroup.setControl('properties', this.preparePropertiesFormArray(values || []), {emitEvent: false});
+  }
+
+  public validate(_c: UntypedFormControl) {
+    const valid =  this.propertiesFormGroup.valid;
+    return valid ? null : {
+      properties: {
+        valid: false,
+      },
+    };
+  }
+
+  propertyDrop(event: CdkDragDrop<string[]>) {
+    const propertiesArray = this.propertiesFormGroup.get('properties') as UntypedFormArray;
+    const property = propertiesArray.at(event.previousIndex);
+    propertiesArray.removeAt(event.previousIndex, {emitEvent: false});
+    propertiesArray.insert(event.currentIndex, property, {emitEvent: true});
+  }
+
+  propertiesFormArray(): UntypedFormArray {
+    return this.propertiesFormGroup.get('properties') as UntypedFormArray;
+  }
+
+  trackByProperty(_index: number, propertyControl: AbstractControl): any {
+    return propertyControl;
+  }
+
+  removeProperty(index: number, emitEvent = true) {
+    (this.propertiesFormGroup.get('properties') as UntypedFormArray).removeAt(index, {emitEvent});
+  }
+
+  addProperty() {
+    const property = {
+      [this.itemProperty.id]: defaultFormPropertyValue(this.itemProperty)
+    };
+    const propertiesArray = this.propertiesFormGroup.get('properties') as UntypedFormArray;
+    const propertyControl = this.fb.control(property, []);
+    propertiesArray.push(propertyControl);
+    setTimeout(() => {
+      propertyControl.updateValueAndValidity();
+    });
+  }
+
+  private preparePropertiesFormArray(values: any[] | undefined): UntypedFormArray {
+    const propertiesControls: Array<AbstractControl> = [];
+    if (values) {
+      values.forEach((value) => {
+        const property = {
+          [this.itemProperty.id]: value
+        };
+        propertiesControls.push(this.fb.control(property, []));
+      });
+    }
+    return this.fb.array(propertiesControls);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-properties.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-properties.component.html
new file mode 100644
index 0000000000..5a37c43486
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-properties.component.html
@@ -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.
+
+-->
+<div class="tb-form-panel tb-dynamic-form-properties" [class.no-border]="noBorder" [class.no-padding]="noBorder" [class.no-margin]="noMargin">
+  <div class="tb-form-table" [class.flex-1]="fillHeight">
+    <div class="tb-form-table-header" [class.no-padding-right]="!disabled">
+      <div class="tb-form-table-header-cell tb-id-header" translate>dynamic-form.property.id</div>
+      <div class="tb-form-table-header-cell tb-name-header" translate>dynamic-form.property.name</div>
+      <div class="tb-form-table-header-cell tb-type-header" translate>dynamic-form.property.type</div>
+      <div class="tb-form-table-header-cell tb-actions-header tb-form-table-row-cell-buttons justify-end" [class.disabled]="disabled">
+        <button mat-icon-button
+                *ngIf="!disabled && importExport"
+                type="button"
+                matTooltip="{{ 'dynamic-form.import-form' | translate }}"
+                matTooltipPosition="above"
+                (click)="import($event)">
+          <tb-icon>mdi:file-import</tb-icon>
+        </button>
+        <button mat-icon-button
+                *ngIf="!disabled && importExport"
+                [class.tb-hidden]="!propertiesFormArray().controls.length"
+                type="button"
+                [disabled]="!propertiesFormArray().controls.length"
+                matTooltip="{{ 'dynamic-form.export-form' | translate }}"
+                matTooltipPosition="above"
+                (click)="export($event)">
+          <tb-icon>mdi:file-export</tb-icon>
+        </button>
+        <button mat-icon-button
+                *ngIf="!disabled"
+                [class.tb-hidden]="!propertiesFormArray().controls.length"
+                type="button"
+                [disabled]="!propertiesFormArray().controls.length"
+                matTooltip="{{ 'dynamic-form.clear-form' | translate }}"
+                matTooltipPosition="above"
+                (click)="clear($event)">
+          <tb-icon>mdi:broom</tb-icon>
+        </button>
+      </div>
+    </div>
+    <div *ngIf="propertiesFormArray().controls.length; else noProperties" class="tb-form-table-body tb-drop-list"
+         cdkDropList cdkDropListOrientation="vertical"
+         [cdkDropListDisabled]="!dragEnabled"
+         (cdkDropListDropped)="propertyDrop($event)">
+      <div cdkDrag [cdkDragDisabled]="!dragEnabled"
+           [class.tb-draggable]="!disabled"
+           [class.tb-draggable-form-table-row]="!disabled"
+           *ngFor="let propertyControl of propertiesFormArray().controls; trackBy: trackByProperty; let $index = index;">
+        <tb-dynamic-form-property-row class="flex-1"
+                                      [index]="$index"
+                                      [booleanPropertyIds]="booleanPropertyIds"
+                                      [formControl]="propertyControl"
+                                      (propertyRemoved)="removeProperty($index)">
+        </tb-dynamic-form-property-row>
+        <div class="tb-form-table-row-cell-buttons">
+          <button mat-icon-button
+                  *ngIf="!disabled"
+                  type="button"
+                  cdkDragHandle
+                  [class.tb-hidden]="!dragEnabled"
+                  matTooltip="{{ 'action.drag' | translate }}"
+                  matTooltipPosition="above">
+            <mat-icon>drag_indicator</mat-icon>
+          </button>
+        </div>
+      </div>
+    </div>
+    <tb-error *ngIf="errorText" noMargin [error]="errorText" style="padding-left: 12px;"></tb-error>
+  </div>
+  <div *ngIf="!disabled">
+    <button type="button" mat-stroked-button color="primary" (click)="addProperty()">
+      {{ 'dynamic-form.property.add-property' | translate }}
+    </button>
+  </div>
+</div>
+
+<ng-template #noProperties>
+  <span class="tb-prompt flex items-center justify-center" [style]="fillHeight ? {height: '100%'} : {}">{{ 'dynamic-form.property.no-properties' | translate }}</span>
+</ng-template>
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-properties.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-properties.component.scss
similarity index 90%
rename from ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-properties.component.scss
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-properties.component.scss
index 094ea0668b..d3bc52b22e 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-properties.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-properties.component.scss
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-.tb-scada-symbol-properties {
+.tb-dynamic-form-properties {
   flex: 1;
-  margin: 12px;
+  &:not(.no-margin) {
+    margin: 12px;
+  }
   .tb-form-table-header-cell {
     &.tb-id-header {
       flex: 1 1 40%;
@@ -40,7 +42,7 @@
   }
   .tb-form-table-body {
     overflow: auto;
-    tb-scada-symbol-metadata-property-row {
+    tb-dynamic-form-property-row {
       overflow: hidden;
     }
   }
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-properties.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-properties.component.ts
similarity index 60%
rename from ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-properties.component.ts
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-properties.component.ts
index 5bcdc74a8a..1c4bfefe33 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-properties.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-properties.component.ts
@@ -36,44 +36,74 @@ import {
   UntypedFormGroup,
   Validator
 } from '@angular/forms';
-import { ScadaSymbolProperty, ScadaSymbolPropertyType } from '@home/components/widget/lib/scada/scada-symbol.models';
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
-import {
-  propertyValid,
-  ScadaSymbolPropertyRowComponent
-} from '@home/pages/scada-symbol/metadata-components/scada-symbol-property-row.component';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  cleanupFormProperties,
+  FormProperty,
+  FormPropertyType,
+  propertyValid
+} from '@shared/models/dynamic-form.models';
+import {
+  DynamicFormPropertyRowComponent
+} from '@home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-row.component';
+import { coerceBoolean } from '@shared/decorators/coercion';
+import { ImportExportService } from '@shared/import-export/import-export.service';
+import { DialogService } from '@core/services/dialog.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
-  selector: 'tb-scada-symbol-metadata-properties',
-  templateUrl: './scada-symbol-properties.component.html',
-  styleUrls: ['./scada-symbol-properties.component.scss'],
+  selector: 'tb-dynamic-form-properties',
+  templateUrl: './dynamic-form-properties.component.html',
+  styleUrls: ['./dynamic-form-properties.component.scss'],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
-      useExisting: forwardRef(() => ScadaSymbolPropertiesComponent),
+      useExisting: forwardRef(() => DynamicFormPropertiesComponent),
       multi: true
     },
     {
       provide: NG_VALIDATORS,
-      useExisting: forwardRef(() => ScadaSymbolPropertiesComponent),
+      useExisting: forwardRef(() => DynamicFormPropertiesComponent),
       multi: true
     }
   ],
   encapsulation: ViewEncapsulation.None
 })
-export class ScadaSymbolPropertiesComponent implements ControlValueAccessor, OnInit, Validator {
+export class DynamicFormPropertiesComponent implements ControlValueAccessor, OnInit, Validator {
 
   @HostBinding('style.display') styleDisplay = 'flex';
   @HostBinding('style.overflow') styleOverflow = 'hidden';
+  @HostBinding('style.height')
+  get containerHeight(): string {
+    return this.fillHeight ? '100%': 'auto';
+  }
 
-  @ViewChildren(ScadaSymbolPropertyRowComponent)
-  propertyRows: QueryList<ScadaSymbolPropertyRowComponent>;
+  @ViewChildren(DynamicFormPropertyRowComponent)
+  propertyRows: QueryList<DynamicFormPropertyRowComponent>;
 
   @Input()
   disabled: boolean;
 
+  @Input()
+  @coerceBoolean()
+  noBorder = false;
+
+  @Input()
+  @coerceBoolean()
+  noMargin = false;
+
+  @Input()
+  @coerceBoolean()
+  fillHeight = false;
+
+  @Input()
+  @coerceBoolean()
+  importExport = false;
+
+  @Input()
+  exportFileName = 'form';
+
   booleanPropertyIds: string[] = [];
 
   propertiesFormGroup: UntypedFormGroup;
@@ -88,6 +118,8 @@ export class ScadaSymbolPropertiesComponent implements ControlValueAccessor, OnI
 
   constructor(private fb: UntypedFormBuilder,
               private translate: TranslateService,
+              private importExportService: ImportExportService,
+              private dialogService: DialogService,
               private destroyRef: DestroyRef) {
   }
 
@@ -99,11 +131,8 @@ export class ScadaSymbolPropertiesComponent implements ControlValueAccessor, OnI
       takeUntilDestroyed(this.destroyRef)
     ).subscribe(
       () => {
-        let properties: ScadaSymbolProperty[] = this.propertiesFormGroup.get('properties').value;
-        if (properties) {
-          properties = properties.filter(p => propertyValid(p));
-        }
-        this.booleanPropertyIds = properties.filter(p => p.type === ScadaSymbolPropertyType.switch).map(p => p.id);
+        const properties = this.getProperties();
+        this.booleanPropertyIds = properties.filter(p => p.type === FormPropertyType.switch).map(p => p.id);
         properties.forEach((p, i) => {
           if (p.disableOnProperty && !this.booleanPropertyIds.includes(p.disableOnProperty)) {
             p.disableOnProperty = null;
@@ -111,7 +140,7 @@ export class ScadaSymbolPropertiesComponent implements ControlValueAccessor, OnI
             controls[i].patchValue(p, {emitEvent: false});
           }
         });
-        this.propagateChange(properties);
+        this.propagateChange(cleanupFormProperties(properties));
       }
     );
   }
@@ -120,7 +149,7 @@ export class ScadaSymbolPropertiesComponent implements ControlValueAccessor, OnI
     this.propagateChange = fn;
   }
 
-  registerOnTouched(fn: any): void {
+  registerOnTouched(_fn: any): void {
   }
 
   setDisabledState(isDisabled: boolean): void {
@@ -132,13 +161,13 @@ export class ScadaSymbolPropertiesComponent implements ControlValueAccessor, OnI
     }
   }
 
-  writeValue(value: ScadaSymbolProperty[] | undefined): void {
+  writeValue(value: FormProperty[] | undefined): void {
     const properties= value || [];
     this.propertiesFormGroup.setControl('properties', this.preparePropertiesFormArray(properties), {emitEvent: false});
-    this.booleanPropertyIds = properties.filter(p => p.type === ScadaSymbolPropertyType.switch).map(p => p.id);
+    this.booleanPropertyIds = properties.filter(p => p.type === FormPropertyType.switch).map(p => p.id);
   }
 
-  public validate(c: UntypedFormControl) {
+  public validate(_c: UntypedFormControl) {
     this.errorText = '';
     const propertiesArray = this.propertiesFormGroup.get('properties') as UntypedFormArray;
     const notUniqueControls =
@@ -146,7 +175,7 @@ export class ScadaSymbolPropertiesComponent implements ControlValueAccessor, OnI
     for (const control of notUniqueControls) {
       control.updateValueAndValidity({onlySelf: false, emitEvent: false});
       if (control.hasError('propertyIdNotUnique')) {
-        this.errorText = this.translate.instant('scada.property.not-unique-property-ids-error');
+        this.errorText = this.translate.instant('dynamic-form.property.not-unique-property-ids-error');
       }
     }
     const valid =  this.propertiesFormGroup.valid;
@@ -173,15 +202,15 @@ export class ScadaSymbolPropertiesComponent implements ControlValueAccessor, OnI
   propertyDrop(event: CdkDragDrop<string[]>) {
     const propertiesArray = this.propertiesFormGroup.get('properties') as UntypedFormArray;
     const property = propertiesArray.at(event.previousIndex);
-    propertiesArray.removeAt(event.previousIndex);
-    propertiesArray.insert(event.currentIndex, property);
+    propertiesArray.removeAt(event.previousIndex, {emitEvent: false});
+    propertiesArray.insert(event.currentIndex, property, {emitEvent: true});
   }
 
   propertiesFormArray(): UntypedFormArray {
     return this.propertiesFormGroup.get('properties') as UntypedFormArray;
   }
 
-  trackByProperty(index: number, propertyControl: AbstractControl): any {
+  trackByProperty(_index: number, propertyControl: AbstractControl): any {
     return propertyControl;
   }
 
@@ -190,10 +219,10 @@ export class ScadaSymbolPropertiesComponent implements ControlValueAccessor, OnI
   }
 
   addProperty() {
-    const property: ScadaSymbolProperty = {
+    const property: FormProperty = {
       id: '',
       name: '',
-      type: ScadaSymbolPropertyType.text,
+      type: FormPropertyType.text,
       default: ''
     };
     const propertiesArray = this.propertiesFormGroup.get('properties') as UntypedFormArray;
@@ -207,7 +236,39 @@ export class ScadaSymbolPropertiesComponent implements ControlValueAccessor, OnI
     });
   }
 
-  private preparePropertiesFormArray(properties: ScadaSymbolProperty[] | undefined): UntypedFormArray {
+  export($event: Event) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    const properties = this.getProperties();
+    this.importExportService.exportFormProperties(properties, this.exportFileName);
+  }
+
+  import($event: Event) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    this.importExportService.importFormProperties().subscribe((properties) => {
+      if (properties) {
+        this.propertiesFormGroup.setControl('properties', this.preparePropertiesFormArray(properties), {emitEvent: true});
+      }
+    });
+  }
+
+  clear($event: Event) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    this.dialogService.confirm(this.translate.instant('dynamic-form.clear-form'),
+      this.translate.instant('dynamic-form.clear-form-prompt'), null, this.translate.instant('action.clear'))
+    .subscribe((clear) => {
+      if (clear) {
+        (this.propertiesFormGroup.get('properties') as UntypedFormArray).clear({emitEvent: true});
+      }
+    });
+  }
+
+  private preparePropertiesFormArray(properties: FormProperty[] | undefined): UntypedFormArray {
     const propertiesControls: Array<AbstractControl> = [];
     if (properties) {
       properties.forEach((property) => {
@@ -216,4 +277,12 @@ export class ScadaSymbolPropertiesComponent implements ControlValueAccessor, OnI
     }
     return this.fb.array(propertiesControls);
   }
+
+  private getProperties(): FormProperty[] {
+    let properties: FormProperty[] = this.propertiesFormGroup.get('properties').value;
+    if (properties) {
+      properties = properties.filter(p => propertyValid(p));
+    }
+    return properties;
+  }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.html
new file mode 100644
index 0000000000..5e8f9b9928
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.html
@@ -0,0 +1,471 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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-dynamic-form-property-settings-panel" [formGroup]="propertyFormGroup">
+  <div class="tb-dynamic-form-property-settings-title">{{ panelTitle | translate }}</div>
+  <div class="tb-dynamic-form-property-settings-panel-content">
+    <div class="tb-form-row">
+      <div class="fixed-title-width" translate>dynamic-form.property.id</div>
+      <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
+        <input required matInput formControlName="id" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+    <div class="tb-form-row">
+      <div class="fixed-title-width" translate>dynamic-form.property.name</div>
+      <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
+        <input required matInput formControlName="name" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+    <div class="tb-form-row">
+      <div class="fixed-title-width" translate>dynamic-form.property.group-title</div>
+      <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
+        <input matInput formControlName="group" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+    <div class="tb-form-row">
+      <div class="fixed-title-width" translate>dynamic-form.property.type</div>
+      <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
+        <mat-select formControlName="type">
+          <mat-option *ngFor="let type of formPropertyTypes" [value]="type">
+            {{ formPropertyTypeTranslations.get(type) | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+    </div>
+    <div *ngIf="isArray" class="tb-form-panel stroked">
+      <div class="tb-form-panel-title" translate>dynamic-form.property.array-item</div>
+      <div class="tb-form-row">
+        <div class="fixed-title-width" translate>dynamic-form.property.item-type</div>
+        <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
+          <mat-select formControlName="arrayItemType">
+            <mat-option *ngFor="let type of arrayItemFormPropertyTypes" [value]="type">
+              {{ formPropertyTypeTranslations.get(type) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div class="tb-form-row">
+        <div class="fixed-title-width" translate>dynamic-form.property.item-name</div>
+        <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
+          <input matInput formControlName="arrayItemName" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+      </div>
+      <ng-container *ngTemplateOutlet="itemSettings">
+      </ng-container>
+    </div>
+    <ng-container *ngIf="!isArray">
+      <ng-container *ngTemplateOutlet="itemSettings">
+      </ng-container>
+    </ng-container>
+    <div *ngIf="![FormPropertyType.fieldset, FormPropertyType.htmlSection, FormPropertyType.array].includes(propertyFormGroup.get('type').value)" class="tb-form-row space-between">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="required">
+        {{ 'dynamic-form.property.value-required' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div class="tb-form-panel stroked">
+      <mat-expansion-panel class="tb-settings">
+        <mat-expansion-panel-header class="flex flex-row flex-wrap">
+          <mat-panel-title>
+            {{ 'dynamic-form.property.advanced-ui-settings' | translate }}
+          </mat-panel-title>
+        </mat-expansion-panel-header>
+        <ng-template matExpansionPanelContent>
+          <ng-container *ngIf="isPropertyTypeAllowedForRow(propertyFormGroup.get('type').value)">
+            <div class="tb-form-row space-between">
+              <div class="fixed-title-width" translate>dynamic-form.property.sub-label</div>
+              <mat-form-field  class="flex"
+                               appearance="outline" subscriptSizing="dynamic">
+                <input matInput formControlName="subLabel" 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="divider">
+                {{ 'dynamic-form.property.vertical-divider-after' | translate }}
+              </mat-slide-toggle>
+            </div>
+          </ng-container>
+          <div *ngIf="[FormPropertyType.number, FormPropertyType.text, FormPropertyType.password].includes(propertyItemType)"
+               class="tb-form-row space-between">
+            <div class="fixed-title-width" translate>dynamic-form.property.input-field-suffix</div>
+            <mat-form-field  class="flex"
+                             appearance="outline" subscriptSizing="dynamic">
+              <input matInput formControlName="fieldSuffix" placeholder="{{ 'widget-config.set' | translate }}">
+            </mat-form-field>
+          </div>
+          <div *ngIf="propertyFormGroup.get('type').value !== FormPropertyType.htmlSection" class="tb-form-row space-between">
+            <div class="fixed-title-width" translate>dynamic-form.property.disable-on-property</div>
+            <mat-form-field  class="flex" appearance="outline" subscriptSizing="dynamic">
+              <mat-select formControlName="disableOnProperty" placeholder="{{ 'widget-config.set' | translate }}">
+                <mat-option [value]="null"></mat-option>
+                <mat-option *ngFor="let prop of booleanPropertyIds" [value]="prop">
+                  {{ prop }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+          </div>
+          <div class="tb-form-row">
+            <tb-js-func
+              class="flex-1"
+              formControlName="condition"
+              [functionArgs]="['property', 'model']"
+              functionTitle="{{ 'dynamic-form.property.display-condition-function' | translate }}">
+            </tb-js-func>
+          </div>
+          <tb-string-items-list *ngIf="isPropertyTypeAllowedForRow(propertyFormGroup.get('type').value)"
+                                class="flex-1"
+                                fieldClass="flex"
+                                floatLabel="always"
+                                label="{{ 'dynamic-form.property.property-row-classes' | translate }}"
+                                placeholder="{{ 'widget-config.set' | translate }}"
+                                [predefinedValues]="formPropertyRowClasses"
+                                formControlName="rowClass"
+                                appearance="outline"
+                                subscriptSizing="dynamic">
+          </tb-string-items-list>
+          <tb-string-items-list *ngIf="isPropertyTypeAllowedForRow(propertyFormGroup.get('type').value) && FormPropertyType.switch !== propertyFormGroup.get('type').value"
+                                class="flex-1"
+                                fieldClass="flex"
+                                floatLabel="always"
+                                label="{{ 'dynamic-form.property.property-field-classes' | translate }}"
+                                placeholder="{{ 'widget-config.set' | translate }}"
+                                [predefinedValues]="formPropertyFieldClasses"
+                                formControlName="fieldClass"
+                                appearance="outline"
+                                subscriptSizing="dynamic">
+          </tb-string-items-list>
+        </ng-template>
+      </mat-expansion-panel>
+    </div>
+  </div>
+  <div class="tb-dynamic-form-property-settings-panel-buttons">
+    <button mat-button
+            color="primary"
+            type="button"
+            (click)="cancel()">
+      {{ (disabled ? 'action.close' : 'action.cancel') | translate }}
+    </button>
+    <button *ngIf="!disabled"
+            mat-raised-button
+            color="primary"
+            type="button"
+            (click)="applyPropertySettings()"
+            [disabled]="propertyFormGroup.invalid || !propertyFormGroup.dirty">
+      {{ (isAdd ? 'action.add' : 'action.apply') | translate }}
+    </button>
+  </div>
+</div>
+
+<ng-template #itemSettings>
+  <ng-container [formGroup]="propertyFormGroup">
+    <div *ngIf="propertyItemType === FormPropertyType.textarea" class="tb-form-row space-between">
+      <div translate>dynamic-form.property.textarea-rows</div>
+      <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+        <input matInput formControlName="rows" min="1" step="1"
+               type="number" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+    <div *ngIf="propertyItemType === FormPropertyType.number" class="tb-form-row space-between">
+      <div translate>dynamic-form.property.number-settings</div>
+      <div class="flex flex-1 flex-row items-center justify-end gap-2">
+        <div class="tb-small-label" translate>dynamic-form.property.min</div>
+        <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+          <input matInput formControlName="min"
+                 type="number" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+        <mat-divider vertical></mat-divider>
+        <div class="tb-small-label" translate>dynamic-form.property.max</div>
+        <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+          <input matInput formControlName="max"
+                 type="number" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+        <mat-divider vertical></mat-divider>
+        <div class="tb-small-label" translate>dynamic-form.property.step</div>
+        <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+          <input matInput formControlName="step" min="0"
+                 type="number" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+      </div>
+    </div>
+    <div *ngIf="propertyItemType === FormPropertyType.fieldset" class="tb-form-panel stroked">
+      <mat-expansion-panel class="tb-settings" expanded>
+        <mat-expansion-panel-header class="flex flex-row flex-wrap">
+          <mat-panel-title>
+            {{ 'dynamic-form.property.properties' | translate }}
+          </mat-panel-title>
+        </mat-expansion-panel-header>
+        <ng-template matExpansionPanelContent>
+          <tb-dynamic-form-properties formControlName="properties" noBorder noMargin>
+          </tb-dynamic-form-properties>
+        </ng-template>
+      </mat-expansion-panel>
+    </div>
+    <div *ngIf="propertyItemType === FormPropertyType.htmlSection" class="tb-form-panel stroked">
+      <mat-expansion-panel class="tb-settings" expanded>
+        <mat-expansion-panel-header class="flex flex-row flex-wrap">
+          <mat-panel-title>
+            {{ 'dynamic-form.property.html-section-settings' | translate }}
+          </mat-panel-title>
+        </mat-expansion-panel-header>
+        <ng-template matExpansionPanelContent>
+          <div class="tb-form-row">
+            <tb-html
+              class="flex-1"
+              formControlName="htmlContent"
+              label="{{ 'dynamic-form.property.html-section-content' | translate }}">
+            </tb-html>
+          </div>
+          <tb-string-items-list class="flex-1"
+                                fieldClass="flex"
+                                floatLabel="always"
+                                label="{{ 'dynamic-form.property.html-section-classes' | translate }}"
+                                formControlName="htmlClassList"
+                                appearance="outline"
+                                subscriptSizing="dynamic">
+          </tb-string-items-list>
+        </ng-template>
+      </mat-expansion-panel>
+    </div>
+    <ng-container *ngIf="[FormPropertyType.select, FormPropertyType.radios].includes(propertyItemType)">
+      <div class="tb-form-panel stroked">
+        <mat-expansion-panel class="tb-settings" expanded>
+          <mat-expansion-panel-header class="flex flex-row flex-wrap">
+            <mat-panel-title>
+              {{ (propertyFormGroup.get('type').value === FormPropertyType.select ? 'dynamic-form.property.select-options' : 'dynamic-form.property.radio-button-options') | translate }}
+            </mat-panel-title>
+          </mat-expansion-panel-header>
+          <ng-template matExpansionPanelContent>
+            <div *ngIf="propertyItemType === FormPropertyType.radios" class="tb-form-row space-between">
+              <div translate>dynamic-form.property.buttons-direction</div>
+              <mat-chip-listbox class="center-stretch" formControlName="direction">
+                <mat-chip-option [selectable]="propertyFormGroup.get('direction').value !== 'column'"
+                                 value="column">{{ 'dynamic-form.property.direction-column' | translate }}</mat-chip-option>
+                <mat-chip-option [selectable]="propertyFormGroup.get('direction').value !== 'row'"
+                                 value="row">{{ 'dynamic-form.property.direction-row' | translate }}</mat-chip-option>
+              </mat-chip-listbox>
+            </div>
+            <div *ngIf="propertyItemType === FormPropertyType.select" class="tb-form-row space-between">
+              <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="multiple">
+                {{ 'dynamic-form.property.enable-multiple-select' | translate }}
+              </mat-slide-toggle>
+            </div>
+            <div *ngIf="propertyItemType === FormPropertyType.select && !propertyFormGroup.get('multiple').value" class="tb-form-row space-between">
+              <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="allowEmptyOption">
+                {{ 'dynamic-form.property.allow-empty-select-option' | translate }}
+              </mat-slide-toggle>
+            </div>
+            <div *ngIf="propertyItemType === FormPropertyType.select && propertyFormGroup.get('multiple').value" class="tb-form-row space-between">
+              <div translate>dynamic-form.property.selected-options-limit</div>
+              <div class="flex flex-1 flex-row items-center justify-end gap-2">
+                <div class="tb-small-label" translate>dynamic-form.property.min</div>
+                <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+                  <input matInput formControlName="minItems"
+                         type="number" placeholder="{{ 'widget-config.set' | translate }}">
+                </mat-form-field>
+                <mat-divider vertical></mat-divider>
+                <div class="tb-small-label" translate>dynamic-form.property.max</div>
+                <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+                  <input matInput formControlName="maxItems"
+                         type="number" placeholder="{{ 'widget-config.set' | translate }}">
+                </mat-form-field>
+              </div>
+            </div>
+            <tb-dynamic-form-select-items
+              formControlName="items">
+            </tb-dynamic-form-select-items>
+          </ng-template>
+        </mat-expansion-panel>
+      </div>
+    </ng-container>
+    <div *ngIf="[FormPropertyType.javascript, FormPropertyType.markdown].includes(propertyItemType)" class="tb-form-row">
+      <div class="fixed-title-width" translate>dynamic-form.property.help-id</div>
+      <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
+        <input matInput formControlName="helpId" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+    <ng-container *ngIf="propertyItemType === FormPropertyType.datetime">
+      <div class="tb-form-row space-between">
+        <div translate>dynamic-form.property.datetime-type</div>
+        <mat-chip-listbox class="center-stretch" formControlName="dateTimeType">
+          <mat-chip-option [selectable]="propertyFormGroup.get('dateTimeType').value !== 'date'"
+                           value="date">{{ 'dynamic-form.property.datetime-type-date' | translate }}</mat-chip-option>
+          <mat-chip-option [selectable]="propertyFormGroup.get('dateTimeType').value !== 'time'"
+                           value="time">{{ 'dynamic-form.property.datetime-type-time' | translate }}</mat-chip-option>
+          <mat-chip-option [selectable]="propertyFormGroup.get('dateTimeType').value !== 'datetime'"
+                           value="datetime">{{ 'dynamic-form.property.datetime-type-datetime' | translate }}</mat-chip-option>
+        </mat-chip-listbox>
+      </div>
+      <div class="tb-form-row space-between">
+        <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="allowClear">
+          {{ 'dynamic-form.property.enable-clear-button' | translate }}
+        </mat-slide-toggle>
+      </div>
+    </ng-container>
+    <div *ngIf="propertyItemType === FormPropertyType.textarea" class="tb-form-row no-border no-padding">
+      <mat-form-field  class="flex"
+                       floatLabel="always"
+                       appearance="outline" subscriptSizing="dynamic">
+        <mat-label translate>dynamic-form.property.default-value</mat-label>
+        <textarea matInput
+                  [rows]="propertyFormGroup.get('rows').value || 2"
+                  formControlName="default" placeholder="{{ 'widget-config.set' | translate }}"></textarea>
+      </mat-form-field>
+    </div>
+    <div *ngIf="propertyItemType === FormPropertyType.javascript" class="tb-form-row" >
+      <tb-js-func
+        class="flex-1"
+        disableUndefinedCheck
+        formControlName="default"
+        [helpId]="propertyFormGroup.get('helpId').value"
+        label="{{ 'dynamic-form.property.default-value' | translate }}">
+      </tb-js-func>
+    </div>
+    <div *ngIf="propertyItemType === FormPropertyType.json" class="tb-form-row" >
+      <tb-json-content
+        class="flex-1"
+        formControlName="default"
+        [contentType]="ContentType.JSON"
+        label="{{ 'dynamic-form.property.default-value' | translate }}">
+      </tb-json-content>
+    </div>
+    <div *ngIf="propertyItemType === FormPropertyType.html" class="tb-form-row" >
+      <tb-html
+        class="flex-1"
+        formControlName="default"
+        label="{{ 'dynamic-form.property.default-value' | translate }}">
+      </tb-html>
+    </div>
+    <div *ngIf="propertyItemType === FormPropertyType.css" class="tb-form-row" >
+      <tb-css
+        class="flex-1"
+        formControlName="default"
+        label="{{ 'dynamic-form.property.default-value' | translate }}">
+      </tb-css>
+    </div>
+    <div *ngIf="propertyItemType === FormPropertyType.markdown" class="tb-form-row" >
+      <tb-markdown-editor
+        class="flex-1"
+        formControlName="default"
+        [helpId]="propertyFormGroup.get('helpId').value"
+        label="{{ 'dynamic-form.property.default-value' | translate }}">
+      </tb-markdown-editor>
+    </div>
+    <div *ngIf="propertyItemType === FormPropertyType.image && !isArray" class="tb-form-row" >
+      <tb-gallery-image-input
+        class="flex-1"
+        formControlName="default"
+        label="{{ 'dynamic-form.property.default-value' | translate }}">
+      </tb-gallery-image-input>
+    </div>
+    <div *ngIf="propertyItemType === FormPropertyType.radios"
+         class="tb-form-row tb-radios-property" [class.direction-column]="propertyFormGroup.get('direction').value === 'column'">
+      <div tbTruncateWithTooltip translate class="fixed-title-height">dynamic-form.property.default-value</div>
+      <mat-radio-group class="flex flex-1 flex-wrap" [class.flex-col]="propertyFormGroup.get('direction').value === 'column'"
+                       formControlName="default">
+        <mat-radio-button *ngFor="let item of propertyFormGroup.get('items').value" [value]="item.value">
+          <div tbTruncateWithTooltip>{{ item.label | customTranslate }}</div>
+        </mat-radio-button>
+      </mat-radio-group>
+    </div>
+    <div *ngIf="isPropertyTypeAllowedForRow(propertyItemType)" class="tb-form-row space-between">
+      <div class="fixed-title-width" translate>dynamic-form.property.default-value</div>
+      <mat-form-field  *ngIf="[FormPropertyType.text, FormPropertyType.password].includes(propertyItemType)"
+                       class="flex"
+                       appearance="outline" subscriptSizing="dynamic">
+        <input matInput [type]="propertyFormGroup.get('type').value" formControlName="default" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+      <tb-color-input *ngIf="propertyItemType === FormPropertyType.color"
+                      asBoxInput
+                      colorClearButton
+                      formControlName="default">
+      </tb-color-input>
+      <tb-color-settings *ngIf="propertyItemType === FormPropertyType.color_settings"
+                         formControlName="default"
+                         settingsKey="{{ propertyFormGroup.get('id').value }}">
+      </tb-color-settings>
+      <mat-form-field  *ngIf="propertyItemType === FormPropertyType.number"
+                       appearance="outline"
+                       class="number"
+                       subscriptSizing="dynamic">
+        <input matInput formControlName="default"
+               [min]="propertyFormGroup.get('min').value"
+               [max]="propertyFormGroup.get('max').value"
+               [step]="propertyFormGroup.get('step').value"
+               type="number" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+      <tb-font-settings *ngIf="propertyItemType === FormPropertyType.font"
+                        formControlName="default"
+                        clearButton
+                        disabledLineHeight>
+      </tb-font-settings>
+      <tb-unit-input *ngIf="propertyItemType === FormPropertyType.units"
+                     formControlName="default"></tb-unit-input>
+      <tb-value-input *ngIf="propertyItemType === FormPropertyType.switch"
+                      [valueType]="ValueType.BOOLEAN"
+                      formControlName="default"></tb-value-input>
+      <tb-material-icon-select *ngIf="propertyItemType === FormPropertyType.icon"
+                               asBoxInput
+                               formControlName="default">
+      </tb-material-icon-select>
+      <mat-form-field *ngIf="propertyItemType === FormPropertyType.select" class="medium-width"
+                      appearance="outline" subscriptSizing="dynamic">
+        <mat-select *ngIf="!propertyFormGroup.get('multiple').value" formControlName="default">
+          <mat-option *ngIf="propertyFormGroup.get('allowEmptyOption').value" [value]="null"></mat-option>
+          <mat-option *ngFor="let item of propertyFormGroup.get('items').value" [value]="item.value">
+            {{ item.label | customTranslate }}
+          </mat-option>
+        </mat-select>
+        <mat-select *ngIf="propertyFormGroup.get('multiple').value" formControlName="default" multiple>
+          <mat-option *ngFor="let item of propertyFormGroup.get('items').value" [value]="item.value">
+            {{ item.label | customTranslate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <ng-container *ngIf="propertyItemType === FormPropertyType.datetime">
+        <tb-datetime *ngIf="propertyFormGroup.get('dateTimeType').value === 'date'"
+                     class="flex-1"
+                     showLabel="false"
+                     fieldClass="flex"
+                     [allowClear]="propertyFormGroup.get('allowClear').value"
+                     appearance="outline"
+                     subscriptSizing="dynamic"
+                     type="date"
+                     formControlName="default"
+        ></tb-datetime>
+        <tb-datetime *ngIf="propertyFormGroup.get('dateTimeType').value === 'time'"
+                     class="flex-1"
+                     showLabel="false"
+                     fieldClass="flex"
+                     [allowClear]="propertyFormGroup.get('allowClear').value"
+                     appearance="outline"
+                     subscriptSizing="dynamic"
+                     type="time"
+                     formControlName="default"
+        ></tb-datetime>
+        <tb-datetime *ngIf="propertyFormGroup.get('dateTimeType').value === 'datetime'"
+                     class="flex-1"
+                     showLabel="false"
+                     fieldClass="flex"
+                     [allowClear]="propertyFormGroup.get('allowClear').value"
+                     appearance="outline"
+                     subscriptSizing="dynamic"
+                     type="datetime"
+                     formControlName="default"
+        ></tb-datetime>
+      </ng-container>
+    </div>
+  </ng-container>
+</ng-template>
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.scss
similarity index 62%
rename from ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-panel.component.scss
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.scss
index c4b5b153d9..da613d5e61 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-panel.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.scss
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import '../../../../../../scss/constants';
+@import '../../../../../../../../../scss/constants';
 
-.tb-scada-symbol-property-settings-panel {
+.tb-dynamic-form-property-settings-panel {
   width: 540px;
   display: flex;
   flex-direction: column;
@@ -23,7 +23,7 @@
   @media #{$mat-lt-md} {
     width: 90vw;
   }
-  .tb-scada-symbol-property-settings-panel-content {
+  .tb-dynamic-form-property-settings-panel-content {
     display: flex;
     flex-direction: column;
     gap: 16px;
@@ -31,14 +31,14 @@
     margin: -10px;
     padding: 10px;
   }
-  .tb-scada-symbol-property-settings-title {
+  .tb-dynamic-form-property-settings-title {
     font-size: 16px;
     font-weight: 500;
     line-height: 24px;
     letter-spacing: 0.25px;
     color: rgba(0, 0, 0, 0.87);
   }
-  .tb-scada-symbol-property-settings-panel-buttons {
+  .tb-dynamic-form-property-settings-panel-buttons {
     height: 40px;
     display: flex;
     flex-direction: row;
@@ -46,4 +46,25 @@
     justify-content: flex-end;
     align-items: flex-end;
   }
+
+  .tb-form-row.tb-radios-property {
+    &.direction-column {
+      flex-direction: column;
+      align-items: flex-start;
+      gap: 4px;
+    }
+    .mat-mdc-radio-group {
+      overflow: hidden;
+      .mat-mdc-radio-button {
+        overflow: hidden;
+        .mdc-form-field {
+          overflow: hidden;
+          width: 100%;
+          .mdc-label {
+            overflow: hidden;
+          }
+        }
+      }
+    }
+  }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.ts
new file mode 100644
index 0000000000..960efa55fc
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.ts
@@ -0,0 +1,317 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, DestroyRef, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
+import { TbPopoverComponent } from '@shared/components/popover.component';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { ContentType, ValueType } from '@shared/models/constants';
+import {
+  defaultPropertyValue,
+  FormProperty,
+  formPropertyFieldClasses,
+  formPropertyRowClasses,
+  FormPropertyType,
+  formPropertyTypes,
+  formPropertyTypeTranslations,
+  FormSelectItem,
+  isPropertyTypeAllowedForRow
+} from '@shared/models/dynamic-form.models';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { isUndefinedOrNull } from '@core/utils';
+import { StringItemsOption } from '@shared/components/string-items-list.component';
+
+@Component({
+  selector: 'tb-dynamic-form-property-panel',
+  templateUrl: './dynamic-form-property-panel.component.html',
+  styleUrls: ['./dynamic-form-property-panel.component.scss'],
+  encapsulation: ViewEncapsulation.None
+})
+export class DynamicFormPropertyPanelComponent implements OnInit {
+
+  ValueType = ValueType;
+
+  FormPropertyType = FormPropertyType;
+
+  ContentType = ContentType;
+
+  formPropertyTypes = formPropertyTypes;
+  arrayItemFormPropertyTypes = formPropertyTypes.filter(t => t !== FormPropertyType.array);
+  formPropertyTypeTranslations = formPropertyTypeTranslations;
+
+  formPropertyRowClasses: StringItemsOption[] = formPropertyRowClasses.map(clazz => ({name: clazz, value: clazz}));
+
+  formPropertyFieldClasses: StringItemsOption[] = formPropertyFieldClasses.map(clazz => ({name: clazz, value: clazz}));
+
+  isPropertyTypeAllowedForRow = isPropertyTypeAllowedForRow;
+
+  get propertyItemType(): FormPropertyType | any {
+    if (this.isArray) {
+      return this.propertyFormGroup.get('arrayItemType').value;
+    } else {
+      return this.propertyFormGroup.get('type').value;
+    }
+  }
+
+  get isArray(): boolean {
+    return this.propertyFormGroup.get('type').value === FormPropertyType.array;
+  }
+
+  @Input()
+  isAdd = false;
+
+  @Input()
+  property: FormProperty;
+
+  @Input()
+  booleanPropertyIds: string[];
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  popover: TbPopoverComponent<DynamicFormPropertyPanelComponent>;
+
+  @Output()
+  propertySettingsApplied = new EventEmitter<FormProperty>();
+
+  panelTitle: string;
+
+  propertyFormGroup: UntypedFormGroup;
+
+  private propertyType: FormPropertyType;
+
+  constructor(private fb: UntypedFormBuilder,
+              private destroyRef: DestroyRef) {
+  }
+
+  ngOnInit(): void {
+    this.panelTitle = this.isAdd ? 'dynamic-form.property.add-property' : 'dynamic-form.property.property-settings';
+    this.propertyType = this.property.type === FormPropertyType.array ? this.property.arrayItemType : this.property.type;
+    this.propertyFormGroup = this.fb.group(
+      {
+        id: [this.property.id, [Validators.required]],
+        name: [this.property.name, [Validators.required]],
+        group: [this.property.group, []],
+        type: [this.property.type, [Validators.required]],
+        arrayItemType: [this.property.arrayItemType, [Validators.required]],
+        arrayItemName: [this.property.arrayItemName, []],
+        default: [this.property.default, []],
+        required: [this.property.required, []],
+        subLabel: [this.property.subLabel, []],
+        divider: [this.property.divider, []],
+        fieldSuffix: [this.property.fieldSuffix, []],
+        disableOnProperty: [this.property.disableOnProperty, []],
+        condition: [this.property.condition, []],
+        rowClass: [this.property.rowClass ? this.property.rowClass.split(' ') : [], []],
+        fieldClass: [this.property.fieldClass ? this.property.fieldClass.split(' ') : [], []],
+        rows: [this.property.rows, [Validators.min(1)]],
+        min: [this.property.min, []],
+        max: [this.property.max, []],
+        step: [this.property.step, [Validators.min(0)]],
+        properties: [this.property.properties, []],
+        multiple: [this.property.multiple, []],
+        allowEmptyOption: [this.property.allowEmptyOption, []],
+        minItems: [this.property.minItems, []],
+        maxItems: [this.property.maxItems, []],
+        items: [this.property.items, []],
+        helpId: [this.property.helpId, []],
+        direction: [this.property.direction || 'column', []],
+        allowClear: [this.property.allowClear || true, []],
+        dateTimeType: [this.property.dateTimeType || 'datetime', []],
+        htmlContent: [this.property.htmlContent || '', []],
+        htmlClassList: [this.property.htmlClassList || [], []]
+      }
+    );
+    if (this.disabled) {
+      this.propertyFormGroup.disable({emitEvent: false});
+    } else {
+      this.propertyFormGroup.get('type').valueChanges.pipe(
+        takeUntilDestroyed(this.destroyRef)
+      ).subscribe(() => {
+        this.updateValidators();
+      });
+      this.propertyFormGroup.get('arrayItemType').valueChanges.pipe(
+        takeUntilDestroyed(this.destroyRef)
+      ).subscribe(() => {
+        this.updateValidators();
+      });
+      this.propertyFormGroup.get('items').valueChanges.pipe(
+        takeUntilDestroyed(this.destroyRef)
+      ).subscribe(() => {
+        this.onSelectItemsChange();
+      });
+      this.propertyFormGroup.get('multiple').valueChanges.pipe(
+        takeUntilDestroyed(this.destroyRef)
+      ).subscribe(() => {
+        this.onMultipleSelectChange();
+      });
+      this.updateValidators();
+    }
+  }
+
+  cancel() {
+    this.popover?.hide();
+  }
+
+  applyPropertySettings() {
+    const property = this.propertyFormGroup.getRawValue();
+    property.rowClass = (property.rowClass || []).join(' ');
+    property.fieldClass = (property.fieldClass || []).join(' ');
+    this.propertySettingsApplied.emit(property);
+  }
+
+  private updateValidators() {
+    if (this.isArray) {
+      this.propertyFormGroup.get('arrayItemType').enable({emitEvent: false});
+      this.propertyFormGroup.get('arrayItemName').enable({emitEvent: false});
+    } else {
+      this.propertyFormGroup.get('arrayItemType').disable({emitEvent: false});
+      this.propertyFormGroup.get('arrayItemName').disable({emitEvent: false});
+    }
+    const type = this.propertyItemType;
+    if (type === FormPropertyType.textarea) {
+      this.propertyFormGroup.get('rows').enable({emitEvent: false});
+    } else {
+      this.propertyFormGroup.get('rows').disable({emitEvent: false});
+    }
+    if (type === FormPropertyType.number) {
+      this.propertyFormGroup.get('min').enable({emitEvent: false});
+      this.propertyFormGroup.get('max').enable({emitEvent: false});
+      this.propertyFormGroup.get('step').enable({emitEvent: false});
+    } else {
+      this.propertyFormGroup.get('min').disable({emitEvent: false});
+      this.propertyFormGroup.get('max').disable({emitEvent: false});
+      this.propertyFormGroup.get('step').disable({emitEvent: false});
+    }
+    if (type === FormPropertyType.fieldset) {
+      this.propertyFormGroup.get('default').disable({emitEvent: false});
+      this.propertyFormGroup.get('properties').enable({emitEvent: false});
+    } else {
+      this.propertyFormGroup.get('default').enable({emitEvent: false});
+      this.propertyFormGroup.get('properties').disable({emitEvent: false});
+    }
+    if ([FormPropertyType.select, FormPropertyType.radios].includes(type)) {
+      this.propertyFormGroup.get('items').enable({emitEvent: false});
+      if (type === FormPropertyType.select) {
+        this.propertyFormGroup.get('multiple').enable({emitEvent: false});
+        const multiple: boolean = this.propertyFormGroup.get('multiple').value;
+        if (multiple) {
+          this.propertyFormGroup.get('allowEmptyOption').disable({emitEvent: false});
+          this.propertyFormGroup.get('minItems').enable({emitEvent: false});
+          this.propertyFormGroup.get('maxItems').enable({emitEvent: false});
+        } else {
+          this.propertyFormGroup.get('allowEmptyOption').enable({emitEvent: false});
+          this.propertyFormGroup.get('minItems').disable({emitEvent: false});
+          this.propertyFormGroup.get('maxItems').disable({emitEvent: false});
+        }
+      }
+    } else {
+      this.propertyFormGroup.get('multiple').disable({emitEvent: false});
+      this.propertyFormGroup.get('allowEmptyOption').disable({emitEvent: false});
+      this.propertyFormGroup.get('minItems').disable({emitEvent: false});
+      this.propertyFormGroup.get('maxItems').disable({emitEvent: false});
+      this.propertyFormGroup.get('items').disable({emitEvent: false});
+    }
+    if (type === FormPropertyType.datetime) {
+      this.propertyFormGroup.get('allowClear').enable({emitEvent: false});
+      this.propertyFormGroup.get('dateTimeType').enable({emitEvent: false});
+    } else {
+      this.propertyFormGroup.get('allowClear').disable({emitEvent: false});
+      this.propertyFormGroup.get('dateTimeType').disable({emitEvent: false});
+    }
+    if (type === FormPropertyType.htmlSection) {
+      this.propertyFormGroup.get('htmlContent').enable({emitEvent: false});
+      this.propertyFormGroup.get('htmlClassList').enable({emitEvent: false});
+    } else {
+      this.propertyFormGroup.get('htmlContent').disable({emitEvent: false});
+      this.propertyFormGroup.get('htmlClassList').disable({emitEvent: false});
+    }
+    if ([FormPropertyType.javascript, FormPropertyType.markdown].includes(type)) {
+      this.propertyFormGroup.get('helpId').enable({emitEvent: false});
+    } else {
+      this.propertyFormGroup.get('helpId').disable({emitEvent: false});
+    }
+    if (this.propertyType !== type) {
+      const defaultValue = defaultPropertyValue(type);
+      this.propertyFormGroup.get('default').patchValue(defaultValue, {emitEvent: false});
+      this.propertyType = type;
+      if (type === FormPropertyType.textarea) {
+        if (isUndefinedOrNull(this.propertyFormGroup.get('rows').value)) {
+          this.propertyFormGroup.get('rows').patchValue(2, {emitEvent: false});
+        }
+      }
+      if (type === FormPropertyType.radios) {
+        if (isUndefinedOrNull(this.propertyFormGroup.get('direction').value)) {
+          this.propertyFormGroup.get('direction').patchValue('column', {emitEvent: false});
+        }
+      }
+      if (type === FormPropertyType.datetime) {
+        if (isUndefinedOrNull(this.propertyFormGroup.get('dateTimeType').value)) {
+          this.propertyFormGroup.get('dateTimeType').patchValue('datetime', {emitEvent: false});
+        }
+        if (isUndefinedOrNull(this.propertyFormGroup.get('allowClear').value)) {
+          this.propertyFormGroup.get('allowClear').patchValue(true, {emitEvent: false});
+        }
+      }
+    }
+  }
+
+  private onSelectItemsChange() {
+    const type = this.propertyItemType;
+    const multiple: boolean = this.propertyFormGroup.get('multiple').value;
+    const defaultValue: any = this.propertyFormGroup.get('default').value;
+    const items: FormSelectItem[] = this.propertyFormGroup.get('items').value;
+    if (defaultValue && [FormPropertyType.select, FormPropertyType.radios].includes(type)) {
+      if (multiple && FormPropertyType.select === type) {
+        let targetValue: any[] = defaultValue;
+        targetValue = targetValue.filter(valItem => !!items.find(item => item.value === valItem));
+        this.propertyFormGroup.get('default').patchValue(targetValue, {emitEvent: false});
+      } else {
+        if (!items.find(item => item.value === defaultValue)) {
+          this.propertyFormGroup.get('default').patchValue(null, {emitEvent: false});
+        }
+      }
+    }
+  }
+
+  private onMultipleSelectChange() {
+    const type = this.propertyItemType;
+    const multiple: boolean = this.propertyFormGroup.get('multiple').value;
+    const defaultValue: any = this.propertyFormGroup.get('default').value;
+    if (type === FormPropertyType.select) {
+      if (multiple) {
+        if (defaultValue && !Array.isArray(defaultValue)) {
+          const newVal = [defaultValue];
+          this.propertyFormGroup.get('default').patchValue(newVal, {emitEvent: false});
+        }
+        this.propertyFormGroup.get('allowEmptyOption').patchValue(false, {emitEvent: false});
+        this.propertyFormGroup.get('allowEmptyOption').disable({emitEvent: false})
+        this.propertyFormGroup.get('minItems').enable({emitEvent: false});
+        this.propertyFormGroup.get('maxItems').enable({emitEvent: false});
+      } else {
+        if (defaultValue && Array.isArray(defaultValue)) {
+          const newVal = defaultValue.length ? defaultValue[0] : null;
+          setTimeout(() => {
+            this.propertyFormGroup.get('default').patchValue(newVal, {emitEvent: false});
+          });
+        }
+        this.propertyFormGroup.get('allowEmptyOption').enable({emitEvent: false});
+        this.propertyFormGroup.get('minItems').disable({emitEvent: false});
+        this.propertyFormGroup.get('maxItems').disable({emitEvent: false});
+      }
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-row.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-row.component.html
similarity index 84%
rename from ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-row.component.html
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-row.component.html
index bb63e69d68..95f4a41f2f 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-row.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-row.component.html
@@ -15,7 +15,7 @@
     limitations under the License.
 
 -->
-<div [formGroup]="propertyRowFormGroup" class="tb-form-table-row tb-scada-symbol-metadata-property-row">
+<div [formGroup]="propertyRowFormGroup" class="tb-form-table-row tb-dynamic-form-property-row">
   <mat-form-field class="tb-inline-field tb-id-field" appearance="outline" subscriptSizing="dynamic">
     <input #idInput required matInput formControlName="id" placeholder="{{ 'widget-config.set' | translate }}">
   </mat-form-field>
@@ -24,8 +24,8 @@
   </mat-form-field>
   <mat-form-field class="tb-inline-field tb-type-field fixed-height" appearance="outline" subscriptSizing="dynamic">
     <mat-select formControlName="type">
-      <mat-option *ngFor="let type of scadaSymbolPropertyTypes" [value]="type">
-        {{ scadaSymbolPropertyTypeTranslations.get(type) | translate }}
+      <mat-option *ngFor="let type of formPropertyTypes" [value]="type">
+        {{ formPropertyTypeTranslations.get(type) | translate }}
       </mat-option>
     </mat-select>
   </mat-form-field>
@@ -34,7 +34,7 @@
             mat-icon-button
             #editButton
             (click)="editProperty($event, editButton)"
-            matTooltip="{{ 'scada.property.property-settings' | translate }}"
+            matTooltip="{{ 'dynamic-form.property.property-settings' | translate }}"
             matTooltipPosition="above">
       <mat-icon>settings</mat-icon>
     </button>
@@ -42,7 +42,7 @@
             type="button"
             mat-icon-button
             (click)="propertyRemoved.emit()"
-            matTooltip="{{ 'scada.property.remove-property' | translate }}"
+            matTooltip="{{ 'dynamic-form.property.remove-property' | translate }}"
             matTooltipPosition="above">
       <mat-icon>delete</mat-icon>
     </button>
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-row.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-row.component.scss
similarity index 94%
rename from ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-row.component.scss
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-row.component.scss
index 5c0b4f0166..7ba115b7fe 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-row.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-row.component.scss
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-.tb-scada-symbol-metadata-property-row {
+.tb-dynamic-form-property-row {
   .tb-id-field {
     flex: 1 1 40%;
   }
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-row.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-row.component.ts
similarity index 67%
rename from ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-row.component.ts
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-row.component.ts
index 60a544dc1e..2cd1d10007 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-row.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-row.component.ts
@@ -40,73 +40,43 @@ import {
   ValidatorFn,
   Validators
 } from '@angular/forms';
-import {
-  ScadaSymbolProperty,
-  ScadaSymbolPropertyType,
-  scadaSymbolPropertyTypes,
-  scadaSymbolPropertyTypeTranslations
-} from '@home/components/widget/lib/scada/scada-symbol.models';
 import { deepClone } from '@core/utils';
 import { MatButton } from '@angular/material/button';
 import { TbPopoverService } from '@shared/components/popover.service';
-import { constantColor, Font } from '@shared/models/widget-settings.models';
 import {
-  ScadaSymbolPropertyPanelComponent
-} from '@home/pages/scada-symbol/metadata-components/scada-symbol-property-panel.component';
+  defaultPropertyValue,
+  FormProperty,
+  FormPropertyType,
+  formPropertyTypes,
+  formPropertyTypeTranslations, propertyValid
+} from '@shared/models/dynamic-form.models';
+import {
+  DynamicFormPropertiesComponent
+} from '@home/components/widget/lib/settings/common/dynamic-form/dynamic-form-properties.component';
 import {
-  ScadaSymbolPropertiesComponent
-} from '@home/pages/scada-symbol/metadata-components/scada-symbol-properties.component';
+  DynamicFormPropertyPanelComponent
+} from '@home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
-export const propertyValid = (property: ScadaSymbolProperty): boolean => !(!property.id || !property.name || !property.type);
-
-export const defaultPropertyValue = (type: ScadaSymbolPropertyType): any => {
-  switch (type) {
-    case ScadaSymbolPropertyType.text:
-      return '';
-    case ScadaSymbolPropertyType.number:
-      return 0;
-    case ScadaSymbolPropertyType.switch:
-      return false;
-    case ScadaSymbolPropertyType.color:
-      return '#000';
-    case ScadaSymbolPropertyType.color_settings:
-      return constantColor('#000');
-    case ScadaSymbolPropertyType.font:
-      return {
-        size: 12,
-        sizeUnit: 'px',
-        family: 'Roboto',
-        weight: 'normal',
-        style: 'normal',
-        lineHeight: '1'
-      } as Font;
-    case ScadaSymbolPropertyType.units:
-      return '';
-    case ScadaSymbolPropertyType.icon:
-      return 'star';
-  }
-};
-
 @Component({
-  selector: 'tb-scada-symbol-metadata-property-row',
-  templateUrl: './scada-symbol-property-row.component.html',
-  styleUrls: ['./scada-symbol-property-row.component.scss'],
+  selector: 'tb-dynamic-form-property-row',
+  templateUrl: './dynamic-form-property-row.component.html',
+  styleUrls: ['./dynamic-form-property-row.component.scss'],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
-      useExisting: forwardRef(() => ScadaSymbolPropertyRowComponent),
+      useExisting: forwardRef(() => DynamicFormPropertyRowComponent),
       multi: true
     },
     {
       provide: NG_VALIDATORS,
-      useExisting: forwardRef(() => ScadaSymbolPropertyRowComponent),
+      useExisting: forwardRef(() => DynamicFormPropertyRowComponent),
       multi: true
     }
   ],
   encapsulation: ViewEncapsulation.None
 })
-export class ScadaSymbolPropertyRowComponent implements ControlValueAccessor, OnInit, Validator {
+export class DynamicFormPropertyRowComponent implements ControlValueAccessor, OnInit, Validator {
 
   @ViewChild('idInput')
   idInput: ElementRef<HTMLInputElement>;
@@ -114,8 +84,8 @@ export class ScadaSymbolPropertyRowComponent implements ControlValueAccessor, On
   @ViewChild('editButton')
   editButton: MatButton;
 
-  scadaSymbolPropertyTypes = scadaSymbolPropertyTypes;
-  scadaSymbolPropertyTypeTranslations = scadaSymbolPropertyTypeTranslations;
+  formPropertyTypes = formPropertyTypes;
+  formPropertyTypeTranslations = formPropertyTypeTranslations;
 
   @Input()
   disabled: boolean;
@@ -131,7 +101,7 @@ export class ScadaSymbolPropertyRowComponent implements ControlValueAccessor, On
 
   propertyRowFormGroup: UntypedFormGroup;
 
-  modelValue: ScadaSymbolProperty;
+  modelValue: FormProperty;
 
   private propagateChange = (_val: any) => {};
 
@@ -140,7 +110,7 @@ export class ScadaSymbolPropertyRowComponent implements ControlValueAccessor, On
               private popoverService: TbPopoverService,
               private renderer: Renderer2,
               private viewContainerRef: ViewContainerRef,
-              private propertiesComponent: ScadaSymbolPropertiesComponent,
+              private propertiesComponent: DynamicFormPropertiesComponent,
               private destroyRef: DestroyRef) {
   }
 
@@ -157,7 +127,7 @@ export class ScadaSymbolPropertyRowComponent implements ControlValueAccessor, On
     );
     this.propertyRowFormGroup.get('type').valueChanges.pipe(
       takeUntilDestroyed(this.destroyRef)
-    ).subscribe((newType: ScadaSymbolPropertyType) => {
+    ).subscribe((newType: FormPropertyType) => {
       this.onTypeChanged(newType);
     });
   }
@@ -166,7 +136,7 @@ export class ScadaSymbolPropertyRowComponent implements ControlValueAccessor, On
     this.propagateChange = fn;
   }
 
-  registerOnTouched(fn: any): void {
+  registerOnTouched(_fn: any): void {
   }
 
   setDisabledState(isDisabled: boolean): void {
@@ -178,7 +148,7 @@ export class ScadaSymbolPropertyRowComponent implements ControlValueAccessor, On
     }
   }
 
-  writeValue(value: ScadaSymbolProperty): void {
+  writeValue(value: FormProperty): void {
     this.modelValue = value;
     this.propertyRowFormGroup.patchValue(
       {
@@ -204,14 +174,14 @@ export class ScadaSymbolPropertyRowComponent implements ControlValueAccessor, On
         booleanPropertyIds: this.booleanPropertyIds,
         property: deepClone(this.modelValue)
       };
-      const scadaSymbolPropertyPanelPopover = this.popoverService.displayPopover(trigger, this.renderer,
-        this.viewContainerRef, ScadaSymbolPropertyPanelComponent, ['leftOnly', 'leftTopOnly', 'leftBottomOnly'], true, null,
+      const dynamicFormPropertyPanelPopover = this.popoverService.displayPopover(trigger, this.renderer,
+        this.viewContainerRef, DynamicFormPropertyPanelComponent, ['leftOnly', 'leftTopOnly', 'leftBottomOnly'], true, null,
         ctx,
         {},
         {}, {}, true);
-      scadaSymbolPropertyPanelPopover.tbComponentRef.instance.popover = scadaSymbolPropertyPanelPopover;
-      scadaSymbolPropertyPanelPopover.tbComponentRef.instance.propertySettingsApplied.subscribe((property) => {
-        scadaSymbolPropertyPanelPopover.hide();
+      dynamicFormPropertyPanelPopover.tbComponentRef.instance.popover = dynamicFormPropertyPanelPopover;
+      dynamicFormPropertyPanelPopover.tbComponentRef.instance.propertySettingsApplied.subscribe((property) => {
+        dynamicFormPropertyPanelPopover.hide();
         this.propertyRowFormGroup.patchValue(
           {
             id: property.id,
@@ -222,7 +192,7 @@ export class ScadaSymbolPropertyRowComponent implements ControlValueAccessor, On
         this.modelValue = property;
         this.propagateChange(this.modelValue);
       });
-      scadaSymbolPropertyPanelPopover.tbDestroy.subscribe(() => {
+      dynamicFormPropertyPanelPopover.tbDestroy.subscribe(() => {
         if (!propertyValid(this.modelValue)) {
           editCanceled();
         }
@@ -240,7 +210,7 @@ export class ScadaSymbolPropertyRowComponent implements ControlValueAccessor, On
     this.editProperty(null, this.editButton, true, onCanceled);
   }
 
-  public validate(c: UntypedFormControl) {
+  public validate(_c: UntypedFormControl) {
     const idControl = this.propertyRowFormGroup.get('id');
     if (idControl.hasError('propertyIdNotUnique')) {
       idControl.updateValueAndValidity({onlySelf: false, emitEvent: false});
@@ -251,7 +221,7 @@ export class ScadaSymbolPropertyRowComponent implements ControlValueAccessor, On
         propertyIdNotUnique: true
       };
     }
-    const property: ScadaSymbolProperty = {...this.modelValue, ...this.propertyRowFormGroup.value};
+    const property: FormProperty = {...this.modelValue, ...this.propertyRowFormGroup.value};
     if (!propertyValid(property)) {
       return {
         property: true
@@ -276,13 +246,13 @@ export class ScadaSymbolPropertyRowComponent implements ControlValueAccessor, On
     };
   }
 
-  private onTypeChanged(newType: ScadaSymbolPropertyType) {
+  private onTypeChanged(newType: FormPropertyType) {
     this.modelValue = {...this.modelValue, ...{type: newType}};
     this.modelValue.default = defaultPropertyValue(newType);
   }
 
   private updateModel() {
-    const value: ScadaSymbolProperty = this.propertyRowFormGroup.value;
+    const value: FormProperty = this.propertyRowFormGroup.value;
     this.modelValue = {...this.modelValue, ...value};
     this.propagateChange(this.modelValue);
   }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-item-row.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-item-row.component.html
new file mode 100644
index 0000000000..5691ba532b
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-item-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]="selectItemRowFormGroup" class="tb-form-table-row tb-dynamic-form-select-item-row">
+  <tb-value-input class="tb-value-field"
+                  shortBooleanField
+                  [allowedValueTypes]="[ValueType.STRING, ValueType.INTEGER, ValueType.DOUBLE, ValueType.BOOLEAN]"
+                  formControlName="value">
+  </tb-value-input>
+  <mat-form-field class="tb-inline-field tb-label-field" appearance="outline" subscriptSizing="dynamic">
+    <input required matInput formControlName="label" placeholder="{{ 'widget-config.set' | translate }}">
+  </mat-form-field>
+  <div class="tb-form-table-row-cell-buttons">
+    <button *ngIf="!disabled"
+            type="button"
+            mat-icon-button
+            (click)="selectItemRemoved.emit()"
+            matTooltip="{{ 'dynamic-form.property.remove-option' | 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/dynamic-form/dynamic-form-select-item-row.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-item-row.component.scss
new file mode 100644
index 0000000000..7d9322262a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-item-row.component.scss
@@ -0,0 +1,23 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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-dynamic-form-select-item-row {
+  .tb-value-field {
+    flex: 1 1 70%;
+  }
+  .tb-label-field {
+    flex: 1 1 30%;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-item-row.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-item-row.component.ts
new file mode 100644
index 0000000000..9db318f475
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-item-row.component.ts
@@ -0,0 +1,171 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, DestroyRef,
+  EventEmitter,
+  forwardRef,
+  Input,
+  OnInit,
+  Output,
+  ViewEncapsulation
+} from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validator,
+  ValidatorFn,
+  Validators
+} from '@angular/forms';
+import { isDefinedAndNotNull } from '@core/utils';
+import { FormSelectItem } from '@shared/models/dynamic-form.models';
+import {
+  DynamicFormSelectItemsComponent
+} from '@home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-items.component';
+import { ValueType } from '@shared/models/constants';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+export const selectItemValid = (item: FormSelectItem): boolean => isDefinedAndNotNull(item.value) && !!item.label;
+
+@Component({
+  selector: 'tb-dynamic-form-select-item-row',
+  templateUrl: './dynamic-form-select-item-row.component.html',
+  styleUrls: ['./dynamic-form-select-item-row.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => DynamicFormSelectItemRowComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => DynamicFormSelectItemRowComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class DynamicFormSelectItemRowComponent implements ControlValueAccessor, OnInit, Validator {
+
+  ValueType = ValueType;
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  index: number;
+
+  @Output()
+  selectItemRemoved = new EventEmitter();
+
+  selectItemRowFormGroup: UntypedFormGroup;
+
+  modelValue: FormSelectItem;
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder,
+              private destroyRef: DestroyRef,
+              private cd: ChangeDetectorRef,
+              private selectItemsComponent: DynamicFormSelectItemsComponent) {
+  }
+
+  ngOnInit() {
+    this.selectItemRowFormGroup = this.fb.group({
+      value: [null, [this.selectItemValueValidator()]],
+      label: [null, [Validators.required]]
+    });
+    this.selectItemRowFormGroup.valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(
+      () => this.updateModel()
+    );
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.selectItemRowFormGroup.disable({emitEvent: false});
+    } else {
+      this.selectItemRowFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(value: FormSelectItem): void {
+    this.modelValue = value;
+    this.selectItemRowFormGroup.patchValue(
+      {
+        value: value?.value,
+        label: value?.label
+      }, {emitEvent: false}
+    );
+    this.cd.markForCheck();
+  }
+
+  public validate(_c: UntypedFormControl) {
+    const valueControl = this.selectItemRowFormGroup.get('value');
+    if (valueControl.hasError('itemValueNotUnique')) {
+      valueControl.updateValueAndValidity({onlySelf: false, emitEvent: false});
+    }
+    if (valueControl.hasError('itemValueNotUnique')) {
+      this.selectItemRowFormGroup.get('value').markAsTouched();
+      return {
+        itemValueNotUnique: true
+      };
+    }
+    const item: FormSelectItem = {...this.modelValue, ...this.selectItemRowFormGroup.value};
+    if (!selectItemValid(item)) {
+      return {
+        selectItem: true
+      };
+    }
+    return null;
+  }
+
+  private selectItemValueValidator(): ValidatorFn {
+    return control => {
+      if (!control.value) {
+        return {
+          required: true
+        };
+      }
+      if (!this.selectItemsComponent.selectItemValueUnique(control.value, this.index)) {
+        return {
+          itemValueNotUnique: true
+        };
+      }
+      return null;
+    };
+  }
+
+  private updateModel() {
+    const value: FormSelectItem = this.selectItemRowFormGroup.value;
+    this.modelValue = {...this.modelValue, ...value};
+    this.propagateChange(this.modelValue);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-properties.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-items.component.html
similarity index 57%
rename from ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-properties.component.html
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-items.component.html
index 684609937e..64918ab339 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-properties.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-items.component.html
@@ -15,27 +15,26 @@
     limitations under the License.
 
 -->
-<div class="tb-form-panel tb-scada-symbol-properties">
+<div class="tb-form-panel tb-dynamic-form-select-items no-border no-padding">
   <div class="tb-form-table">
     <div class="tb-form-table-header" [class.no-padding-right]="!disabled">
-      <div class="tb-form-table-header-cell tb-id-header" translate>scada.property.id</div>
-      <div class="tb-form-table-header-cell tb-name-header" translate>scada.property.name</div>
-      <div class="tb-form-table-header-cell tb-type-header" translate>scada.property.type</div>
+      <div class="tb-form-table-header-cell tb-value-header" translate>dynamic-form.property.value</div>
+      <div class="tb-form-table-header-cell tb-label-header" translate>dynamic-form.property.label</div>
       <div class="tb-form-table-header-cell tb-actions-header" [class.disabled]="disabled"></div>
     </div>
-    <div *ngIf="propertiesFormArray().controls.length; else noProperties" class="tb-form-table-body tb-drop-list"
+    <div *ngIf="selectItemsFormArray().controls.length; else noSelectItems" class="tb-form-table-body tb-drop-list"
          cdkDropList cdkDropListOrientation="vertical"
          [cdkDropListDisabled]="!dragEnabled"
-         (cdkDropListDropped)="propertyDrop($event)">
+         (cdkDropListDropped)="selectItemDrop($event)">
       <div cdkDrag [cdkDragDisabled]="!dragEnabled"
+           [class.tb-draggable]="!disabled"
            [class.tb-draggable-form-table-row]="!disabled"
-           *ngFor="let propertyControl of propertiesFormArray().controls; trackBy: trackByProperty; let $index = index;">
-        <tb-scada-symbol-metadata-property-row class="flex-1"
-                                               [index]="$index"
-                                               [booleanPropertyIds]="booleanPropertyIds"
-                                               [formControl]="propertyControl"
-                                               (propertyRemoved)="removeProperty($index)">
-        </tb-scada-symbol-metadata-property-row>
+           *ngFor="let selectItemControl of selectItemsFormArray().controls; trackBy: trackBySelectItem; let $index = index;">
+        <tb-dynamic-form-select-item-row class="flex-1"
+                                         [index]="$index"
+                                         [formControl]="selectItemControl"
+                                         (selectItemRemoved)="removeSelectItem($index)">
+        </tb-dynamic-form-select-item-row>
         <div class="tb-form-table-row-cell-buttons">
           <button mat-icon-button
                   *ngIf="!disabled"
@@ -52,12 +51,12 @@
     <tb-error *ngIf="errorText" noMargin [error]="errorText" style="padding-left: 12px;"></tb-error>
   </div>
   <div *ngIf="!disabled">
-    <button type="button" mat-stroked-button color="primary" (click)="addProperty()">
-      {{ 'scada.property.add-property' | translate }}
+    <button type="button" mat-stroked-button color="primary" (click)="addSelectItem()">
+      {{ 'dynamic-form.property.add-option' | translate }}
     </button>
   </div>
 </div>
 
-<ng-template #noProperties>
-  <span class="tb-prompt flex items-center justify-center">{{ 'scada.property.no-properties' | translate }}</span>
+<ng-template #noSelectItems>
+  <span class="tb-prompt flex items-center justify-center">{{ 'dynamic-form.property.no-options' | translate }}</span>
 </ng-template>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-items.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-items.component.scss
new file mode 100644
index 0000000000..450056d2d6
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-items.component.scss
@@ -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.
+ */
+.tb-dynamic-form-select-items {
+  flex: 1;
+  .tb-form-table-header-cell {
+    &.tb-value-header {
+      flex: 1 1 70%;
+    }
+    &.tb-label-header {
+      flex: 1 1 30%;
+    }
+    &.tb-actions-header {
+      width: 80px;
+      min-width: 80px;
+      &.disabled {
+        width: 0;
+        min-width: 0;
+      }
+    }
+  }
+  .tb-form-table {
+    overflow: hidden;
+  }
+  .tb-form-table-body {
+    overflow: auto;
+    tb-dynamic-form-select-item-row {
+      overflow: hidden;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-items.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-items.component.ts
new file mode 100644
index 0000000000..42245e65f0
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-items.component.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 {
+  Component, DestroyRef,
+  forwardRef,
+  HostBinding,
+  Input,
+  OnInit,
+  QueryList,
+  ViewChildren,
+  ViewEncapsulation
+} from '@angular/core';
+import {
+  AbstractControl,
+  ControlValueAccessor,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  UntypedFormArray,
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validator
+} from '@angular/forms';
+import { CdkDragDrop } from '@angular/cdk/drag-drop';
+import { TranslateService } from '@ngx-translate/core';
+import { FormSelectItem } from '@shared/models/dynamic-form.models';
+import {
+  DynamicFormSelectItemRowComponent,
+  selectItemValid
+} from '@home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-item-row.component';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+@Component({
+  selector: 'tb-dynamic-form-select-items',
+  templateUrl: './dynamic-form-select-items.component.html',
+  styleUrls: ['./dynamic-form-select-items.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => DynamicFormSelectItemsComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => DynamicFormSelectItemsComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class DynamicFormSelectItemsComponent implements ControlValueAccessor, OnInit, Validator {
+
+  @HostBinding('style.display') styleDisplay = 'flex';
+  @HostBinding('style.overflow') styleOverflow = 'hidden';
+
+  @ViewChildren(DynamicFormSelectItemRowComponent)
+  selectItemRows: QueryList<DynamicFormSelectItemRowComponent>;
+
+  @Input()
+  disabled: boolean;
+
+  selectItemsFormGroup: UntypedFormGroup;
+
+  errorText = '';
+
+  get dragEnabled(): boolean {
+    return !this.disabled && this.selectItemsFormArray().controls.length > 1;
+  }
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder,
+              private destroyRef: DestroyRef,
+              private translate: TranslateService) {
+  }
+
+  ngOnInit() {
+    this.selectItemsFormGroup = this.fb.group({
+      selectItems: this.fb.array([])
+    });
+    this.selectItemsFormGroup.valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(
+      () => {
+        let items: FormSelectItem[] = this.selectItemsFormGroup.get('selectItems').value;
+        if (items) {
+          items = items.filter(i => selectItemValid(i));
+        }
+        this.propagateChange(items);
+      }
+    );
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.selectItemsFormGroup.disable({emitEvent: false});
+    } else {
+      this.selectItemsFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(value: FormSelectItem[] | undefined): void {
+    const items= value || [];
+    this.selectItemsFormGroup.setControl('selectItems', this.prepareSelectItemsFormArray(items), {emitEvent: false});
+  }
+
+  public validate(_c: UntypedFormControl) {
+    this.errorText = '';
+    const itemsArray = this.selectItemsFormGroup.get('selectItems') as UntypedFormArray;
+    const notUniqueControls =
+      itemsArray.controls.filter(control => control.hasError('itemValueNotUnique'));
+    for (const control of notUniqueControls) {
+      control.updateValueAndValidity({onlySelf: false, emitEvent: false});
+      if (control.hasError('itemValueNotUnique')) {
+        this.errorText = this.translate.instant('dynamic-form.property.not-unique-select-option-value-error');
+      }
+    }
+    let valid =  this.selectItemsFormGroup.valid;
+    if (valid) {
+      const items: FormSelectItem[] = this.selectItemsFormGroup.get('selectItems').value;
+      valid = !items.some(item => !selectItemValid(item));
+    }
+
+    return valid ? null : {
+      selectItems: {
+        valid: false,
+      },
+    };
+  }
+
+  public selectItemValueUnique(value: any, index: number): boolean {
+    const itemsArray = this.selectItemsFormGroup.get('selectItems') as UntypedFormArray;
+    for (let i = 0; i < itemsArray.controls.length; i++) {
+      if (i !== index) {
+        const otherControl = itemsArray.controls[i];
+        if (value === otherControl.value.value) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
+  selectItemDrop(event: CdkDragDrop<string[]>) {
+    const itemsArray = this.selectItemsFormGroup.get('selectItems') as UntypedFormArray;
+    const item = itemsArray.at(event.previousIndex);
+    itemsArray.removeAt(event.previousIndex, {emitEvent: false});
+    itemsArray.insert(event.currentIndex, item, {emitEvent: true});
+  }
+
+  selectItemsFormArray(): UntypedFormArray {
+    return this.selectItemsFormGroup.get('selectItems') as UntypedFormArray;
+  }
+
+  trackBySelectItem(_index: number, selectItemControl: AbstractControl): any {
+    return selectItemControl;
+  }
+
+  removeSelectItem(index: number, emitEvent = true) {
+    (this.selectItemsFormGroup.get('selectItems') as UntypedFormArray).removeAt(index, {emitEvent});
+  }
+
+  addSelectItem() {
+    const item: FormSelectItem = {
+      value: '',
+      label: ''
+    };
+    const itemsArray = this.selectItemsFormGroup.get('selectItems') as UntypedFormArray;
+    const itemControl = this.fb.control(item, []);
+    itemsArray.push(itemControl);
+  }
+
+  private prepareSelectItemsFormArray(items: FormSelectItem[] | undefined): UntypedFormArray {
+    const selectItemsControls: Array<AbstractControl> = [];
+    if (items) {
+      items.forEach((item) => {
+        selectItemsControls.push(this.fb.control(item, []));
+      });
+    }
+    return this.fb.array(selectItemsControls);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form.component.html
new file mode 100644
index 0000000000..e598fd02db
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form.component.html
@@ -0,0 +1,266 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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.!hidden]="!propertyGroups?.length && !propertiesContent.children?.length" class="tb-form-panel"
+     [class.stroked]="stroked" [class.no-padding]="noPadding" [class.no-border]="noBorder"
+     [formGroup]="propertiesFormGroup">
+  <div *ngIf="title" class="tb-form-panel-title">{{ title }}</div>
+  <ng-container #propertiesContent><ng-content select=".tb-properties-content"></ng-content></ng-container>
+  <ng-container *ngFor="let propertyGroup of propertyGroups">
+    <ng-container *ngIf="propertyGroup.visible">
+      <div *ngIf="propertyGroup.title" class="tb-form-panel stroked">
+        <mat-expansion-panel class="tb-settings" expanded>
+          <mat-expansion-panel-header class="flex flex-row flex-wrap">
+            <mat-panel-title>
+              <div class="tb-form-panel-title">{{ propertyGroup.title | customTranslate }}</div>
+            </mat-panel-title>
+          </mat-expansion-panel-header>
+          <ng-template matExpansionPanelContent>
+            <ng-container *ngTemplateOutlet="propertyContainersTpl; context:{propertyContainers: propertyGroup.containers}"></ng-container>
+          </ng-template>
+        </mat-expansion-panel>
+      </div>
+      <ng-container *ngIf="!propertyGroup.title">
+        <ng-container *ngTemplateOutlet="propertyContainersTpl; context:{propertyContainers: propertyGroup.containers}"></ng-container>
+      </ng-container>
+    </ng-container>
+  </ng-container>
+</div>
+
+<ng-template #propertyContainersTpl let-propertyContainers="propertyContainers">
+  <ng-container *ngFor="let propertyContainer of propertyContainers" [formGroup]="propertiesFormGroup">
+    <ng-container *ngIf="propertyContainer.visible">
+      <ng-container *ngIf="propertyContainer.type === FormPropertyContainerType.field">
+        <ng-container *ngTemplateOutlet="propertyFieldTpl;context:{property: propertyContainer.property}">
+        </ng-container>
+      </ng-container>
+      <ng-container *ngIf="propertyContainer.type === FormPropertyContainerType.row">
+        <ng-container *ngTemplateOutlet="propertyRowTpl;context:{propertyRow: propertyContainer}">
+        </ng-container>
+      </ng-container>
+      <tb-dynamic-form *ngIf="propertyContainer.type === FormPropertyContainerType.fieldset"
+                       formControlName="{{ propertyContainer.property.id }}"
+                       title="{{ propertyContainer.label | customTranslate }}"
+                       stroked
+                       [properties]="propertyContainer.properties">
+      </tb-dynamic-form>
+      <ng-container *ngIf="propertyContainer.type === FormPropertyContainerType.array">
+        <div *ngIf="propertyContainer.arrayItemProperty.type === FormPropertyType.image" class="tb-form-row flex-1">
+          <tb-multiple-gallery-image-input
+            class="flex-1"
+            label="{{ propertyContainer.property.name | customTranslate }}"
+            formControlName="{{ propertyContainer.property.id }}"
+            [required]="propertyContainer.property.required">
+          </tb-multiple-gallery-image-input>
+        </div>
+        <tb-dynamic-form-array *ngIf="propertyContainer.arrayItemProperty.type !== FormPropertyType.image"
+                       formControlName="{{ propertyContainer.property.id }}"
+                       [itemProperty]="propertyContainer.arrayItemProperty"
+                       title="{{ propertyContainer.label | customTranslate }}">
+        </tb-dynamic-form-array>
+      </ng-container>
+      <ng-container *ngIf="propertyContainer.type === FormPropertyContainerType.htmlSection">
+        <div [innerHTML]="propertyContainer.safeHtml" [class]="propertyContainer.htmlClass"></div>
+      </ng-container>
+    </ng-container>
+  </ng-container>
+</ng-template>
+
+<ng-template #propertyFieldTpl let-property="property">
+  <div [formGroup]="propertiesFormGroup" class="tb-form-row no-border no-padding tb-standard-fields">
+    <ng-container *ngTemplateOutlet="inputFieldTpl;context:{property: property, singleField: true}">
+    </ng-container>
+  </div>
+</ng-template>
+
+<ng-template #propertyRowTpl let-propertyRow="propertyRow">
+  <div [formGroup]="propertiesFormGroup" class="tb-form-row space-between overflow-auto" [class]="propertyRow.rowClass">
+    <mat-slide-toggle *ngIf="propertyRow.switch && propertyRow.switch.visible"
+                      class="mat-slide fixed-title-width margin" formControlName="{{ propertyRow.switch.id }}">
+      {{ propertyRow.label | customTranslate }}
+    </mat-slide-toggle>
+    <div *ngIf="!propertyRow.switch" class="fixed-title-width fixed-title-height">{{ propertyRow.label | customTranslate }}</div>
+    <div *ngIf="propertyRow.properties.length" class="tb-flex" [class]="propertyRow.propertiesRowClass">
+      <ng-container *ngFor="let property of propertyRow.properties">
+        <ng-container *ngIf="property.visible">
+          <div *ngIf="property.subLabel" class="tb-small-label">{{ property.subLabel | customTranslate }}</div>
+          <ng-container *ngIf="isInputFieldPropertyType(property.type)">
+            <ng-container *ngTemplateOutlet="inputFieldTpl;context:{property: property, singleField: false}">
+            </ng-container>
+          </ng-container>
+          <tb-color-input *ngIf="property.type === FormPropertyType.color"
+                          [required]="property.required"
+                          [class]="property.fieldClass"
+                          asBoxInput
+                          colorClearButton
+                          formControlName="{{ property.id }}">
+          </tb-color-input>
+          <tb-color-settings *ngIf="property.type === FormPropertyType.color_settings"
+                             [class]="property.fieldClass"
+                             formControlName="{{ property.id }}"
+                             settingsKey="{{ property.name | customTranslate }}">
+          </tb-color-settings>
+          <tb-font-settings *ngIf="property.type === FormPropertyType.font"
+                            [class]="property.fieldClass"
+                            formControlName="{{ property.id }}"
+                            clearButton
+                            disabledLineHeight>
+          </tb-font-settings>
+          <tb-unit-input *ngIf="property.type === FormPropertyType.units"
+                         [class]="property.fieldClass"
+                         [required]="property.required"
+                         formControlName="{{ property.id }}"></tb-unit-input>
+          <tb-material-icon-select *ngIf="property.type === FormPropertyType.icon"
+                                   [required]="property.required"
+                                   asBoxInput
+                                   formControlName="{{ property.id }}">
+          </tb-material-icon-select>
+          <mat-divider *ngIf="property.divider" vertical></mat-divider>
+        </ng-container>
+      </ng-container>
+    </div>
+  </div>
+</ng-template>
+
+<ng-template #inputFieldTpl let-property="property" let-singleField="singleField">
+  <ng-container [formGroup]="propertiesFormGroup">
+    <mat-form-field  *ngIf="property.type === FormPropertyType.textarea"
+                     [class]="singleField ? 'flex' : property.fieldClass"
+                     [floatLabel]="singleField ? 'always' : 'auto'"
+                     appearance="outline" subscriptSizing="dynamic">
+      <mat-label *ngIf="singleField">{{ property.name | customTranslate }}</mat-label>
+      <textarea matInput
+                [rows]="property.rows || 2"
+                formControlName="{{ property.id }}"
+                [required]="property.required"
+                placeholder="{{ 'widget-config.set' | translate }}"></textarea>
+    </mat-form-field>
+    <mat-form-field *ngIf="[FormPropertyType.text, FormPropertyType.password].includes(property.type)"
+                    [class]="singleField ? 'flex' : property.fieldClass"
+                    [floatLabel]="singleField ? 'always' : 'auto'"
+                    appearance="outline" subscriptSizing="dynamic">
+      <mat-label *ngIf="singleField">{{ property.name | customTranslate }}</mat-label>
+      <input matInput
+             [type]="property.type"
+             formControlName="{{ property.id }}"
+             [required]="property.required"
+             placeholder="{{ 'widget-config.set' | translate }}">
+      <div class="lt-md:!hidden" matSuffix *ngIf="property.fieldSuffix">{{ property.fieldSuffix | customTranslate }}</div>
+    </mat-form-field>
+    <mat-form-field *ngIf="property.type === FormPropertyType.number"
+                    [class]="singleField ? 'flex' : property.fieldClass"
+                    class="number"
+                    [floatLabel]="singleField ? 'always' : 'auto'"
+                    appearance="outline" subscriptSizing="dynamic">
+      <mat-label *ngIf="singleField">{{ property.name | customTranslate }}</mat-label>
+      <input matInput
+             type="number"
+             formControlName="{{ property.id }}"
+             [required]="property.required"
+             [min]="property.min"
+             [max]="property.max"
+             [step]="property.step"
+             placeholder="{{ 'widget-config.set' | translate }}">
+      <div class="lt-md:!hidden" matSuffix *ngIf="property.fieldSuffix">{{ property.fieldSuffix | customTranslate }}</div>
+    </mat-form-field>
+    <mat-form-field *ngIf="property.type === FormPropertyType.select"
+                    [class]="singleField ? 'flex' : (property.fieldClass || 'medium-width')"
+                    [floatLabel]="singleField ? 'always' : 'auto'"
+                    appearance="outline" subscriptSizing="dynamic">
+      <mat-label *ngIf="singleField">{{ property.name | customTranslate }}</mat-label>
+      <mat-select formControlName="{{ property.id }}"
+                  [required]="property.required"
+                  [multiple]="property.multiple">
+        <mat-option *ngIf="!property.multiple && property.allowEmptyOption" [value]="null"></mat-option>
+        <mat-option *ngFor="let item of property.items" [value]="item.value">
+          {{ item.label | customTranslate }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+    <tb-datetime *ngIf="property.type === FormPropertyType.datetime"
+                 [fieldClass]="singleField ? 'flex' : property.fieldClass"
+                 [class.flex-1]="singleField || property.fieldClass?.includes('flex')"
+                 [floatLabel]="singleField ? 'always' : 'auto'"
+                 [showLabel]="singleField"
+                 [dateText]="singleField ? (property.name | customTranslate) : ''"
+                 [allowClear]="property.allowClear"
+                 [required]="property.required"
+                 appearance="outline"
+                 subscriptSizing="dynamic"
+                 [type]="property.dateTimeType"
+                 formControlName="{{ property.id }}">
+    </tb-datetime>
+    <div *ngIf="property.type === FormPropertyType.javascript" class="tb-form-row flex-1">
+      <tb-js-func class="flex-1"
+                  label="{{ property.name | customTranslate }}"
+                  disableUndefinedCheck
+                  [required]="property.required"
+                  [helpId]="property.helpId"
+                  formControlName="{{ property.id }}">
+      </tb-js-func>
+    </div>
+    <div *ngIf="property.type === FormPropertyType.json" class="tb-form-row flex-1">
+      <tb-json-content class="flex-1"
+                       label="{{ property.name | customTranslate }}"
+                       [required]="property.required"
+                       [contentType]="ContentType.JSON"
+                       formControlName="{{ property.id }}">
+      </tb-json-content>
+    </div>
+    <div *ngIf="property.type === FormPropertyType.html" class="tb-form-row flex-1">
+      <tb-html class="flex-1"
+               label="{{ property.name | customTranslate }}"
+               [required]="property.required"
+               formControlName="{{ property.id }}">
+      </tb-html>
+    </div>
+    <div *ngIf="property.type === FormPropertyType.css" class="tb-form-row flex-1">
+      <tb-css class="flex-1"
+              label="{{ property.name | customTranslate }}"
+              [required]="property.required"
+              formControlName="{{ property.id }}">
+      </tb-css>
+    </div>
+    <div *ngIf="property.type === FormPropertyType.markdown" class="tb-form-row flex-1">
+      <tb-markdown-editor class="flex-1"
+                          label="{{ property.name | customTranslate }}"
+                          [required]="property.required"
+                          [helpId]="property.helpId"
+                          formControlName="{{ property.id }}">
+      </tb-markdown-editor>
+    </div>
+    <div *ngIf="property.type === FormPropertyType.image" class="tb-form-row flex-1">
+      <tb-gallery-image-input
+        class="flex-1"
+        label="{{ property.name | customTranslate }}"
+        formControlName="{{ property.id }}"
+        [required]="property.required">
+      </tb-gallery-image-input>
+    </div>
+    <div *ngIf="property.type === FormPropertyType.radios"
+         class="tb-form-row tb-radios-property column-xs flex-1" [class.direction-column]="property.direction === 'column'">
+      <div tbTruncateWithTooltip class="fixed-title-width fixed-title-height">{{ property.name | customTranslate }}</div>
+      <mat-radio-group class="flex flex-1 flex-wrap" [class.flex-col]="property.direction === 'column'"
+                       [required]="property.required"
+                       formControlName="{{ property.id }}">
+        <mat-radio-button *ngFor="let item of property.items" [value]="item.value">
+          <div tbTruncateWithTooltip>{{ item.label | customTranslate }}</div>
+        </mat-radio-button>
+      </mat-radio-group>
+    </div>
+  </ng-container>
+</ng-template>
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-markdown.tsx b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form.component.scss
similarity index 54%
rename from ui-ngx/src/app/shared/components/json-form/react/json-form-markdown.tsx
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form.component.scss
index 57fb97ae23..90354e904e 100644
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-markdown.tsx
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form.component.scss
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright © 2016-2024 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,21 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as React from 'react';
-import ThingsboardAceEditor from './json-form-ace-editor';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
 
-class ThingsboardMarkdown extends React.Component<JsonFormFieldProps, JsonFormFieldState> {
-
-  constructor(props: JsonFormFieldProps) {
-    super(props);
+:host ::ng-deep {
+  .tb-properties-content {
+    gap: 16px;
+    display: flex;
+    flex-direction: column;
   }
-
-  render() {
-    return (
-      <ThingsboardAceEditor {...this.props} mode='markdown' {...this.state}></ThingsboardAceEditor>
-    );
+  .tb-form-row.tb-radios-property {
+    &.direction-column {
+      flex-direction: column;
+      align-items: flex-start;
+      gap: 4px;
+    }
+    .mat-mdc-radio-group {
+      overflow: hidden;
+      .mat-mdc-radio-button {
+        overflow: hidden;
+        .mdc-form-field {
+          overflow: hidden;
+          width: 100%;
+          .mdc-label {
+            overflow: hidden;
+          }
+        }
+      }
+    }
   }
 }
-
-export default ThingsboardMarkdown;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form.component.ts
new file mode 100644
index 0000000000..432bacf4f1
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form.component.ts
@@ -0,0 +1,301 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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,
+  DestroyRef,
+  forwardRef,
+  Input,
+  OnChanges,
+  OnInit,
+  SimpleChanges
+} from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validator,
+  ValidatorFn,
+  Validators
+} from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { isDefinedAndNotNull, mergeDeep } from '@core/utils';
+import {
+  defaultFormProperties,
+  FormProperty,
+  FormPropertyContainerType,
+  FormPropertyGroup,
+  FormPropertyType,
+  isInputFieldPropertyType,
+  PropertyConditionFunction,
+  toPropertyGroups
+} from '@shared/models/dynamic-form.models';
+import { coerceBoolean } from '@shared/decorators/coercion';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { CustomTranslatePipe } from '@shared/pipe/custom-translate.pipe';
+import { ContentType } from '@shared/models/constants';
+import { DomSanitizer } from '@angular/platform-browser';
+
+@Component({
+  selector: 'tb-dynamic-form',
+  templateUrl: './dynamic-form.component.html',
+  styleUrls: ['./dynamic-form.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => DynamicFormComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => DynamicFormComponent),
+      multi: true
+    }
+  ]
+})
+export class DynamicFormComponent implements OnInit, OnChanges, ControlValueAccessor, Validator {
+
+  isInputFieldPropertyType = isInputFieldPropertyType;
+
+  FormPropertyContainerType = FormPropertyContainerType;
+
+  FormPropertyType = FormPropertyType;
+
+  ContentType = ContentType;
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  properties: FormProperty[];
+
+  @Input()
+  title: string;
+
+  @Input()
+  @coerceBoolean()
+  isArrayItem = false;
+
+  @Input()
+  @coerceBoolean()
+  stroked = false;
+
+  @Input()
+  @coerceBoolean()
+  noPadding = false;
+
+  @Input()
+  @coerceBoolean()
+  noBorder = false;
+
+  private modelValue: {[id: string]: any};
+
+  private propagateChange = null;
+
+  private validatorTriggers: string[];
+
+  public propertiesFormGroup: UntypedFormGroup;
+
+  propertyGroups: FormPropertyGroup[];
+
+  constructor(protected store: Store<AppState>,
+              private customTranslate: CustomTranslatePipe,
+              private sanitizer: DomSanitizer,
+              private destroyRef: DestroyRef,
+              private fb: UntypedFormBuilder,
+              private cd: ChangeDetectorRef) {
+  }
+
+  ngOnInit(): void {
+    this.propertiesFormGroup = this.fb.group({
+    });
+    this.propertiesFormGroup.valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(() => {
+      this.updateModel();
+    });
+    this.loadMetadata();
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    for (const propName of Object.keys(changes)) {
+      const change = changes[propName];
+      if (!change.firstChange && change.currentValue !== change.previousValue) {
+        if (['properties'].includes(propName)) {
+          this.loadMetadata();
+        }
+      }
+    }
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.propertiesFormGroup.disable({emitEvent: false});
+    } else {
+      this.propertiesFormGroup.enable({emitEvent: false});
+      this.updateControlsState();
+    }
+  }
+
+  writeValue(value: {[id: string]: any}): void {
+    this.modelValue = value || {};
+    this.setupValue();
+  }
+
+  validate(_c: UntypedFormControl) {
+    const valid = this.propertiesFormGroup.valid;
+    return valid ? null : {
+      properties: {
+        valid: false,
+      },
+    };
+  }
+
+  private loadMetadata() {
+    this.validatorTriggers = [];
+    this.propertyGroups = [];
+
+    for (const control of Object.keys(this.propertiesFormGroup.controls)) {
+      this.propertiesFormGroup.removeControl(control, {emitEvent: false});
+    }
+    if (this.properties) {
+      for (let property of this.properties) {
+        property.disabled = false;
+        property.visible = true;
+        if (property.condition) {
+          try {
+            property.conditionFunction = new Function('property', 'model', property.condition) as PropertyConditionFunction;
+          } catch (_e) {
+          }
+        }
+      }
+      this.propertyGroups = toPropertyGroups(this.properties, this.isArrayItem, this.customTranslate, this.sanitizer);
+      for (const property of this.properties) {
+        if (property.type !== FormPropertyType.htmlSection) {
+          if (property.disableOnProperty) {
+            if (!this.validatorTriggers.includes(property.disableOnProperty)) {
+              this.validatorTriggers.push(property.disableOnProperty);
+            }
+          }
+          const validators: ValidatorFn[] = [];
+          if (property.required) {
+            validators.push(Validators.required);
+          }
+          if (property.type === FormPropertyType.number) {
+            if (isDefinedAndNotNull(property.min)) {
+              validators.push(Validators.min(property.min));
+            }
+            if (isDefinedAndNotNull(property.max)) {
+              validators.push(Validators.max(property.max));
+            }
+          }
+          if (property.type === FormPropertyType.select) {
+            if (property.multiple) {
+              if (isDefinedAndNotNull(property.minItems)) {
+                validators.push(Validators.minLength(property.minItems));
+              }
+              if (isDefinedAndNotNull(property.maxItems)) {
+                validators.push(Validators.maxLength(property.maxItems));
+              }
+            }
+          }
+          this.propertiesFormGroup.addControl(property.id, this.fb.control(null, validators), {emitEvent: false});
+        }
+      }
+    }
+    this.setupValue();
+    this.cd.markForCheck();
+  }
+
+  private calculateControlsState(updateControls = false) {
+    for (const trigger of this.validatorTriggers) {
+      const value: boolean = this.propertiesFormGroup.get(trigger).value;
+      this.properties.filter(p => p.disableOnProperty === trigger).forEach(
+        (p) => {
+          p.disabled = !value;
+        }
+      );
+    }
+    if (this.properties) {
+      for (let property of this.properties) {
+        if (property.conditionFunction) {
+          property.visible = property.conditionFunction(property, this.modelValue);
+        }
+      }
+      this.propertyGroups.forEach(g => {
+        g.containers.forEach(container => {
+          if ([FormPropertyContainerType.fieldset, FormPropertyContainerType.field, FormPropertyContainerType.htmlSection, FormPropertyContainerType.array].includes(container.type)) {
+            container.visible = container.property.visible;
+          } else {
+            container.visible = container.switch?.visible || container.properties.some(p => p.visible);
+          }
+        });
+        g.visible = g.containers.some(c => c.visible);
+      });
+    }
+    if (updateControls) {
+      this.updateControlsState();
+    }
+  }
+
+  private updateControlsState() {
+    if (this.properties) {
+      for (let property of this.properties) {
+        if (property.type !== FormPropertyType.htmlSection) {
+          const control = this.propertiesFormGroup.get(property.id);
+          if (property.visible && !property.disabled) {
+            control.enable({emitEvent: false});
+            control.updateValueAndValidity({emitEvent: false});
+          } else {
+            control.disable({emitEvent: false});
+          }
+        }
+      }
+    }
+  }
+
+  private setupValue() {
+    if (this.properties) {
+      const defaults = defaultFormProperties(this.properties);
+      this.modelValue = mergeDeep<{[id: string]: any}>(defaults, this.modelValue);
+      this.propertiesFormGroup.patchValue(
+        this.modelValue, {emitEvent: false}
+      );
+      this.calculateControlsState();
+      this.setDisabledState(this.disabled);
+    }
+  }
+
+  private updateModel() {
+    this.modelValue = this.propertiesFormGroup.getRawValue();
+    this.calculateControlsState(true);
+    this.propagateChange(this.modelValue);
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.component.html
index c8a0c5cb2a..41c40f8623 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.component.html
@@ -36,58 +36,11 @@
       </ng-container>
     </ng-container>
   </div>
-  <div [class.!hidden]="!propertyRows?.length && !appearanceProperties.children.length" class="tb-form-panel" formGroupName="properties">
-    <div class="tb-form-panel-title" translate>widget-config.appearance</div>
-    <div #appearanceProperties><ng-content select=".tb-scada-symbol-appearance-properties"></ng-content></div>
-    <div *ngFor="let propertyRow of propertyRows" class="tb-form-row space-between flex-wrap overflow-auto" [class]="propertyRow.rowClass">
-      <mat-slide-toggle *ngIf="propertyRow.switch" class="mat-slide fixed-title-width margin" formControlName="{{ propertyRow.switch.id }}">
-        {{ propertyRow.label | customTranslate }}
-      </mat-slide-toggle>
-      <div *ngIf="!propertyRow.switch" class="fixed-title-width fixed-title-height">{{ propertyRow.label | customTranslate }}</div>
-      <div *ngIf="propertyRow.properties.length" class="tb-flex row flex-end align-center">
-        <ng-container *ngFor="let property of propertyRow.properties">
-          <div *ngIf="property.subLabel" class="tb-small-label">{{ property.subLabel | customTranslate }}</div>
-          <mat-form-field  *ngIf="property.type === ScadaSymbolPropertyType.text" [class]="property.fieldClass" appearance="outline" subscriptSizing="dynamic">
-            <input matInput formControlName="{{ property.id }}" [required]="property.required" placeholder="{{ 'widget-config.set' | translate }}">
-            <div class="lt-md:!hidden" matSuffix *ngIf="property.fieldSuffix">{{ property.fieldSuffix | customTranslate }}</div>
-          </mat-form-field>
-          <tb-color-input *ngIf="property.type === ScadaSymbolPropertyType.color"
-                          [required]="property.required"
-                          [class]="property.fieldClass"
-                          asBoxInput
-                          colorClearButton
-                          formControlName="{{ property.id }}">
-          </tb-color-input>
-          <tb-color-settings *ngIf="property.type === ScadaSymbolPropertyType.color_settings"
-                             [class]="property.fieldClass"
-                             formControlName="{{ property.id }}"
-                             settingsKey="{{ property.name | customTranslate }}">
-          </tb-color-settings>
-          <mat-form-field  *ngIf="property.type === ScadaSymbolPropertyType.number" [class]="property.fieldClass" appearance="outline" class="number" subscriptSizing="dynamic">
-            <input matInput formControlName="{{ property.id }}" [required]="property.required"
-                   [min]="property.min" [max]="property.max" [step]="property.step"
-                   type="number" placeholder="{{ 'widget-config.set' | translate }}">
-            <div class="lt-md:!hidden" matSuffix *ngIf="property.fieldSuffix">{{ property.fieldSuffix | customTranslate }}</div>
-          </mat-form-field>
-          <tb-font-settings *ngIf="property.type === ScadaSymbolPropertyType.font"
-                            [class]="property.fieldClass"
-                            formControlName="{{ property.id }}"
-                            clearButton
-                            disabledLineHeight>
-          </tb-font-settings>
-          <tb-unit-input *ngIf="property.type === ScadaSymbolPropertyType.units"
-                         [class]="property.fieldClass"
-                         [required]="property.required"
-                         formControlName="{{ property.id }}"></tb-unit-input>
-          <tb-material-icon-select *ngIf="property.type === ScadaSymbolPropertyType.icon"
-                                   asBoxInput
-                                   formControlName="{{ property.id }}">
-          </tb-material-icon-select>
-          <mat-divider *ngIf="property.divider" vertical></mat-divider>
-        </ng-container>
-      </div>
-    </div>
-  </div>
+  <tb-dynamic-form formControlName="properties"
+                   title="{{ 'widget-config.appearance' | translate }}"
+                   [properties]="metadata?.properties">
+    <ng-container class="tb-properties-content"><ng-content select=".tb-scada-symbol-appearance-properties"></ng-content></ng-container>
+  </tb-dynamic-form>
 </ng-container>
 
 <ng-template #behaviorsTpl let-behaviors="behaviors">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.component.ts
index 8f4b19d4b4..9268bfc25e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.component.ts
@@ -21,7 +21,6 @@ import {
   forwardRef,
   Input,
   OnChanges,
-  OnDestroy,
   OnInit,
   SimpleChanges
 } from '@angular/core';
@@ -32,9 +31,7 @@ import {
   UntypedFormBuilder,
   UntypedFormControl,
   UntypedFormGroup,
-  Validator,
-  ValidatorFn,
-  Validators
+  Validator
 } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
@@ -43,19 +40,16 @@ import {
   parseScadaSymbolMetadataFromContent,
   ScadaSymbolBehaviorType,
   ScadaSymbolMetadata,
-  ScadaSymbolObjectSettings,
-  ScadaSymbolPropertyType
+  ScadaSymbolObjectSettings
 } from '@home/components/widget/lib/scada/scada-symbol.models';
 import { IAliasController } from '@core/api/widget-api.models';
 import { TargetDevice, widgetType } from '@shared/models/widget.models';
 import { isDefinedAndNotNull, mergeDeepIgnoreArray } from '@core/utils';
 import {
   ScadaSymbolBehaviorGroup,
-  ScadaSymbolPropertyRow,
-  toBehaviorGroups,
-  toPropertyRows
+  toBehaviorGroups
 } from '@home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.models';
-import { merge, Observable, of, Subscription } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { WidgetActionCallbacks } from '@home/components/widget/action/manage-widget-actions.component.models';
 import { ImageService } from '@core/http/image.service';
 import { map } from 'rxjs/operators';
@@ -78,12 +72,10 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
     }
   ]
 })
-export class ScadaSymbolObjectSettingsComponent implements OnInit, OnChanges, ControlValueAccessor, Validator, OnDestroy {
+export class ScadaSymbolObjectSettingsComponent implements OnInit, OnChanges, ControlValueAccessor, Validator {
 
   ScadaSymbolBehaviorType = ScadaSymbolBehaviorType;
 
-  ScadaSymbolPropertyType = ScadaSymbolPropertyType;
-
   @Input()
   disabled: boolean;
 
@@ -112,14 +104,10 @@ export class ScadaSymbolObjectSettingsComponent implements OnInit, OnChanges, Co
 
   private propagateChange = null;
 
-  private validatorTriggers: string[];
-  private validatorSubscription: Subscription;
-
   public scadaSymbolObjectSettingsFormGroup: UntypedFormGroup;
 
   metadata: ScadaSymbolMetadata;
   behaviorGroups: ScadaSymbolBehaviorGroup[];
-  propertyRows: ScadaSymbolPropertyRow[];
 
   constructor(protected store: Store<AppState>,
               private fb: UntypedFormBuilder,
@@ -131,7 +119,7 @@ export class ScadaSymbolObjectSettingsComponent implements OnInit, OnChanges, Co
   ngOnInit(): void {
     this.scadaSymbolObjectSettingsFormGroup = this.fb.group({
       behavior: this.fb.group({}),
-      properties: this.fb.group({})
+      properties: [{}, []]
     });
     this.scadaSymbolObjectSettingsFormGroup.valueChanges.pipe(
       takeUntilDestroyed(this.destroyRef)
@@ -152,13 +140,6 @@ export class ScadaSymbolObjectSettingsComponent implements OnInit, OnChanges, Co
     }
   }
 
-  ngOnDestroy() {
-    if (this.validatorSubscription) {
-      this.validatorSubscription.unsubscribe();
-      this.validatorSubscription = null;
-    }
-  }
-
   registerOnChange(fn: any): void {
     this.propagateChange = fn;
   }
@@ -172,7 +153,6 @@ export class ScadaSymbolObjectSettingsComponent implements OnInit, OnChanges, Co
       this.scadaSymbolObjectSettingsFormGroup.disable({emitEvent: false});
     } else {
       this.scadaSymbolObjectSettingsFormGroup.enable({emitEvent: false});
-      this.updateValidators();
     }
   }
 
@@ -191,12 +171,6 @@ export class ScadaSymbolObjectSettingsComponent implements OnInit, OnChanges, Co
   }
 
   private loadMetadata() {
-    if (this.validatorSubscription) {
-      this.validatorSubscription.unsubscribe();
-      this.validatorSubscription = null;
-    }
-    this.validatorTriggers = [];
-
     let metadata$: Observable<ScadaSymbolMetadata>;
     if (this.scadaSymbolMetadata) {
       metadata$ = of(this.scadaSymbolMetadata);
@@ -217,74 +191,19 @@ export class ScadaSymbolObjectSettingsComponent implements OnInit, OnChanges, Co
       (metadata) => {
         this.metadata = metadata;
         this.behaviorGroups = toBehaviorGroups(this.metadata.behavior);
-        this.propertyRows = toPropertyRows(this.metadata.properties);
         const behaviorFormGroup =  this.scadaSymbolObjectSettingsFormGroup.get('behavior') as UntypedFormGroup;
         for (const control of Object.keys(behaviorFormGroup.controls)) {
           behaviorFormGroup.removeControl(control, {emitEvent: false});
         }
-        const propertiesFormGroup =  this.scadaSymbolObjectSettingsFormGroup.get('properties') as UntypedFormGroup;
-        for (const control of Object.keys(propertiesFormGroup.controls)) {
-          propertiesFormGroup.removeControl(control, {emitEvent: false});
-        }
         for (const behavior of this.metadata.behavior) {
           behaviorFormGroup.addControl(behavior.id, this.fb.control(null, []), {emitEvent: false});
         }
-        for (const property of this.metadata.properties) {
-          if (property.disableOnProperty) {
-            if (!this.validatorTriggers.includes(property.disableOnProperty)) {
-              this.validatorTriggers.push(property.disableOnProperty);
-            }
-          }
-          const validators: ValidatorFn[] = [];
-          if (property.required) {
-            validators.push(Validators.required);
-          }
-          if (property.type === ScadaSymbolPropertyType.number) {
-            if (isDefinedAndNotNull(property.min)) {
-              validators.push(Validators.min(property.min));
-            }
-            if (isDefinedAndNotNull(property.max)) {
-              validators.push(Validators.max(property.max));
-            }
-          }
-          propertiesFormGroup.addControl(property.id, this.fb.control(null, validators), {emitEvent: false});
-        }
-        if (this.validatorTriggers.length) {
-          const observables: Observable<any>[] = [];
-          for (const trigger of this.validatorTriggers) {
-            if (propertiesFormGroup.get(trigger)) {
-              observables.push(propertiesFormGroup.get(trigger).valueChanges);
-            }
-          }
-          if (observables.length) {
-            this.validatorSubscription = merge(...observables).subscribe(() => {
-              this.updateValidators();
-            });
-          }
-        }
         this.setupValue();
         this.cd.markForCheck();
       }
     );
   }
 
-  private updateValidators() {
-    const propertiesFormGroup =  this.scadaSymbolObjectSettingsFormGroup.get('properties') as UntypedFormGroup;
-    for (const trigger of this.validatorTriggers) {
-      const value: boolean = propertiesFormGroup.get(trigger).value;
-      this.metadata.properties.filter(p => p.disableOnProperty === trigger).forEach(
-        (p) => {
-          const control = propertiesFormGroup.get(p.id);
-          if (value) {
-            control.enable({emitEvent: false});
-          } else {
-            control.disable({emitEvent: false});
-          }
-        }
-      );
-    }
-  }
-
   private setupValue() {
     if (this.metadata) {
       const defaults = defaultScadaSymbolObjectSettings(this.metadata);
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.models.ts
index b884166cd2..2116093c59 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.models.ts
@@ -15,9 +15,7 @@
 ///
 
 import {
-  ScadaSymbolBehavior,
-  ScadaSymbolProperty,
-  ScadaSymbolPropertyType
+  ScadaSymbolBehavior
 } from '@home/components/widget/lib/scada/scada-symbol.models';
 
 export interface ScadaSymbolBehaviorGroup {
@@ -25,13 +23,6 @@ export interface ScadaSymbolBehaviorGroup {
   behaviors: ScadaSymbolBehavior[];
 }
 
-export interface ScadaSymbolPropertyRow {
-  label: string;
-  properties: ScadaSymbolProperty[];
-  switch?: ScadaSymbolProperty;
-  rowClass?: string;
-}
-
 export const toBehaviorGroups = (behaviors: ScadaSymbolBehavior[]): ScadaSymbolBehaviorGroup[] => {
   const result: ScadaSymbolBehaviorGroup[] = [];
   for (const behavior of behaviors) {
@@ -54,24 +45,3 @@ export const toBehaviorGroups = (behaviors: ScadaSymbolBehavior[]): ScadaSymbolB
   }
   return result;
 };
-
-export const toPropertyRows = (properties: ScadaSymbolProperty[]): ScadaSymbolPropertyRow[] => {
-  const result: ScadaSymbolPropertyRow[] = [];
-  for (const property of properties) {
-    let propertyRow = result.find(r => r.label === property.name);
-    if (!propertyRow) {
-      propertyRow = {
-        label: property.name,
-        properties: [],
-        rowClass: property.rowClass
-      };
-      result.push(propertyRow);
-    }
-    if (property.type === ScadaSymbolPropertyType.switch) {
-      propertyRow.switch = property;
-    } else {
-      propertyRow.properties.push(property);
-    }
-  }
-  return result;
-};
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 037096f406..627c0b6362 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
@@ -164,6 +164,25 @@ import {
 import {
   WidgetButtonToggleCustomStylePanelComponent
 } from '@home/components/widget/lib/settings/common/button/widget-button-toggle-custom-style-panel.component';
+import {
+  DynamicFormPropertiesComponent
+} from '@home/components/widget/lib/settings/common/dynamic-form/dynamic-form-properties.component';
+import {
+  DynamicFormPropertyRowComponent
+} from '@home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-row.component';
+import {
+  DynamicFormPropertyPanelComponent
+} from '@home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component';
+import { DynamicFormComponent } from '@home/components/widget/lib/settings/common/dynamic-form/dynamic-form.component';
+import {
+  DynamicFormSelectItemsComponent
+} from '@home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-items.component';
+import {
+  DynamicFormSelectItemRowComponent
+} from '@home/components/widget/lib/settings/common/dynamic-form/dynamic-form-select-item-row.component';
+import {
+  DynamicFormArrayComponent
+} from '@home/components/widget/lib/settings/common/dynamic-form/dynamic-form-array.component';
 
 @NgModule({
   declarations: [
@@ -226,7 +245,14 @@ import {
     DataKeyInputComponent,
     EntityAliasInputComponent,
     AdvancedRangeComponent,
-    GradientComponent
+    GradientComponent,
+    DynamicFormPropertiesComponent,
+    DynamicFormPropertyRowComponent,
+    DynamicFormPropertyPanelComponent,
+    DynamicFormSelectItemsComponent,
+    DynamicFormSelectItemRowComponent,
+    DynamicFormComponent,
+    DynamicFormArrayComponent
   ],
   imports: [
     CommonModule,
@@ -293,7 +319,14 @@ import {
     DataKeyInputComponent,
     EntityAliasInputComponent,
     AdvancedRangeComponent,
-    GradientComponent
+    GradientComponent,
+    DynamicFormPropertiesComponent,
+    DynamicFormPropertyRowComponent,
+    DynamicFormPropertyPanelComponent,
+    DynamicFormSelectItemsComponent,
+    DynamicFormSelectItemRowComponent,
+    DynamicFormComponent,
+    DynamicFormArrayComponent
   ],
   providers: [
     ColorSettingsComponentService,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/value-stepper-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/value-stepper-widget-settings.component.html
new file mode 100644
index 0000000000..ebc106794e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/value-stepper-widget-settings.component.html
@@ -0,0 +1,266 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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]="valueStepperWidgetSettingsForm">
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.value-stepper.behavior</div>
+    <div class="tb-form-row">
+      <div class="fixed-title-width" tb-hint-tooltip-icon="{{'widgets.value-stepper.initial-state-hint' | translate}}" translate>widgets.value-stepper.initial-state</div>
+      <tb-get-value-action-settings class="flex-1"
+                                    panelTitle="{{ 'widgets.value-stepper.initial-state' | translate }}"
+                                    [valueType]="valueType.DOUBLE"
+                                    [aliasController]="aliasController"
+                                    [targetDevice]="targetDevice"
+                                    [widgetType]="widgetType"
+                                    formControlName="initialState"></tb-get-value-action-settings>
+    </div>
+    <div class="tb-form-row space-between">
+      <div class="fixed-title-width" tb-hint-tooltip-icon="{{'widgets.value-stepper.left-button-click-hint' | translate}}" translate>widgets.value-stepper.left-button-click</div>
+      <tb-set-value-action-settings class="flex-1"
+                                    panelTitle="{{ 'widgets.value-stepper.left-button-click' | translate }}"
+                                    [valueType]="valueType.DOUBLE"
+                                    [aliasController]="aliasController"
+                                    [targetDevice]="targetDevice"
+                                    [widgetType]="widgetType"
+                                    formControlName="leftButtonClick"></tb-set-value-action-settings>
+    </div>
+    <div class="tb-form-row space-between">
+      <div class="fixed-title-width" tb-hint-tooltip-icon="{{'widgets.value-stepper.right-button-click-hint' | translate}}" translate>widgets.value-stepper.right-button-click</div>
+      <tb-set-value-action-settings class="flex-1"
+                                    panelTitle="{{ 'widgets.value-stepper.right-button-click' | translate }}"
+                                    [valueType]="valueType.DOUBLE"
+                                    [aliasController]="aliasController"
+                                    [targetDevice]="targetDevice"
+                                    [widgetType]="widgetType"
+                                    formControlName="rightButtonClick"></tb-set-value-action-settings>
+    </div>
+    <div class="tb-form-row">
+      <div class="fixed-title-width" tb-hint-tooltip-icon="{{'widgets.button-state.disabled-state-hint' | translate}}" translate>widgets.button-state.disabled-state</div>
+      <tb-get-value-action-settings class="flex-1"
+                                    panelTitle="{{ 'widgets.button-state.disabled-state' | translate }}"
+                                    [valueType]="valueType.BOOLEAN"
+                                    stateLabel="{{ 'widgets.button-state.disabled' | translate }}"
+                                    [aliasController]="aliasController"
+                                    [targetDevice]="targetDevice"
+                                    [widgetType]="widgetType"
+                                    formControlName="disabledState"></tb-get-value-action-settings>
+    </div>
+  </div>
+  <div class="tb-form-panel" formGroupName="appearance">
+    <div class="tb-form-panel-title" translate>widget-config.appearance</div>
+    <tb-image-cards-select rowHeight="3:1"
+                           [cols]="{columns:  2,
+                                    breakpoints: {
+                                      'lt-sm': 1
+                                    }}"
+                           label="{{ 'widgets.button.layout' | translate }}" formControlName="type">
+      <tb-image-cards-select-option *ngFor="let type of valueStepperTypes"
+                                    [value]="type"
+                                    [image]="valueStepperTypeImageMap.get(type)">
+        {{ valueStepperTypeTranslationMap.get(type) | translate }}
+      </tb-image-cards-select-option>
+    </tb-image-cards-select>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="autoScale">
+        {{ 'widgets.value-stepper.auto-scale' | translate }}
+      </mat-slide-toggle>
+    </div>
+
+    <div class="tb-form-row space-between column-xs">
+      <div>{{ 'widgets.value-stepper.value-range' | translate }}</div>
+      <div class="flex flex-row items-center justify-start gap-2">
+        <div class="tb-small-label" translate>widgets.value-stepper.min-range</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="minValueRange" type="number" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+        <div class="tb-small-label" translate>widgets.value-stepper.max-range</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="maxValueRange" type="number" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+      </div>
+    </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.value-stepper.value-increment-decrement-step' | translate }}</div>
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <input matInput formControlName="valueStep" type="number" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+    <div class="tb-form-row column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showValueBox">
+        {{ 'widgets.value-stepper.value' | translate }}
+      </mat-slide-toggle>
+      <div class="flex flex-1 flex-row items-center justify-start gap-2">
+        <tb-unit-input class="flex" formControlName="valueUnits"></tb-unit-input>
+        <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+          <input matInput formControlName="valueDecimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+          <div matSuffix class="lt-md:!hidden" translate>widget-config.decimals-suffix</div>
+        </mat-form-field>
+        <tb-font-settings formControlName="valueFont"
+                          [previewText]="valuePreviewFn">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="valueColor">
+        </tb-color-input>
+      </div>
+    </div>
+
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.value-stepper.value-box-background' | translate }}</div>
+      <tb-color-input asBoxInput
+                      colorClearButton
+                      formControlName="valueBoxBackground">
+      </tb-color-input>
+    </div>
+    <div class="tb-form-row space-between column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showBorder">
+        {{ 'widgets.value-stepper.border' | translate }}
+      </mat-slide-toggle>
+      <div class="flex flex-1 flex-row items-center justify-end gap-2">
+        <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 class="lt-md:!hidden">px</div>
+        </mat-form-field>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="borderColor">
+        </tb-color-input>
+      </div>
+    </div>
+  </div>
+  <div class="tb-form-panel" formGroupName="buttonAppearance">
+    <div class="flex flex-row items-center justify-between">
+      <div class="tb-form-panel-title" translate>widgets.value-stepper.button-appearance</div>
+      <tb-toggle-select [(ngModel)]="buttonAppearanceType" [ngModelOptions]="{standalone: true}">
+        <tb-toggle-option value="left">{{ 'widgets.value-stepper.left' | translate }}</tb-toggle-option>
+        <tb-toggle-option value="right">{{ 'widgets.value-stepper.right' | translate }}</tb-toggle-option>
+      </tb-toggle-select>
+    </div>
+    <div class="tb-form-panel no-border no-padding" formGroupName="leftButton" [class.!hidden]="buttonAppearanceType !== 'left'">
+      <div class="tb-form-row">
+        <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showButton">
+          {{ 'widgets.value-stepper.left-button' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <div class="tb-form-row">
+        <div>{{ 'widgets.value-stepper.icon' | translate }}</div>
+        <div class="flex flex-1 flex-row items-center justify-start gap-2">
+          <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+            <input matInput type="number" min="0" formControlName="iconSize" placeholder="{{ 'widget-config.set' | translate }}">
+          </mat-form-field>
+          <tb-css-unit-select class="flex-1" formControlName="iconSizeUnit"></tb-css-unit-select>
+          <tb-material-icon-select asBoxInput
+                                   iconClearButton
+                                   formControlName="icon">
+          </tb-material-icon-select>
+        </div>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div>{{ 'widgets.power-button.power-on-colors' | translate }}</div>
+        <div class="flex flex-row items-center justify-start gap-3">
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.power-button.main</div>
+            <tb-color-input asBoxInput
+                            formControlName="mainColorOn">
+            </tb-color-input>
+          </div>
+          <mat-divider vertical></mat-divider>
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.power-button.background</div>
+            <tb-color-input asBoxInput
+                            formControlName="backgroundColorOn">
+            </tb-color-input>
+          </div>
+        </div>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div>{{ 'widgets.power-button.disabled-colors' | translate }}</div>
+        <div class="flex flex-row items-center justify-start gap-3">
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.power-button.main</div>
+            <tb-color-input asBoxInput
+                            formControlName="mainColorDisabled">
+            </tb-color-input>
+          </div>
+          <mat-divider vertical></mat-divider>
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.power-button.background</div>
+            <tb-color-input asBoxInput
+                            formControlName="backgroundColorDisabled">
+            </tb-color-input>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="tb-form-panel no-border no-padding" formGroupName="rightButton" [class.!hidden]="buttonAppearanceType !== 'right'">
+      <div class="tb-form-row">
+        <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showButton">
+          {{ 'widgets.value-stepper.right-button' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <div class="tb-form-row">
+        <div>{{ 'widgets.value-stepper.icon' | translate }}</div>
+        <div class="flex flex-1 flex-row items-center justify-start gap-2">
+          <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+            <input matInput type="number" min="0" formControlName="iconSize" placeholder="{{ 'widget-config.set' | translate }}">
+          </mat-form-field>
+          <tb-css-unit-select class="flex-1" formControlName="iconSizeUnit"></tb-css-unit-select>
+          <tb-material-icon-select asBoxInput
+                                   iconClearButton
+                                   formControlName="icon">
+          </tb-material-icon-select>
+        </div>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div>{{ 'widgets.power-button.power-on-colors' | translate }}</div>
+        <div class="flex flex-row items-center justify-start gap-3">
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.power-button.main</div>
+            <tb-color-input asBoxInput
+                            formControlName="mainColorOn">
+            </tb-color-input>
+          </div>
+          <mat-divider vertical></mat-divider>
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.power-button.background</div>
+            <tb-color-input asBoxInput
+                            formControlName="backgroundColorOn">
+            </tb-color-input>
+          </div>
+        </div>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div>{{ 'widgets.power-button.disabled-colors' | translate }}</div>
+        <div class="flex flex-row items-center justify-start gap-3">
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.power-button.main</div>
+            <tb-color-input asBoxInput
+                            formControlName="mainColorDisabled">
+            </tb-color-input>
+          </div>
+          <mat-divider vertical></mat-divider>
+          <div class="flex flex-row items-center justify-start gap-2">
+            <div translate>widgets.power-button.background</div>
+            <tb-color-input asBoxInput
+                            formControlName="backgroundColorDisabled">
+            </tb-color-input>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/value-stepper-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/value-stepper-widget-settings.component.ts
new file mode 100644
index 0000000000..119c099da0
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/value-stepper-widget-settings.component.ts
@@ -0,0 +1,191 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { TargetDevice, WidgetSettings, WidgetSettingsComponent, widgetType } from '@shared/models/widget.models';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { ValueType } from '@shared/models/constants';
+import { getTargetDeviceFromDatasources } from '@shared/models/widget-settings.models';
+import {
+  valueStepperDefaultSettings,
+  valueStepperTypeImages,
+  valueStepperTypes,
+  valueStepperTypeTranslations
+} from '@home/components/widget/lib/rpc/value-stepper-widget.models';
+import { formatValue } from '@core/utils';
+
+type ButtonAppearanceType = 'left' | 'right';
+
+@Component({
+  selector: 'tb-value-stepper-widget-settings',
+  templateUrl: './value-stepper-widget-settings.component.html',
+  styleUrls: ['../widget-settings.scss']
+})
+export class ValueStepperWidgetSettingsComponent extends WidgetSettingsComponent {
+
+  get targetDevice(): TargetDevice {
+    const datasources = this.widgetConfig?.config?.datasources;
+    return getTargetDeviceFromDatasources(datasources);
+  }
+
+  get widgetType(): widgetType {
+    return this.widgetConfig?.widgetType;
+  }
+  get borderRadius(): string {
+    return this.widgetConfig?.config?.borderRadius;
+  }
+
+  valueType = ValueType;
+
+  valueStepperWidgetSettingsForm: UntypedFormGroup;
+
+  valueStepperTypeTranslationMap = valueStepperTypeTranslations;
+  valueStepperTypes = valueStepperTypes;
+  valueStepperTypeImageMap = valueStepperTypeImages;
+
+  buttonAppearanceType: ButtonAppearanceType = 'left';
+
+  valuePreviewFn = this._valuePreviewFn.bind(this);
+
+  constructor(protected store: Store<AppState>,
+              private fb: UntypedFormBuilder) {
+    super(store);
+  }
+
+  protected settingsForm(): UntypedFormGroup {
+    return this.valueStepperWidgetSettingsForm;
+  }
+
+  protected defaultSettings(): WidgetSettings {
+    return {...valueStepperDefaultSettings};
+  }
+
+  protected onSettingsSet(settings: WidgetSettings) {
+    this.valueStepperWidgetSettingsForm = this.fb.group({
+      initialState: [settings.initialState, []],
+      leftButtonClick: [settings.leftButtonClick, []],
+      rightButtonClick: [settings.rightButtonClick, []],
+      disabledState: [settings.disabledState, []],
+
+      appearance: this.fb.group({
+        type: [settings.appearance.type, []],
+        autoScale: [settings.appearance.autoScale, []],
+        minValueRange: [settings.appearance.minValueRange, []],
+        maxValueRange: [settings.appearance.maxValueRange, []],
+        valueStep: [settings.appearance.valueStep, [Validators.min(0)]],
+        showValueBox: [settings.appearance.showValueBox, []],
+        valueUnits: [settings.appearance.valueUnits, []],
+        valueDecimals: [settings.appearance.valueDecimals, []],
+        valueFont: [settings.appearance.valueFont, []],
+        valueColor: [settings.appearance.valueColor],
+        valueBoxBackground: [settings.appearance.valueBoxBackground, []],
+        showBorder: [settings.appearance.showBorder, []],
+        borderWidth: [settings.appearance.borderWidth, []],
+        borderColor: [settings.appearance.borderColor, []]
+      }),
+
+      buttonAppearance: this.fb.group({
+        leftButton: this.fb.group({
+          showButton: [settings.buttonAppearance.leftButton.showButton],
+          icon: [settings.buttonAppearance.leftButton.icon],
+          iconSize: [settings.buttonAppearance.leftButton.iconSize],
+          iconSizeUnit: [settings.buttonAppearance.leftButton.iconSizeUnit],
+          mainColorOn: [settings.buttonAppearance.leftButton.mainColorOn, []],
+          backgroundColorOn: [settings.buttonAppearance.leftButton.backgroundColorOn, []],
+          mainColorDisabled: [settings.buttonAppearance.leftButton.mainColorDisabled, []],
+          backgroundColorDisabled: [settings.buttonAppearance.leftButton.backgroundColorDisabled, []]
+        }),
+        rightButton: this.fb.group({
+          showButton: [settings.buttonAppearance.rightButton.showButton],
+          icon: [settings.buttonAppearance.rightButton.icon],
+          iconSize: [settings.buttonAppearance.rightButton.iconSize],
+          iconSizeUnit: [settings.buttonAppearance.rightButton.iconSizeUnit],
+          mainColorOn: [settings.buttonAppearance.rightButton.mainColorOn, []],
+          backgroundColorOn: [settings.buttonAppearance.rightButton.backgroundColorOn, []],
+          mainColorDisabled: [settings.buttonAppearance.rightButton.mainColorDisabled, []],
+          backgroundColorDisabled: [settings.buttonAppearance.rightButton.backgroundColorDisabled, []]
+        })
+      })
+    });
+  }
+
+
+  protected validatorTriggers(): string[] {
+    return ['appearance.showValueBox', 'appearance.showBorder',
+      'buttonAppearance.leftButton.showButton', 'buttonAppearance.rightButton.showButton'];
+  }
+
+  protected updateValidators(_emitEvent: boolean): void {
+    const showValueBox: boolean = this.valueStepperWidgetSettingsForm.get('appearance').get('showValueBox').value;
+    const showBorder: boolean = this.valueStepperWidgetSettingsForm.get('appearance').get('showBorder').value;
+    const showLeftButton: boolean = this.valueStepperWidgetSettingsForm.get('buttonAppearance').get('leftButton').get('showButton').value;
+    const showRightButton: boolean = this.valueStepperWidgetSettingsForm.get('buttonAppearance').get('rightButton').get('showButton').value;
+    if (showValueBox) {
+      this.valueStepperWidgetSettingsForm.get('appearance').get('valueUnits').enable();
+      this.valueStepperWidgetSettingsForm.get('appearance').get('valueDecimals').enable();
+      this.valueStepperWidgetSettingsForm.get('appearance').get('valueFont').enable();
+      this.valueStepperWidgetSettingsForm.get('appearance').get('valueColor').enable();
+      this.valueStepperWidgetSettingsForm.get('appearance').get('valueBoxBackground').enable();
+      this.valueStepperWidgetSettingsForm.get('appearance').get('showBorder').enable({emitEvent: false});
+      if (showBorder) {
+        this.valueStepperWidgetSettingsForm.get('appearance').get('borderWidth').enable();
+        this.valueStepperWidgetSettingsForm.get('appearance').get('borderColor').enable();
+      } else {
+        this.valueStepperWidgetSettingsForm.get('appearance').get('borderWidth').disable();
+        this.valueStepperWidgetSettingsForm.get('appearance').get('borderColor').disable();
+      }
+    } else {
+      this.valueStepperWidgetSettingsForm.get('appearance').get('valueUnits').disable();
+      this.valueStepperWidgetSettingsForm.get('appearance').get('valueDecimals').disable();
+      this.valueStepperWidgetSettingsForm.get('appearance').get('valueFont').disable();
+      this.valueStepperWidgetSettingsForm.get('appearance').get('valueColor').disable();
+      this.valueStepperWidgetSettingsForm.get('appearance').get('valueBoxBackground').disable();
+      this.valueStepperWidgetSettingsForm.get('appearance').get('showBorder').disable({emitEvent: false});
+      this.valueStepperWidgetSettingsForm.get('appearance').get('borderWidth').disable();
+      this.valueStepperWidgetSettingsForm.get('appearance').get('borderColor').disable();
+    }
+    this.buttonValidators(showLeftButton, 'leftButton');
+    this.buttonValidators(showRightButton, 'rightButton');
+  }
+
+  private buttonValidators(showButtonValue: boolean, button: string) {
+    if (showButtonValue) {
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('icon').enable()
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('iconSize').enable()
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('iconSizeUnit').enable()
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('mainColorOn').enable()
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('backgroundColorOn').enable()
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('mainColorDisabled').enable()
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('backgroundColorDisabled').enable()
+    } else {
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('icon').disable()
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('iconSize').disable()
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('iconSizeUnit').disable()
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('mainColorOn').disable()
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('backgroundColorOn').disable()
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('mainColorDisabled').disable()
+      this.valueStepperWidgetSettingsForm.get('buttonAppearance').get(button).get('backgroundColorDisabled').disable()
+    }
+  }
+
+  private _valuePreviewFn(): string {
+    const units: string = this.valueStepperWidgetSettingsForm.get('appearance').get('valueUnits').value;
+    const decimals: number = this.valueStepperWidgetSettingsForm.get('appearance').get('valueDecimals').value;
+    return formatValue(48, decimals, units, false);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/liquid-level-card-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/liquid-level-card-widget-settings.component.ts
index 70a163ac1a..11454392b4 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/liquid-level-card-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/liquid-level-card-widget-settings.component.ts
@@ -56,7 +56,7 @@ import { EntityService } from '@core/http/entity.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
-  selector: 'liquid-level-card-widget-settings',
+  selector: 'tb-liquid-level-card-widget-settings',
   templateUrl: './liquid-level-card-widget-settings.component.html',
   styleUrls: []
 })
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/input/update-multiple-attributes-key-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/input/update-multiple-attributes-key-settings.component.html
index 93c53c27ec..37a4dee4d5 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/input/update-multiple-attributes-key-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/input/update-multiple-attributes-key-settings.component.html
@@ -21,108 +21,113 @@
   </mat-slide-toggle>
   <fieldset [class.!hidden]="updateMultipleAttributesKeySettingsForm.get('dataKeyHidden').value" class="fields-group">
     <legend class="group-title" translate>widgets.input-widgets.general-settings</legend>
-    <section class="flex flex-col gt-xs:flex-row gt-xs:items-center gt-xs:justify-start gt-xs:gap-2">
-      <mat-form-field class="mat-block flex-full xs:max-h-50% gt-xs:max-w-50%">
-        <mat-label translate>widgets.input-widgets.datakey-type</mat-label>
-        <mat-select formControlName="dataKeyType">
-          <mat-option [value]="'server'">
-            {{ 'widgets.input-widgets.datakey-type-server' | translate }}
-          </mat-option>
-          <mat-option [value]="'shared'">
-            {{ 'widgets.input-widgets.datakey-type-shared' | translate }}
-          </mat-option>
-          <mat-option [value]="'timeseries'">
-            {{ 'widgets.input-widgets.datakey-type-timeseries' | translate }}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field class="mat-block flex-full xs:max-h-50% gt-xs:max-w-50%">
-        <mat-label translate>widgets.input-widgets.datakey-value-type</mat-label>
-        <mat-select formControlName="dataKeyValueType">
-          <mat-option [value]="'string'">
-            {{ 'widgets.input-widgets.datakey-value-type-string' | translate }}
-          </mat-option>
-          <mat-option [value]="'double'">
-            {{ 'widgets.input-widgets.datakey-value-type-double' | translate }}
-          </mat-option>
-          <mat-option [value]="'integer'">
-            {{ 'widgets.input-widgets.datakey-value-type-integer' | translate }}
-          </mat-option>
-          <mat-option [value]="'booleanCheckbox'">
-            {{ 'widgets.input-widgets.datakey-value-type-boolean-checkbox' | translate }}
-          </mat-option>
-          <mat-option [value]="'booleanSwitch'">
-            {{ 'widgets.input-widgets.datakey-value-type-boolean-switch' | translate }}
-          </mat-option>
-          <mat-option [value]="'dateTime'">
-            {{ 'widgets.input-widgets.datakey-value-type-date-time' | translate }}
-          </mat-option>
-          <mat-option [value]="'date'">
-            {{ 'widgets.input-widgets.datakey-value-type-date' | translate }}
-          </mat-option>
-          <mat-option [value]="'time'">
-            {{ 'widgets.input-widgets.datakey-value-type-time' | translate }}
-          </mat-option>
-          <mat-option [value]="'select'">
-            {{ 'widgets.input-widgets.datakey-value-type-select' | translate }}
-          </mat-option>
-          <mat-option [value]="'JSON'">
-            {{ 'widgets.input-widgets.datakey-value-type-json' | translate }}
-          </mat-option>
-          <mat-option [value]="'color'">
-            {{ 'widgets.input-widgets.datakey-value-type-color' | translate }}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
-    </section>
-    <mat-checkbox formControlName="required" style="margin-bottom: 8px;">
-      {{ 'widgets.input-widgets.value-is-required' | translate }}
-    </mat-checkbox>
-    <section class="flex flex-col gt-xs:flex-row gt-xs:items-center gt-xs:justify-start gt-xs:gap-2">
-      <mat-form-field class="mat-block flex-full xs:max-h-50% gt-xs:max-w-50%">
-        <mat-label translate>widgets.input-widgets.ability-to-edit-attribute</mat-label>
-        <mat-select formControlName="isEditable">
-          <mat-option [value]="'editable'">
-            {{ 'widgets.input-widgets.ability-to-edit-attribute-editable' | translate }}
-          </mat-option>
-          <mat-option [value]="'disabled'">
-            {{ 'widgets.input-widgets.ability-to-edit-attribute-disabled' | translate }}
-          </mat-option>
-          <mat-option [value]="'readonly'">
-            {{ 'widgets.input-widgets.ability-to-edit-attribute-readonly' | translate }}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field [class.!hidden]="updateMultipleAttributesKeySettingsForm.get('isEditable').value !== 'editable'" class="mat-block flex-full xs:max-h-50% gt-xs:max-w-50%">
-        <mat-label translate>widgets.input-widgets.disable-on-datakey-name</mat-label>
-        <input matInput formControlName="disabledOnDataKey">
-      </mat-form-field>
-    </section>
-    <section *ngIf="!['booleanSwitch', 'booleanCheckbox'].includes(updateMultipleAttributesKeySettingsForm.get('dataKeyValueType').value)"
-             class="flex flex-col gt-xs:flex-row gt-xs:items-center gt-xs:justify-start gt-xs:gap-2">
-      <mat-form-field class="mat-block flex-full xs:max-h-50% gt-xs:max-w-50%">
-        <mat-label translate>widgets.input-widgets.field-appearance</mat-label>
-        <mat-select formControlName="appearance">
-          <mat-option [value]="'fill'">
-            {{ 'widgets.input-widgets.appearance-fill' | translate }}
-          </mat-option>
-          <mat-option [value]="'outline'">
-            {{ 'widgets.input-widgets.appearance-outline' | translate }}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field class="mat-block flex-full xs:max-h-50% gt-xs:max-w-50%">
-        <mat-label translate>widgets.input-widgets.subscript-sizing</mat-label>
-        <mat-select formControlName="subscriptSizing">
-          <mat-option [value]="'fixed'">
-            {{ 'widgets.input-widgets.subscript-sizing-fixed' | translate }}
-          </mat-option>
-          <mat-option [value]="'dynamic'">
-            {{ 'widgets.input-widgets.subscript-sizing-dynamic' | translate }}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
-    </section>
+    <div class="flex flex-col">
+      <section class="flex flex-col gt-xs:flex-row gt-xs:items-center gt-xs:justify-start gt-xs:gap-2">
+        <mat-form-field class="mat-block flex-full xs:max-h-50% gt-xs:max-w-50%">
+          <mat-label translate>widgets.input-widgets.datakey-type</mat-label>
+          <mat-select formControlName="dataKeyType">
+            <mat-option [value]="'server'">
+              {{ 'widgets.input-widgets.datakey-type-server' | translate }}
+            </mat-option>
+            <mat-option [value]="'shared'">
+              {{ 'widgets.input-widgets.datakey-type-shared' | translate }}
+            </mat-option>
+            <mat-option [value]="'timeseries'">
+              {{ 'widgets.input-widgets.datakey-type-timeseries' | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-form-field class="mat-block flex-full xs:max-h-50% gt-xs:max-w-50%">
+          <mat-label translate>widgets.input-widgets.datakey-value-type</mat-label>
+          <mat-select formControlName="dataKeyValueType">
+            <mat-option [value]="'string'">
+              {{ 'widgets.input-widgets.datakey-value-type-string' | translate }}
+            </mat-option>
+            <mat-option [value]="'double'">
+              {{ 'widgets.input-widgets.datakey-value-type-double' | translate }}
+            </mat-option>
+            <mat-option [value]="'integer'">
+              {{ 'widgets.input-widgets.datakey-value-type-integer' | translate }}
+            </mat-option>
+            <mat-option [value]="'booleanCheckbox'">
+              {{ 'widgets.input-widgets.datakey-value-type-boolean-checkbox' | translate }}
+            </mat-option>
+            <mat-option [value]="'booleanSwitch'">
+              {{ 'widgets.input-widgets.datakey-value-type-boolean-switch' | translate }}
+            </mat-option>
+            <mat-option [value]="'dateTime'">
+              {{ 'widgets.input-widgets.datakey-value-type-date-time' | translate }}
+            </mat-option>
+            <mat-option [value]="'date'">
+              {{ 'widgets.input-widgets.datakey-value-type-date' | translate }}
+            </mat-option>
+            <mat-option [value]="'time'">
+              {{ 'widgets.input-widgets.datakey-value-type-time' | translate }}
+            </mat-option>
+            <mat-option [value]="'select'">
+              {{ 'widgets.input-widgets.datakey-value-type-select' | translate }}
+            </mat-option>
+            <mat-option [value]="'radio'">
+              {{ 'widgets.input-widgets.datakey-value-type-radio' | translate }}
+            </mat-option>
+            <mat-option [value]="'JSON'">
+              {{ 'widgets.input-widgets.datakey-value-type-json' | translate }}
+            </mat-option>
+            <mat-option [value]="'color'">
+              {{ 'widgets.input-widgets.datakey-value-type-color' | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+      </section>
+      <mat-checkbox formControlName="required" style="margin-bottom: 8px;">
+        {{ 'widgets.input-widgets.value-is-required' | translate }}
+      </mat-checkbox>
+      <section class="flex flex-col gt-xs:flex-row gt-xs:items-center gt-xs:justify-start gt-xs:gap-2">
+        <mat-form-field class="mat-block flex-full xs:max-h-50% gt-xs:max-w-50%">
+          <mat-label translate>widgets.input-widgets.ability-to-edit-attribute</mat-label>
+          <mat-select formControlName="isEditable">
+            <mat-option [value]="'editable'">
+              {{ 'widgets.input-widgets.ability-to-edit-attribute-editable' | translate }}
+            </mat-option>
+            <mat-option [value]="'disabled'">
+              {{ 'widgets.input-widgets.ability-to-edit-attribute-disabled' | translate }}
+            </mat-option>
+            <mat-option [value]="'readonly'">
+              {{ 'widgets.input-widgets.ability-to-edit-attribute-readonly' | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-form-field [class.!hidden]="updateMultipleAttributesKeySettingsForm.get('isEditable').value !== 'editable'" class="mat-block flex-full xs:max-h-50% gt-xs:max-w-50%">
+          <mat-label translate>widgets.input-widgets.disable-on-datakey-name</mat-label>
+          <input matInput formControlName="disabledOnDataKey">
+        </mat-form-field>
+      </section>
+      <section *ngIf="!['booleanSwitch', 'booleanCheckbox', 'radio'].includes(updateMultipleAttributesKeySettingsForm.get('dataKeyValueType').value)"
+               class="flex flex-col gt-xs:flex-row gt-xs:items-center gt-xs:justify-start gt-xs:gap-2">
+        <mat-form-field class="mat-block flex-full xs:max-h-50% gt-xs:max-w-50%">
+          <mat-label translate>widgets.input-widgets.field-appearance</mat-label>
+          <mat-select formControlName="appearance">
+            <mat-option [value]="'fill'">
+              {{ 'widgets.input-widgets.appearance-fill' | translate }}
+            </mat-option>
+            <mat-option [value]="'outline'">
+              {{ 'widgets.input-widgets.appearance-outline' | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-form-field class="mat-block flex-full xs:max-h-50% gt-xs:max-w-50%">
+          <mat-label translate>widgets.input-widgets.subscript-sizing</mat-label>
+          <mat-select formControlName="subscriptSizing">
+            <mat-option [value]="'fixed'">
+              {{ 'widgets.input-widgets.subscript-sizing-fixed' | translate }}
+            </mat-option>
+            <mat-option [value]="'dynamic'">
+              {{ 'widgets.input-widgets.subscript-sizing-dynamic' | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+      </section>
+    </div>
   </fieldset>
   <fieldset [class.!hidden]="updateMultipleAttributesKeySettingsForm.get('dataKeyHidden').value ||
                              updateMultipleAttributesKeySettingsForm.get('dataKeyValueType').value !== 'booleanSwitch'" class="fields-group">
@@ -140,8 +145,10 @@
     </mat-form-field>
   </fieldset>
   <fieldset [class.!hidden]="updateMultipleAttributesKeySettingsForm.get('dataKeyHidden').value ||
-                             updateMultipleAttributesKeySettingsForm.get('dataKeyValueType').value !== 'select'" class="fields-group">
-    <legend class="group-title" translate>widgets.input-widgets.select-options</legend>
+                             (updateMultipleAttributesKeySettingsForm.get('dataKeyValueType').value !== 'select' && updateMultipleAttributesKeySettingsForm.get('dataKeyValueType').value !== 'radio')" class="fields-group">
+    <legend class="group-title">
+      {{ (updateMultipleAttributesKeySettingsForm.get('dataKeyValueType').value === 'select' ? 'widgets.input-widgets.select-options' : 'widgets.input-widgets.radio-options') | translate }}
+    </legend>
     <div class="flex flex-col">
       <div class="tb-control-list tb-drop-list" cdkDropList cdkDropListOrientation="vertical"
            (cdkDropListDropped)="selectOptionDrop($event)">
@@ -155,18 +162,51 @@
         </div>
       </div>
       <div *ngIf="!selectOptionsFormArray().controls.length">
-            <span translate
-                  class="tb-prompt flex items-center justify-center">widgets.input-widgets.no-select-options</span>
+            <span class="tb-prompt flex items-center justify-center">
+              {{ (updateMultipleAttributesKeySettingsForm.get('dataKeyValueType').value === 'select' ? 'widgets.input-widgets.no-select-options' : 'widgets.input-widgets.no-radio-options') | translate }}
+            </span>
       </div>
       <div style="padding-top: 16px;">
         <button mat-raised-button color="primary"
                 type="button"
                 (click)="addSelectOption()">
-          <span translate>widgets.input-widgets.add-select-option</span>
+          <span>
+            {{ (updateMultipleAttributesKeySettingsForm.get('dataKeyValueType').value === 'select' ? 'widgets.input-widgets.add-select-option' : 'widgets.input-widgets.add-radio-option') | translate }}
+          </span>
         </button>
       </div>
     </div>
   </fieldset>
+  <div class="tb-form-panel mb-3.5"
+       [class.!hidden]="updateMultipleAttributesKeySettingsForm.get('dataKeyHidden').value ||
+       updateMultipleAttributesKeySettingsForm.get('dataKeyValueType').value !== 'radio'">
+    <div class="tb-form-panel-title" translate>widgets.input-widgets.radio-button-settings</div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.input-widgets.color' | translate }}</div>
+      <tb-color-input asBoxInput
+                      formControlName="radioColor">
+      </tb-color-input>
+    </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.input-widgets.columns' | translate }}</div>
+      <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+        <input matInput formControlName="radioColumns" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.input-widgets.radio-label-position' | translate }}</div>
+      <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+        <mat-select formControlName="radioLabelPosition">
+          <mat-option [value]="'after'">
+            {{ 'widgets.input-widgets.radio-label-position-after' | translate }}
+          </mat-option>
+          <mat-option [value]="'before'">
+            {{ 'widgets.input-widgets.radio-label-position-before' | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+    </div>
+  </div>
   <fieldset [class.!hidden]="updateMultipleAttributesKeySettingsForm.get('dataKeyHidden').value ||
                              (updateMultipleAttributesKeySettingsForm.get('dataKeyValueType').value !== 'integer' &&
                              updateMultipleAttributesKeySettingsForm.get('dataKeyValueType').value !== 'double')" class="fields-group">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/input/update-multiple-attributes-key-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/input/update-multiple-attributes-key-settings.component.ts
index 24e0ac7072..378c2fdeab 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/input/update-multiple-attributes-key-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/input/update-multiple-attributes-key-settings.component.ts
@@ -60,6 +60,9 @@ export class UpdateMultipleAttributesKeySettingsComponent extends WidgetSettings
 
       slideToggleLabelPosition: 'after',
       selectOptions: [],
+      radioColor: null,
+      radioColumns: 1,
+      radioLabelPosition: 'after',
       step: 1,
       minValue: null,
       maxValue: null,
@@ -104,10 +107,16 @@ export class UpdateMultipleAttributesKeySettingsComponent extends WidgetSettings
 
       slideToggleLabelPosition: [settings.slideToggleLabelPosition, []],
 
-      // Select options
+      // Select/Radio options
 
       selectOptions: this.prepareSelectOptionsFormArray(settings.selectOptions),
 
+      // Radio settings
+
+      radioColor: [settings.radioColor, []],
+      radioColumns: [settings.radioColumns, []],
+      radioLabelPosition: [settings.radioLabelPosition, []],
+
       // Numeric field settings
 
       step: [settings.step, [Validators.min(0)]],
@@ -183,6 +192,11 @@ export class UpdateMultipleAttributesKeySettingsComponent extends WidgetSettings
         this.updateMultipleAttributesKeySettingsForm.get('slideToggleLabelPosition').enable({emitEvent: false});
       } else if (dataKeyValueType === 'select') {
         this.updateMultipleAttributesKeySettingsForm.get('selectOptions').enable({emitEvent: false});
+      } else if (dataKeyValueType === 'radio') {
+        this.updateMultipleAttributesKeySettingsForm.get('selectOptions').enable({emitEvent: false});
+        this.updateMultipleAttributesKeySettingsForm.get('radioColor').enable({emitEvent: false});
+        this.updateMultipleAttributesKeySettingsForm.get('radioColumns').enable({emitEvent: false});
+        this.updateMultipleAttributesKeySettingsForm.get('radioLabelPosition').enable({emitEvent: false});
       } else if (dataKeyValueType === 'integer' || dataKeyValueType === 'double') {
         this.updateMultipleAttributesKeySettingsForm.get('step').enable({emitEvent: false});
         this.updateMultipleAttributesKeySettingsForm.get('minValue').enable({emitEvent: false});
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 4b5f3a1ad0..e50fcb30f0 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
@@ -14,14 +14,14 @@
 /// limitations under the License.
 ///
 
-import { NgModule, Type } from '@angular/core';
-import {
-  QrCodeWidgetSettingsComponent
-} from '@home/components/widget/lib/settings/cards/qrcode-widget-settings.component';
+import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { SharedModule } from '@shared/shared.module';
+import { WidgetService } from '@core/http/widget.service';
 import { SharedHomeComponentsModule } from '@home/components/shared-home-components.module';
-import { IWidgetSettingsComponent } from '@shared/models/widget.models';
+import {
+  QrCodeWidgetSettingsComponent
+} from '@home/components/widget/lib/settings/cards/qrcode-widget-settings.component';
 import {
   TimeseriesTableWidgetSettingsComponent
 } from '@home/components/widget/lib/settings/cards/timeseries-table-widget-settings.component';
@@ -366,11 +366,14 @@ import {
   UnreadNotificationWidgetSettingsComponent
 } from '@home/components/widget/lib/settings/cards/unread-notification-widget-settings.component';
 import {
-ScadaSymbolWidgetSettingsComponent
+  ScadaSymbolWidgetSettingsComponent
 } from '@home/components/widget/lib/settings/scada/scada-symbol-widget-settings.component';
 import {
   SegmentedButtonWidgetSettingsComponent
 } from '@home/components/widget/lib/settings/button/segmented-button-widget-settings.component';
+import {
+  ValueStepperWidgetSettingsComponent
+} from '@home/components/widget/lib/settings/control/value-stepper-widget-settings.component';
 
 @NgModule({
   declarations: [
@@ -487,6 +490,7 @@ import {
     SingleSwitchWidgetSettingsComponent,
     ActionButtonWidgetSettingsComponent,
     SegmentedButtonWidgetSettingsComponent,
+    ValueStepperWidgetSettingsComponent,
     CommandButtonWidgetSettingsComponent,
     PowerButtonWidgetSettingsComponent,
     SliderWidgetSettingsComponent,
@@ -624,6 +628,7 @@ import {
     SingleSwitchWidgetSettingsComponent,
     ActionButtonWidgetSettingsComponent,
     SegmentedButtonWidgetSettingsComponent,
+    ValueStepperWidgetSettingsComponent,
     CommandButtonWidgetSettingsComponent,
     PowerButtonWidgetSettingsComponent,
     SliderWidgetSettingsComponent,
@@ -643,105 +648,7 @@ import {
   ]
 })
 export class WidgetSettingsModule {
+  constructor(private widgetService: WidgetService) {
+    this.widgetService.registerWidgetSettingsComponents(this.constructor)
+  }
 }
-
-export const widgetSettingsComponentsMap: {[key: string]: Type<IWidgetSettingsComponent>} = {
-  'tb-qrcode-widget-settings': QrCodeWidgetSettingsComponent,
-  'tb-mobile-app-qr-code-widget-settings': MobileAppQrCodeWidgetSettingsComponent,
-  'tb-timeseries-table-widget-settings': TimeseriesTableWidgetSettingsComponent,
-  'tb-timeseries-table-key-settings': TimeseriesTableKeySettingsComponent,
-  'tb-timeseries-table-latest-key-settings': TimeseriesTableLatestKeySettingsComponent,
-  'tb-markdown-widget-settings': MarkdownWidgetSettingsComponent,
-  'tb-label-widget-settings': LabelWidgetSettingsComponent,
-  'tb-simple-card-widget-settings': SimpleCardWidgetSettingsComponent,
-  'tb-dashboard-state-widget-settings': DashboardStateWidgetSettingsComponent,
-  'tb-entities-hierarchy-widget-settings': EntitiesHierarchyWidgetSettingsComponent,
-  'tb-html-card-widget-settings': HtmlCardWidgetSettingsComponent,
-  'tb-entities-table-widget-settings': EntitiesTableWidgetSettingsComponent,
-  'tb-entities-table-key-settings': EntitiesTableKeySettingsComponent,
-  'tb-alarms-table-widget-settings': AlarmsTableWidgetSettingsComponent,
-  'tb-alarms-table-key-settings': AlarmsTableKeySettingsComponent,
-  'tb-analogue-radial-gauge-widget-settings': AnalogueRadialGaugeWidgetSettingsComponent,
-  'tb-analogue-linear-gauge-widget-settings': AnalogueLinearGaugeWidgetSettingsComponent,
-  'tb-analogue-compass-widget-settings': AnalogueCompassWidgetSettingsComponent,
-  'tb-digital-gauge-widget-settings': DigitalGaugeWidgetSettingsComponent,
-  'tb-flot-line-widget-settings': FlotLineWidgetSettingsComponent,
-  'tb-flot-bar-widget-settings': FlotBarWidgetSettingsComponent,
-  'tb-flot-line-key-settings': FlotLineKeySettingsComponent,
-  'tb-flot-bar-key-settings': FlotBarKeySettingsComponent,
-  'tb-flot-latest-key-settings': FlotLatestKeySettingsComponent,
-  'tb-flot-pie-widget-settings': FlotPieWidgetSettingsComponent,
-  'tb-flot-pie-key-settings': FlotPieKeySettingsComponent,
-  'tb-chart-widget-settings': ChartWidgetSettingsComponent,
-  'tb-doughnut-chart-widget-settings': DoughnutChartWidgetSettingsComponent,
-  'tb-round-switch-widget-settings': RoundSwitchWidgetSettingsComponent,
-  'tb-switch-control-widget-settings': SwitchControlWidgetSettingsComponent,
-  'tb-slide-toggle-widget-settings': SlideToggleWidgetSettingsComponent,
-  'tb-persistent-table-widget-settings': PersistentTableWidgetSettingsComponent,
-  'tb-update-device-attribute-widget-settings': UpdateDeviceAttributeWidgetSettingsComponent,
-  'tb-send-rpc-widget-settings': SendRpcWidgetSettingsComponent,
-  'tb-led-indicator-widget-settings': LedIndicatorWidgetSettingsComponent,
-  'tb-knob-control-widget-settings': KnobControlWidgetSettingsComponent,
-  'tb-rpc-terminal-widget-settings': RpcTerminalWidgetSettingsComponent,
-  'tb-rpc-shell-widget-settings': RpcShellWidgetSettingsComponent,
-  'tb-date-range-navigator-widget-settings': DateRangeNavigatorWidgetSettingsComponent,
-  'tb-edge-quick-overview-widget-settings': EdgeQuickOverviewWidgetSettingsComponent,
-  'tb-gateway-config-widget-settings': GatewayConfigWidgetSettingsComponent,
-  'tb-gateway-config-single-device-widget-settings': GatewayConfigSingleDeviceWidgetSettingsComponent,
-  'tb-gateway-events-widget-settings': GatewayEventsWidgetSettingsComponent,
-  'tb-gpio-control-widget-settings': GpioControlWidgetSettingsComponent,
-  'tb-gpio-panel-widget-settings': GpioPanelWidgetSettingsComponent,
-  'tb-navigation-card-widget-settings': NavigationCardWidgetSettingsComponent,
-  'tb-navigation-cards-widget-settings': NavigationCardsWidgetSettingsComponent,
-  'tb-device-claiming-widget-settings': DeviceClaimingWidgetSettingsComponent,
-  'tb-update-integer-attribute-widget-settings': UpdateIntegerAttributeWidgetSettingsComponent,
-  'tb-update-double-attribute-widget-settings': UpdateDoubleAttributeWidgetSettingsComponent,
-  'tb-update-string-attribute-widget-settings': UpdateStringAttributeWidgetSettingsComponent,
-  'tb-update-boolean-attribute-widget-settings': UpdateBooleanAttributeWidgetSettingsComponent,
-  'tb-update-image-attribute-widget-settings': UpdateImageAttributeWidgetSettingsComponent,
-  'tb-update-date-attribute-widget-settings': UpdateDateAttributeWidgetSettingsComponent,
-  'tb-update-location-attribute-widget-settings': UpdateLocationAttributeWidgetSettingsComponent,
-  'tb-update-json-attribute-widget-settings': UpdateJsonAttributeWidgetSettingsComponent,
-  'tb-photo-camera-input-widget-settings': PhotoCameraInputWidgetSettingsComponent,
-  'tb-update-multiple-attributes-widget-settings': UpdateMultipleAttributesWidgetSettingsComponent,
-  'tb-update-multiple-attributes-key-settings': UpdateMultipleAttributesKeySettingsComponent,
-  'tb-map-widget-settings': MapWidgetSettingsComponent,
-  'tb-route-map-widget-settings': RouteMapWidgetSettingsComponent,
-  'tb-trip-animation-widget-settings': TripAnimationWidgetSettingsComponent,
-  'tb-gateway-logs-settings': GatewayLogsSettingsComponent,
-  'tb-gateway-service-rpc-settings':GatewayServiceRPCSettingsComponent,
-  'tb-doc-links-widget-settings': DocLinksWidgetSettingsComponent,
-  'tb-quick-links-widget-settings': QuickLinksWidgetSettingsComponent,
-  'tb-value-card-widget-settings': ValueCardWidgetSettingsComponent,
-  'tb-aggregated-value-card-key-settings': AggregatedValueCardKeySettingsComponent,
-  'tb-aggregated-value-card-widget-settings': AggregatedValueCardWidgetSettingsComponent,
-  'tb-alarm-count-widget-settings': AlarmCountWidgetSettingsComponent,
-  'tb-entity-count-widget-settings': EntityCountWidgetSettingsComponent,
-  'tb-battery-level-widget-settings': BatteryLevelWidgetSettingsComponent,
-  'tb-wind-speed-direction-widget-settings': WindSpeedDirectionWidgetSettingsComponent,
-  'tb-signal-strength-widget-settings': SignalStrengthWidgetSettingsComponent,
-  'tb-value-chart-card-widget-settings': ValueChartCardWidgetSettingsComponent,
-  'tb-progress-bar-widget-settings': ProgressBarWidgetSettingsComponent,
-  'tb-liquid-level-card-widget-settings': LiquidLevelCardWidgetSettingsComponent,
-  'tb-doughnut-widget-settings': DoughnutWidgetSettingsComponent,
-  'tb-range-chart-widget-settings': RangeChartWidgetSettingsComponent,
-  'tb-bar-chart-with-labels-widget-settings': BarChartWithLabelsWidgetSettingsComponent,
-  'tb-single-switch-widget-settings': SingleSwitchWidgetSettingsComponent,
-  'tb-action-button-widget-settings': ActionButtonWidgetSettingsComponent,
-  'tb-segmented-button-widget-settings': SegmentedButtonWidgetSettingsComponent,
-  'tb-command-button-widget-settings': CommandButtonWidgetSettingsComponent,
-  'tb-power-button-widget-settings': PowerButtonWidgetSettingsComponent,
-  'tb-slider-widget-settings': SliderWidgetSettingsComponent,
-  'tb-toggle-button-widget-settings': ToggleButtonWidgetSettingsComponent,
-  'tb-time-series-chart-key-settings': TimeSeriesChartKeySettingsComponent,
-  'tb-time-series-chart-widget-settings': TimeSeriesChartWidgetSettingsComponent,
-  'tb-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,
-  'tb-label-card-widget-settings': LabelCardWidgetSettingsComponent,
-  'tb-label-value-card-widget-settings': LabelValueCardWidgetSettingsComponent,
-  'tb-unread-notification-widget-settings': UnreadNotificationWidgetSettingsComponent,
-  'tb-scada-symbol-widget-settings': ScadaSymbolWidgetSettingsComponent
-};
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 6e837b0740..8c94dfcdde 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
@@ -37,6 +37,7 @@ import {
 } from '@core/services/resources.service';
 import {
   IWidgetSettingsComponent,
+  migrateWidgetTypeToDynamicForms,
   Widget,
   widgetActionSources,
   WidgetControllerDescriptor,
@@ -58,11 +59,10 @@ import tinycolor from 'tinycolor2';
 import moment from 'moment';
 import { IModulesMap } from '@modules/common/modules-map.models';
 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 { compileTbFunction, TbFunction } from '@shared/models/js-function.models';
 import { HttpClient } from '@angular/common/http';
+import { jsonFormSchemaToFormProperties } from '@shared/models/dynamic-form.models';
 
 @Injectable()
 export class WidgetComponentService {
@@ -112,9 +112,9 @@ export class WidgetComponentService {
             templateHtml: this.utils.editWidgetInfo.templateHtml,
             templateCss: this.utils.editWidgetInfo.templateCss,
             controllerScript: this.utils.editWidgetInfo.controllerScript,
-            settingsSchema: this.utils.editWidgetInfo.settingsSchema,
-            dataKeySettingsSchema: this.utils.editWidgetInfo.dataKeySettingsSchema,
-            latestDataKeySettingsSchema: this.utils.editWidgetInfo.latestDataKeySettingsSchema,
+            settingsForm: this.utils.editWidgetInfo.settingsForm,
+            dataKeySettingsForm: this.utils.editWidgetInfo.dataKeySettingsForm,
+            latestDataKeySettingsForm: this.utils.editWidgetInfo.latestDataKeySettingsForm,
             settingsDirective: this.utils.editWidgetInfo.settingsDirective,
             dataKeySettingsDirective: this.utils.editWidgetInfo.dataKeySettingsDirective,
             latestDataKeySettingsDirective: this.utils.editWidgetInfo.latestDataKeySettingsDirective,
@@ -275,6 +275,7 @@ export class WidgetComponentService {
           this.widgetsInfoFetchQueue.set(fullFqn, fetchQueue);
           this.widgetService.getWidgetType(fullFqn, {ignoreErrors: true}).subscribe(
             (widgetType) => {
+              widgetType = migrateWidgetTypeToDynamicForms(widgetType);
               this.loadWidget(widgetType, widgetInfoSubject);
             },
             () => {
@@ -298,14 +299,14 @@ export class WidgetComponentService {
           this.loadWidgetResources(widgetInfo, widgetNamespace, [SharedModule, WidgetComponentsModule, this.homeComponentsModule]).subscribe(
             {
               next: () => {
-                if (widgetControllerDescriptor.settingsSchema) {
-                  widgetInfo.typeSettingsSchema = widgetControllerDescriptor.settingsSchema;
+                if (widgetControllerDescriptor.settingsForm) {
+                  widgetInfo.typeSettingsForm = widgetControllerDescriptor.settingsForm;
                 }
-                if (widgetControllerDescriptor.dataKeySettingsSchema) {
-                  widgetInfo.typeDataKeySettingsSchema = widgetControllerDescriptor.dataKeySettingsSchema;
+                if (widgetControllerDescriptor.dataKeySettingsForm) {
+                  widgetInfo.typeDataKeySettingsForm = widgetControllerDescriptor.dataKeySettingsForm;
                 }
-                if (widgetControllerDescriptor.latestDataKeySettingsSchema) {
-                  widgetInfo.typeLatestDataKeySettingsSchema = widgetControllerDescriptor.latestDataKeySettingsSchema;
+                if (widgetControllerDescriptor.latestDataKeySettingsForm) {
+                  widgetInfo.typeLatestDataKeySettingsForm = widgetControllerDescriptor.latestDataKeySettingsForm;
                 }
                 widgetInfo.typeParameters = widgetControllerDescriptor.typeParameters;
                 widgetInfo.actionSources = widgetControllerDescriptor.actionSources;
@@ -435,17 +436,17 @@ export class WidgetComponentService {
       basicDirectives.push(widgetInfo.basicModeDirective);
     }
 
-    this.expandSettingComponentMap(widgetSettingsComponentsMap, directives, modulesWithComponents);
-    this.expandSettingComponentMap(basicWidgetConfigComponentsMap, basicDirectives, modulesWithComponents);
+    this.expandSettingComponentMap(this.widgetService.putWidgetSettingsComponentToMap.bind(this.widgetService), directives, modulesWithComponents);
+    this.expandSettingComponentMap(this.widgetService.putBasicWidgetSettingsComponentToMap.bind(this.widgetService), basicDirectives, modulesWithComponents);
   }
 
-  private expandSettingComponentMap(settingsComponentsMap: {[key: string]: Type<IWidgetSettingsComponent | IBasicWidgetConfigComponent>},
+  private expandSettingComponentMap(putComponentToMap: (selector: string, comp: Type<IWidgetSettingsComponent | IBasicWidgetConfigComponent>) => void,
                                     directives: string[], modulesWithComponents: ModulesWithComponents): void {
     if (directives.length) {
       directives.forEach(selector => {
         const compType = componentTypeBySelector(modulesWithComponents, selector);
         if (compType) {
-          settingsComponentsMap[selector] = compType;
+          putComponentToMap(selector, compType);
         }
       });
     }
@@ -506,12 +507,23 @@ export class WidgetComponentService {
 
          '    }\n\n' +
 
-         '    self.getSettingsSchema = function() {\n\n' +
-
+         '    self.getSettingsForm = function() {\n\n' +
+                return [
+                  {
+                    'id': 'testProp',
+                    'name': 'Test property',
+                    'type': 'text',
+                    'default': 'Default value'
+                  }
+                ];
          '    }\n\n' +
 
-         '    self.getDataKeySettingsSchema = function() {\n\n' +
+         '    self.getDataKeySettingsForm = function() {\n\n' +
+                return [];
+         '    }\n\n' +
 
+         '    self.getLatestDataKeySettingsForm = function() {\n\n' +
+                return [];
          '    }\n\n' +
 
          '    self.onDestroy = function() {\n\n' +
@@ -539,15 +551,33 @@ export class WidgetComponentService {
         const result: WidgetControllerDescriptor = {
           widgetTypeFunction: widgetType
         };
-        if (isFunction(widgetTypeInstance.getSettingsSchema)) {
-          result.settingsSchema = widgetTypeInstance.getSettingsSchema();
+        if (isFunction(widgetTypeInstance.getSettingsForm)) {
+          result.settingsForm = widgetTypeInstance.getSettingsForm();
+        }
+        if (isFunction(widgetTypeInstance.getDataKeySettingsForm)) {
+          result.dataKeySettingsForm = widgetTypeInstance.getDataKeySettingsForm();
         }
-        if (isFunction(widgetTypeInstance.getDataKeySettingsSchema)) {
-          result.dataKeySettingsSchema = widgetTypeInstance.getDataKeySettingsSchema();
+        if (isFunction(widgetTypeInstance.getLatestDataKeySettingsForm)) {
+          result.latestDataKeySettingsForm = widgetTypeInstance.getLatestDataKeySettingsForm();
         }
-        if (isFunction(widgetTypeInstance.getLatestDataKeySettingsSchema)) {
-          result.latestDataKeySettingsSchema = widgetTypeInstance.getLatestDataKeySettingsSchema();
+
+        /** Start migrate from old JSON Schema Form **/
+
+        if (isFunction((widgetTypeInstance as any).getSettingsSchema) && !result.settingsForm?.length) {
+          const settingsSchema = (widgetTypeInstance as any).getSettingsSchema();
+          result.settingsForm = jsonFormSchemaToFormProperties(settingsSchema);
         }
+        if (isFunction((widgetTypeInstance as any).getDataKeySettingsSchema) && !result.dataKeySettingsForm?.length) {
+          const dataKeySettingsSchema = (widgetTypeInstance as any).getDataKeySettingsSchema();
+          result.dataKeySettingsForm = jsonFormSchemaToFormProperties(dataKeySettingsSchema);
+        }
+        if (isFunction((widgetTypeInstance as any).getLatestDataKeySettingsSchema) && !result.latestDataKeySettingsForm?.length) {
+          const latestDataKeySettingsSchema = (widgetTypeInstance as any).getLatestDataKeySettingsSchema();
+          result.latestDataKeySettingsForm = jsonFormSchemaToFormProperties(latestDataKeySettingsSchema);
+        }
+
+        /** End migrate from old JSON Schema Form **/
+
         if (isFunction(widgetTypeInstance.typeParameters)) {
           result.typeParameters = widgetTypeInstance.typeParameters();
         } else {
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 21f2d89dc6..fe752bb8b5 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
@@ -88,6 +88,7 @@ import {
 import { EllipsisChipListDirective } from '@shared/directives/ellipsis-chip-list.directive';
 import { ScadaSymbolWidgetComponent } from '@home/components/widget/lib/scada/scada-symbol-widget.component';
 import { TwoSegmentButtonWidgetComponent } from '@home/components/widget/lib/button/two-segment-button-widget.component';
+import { ValueStepperWidgetComponent } from '@home/components/widget/lib/rpc/value-stepper-widget.component';
 
 @NgModule({
   declarations: [
@@ -128,6 +129,7 @@ import { TwoSegmentButtonWidgetComponent } from '@home/components/widget/lib/but
     TwoSegmentButtonWidgetComponent,
     CommandButtonWidgetComponent,
     PowerButtonWidgetComponent,
+    ValueStepperWidgetComponent,
     SliderWidgetComponent,
     ToggleButtonWidgetComponent,
     TimeSeriesChartWidgetComponent,
@@ -190,6 +192,7 @@ import { TwoSegmentButtonWidgetComponent } from '@home/components/widget/lib/but
     TwoSegmentButtonWidgetComponent,
     CommandButtonWidgetComponent,
     PowerButtonWidgetComponent,
+    ValueStepperWidgetComponent,
     SliderWidgetComponent,
     ToggleButtonWidgetComponent,
     TimeSeriesChartWidgetComponent,
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 b70b75d52a..595a8a2914 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
@@ -34,9 +34,7 @@ import {
   DataKey,
   datasourcesHasAggregation,
   datasourcesHasOnlyComparisonAggregation,
-  GroupInfo,
-  JsonSchema,
-  JsonSettingsSchema,
+  DynamicFormData,
   TargetDevice,
   targetDeviceValid,
   Widget,
@@ -75,28 +73,19 @@ import {
 import { catchError, map, mergeMap, tap } from 'rxjs/operators';
 import { MatDialog } from '@angular/material/dialog';
 import { EntityService } from '@core/http/entity.service';
-import { JsonFormComponentData } from '@shared/components/json-form/json-form-component.models';
 import { Dashboard } from '@shared/models/dashboard.models';
 import { entityFields } from '@shared/models/entity.models';
 import { Filter, singleEntityFilterFromDeviceId } from '@shared/models/query/query.models';
 import { FilterDialogComponent, FilterDialogData } from '@home/components/filter/filter-dialog.component';
 import { ToggleHeaderOption } from '@shared/components/toggle-header.component';
 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 { DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
+import { defaultFormProperties, FormProperty } from '@shared/models/dynamic-form.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { WidgetService } from '@core/http/widget.service';
 import Timeout = NodeJS.Timeout;
 
-const emptySettingsSchema: JsonSchema = {
-  type: 'object',
-  properties: {}
-};
-const emptySettingsGroupInfoes: GroupInfo[] = [];
-const defaultSettingsForm = [
-  '*'
-];
-
 @Component({
   selector: 'tb-widget-config',
   templateUrl: './widget-config.component.html',
@@ -216,6 +205,7 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
               public translate: TranslateService,
               private fb: UntypedFormBuilder,
               private cd: ChangeDetectorRef,
+              private widgetService: WidgetService,
               private destroyRef: DestroyRef) {
     super(store);
   }
@@ -446,7 +436,7 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
   }
 
   private setupBasicModeConfig(isAdd = false) {
-    const componentType = basicWidgetConfigComponentsMap[this.modelValue.basicModeDirective];
+    const componentType = this.widgetService.getBasicWidgetSettingsComponentBySelector(this.modelValue.basicModeDirective);
     if (!componentType) {
       this.basicModeDirectiveError = this.translate.instant('widget-config.settings-component-not-found',
         {selector: this.modelValue.basicModeDirective});
@@ -571,7 +561,7 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
         }
       }
 
-      this.updateSchemaForm(config.settings);
+      this.updateAdvancedForm(config.settings);
 
       if (layout) {
         this.layoutSettings.patchValue(
@@ -641,21 +631,16 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
     }
   }
 
-  private updateSchemaForm(settings?: any) {
-    const widgetSettingsFormData: JsonFormComponentData = {};
-    if (this.modelValue.settingsSchema && this.modelValue.settingsSchema.schema) {
-      widgetSettingsFormData.schema = this.modelValue.settingsSchema.schema;
-      widgetSettingsFormData.form = this.modelValue.settingsSchema.form || deepClone(defaultSettingsForm);
-      widgetSettingsFormData.groupInfoes = this.modelValue.settingsSchema.groupInfoes;
-      widgetSettingsFormData.model = settings;
+  private updateAdvancedForm(settings?: any) {
+    const dynamicFormData: DynamicFormData = {};
+    dynamicFormData.model = settings || {};
+    if (this.modelValue.settingsForm?.length) {
+      dynamicFormData.settingsForm = this.modelValue.settingsForm;
     } else {
-      widgetSettingsFormData.schema = deepClone(emptySettingsSchema);
-      widgetSettingsFormData.form = deepClone(defaultSettingsForm);
-      widgetSettingsFormData.groupInfoes = deepClone(emptySettingsGroupInfoes);
-      widgetSettingsFormData.model = settings || {};
+      dynamicFormData.settingsForm = [];
     }
-    widgetSettingsFormData.settingsDirective = this.modelValue.settingsDirective;
-    this.advancedSettings.patchValue({ settings: widgetSettingsFormData }, {emitEvent: false});
+    dynamicFormData.settingsDirective = this.modelValue.settingsDirective;
+    this.advancedSettings.patchValue({ settings: dynamicFormData }, {emitEvent: false});
   }
 
   private updateDataSettings() {
@@ -731,7 +716,7 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
   }
 
   public get displayAdvancedAppearance(): boolean {
-    return !!this.modelValue && (!!this.modelValue.settingsSchema && !!this.modelValue.settingsSchema.schema ||
+    return !!this.modelValue && (!!this.modelValue.settingsForm && !!this.modelValue.settingsForm.length ||
         !!this.modelValue.settingsDirective && !!this.modelValue.settingsDirective.length);
   }
 
@@ -770,7 +755,7 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
     }
   }
 
-  public generateDataKey(chip: any, type: DataKeyType, datakeySettingsSchema: JsonSettingsSchema,
+  public generateDataKey(chip: any, type: DataKeyType, dataKeySettingsForm: FormProperty[],
                          isLatestDataKey: boolean, dataKeySettingsFunction: DataKeySettingsFunction): DataKey {
     if (isObject(chip)) {
       (chip as DataKey)._hash = Math.random();
@@ -802,8 +787,8 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
       } else if (type === DataKeyType.count) {
         result.name = 'count';
       }
-      if (datakeySettingsSchema && isDefined(datakeySettingsSchema.schema)) {
-        result.settings = this.utils.generateObjectFromJsonSchema(datakeySettingsSchema.schema);
+      if (dataKeySettingsForm?.length) {
+        result.settings = defaultFormProperties(dataKeySettingsForm);
       } else if (dataKeySettingsFunction) {
         const settings = dataKeySettingsFunction(result, isLatestDataKey);
         if (settings) {
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 dbdcdcd61e..7e1a25d61a 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
@@ -144,7 +144,8 @@ export class DateEntityTableColumn<T extends BaseData<HasId>> extends EntityTabl
 export class EntityChipsEntityTableColumn<T extends BaseData<HasId>> extends BaseEntityTableColumn<T> {
   constructor(public key: string,
               public title: string,
-              public width: string = '0px') {
+              public width: string = '0px',
+              public entityURL?: (entity) => string) {
     super('entityChips', key, title, width, false);
   }
 }
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 03af49d6d2..b1958cb3db 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
@@ -21,7 +21,6 @@ import {
   DatasourceData,
   FormattedData,
   fullWidgetTypeFqn,
-  JsonSettingsSchema,
   Widget,
   WidgetActionDescriptor,
   WidgetActionSource,
@@ -106,6 +105,7 @@ import { UserSettingsService } from '@core/http/user-settings.service';
 import { DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 import { UtilsService } from '@core/services/utils.service';
 import { CompiledTbFunction } from '@shared/models/js-function.models';
+import { FormProperty } from '@shared/models/dynamic-form.models';
 
 export interface IWidgetAction {
   name: string;
@@ -560,9 +560,9 @@ export interface WidgetInfo extends WidgetTypeDescriptor, WidgetControllerDescri
   fullFqn: string;
   deprecated: boolean;
   scada: boolean;
-  typeSettingsSchema?: string | any;
-  typeDataKeySettingsSchema?: string | any;
-  typeLatestDataKeySettingsSchema?: string | any;
+  typeSettingsForm?: FormProperty[];
+  typeDataKeySettingsForm?: FormProperty[];
+  typeLatestDataKeySettingsForm?: FormProperty[];
   image?: string;
   description?: string;
   tags?: string[];
@@ -577,9 +577,9 @@ export interface WidgetConfigComponentData {
   typeParameters: WidgetTypeParameters;
   actionSources: {[actionSourceId: string]: WidgetActionSource};
   isDataEnabled: boolean;
-  settingsSchema: JsonSettingsSchema;
-  dataKeySettingsSchema: JsonSettingsSchema;
-  latestDataKeySettingsSchema: JsonSettingsSchema;
+  settingsForm: FormProperty[];
+  dataKeySettingsForm: FormProperty[];
+  latestDataKeySettingsForm: FormProperty[];
   dataKeySettingsFunction: DataKeySettingsFunction;
   settingsDirective: string;
   dataKeySettingsDirective: string;
@@ -602,8 +602,8 @@ export const MissingWidgetType: WidgetInfo = {
     '</div>',
   templateCss: '',
   controllerScript: 'self.onInit = function() {}',
-  settingsSchema: '{}\n',
-  dataKeySettingsSchema: '{}\n',
+  settingsForm: [],
+  dataKeySettingsForm: [],
   image: null,
   description: null,
   defaultConfig: '{\n' +
@@ -629,8 +629,8 @@ export const ErrorWidgetType: WidgetInfo = {
                 '</div>',
   templateCss: '',
   controllerScript: 'self.onInit = function() {}',
-  settingsSchema: '{}\n',
-  dataKeySettingsSchema: '{}\n',
+  settingsForm: [],
+  dataKeySettingsForm: [],
   image: null,
   description: null,
   defaultConfig: '{\n' +
@@ -642,9 +642,9 @@ export const ErrorWidgetType: WidgetInfo = {
 };
 
 export interface WidgetTypeInstance {
-  getSettingsSchema?: () => string;
-  getDataKeySettingsSchema?: () => string;
-  getLatestDataKeySettingsSchema?: () => string;
+  getSettingsForm?: () => FormProperty[];
+  getDataKeySettingsForm?: () => FormProperty[];
+  getLatestDataKeySettingsForm?: () => FormProperty[];
   typeParameters?: () => WidgetTypeParameters;
   useCustomDatasources?: () => boolean;
   actionSources?: () => {[actionSourceId: string]: WidgetActionSource};
@@ -670,9 +670,9 @@ export const toWidgetInfo = (widgetTypeEntity: WidgetType): WidgetInfo => ({
   templateHtml: widgetTypeEntity.descriptor.templateHtml,
   templateCss: widgetTypeEntity.descriptor.templateCss,
   controllerScript: widgetTypeEntity.descriptor.controllerScript,
-  settingsSchema: widgetTypeEntity.descriptor.settingsSchema,
-  dataKeySettingsSchema: widgetTypeEntity.descriptor.dataKeySettingsSchema,
-  latestDataKeySettingsSchema: widgetTypeEntity.descriptor.latestDataKeySettingsSchema,
+  settingsForm: widgetTypeEntity.descriptor.settingsForm,
+  dataKeySettingsForm: widgetTypeEntity.descriptor.dataKeySettingsForm,
+  latestDataKeySettingsForm: widgetTypeEntity.descriptor.latestDataKeySettingsForm,
   settingsDirective: widgetTypeEntity.descriptor.settingsDirective,
   dataKeySettingsDirective: widgetTypeEntity.descriptor.dataKeySettingsDirective,
   latestDataKeySettingsDirective: widgetTypeEntity.descriptor.latestDataKeySettingsDirective,
@@ -699,9 +699,9 @@ export const toWidgetType = (widgetInfo: WidgetInfo, id: WidgetTypeId, tenantId:
     templateHtml: widgetInfo.templateHtml,
     templateCss: widgetInfo.templateCss,
     controllerScript: widgetInfo.controllerScript,
-    settingsSchema: widgetInfo.settingsSchema,
-    dataKeySettingsSchema: widgetInfo.dataKeySettingsSchema,
-    latestDataKeySettingsSchema: widgetInfo.latestDataKeySettingsSchema,
+    settingsForm: widgetInfo.settingsForm,
+    dataKeySettingsForm: widgetInfo.dataKeySettingsForm,
+    latestDataKeySettingsForm: widgetInfo.latestDataKeySettingsForm,
     settingsDirective: widgetInfo.settingsDirective,
     dataKeySettingsDirective: widgetInfo.dataKeySettingsDirective,
     latestDataKeySettingsDirective: widgetInfo.latestDataKeySettingsDirective,
diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client.component.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client.component.ts
index 70355c0a3e..08d7782a7f 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client.component.ts
@@ -203,7 +203,9 @@ export class ClientComponent extends EntityComponent<OAuth2Client, PageLink, OAu
       additionalInfo?.providerName : defaultProviderName);
 
     this.changeMapperConfigType(this.entityForm, MapperType.BASIC);
-    this.setProviderDefaultValue(defaultProviderName, this.entityForm);
+    if (this.createNewDialog || this.isAdd) {
+      this.setProviderDefaultValue(defaultProviderName, this.entityForm);
+    }
 
     this.subscriptions.push(this.entityForm.get('mapperConfig.type').valueChanges.subscribe((value) => {
       this.changeMapperConfigType(this.entityForm, value);
diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts
index 8e1014a1da..8048fec885 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts
@@ -32,7 +32,8 @@ import { DomainComponent } from '@home/pages/admin/oauth2/domains/domain.compone
 import { isEqual } from '@core/utils';
 import { DomainTableHeaderComponent } from '@home/pages/admin/oauth2/domains/domain-table-header.component';
 import { Direction } from '@app/shared/models/page/sort-order';
-import { map, mergeMap, Observable, of } from 'rxjs';
+import { map, of } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
 
 @Injectable()
 export class DomainTableConfigResolver  {
@@ -84,16 +85,15 @@ export class DomainTableConfigResolver  {
     this.config.loadEntity = id => this.domainService.getDomainInfoById(id.id);
     this.config.saveEntity = (domain, originalDomain) => {
       const clientsIds = domain.oauth2ClientInfos as Array<string> || [];
-      let clientsTask: Observable<void>;
-      if (domain.id && !isEqual(domain.oauth2ClientInfos?.sort(),
-        originalDomain.oauth2ClientInfos?.map(info => info.id ? info.id.id : info).sort())) {
-        clientsTask = this.domainService.updateOauth2Clients(domain.id.id, clientsIds);
-      } else {
-        clientsTask = of(null);
-      }
+      const shouldUpdateClients = domain.id && !isEqual(domain.oauth2ClientInfos?.sort(),
+        originalDomain.oauth2ClientInfos?.map(info => info.id ? info.id.id : info).sort());
       delete domain.oauth2ClientInfos;
-      return clientsTask.pipe(
-        mergeMap(() => this.domainService.saveDomain(domain, domain.id ? [] : clientsIds)),
+
+      return this.domainService.saveDomain(domain, domain.id ? null : clientsIds).pipe(
+        switchMap(savedDomain => shouldUpdateClients
+          ? this.domainService.updateOauth2Clients(domain.id.id, clientsIds).pipe(map(() => savedDomain))
+          : of(savedDomain)
+        ),
         map(savedDomain => {
           (savedDomain as DomainInfo).oauth2ClientInfos = clientsIds;
           return savedDomain;
@@ -112,12 +112,9 @@ export class DomainTableConfigResolver  {
       $event.stopPropagation();
     }
 
-    const modifiedDomain: DomainInfo = {
-      ...domain,
-      oauth2Enabled: !domain.oauth2Enabled
-    };
+    const { oauth2ClientInfos, oauth2Enabled, ...updatedDomain } = domain;
 
-    this.domainService.saveDomain(modifiedDomain, domain.oauth2ClientInfos.map(clientInfo => clientInfo.id.id),
+    this.domainService.saveDomain({ ...updatedDomain, oauth2Enabled: !oauth2Enabled }, null,
       {ignoreLoading: true})
       .subscribe((result) => {
         domain.oauth2Enabled = result.oauth2Enabled;
@@ -130,12 +127,9 @@ export class DomainTableConfigResolver  {
       $event.stopPropagation();
     }
 
-    const modifiedDomain: DomainInfo = {
-      ...domain,
-      propagateToEdge: !domain.propagateToEdge
-    };
+    const { oauth2ClientInfos, propagateToEdge, ...updatedDomain } = domain;
 
-    this.domainService.saveDomain(modifiedDomain, domain.oauth2ClientInfos.map(clientInfo => clientInfo.id.id),
+    this.domainService.saveDomain({ ...updatedDomain, propagateToEdge: !propagateToEdge }, null,
       {ignoreLoading: true})
       .subscribe((result) => {
         domain.propagateToEdge = result.propagateToEdge;
diff --git a/ui-ngx/src/app/modules/home/pages/edge/edge-routing.module.ts b/ui-ngx/src/app/modules/home/pages/edge/edge-routing.module.ts
index 1302bfa140..bef4cd4a51 100644
--- a/ui-ngx/src/app/modules/home/pages/edge/edge-routing.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/edge/edge-routing.module.ts
@@ -291,6 +291,7 @@ const routes: Routes = [
                   import: false,
                   ruleChainType: RuleChainType.EDGE
                 },
+                loadChildren: () => import('../rulechain/rulechain-page.module').then(m => m.RuleChainPageModule),
                 resolve: {
                   ruleChain: RuleChainResolver,
                   ruleChainMetaData: RuleChainMetaDataResolver,
@@ -336,6 +337,7 @@ const routes: Routes = [
               import: false,
               ruleChainType: RuleChainType.EDGE
             },
+            loadChildren: () => import('../rulechain/rulechain-page.module').then(m => m.RuleChainPageModule),
             resolve: {
               ruleChain: RuleChainResolver,
               ruleChainMetaData: RuleChainMetaDataResolver,
@@ -358,6 +360,7 @@ const routes: Routes = [
               import: true,
               ruleChainType: RuleChainType.EDGE
             },
+            loadChildren: () => import('../rulechain/rulechain-page.module').then(m => m.RuleChainPageModule),
             resolve: {
               ruleNodeComponents: RuleNodeComponentsResolver,
               tooltipster: TooltipsterResolver
diff --git a/ui-ngx/src/app/modules/home/pages/entity-view/entity-view.component.html b/ui-ngx/src/app/modules/home/pages/entity-view/entity-view.component.html
index c0ee9b61b7..4cc1f0fedc 100644
--- a/ui-ngx/src/app/modules/home/pages/entity-view/entity-view.component.html
+++ b/ui-ngx/src/app/modules/home/pages/entity-view/entity-view.component.html
@@ -148,17 +148,15 @@
           </mat-expansion-panel>
         </mat-accordion>
       </div>
-      <tb-datetime
-        dateText="entity-view.start-date"
-        timeText="entity-view.start-ts"
-        [maxDate]="maxStartTimeMs | async"
-        formControlName="startTimeMs"
+      <tb-datetime class="block"
+                   dateText="{{ 'entity-view.start-ts' | translate }}"
+                   [maxDate]="maxStartTimeMs | async"
+                   formControlName="startTimeMs"
       ></tb-datetime>
-      <tb-datetime
-        dateText="entity-view.end-date"
-        timeText="entity-view.end-ts"
-        [minDate]="minEndTimeMs | async"
-        formControlName="endTimeMs"
+      <tb-datetime class="block"
+                   dateText="{{ 'entity-view.end-ts' | translate }}"
+                   [minDate]="minEndTimeMs | async"
+                   formControlName="endTimeMs"
       ></tb-datetime>
       <div formGroupName="additionalInfo">
         <mat-form-field class="mat-block">
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/custom-mobile-page.component.html b/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/custom-mobile-page.component.html
index 1c89c7e06b..b0a44386cd 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/custom-mobile-page.component.html
+++ b/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/custom-mobile-page.component.html
@@ -46,6 +46,14 @@
                 class="tb-error">
         warning
       </mat-icon>
+      <mat-icon matSuffix
+                matTooltipPosition="above"
+                matTooltipClass="tb-error-tooltip"
+                matTooltip="{{ 'mobile.page-name-max-length' | translate }}"
+                *ngIf="customMobilePageForm.get('label').hasError('maxlength') && customMobilePageForm.get('label').touched"
+                class="tb-error">
+        warning
+      </mat-icon>
     </mat-form-field>
   </div>
   <mat-form-field appearance="outline" subscriptSizing="dynamic">
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/custom-mobile-page.component.ts b/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/custom-mobile-page.component.ts
index e9576f313a..cf57c90a14 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/custom-mobile-page.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/custom-mobile-page.component.ts
@@ -65,7 +65,7 @@ export class CustomMobilePageComponent implements ControlValueAccessor, Validato
   customMobilePageForm = this.fb.group({
     visible: [true],
     icon: ['star'],
-    label: ['', [Validators.required, Validators.pattern(/\S/)]],
+    label: ['', [Validators.required, Validators.pattern(/\S/), Validators.maxLength(255)]],
     type: [MobilePageType.DASHBOARD],
     dashboardId: this.fb.control<string>(null, Validators.required),
     url: [{value:'', disabled: true}, [Validators.required, Validators.pattern(WEB_URL_REGEX)]],
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-dialog.component.html b/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-dialog.component.html
index 8e029cf9f7..e3352a2eb4 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-dialog.component.html
@@ -44,6 +44,12 @@
           <mat-error *ngIf="bundlesForms.get('title').hasError('required')">
             {{ 'mobile.title-required' | translate }}
           </mat-error>
+          <mat-error *ngIf="bundlesForms.get('title').hasError('pattern')">
+            {{ 'mobile.title-cannot-contain-only-spaces' | translate }}
+          </mat-error>
+          <mat-error *ngIf="bundlesForms.get('title').hasError('maxlength')">
+            {{ 'mobile.title-max-length' | translate }}
+          </mat-error>
         </mat-form-field>
         <tb-entity-autocomplete
           allowCreateNew
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-dialog.component.ts
index 6e43e1f650..1db7aa1cfc 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-dialog.component.ts
@@ -64,7 +64,7 @@ export class MobileBundleDialogComponent extends DialogComponent<MobileBundleDia
   platformType = PlatformType;
 
   bundlesForms = this.fb.group({
-    title: ['', Validators.required],
+    title: ['', [Validators.required, Validators.pattern(/\S/), Validators.maxLength(255)]],
     androidAppId: [null],
     iosAppId: [null],
     description: [''],
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-table-config.resolve.ts b/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-table-config.resolve.ts
index ac9445c615..5576117460 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-table-config.resolve.ts
+++ b/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-table-config.resolve.ts
@@ -185,11 +185,7 @@ export class MobileBundleTableConfigResolver {
           iosApp: data.iosApp
         }
       }).afterClosed()
-        .subscribe(() => {
-          if (afterAdd) {
-            this.config.updateData();
-          }
-        });
+        .subscribe();
     })
   }
 }
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.ts
index fc73cc9d56..0a5057342f 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.ts
@@ -207,6 +207,10 @@ export class RuleNodeConfigComponent implements ControlValueAccessor, OnDestroy
         this.changeSubscription.unsubscribe();
         this.changeSubscription = null;
       }
+      if (this.changeScriptSubscription) {
+        this.changeScriptSubscription.unsubscribe();
+        this.changeScriptSubscription = null;
+      }
       this.definedConfigContainer.clear();
       const component = this.ruleChainService.getRuleNodeConfigComponent(this.nodeDefinition.configDirective);
       this.definedConfigComponentRef = this.definedConfigContainer.createComponent(component);
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.module.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.module.ts
new file mode 100644
index 0000000000..5e2596939e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.module.ts
@@ -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.
+///
+
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '@shared/shared.module';
+import { HomeComponentsModule } from '@home/components/home-components.module';
+import { DurationLeftPipe } from '@shared/pipe/duration-left.pipe';
+import {
+  EntityDebugSettingsButtonComponent
+} from '@home/components/entity/debug/entity-debug-settings-button.component';
+import { RuleNodeConfigModule } from '@home/components/rule-node/rule-node-config.module';
+import {
+  AddRuleNodeDialogComponent,
+  AddRuleNodeLinkDialogComponent,
+  CreateNestedRuleChainDialogComponent,
+  RuleChainPageComponent
+} from '@home/pages/rulechain/rulechain-page.component';
+import { RuleNodeDetailsComponent } from '@home/pages/rulechain/rule-node-details.component';
+import { RuleNodeConfigComponent } from '@home/pages/rulechain/rule-node-config.component';
+import { LinkLabelsComponent } from '@home/pages/rulechain/link-labels.component';
+import { RuleNodeLinkComponent } from '@home/pages/rulechain/rule-node-link.component';
+
+@NgModule({
+  declarations: [
+    RuleChainPageComponent,
+    RuleNodeDetailsComponent,
+    LinkLabelsComponent,
+    RuleNodeLinkComponent,
+    RuleNodeConfigComponent,
+    AddRuleNodeLinkDialogComponent,
+    AddRuleNodeDialogComponent,
+    CreateNestedRuleChainDialogComponent
+  ],
+  imports: [
+    CommonModule,
+    SharedModule,
+    DurationLeftPipe,
+    EntityDebugSettingsButtonComponent,
+    RuleNodeConfigModule,
+    HomeComponentsModule,
+  ]
+})
+export class RuleChainPageModule {}
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts
index 0162e43655..cff4d2df4e 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts
@@ -148,6 +148,7 @@ const routes: Routes = [
           import: false,
           ruleChainType: RuleChainType.CORE
         },
+        loadChildren: () => import('./rulechain-page.module').then(m => m.RuleChainPageModule),
         resolve: {
           ruleChain: RuleChainResolver,
           ruleChainMetaData: RuleChainMetaDataResolver,
@@ -170,6 +171,7 @@ const routes: Routes = [
           import: true,
           ruleChainType: RuleChainType.CORE
         },
+        loadChildren: () => import('./rulechain-page.module').then(m => m.RuleChainPageModule),
         resolve: {
           ruleNodeComponents: RuleNodeComponentsResolver,
           tooltipster: TooltipsterResolver
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain.module.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain.module.ts
index 4cc83b0074..be9478574d 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain.module.ts
@@ -21,33 +21,14 @@ import { RuleChainComponent } from '@modules/home/pages/rulechain/rulechain.comp
 import { RuleChainRoutingModule } from '@modules/home/pages/rulechain/rulechain-routing.module';
 import { HomeComponentsModule } from '@modules/home/components/home-components.module';
 import { RuleChainTabsComponent } from '@home/pages/rulechain/rulechain-tabs.component';
-import {
-  AddRuleNodeDialogComponent,
-  AddRuleNodeLinkDialogComponent, CreateNestedRuleChainDialogComponent,
-  RuleChainPageComponent
-} from './rulechain-page.component';
 import { RuleNodeComponent } from '@home/pages/rulechain/rulenode.component';
 import { FC_NODE_COMPONENT_CONFIG } from 'ngx-flowchart';
-import { RuleNodeDetailsComponent } from './rule-node-details.component';
-import { RuleNodeLinkComponent } from './rule-node-link.component';
-import { LinkLabelsComponent } from '@home/pages/rulechain/link-labels.component';
-import { RuleNodeConfigComponent } from './rule-node-config.component';
-import { DurationLeftPipe } from '@shared/pipe/duration-left.pipe';
-import { EntityDebugSettingsButtonComponent } from '@home/components/entity/debug/entity-debug-settings-button.component';
 
 @NgModule({
   declarations: [
     RuleChainComponent,
     RuleChainTabsComponent,
-    RuleChainPageComponent,
     RuleNodeComponent,
-    RuleNodeDetailsComponent,
-    RuleNodeConfigComponent,
-    LinkLabelsComponent,
-    RuleNodeLinkComponent,
-    AddRuleNodeLinkDialogComponent,
-    AddRuleNodeDialogComponent,
-    CreateNestedRuleChainDialogComponent
   ],
   providers: [
     {
@@ -55,15 +36,13 @@ import { EntityDebugSettingsButtonComponent } from '@home/components/entity/debu
       useValue: {
         nodeComponentType: RuleNodeComponent
       }
-    }
+    },
   ],
   imports: [
     CommonModule,
     SharedModule,
     HomeComponentsModule,
     RuleChainRoutingModule,
-    DurationLeftPipe,
-    EntityDebugSettingsButtonComponent
   ]
 })
 export class RuleChainModule { }
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-behaviors.component.html b/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-behaviors.component.html
index d566336057..fc02871a9c 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-behaviors.component.html
+++ b/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-behaviors.component.html
@@ -28,6 +28,7 @@
          [cdkDropListDisabled]="!dragEnabled"
          (cdkDropListDropped)="behaviorDrop($event)">
       <div cdkDrag [cdkDragDisabled]="!dragEnabled"
+           [class.tb-draggable]="!disabled"
            [class.tb-draggable-form-table-row]="!disabled"
            *ngFor="let behaviorControl of behaviorsFormArray().controls; trackBy: trackByBehavior; let $index = index;">
         <tb-scada-symbol-metadata-behavior-row class="flex-1"
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-behaviors.component.ts b/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-behaviors.component.ts
index b2ca82b7ae..ffd8571d56 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-behaviors.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-behaviors.component.ts
@@ -177,8 +177,8 @@ export class ScadaSymbolBehaviorsComponent implements ControlValueAccessor, OnIn
   behaviorDrop(event: CdkDragDrop<string[]>) {
     const behaviorsArray = this.behaviorsFormGroup.get('behaviors') as UntypedFormArray;
     const behavior = behaviorsArray.at(event.previousIndex);
-    behaviorsArray.removeAt(event.previousIndex);
-    behaviorsArray.insert(event.currentIndex, behavior);
+    behaviorsArray.removeAt(event.previousIndex, {emitEvent: false});
+    behaviorsArray.insert(event.currentIndex, behavior, {emitEvent: true});
   }
 
   behaviorsFormArray(): UntypedFormArray {
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata-components.module.ts b/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata-components.module.ts
index 7507b4cdcb..6e3a02330f 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata-components.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata-components.module.ts
@@ -35,15 +35,6 @@ import {
 import {
   ScadaSymbolBehaviorPanelComponent
 } from '@home/pages/scada-symbol/metadata-components/scada-symbol-behavior-panel.component';
-import {
-  ScadaSymbolPropertiesComponent
-} from '@home/pages/scada-symbol/metadata-components/scada-symbol-properties.component';
-import {
-  ScadaSymbolPropertyRowComponent
-} from '@home/pages/scada-symbol/metadata-components/scada-symbol-property-row.component';
-import {
-  ScadaSymbolPropertyPanelComponent
-} from '@home/pages/scada-symbol/metadata-components/scada-symbol-property-panel.component';
 import { WidgetSettingsCommonModule } from '@home/components/widget/lib/settings/common/widget-settings-common.module';
 import {
   ScadaSymbolMetadataTagFunctionPanelComponent
@@ -58,10 +49,7 @@ import {
       ScadaSymbolMetadataTagFunctionPanelComponent,
       ScadaSymbolBehaviorsComponent,
       ScadaSymbolBehaviorRowComponent,
-      ScadaSymbolBehaviorPanelComponent,
-      ScadaSymbolPropertiesComponent,
-      ScadaSymbolPropertyRowComponent,
-      ScadaSymbolPropertyPanelComponent
+      ScadaSymbolBehaviorPanelComponent
     ],
   imports: [
     CommonModule,
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata.component.html b/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata.component.html
index c505546286..f90a5bef64 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata.component.html
+++ b/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata.component.html
@@ -106,9 +106,11 @@
       </tb-scada-symbol-metadata-behaviors>
     </div>
     <div [class.!hidden]="selectedOption !== 'properties'" class="mat-content overflow-hidden">
-      <tb-scada-symbol-metadata-properties
+      <tb-dynamic-form-properties
+        importExport
+        [exportFileName]="(modelValue?.title || 'scada-symbol') + '-properties'"
         formControlName="properties">
-      </tb-scada-symbol-metadata-properties>
+      </tb-dynamic-form-properties>
     </div>
   </div>
 </div>
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata.component.ts b/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata.component.ts
index 29b61b4523..45f412667d 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata.component.ts
@@ -92,7 +92,7 @@ export class ScadaSymbolMetadataComponent extends PageComponent implements OnIni
   @Input()
   tags: string[];
 
-  private modelValue: ScadaSymbolMetadata;
+  modelValue: ScadaSymbolMetadata;
 
   private propagateChange = null;
 
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-panel.component.html b/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-panel.component.html
deleted file mode 100644
index 94efffca85..0000000000
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-panel.component.html
+++ /dev/null
@@ -1,190 +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-scada-symbol-property-settings-panel" [formGroup]="propertyFormGroup">
-  <div class="tb-scada-symbol-property-settings-title">{{ panelTitle | translate }}</div>
-  <div class="tb-scada-symbol-property-settings-panel-content">
-    <div class="tb-form-row">
-      <div class="fixed-title-width" translate>scada.property.id</div>
-      <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
-        <input required matInput formControlName="id" placeholder="{{ 'widget-config.set' | translate }}">
-      </mat-form-field>
-    </div>
-    <div class="tb-form-row">
-      <div class="fixed-title-width" translate>scada.property.name</div>
-      <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
-        <input required matInput formControlName="name" placeholder="{{ 'widget-config.set' | translate }}">
-      </mat-form-field>
-    </div>
-    <div class="tb-form-row">
-      <div class="fixed-title-width" translate>scada.property.type</div>
-      <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
-        <mat-select formControlName="type">
-          <mat-option *ngFor="let type of scadaSymbolPropertyTypes" [value]="type">
-            {{ scadaSymbolPropertyTypeTranslations.get(type) | translate }}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
-    </div>
-    <div class="tb-form-row space-between">
-      <div class="fixed-title-width" translate>scada.property.default-value</div>
-      <mat-form-field  *ngIf="propertyFormGroup.get('type').value === ScadaSymbolPropertyType.text"
-                       class="flex"
-                       appearance="outline" subscriptSizing="dynamic">
-        <input matInput formControlName="default" placeholder="{{ 'widget-config.set' | translate }}">
-      </mat-form-field>
-      <tb-color-input *ngIf="propertyFormGroup.get('type').value === ScadaSymbolPropertyType.color"
-                      asBoxInput
-                      colorClearButton
-                      formControlName="default">
-      </tb-color-input>
-      <tb-color-settings *ngIf="propertyFormGroup.get('type').value === ScadaSymbolPropertyType.color_settings"
-                         formControlName="default"
-                         settingsKey="{{ propertyFormGroup.get('id').value }}">
-      </tb-color-settings>
-      <mat-form-field  *ngIf="propertyFormGroup.get('type').value === ScadaSymbolPropertyType.number"
-                       appearance="outline"
-                       class="number"
-                       subscriptSizing="dynamic">
-        <input matInput formControlName="default"
-               [min]="propertyFormGroup.get('min').value"
-               [max]="propertyFormGroup.get('max').value"
-               [step]="propertyFormGroup.get('step').value"
-               type="number" placeholder="{{ 'widget-config.set' | translate }}">
-      </mat-form-field>
-      <tb-font-settings *ngIf="propertyFormGroup.get('type').value === ScadaSymbolPropertyType.font"
-                        formControlName="default"
-                        clearButton
-                        disabledLineHeight>
-      </tb-font-settings>
-      <tb-unit-input *ngIf="propertyFormGroup.get('type').value === ScadaSymbolPropertyType.units"
-                     formControlName="default"></tb-unit-input>
-      <tb-value-input *ngIf="propertyFormGroup.get('type').value === ScadaSymbolPropertyType.switch"
-                      [valueType]="ValueType.BOOLEAN"
-                      formControlName="default"></tb-value-input>
-      <tb-material-icon-select *ngIf="propertyFormGroup.get('type').value === ScadaSymbolPropertyType.icon"
-                               asBoxInput
-                               formControlName="default">
-      </tb-material-icon-select>
-    </div>
-    <div *ngIf="propertyFormGroup.get('type').value === ScadaSymbolPropertyType.number" class="tb-form-row space-between">
-      <div translate>scada.property.number-settings</div>
-      <div class="flex flex-1 flex-row items-center justify-end gap-2">
-        <div class="tb-small-label" translate>scada.property.min</div>
-        <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
-          <input matInput formControlName="min"
-                 type="number" placeholder="{{ 'widget-config.set' | translate }}">
-        </mat-form-field>
-        <mat-divider vertical></mat-divider>
-        <div class="tb-small-label" translate>scada.property.max</div>
-        <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
-          <input matInput formControlName="max"
-                 type="number" placeholder="{{ 'widget-config.set' | translate }}">
-        </mat-form-field>
-        <mat-divider vertical></mat-divider>
-        <div class="tb-small-label" translate>scada.property.step</div>
-        <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
-          <input matInput formControlName="step" min="0"
-                 type="number" placeholder="{{ 'widget-config.set' | translate }}">
-        </mat-form-field>
-      </div>
-    </div>
-    <div class="tb-form-row space-between">
-      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="required">
-        {{ 'scada.property.value-required' | translate }}
-      </mat-slide-toggle>
-    </div>
-    <div class="tb-form-panel stroked">
-      <mat-expansion-panel class="tb-settings">
-        <mat-expansion-panel-header class="flex flex-row flex-wrap">
-          <mat-panel-title>
-            {{ 'scada.property.advanced-ui-settings' | translate }}
-          </mat-panel-title>
-        </mat-expansion-panel-header>
-        <ng-template matExpansionPanelContent>
-          <div class="tb-form-row space-between">
-            <div class="fixed-title-width" translate>scada.property.sub-label</div>
-            <mat-form-field  class="flex"
-                             appearance="outline" subscriptSizing="dynamic">
-              <input matInput formControlName="subLabel" 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="divider">
-              {{ 'scada.property.vertical-divider-after' | translate }}
-            </mat-slide-toggle>
-          </div>
-          <div *ngIf="[ScadaSymbolPropertyType.number, ScadaSymbolPropertyType.text].includes(propertyFormGroup.get('type').value)"
-               class="tb-form-row space-between">
-            <div class="fixed-title-width" translate>scada.property.input-field-suffix</div>
-            <mat-form-field  class="flex"
-                             appearance="outline" subscriptSizing="dynamic">
-              <input matInput formControlName="fieldSuffix" placeholder="{{ 'widget-config.set' | translate }}">
-            </mat-form-field>
-          </div>
-          <div class="tb-form-row space-between">
-            <div class="fixed-title-width" translate>scada.property.disable-on-property</div>
-            <mat-form-field  class="flex" appearance="outline" subscriptSizing="dynamic">
-              <mat-select formControlName="disableOnProperty" placeholder="{{ 'widget-config.set' | translate }}">
-                <mat-option [value]="null"></mat-option>
-                <mat-option *ngFor="let prop of booleanPropertyIds" [value]="prop">
-                  {{ prop }}
-                </mat-option>
-              </mat-select>
-            </mat-form-field>
-          </div>
-          <div class="tb-form-row">
-            <div class="fixed-title-width" translate>scada.property.property-row-classes</div>
-            <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
-              <mat-select formControlName="rowClass" multiple placeholder="{{ 'widget-config.set' | translate }}">
-                <mat-option *ngFor="let clazz of scadaSymbolPropertyRowClasses" [value]="clazz">
-                  {{ clazz }}
-                </mat-option>
-              </mat-select>
-            </mat-form-field>
-          </div>
-          <div *ngIf="propertyFormGroup.get('type').value !== ScadaSymbolPropertyType.switch" class="tb-form-row">
-            <div class="fixed-title-width" translate>scada.property.property-field-classes</div>
-            <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
-              <mat-select formControlName="fieldClass" multiple placeholder="{{ 'widget-config.set' | translate }}">
-                <mat-option *ngFor="let clazz of scadaSymbolPropertyFieldClasses" [value]="clazz">
-                  {{ clazz }}
-                </mat-option>
-              </mat-select>
-            </mat-form-field>
-          </div>
-        </ng-template>
-      </mat-expansion-panel>
-    </div>
-  </div>
-  <div class="tb-scada-symbol-property-settings-panel-buttons">
-    <button mat-button
-            color="primary"
-            type="button"
-            (click)="cancel()">
-      {{ (disabled ? 'action.close' : 'action.cancel') | translate }}
-    </button>
-    <button *ngIf="!disabled"
-            mat-raised-button
-            color="primary"
-            type="button"
-            (click)="applyPropertySettings()"
-            [disabled]="propertyFormGroup.invalid || !propertyFormGroup.dirty">
-      {{ (isAdd ? 'action.add' : 'action.apply') | translate }}
-    </button>
-  </div>
-</div>
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-panel.component.ts b/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-panel.component.ts
deleted file mode 100644
index 045694ed46..0000000000
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-property-panel.component.ts
+++ /dev/null
@@ -1,140 +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.
-///
-
-import { Component, DestroyRef, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
-import { TbPopoverComponent } from '@shared/components/popover.component';
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
-import {
-  ScadaSymbolProperty,
-  scadaSymbolPropertyFieldClasses,
-  scadaSymbolPropertyRowClasses,
-  ScadaSymbolPropertyType,
-  scadaSymbolPropertyTypes,
-  scadaSymbolPropertyTypeTranslations
-} from '@home/components/widget/lib/scada/scada-symbol.models';
-import { defaultPropertyValue } from '@home/pages/scada-symbol/metadata-components/scada-symbol-property-row.component';
-import { ValueType } from '@shared/models/constants';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-
-@Component({
-  selector: 'tb-scada-symbol-property-panel',
-  templateUrl: './scada-symbol-property-panel.component.html',
-  styleUrls: ['./scada-symbol-property-panel.component.scss'],
-  encapsulation: ViewEncapsulation.None
-})
-export class ScadaSymbolPropertyPanelComponent implements OnInit {
-
-  ValueType = ValueType;
-
-  ScadaSymbolPropertyType = ScadaSymbolPropertyType;
-
-  scadaSymbolPropertyTypes = scadaSymbolPropertyTypes;
-  scadaSymbolPropertyTypeTranslations = scadaSymbolPropertyTypeTranslations;
-
-  scadaSymbolPropertyRowClasses = scadaSymbolPropertyRowClasses;
-
-  scadaSymbolPropertyFieldClasses = scadaSymbolPropertyFieldClasses;
-
-  @Input()
-  isAdd = false;
-
-  @Input()
-  property: ScadaSymbolProperty;
-
-  @Input()
-  booleanPropertyIds: string[];
-
-  @Input()
-  disabled: boolean;
-
-  @Input()
-  popover: TbPopoverComponent<ScadaSymbolPropertyPanelComponent>;
-
-  @Output()
-  propertySettingsApplied = new EventEmitter<ScadaSymbolProperty>();
-
-  panelTitle: string;
-
-  propertyFormGroup: UntypedFormGroup;
-
-  private propertyType: ScadaSymbolPropertyType;
-
-  constructor(private fb: UntypedFormBuilder,
-              private destroyRef: DestroyRef) {
-  }
-
-  ngOnInit(): void {
-    this.panelTitle = this.isAdd ? 'scada.property.add-property' : 'scada.property.property-settings';
-    this.propertyType = this.property.type;
-    this.propertyFormGroup = this.fb.group(
-      {
-        id: [this.property.id, [Validators.required]],
-        name: [this.property.name, [Validators.required]],
-        type: [this.property.type, [Validators.required]],
-        default: [this.property.default, []],
-        required: [this.property.required, []],
-        subLabel: [this.property.subLabel, []],
-        divider: [this.property.divider, []],
-        fieldSuffix: [this.property.fieldSuffix, []],
-        disableOnProperty: [this.property.disableOnProperty, []],
-        rowClass: [(this.property.rowClass || '').split(' '), []],
-        fieldClass: [(this.property.fieldClass || '').split(' '), []],
-        min: [this.property.min, []],
-        max: [this.property.max, []],
-        step: [this.property.step, [Validators.min(0)]]
-      }
-    );
-    if (this.disabled) {
-      this.propertyFormGroup.disable({emitEvent: false});
-    } else {
-      this.propertyFormGroup.get('type').valueChanges.pipe(
-        takeUntilDestroyed(this.destroyRef)
-      ).subscribe(() => {
-        this.updateValidators();
-      });
-      this.updateValidators();
-    }
-  }
-
-  cancel() {
-    this.popover?.hide();
-  }
-
-  applyPropertySettings() {
-    const property = this.propertyFormGroup.getRawValue();
-    property.rowClass = (property.rowClass || []).join(' ');
-    property.fieldClass = (property.fieldClass || []).join(' ');
-    this.propertySettingsApplied.emit(property);
-  }
-
-  private updateValidators() {
-    const type: ScadaSymbolPropertyType = this.propertyFormGroup.get('type').value;
-    if (type === ScadaSymbolPropertyType.number) {
-      this.propertyFormGroup.get('min').enable({emitEvent: false});
-      this.propertyFormGroup.get('max').enable({emitEvent: false});
-      this.propertyFormGroup.get('step').enable({emitEvent: false});
-    } else {
-      this.propertyFormGroup.get('min').disable({emitEvent: false});
-      this.propertyFormGroup.get('max').disable({emitEvent: false});
-      this.propertyFormGroup.get('step').disable({emitEvent: false});
-    }
-    if (this.propertyType !== type) {
-      const defaultValue = defaultPropertyValue(type);
-      this.propertyFormGroup.get('default').patchValue(defaultValue, {emitEvent: false});
-      this.propertyType = type;
-    }
-  }
-}
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol-editor.models.ts b/ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol-editor.models.ts
index 71fb7f59a2..9fe747db0a 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol-editor.models.ts
+++ b/ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol-editor.models.ts
@@ -27,14 +27,13 @@ import {
   ScadaSymbolBehavior,
   ScadaSymbolBehaviorType,
   scadaSymbolContentData,
-  ScadaSymbolMetadata,
-  ScadaSymbolProperty,
-  ScadaSymbolPropertyType
+  ScadaSymbolMetadata
 } from '@home/components/widget/lib/scada/scada-symbol.models';
 import { TbEditorCompletion, TbEditorCompletions } from '@shared/models/ace/completion.models';
 import { CustomTranslatePipe } from '@shared/pipe/custom-translate.pipe';
 import { AceHighlightRule, AceHighlightRules } from '@shared/models/ace/ace.models';
 import { HelpLinks, ValueType } from '@shared/models/constants';
+import { formPropertyCompletions } from '@shared/models/dynamic-form.models';
 import ITooltipsterInstance = JQueryTooltipster.ITooltipsterInstance;
 import TooltipPositioningSide = JQueryTooltipster.TooltipPositioningSide;
 import ITooltipsterHelper = JQueryTooltipster.ITooltipsterHelper;
@@ -1141,11 +1140,8 @@ export const scadaSymbolContextCompletion = (metadata: ScadaSymbolMetadata, tags
     meta: 'object',
     type: 'object',
     description: 'An object holding all defined SCADA symbol properties.',
-    children: {}
+    children: formPropertyCompletions(metadata.properties, customTranslate)
   };
-  for (const property of metadata.properties) {
-    properties.children[property.id] = scadaSymbolPropertyCompletion(property, customTranslate);
-  }
   const values: TbEditorCompletion = {
     meta: 'object',
     type: 'object',
@@ -1441,18 +1437,6 @@ export const scadaSymbolContextCompletion = (metadata: ScadaSymbolMetadata, tags
   };
 };
 
-const scadaSymbolPropertyCompletion = (property: ScadaSymbolProperty, customTranslate: CustomTranslatePipe): TbEditorCompletion => {
-  let description = customTranslate.transform(property.name, property.name);
-  if (property.subLabel) {
-    description += ` <small>${customTranslate.transform(property.subLabel, property.subLabel)}</small>`;
-  }
-  return {
-    meta: 'property',
-    description,
-    type: scadaSymbolPropertyCompletionType(property.type)
-  };
-};
-
 const scadaSymbolValueCompletion = (value: ScadaSymbolBehavior, customTranslate: CustomTranslatePipe): TbEditorCompletion => {
   const description = customTranslate.transform(value.name, value.name);
   return {
@@ -1462,27 +1446,6 @@ const scadaSymbolValueCompletion = (value: ScadaSymbolBehavior, customTranslate:
   };
 };
 
-const scadaSymbolPropertyCompletionType = (type: ScadaSymbolPropertyType): string => {
-  switch (type) {
-    case ScadaSymbolPropertyType.text:
-      return 'string';
-    case ScadaSymbolPropertyType.number:
-      return 'number';
-    case ScadaSymbolPropertyType.switch:
-      return 'boolean';
-    case ScadaSymbolPropertyType.color:
-      return 'color string';
-    case ScadaSymbolPropertyType.color_settings:
-      return 'ColorProcessor';
-    case ScadaSymbolPropertyType.font:
-      return 'Font';
-    case ScadaSymbolPropertyType.units:
-      return 'units string';
-    case ScadaSymbolPropertyType.icon:
-      return 'icon string';
-  }
-};
-
 const scadaSymbolValueCompletionType = (type: ValueType): string => {
   switch (type) {
     case ValueType.STRING:
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.html b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.html
index 63a1667cb7..00f46c01f3 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.html
+++ b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.html
@@ -188,52 +188,37 @@
           </div>
           <div #topRightPanel class="tb-split tb-content">
             <mat-tab-group mat-stretch-tabs="false" dynamicHeight="true" style="width: 100%; height: 100%;">
-              <mat-tab label="{{ 'widget.settings-schema' | translate }}">
-                <div class="tb-resize-container" tb-fullscreen [fullscreen]="jsonSettingsFullscreen">
-                  <div class="tb-editor-area-title-panel">
-                    <button mat-button (click)="beautifyJson()">
-                      {{ 'widget.tidy' | translate }}
-                    </button>
-                    <button mat-icon-button class="tb-mat-32"
-                            (click)="jsonSettingsFullscreen = !jsonSettingsFullscreen"
-                            matTooltip="{{(jsonSettingsFullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}"
-                            matTooltipPosition="above">
-                      <mat-icon>{{ jsonSettingsFullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon>
-                    </button>
-                  </div>
-                  <div #settingsJsonInput></div>
+              <mat-tab label="{{ 'widget.settings-form' | translate }}">
+                <div class="tb-resize-container" style="background-color: #fff;">
+                  <tb-dynamic-form-properties
+                    importExport
+                    [exportFileName]="(widget.widgetName || 'widget') + '-settings-form'"
+                    [(ngModel)]="widget.settingsForm"
+                    (ngModelChange)="settingsFormUpdated()"
+                    noBorder fillHeight>
+                  </tb-dynamic-form-properties>
                 </div>
               </mat-tab>
-              <mat-tab label="{{ 'widget.datakey-settings-schema' | translate }}">
-                <div class="tb-resize-container" tb-fullscreen [fullscreen]="jsonDataKeySettingsFullscreen">
-                  <div class="tb-editor-area-title-panel">
-                    <button mat-button (click)="beautifyDataKeyJson()">
-                      {{ 'widget.tidy' | translate }}
-                    </button>
-                    <button mat-icon-button class="tb-mat-32"
-                            (click)="jsonDataKeySettingsFullscreen = !jsonDataKeySettingsFullscreen"
-                            matTooltip="{{(jsonDataKeySettingsFullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}"
-                            matTooltipPosition="above">
-                      <mat-icon>{{ jsonDataKeySettingsFullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon>
-                    </button>
-                  </div>
-                  <div #dataKeySettingsJsonInput></div>
+              <mat-tab label="{{ 'widget.data-key-settings-form' | translate }}">
+                <div class="tb-resize-container" style="background-color: #fff;">
+                  <tb-dynamic-form-properties
+                    importExport
+                    [exportFileName]="(widget.widgetName || 'widget') + '-data-key-settings-form'"
+                    [(ngModel)]="widget.dataKeySettingsForm"
+                    (ngModelChange)="dataKeySettingsFormUpdated()"
+                    noBorder fillHeight>
+                  </tb-dynamic-form-properties>
                 </div>
               </mat-tab>
-              <mat-tab [aria-labelledby]="widget.type !== widgetTypes.timeseries ? 'hidden': ''" label="{{ 'widget.latest-datakey-settings-schema' | translate }}">
-                <div class="tb-resize-container" tb-fullscreen [fullscreen]="jsonLatestDataKeySettingsFullscreen">
-                  <div class="tb-editor-area-title-panel">
-                    <button mat-button (click)="beautifyLatestDataKeyJson()">
-                      {{ 'widget.tidy' | translate }}
-                    </button>
-                    <button mat-icon-button class="tb-mat-32"
-                            (click)="jsonLatestDataKeySettingsFullscreen = !jsonLatestDataKeySettingsFullscreen"
-                            matTooltip="{{(jsonLatestDataKeySettingsFullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}"
-                            matTooltipPosition="above">
-                      <mat-icon>{{ jsonLatestDataKeySettingsFullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon>
-                    </button>
-                  </div>
-                  <div #latestDataKeySettingsJsonInput></div>
+              <mat-tab [aria-labelledby]="widget.type !== widgetTypes.timeseries ? 'hidden': ''" label="{{ 'widget.latest-data-key-settings-form' | translate }}">
+                <div class="tb-resize-container" style="background-color: #fff;">
+                  <tb-dynamic-form-properties
+                    importExport
+                    [exportFileName]="(widget.widgetName || 'widget') + '-latest-data-key-settings-form'"
+                    [(ngModel)]="widget.latestDataKeySettingsForm"
+                    (ngModelChange)="latestDataKeySettingsFormUpdated()"
+                    noBorder fillHeight>
+                  </tb-dynamic-form-properties>
                 </div>
               </mat-tab>
               <mat-tab label="{{ 'widget.widget-settings' | translate }}">
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.ts b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.ts
index 03b5674268..71b30c1464 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.ts
@@ -21,8 +21,10 @@ import {
   EventEmitter,
   Inject,
   OnDestroy,
-  OnInit, Renderer2,
-  ViewChild, ViewContainerRef,
+  OnInit,
+  Renderer2,
+  ViewChild,
+  ViewContainerRef,
   ViewEncapsulation
 } from '@angular/core';
 import { Store } from '@ngrx/store';
@@ -30,6 +32,7 @@ import { AppState } from '@core/core.state';
 import { WidgetService } from '@core/http/widget.service';
 import { detailsToWidgetInfo, WidgetInfo } from '@home/models/widget-component.models';
 import {
+  migrateWidgetTypeToDynamicForms,
   TargetDeviceType,
   Widget,
   WidgetConfig,
@@ -65,12 +68,13 @@ import { Observable } from 'rxjs/internal/Observable';
 import { catchError, map, tap } from 'rxjs/operators';
 import { beautifyCss, beautifyHtml, beautifyJs } from '@shared/models/beautify.models';
 import { HttpClient, HttpStatusCode } from '@angular/common/http';
-import Timeout = NodeJS.Timeout;
-import { TbEditorCompleter } from '@shared/models/ace/completion.models';
 import { loadModulesCompleter } from '@shared/models/js-function.models';
 import { TbPopoverService } from '@shared/components/popover.service';
 import { JsFuncModulesComponent } from '@shared/components/js-func-modules.component';
 import { MatIconButton } from '@angular/material/button';
+import { formPropertyCompletions } from '@shared/models/dynamic-form.models';
+import { CustomTranslatePipe } from '@shared/pipe/custom-translate.pipe';
+import Timeout = NodeJS.Timeout;
 
 // @dynamic
 @Component({
@@ -105,15 +109,6 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe
   @ViewChild('cssInput', {static: true})
   cssInputElmRef: ElementRef;
 
-  @ViewChild('settingsJsonInput', {static: true})
-  settingsJsonInputElmRef: ElementRef;
-
-  @ViewChild('dataKeySettingsJsonInput', {static: true})
-  dataKeySettingsJsonInputElmRef: ElementRef;
-
-  @ViewChild('latestDataKeySettingsJsonInput', {static: true})
-  latestDataKeySettingsJsonInputElmRef: ElementRef;
-
   @ViewChild('javascriptInput', {static: true})
   javascriptInputElmRef: ElementRef;
 
@@ -151,9 +146,6 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe
   fullscreen = false;
   htmlFullscreen = false;
   cssFullscreen = false;
-  jsonSettingsFullscreen = false;
-  jsonDataKeySettingsFullscreen = false;
-  jsonLatestDataKeySettingsFullscreen = false;
   javascriptFullscreen = false;
   iFrameFullscreen = false;
 
@@ -161,9 +153,6 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe
   editorsResizeCafs: {[editorId: string]: CancelAnimationFrame} = {};
   htmlEditor: Ace.Editor;
   cssEditor: Ace.Editor;
-  jsonSettingsEditor: Ace.Editor;
-  dataKeyJsonSettingsEditor: Ace.Editor;
-  latestDataKeyJsonSettingsEditor: Ace.Editor;
   jsEditor: Ace.Editor;
   private initialCompleters: Ace.Completer[];
   aceResize$: ResizeObserver;
@@ -197,6 +186,7 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe
               private popoverService: TbPopoverService,
               private renderer: Renderer2,
               private viewContainerRef: ViewContainerRef,
+              private customTranslate: CustomTranslatePipe,
               private http: HttpClient) {
     super(store);
 
@@ -353,45 +343,6 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe
       })
     ));
 
-    editorsObservables.push(this.createAceEditor(this.settingsJsonInputElmRef, 'json').pipe(
-      tap((editor) => {
-        this.jsonSettingsEditor = editor;
-        this.jsonSettingsEditor.on('input', () => {
-          const editorValue = this.jsonSettingsEditor.getValue();
-          if (this.widget.settingsSchema !== editorValue) {
-            this.widget.settingsSchema = editorValue;
-            this.isDirty = true;
-          }
-        });
-      })
-    ));
-
-    editorsObservables.push(this.createAceEditor(this.dataKeySettingsJsonInputElmRef, 'json').pipe(
-      tap((editor) => {
-        this.dataKeyJsonSettingsEditor = editor;
-        this.dataKeyJsonSettingsEditor.on('input', () => {
-          const editorValue = this.dataKeyJsonSettingsEditor.getValue();
-          if (this.widget.dataKeySettingsSchema !== editorValue) {
-            this.widget.dataKeySettingsSchema = editorValue;
-            this.isDirty = true;
-          }
-        });
-      })
-    ));
-
-    editorsObservables.push(this.createAceEditor(this.latestDataKeySettingsJsonInputElmRef, 'json').pipe(
-      tap((editor) => {
-        this.latestDataKeyJsonSettingsEditor = editor;
-        this.latestDataKeyJsonSettingsEditor.on('input', () => {
-          const editorValue = this.latestDataKeyJsonSettingsEditor.getValue();
-          if (this.widget.latestDataKeySettingsSchema !== editorValue) {
-            this.widget.latestDataKeySettingsSchema = editorValue;
-            this.isDirty = true;
-          }
-        });
-      })
-    ));
-
     editorsObservables.push(this.createAceEditor(this.javascriptInputElmRef, 'javascript').pipe(
       tap((editor) => {
         this.jsEditor = editor;
@@ -405,6 +356,11 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe
         this.jsEditor.on('change', () => {
           this.cleanupJsErrors();
         });
+        if (!(this.jsEditor as any).completer) {
+          this.jsEditor.execCommand("startAutocomplete");
+          (this.jsEditor as any).completer.detach();
+        }
+        (this.jsEditor as any).completer.popup.container.style.width = '500px';
         this.initialCompleters = this.jsEditor.completers || [];
       })
     ));
@@ -420,10 +376,6 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe
   private setAceEditorValues() {
     this.htmlEditor.setValue(this.widget.templateHtml ? this.widget.templateHtml : '', -1);
     this.cssEditor.setValue(this.widget.templateCss ? this.widget.templateCss : '', -1);
-    this.jsonSettingsEditor.setValue(this.widget.settingsSchema ? this.widget.settingsSchema : '', -1);
-    this.dataKeyJsonSettingsEditor.setValue(this.widget.dataKeySettingsSchema ? this.widget.dataKeySettingsSchema : '', -1);
-    this.latestDataKeyJsonSettingsEditor.setValue(this.widget.latestDataKeySettingsSchema ?
-      this.widget.latestDataKeySettingsSchema : '', -1);
     this.jsEditor.setValue(this.controllerScriptBody ? this.controllerScriptBody : '', -1);
     this.updateControllerScriptCompleters();
   }
@@ -596,7 +548,11 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe
       }),
       catchError((err) => {
         if (id && err.status === HttpStatusCode.Conflict) {
-          return this.widgetService.getWidgetTypeById(id.id);
+          return this.widgetService.getWidgetTypeById(id.id).pipe(
+            map((details) => {
+              return migrateWidgetTypeToDynamicForms(details);
+            })
+          );
         }
         return throwError(() => err);
       }),
@@ -754,43 +710,6 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe
     );
   }
 
-  beautifyJson(): void {
-    beautifyJs(this.widget.settingsSchema, {indent_size: 4}).subscribe(
-      (res) => {
-        if (this.widget.settingsSchema !== res) {
-          this.isDirty = true;
-          this.widget.settingsSchema = res;
-          this.jsonSettingsEditor.setValue(this.widget.settingsSchema ? this.widget.settingsSchema : '', -1);
-        }
-      }
-    );
-  }
-
-  beautifyDataKeyJson(): void {
-    beautifyJs(this.widget.dataKeySettingsSchema, {indent_size: 4}).subscribe(
-      (res) => {
-        if (this.widget.dataKeySettingsSchema !== res) {
-          this.isDirty = true;
-          this.widget.dataKeySettingsSchema = res;
-          this.dataKeyJsonSettingsEditor.setValue(this.widget.dataKeySettingsSchema ? this.widget.dataKeySettingsSchema : '', -1);
-        }
-      }
-    );
-  }
-
-  beautifyLatestDataKeyJson(): void {
-    beautifyJs(this.widget.latestDataKeySettingsSchema, {indent_size: 4}).subscribe(
-      (res) => {
-        if (this.widget.latestDataKeySettingsSchema !== res) {
-          this.isDirty = true;
-          this.widget.latestDataKeySettingsSchema = res;
-          this.latestDataKeyJsonSettingsEditor.setValue(this.widget.latestDataKeySettingsSchema ?
-            this.widget.latestDataKeySettingsSchema : '', -1);
-        }
-      }
-    );
-  }
-
   beautifyJs(): void {
     beautifyJs(this.controllerScriptBody, {indent_size: 4, wrap_line_length: 60}).subscribe(
       (res) => {
@@ -873,6 +792,19 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe
     this.isDirty = true;
   }
 
+  settingsFormUpdated() {
+    this.isDirty = true;
+    this.updateControllerScriptCompleters();
+  }
+
+  dataKeySettingsFormUpdated() {
+    this.isDirty = true;
+  }
+
+  latestDataKeySettingsFormUpdated() {
+    this.isDirty = true;
+  }
+
   editControllerScriptModules($event: Event, button: MatIconButton) {
     if ($event) {
       $event.stopPropagation();
@@ -951,7 +883,8 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe
     const modulesCompleterObservable = loadModulesCompleter(this.http, this.controllerScriptModules);
     modulesCompleterObservable.subscribe((modulesCompleter) => {
       const completers: Ace.Completer[] = [];
-      completers.push(widgetEditorCompleter);
+      const formPropertiesCompletions = formPropertyCompletions(this.widget.settingsForm || [], this.customTranslate);
+      completers.push(widgetEditorCompleter(formPropertiesCompletions));
       if (modulesCompleter) {
         completers.push(modulesCompleter);
       }
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.models.ts b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.models.ts
index 5d4afd93fc..eb4783b095 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.models.ts
+++ b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.models.ts
@@ -15,77 +15,100 @@
 ///
 
 import { TbEditorCompleter, TbEditorCompletions } from '@shared/models/ace/completion.models';
-import { widgetContextCompletions } from '@shared/models/ace/widget-completion.models';
+import {
+  widgetContextCompletions,
+  widgetContextCompletionsWithSettings
+} from '@shared/models/ace/widget-completion.models';
 import { serviceCompletions } from '@shared/models/ace/service-completion.models';
 
-const widgetEditorCompletions: TbEditorCompletions = {
-  ... {self: {
-    description: 'Built-in variable <b>self</b> that is a reference to the widget instance',
-    type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L350" target="_blank">WidgetTypeInstance</a>',
-    meta: 'object',
-    children: {
-      ...{
-        onInit: {
-          description: 'The first function which is called when widget is ready for initialization.<br>Should be used to prepare widget DOM, process widget settings and initial subscription information.',
-          meta: 'function'
-        },
-        onDataUpdated: {
-          description: 'Called when the new data is available from the widget subscription.<br>Latest data can be accessed from ' +
-            'the <code>defaultSubscription</code> property of <a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L83" target="_blank">widget context (<code>ctx</code>)</a>.',
-          meta: 'function'
-        },
-        onResize: {
-          description: 'Called when widget container is resized. Latest <code>width</code> and <code>height</code> can be obtained from <a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L83" target="_blank">widget context (<code>ctx</code>)</a>.',
-          meta: 'function'
-        },
-        onEditModeChanged: {
-          description: 'Called when dashboard editing mode is changed. Latest mode is handled by <code>isEdit</code> property of <a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L83" target="_blank">widget context (<code>ctx</code>)</a>.',
-          meta: 'function'
-        },
-        onMobileModeChanged: {
-          description: 'Called when dashboard view width crosses mobile breakpoint. Latest state is handled by <code>isMobile</code> property of <a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L83" target="_blank">widget context (<code>ctx</code>)</a>.',
-          meta: 'function'
-        },
-        onDestroy: {
-          description: 'Called when widget element is destroyed. Should be used to cleanup all resources if necessary.',
-          meta: 'function'
-        },
-        getSettingsSchema: {
-          description: 'Optional function returning widget settings schema json as alternative to <b>Settings tab</b> of <a href="https://thingsboard.io/docs/user-guide/contribution/widgets-development/#settings-schema-section" target="_blank">Settings schema section</a>.',
-          meta: 'function',
-          return: {
-            description: 'An widget settings schema json',
-            type: 'object'
-          }
-        },
-        getDataKeySettingsSchema: {
-          description: 'Optional function returning particular data key settings schema json as alternative to <b>Data key settings schema</b> of <a href="https://thingsboard.io/docs/user-guide/contribution/widgets-development/#settings-schema-section" target="_blank">Settings schema section</a>.',
-          meta: 'function',
-          return: {
-            description: 'A particular data key settings schema json',
-            type: 'object'
-          }
-        },
-        typeParameters: {
-          description: 'Returns object describing widget datasource parameters.',
-          meta: 'function',
-          return: {
-            description: 'An object describing widget datasource parameters.',
-            type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L146" target="_blank">WidgetTypeParameters</a>'
-          }
-        },
-        actionSources: {
-          description: 'Returns map describing available widget action sources used to define user actions.',
-          meta: 'function',
-          return: {
-            description: 'A map of action sources by action source id.',
-            type: '{[actionSourceId: string]: <a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L118" target="_blank">WidgetActionSource</a>}'
-          }
+const widgetEditorCompletions = (settingsCompletions?: TbEditorCompletions): TbEditorCompletions => {
+  return {
+    ... {self: {
+        description: 'Built-in variable <b>self</b> that is a reference to the widget instance',
+        type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L350" target="_blank">WidgetTypeInstance</a>',
+        meta: 'object',
+        children: {
+          ...{
+            onInit: {
+              description: 'The first function which is called when widget is ready for initialization.<br>Should be used to prepare widget DOM, process widget settings and initial subscription information.',
+              meta: 'function'
+            },
+            onDataUpdated: {
+              description: 'Called when the new data is available from the widget subscription.<br>Latest data can be accessed from ' +
+                'the <code>defaultSubscription</code> property of <a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L83" target="_blank">widget context (<code>ctx</code>)</a>.',
+              meta: 'function'
+            },
+            onResize: {
+              description: 'Called when widget container is resized. Latest <code>width</code> and <code>height</code> can be obtained from <a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L83" target="_blank">widget context (<code>ctx</code>)</a>.',
+              meta: 'function'
+            },
+            onEditModeChanged: {
+              description: 'Called when dashboard editing mode is changed. Latest mode is handled by <code>isEdit</code> property of <a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L83" target="_blank">widget context (<code>ctx</code>)</a>.',
+              meta: 'function'
+            },
+            onMobileModeChanged: {
+              description: 'Called when dashboard view width crosses mobile breakpoint. Latest state is handled by <code>isMobile</code> property of <a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L83" target="_blank">widget context (<code>ctx</code>)</a>.',
+              meta: 'function'
+            },
+            onDestroy: {
+              description: 'Called when widget element is destroyed. Should be used to cleanup all resources if necessary.',
+              meta: 'function'
+            },
+            getSettingsForm: {
+              description: 'Optional function returning widget settings form array as alternative to <b>Settings form</b> tab of settings section.',
+              meta: 'function',
+              return: {
+                description: 'An array of widget settings form properties',
+                type: 'Array&lt;FormProperty&gt;'
+              }
+            },
+            getDataKeySettingsForm: {
+              description: 'Optional function returning particular data key settings form array as alternative to <b>Data key settings form</b> tab of settings section.',
+              meta: 'function',
+              return: {
+                description: 'An array of data key settings form properties',
+                type: 'Array&lt;FormProperty&gt;'
+              }
+            },
+            getSettingsSchema: {
+              description: '<b>Deprecated</b>. Use getSettingsForm() function.',
+              meta: 'function',
+              return: {
+                description: 'An widget settings schema json',
+                type: 'object'
+              }
+            },
+            getDataKeySettingsSchema: {
+              description: '<b>Deprecated</b>. Use getDataKeySettingsForm() function.',
+              meta: 'function',
+              return: {
+                description: 'A particular data key settings schema json',
+                type: 'object'
+              }
+            },
+            typeParameters: {
+              description: 'Returns object describing widget datasource parameters.',
+              meta: 'function',
+              return: {
+                description: 'An object describing widget datasource parameters.',
+                type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L146" target="_blank">WidgetTypeParameters</a>'
+              }
+            },
+            actionSources: {
+              description: 'Returns map describing available widget action sources used to define user actions.',
+              meta: 'function',
+              return: {
+                description: 'A map of action sources by action source id.',
+                type: '{[actionSourceId: string]: <a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L118" target="_blank">WidgetActionSource</a>}'
+              }
+            }
+          },
+          ...widgetContextCompletionsWithSettings(settingsCompletions)
         }
-      },
-      ...widgetContextCompletions
-    }
-  }}
+      }}
+  }
 };
 
-export const widgetEditorCompleter = new TbEditorCompleter(widgetEditorCompletions);
+export const widgetEditorCompleter = (settingsCompletions?: TbEditorCompletions): TbEditorCompleter => {
+  return new TbEditorCompleter(widgetEditorCompletions(settingsCompletions));
+}
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-library-routing.module.ts b/ui-ngx/src/app/modules/home/pages/widget/widget-library-routing.module.ts
index 046737ac10..acd48f79ab 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widget-library-routing.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/widget/widget-library-routing.module.ts
@@ -26,7 +26,12 @@ import { WidgetService } from '@core/http/widget.service';
 import { WidgetEditorComponent } from '@home/pages/widget/widget-editor.component';
 import { map } from 'rxjs/operators';
 import { detailsToWidgetInfo, WidgetInfo } from '@home/models/widget-component.models';
-import { widgetType, WidgetTypeDetails, WidgetTypeInfo } from '@app/shared/models/widget.models';
+import {
+  migrateWidgetTypeToDynamicForms,
+  widgetType,
+  WidgetTypeDetails,
+  WidgetTypeInfo
+} from '@app/shared/models/widget.models';
 import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
 import { RouterTabsComponent } from '@home/components/router-tabs.component';
 import { WidgetTypesTableConfigResolver } from '@home/pages/widget/widget-types-table-config.resolver';
@@ -68,10 +73,13 @@ const widgetEditorDataResolver: ResolveFn<WidgetEditorData> = (route: ActivatedR
     );
   } else {
     return inject(WidgetService).getWidgetTypeById(widgetTypeId).pipe(
-      map((result) => ({
-        widgetTypeDetails: result,
-        widget: detailsToWidgetInfo(result)
-      }))
+      map((result) => {
+        result = migrateWidgetTypeToDynamicForms(result);
+        return {
+          widgetTypeDetails: result,
+          widget: detailsToWidgetInfo(result)
+        };
+      })
     );
   }
 };
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-library.module.ts b/ui-ngx/src/app/modules/home/pages/widget/widget-library.module.ts
index 80438b4f4d..f76be11ba1 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widget-library.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/widget/widget-library.module.ts
@@ -29,6 +29,7 @@ import { WidgetTypeTabsComponent } from '@home/pages/widget/widget-type-tabs.com
 import { WidgetsBundleWidgetsComponent } from '@home/pages/widget/widgets-bundle-widgets.component';
 import { WidgetTypeAutocompleteComponent } from '@home/pages/widget/widget-type-autocomplete.component';
 import { WidgetsBundleDialogComponent } from '@home/pages/widget/widgets-bundle-dialog.component';
+import { WidgetConfigComponentsModule } from '@home/components/widget/config/widget-config-components.module';
 
 @NgModule({
   declarations: [
@@ -47,6 +48,7 @@ import { WidgetsBundleDialogComponent } from '@home/pages/widget/widgets-bundle-
     CommonModule,
     SharedModule,
     HomeComponentsModule,
+    WidgetConfigComponentsModule,
     WidgetLibraryRoutingModule
   ]
 })
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-types-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/widget/widget-types-table-config.resolver.ts
index eac0817875..60b6f70ac7 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widget-types-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/widget/widget-types-table-config.resolver.ts
@@ -20,6 +20,7 @@ import { Router } from '@angular/router';
 import {
   checkBoxCell,
   DateEntityTableColumn,
+  EntityChipsEntityTableColumn,
   EntityTableColumn,
   EntityTableConfig
 } from '@home/models/entity/entities-table-config.models';
@@ -75,7 +76,9 @@ export class WidgetTypesTableConfigResolver  {
 
     this.config.columns.push(
       new DateEntityTableColumn<WidgetTypeInfo>('createdTime', 'common.created-time', this.datePipe, '150px'),
-      new EntityTableColumn<WidgetTypeInfo>('name', 'widget.title', '100%'),
+      new EntityTableColumn<WidgetTypeInfo>('name', 'widget.title', '60%'),
+      new EntityChipsEntityTableColumn<WidgetTypeInfo>( 'bundles', 'entity.type-widgets-bundles', '40%',
+          () => '/resources/widgets-library/widgets-bundles'),
       new EntityTableColumn<WidgetTypeInfo>('widgetType', 'widget.type', '150px', entity =>
         entity?.widgetType ? this.translate.instant(widgetTypesData.get(entity.widgetType).name) : '', undefined, false),
       new EntityTableColumn<WidgetTypeInfo>('tenantId', 'widget.system', '60px',
diff --git a/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.html b/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.html
index bfdf4dce2b..c8c6935619 100644
--- a/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.html
+++ b/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.html
@@ -31,7 +31,9 @@
          [required]="required"
          [matAutocomplete]="dashboardAutocomplete"
          [class.!hidden]="useDashboardLink && disabled && selectDashboardFormGroup.get('dashboard').value">
-  <a *ngIf="useDashboardLink && selectDashboardFormGroup.get('dashboard').value && disabled" aria-label="Open device profile" [routerLink]=dashboardURL>
+  <a *ngIf="useDashboardLink && selectDashboardFormGroup.get('dashboard').value && disabled"
+     [attr.aria-label]="'dashboard.open-dashboard' | translate"
+     [routerLink]=dashboardURL>
     {{ displayDashboardFn(selectDashboardFormGroup.get('dashboard').value) | customTranslate }}
   </a>
   <button *ngIf="selectDashboardFormGroup.get('dashboard').value && !disabled"
diff --git a/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.ts b/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.ts
index bbe71011e9..a88dda3a33 100644
--- a/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.ts
+++ b/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { AfterViewInit, Component, ElementRef, forwardRef, Input, OnInit, ViewChild } from '@angular/core';
+import { Component, ElementRef, forwardRef, Input, OnInit, ViewChild } from '@angular/core';
 import {
   ControlValueAccessor,
   NG_VALUE_ACCESSOR,
@@ -25,7 +25,7 @@ import {
 import { Observable, of } from 'rxjs';
 import { PageLink } from '@shared/models/page/page-link';
 import { Direction } from '@shared/models/page/sort-order';
-import { catchError, debounceTime, distinctUntilChanged, map, share, switchMap, tap } from 'rxjs/operators';
+import { catchError, debounceTime, map, share, switchMap, tap } from 'rxjs/operators';
 import { emptyPageData, PageData } from '@shared/models/page/page-data';
 import { DashboardInfo } from '@app/shared/models/dashboard.models';
 import { DashboardService } from '@core/http/dashboard.service';
@@ -39,6 +39,7 @@ import { getEntityDetailsPageURL } from '@core/utils';
 import { EntityType } from '@shared/models/entity-type.models';
 import { AuthUser } from '@shared/models/user.model';
 import { coerceBoolean } from '@shared/decorators/coercion';
+import { MatAutocompleteTrigger } from '@angular/material/autocomplete';
 
 @Component({
   selector: 'tb-dashboard-autocomplete',
@@ -50,7 +51,7 @@ import { coerceBoolean } from '@shared/decorators/coercion';
     multi: true
   }]
 })
-export class DashboardAutocompleteComponent implements ControlValueAccessor, OnInit, AfterViewInit {
+export class DashboardAutocompleteComponent implements ControlValueAccessor, OnInit {
 
   private dirty = false;
 
@@ -103,6 +104,7 @@ export class DashboardAutocompleteComponent implements ControlValueAccessor, OnI
   disabled: boolean;
 
   @ViewChild('dashboardInput', {static: true}) dashboardInput: ElementRef;
+  @ViewChild('dashboardInput', {read: MatAutocompleteTrigger, static: true}) dashboardAutocomplete: MatAutocompleteTrigger;
 
   filteredDashboards: Observable<Array<DashboardInfo>>;
 
@@ -151,16 +153,11 @@ export class DashboardAutocompleteComponent implements ControlValueAccessor, OnI
           this.updateView(modelValue);
         }),
         map(value => value ? (typeof value === 'string' ? value : value.name) : ''),
-        distinctUntilChanged(),
         switchMap(name => this.fetchDashboards(name) ),
         share()
       );
   }
 
-  ngAfterViewInit(): void {
-    // this.selectFirstDashboardIfNeeded();
-  }
-
   selectFirstDashboardIfNeeded(): void {
     if (this.selectFirstDashboard && !this.modelValue) {
       this.getDashboards(new PageLink(1, 0, null, {
@@ -183,6 +180,7 @@ export class DashboardAutocompleteComponent implements ControlValueAccessor, OnI
     this.disabled = isDisabled;
     if (this.disabled) {
       this.selectDashboardFormGroup.disable({emitEvent: false});
+      this.dashboardAutocomplete.closePanel();
     } else {
       this.selectDashboardFormGroup.enable({emitEvent: false});
     }
diff --git a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.html b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.html
index c194e04290..5ef42cb70c 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.html
@@ -24,8 +24,8 @@
          (focusin)="onFocus()"
          [required]="required"
          [matAutocomplete]="entityAutocomplete"
-         [class.!hidden]="disabled && selectEntityFormGroup.get('entity').value">
-  <a *ngIf="selectEntityFormGroup.get('entity').value && disabled" aria-label="Open device profile" [routerLink]=entityURL>
+         [class.!hidden]="showEntityLink">
+  <a *ngIf="showEntityLink" aria-label="Open entity details page" [routerLink]=entityURL>
     {{ displayEntityFn(selectEntityFormGroup.get('entity').value) }}
   </a>
   <button *ngIf="selectEntityFormGroup.get('entity').value && !disabled"
@@ -53,7 +53,7 @@
         </div>
         <ng-template #searchNotEmpty>
           <span>
-              {{ translate.get(noEntitiesMatchingText, {entity: searchText}) | async }}
+              {{ noEntitiesMatchingText | translate: {entity: searchText} }}
           </span>
         </ng-template>
       </div>
diff --git a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
index 417fc35bf4..e818e07ee4 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
@@ -14,24 +14,13 @@
 /// limitations under the License.
 ///
 
-import {
-  AfterViewInit,
-  Component,
-  ElementRef,
-  EventEmitter,
-  forwardRef,
-  Input,
-  OnInit,
-  Output,
-  ViewChild
-} from '@angular/core';
+import { Component, ElementRef, EventEmitter, forwardRef, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
-import { merge, Observable, of, Subject } from 'rxjs';
+import { firstValueFrom, merge, Observable, of, Subject } from 'rxjs';
 import { catchError, debounceTime, map, share, switchMap, tap } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { AppState } from '@app/core/core.state';
-import { TranslateService } from '@ngx-translate/core';
 import { AliasEntityType, EntityType } from '@shared/models/entity-type.models';
 import { BaseData } from '@shared/models/base-data';
 import { EntityId } from '@shared/models/id/entity-id';
@@ -51,22 +40,22 @@ import { coerceArray, coerceBoolean } from '@shared/decorators/coercion';
     multi: true
   }]
 })
-export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit, AfterViewInit {
+export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit {
 
   selectEntityFormGroup: UntypedFormGroup;
 
-  modelValue: string | EntityId | null;
+  private modelValue: string | EntityId | null;
 
-  entityTypeValue: EntityType | AliasEntityType;
+  private entityTypeValue: EntityType | AliasEntityType;
 
-  entitySubtypeValue: string;
+  private entitySubtypeValue: string;
 
-  entityText: string;
+  private entityText: string;
 
   noEntitiesMatchingText: string;
   notFoundEntities = 'entity.no-entities-text';
 
-  entityRequiredText: string;
+  private entityRequiredText: string;
 
   filteredEntities: Observable<Array<BaseData<EntityId>>>;
 
@@ -78,7 +67,7 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
 
   private refresh$ = new Subject<Array<BaseData<EntityId>>>();
 
-  private propagateChange = (v: any) => { };
+  private propagateChange: (value: any) => void = () => { };
 
   @Input()
   set entityType(entityType: EntityType) {
@@ -166,7 +155,6 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
 
 
   constructor(private store: Store<AppState>,
-              public translate: TranslateService,
               private entityService: EntityService,
               private fb: UntypedFormBuilder) {
     this.selectEntityFormGroup = this.fb.group({
@@ -178,7 +166,7 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
     this.propagateChange = fn;
   }
 
-  registerOnTouched(fn: any): void {
+  registerOnTouched(_fn: any): void {
   }
 
   ngOnInit() {
@@ -188,7 +176,7 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
         .pipe(
           debounceTime(150),
           tap(value => {
-            let modelValue;
+            let modelValue: string | EntityId;
             if (typeof value === 'string' || !value) {
               modelValue = null;
             } else {
@@ -207,9 +195,7 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
     );
   }
 
-  ngAfterViewInit(): void {}
-
-  load(): void {
+  private load(): void {
     if (this.entityTypeValue) {
       switch (this.entityTypeValue) {
         case EntityType.ASSET:
@@ -327,7 +313,7 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
     }
   }
 
-  getCurrentEntity(): BaseData<EntityId> | null {
+  private getCurrentEntity(): BaseData<EntityId> | null {
     const currentEntity = this.selectEntityFormGroup.get('entity').value;
     if (currentEntity && typeof currentEntity !== 'string') {
       return currentEntity as BaseData<EntityId>;
@@ -359,16 +345,17 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
       }
       let entity: BaseData<EntityId> = null;
       try {
-        entity = await this.entityService.getEntity(targetEntityType, id, {ignoreLoading: true, ignoreErrors: true}).toPromise();
+        entity = await firstValueFrom(this.entityService.getEntity(targetEntityType, id, {ignoreLoading: true, ignoreErrors: true}));
       } catch (e) {
         this.propagateChange(null);
       }
       this.modelValue = entity !== null ? (this.useFullEntityId ? entity.id : entity.id.id) : null;
-      this.entityURL = getEntityDetailsPageURL(this.modelValue as string, targetEntityType);
+      this.entityURL = !entity ? '' : getEntityDetailsPageURL(entity.id.id, targetEntityType);
       this.selectEntityFormGroup.get('entity').patchValue(entity !== null ? entity : '', {emitEvent: false});
       this.entityChanged.emit(entity);
     } else {
       this.modelValue = null;
+      this.entityURL = '';
       this.selectEntityFormGroup.get('entity').patchValue('', {emitEvent: false});
     }
     this.dirty = true;
@@ -381,13 +368,14 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
     }
   }
 
-  reset() {
+  private reset() {
     this.selectEntityFormGroup.get('entity').patchValue('', {emitEvent: false});
   }
 
-  updateView(value: string | null, entity: BaseData<EntityId> | null) {
+  private updateView(value: string | EntityId | null, entity: BaseData<EntityId> | null) {
     if (!isEqual(this.modelValue, value)) {
       this.modelValue = value;
+      this.entityURL = !entity ? '' : getEntityDetailsPageURL(entity.id.id, entity.id.entityType as EntityType);
       this.propagateChange(this.modelValue);
       this.entityChanged.emit(entity);
     }
@@ -397,7 +385,7 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
     return entity ? entity.name : undefined;
   }
 
-  fetchEntities(searchText?: string): Observable<Array<BaseData<EntityId>>> {
+  private fetchEntities(searchText?: string): Observable<Array<BaseData<EntityId>>> {
     this.searchText = searchText;
     const targetEntityType = this.checkEntityType(this.entityTypeValue);
     return this.entityService.getEntitiesByNameFilter(targetEntityType, searchText,
@@ -432,7 +420,7 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
     }, 0);
   }
 
-  checkEntityType(entityType: EntityType | AliasEntityType): EntityType {
+  private checkEntityType(entityType: EntityType | AliasEntityType): EntityType {
     if (entityType === AliasEntityType.CURRENT_CUSTOMER) {
       return EntityType.CUSTOMER;
     } else if (entityType === AliasEntityType.CURRENT_TENANT) {
@@ -454,4 +442,8 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
     $event.stopPropagation();
     this.createNew.emit();
   }
+
+  get showEntityLink(): boolean {
+    return this.selectEntityFormGroup.get('entity').value && this.disabled && this.entityURL !== '';
+  }
 }
diff --git a/ui-ngx/src/app/shared/components/js-func-modules.component.html b/ui-ngx/src/app/shared/components/js-func-modules.component.html
index 7aa70afd1d..b011838212 100644
--- a/ui-ngx/src/app/shared/components/js-func-modules.component.html
+++ b/ui-ngx/src/app/shared/components/js-func-modules.component.html
@@ -27,7 +27,7 @@
         </div>
         <div *ngIf="modulesFormArray().controls.length; else noModules" class="tb-form-table-body">
           <div *ngFor="let moduleControl of modulesFormArray().controls; trackBy: trackByModule; let $index = index;">
-            <tb-js-func-module-row class="flex-1"
+            <tb-js-func-module-row class="flex"
                                    [index]="$index"
                                    [formControl]="moduleControl"
                                    (moduleRemoved)="removeModule($index)">
diff --git a/ui-ngx/src/app/shared/components/js-func.component.ts b/ui-ngx/src/app/shared/components/js-func.component.ts
index 647ab6113d..8e500bdbe9 100644
--- a/ui-ngx/src/app/shared/components/js-func.component.ts
+++ b/ui-ngx/src/app/shared/components/js-func.component.ts
@@ -80,6 +80,8 @@ export class JsFuncComponent implements OnInit, OnDestroy, ControlValueAccessor,
 
   toastTargetId = `jsFuncEditor-${guid()}`;
 
+  @Input() label: string;
+
   @Input() functionTitle: string;
 
   @Input() functionName: string;
@@ -102,7 +104,9 @@ export class JsFuncComponent implements OnInit, OnDestroy, ControlValueAccessor,
 
   @Input() globalVariables: Array<string>;
 
-  @Input() disableUndefinedCheck = false;
+  @Input()
+  @coerceBoolean()
+  disableUndefinedCheck = false;
 
   @Input() helpId: string;
 
@@ -174,7 +178,7 @@ export class JsFuncComponent implements OnInit, OnDestroy, ControlValueAccessor,
   }
 
   ngOnInit(): void {
-    if (this.functionTitle) {
+    if (this.functionTitle || this.label) {
       this.hideBrackets = true;
     }
     if (!this.resultType || this.resultType.length === 0) {
@@ -190,6 +194,8 @@ export class JsFuncComponent implements OnInit, OnDestroy, ControlValueAccessor,
     }
     if (this.functionTitle) {
       this.functionLabel = `${this.functionTitle}: f(${this.functionArgsString})`;
+    } else if (this.label) {
+      this.functionLabel = this.label;
     } else {
       this.functionLabel =
         `function ${this.functionName ? this.functionName : ''}(${this.functionArgsString})${this.hideBrackets ? '' : ' {'}`;
diff --git a/ui-ngx/src/app/shared/components/json-form/json-form.component.ts b/ui-ngx/src/app/shared/components/json-form/json-form.component.ts
deleted file mode 100644
index 76647b5bae..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/json-form.component.ts
+++ /dev/null
@@ -1,293 +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.
-///
-
-import {
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  forwardRef,
-  Input,
-  OnChanges,
-  OnDestroy,
-  Renderer2,
-  SimpleChanges,
-  ViewChild, ViewContainerRef,
-  ViewEncapsulation
-} from '@angular/core';
-import { ControlValueAccessor, UntypedFormControl, NG_VALIDATORS, NG_VALUE_ACCESSOR, Validator } from '@angular/forms';
-import { coerceBooleanProperty } from '@angular/cdk/coercion';
-import { Store } from '@ngrx/store';
-import { AppState } from '@core/core.state';
-import { deepClone, isString, unwrapModule } from '@app/core/utils';
-import { JsonFormProps } from './react/json-form.models';
-import inspector from 'schema-inspector';
-import tinycolor from 'tinycolor2';
-import { DialogService } from '@app/core/services/dialog.service';
-import JsonFormUtils from './react/json-form-utils';
-import { JsonFormComponentData } from './json-form-component.models';
-import { GroupInfo } from '@shared/models/widget.models';
-import { Observable } from 'rxjs/internal/Observable';
-import { forkJoin, from } from 'rxjs';
-import { TbPopoverService } from '@shared/components/popover.service';
-
-@Component({
-  selector: 'tb-json-form',
-  templateUrl: './json-form.component.html',
-  styleUrls: ['./json-form.component.scss'],
-  providers: [
-    {
-      provide: NG_VALUE_ACCESSOR,
-      useExisting: forwardRef(() => JsonFormComponent),
-      multi: true
-    },
-    {
-      provide: NG_VALIDATORS,
-      useExisting: forwardRef(() => JsonFormComponent),
-      multi: true,
-    }
-  ],
-  encapsulation: ViewEncapsulation.None
-})
-export class JsonFormComponent implements ControlValueAccessor, Validator, OnChanges, OnDestroy {
-
-  @ViewChild('reactRoot', {static: true})
-  reactRootElmRef: ElementRef<HTMLElement>;
-
-  @ViewChild('reactFullscreen', {static: true})
-  reactFullscreenElmRef: ElementRef<HTMLElement>;
-
-  private readonlyValue: boolean;
-  get readonly(): boolean {
-    return this.readonlyValue;
-  }
-  @Input()
-  set required(value: boolean) {
-    this.readonlyValue = coerceBooleanProperty(value);
-  }
-
-  formProps: JsonFormProps = {
-    isFullscreen: false,
-    option: {
-      formDefaults: {
-        startEmpty: true
-      }
-    },
-    onModelChange: this.onModelChange.bind(this),
-    onColorClick: this.onColorClick.bind(this),
-    onIconClick: this.onIconClick.bind(this),
-    onToggleFullscreen: this.onToggleFullscreen.bind(this),
-    onHelpClick: this.onHelpClick.bind(this)
-  };
-
-  data: JsonFormComponentData;
-
-  model: any;
-  schema: any;
-  form: any;
-  groupInfoes: GroupInfo[];
-
-  isModelValid = true;
-
-  isFullscreen = false;
-  fullscreenFinishFn: (el: Element) => void;
-
-  private reactRoot: any;
-
-  private propagateChange = null;
-  private propagateChangePending = false;
-  private writingValue = false;
-  private updateViewPending = false;
-
-  constructor(public elementRef: ElementRef,
-              private dialogs: DialogService,
-              private popoverService: TbPopoverService,
-              private renderer: Renderer2,
-              private viewContainerRef: ViewContainerRef,
-              protected store: Store<AppState>,
-              private cd: ChangeDetectorRef) {
-  }
-
-  ngOnDestroy(): void {
-    this.destroyReactSchemaForm();
-  }
-
-  registerOnChange(fn: any): void {
-    this.propagateChange = fn;
-    if (this.propagateChangePending) {
-      this.propagateChangePending = false;
-      setTimeout(() => {
-        this.propagateChange(this.data);
-      }, 0);
-    }
-  }
-
-  registerOnTouched(fn: any): void {
-  }
-
-  setDisabledState(isDisabled: boolean): void {
-  }
-
-  public validate(c: UntypedFormControl) {
-    return this.isModelValid ? null : {
-      modelValid: false
-    };
-  }
-
-  writeValue(data: JsonFormComponentData): void {
-    this.writingValue = true;
-    this.data = data;
-    this.schema = this.data && this.data.schema ? deepClone(this.data.schema) : {
-      type: 'object'
-    };
-    this.schema.strict = true;
-    this.form = this.data && this.data.form ? deepClone(this.data.form) : [ '*' ];
-    this.groupInfoes = this.data && this.data.groupInfoes ? deepClone(this.data.groupInfoes) : [];
-    this.model = this.data && this.data.model || {};
-    this.model = inspector.sanitize(this.schema, this.model).data;
-    this.updateAndRender();
-    this.isModelValid = this.validateModel();
-    this.writingValue = false;
-    if (!this.isModelValid || this.updateViewPending) {
-      this.updateView();
-    }
-}
-
-  updateView() {
-    if (!this.writingValue) {
-      this.updateViewPending = false;
-      if (this.data) {
-        this.data.model = this.model;
-        if (this.propagateChange) {
-          try {
-            this.propagateChange(this.data);
-          } catch (e) {
-            this.propagateChangePending = true;
-          }
-        } else {
-          this.propagateChangePending = true;
-        }
-      }
-    } else {
-      this.updateViewPending = true;
-    }
-  }
-
-  ngOnChanges(changes: SimpleChanges): void {
-    for (const propName of Object.keys(changes)) {
-      const change = changes[propName];
-      if (!change.firstChange && change.currentValue !== change.previousValue) {
-        if (propName === 'readonly') {
-          this.updateAndRender();
-        }
-      }
-    }
-  }
-
-  private onModelChange(key: (string | number)[], val: any, forceUpdate = false) {
-    if (isString(val) && val === '') {
-      val = undefined;
-    }
-    if (JsonFormUtils.updateValue(key, this.model, val) || forceUpdate) {
-      this.isModelValid = this.validateModel();
-      this.updateView();
-    }
-  }
-
-  private onColorClick(key: (string | number)[],
-                       val: tinycolor.ColorFormats.RGBA,
-                       colorSelectedFn: (color: tinycolor.ColorFormats.RGBA) => void) {
-    this.dialogs.colorPicker(tinycolor(val).toRgbString()).subscribe((result) => {
-      if (!result?.canceled && colorSelectedFn) {
-        colorSelectedFn(tinycolor(result?.color).toRgb());
-      }
-    });
-  }
-
-  private onIconClick(key: (string | number)[],
-                      val: string,
-                      iconSelectedFn: (icon: string) => void) {
-    this.dialogs.materialIconPicker(val).subscribe((result) => {
-      if (!result?.canceled && iconSelectedFn) {
-        iconSelectedFn(result?.icon);
-      }
-    });
-  }
-
-  private onToggleFullscreen(fullscreenFinishFn?: (el: Element) => void) {
-    this.isFullscreen = !this.isFullscreen;
-    this.fullscreenFinishFn = fullscreenFinishFn;
-    this.cd.markForCheck();
-  }
-
-  onFullscreenChanged(fullscreen: boolean) {
-    this.formProps.isFullscreen = fullscreen;
-    this.renderReactSchemaForm(false);
-    if (this.fullscreenFinishFn) {
-      this.fullscreenFinishFn(this.reactFullscreenElmRef.nativeElement);
-      this.fullscreenFinishFn = null;
-    }
-  }
-
-  private onHelpClick(event: MouseEvent, helpId: string, helpVisibleFn: (visible: boolean) => void, helpReadyFn: (ready: boolean) => void) {
-    const trigger = event.currentTarget as Element;
-    this.popoverService.toggleHelpPopover(trigger, this.renderer, this.viewContainerRef, helpId, '', '', null, helpVisibleFn, helpReadyFn);
-  }
-
-  private updateAndRender() {
-
-    this.formProps.option.formDefaults.readonly = this.readonly;
-    this.formProps.schema = this.schema;
-    this.formProps.form = this.form;
-    this.formProps.groupInfoes = this.groupInfoes;
-    this.formProps.model = this.model;
-    this.renderReactSchemaForm();
-  }
-
-  private renderReactSchemaForm(destroy: boolean = true) {
-    if (destroy) {
-      this.destroyReactSchemaForm();
-    }
-
-    // import ReactSchemaForm from './react/json-form-react';
-    const reactSchemaFormObservables: Observable<any>[] = [
-      from(import('react')),
-      from(import('react-dom')),
-      from(import('react-dom/client')),
-      from(import('./react/json-form-react'))
-    ];
-    forkJoin(reactSchemaFormObservables).subscribe(
-      (modules) => {
-        const react = unwrapModule(modules[0]);
-        const reactDomClient =  unwrapModule(modules[2]);
-        const jsonFormReact = unwrapModule(modules[3]);
-        this.reactRoot = reactDomClient.createRoot(this.reactRootElmRef.nativeElement);
-        this.reactRoot.render(react.createElement(jsonFormReact, this.formProps));
-      }
-    );
-  }
-
-  private destroyReactSchemaForm() {
-    this.reactRoot?.unmount();
-  }
-
-  private validateModel(): boolean {
-    if (this.schema && this.model) {
-      return JsonFormUtils.validateBySchema(this.schema, this.model).valid;
-    }
-    return true;
-  }
-}
-
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-ace-editor.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-ace-editor.tsx
deleted file mode 100644
index 649ee16c95..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-ace-editor.tsx
+++ /dev/null
@@ -1,239 +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.
- */
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
-import ThingsboardBaseComponent from './json-form-base-component';
-import reactCSS from 'reactcss';
-import Button from '@mui/material/Button';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import { IEditorProps } from 'react-ace/src/types';
-import { map, mergeMap } from 'rxjs/operators';
-import { getAce } from '@shared/models/ace/ace.models';
-import { from, lastValueFrom } from 'rxjs';
-import { Observable } from 'rxjs/internal/Observable';
-import { CircularProgress, IconButton } from '@mui/material';
-import { MouseEvent } from 'react';
-import { Help, HelpOutline } from '@mui/icons-material';
-import { unwrapModule } from '@core/utils';
-
-const ReactAce = React.lazy(() => {
-  return lastValueFrom(getAce().pipe(
-    mergeMap(() => {
-      return from(import('react-ace')).pipe(
-        map((module) => unwrapModule(module)
-      ));
-    })
-  ));
-});
-
-interface ThingsboardAceEditorProps extends JsonFormFieldProps {
-  mode: string;
-  onTidy: (value: string) => Observable<string>;
-}
-
-interface ThingsboardAceEditorState extends JsonFormFieldState {
-  isFull: boolean;
-  fullscreenContainerElement: Element;
-  helpVisible: boolean;
-  helpReady: boolean;
-  focused: boolean;
-}
-
-class ThingsboardAceEditor extends React.Component<ThingsboardAceEditorProps, ThingsboardAceEditorState> {
-
-    private aceEditor: IEditorProps;
-
-    constructor(props: ThingsboardAceEditorProps) {
-        super(props);
-        this.onValueChanged = this.onValueChanged.bind(this);
-        this.onBlur = this.onBlur.bind(this);
-        this.onFocus = this.onFocus.bind(this);
-        this.onTidy = this.onTidy.bind(this);
-        this.onHelp = this.onHelp.bind(this);
-        this.onLoad = this.onLoad.bind(this);
-        this.onToggleFull = this.onToggleFull.bind(this);
-        const value = props.value ? props.value + '' : '';
-        this.state = {
-            isFull: false,
-            fullscreenContainerElement: null,
-            helpVisible: false,
-            helpReady: true,
-            value,
-            focused: false
-        };
-    }
-
-    onValueChanged(value) {
-        this.setState({
-            value
-        });
-        this.props.onChangeValidate({
-            target: {
-                value
-            }
-        });
-    }
-
-    onBlur() {
-        this.setState({ focused: false });
-    }
-
-    onFocus() {
-        this.setState({ focused: true });
-    }
-
-    onTidy() {
-        if (!this.props.form.readonly) {
-            const value = this.state.value;
-            this.props.onTidy(value).subscribe(
-              (processedValue) => {
-                this.setState({
-                  value: processedValue
-                });
-                this.props.onChangeValidate({
-                  target: {
-                    value: processedValue
-                  }
-                });
-              }
-            );
-        }
-    }
-
-    onHelp(event: MouseEvent) {
-      if (this.state.helpVisible && !this.state.helpReady) {
-        event.preventDefault();
-        event.stopPropagation();
-      } else {
-        this.props.onHelpClick(event, this.props.form.helpId,
-          (visible) => {
-            this.setState({
-              helpVisible: visible
-            });
-          }, (ready) => {
-            this.setState({
-              helpReady: ready
-            });
-          });
-      }
-    }
-
-    onLoad(editor: IEditorProps) {
-        this.aceEditor = editor;
-    }
-
-    onToggleFull() {
-        this.props.onToggleFullscreen((el) => {
-          this.setState({ isFull: !this.state.isFull, fullscreenContainerElement: el });
-        });
-    }
-
-    componentDidUpdate() {
-    }
-
-    render() {
-
-        const styles = reactCSS({
-            default: {
-                tidyButtonStyle: {
-                    color: '#7B7B7B',
-                    minWidth: '32px',
-                    minHeight: '15px',
-                    lineHeight: '15px',
-                    fontSize: '0.800rem',
-                    margin: '0',
-                    padding: '4px',
-                    height: '23px',
-                    borderRadius: '5px',
-                    marginLeft: '5px'
-                }
-            }
-        });
-
-        let labelClass = 'tb-label';
-        if (this.props.form.required) {
-            labelClass += ' tb-required';
-        }
-        if (this.props.form.readonly) {
-            labelClass += ' tb-readonly';
-        }
-        if (this.state.focused) {
-            labelClass += ' tb-focused';
-        }
-        let containerClass = 'tb-container';
-        const style = this.props.form.style || {width: '100%'};
-        if (this.state.isFull) {
-            containerClass += ' fullscreen-form-field';
-        }
-        const formDom = (
-          <div className={containerClass}>
-            <label className={labelClass}>{this.props.form.title}</label>
-            <div className='json-form-ace-editor'>
-              <div className='title-panel'>
-                <label>{this.props.mode}</label>
-                { this.props.onTidy ? <Button style={ styles.tidyButtonStyle }
-                                              className='tidy-button' onClick={this.onTidy}>Tidy</Button> : null }
-                { this.props.form.helpId ? <div style={ {position: 'relative', display: 'inline-block', marginLeft: '5px'} }>
-                  <IconButton color='primary'
-                              className='help-button' onClick={this.onHelp}>
-                    {this.state.helpVisible ? <Help /> : <HelpOutline /> }
-                  </IconButton>
-                  { this.state.helpVisible && !this.state.helpReady ?
-                    <div className='tb-absolute-fill help-button-loading'>
-                      <CircularProgress size={18} thickness={4}/>
-                    </div> : null }</div> : null }
-                <Button style={ styles.tidyButtonStyle }
-                        className='tidy-button' onClick={this.onToggleFull}>
-                  {this.state.isFull ?
-                    'Exit fullscreen' : 'Fullscreen'}
-                </Button>
-              </div>
-              <React.Suspense fallback={<div>Loading...</div>}>
-                <ReactAce  mode={this.props.mode}
-                           theme={'textmate'}
-                           height={this.state.isFull ? '100%' : '150px'}
-                           width={this.state.isFull ? '100%' : '300px'}
-                           onChange={this.onValueChanged}
-                           onFocus={this.onFocus}
-                           onBlur={this.onBlur}
-                           onLoad={this.onLoad}
-                           name={this.props.form.title}
-                           value={this.state.value}
-                           readOnly={this.props.form.readonly}
-                           editorProps={{$blockScrolling: Infinity}}
-                           enableBasicAutocompletion={true}
-                           enableSnippets={true}
-                           enableLiveAutocompletion={true}
-                           style={style}/>
-              </React.Suspense>
-            </div>
-            <div className='json-form-error'
-                 style={{opacity: this.props.valid ? '0' : '1'}}>{this.props.error}</div>
-          </div>
-        );
-        if (this.state.isFull) {
-          return ReactDOM.createPortal(formDom, this.state.fullscreenContainerElement);
-        } else {
-          return (
-            <div>
-                {formDom}
-            </div>
-          );
-        }
-    }
-}
-
-export default ThingsboardBaseComponent(ThingsboardAceEditor);
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-array.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-array.tsx
deleted file mode 100644
index 681fe69aab..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-array.tsx
+++ /dev/null
@@ -1,177 +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.
- */
-import * as React from 'react';
-import JsonFormUtils from './json-form-utils';
-import ThingsboardBaseComponent from './json-form-base-component';
-import Button from '@mui/material/Button';
-import _ from 'lodash';
-import IconButton from '@mui/material/IconButton';
-import Clear from '@mui/icons-material/Clear';
-import Add from '@mui/icons-material/Add';
-import Tooltip from '@mui/material/Tooltip';
-import {
-  JsonFormData,
-  JsonFormFieldProps,
-  JsonFormFieldState
-} from '@shared/components/json-form/react/json-form.models';
-
-interface ThingsboardArrayState extends JsonFormFieldState {
-  model: any[];
-  keys: number[];
-}
-
-class ThingsboardArray extends React.Component<JsonFormFieldProps, ThingsboardArrayState> {
-
-    constructor(props: JsonFormFieldProps) {
-        super(props);
-        this.onAppend = this.onAppend.bind(this);
-        this.onDelete = this.onDelete.bind(this);
-        const model = JsonFormUtils.selectOrSet(this.props.form.key, this.props.model) || [];
-        const keys: number[] = [];
-        for (let i = 0; i < model.length; i++) {
-            keys.push(i);
-        }
-        this.state = {
-            model,
-            keys
-        };
-    }
-
-    componentDidMount() {
-        if (this.props.form.startEmpty !== true && this.state.model.length === 0) {
-            this.onAppend();
-        }
-    }
-
-    onAppend() {
-        let empty;
-        if (this.props.form && this.props.form.schema && this.props.form.schema.items) {
-            const items = this.props.form.schema.items;
-            if (items.type && items.type.indexOf('object') !== -1) {
-                empty = {};
-                if (!this.props.options || this.props.options.setSchemaDefaults !== false) {
-                    empty = typeof items.default !== 'undefined' ? items.default : empty;
-                    if (empty) {
-                      JsonFormUtils.traverseSchema(items, (prop, path) => {
-                            if (typeof prop.default !== 'undefined') {
-                              JsonFormUtils.selectOrSet(path, empty, prop.default);
-                            }
-                        });
-                    }
-                }
-            } else if (items.type && items.type.indexOf('array') !== -1) {
-                empty = [];
-                if (!this.props.options || this.props.options.setSchemaDefaults !== false) {
-                    empty = items.default || empty;
-                }
-            } else {
-                if (!this.props.options || this.props.options.setSchemaDefaults !== false) {
-                    empty = items.default || empty;
-                }
-            }
-        }
-        const newModel = this.state.model;
-        newModel.push(empty);
-        const newKeys = this.state.keys;
-        let key = 0;
-        if (newKeys.length > 0) {
-            key = newKeys[newKeys.length - 1] + 1;
-        }
-        newKeys.push(key);
-        this.setState({
-                model: newModel,
-                keys: newKeys
-            }
-        );
-        this.props.onChangeValidate(this.state.model, true);
-    }
-
-    onDelete(index: number) {
-        const newModel = this.state.model;
-        newModel.splice(index, 1);
-        const newKeys = this.state.keys;
-        newKeys.splice(index, 1);
-        this.setState(
-            {
-                model: newModel,
-                keys: newKeys
-            }
-        );
-        this.props.onChangeValidate(this.state.model, true);
-    }
-
-    setIndex(index: number) {
-        return (form: JsonFormData) => {
-            if (form.key) {
-                form.key[form.key.indexOf('')] = index;
-            }
-        };
-    }
-
-    copyWithIndex(form: JsonFormData, index: number): JsonFormData {
-        const copy: JsonFormData = _.cloneDeep(form);
-        copy.arrayIndex = index;
-        JsonFormUtils.traverseForm(copy, this.setIndex(index));
-        return copy;
-    }
-
-    render() {
-        const arrays = [];
-        const model = this.state.model;
-        const keys = this.state.keys;
-        for (let i = 0; i < model.length; i++ ) {
-            let removeButton: React.JSX.Element = null;
-            if (!this.props.form.readonly) {
-                const boundOnDelete = this.onDelete.bind(this, i);
-                removeButton = <Tooltip title='Remove'><IconButton onClick={boundOnDelete}><Clear/></IconButton></Tooltip>;
-            }
-            const forms = (this.props.form.items as JsonFormData[]).map((form, index) => {
-                const copy = this.copyWithIndex(form, i);
-                return this.props.builder(copy, this.props.model, index, this.props.onChange,
-                  this.props.onColorClick, this.props.onIconClick, this.props.onToggleFullscreen,
-                  this.props.onHelpClick, this.props.mapper);
-            });
-            arrays.push(
-            <li key={keys[i]} className='list-group-item'>
-                {removeButton}
-                {forms}
-                </li>
-        );
-        }
-        let addButton: JSX.Element = null;
-        if (!this.props.form.readonly) {
-            addButton = <Button variant='contained'
-                                color='primary'
-                                startIcon={<Add/>}
-                                style={{marginBottom: '8px'}}
-                                onClick={this.onAppend}>{this.props.form.add || 'New'}</Button>;
-        }
-
-        return (
-            <div>
-                <div className='tb-container'>
-                    <div className='tb-head-label'>{this.props.form.title}</div>
-                        <ol className='list-group'>
-                            {arrays}
-                        </ol>
-                </div>
-                {addButton}
-            </div>
-        );
-    }
-}
-
-export default ThingsboardBaseComponent(ThingsboardArray);
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-base-component.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-base-component.tsx
deleted file mode 100644
index 4e9687ce3a..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-base-component.tsx
+++ /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.
- */
-import * as React from 'react';
-import JsonFormUtils from './json-form-utils';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import { isDefinedAndNotNull } from '@core/utils';
-
-export default ThingsboardBaseComponent => class<P extends JsonFormFieldProps>
-  extends React.Component<P, JsonFormFieldState> {
-
-    constructor(props: P) {
-        super(props);
-        this.onChangeValidate = this.onChangeValidate.bind(this);
-        const value = this.defaultValue();
-        const validationResult = JsonFormUtils.validate(this.props.form, value);
-        this.state = {
-            value,
-            valid: !!(validationResult.valid || !value),
-            error: !validationResult.valid && value ? validationResult.error.message : null
-        };
-    }
-
-    componentDidMount() {
-        if (typeof this.state.value !== 'undefined') {
-            this.props.onChange(this.props.form.key, this.state.value);
-        }
-    }
-
-    onChangeValidate(e, forceUpdate?: boolean) {
-        let value = null;
-        if (this.props.form.schema.type === 'integer' || this.props.form.schema.type === 'number') {
-            if (!e || e.target?.value === null || e.target?.value === '') {
-                value = undefined;
-            } else if (typeof e === 'number') {
-                value = Number(e);
-            } else if (e.target.value.indexOf('.') === -1) {
-                value = parseInt(e.target.value, 10);
-            } else {
-                value = parseFloat(e.target.value);
-            }
-        } else if (this.props.form.schema.type === 'boolean') {
-            value = e.target.checked;
-        } else if (this.props.form.schema.type === 'date' || this.props.form.schema.type === 'array') {
-            value = e;
-        } else { // string
-            value = e.target.value;
-        }
-        const validationResult = JsonFormUtils.validate(this.props.form, value);
-        this.setState({
-            value,
-            valid: validationResult.valid,
-            error: validationResult.valid ? null : validationResult.error.message
-        });
-        this.props.onChange(this.props.form.key, value, forceUpdate);
-    }
-
-    defaultValue() {
-        let value = JsonFormUtils.selectOrSet(this.props.form.key, this.props.model);
-        if (this.props.form.schema.type === 'boolean') {
-            if (typeof value !== 'boolean' && typeof this.props.form.default === 'boolean') {
-                value = this.props.form.default;
-            }
-            if (typeof value !== 'boolean' && this.props.form.schema && typeof this.props.form.schema.default === 'boolean') {
-                value = this.props.form.schema.default;
-            }
-            if (typeof value !== 'boolean' &&
-                this.props.form.schema &&
-                this.props.form.required) {
-                value = false;
-            }
-        } else if (this.props.form.schema.type === 'integer' || this.props.form.schema.type === 'number') {
-            if (typeof value !== 'number' && typeof this.props.form.default === 'number') {
-                value = this.props.form.default;
-            }
-            if (typeof value !== 'number' && this.props.form.schema && typeof this.props.form.schema.default === 'number') {
-                value = this.props.form.schema.default;
-            }
-            if (typeof value !== 'number' && this.props.form.titleMap && typeof this.props.form.titleMap[0].value === 'number') {
-                value = this.props.form.titleMap[0].value;
-            }
-            if (value && typeof value === 'string') {
-                if (value.indexOf('.') === -1) {
-                    value = parseInt(value, 10);
-                } else {
-                    value = parseFloat(value);
-                }
-            }
-        } else {
-            if (!value && isDefinedAndNotNull(this.props.form.default)) {
-                value = this.props.form.default;
-            }
-            if (!value && this.props.form.schema && isDefinedAndNotNull(this.props.form.schema.default)) {
-                value = this.props.form.schema.default;
-            }
-            if (!value && this.props.form.titleMap && isDefinedAndNotNull(this.props.form.titleMap[0].value)) {
-                value = this.props.form.titleMap[0].value;
-            }
-        }
-        return value;
-    }
-
-    render() {
-        if (this.props.form && this.props.form.schema) {
-            return <ThingsboardBaseComponent {...this.props} {...this.state} onChangeValidate={this.onChangeValidate}/>;
-        } else {
-            return <div></div>;
-        }
-    }
-};
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-checkbox.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-checkbox.tsx
deleted file mode 100644
index fd3bac8f2c..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-checkbox.tsx
+++ /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.
- */
-import * as React from 'react';
-import ThingsboardBaseComponent from './json-form-base-component';
-import Checkbox from '@mui/material/Checkbox';
-import { JsonFormFieldProps, JsonFormFieldState } from './json-form.models.js';
-import FormControlLabel from '@mui/material/FormControlLabel';
-
-class ThingsboardCheckbox extends React.Component<JsonFormFieldProps, JsonFormFieldState> {
-    render() {
-        return (
-          <div>
-          <FormControlLabel
-            control={
-              <Checkbox
-                color={'secondary'}
-                name={this.props.form.key.slice(-1)[0] + ''}
-                value={this.props.form.key.slice(-1)[0]}
-                checked={this.props.value || false}
-                disabled={this.props.form.readonly}
-                onChange={(e) => {
-                  this.props.onChangeValidate(e);
-                }}
-              />
-            }
-            label={this.props.form.title}
-            />
-          </div>
-        );
-    }
-}
-
-export default ThingsboardBaseComponent(ThingsboardCheckbox);
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-color.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-color.tsx
deleted file mode 100644
index bf3a245663..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-color.tsx
+++ /dev/null
@@ -1,186 +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.
- */
-import * as React from 'react';
-import ThingsboardBaseComponent from './json-form-base-component';
-import reactCSS from 'reactcss';
-import tinycolor from 'tinycolor2';
-import TextField from '@mui/material/TextField';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import IconButton from '@mui/material/IconButton';
-import Clear from '@mui/icons-material/Clear';
-import Tooltip from '@mui/material/Tooltip';
-
-interface ThingsboardColorState extends JsonFormFieldState {
-  color: tinycolor.ColorFormats.RGBA | null;
-  focused: boolean;
-}
-
-class ThingsboardColor extends React.Component<JsonFormFieldProps, ThingsboardColorState> {
-
-    containerRef = React.createRef<HTMLDivElement>();
-
-    constructor(props: JsonFormFieldProps) {
-        super(props);
-        this.onBlur = this.onBlur.bind(this);
-        this.onFocus = this.onFocus.bind(this);
-        this.onValueChanged = this.onValueChanged.bind(this);
-        this.onSwatchClick = this.onSwatchClick.bind(this);
-        this.onClear = this.onClear.bind(this);
-        const value = props.value ? props.value + '' : null;
-        const color = value != null ? tinycolor(value).toRgb() : null;
-        this.state = {
-            color,
-            focused: false
-        };
-    }
-
-    onBlur() {
-      this.setState({focused: false});
-    }
-
-    onFocus() {
-      this.setState({focused: true});
-    }
-
-    componentDidMount() {
-        const node = this.containerRef.current;
-        const colContainer = $(node).children('#color-container');
-        colContainer.click(() => {
-            if (!this.props.form.readonly) {
-              this.onSwatchClick();
-            }
-        });
-    }
-
-    componentWillUnmount() {
-        const node = this.containerRef.current;
-        const colContainer = $(node).children('#color-container');
-        colContainer.off( 'click' );
-    }
-
-    onValueChanged(value: tinycolor.ColorFormats.RGBA | null) {
-        let color: tinycolor.Instance = null;
-        if (value != null) {
-            color = tinycolor(value);
-        }
-        this.setState({
-            color: value
-        });
-        let colorValue = '';
-        if (color != null && color.getAlpha() !== 1) {
-            colorValue = color.toRgbString();
-        } else if (color != null) {
-            colorValue = color.toHexString();
-        }
-        this.props.onChangeValidate({
-            target: {
-                value: colorValue
-            }
-        });
-    }
-
-    onSwatchClick() {
-        this.props.onColorClick(this.props.form.key, this.state.color,
-          (color) => {
-            this.onValueChanged(color);
-          }
-        );
-    }
-
-    onClear(event: React.MouseEvent) {
-        if (event) {
-            event.stopPropagation();
-        }
-        this.onValueChanged(null);
-    }
-
-    render() {
-
-        let background = 'rgba(0,0,0,0)';
-        if (this.state.color != null) {
-            background = `rgba(${ this.state.color.r }, ${ this.state.color.g }, ${ this.state.color.b }, ${ this.state.color.a })`;
-        }
-
-        const styles = reactCSS({
-            default: {
-                color: {
-                    background: `${ background }`
-                },
-                swatch: {
-                    display: 'inline-block',
-                    marginRight: '10px',
-                    marginTop: 'auto',
-                    marginBottom: 'auto',
-                    cursor: 'pointer',
-                    opacity: `${ this.props.form.readonly ? '0.6' : '1' }`
-                },
-                swatchText: {
-                    width: '100%'
-                },
-                container: {
-                    display: 'flex',
-                    flexDirection: 'row',
-                    alignItems: 'center'
-                },
-                colorContainer: {
-                    display: 'flex',
-                    width: '100%'
-                }
-            },
-        });
-
-        let fieldClass = 'tb-field';
-        if (this.props.form.required) {
-            fieldClass += ' tb-required';
-        }
-        if (this.props.form.readonly) {
-            fieldClass += ' tb-readonly';
-        }
-        if (this.state.focused) {
-            fieldClass += ' tb-focused';
-        }
-
-        let stringColor = '';
-        if (this.state.color != null) {
-            const color = tinycolor(this.state.color);
-            stringColor = color.toRgbString();
-        }
-
-        return (
-            <div ref={this.containerRef} style={ styles.container }>
-                 <div id='color-container' style={ styles.colorContainer }>
-                    <div className='tb-color-preview' style={ styles.swatch }>
-                        <div className='tb-color-result' style={ styles.color }/>
-                    </div>
-                   <TextField
-                     variant={'standard'}
-                     className={fieldClass}
-                     label={this.props.form.title}
-                     error={!this.props.valid}
-                     helperText={this.props.valid ? this.props.form.placeholder : this.props.error}
-                     value={stringColor}
-                     disabled={this.props.form.readonly}
-                     onFocus={this.onFocus}
-                     onBlur={this.onBlur}
-                     style={ styles.swatchText }/>
-                 </div>
-                 <Tooltip title='Clear' placement='top'><IconButton onClick={this.onClear}><Clear/></IconButton></Tooltip>
-            </div>
-        );
-    }
-}
-
-export default ThingsboardBaseComponent(ThingsboardColor);
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-css.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-css.tsx
deleted file mode 100644
index 600ae8c12b..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-css.tsx
+++ /dev/null
@@ -1,40 +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.
- */
-import * as React from 'react';
-import ThingsboardAceEditor from './json-form-ace-editor';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import { Observable } from 'rxjs/internal/Observable';
-import { beautifyCss } from '@shared/models/beautify.models';
-
-class ThingsboardCss extends React.Component<JsonFormFieldProps, JsonFormFieldState> {
-
-    constructor(props: JsonFormFieldProps) {
-        super(props);
-        this.onTidyCss = this.onTidyCss.bind(this);
-    }
-
-    onTidyCss(css: string): Observable<string> {
-        return beautifyCss(css, {indent_size: 4});
-    }
-
-    render() {
-        return (
-            <ThingsboardAceEditor {...this.props} mode='css' onTidy={this.onTidyCss} {...this.state}></ThingsboardAceEditor>
-        );
-    }
-}
-
-export default ThingsboardCss;
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-date.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-date.tsx
deleted file mode 100644
index 3b253cfa8e..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-date.tsx
+++ /dev/null
@@ -1,83 +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.
- */
-import * as React from 'react';
-import ThingsboardBaseComponent from './json-form-base-component';
-import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment'
-import { LocalizationProvider, DatePicker } from '@mui/x-date-pickers';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import moment from 'moment';
-
-interface ThingsboardDateState extends JsonFormFieldState {
-  currentValue: Date | null;
-}
-
-class ThingsboardDate extends React.Component<JsonFormFieldProps, ThingsboardDateState> {
-
-    constructor(props: JsonFormFieldProps) {
-        super(props);
-        this.onDatePicked = this.onDatePicked.bind(this);
-        let value: Date | null = null;
-        if (this.props.value && typeof this.props.value === 'number') {
-          value = new Date(this.props.value);
-        }
-        this.state = {
-          currentValue: value
-        };
-    }
-
-
-    onDatePicked(date: moment.Moment | null) {
-        this.setState({
-          currentValue: date?.toDate()
-        });
-        this.props.onChangeValidate(date ? date.valueOf() : null);
-    }
-
-    render() {
-
-        let fieldClass = 'tb-date-field';
-        if (this.props.form.required) {
-            fieldClass += ' tb-required';
-        }
-        if (this.props.form.readonly) {
-            fieldClass += ' tb-readonly';
-        }
-
-        return (
-          <LocalizationProvider dateAdapter={AdapterMoment}>
-            <div style={{width: '100%', display: 'block'}}>
-                <DatePicker
-                    slotProps={{
-                      textField: {
-                        variant: 'standard'
-                      }
-                    }}
-                    format='MM/DD/YYYY'
-                    className={fieldClass}
-                    label={this.props.form.title}
-                    value={moment(this.state.currentValue?.valueOf())}
-                    onChange={this.onDatePicked}
-                    disabled={this.props.form.readonly}
-                    sx={this.props.form.style || {width: '100%'}}
-                />
-
-            </div>
-          </LocalizationProvider>
-        );
-    }
-}
-
-export default ThingsboardBaseComponent(ThingsboardDate);
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-fieldset.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-fieldset.tsx
deleted file mode 100644
index 31f09fc409..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-fieldset.tsx
+++ /dev/null
@@ -1,44 +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.
- */
-import * as React from 'react';
-import {
-  JsonFormData,
-  JsonFormFieldProps,
-  JsonFormFieldState
-} from '@shared/components/json-form/react/json-form.models';
-
-class ThingsboardFieldSet extends React.Component<JsonFormFieldProps, JsonFormFieldState> {
-
-    render() {
-        const forms = (this.props.form.items as JsonFormData[]).map((form: JsonFormData, index) => {
-            return this.props.builder(form, this.props.model, index, this.props.onChange,
-              this.props.onColorClick, this.props.onIconClick, this.props.onToggleFullscreen, this.props.onHelpClick, this.props.mapper);
-        });
-
-        return (
-            <div style={{paddingTop: '20px'}}>
-                <div className='tb-head-label'>
-                    {this.props.form.title}
-                </div>
-                <div>
-                    {forms}
-                </div>
-            </div>
-        );
-    }
-}
-
-export default ThingsboardFieldSet;
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-html.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-html.tsx
deleted file mode 100644
index f267154182..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-html.tsx
+++ /dev/null
@@ -1,40 +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.
- */
-import * as React from 'react';
-import ThingsboardAceEditor from './json-form-ace-editor';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import { Observable } from 'rxjs/internal/Observable';
-import { beautifyHtml } from '@shared/models/beautify.models';
-
-class ThingsboardHtml extends React.Component<JsonFormFieldProps, JsonFormFieldState> {
-
-    constructor(props: JsonFormFieldProps) {
-        super(props);
-        this.onTidyHtml = this.onTidyHtml.bind(this);
-    }
-
-    onTidyHtml(html: string): Observable<string> {
-        return beautifyHtml(html, {indent_size: 4});
-    }
-
-    render() {
-        return (
-            <ThingsboardAceEditor {...this.props} mode='html' onTidy={this.onTidyHtml} {...this.state}></ThingsboardAceEditor>
-        );
-    }
-}
-
-export default ThingsboardHtml;
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-icon.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-icon.tsx
deleted file mode 100644
index 00366b86e8..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-icon.tsx
+++ /dev/null
@@ -1,162 +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.
- */
-import * as React from 'react';
-import { MouseEvent } from 'react';
-import ThingsboardBaseComponent from './json-form-base-component';
-import reactCSS from 'reactcss';
-import TextField from '@mui/material/TextField';
-import IconButton from '@mui/material/IconButton';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import Clear from '@mui/icons-material/Clear';
-import Icon from '@mui/material/Icon';
-import Tooltip from '@mui/material/Tooltip';
-
-interface ThingsboardIconState extends JsonFormFieldState {
-  icon: string | null;
-  focused: boolean;
-}
-
-class ThingsboardIcon extends React.Component<JsonFormFieldProps, ThingsboardIconState> {
-
-    containerRef = React.createRef<HTMLDivElement>();
-
-    constructor(props: JsonFormFieldProps) {
-        super(props);
-        this.onBlur = this.onBlur.bind(this);
-        this.onFocus = this.onFocus.bind(this);
-        this.onValueChanged = this.onValueChanged.bind(this);
-        this.onIconClick = this.onIconClick.bind(this);
-        this.onClear = this.onClear.bind(this);
-        const icon = props.value ? props.value : '';
-        this.state = {
-            icon,
-            focused: false
-        };
-    }
-
-    onBlur() {
-      this.setState({focused: false});
-    }
-
-    onFocus() {
-      this.setState({focused: true});
-    }
-
-    componentDidMount() {
-        const node = this.containerRef.current;
-        const iconContainer = $(node).children('#icon-container');
-        iconContainer.on('click', (event) => {
-          if (!this.props.form.readonly) {
-            this.onIconClick(event);
-          }
-        });
-    }
-
-    componentWillUnmount() {
-        const node = this.containerRef.current;
-        const iconContainer = $(node).children('#icon-container');
-        iconContainer.off( 'click' );
-    }
-
-    onValueChanged(value: string | null) {
-        this.setState({
-            icon: value
-        });
-        this.props.onChange(this.props.form.key, value);
-    }
-
-    onIconClick(_event) {
-      this.props.onIconClick(this.props.form.key, this.state.icon,
-        (color) => {
-          this.onValueChanged(color);
-        }
-      );
-    }
-
-    onClear(event: MouseEvent) {
-        if (event) {
-            event.stopPropagation();
-        }
-        this.onValueChanged('');
-    }
-
-    render() {
-
-        const styles = reactCSS({
-            default: {
-                container: {
-                    display: 'flex',
-                    flexDirection: 'row',
-                    alignItems: 'center'
-                },
-                icon: {
-                    padding: '12px',
-                    marginRight: '10px',
-                    marginBottom: 'auto',
-                    cursor: 'pointer',
-                    border: 'solid 1px rgba(0, 0, 0, .27)',
-                    borderRadius: '0'
-                },
-                iconContainer: {
-                    display: 'flex',
-                    width: '100%'
-                },
-                iconText: {
-                    width: '100%'
-                },
-            },
-        });
-
-        let fieldClass = 'tb-field';
-        if (this.props.form.required) {
-            fieldClass += ' tb-required';
-        }
-        if (this.state.focused) {
-            fieldClass += ' tb-focused';
-        }
-
-        let pickedIcon = 'more_horiz';
-        let icon = '';
-        if (this.state.icon !== '') {
-            pickedIcon = this.state.icon;
-            icon = this.state.icon;
-        }
-
-        return (
-            <div ref={this.containerRef} style={ styles.container }>
-                 <div id='icon-container' style={ styles.iconContainer }>
-                    <IconButton style={ styles.icon }>
-                      <Icon>{pickedIcon}</Icon>
-                    </IconButton>
-                    <TextField
-                        variant={'standard'}
-                        className={fieldClass}
-                        label={this.props.form.title}
-                        error={!this.props.valid}
-                        helperText={this.props.valid ? this.props.form.placeholder : this.props.error}
-                        value={icon}
-                        disabled={this.props.form.readonly}
-                        onFocus={this.onFocus}
-                        onBlur={this.onBlur}
-                        style={ styles.iconText } />
-                 </div>
-                 <Tooltip title='Clear' placement='top'><IconButton onClick={this.onClear}><Clear/></IconButton></Tooltip>
-            </div>
-        );
-    }
-}
-
-export default ThingsboardBaseComponent(ThingsboardIcon);
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-image.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-image.tsx
deleted file mode 100644
index 2a03d95669..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-image.tsx
+++ /dev/null
@@ -1,108 +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.
- */
-import React, { MouseEvent } from 'react';
-import Dropzone from 'react-dropzone';
-import ThingsboardBaseComponent from './json-form-base-component';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import IconButton from '@mui/material/IconButton';
-import Clear from '@mui/icons-material/Clear';
-import Tooltip from '@mui/material/Tooltip';
-
-interface ThingsboardImageState extends JsonFormFieldState {
-  imageUrl: string;
-}
-
-class ThingsboardImage extends React.Component<JsonFormFieldProps, ThingsboardImageState> {
-
-    constructor(props: JsonFormFieldProps) {
-        super(props);
-        this.onDrop = this.onDrop.bind(this);
-        this.onClear = this.onClear.bind(this);
-        const value = props.value ? props.value + '' : null;
-        this.state = {
-            imageUrl: value
-        };
-    }
-
-    onDrop(acceptedFiles: File[]) {
-      const reader = new FileReader();
-      reader.onload = () => {
-        this.onValueChanged(reader.result as string);
-      };
-      reader.readAsDataURL(acceptedFiles[0]);
-    }
-
-    onValueChanged(value: string) {
-        this.setState({
-            imageUrl: value
-        });
-        this.props.onChangeValidate({
-            target: {
-                value
-            }
-        });
-    }
-
-    onClear(event: MouseEvent) {
-        if (event) {
-            event.stopPropagation();
-        }
-        this.onValueChanged('');
-    }
-
-    render() {
-
-        let labelClass = 'tb-label';
-        if (this.props.form.required) {
-            labelClass += ' tb-required';
-        }
-        if (this.props.form.readonly) {
-            labelClass += ' tb-readonly';
-        }
-
-        let previewComponent: React.JSX.Element;
-        if (this.state.imageUrl) {
-            previewComponent = <img className='tb-image-preview' src={this.state.imageUrl} />;
-        } else {
-            previewComponent = <div>No image selected</div>;
-        }
-
-        return (
-            <div className='tb-container'>
-                <label className={labelClass}>{this.props.form.title}</label>
-                <div className='tb-image-select-container'>
-                    <div className='tb-image-preview-container'>{previewComponent}</div>
-                    <div className='tb-image-clear-container'>
-                        <Tooltip title='Clear' placement='top'>
-                          <IconButton className='tb-image-clear-btn' onClick={this.onClear}><Clear/></IconButton>
-                        </Tooltip>
-                    </div>
-                    <Dropzone onDrop={this.onDrop}
-                              accept={ {'image/*': []} }  multiple={false}>
-                      {({getRootProps, getInputProps}) => (
-                          <div className='tb-dropzone' {...getRootProps()}>
-                            <div>Drop an image or click to select a file to upload.</div>
-                            <input {...getInputProps()} />
-                          </div>
-                        )}
-                    </Dropzone>
-                </div>
-            </div>
-        );
-    }
-}
-
-export default ThingsboardBaseComponent(ThingsboardImage);
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-javascript.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-javascript.tsx
deleted file mode 100644
index 74d01137a8..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-javascript.tsx
+++ /dev/null
@@ -1,40 +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.
- */
-import * as React from 'react';
-import ThingsboardAceEditor from './json-form-ace-editor';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import { Observable } from 'rxjs/internal/Observable';
-import { beautifyJs } from '@shared/models/beautify.models';
-
-class ThingsboardJavaScript extends React.Component<JsonFormFieldProps, JsonFormFieldState> {
-
-    constructor(props: JsonFormFieldProps) {
-        super(props);
-        this.onTidyJavascript = this.onTidyJavascript.bind(this);
-    }
-
-    onTidyJavascript(javascript: string): Observable<string> {
-        return beautifyJs(javascript, {indent_size: 4, wrap_line_length: 60});
-    }
-
-    render() {
-        return (
-           <ThingsboardAceEditor {...this.props} mode='javascript' onTidy={this.onTidyJavascript} {...this.state}></ThingsboardAceEditor>
-        );
-    }
-}
-
-export default ThingsboardJavaScript;
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-json.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-json.tsx
deleted file mode 100644
index 9ab839616b..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-json.tsx
+++ /dev/null
@@ -1,40 +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.
- */
-import * as React from 'react';
-import ThingsboardAceEditor from './json-form-ace-editor';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import { Observable } from 'rxjs/internal/Observable';
-import { beautifyJs } from '@shared/models/beautify.models';
-
-class ThingsboardJson extends React.Component<JsonFormFieldProps, JsonFormFieldState> {
-
-    constructor(props: JsonFormFieldProps) {
-        super(props);
-        this.onTidyJson = this.onTidyJson.bind(this);
-    }
-
-    onTidyJson(json: string): Observable<string> {
-        return beautifyJs(json, {indent_size: 4});
-    }
-
-    render() {
-        return (
-            <ThingsboardAceEditor {...this.props} mode='json' onTidy={this.onTidyJson} {...this.state}></ThingsboardAceEditor>
-        );
-    }
-}
-
-export default ThingsboardJson;
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-number.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-number.tsx
deleted file mode 100644
index 4616324de2..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-number.tsx
+++ /dev/null
@@ -1,99 +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.
- */
-import * as React from 'react';
-import ThingsboardBaseComponent from './json-form-base-component';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import { TextField } from '@mui/material';
-import { ChangeEvent } from 'react';
-
-interface ThingsboardNumberState extends JsonFormFieldState {
-  focused: boolean;
-  lastSuccessfulValue: number;
-}
-
-class ThingsboardNumber extends React.Component<JsonFormFieldProps, ThingsboardNumberState> {
-
-  constructor(props: JsonFormFieldProps) {
-    super(props);
-    this.preValidationCheck = this.preValidationCheck.bind(this);
-    this.onBlur = this.onBlur.bind(this);
-    this.onFocus = this.onFocus.bind(this);
-    this.state = {
-      lastSuccessfulValue: this.props.value,
-      focused: false
-    };
-  }
-
-  isNumeric(n: any) {
-    return n === null || n === '' || !isNaN(n) && isFinite(n);
-  }
-
-  onBlur() {
-    this.setState({focused: false});
-  }
-
-  onFocus() {
-    this.setState({focused: true});
-  }
-
-  preValidationCheck(e: ChangeEvent<HTMLTextAreaElement | HTMLInputElement>) {
-    if (this.isNumeric(e.target.value)) {
-      this.setState({
-        lastSuccessfulValue: Number(e.target.value)
-      });
-      this.props.onChangeValidate(e);
-    }
-  }
-
-  render() {
-
-    let fieldClass = 'tb-field';
-    if (this.props.form.required) {
-      fieldClass += ' tb-required';
-    }
-    if (this.props.form.readonly) {
-      fieldClass += ' tb-readonly';
-    }
-    if (this.state.focused) {
-      fieldClass += ' tb-focused';
-    }
-    let value = this.state.lastSuccessfulValue;
-    if (typeof value !== 'undefined') {
-      value = Number(value);
-    } else {
-      value = null;
-    }
-    return (
-      <div>
-        <TextField
-          variant={'standard'}
-          className={fieldClass}
-          label={this.props.form.title}
-          type='number'
-          error={!this.props.valid}
-          helperText={this.props.valid ? this.props.form.placeholder : this.props.error}
-          onChange={this.preValidationCheck}
-          defaultValue={value}
-          disabled={this.props.form.readonly}
-          onFocus={this.onFocus}
-          onBlur={this.onBlur}
-          style={this.props.form.style || {width: '100%'}}/>
-      </div>
-    );
-  }
-}
-
-export default ThingsboardBaseComponent(ThingsboardNumber);
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-radios.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-radios.tsx
deleted file mode 100644
index 99031ff480..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-radios.tsx
+++ /dev/null
@@ -1,51 +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.
- */
-import * as React from 'react';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import FormControlLabel from '@mui/material/FormControlLabel';
-import { FormLabel, Radio, RadioGroup } from '@mui/material';
-import FormControl from '@mui/material/FormControl';
-import ThingsboardBaseComponent from '@shared/components/json-form/react/json-form-base-component';
-
-class ThingsboardRadios extends React.Component<JsonFormFieldProps, JsonFormFieldState> {
-  render() {
-    const items = this.props.form.titleMap.map((item, index) => {
-      return (
-          <FormControlLabel value={item.value} control={<Radio color={'secondary'} />} label={item.name} key={index} />
-      );
-    });
-
-    let row = false;
-    if (this.props.form.direction === 'row') {
-      row = true;
-    }
-
-    return (
-      <FormControl component='fieldset'
-                   className={this.props.form.htmlClass}
-                   disabled={this.props.form.readonly}>
-        <FormLabel component='legend'>{this.props.form.title}</FormLabel>
-        <RadioGroup row={row} name={this.props.form.title} value={this.props.value} onChange={(e) => {
-          this.props.onChangeValidate(e);
-        }}>
-          {items}
-        </RadioGroup>
-      </FormControl>
-    );
-  }
-}
-
-export default ThingsboardBaseComponent(ThingsboardRadios);
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-rc-select.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-rc-select.tsx
deleted file mode 100644
index ee21674b94..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-rc-select.tsx
+++ /dev/null
@@ -1,202 +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.
- */
-import * as React from 'react';
-import ThingsboardBaseComponent from './json-form-base-component';
-import Select, { Option } from 'rc-select';
-import {
-  JsonFormFieldProps,
-  JsonFormFieldState,
-  KeyLabelItem
-} from '@shared/components/json-form/react/json-form.models';
-import { Mode } from 'rc-select/lib/interface';
-import { deepClone } from '@core/utils';
-
-interface ThingsboardRcSelectState extends JsonFormFieldState {
-  currentValue: KeyLabelItem | KeyLabelItem[];
-  items: Array<KeyLabelItem>;
-  focused: boolean;
-}
-
-class ThingsboardRcSelect extends React.Component<JsonFormFieldProps, ThingsboardRcSelectState> {
-
-    constructor(props: JsonFormFieldProps) {
-        super(props);
-        this.onSelect = this.onSelect.bind(this);
-        this.onDeselect = this.onDeselect.bind(this);
-        this.onBlur = this.onBlur.bind(this);
-        this.onFocus = this.onFocus.bind(this);
-        this.state = {
-            currentValue: this.keyToCurrentValue(this.props.value, this.props.form.schema.type === 'array'),
-            items: this.props.form.items as KeyLabelItem[],
-            focused: false
-        };
-    }
-
-    keyToCurrentValue(key: string | string[], isArray: boolean): KeyLabelItem | KeyLabelItem[] {
-        let currentValue: KeyLabelItem | KeyLabelItem[] = isArray ? [] : null;
-        if (isArray) {
-            const keys = key;
-            if (keys) {
-              (keys as string[]).forEach((keyVal) => {
-                (currentValue as KeyLabelItem[]).push({key: keyVal, label: this.labelFromKey(keyVal)});
-              });
-            }
-        } else {
-            currentValue = {key: key as string, label: this.labelFromKey(key as string)};
-        }
-        return currentValue;
-    }
-
-    labelFromKey(key: string): string {
-        let label = key || '';
-        if (key) {
-          for (const item of this.props.form.items) {
-            if (item.value === key) {
-              label = item.label;
-              break;
-            }
-          }
-        }
-        return label;
-    }
-
-    arrayValues(items: KeyLabelItem[]): string[] {
-        const v: string[] = [];
-        if (items) {
-          items.forEach(item => {
-            v.push(item.key);
-          });
-        }
-        return v;
-    }
-
-    keyIndex(values: KeyLabelItem[], key: string): number {
-        let index = -1;
-        if (values) {
-            for (let i = 0; i < values.length; i++) {
-                if (values[i].key === key) {
-                    index = i;
-                    break;
-                }
-            }
-        }
-        return index;
-    }
-
-    onSelect(value: KeyLabelItem) {
-        if (this.props.form.schema.type === 'array') {
-            const v = this.state.currentValue as KeyLabelItem[];
-            v.push(this.keyToCurrentValue(value.key, false) as KeyLabelItem);
-            this.setState({
-                currentValue: v
-            });
-            this.props.onChangeValidate(this.arrayValues(v));
-        } else {
-            this.setState({currentValue: this.keyToCurrentValue(value.key, false)});
-            this.props.onChangeValidate({target: {value: value.key}});
-        }
-    }
-
-    onDeselect(value: KeyLabelItem) {
-        if (this.props.form.schema.type === 'array') {
-            const v = this.state.currentValue as KeyLabelItem[];
-            const index = this.keyIndex(v, value.key);
-            if (index > -1) {
-                v.splice(index, 1);
-            }
-            this.setState({
-                currentValue: v
-            });
-            this.props.onChangeValidate(this.arrayValues(v));
-        }
-    }
-
-    onBlur() {
-        this.setState({ focused: false });
-    }
-
-    onFocus() {
-        this.setState({ focused: true });
-    }
-
-    render() {
-
-        let options: React.JSX.Element[] = [];
-        if (this.state.items && this.state.items.length > 0) {
-            options = this.state.items.map((item) => (
-              <Option key={item.value} value={item.value}>{item.label}</Option>
-            ));
-        }
-
-        let labelClass = 'tb-label';
-        if (this.props.form.required) {
-            labelClass += ' tb-required';
-        }
-        if (this.props.form.readonly) {
-            labelClass += ' tb-readonly';
-        }
-        if (this.state.focused) {
-            labelClass += ' tb-focused';
-        }
-        let mode: Mode;
-        let value = this.state.currentValue;
-        if (this.props.form.tags || this.props.form.multiple) {
-          value = deepClone(value);
-          if (this.props.form.tags) {
-            mode = 'tags';
-          } else if (this.props.form.multiple) {
-            mode = 'multiple';
-          }
-        }
-
-        const dropdownStyle = {...this.props.form.dropdownStyle, ...{zIndex: 100001}};
-        let dropdownClassName = 'tb-rc-select-dropdown';
-        if (this.props.form.dropdownClassName) {
-          dropdownClassName += ' ' + this.props.form.dropdownClassName;
-        }
-
-        return (
-            <div className='tb-container'>
-                <label className={labelClass}>{this.props.form.title}</label>
-                <Select
-                    className={this.props.form.className}
-                    dropdownClassName={dropdownClassName}
-                    dropdownStyle={dropdownStyle}
-                    allowClear={this.props.form.allowClear}
-                    showSearch={true}
-                    mode={mode}
-                    maxTagTextLength={this.props.form.maxTagTextLength}
-                    disabled={this.props.form.readonly}
-                    optionLabelProp='children'
-                    value={value}
-                    labelInValue={true}
-                    onSelect={this.onSelect}
-                    onDeselect={this.onDeselect}
-                    onFocus={this.onFocus}
-                    onBlur={this.onBlur}
-                    placeholder={this.props.form.placeholder}
-                    style={this.props.form.style || {width: '100%'}}>
-                    {options}
-                </Select>
-                <div className='json-form-error'
-                     style={{opacity: this.props.valid ? '0' : '1',
-                             bottom: '-5px'}}>{this.props.error}</div>
-            </div>
-        );
-    }
-}
-
-export default ThingsboardBaseComponent(ThingsboardRcSelect);
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-react.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-react.tsx
deleted file mode 100644
index a56054a614..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-react.tsx
+++ /dev/null
@@ -1,53 +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.
- */
-import * as React from 'react';
-import { createTheme, ThemeProvider } from '@mui/material/styles';
-import thingsboardTheme from './styles/thingsboardTheme';
-import ThingsboardSchemaForm from './json-form-schema-form';
-import { JsonFormProps } from './json-form.models';
-
-const tbTheme = createTheme(thingsboardTheme);
-
-class ReactSchemaForm extends React.Component<JsonFormProps, {}> {
-
-  static defaultProps: JsonFormProps;
-
-  constructor(props) {
-    super(props);
-  }
-
-  render() {
-    if (this.props.form.length > 0) {
-      return <ThemeProvider theme={tbTheme}><ThingsboardSchemaForm {...this.props} /></ThemeProvider>;
-    } else {
-      return <div></div>;
-    }
-  }
-}
-
-ReactSchemaForm.defaultProps = {
-  isFullscreen: false,
-  schema: {},
-  form: ['*'],
-  groupInfoes: [],
-  option: {
-    formDefaults: {
-      startEmpty: true
-    }
-  }
-};
-
-export default ReactSchemaForm;
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx
deleted file mode 100644
index bbdd90cbe7..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx
+++ /dev/null
@@ -1,217 +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.
- */
-import * as React from 'react';
-import JsonFormUtils from './json-form-utils';
-
-import ThingsboardArray from './json-form-array';
-import ThingsboardJavaScript from './json-form-javascript';
-import ThingsboardJson from './json-form-json';
-import ThingsboardHtml from './json-form-html';
-import ThingsboardCss from './json-form-css';
-import ThingsboardColor from './json-form-color';
-import ThingsboardRcSelect from './json-form-rc-select';
-import ThingsboardNumber from './json-form-number';
-import ThingsboardText from './json-form-text';
-import ThingsboardSelect from './json-form-select';
-import ThingsboardRadios from './json-form-radios';
-import ThingsboardDate from './json-form-date';
-import ThingsboardImage from './json-form-image';
-import ThingsboardCheckbox from './json-form-checkbox';
-import ThingsboardHelp from './json-form-help';
-import ThingsboardFieldSet from './json-form-fieldset';
-import ThingsboardIcon from './json-form-icon';
-import {
-  JsonFormData,
-  JsonFormProps,
-  onChangeFn,
-  OnColorClickFn, onHelpClickFn,
-  OnIconClickFn,
-  onToggleFullscreenFn
-} from './json-form.models';
-
-import _ from 'lodash';
-import tinycolor from 'tinycolor2';
-import { GroupInfo } from '@shared/models/widget.models';
-import ThingsboardMarkdown from '@shared/components/json-form/react/json-form-markdown';
-import { MouseEvent, ReactNode } from 'react';
-
-class ThingsboardSchemaForm extends React.Component<JsonFormProps, any> {
-
-  private hasConditions: boolean;
-  private conditionFunction: Function;
-  private readonly mapper: {[type: string]: any};
-
-  constructor(props: JsonFormProps) {
-    super(props);
-
-    this.mapper = {
-      number: ThingsboardNumber,
-      text: ThingsboardText,
-      password: ThingsboardText,
-      textarea: ThingsboardText,
-      select: ThingsboardSelect,
-      radios: ThingsboardRadios,
-      date: ThingsboardDate,
-      image: ThingsboardImage,
-      checkbox: ThingsboardCheckbox,
-      help: ThingsboardHelp,
-      array: ThingsboardArray,
-      javascript: ThingsboardJavaScript,
-      json: ThingsboardJson,
-      html: ThingsboardHtml,
-      css: ThingsboardCss,
-      markdown: ThingsboardMarkdown,
-      color: ThingsboardColor,
-      'rc-select': ThingsboardRcSelect,
-      fieldset: ThingsboardFieldSet,
-      icon: ThingsboardIcon
-    };
-
-    this.onChange = this.onChange.bind(this);
-    this.onColorClick = this.onColorClick.bind(this);
-    this.onIconClick = this.onIconClick.bind(this);
-    this.onToggleFullscreen = this.onToggleFullscreen.bind(this);
-    this.onHelpClick = this.onHelpClick.bind(this);
-    this.hasConditions = false;
-  }
-
-  onChange(key: (string | number)[], val: any, forceUpdate?: boolean) {
-    this.props.onModelChange(key, val, forceUpdate);
-    if (this.hasConditions) {
-      this.forceUpdate();
-    }
-  }
-
-  onColorClick(key: (string | number)[], val: tinycolor.ColorFormats.RGBA,
-               colorSelectedFn: (color: tinycolor.ColorFormats.RGBA) => void) {
-    this.props.onColorClick(key, val, colorSelectedFn);
-  }
-
-  onIconClick(key: (string | number)[], val: string,
-              iconSelectedFn: (icon: string) => void) {
-    this.props.onIconClick(key, val, iconSelectedFn);
-  }
-
-  onToggleFullscreen(fullscreenFinishFn?: (el: Element) => void) {
-    this.props.onToggleFullscreen(fullscreenFinishFn);
-  }
-
-  onHelpClick(event: MouseEvent, helpId: string, helpVisibleFn: (visible: boolean) => void, helpReadyFn: (ready: boolean) => void) {
-    this.props.onHelpClick(event, helpId, helpVisibleFn, helpReadyFn);
-  }
-
-
-  builder(form: JsonFormData,
-          model: any,
-          index: number,
-          onChange: onChangeFn,
-          onColorClick: OnColorClickFn,
-          onIconClick: OnIconClickFn,
-          onToggleFullscreen: onToggleFullscreenFn,
-          onHelpClick: onHelpClickFn,
-          mapper: {[type: string]: any}): React.JSX.Element {
-    const type = form.type;
-    const Field = this.mapper[type];
-    if (!Field) {
-      console.log('Invalid field: \"' + form.key[0] + '\"!');
-      return null;
-    }
-    if (form.condition) {
-      this.hasConditions = true;
-      if (!form.conditionFunction) {
-        form.conditionFunction = new Function('form', 'model', 'index', `return ${form.condition};`);
-      }
-      if (form.conditionFunction(form, model, index) === false) {
-        return null;
-      }
-    }
-    return <Field model={model} form={form} key={index} onChange={onChange}
-                  onColorClick={onColorClick}
-                  onIconClick={onIconClick}
-                  onToggleFullscreen={onToggleFullscreen}
-                  onHelpClick={onHelpClick}
-                  mapper={mapper} builder={this.builder}/>;
-  }
-
-  createSchema(theForm: any[]): React.JSX.Element {
-    const merged = JsonFormUtils.merge(this.props.schema, theForm, this.props.ignore, this.props.option);
-    let mapper = this.mapper;
-    if (this.props.mapper) {
-      mapper = _.merge(this.mapper, this.props.mapper);
-    }
-    const forms: ReactNode[] = merged.map(function(form: JsonFormData, index: number) {
-      return this.builder(form, this.props.model, index, this.onChange, this.onColorClick,
-        this.onIconClick, this.onToggleFullscreen, this.onHelpClick, mapper);
-    }.bind(this));
-
-    let formClass = 'SchemaForm';
-    if (this.props.isFullscreen) {
-      formClass += ' SchemaFormFullscreen';
-    }
-
-    return (
-      <div style={{width: '100%'}} className={formClass}>{forms}</div>
-    );
-  }
-
-  render() {
-    if (this.props.groupInfoes && this.props.groupInfoes.length > 0) {
-      const content: React.JSX.Element[] = [];
-      for (const info of this.props.groupInfoes) {
-        const forms = this.createSchema(this.props.form[info.formIndex]);
-        const item = <ThingsboardSchemaGroup key={content.length} forms={forms} info={info}></ThingsboardSchemaGroup>;
-        content.push(item);
-      }
-      return (<div>{content}</div>);
-    } else {
-      return this.createSchema(this.props.form);
-    }
-  }
-}
-export default ThingsboardSchemaForm;
-
-interface ThingsboardSchemaGroupProps {
-  info: GroupInfo;
-  forms: React.JSX.Element;
-}
-
-interface ThingsboardSchemaGroupState {
-  showGroup: boolean;
-}
-
-class ThingsboardSchemaGroup extends React.Component<ThingsboardSchemaGroupProps, ThingsboardSchemaGroupState> {
-  constructor(props: ThingsboardSchemaGroupProps) {
-    super(props);
-    this.state = {
-      showGroup: true
-    };
-  }
-
-  toogleGroup() {
-    this.setState({
-      showGroup: !this.state.showGroup
-    });
-  }
-
-  render() {
-    const theCla = 'pull-right fa fa-chevron-down tb-toggle-icon' + (this.state.showGroup ? '' : ' tb-toggled');
-    return (<section className='mat-elevation-z1' style={{marginTop: '10px'}}>
-      <div className='SchemaGroupname tb-button-toggle'
-           onClick={this.toogleGroup.bind(this)}>{this.props.info.GroupTitle}<span className={theCla}></span></div>
-      <div style={{padding: '20px'}} className={this.state.showGroup ? '' : 'invisible'}>{this.props.forms}</div>
-    </section>);
-  }
-}
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-select.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-select.tsx
deleted file mode 100644
index 46da881e38..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-select.tsx
+++ /dev/null
@@ -1,93 +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.
- */
-import * as React from 'react';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-import MenuItem from '@mui/material/MenuItem';
-import FormControl from '@mui/material/FormControl';
-import InputLabel from '@mui/material/InputLabel';
-import Select, { SelectChangeEvent } from '@mui/material/Select';
-import ThingsboardBaseComponent from '@shared/components/json-form/react/json-form-base-component';
-import { isObject } from '@core/utils';
-
-interface ThingsboardSelectState extends JsonFormFieldState {
-  currentValue: any;
-}
-
-class ThingsboardSelect extends React.Component<JsonFormFieldProps, ThingsboardSelectState> {
-
-  static getDerivedStateFromProps(props: JsonFormFieldProps) {
-    if (props.model && props.form.key) {
-      return {
-        currentValue: ThingsboardSelect.getModelKey(props.model, props.form.key)
-          || (props.form.titleMap != null ? props.form.titleMap[0].value : '')
-      }
-    }
-  }
-
-  static getModelKey(model: any, key: (string | number)[]) {
-    if (Array.isArray(key)) {
-      const res = key.reduce((cur, nxt) => (cur[nxt] || {}), model);
-      if (res && isObject(res)) {
-        return undefined;
-      } else {
-        return res;
-      }
-    } else {
-      return model[key];
-    }
-  }
-
-  constructor(props: JsonFormFieldProps) {
-    super(props);
-    this.onSelected = this.onSelected.bind(this);
-    const possibleValue = ThingsboardSelect.getModelKey(this.props.model, this.props.form.key);
-    this.state = {
-      currentValue: this.props.model !== undefined && possibleValue ? possibleValue : this.props.form.titleMap != null ?
-        this.props.form.titleMap[0].value : ''
-    };
-  }
-
-  onSelected(event: SelectChangeEvent<any>) {
-
-    this.setState({
-      currentValue: event.target.value
-    });
-    this.props.onChangeValidate(event);
-  }
-
-  render() {
-    const menuItems = this.props.form.titleMap.map((item, idx) => (
-      <MenuItem key={idx}
-                value={item.value}>{item.name}</MenuItem>
-    ));
-
-    return (
-      <FormControl className={this.props.form.htmlClass}
-                   disabled={this.props.form.readonly}
-                   fullWidth={true}>
-        <InputLabel variant={'standard'} htmlFor='select-field'>{this.props.form.title}</InputLabel>
-        <Select
-          variant={'standard'}
-          value={this.state.currentValue}
-          onChange={this.onSelected}>
-          {menuItems}
-        </Select>
-      </FormControl>
-    );
-  }
-}
-
-export default ThingsboardBaseComponent(ThingsboardSelect);
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-text.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-text.tsx
deleted file mode 100644
index 6fad3f3480..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-text.tsx
+++ /dev/null
@@ -1,92 +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.
- */
-import * as React from 'react';
-import ThingsboardBaseComponent from './json-form-base-component';
-import TextField from '@mui/material/TextField';
-import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
-
-interface ThingsboardTextState extends JsonFormFieldState {
-  focused: boolean;
-}
-
-class ThingsboardText extends React.Component<JsonFormFieldProps, ThingsboardTextState> {
-
-  constructor(props: JsonFormFieldProps) {
-    super(props);
-    this.onBlur = this.onBlur.bind(this);
-    this.onFocus = this.onFocus.bind(this);
-    this.state = {
-      focused: false
-    };
-  }
-
-  onBlur() {
-    this.setState({focused: false});
-  }
-
-  onFocus() {
-    this.setState({focused: true});
-  }
-
-  render() {
-
-    let fieldClass = 'tb-field';
-    if (this.props.form.required) {
-      fieldClass += ' tb-required';
-    }
-    if (this.props.form.readonly) {
-      fieldClass += ' tb-readonly';
-    }
-    if (this.state.focused) {
-      fieldClass += ' tb-focused';
-    }
-
-    const multiline = this.props.form.type === 'textarea';
-    let rows = 1;
-    let rowsMax = 1;
-    let minHeight = 48;
-    if (multiline) {
-      rows = this.props.form.rows || 2;
-      rowsMax = this.props.form.rowsMax;
-      minHeight = 19 * rows + 48;
-    }
-
-    return (
-      <div>
-        <TextField
-          variant={'standard'}
-          className={fieldClass}
-          type={this.props.form.type}
-          label={this.props.form.title}
-          multiline={multiline}
-          error={!this.props.valid}
-          helperText={this.props.valid ? this.props.form.placeholder : this.props.error}
-          onChange={(e) => {
-            this.props.onChangeValidate(e);
-          }}
-          defaultValue={this.props.value}
-          disabled={this.props.form.readonly}
-          rows={rows}
-          maxRows={rowsMax}
-          onFocus={this.onFocus}
-          onBlur={this.onBlur}
-          style={this.props.form.style || {width: '100%', minHeight: minHeight + 'px'}}/>
-      </div>
-    );
-  }
-}
-
-export default ThingsboardBaseComponent(ThingsboardText);
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form.models.ts b/ui-ngx/src/app/shared/components/json-form/react/json-form.models.ts
deleted file mode 100644
index ffcf201136..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form.models.ts
+++ /dev/null
@@ -1,141 +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.
-///
-
-import tinycolor from 'tinycolor2';
-import { GroupInfo } from '@shared/models/widget.models';
-import { MouseEvent } from 'react';
-
-export interface SchemaValidationResult {
-  valid: boolean;
-  error?: {
-    message?: string;
-  };
-}
-
-export interface FormOption {
-  formDefaults?: {
-    startEmpty?: boolean;
-    readonly?: boolean;
-  };
-  supressPropertyTitles?: boolean;
-}
-
-export interface DefaultsFormOptions {
-  global?: FormOption;
-  required?: boolean;
-  path?: string[];
-  lookup?: {[key: string]: any};
-  ignore?: {[key: string]: boolean};
-}
-
-export type onChangeFn = (key: (string | number)[], val: any, forceUpdate?: boolean) => void;
-export type OnColorClickFn = (key: (string | number)[], val: tinycolor.ColorFormats.RGBA,
-                              colorSelectedFn: (color: tinycolor.ColorFormats.RGBA) => void) => void;
-export type OnIconClickFn = (key: (string | number)[], val: string,
-                             iconSelectedFn: (icon: string) => void) => void;
-export type onToggleFullscreenFn = (fullscreenFinishFn?: (el: Element) => void) => void;
-export type onHelpClickFn = (event: MouseEvent, helpId: string, helpVisibleFn: (visible: boolean) => void,
-                             helpReadyFn: (ready: boolean) => void) => void;
-
-export interface JsonFormProps {
-  model?: any;
-  schema?: any;
-  form?: any;
-  groupInfoes?: GroupInfo[];
-  isFullscreen: boolean;
-  ignore?: {[key: string]: boolean};
-  option: FormOption;
-  onModelChange?: onChangeFn;
-  onColorClick?: OnColorClickFn;
-  onIconClick?: OnIconClickFn;
-  onToggleFullscreen?: onToggleFullscreenFn;
-  onHelpClick?: onHelpClickFn;
-  mapper?: {[type: string]: any};
-}
-
-export interface KeyLabelItem {
-  key: string;
-  label: string;
-  value?: string;
-}
-
-export interface JsonSchemaData {
-  type: string;
-  default: any;
-  items?: JsonSchemaData;
-  properties?: any;
-}
-
-export interface JsonFormData {
-  type: string;
-  key: (string | number)[];
-  title: string;
-  readonly: boolean;
-  required: boolean;
-  default?: any;
-  condition?: string;
-  conditionFunction?: Function;
-  style?: any;
-  rows?: number;
-  rowsMax?: number;
-  placeholder?: string;
-  schema: JsonSchemaData;
-  titleMap: {
-    value: any;
-    name: string;
-  }[];
-  items?: Array<KeyLabelItem> | Array<JsonFormData>;
-  tabs?: Array<JsonFormData>;
-  tags?: any;
-  helpId?: string;
-  startEmpty?: boolean;
-  [key: string]: any;
-}
-
-export type ComponentBuilderFn = (form: JsonFormData,
-                                  model: any,
-                                  index: number,
-                                  onChange: onChangeFn,
-                                  onColorClick: OnColorClickFn,
-                                  onIconClick: OnIconClickFn,
-                                  onToggleFullscreen: onToggleFullscreenFn,
-                                  onHelpClick: onHelpClickFn,
-                                  mapper: {[type: string]: any}) => JSX.Element;
-
-export interface JsonFormFieldProps {
-  value: any;
-  model: any;
-  form: JsonFormData;
-  builder: ComponentBuilderFn;
-  mapper?: {[type: string]: any};
-  onChange?: onChangeFn;
-  onColorClick?: OnColorClickFn;
-  onIconClick?: OnIconClickFn;
-  onChangeValidate?: (e: any, forceUpdate?: boolean) => void;
-  onToggleFullscreen?: onToggleFullscreenFn;
-  onHelpClick?: onHelpClickFn;
-  valid?: boolean;
-  error?: string;
-  options?: {
-    setSchemaDefaults?: boolean;
-  };
-}
-
-export interface JsonFormFieldState {
-  value?: any;
-  valid?: boolean;
-  error?: string;
-}
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form.scss b/ui-ngx/src/app/shared/components/json-form/react/json-form.scss
deleted file mode 100644
index 42e1dc9677..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form.scss
+++ /dev/null
@@ -1,361 +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.
- */
-$swift-ease-out-duration: .4s !default;
-$swift-ease-out-timing-function: cubic-bezier(.25, .8, .25, 1) !default;
-
-$input-label-float-offset: 6px !default;
-$input-label-float-scale: .75 !default;
-
-$previewSize: 100px !default;
-
-.tb-json-form {
-
-  &.tb-fullscreen {
-    background: #fff;
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    > div.fullscreen-form-field {
-      position: relative;
-      width: 100%;
-      height: 100%;
-    }
-  }
-
-  .json-form-error {
-    position: relative;
-    bottom: -5px;
-    font-size: 12px;
-    line-height: 12px;
-    color: rgb(244, 67, 54);
-
-    transition: all 450ms cubic-bezier(.23, 1, .32, 1) 0ms;
-  }
-
-  .tb-container {
-    position: relative;
-    box-sizing: border-box;
-    padding: 10px 0;
-    margin-top: 32px;
-  }
-
-  .tb-field {
-    padding-bottom: 18px;
-
-    .MuiInputBase-multiline {
-      flex: 1;
-      flex-direction: column;
-      .MuiInputBase-inputMultiline {
-        flex: 1;
-      }
-    }
-
-    &.tb-required {
-      label::after {
-        font-size: 13px;
-        color: rgba(0, 0, 0, .54);
-        vertical-align: top;
-        content: " *";
-      }
-    }
-
-    &.tb-focused:not(.tb-readonly) {
-      label::after {
-        color: rgb(221, 44, 0);
-      }
-    }
-  }
-
-  .tb-date-field {
-    &.tb-required {
-      div > div:first-child::after {
-        font-size: 13px;
-        color: rgba(0, 0, 0, .54);
-        vertical-align: top;
-        content: " *";
-      }
-    }
-
-    &.tb-focused:not(.tb-readonly) {
-      div > div:first-child::after {
-        color: rgb(221, 44, 0);
-      }
-    }
-  }
-
-  label.tb-label {
-    position: absolute;
-    right: auto;
-    bottom: 100%;
-    left: 0;
-    color: rgba(0, 0, 0, .54);
-
-    transition: transform $swift-ease-out-timing-function $swift-ease-out-duration, width $swift-ease-out-timing-function $swift-ease-out-duration;
-
-    transform: translate3d(0, $input-label-float-offset, 0) scale($input-label-float-scale);
-    transform-origin: left top;
-    -webkit-font-smoothing: antialiased;
-
-    &.tb-focused {
-      color: rgb(96, 125, 139);
-    }
-
-    &.tb-required::after {
-      font-size: 13px;
-      color: rgba(0, 0, 0, .54);
-      vertical-align: top;
-      content: " *";
-    }
-
-    &.tb-focused:not(.tb-readonly)::after {
-      color: rgb(221, 44, 0);
-    }
-  }
-
-  .tb-head-label {
-    color: rgba(0, 0, 0, .54);
-    padding-bottom: 15px;
-  }
-
-  .SchemaGroupname {
-    padding: 10px 20px;
-    background-color: #f1f1f1;
-  }
-
-  .invisible {
-    display: none;
-  }
-
-  .tb-button-toggle .tb-toggle-icon {
-    display: inline-block;
-    width: 15px;
-    margin: auto 0 auto auto;
-    background-size: 100% auto;
-
-    transition: transform .3s, ease-in-out;
-  }
-
-  .tb-button-toggle .tb-toggle-icon.tb-toggled {
-    transform: rotateZ(180deg);
-  }
-
-  .fullscreen-form-field {
-    .json-form-ace-editor {
-      height: calc(100% - 60px);
-    }
-  }
-
-  .json-form-ace-editor {
-    position: relative;
-    height: 100%;
-    border: 1px solid #c0c0c0;
-
-    .title-panel {
-      position: absolute;
-      top: 10px;
-      right: 20px;
-      z-index: 5;
-      font-size: .8rem;
-      font-weight: 500;
-
-      label {
-        padding: 4px;
-        color: #00acc1;
-        background: rgba(220, 220, 220, .35);
-        border-radius: 5px;
-      }
-
-      button.tidy-button {
-        background: rgba(220, 220, 220, .35) !important;
-
-        span {
-          padding: 0 !important;
-          font-size: 12px !important;
-        }
-      }
-      button.help-button {
-        background: rgba(220, 220, 220, .35);
-        padding: 4px;
-      }
-      div.help-button-loading {
-        pointer-events: none;
-        background: #f3f3f3;
-        border-radius: 50%;
-        display: flex;
-        place-content: center;
-        align-items: center;
-      }
-    }
-  }
-
-  .tb-image-select-container {
-    position: relative;
-    width: 100%;
-    height: $previewSize;
-  }
-
-  .tb-image-preview {
-    width: auto;
-    max-width: $previewSize;
-    height: auto;
-    max-height: $previewSize;
-  }
-
-  .tb-image-preview-container {
-    position: relative;
-    float: left;
-    width: $previewSize;
-    height: $previewSize;
-    margin-right: 12px;
-    vertical-align: top;
-    border: solid 1px;
-
-    div {
-      width: 100%;
-      font-size: 18px;
-      text-align: center;
-    }
-
-    div, .tb-image-preview {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-    }
-  }
-
-  .tb-dropzone {
-    outline: none;
-    position: relative;
-    height: $previewSize;
-    padding: 0 8px;
-    overflow: hidden;
-    vertical-align: top;
-    border: dashed 2px;
-
-    div {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      width: 100%;
-      font-size: 24px;
-      text-align: center;
-      transform: translate(-50%, -50%);
-    }
-  }
-
-  .tb-image-clear-container {
-    position: relative;
-    float: right;
-    width: 48px;
-    height: $previewSize;
-  }
-
-  .tb-image-clear-btn {
-    position: absolute !important;
-    top: 50%;
-    transform: translate(0%, -50%) !important;
-  }
-
-  .MuiButton-root {
-    text-transform: none;
-  }
-
-}
-
-.rc-select {
-  box-sizing: border-box;
-  display: inline-block;
-  position: relative;
-  vertical-align: middle;
-  color: #666;
-  line-height: 28px;
-  font-size: inherit !important;
-  .rc-select-selector {
-    outline: none;
-    user-select: none;
-    box-sizing: border-box;
-    display: block;
-    background-color: #fff;
-    border-radius: 6px;
-  }
-  &.rc-select-single {
-    &:not(.rc-select-customize-input) {
-      .rc-select-selector {
-        height: 28px;
-        line-height: 28px;
-        position: relative;
-        border: 1px solid #d9d9d9;
-        &:hover {
-          border-color: #23c0fa;
-          box-shadow: 0 0 2px rgba(45, 183, 245, 0.8);
-        }
-        .rc-select-selection-search {
-          .rc-select-selection-search-input {
-            cursor: pointer;
-            background: transparent;
-            margin-left: 10px;
-          }
-        }
-        .rc-select-selection-item, .rc-select-selection-placeholder {
-          top: 0;
-          left: 10px;
-        }
-      }
-      &.rc-select-focused {
-        .rc-select-selector {
-          border-color: #23c0fa !important;
-          box-shadow: 0 0 2px rgba(45, 183, 245, 0.8) !important;
-        }
-      }
-    }
-  }
-}
-
-.rc-select-dropdown {
-  &.tb-rc-select-dropdown {
-    z-index: 100001;
-    background-color: white;
-    border: 1px solid #d9d9d9;
-    box-shadow: 0 0 4px #d9d9d9;
-    border-radius: 4px;
-    box-sizing: border-box;
-    outline: none;
-
-    .rc-select-item {
-      &.rc-select-item-option {
-        margin: 0;
-        position: relative;
-        display: block;
-        padding: 7px 10px;
-        font-weight: normal;
-        color: #666;
-        white-space: nowrap;
-        &.rc-select-item-option-selected {
-          color: #666;
-          background-color: #ddd;
-        }
-        &.rc-select-item-option-active {
-          background-color: #5897fb;
-          color: white;
-          cursor: pointer;
-        }
-      }
-    }
-  }
-}
diff --git a/ui-ngx/src/app/shared/components/json-form/react/styles/thingsboardTheme.ts b/ui-ngx/src/app/shared/components/json-form/react/styles/thingsboardTheme.ts
deleted file mode 100644
index ab3497fd53..0000000000
--- a/ui-ngx/src/app/shared/components/json-form/react/styles/thingsboardTheme.ts
+++ /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.
-///
-
-import { indigo, deepOrange } from '@mui/material/colors';
-import { ThemeOptions } from '@mui/material/styles';
-import { PaletteOptions } from '@mui/material/styles/createPalette';
-import { mergeDeep } from '@core/utils';
-
-const PRIMARY_COLOR = '#305680';
-const SECONDARY_COLOR = '#527dad';
-const HUE3_COLOR = '#a7c1de';
-
-const tbIndigo = mergeDeep<any>({}, indigo, {
-  500: PRIMARY_COLOR,
-  600: SECONDARY_COLOR,
-  700: PRIMARY_COLOR,
-  A100: HUE3_COLOR
-});
-
-const thingsboardPalette: PaletteOptions = {
-  primary: tbIndigo,
-  secondary: deepOrange,
-  background: {
-    default: '#eee'
-  }
-};
-
-export default {
-  typography: {
-    fontFamily: 'Roboto, \'Helvetica Neue\', sans-serif'
-  },
-  palette: thingsboardPalette,
-} as ThemeOptions;
diff --git a/ui-ngx/src/app/shared/components/string-items-list.component.html b/ui-ngx/src/app/shared/components/string-items-list.component.html
index 375f22e02f..eb4c15fc18 100644
--- a/ui-ngx/src/app/shared/components/string-items-list.component.html
+++ b/ui-ngx/src/app/shared/components/string-items-list.component.html
@@ -15,7 +15,8 @@
     limitations under the License.
 
 -->
-<mat-form-field [formGroup]="stringItemsForm" class="mat-block flex-1"
+<mat-form-field [class]="fieldClass"
+                [formGroup]="stringItemsForm" class="mat-block flex-1"
                 [floatLabel]="floatLabel"
                 [appearance]="appearance"
                 [subscriptSizing]="subscriptSizing">
diff --git a/ui-ngx/src/app/shared/components/string-items-list.component.ts b/ui-ngx/src/app/shared/components/string-items-list.component.ts
index 951abaa12b..4121a7e8d7 100644
--- a/ui-ngx/src/app/shared/components/string-items-list.component.ts
+++ b/ui-ngx/src/app/shared/components/string-items-list.component.ts
@@ -108,6 +108,9 @@ export class StringItemsListComponent implements ControlValueAccessor, OnInit {
   @Input()
   subscriptSizing: SubscriptSizing = 'fixed';
 
+  @Input()
+  fieldClass: string;
+
   @Input()
   @coerceArray()
   predefinedValues: StringItemsOption[];
diff --git a/ui-ngx/src/app/shared/components/time/datetime-period.component.html b/ui-ngx/src/app/shared/components/time/datetime-period.component.html
index 84f6d29d68..03c5a6ac21 100644
--- a/ui-ngx/src/app/shared/components/time/datetime-period.component.html
+++ b/ui-ngx/src/app/shared/components/time/datetime-period.component.html
@@ -15,17 +15,17 @@
     limitations under the License.
 
 -->
-<section class="tb-form-row column-xs no-border no-padding tb-standard-fields">
+<section class="tb-form-row column-xs no-border no-padding tb-standard-fields" [formGroup]="dateTimePeriodFormGroup">
     <mat-form-field class="flex" [subscriptSizing]="subscriptSizing" [appearance]="appearance">
       <mat-label translate>datetime.from</mat-label>
       <mat-datetimepicker-toggle [for]="startDatePicker" matSuffix></mat-datetimepicker-toggle>
       <mat-datetimepicker #startDatePicker type="datetime" openOnFocus="true"></mat-datetimepicker>
-      <input matInput [disabled]="disabled" [(ngModel)]="startDate" [matDatetimepicker]="startDatePicker" (ngModelChange)="onStartDateChange()">
+      <input matInput formControlName="startDate" [matDatetimepicker]="startDatePicker" [max]="maxStartDate">
     </mat-form-field>
     <mat-form-field class="flex" [subscriptSizing]="subscriptSizing" [appearance]="appearance">
       <mat-label translate>datetime.to</mat-label>
       <mat-datetimepicker-toggle [for]="endDatePicker" matSuffix></mat-datetimepicker-toggle>
       <mat-datetimepicker #endDatePicker type="datetime" openOnFocus="true"></mat-datetimepicker>
-      <input matInput [disabled]="disabled" [(ngModel)]="endDate" [matDatetimepicker]="endDatePicker" (ngModelChange)="onEndDateChange()">
+      <input matInput formControlName="endDate" [matDatetimepicker]="endDatePicker" [max]="maxEndDate">
     </mat-form-field>
 </section>
diff --git a/ui-ngx/src/app/shared/components/time/datetime-period.component.ts b/ui-ngx/src/app/shared/components/time/datetime-period.component.ts
index c0fbaea21e..0e212f7630 100644
--- a/ui-ngx/src/app/shared/components/time/datetime-period.component.ts
+++ b/ui-ngx/src/app/shared/components/time/datetime-period.component.ts
@@ -14,10 +14,17 @@
 /// limitations under the License.
 ///
 
-import { Component, forwardRef, Input, OnInit } from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { FixedWindow } from '@shared/models/time/time.models';
+import { Component, forwardRef, Input } from '@angular/core';
+import { ControlValueAccessor, FormBuilder, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { DAY, FixedWindow, MINUTE } from '@shared/models/time/time.models';
 import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { distinctUntilChanged } from 'rxjs/operators';
+
+interface DateTimePeriod {
+  startDate: Date;
+  endDate: Date;
+}
 
 @Component({
   selector: 'tb-datetime-period',
@@ -31,7 +38,7 @@ import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-
     }
   ]
 })
-export class DatetimePeriodComponent implements OnInit, ControlValueAccessor {
+export class DatetimePeriodComponent implements ControlValueAccessor {
 
   @Input() disabled: boolean;
 
@@ -41,25 +48,45 @@ export class DatetimePeriodComponent implements OnInit, ControlValueAccessor {
   @Input()
   appearance: MatFormFieldAppearance = 'fill';
 
-  modelValue: FixedWindow;
-
-  startDate: Date;
-  endDate: Date;
-
-  endTime: any;
+  private modelValue: FixedWindow;
 
   maxStartDate: Date;
-  minEndDate: Date;
   maxEndDate: Date;
 
-  changePending = false;
+  private maxStartDateTs: number;
+  private minEndDateTs: number;
+  private maxStartTs: number;
+  private maxEndTs: number;
 
-  private propagateChange = null;
+  private timeShiftMs = MINUTE;
 
-  constructor() {
-  }
+  dateTimePeriodFormGroup = this.fb.group({
+    startDate: this.fb.control<Date>(null),
+    endDate: this.fb.control<Date>(null)
+  });
+
+  private changePending = false;
 
-  ngOnInit(): void {
+  private propagateChange = null;
+
+  constructor(private fb: FormBuilder) {
+    this.dateTimePeriodFormGroup.valueChanges.pipe(
+      distinctUntilChanged((prevDateTimePeriod, dateTimePeriod) =>
+        prevDateTimePeriod.startDate === dateTimePeriod.startDate && prevDateTimePeriod.endDate === dateTimePeriod.endDate),
+      takeUntilDestroyed()
+    ).subscribe((dateTimePeriod: DateTimePeriod) => {
+      this.updateMinMaxDates(dateTimePeriod);
+      this.updateView();
+    });
+
+    this.dateTimePeriodFormGroup.get('startDate').valueChanges.pipe(
+      distinctUntilChanged(),
+      takeUntilDestroyed()
+    ).subscribe(startDate => this.onStartDateChange(startDate));
+    this.dateTimePeriodFormGroup.get('endDate').valueChanges.pipe(
+      distinctUntilChanged(),
+      takeUntilDestroyed()
+    ).subscribe(endDate => this.onEndDateChange(endDate));
   }
 
   registerOnChange(fn: any): void {
@@ -75,35 +102,38 @@ export class DatetimePeriodComponent implements OnInit, ControlValueAccessor {
 
   setDisabledState(isDisabled: boolean): void {
     this.disabled = isDisabled;
+    if (this.disabled) {
+      this.dateTimePeriodFormGroup.disable({emitEvent: false});
+    } else {
+      this.dateTimePeriodFormGroup.enable({emitEvent: false});
+    }
   }
 
   writeValue(datePeriod: FixedWindow): void {
     this.modelValue = datePeriod;
     if (this.modelValue) {
-      this.startDate = new Date(this.modelValue.startTimeMs);
-      this.endDate = new Date(this.modelValue.endTimeMs);
+      this.dateTimePeriodFormGroup.patchValue({
+        startDate: new Date(this.modelValue.startTimeMs),
+        endDate: new Date(this.modelValue.endTimeMs)
+      }, {emitEvent: false});
     } else {
       const date = new Date();
-      this.startDate = new Date(
-        date.getFullYear(),
-        date.getMonth(),
-        date.getDate() - 1,
-        date.getHours(),
-        date.getMinutes(),
-        date.getSeconds(),
-        date.getMilliseconds());
-      this.endDate = date;
+      this.dateTimePeriodFormGroup.patchValue({
+        startDate: new Date(date.getTime() - DAY),
+        endDate: date
+      }, {emitEvent: false});
       this.updateView();
     }
-    this.updateMinMaxDates();
+    this.updateMinMaxDates(this.dateTimePeriodFormGroup.value);
   }
 
-  updateView() {
+  private updateView() {
     let value: FixedWindow = null;
-    if (this.startDate && this.endDate) {
+    const dateTimePeriod = this.dateTimePeriodFormGroup.value;
+    if (dateTimePeriod.startDate && dateTimePeriod.endDate) {
       value = {
-        startTimeMs: this.startDate.getTime(),
-        endTimeMs: this.endDate.getTime()
+        startTimeMs: dateTimePeriod.startDate.getTime(),
+        endTimeMs: dateTimePeriod.endDate.getTime()
       };
     }
     this.modelValue = value;
@@ -114,32 +144,40 @@ export class DatetimePeriodComponent implements OnInit, ControlValueAccessor {
     }
   }
 
-  updateMinMaxDates() {
-    this.maxStartDate = new Date(this.endDate.getTime() - 1000);
-    this.minEndDate = new Date(this.startDate.getTime() + 1000);
+  private updateMinMaxDates(dateTimePeriod: Partial<DateTimePeriod>) {
     this.maxEndDate = new Date();
+    this.maxEndTs = this.maxEndDate.getTime();
+    this.maxStartTs = this.maxEndTs - this.timeShiftMs;
+    this.maxStartDate = new Date(this.maxStartTs);
+
+    if (dateTimePeriod.endDate) {
+      this.maxStartDateTs = dateTimePeriod.endDate.getTime() - this.timeShiftMs;
+    }
+    if (dateTimePeriod.startDate) {
+      this.minEndDateTs = dateTimePeriod.startDate.getTime() + this.timeShiftMs;
+    }
   }
 
-  onStartDateChange() {
-    if (this.startDate) {
-      if (this.startDate.getTime() > this.maxStartDate.getTime()) {
-        this.startDate = new Date(this.maxStartDate.getTime());
+  private onStartDateChange(startDate: Date) {
+    if (startDate) {
+      if (startDate.getTime() > this.maxStartTs) {
+        this.dateTimePeriodFormGroup.get('startDate').patchValue(new Date(this.maxStartTs), { emitEvent: false });
+      }
+      if (startDate.getTime() > this.maxStartDateTs) {
+        this.dateTimePeriodFormGroup.get('endDate').patchValue(new Date(startDate.getTime() + this.timeShiftMs), { emitEvent: false });
       }
-      this.updateMinMaxDates();
     }
-    this.updateView();
   }
 
-  onEndDateChange() {
-    if (this.endDate) {
-      if (this.endDate.getTime() < this.minEndDate.getTime()) {
-        this.endDate = new Date(this.minEndDate.getTime());
-      } else if (this.endDate.getTime() > this.maxEndDate.getTime()) {
-        this.endDate = new Date(this.maxEndDate.getTime());
+  private onEndDateChange(endDate: Date) {
+    if (endDate) {
+      if (endDate.getTime() > this.maxEndTs) {
+        this.dateTimePeriodFormGroup.get('endDate').patchValue(new Date(this.maxEndTs), { emitEvent: false });
+      }
+      if (endDate.getTime() < this.minEndDateTs) {
+        this.dateTimePeriodFormGroup.get('startDate').patchValue(new Date(endDate.getTime() - this.timeShiftMs), { emitEvent: false });
       }
-      this.updateMinMaxDates();
     }
-    this.updateView();
   }
 
 }
diff --git a/ui-ngx/src/app/shared/components/time/datetime.component.html b/ui-ngx/src/app/shared/components/time/datetime.component.html
index edf59702f1..f0965deaf8 100644
--- a/ui-ngx/src/app/shared/components/time/datetime.component.html
+++ b/ui-ngx/src/app/shared/components/time/datetime.component.html
@@ -15,26 +15,26 @@
     limitations under the License.
 
 -->
-<section class="flex flex-row items-start justify-start gap-4">
-  <mat-form-field>
-    <mat-label *ngIf="showLabel">{{ dateText | translate }}</mat-label>
-    <mat-datetimepicker-toggle [for]="datePicker" matPrefix></mat-datetimepicker-toggle>
-    <mat-datetimepicker #datePicker type="date" openOnFocus="true"></mat-datetimepicker>
-    <input [min]="minDateValue" [max]="maxDateValue"
-           [disabled]="disabled"
-           [required]="required"
-           matInput [(ngModel)]="date"
-           [matDatetimepicker]="datePicker" (ngModelChange)="onDateChange()">
-  </mat-form-field>
-  <mat-form-field>
-    <mat-label *ngIf="showLabel">{{ timeText | translate }}</mat-label>
-    <mat-datetimepicker-toggle [for]="timePicker" matPrefix></mat-datetimepicker-toggle>
-    <mat-datetimepicker #timePicker type="time" openOnFocus="true"></mat-datetimepicker>
-    <input [min]="minDateValue" [max]="maxDateValue"
-           [disabled]="disabled"
-           [required]="required"
-           matInput
-           [(ngModel)]="date"
-           [matDatetimepicker]="timePicker" (ngModelChange)="onDateChange()">
-  </mat-form-field>
-</section>
+<mat-form-field [class]="fieldClass"
+                [class.tb-datetime-field]="!fieldClass && type === 'datetime'"
+                [class.tb-date-field]="!fieldClass && type === 'date'"
+                [class.tb-time-field]="!fieldClass && type === 'time'"
+                [class.with-clear]="allowClear"
+                [subscriptSizing]="subscriptSizing" [appearance]="appearance" [floatLabel]="floatLabel">
+  <mat-label *ngIf="showLabel">{{ dateText }}</mat-label>
+  <div matSuffix class="mat-mdc-form-field-icon-suffix flex flex-row">
+    <button *ngIf="allowClear && date && !disabled"
+            type="button"
+            mat-icon-button aria-label="Clear"
+            (click)="clear($event)">
+      <mat-icon>close</mat-icon>
+    </button>
+    <mat-datetimepicker-toggle [for]="datePicker"></mat-datetimepicker-toggle>
+  </div>
+  <mat-datetimepicker #datePicker [type]="type" openOnFocus="true"></mat-datetimepicker>
+  <input [min]="minDateValue" [max]="maxDateValue"
+         [disabled]="disabled"
+         [required]="required"
+         matInput [(ngModel)]="date"
+         [matDatetimepicker]="datePicker" (ngModelChange)="onDateChange()">
+</mat-form-field>
diff --git a/ui-ngx/src/app/shared/components/time/datetime.component.scss b/ui-ngx/src/app/shared/components/time/datetime.component.scss
new file mode 100644
index 0000000000..b3333d34d5
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/time/datetime.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';
+
+:host-context(.tb-form-row) {
+  :host {
+    display: flex;
+  }
+  .mat-mdc-form-field {
+    &.tb-datetime-field {
+      width: 185px;
+      &.with-clear {
+        width: 225px;
+      }
+    }
+    &.tb-date-field {
+      width: 140px;
+      &.with-clear {
+        width: 180px;
+      }
+    }
+    &.tb-time-field {
+      width: 100px;
+      &.with-clear {
+        width: 140px;
+      }
+    }
+  }
+}
+
+:host-context(.tb-form-row.column-xs) {
+  @media #{$mat-xs} {
+    .mat-mdc-form-field {
+      &.tb-datetime-field, &.tb-date-field, &.tb-time-field {
+        width: auto;
+        flex: 1;
+      }
+    }
+  }
+}
+
+:host {
+  .mat-mdc-form-field-icon-suffix,
+  .mat-datetimepicker-toggle {
+    color: rgba(0, 0, 0, 0.38);
+  }
+}
diff --git a/ui-ngx/src/app/shared/components/time/datetime.component.ts b/ui-ngx/src/app/shared/components/time/datetime.component.ts
index c004ab3786..52029fb958 100644
--- a/ui-ngx/src/app/shared/components/time/datetime.component.ts
+++ b/ui-ngx/src/app/shared/components/time/datetime.component.ts
@@ -17,11 +17,14 @@
 import { Component, forwardRef, Input, OnInit } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
+import { FloatLabelType, MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
+import { MatDatetimepickerType } from '@mat-datetimepicker/core/datetimepicker/datetimepicker-type';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
   selector: 'tb-datetime',
   templateUrl: './datetime.component.html',
-  styleUrls: [],
+  styleUrls: ['./datetime.component.scss'],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
@@ -41,6 +44,18 @@ export class DatetimeComponent implements OnInit, ControlValueAccessor {
     this.requiredValue = coerceBooleanProperty(value);
   }
 
+  @Input()
+  floatLabel: FloatLabelType = 'auto';
+
+  @Input()
+  subscriptSizing: SubscriptSizing = 'fixed';
+
+  @Input()
+  appearance: MatFormFieldAppearance = 'fill';
+
+  @Input()
+  type: MatDatetimepickerType = 'datetime';
+
   @Input()
   disabled: boolean;
 
@@ -48,10 +63,15 @@ export class DatetimeComponent implements OnInit, ControlValueAccessor {
   dateText: string;
 
   @Input()
-  timeText: string;
+  @coerceBoolean()
+  showLabel = true;
 
   @Input()
-  showLabel = true;
+  @coerceBoolean()
+  allowClear = false;
+
+  @Input()
+  fieldClass: string;
 
   minDateValue: Date | null;
 
@@ -111,4 +131,10 @@ export class DatetimeComponent implements OnInit, ControlValueAccessor {
     this.updateView(value);
   }
 
+  clear($event: Event) {
+    $event.stopPropagation();
+    this.date = null;
+    this.updateView(null);
+  }
+
 }
diff --git a/ui-ngx/src/app/shared/components/value-input.component.html b/ui-ngx/src/app/shared/components/value-input.component.html
index e4aa511e83..e6138dd321 100644
--- a/ui-ngx/src/app/shared/components/value-input.component.html
+++ b/ui-ngx/src/app/shared/components/value-input.component.html
@@ -68,11 +68,16 @@
         warning
       </mat-icon>
     </mat-form-field>
-    <mat-chip-listbox *ngIf="valueType === valueTypeEnum.BOOLEAN" class="tb-boolean-input center-stretch flex-1"
-                      [disabled]="disabled" name="value" #value="ngModel" [(ngModel)]="modelValue" (ngModelChange)="onValueChanged()">
-      <mat-chip-option [selectable]="!modelValue" [value]="true">{{ trueLabel }}</mat-chip-option>
-      <mat-chip-option [selectable]="modelValue" [value]="false">{{ falseLabel }}</mat-chip-option>
-    </mat-chip-listbox>
+    <ng-container *ngIf="valueType === valueTypeEnum.BOOLEAN">
+      <mat-chip-listbox *ngIf="!shortBooleanField" class="tb-boolean-input center-stretch flex-1"
+                        [disabled]="disabled" name="value" #value="ngModel" [(ngModel)]="modelValue" (ngModelChange)="onValueChanged()">
+        <mat-chip-option [selectable]="!modelValue" [value]="true">{{ trueLabel }}</mat-chip-option>
+        <mat-chip-option [selectable]="modelValue" [value]="false">{{ falseLabel }}</mat-chip-option>
+      </mat-chip-listbox>
+      <mat-checkbox *ngIf="shortBooleanField" name="value" #value="ngModel" [disabled]="disabled" [(ngModel)]="modelValue" (ngModelChange)="onValueChanged()">
+        {{ modelValue ? trueLabel : falseLabel }}
+      </mat-checkbox>
+    </ng-container>
     <div *ngIf="valueType === valueTypeEnum.JSON" class="flex flex-1 flex-row items-center justify-start gap-2">
       <mat-form-field appearance="outline" subscriptSizing="dynamic" class="tb-inline-field tb-suffix-absolute flex flex-1">
         <input [disabled]="disabled" matInput tb-json-to-string required name="value" #value="ngModel"
diff --git a/ui-ngx/src/app/shared/components/value-input.component.ts b/ui-ngx/src/app/shared/components/value-input.component.ts
index 83b6a4d432..080f7151a7 100644
--- a/ui-ngx/src/app/shared/components/value-input.component.ts
+++ b/ui-ngx/src/app/shared/components/value-input.component.ts
@@ -36,6 +36,7 @@ import {
 import { BreakpointObserver } from '@angular/cdk/layout';
 import { Subscription } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 type Layout = 'column' | 'row';
 
@@ -67,12 +68,19 @@ export class ValueInputComponent implements OnInit, OnDestroy, OnChanges, Contro
   @Input()
   valueType: ValueType;
 
+  @Input()
+  allowedValueTypes: ValueType[];
+
   @Input()
   trueLabel: string;
 
   @Input()
   falseLabel: string;
 
+  @Input()
+  @coerceBoolean()
+  shortBooleanField = false;
+
   @Input()
   layout: ValueInputLayout | Layout = 'row';
 
@@ -110,6 +118,9 @@ export class ValueInputComponent implements OnInit, OnDestroy, OnChanges, Contro
     if (!this.falseLabel) {
       this.falseLabel = this.translate.instant('value.false');
     }
+    if (this.allowedValueTypes?.length) {
+      this.valueTypeKeys = this.allowedValueTypes;
+    }
     this._subscription = new Subscription();
     this.showValueType = !this.valueType;
     this.computedLayout = this._computeLayout();
diff --git a/ui-ngx/src/app/shared/import-export/import-dialog.component.html b/ui-ngx/src/app/shared/import-export/import-dialog.component.html
index c472fb2526..8bbe1599c4 100644
--- a/ui-ngx/src/app/shared/import-export/import-dialog.component.html
+++ b/ui-ngx/src/app/shared/import-export/import-dialog.component.html
@@ -15,7 +15,7 @@
     limitations under the License.
 
 -->
-<form [formGroup]="importFormGroup" (ngSubmit)="importFromJson()">
+<form [formGroup]="importFormGroup" (ngSubmit)="importFromJson()" style="width: 500px;">
   <mat-toolbar color="primary">
     <h2 translate>{{ importTitle }}</h2>
     <span class="flex-1"></span>
@@ -30,15 +30,28 @@
   <div mat-dialog-content>
     <fieldset [disabled]="isLoading$ | async">
       <div class="flex flex-1 flex-col">
-        <tb-file-input
+        <tb-toggle-select *ngIf="enableImportFromContent"
+                          class="flex-1"
+                          formControlName="importType">
+          <tb-toggle-option value="file">{{ importFileLabel | translate }}</tb-toggle-option>
+          <tb-toggle-option value="content">{{ importContentLabel | translate }}</tb-toggle-option>
+        </tb-toggle-select>
+        <tb-file-input *ngIf="importFormGroup.get('importType').value === 'file'"
           [contentConvertFunction]="loadDataFromJsonContent"
-          formControlName="jsonContent"
+          [existingFileName]="currentFileName"
+          (fileNameChanged)="currentFileName = $event"
+          formControlName="fileContent"
           required
           label="{{importFileLabel | translate}}"
           dropLabel="{{ 'import.drop-json-file-or' | translate }}"
           accept=".json,application/json"
           allowedExtensions="json">
         </tb-file-input>
+        <tb-json-object-edit *ngIf="importFormGroup.get('importType').value === 'content'"
+          formControlName="jsonContent"
+          jsonRequired
+          label="{{ importContentLabel | translate }}">
+        </tb-json-object-edit>
       </div>
     </fieldset>
   </div>
diff --git a/ui-ngx/src/app/shared/import-export/import-dialog.component.ts b/ui-ngx/src/app/shared/import-export/import-dialog.component.ts
index b68fe3b2cd..7e46f47978 100644
--- a/ui-ngx/src/app/shared/import-export/import-dialog.component.ts
+++ b/ui-ngx/src/app/shared/import-export/import-dialog.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, Inject, OnInit, SkipSelf } from '@angular/core';
+import { Component, DestroyRef, Inject, OnInit, SkipSelf } from '@angular/core';
 import { ErrorStateMatcher } from '@angular/material/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
@@ -23,10 +23,14 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, FormGroupDire
 import { Router } from '@angular/router';
 import { DialogComponent } from '@app/shared/components/dialog.component';
 import { ActionNotificationShow } from '@core/notification/notification.actions';
+import { isDefinedAndNotNull } from '@core/utils';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 export interface ImportDialogData {
   importTitle: string;
   importFileLabel: string;
+  enableImportFromContent?: boolean;
+  importContentLabel?: string;
 }
 
 @Component({
@@ -40,9 +44,13 @@ export class ImportDialogComponent extends DialogComponent<ImportDialogComponent
 
   importTitle: string;
   importFileLabel: string;
+  enableImportFromContent: boolean;
+  importContentLabel: string;
 
   importFormGroup: UntypedFormGroup;
 
+  currentFileName: string;
+
   submitted = false;
 
   constructor(protected store: Store<AppState>,
@@ -50,17 +58,26 @@ export class ImportDialogComponent extends DialogComponent<ImportDialogComponent
               @Inject(MAT_DIALOG_DATA) public data: ImportDialogData,
               @SkipSelf() private errorStateMatcher: ErrorStateMatcher,
               public dialogRef: MatDialogRef<ImportDialogComponent>,
+              private destroyRef: DestroyRef,
               private fb: UntypedFormBuilder) {
     super(store, router, dialogRef);
     this.importTitle = data.importTitle;
     this.importFileLabel = data.importFileLabel;
-
-    this.importFormGroup = this.fb.group({
-      jsonContent: [null, [Validators.required]]
-    });
+    this.enableImportFromContent = isDefinedAndNotNull(data.enableImportFromContent) ? data.enableImportFromContent : false;
+    this.importContentLabel = data.importContentLabel;
   }
 
   ngOnInit(): void {
+    this.importFormGroup = this.fb.group({
+      importType: ['file'],
+      fileContent: [null, [Validators.required]],
+      jsonContent: [{ value: null, disabled: true }, [Validators.required]]
+    });
+    this.importFormGroup.get('importType').valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe(() => {
+      this.importTypeChanged();
+    });
   }
 
   isErrorState(control: UntypedFormControl | null, form: FormGroupDirective | NgForm | null): boolean {
@@ -85,7 +102,19 @@ export class ImportDialogComponent extends DialogComponent<ImportDialogComponent
 
   importFromJson(): void {
     this.submitted = true;
-    const importData = this.importFormGroup.get('jsonContent').value;
+    const importType: 'file' | 'content' = this.importFormGroup.get('importType').value;
+    const importData = this.importFormGroup.get(importType === 'file' ? 'fileContent' : 'jsonContent').value;
     this.dialogRef.close(importData);
   }
+
+  private importTypeChanged() {
+    const importType: 'file' | 'content' = this.importFormGroup.get('importType').value;
+    if (importType === 'file') {
+      this.importFormGroup.get('fileContent').enable({emitEvent: false});
+      this.importFormGroup.get('jsonContent').disable({emitEvent: false});
+    } else {
+      this.importFormGroup.get('fileContent').disable({emitEvent: false});
+      this.importFormGroup.get('jsonContent').enable({emitEvent: false});
+    }
+  }
 }
diff --git a/ui-ngx/src/app/shared/import-export/import-export.service.ts b/ui-ngx/src/app/shared/import-export/import-export.service.ts
index 5b707d6399..229e09d54b 100644
--- a/ui-ngx/src/app/shared/import-export/import-export.service.ts
+++ b/ui-ngx/src/app/shared/import-export/import-export.service.ts
@@ -87,6 +87,7 @@ import {
   ExportResourceDialogData,
   ExportResourceDialogDialogResult
 } from '@shared/import-export/export-resource-dialog.component';
+import { FormProperty, propertyValid } from '@shared/models/dynamic-form.models';
 
 export type editMissingAliasesFunction = (widgets: Array<Widget>, isSingleWidget: boolean,
                                           customTitle: string, missingEntityAliases: EntityAliases) => Observable<EntityAliases>;
@@ -119,6 +120,27 @@ export class ImportExportService {
 
   }
 
+  public exportFormProperties(properties: FormProperty[], fileName: string) {
+    this.exportToPc(properties, fileName);
+  }
+
+  public importFormProperties(): Observable<FormProperty[]> {
+    return this.openImportDialog('dynamic-form.import-form',
+      'dynamic-form.json-file', true, 'dynamic-form.json-content').pipe(
+      map((properties: FormProperty[]) => {
+        if (!this.validateImportedFormProperties(properties)) {
+          this.store.dispatch(new ActionNotificationShow(
+            {message: this.translate.instant('dynamic-form.invalid-form-json-file-error'),
+              type: 'error'}));
+          throw new Error('Invalid form JSON file');
+        } else {
+          return properties;
+        }
+      }),
+      catchError(() => of(null))
+    );
+  }
+
   public exportImage(type: ImageResourceType, key: string) {
     this.imageService.exportImage(type, key).subscribe(
       {
@@ -790,7 +812,7 @@ export class ImportExportService {
   private processCSVCell(cellData: any): any {
     if (isString(cellData)) {
       let result = cellData.replace(/"/g, '""');
-      if (result.search(/([",\n])/g) >= 0) {
+      if (result.search(/([",;\n])/g) >= 0) {
         result = `"${result}"`;
       }
       return result;
@@ -927,6 +949,14 @@ export class ImportExportService {
         type: 'error'}));
   }
 
+  private validateImportedFormProperties(properties: FormProperty[]): boolean {
+    if (!properties.length) {
+      return false;
+    } else {
+      return !properties.some(p => !propertyValid(p));
+    }
+  }
+
   private validateImportedImage(image: ImageExportData): boolean {
     return !(!isNotEmptyStr(image.data)
       || !isNotEmptyStr(image.title)
@@ -1105,14 +1135,17 @@ export class ImportExportService {
     };
   }
 
-  private openImportDialog(importTitle: string, importFileLabel: string): Observable<any> {
+  private openImportDialog(importTitle: string, importFileLabel: string,
+                           enableImportFromContent = false, importContentLabel?: string): Observable<any> {
     return this.dialog.open<ImportDialogComponent, ImportDialogData,
       any>(ImportDialogComponent, {
       disableClose: true,
       panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
       data: {
         importTitle,
-        importFileLabel
+        importFileLabel,
+        enableImportFromContent,
+        importContentLabel
       }
     }).afterClosed().pipe(
       map((importedData) => {
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-utils.ts b/ui-ngx/src/app/shared/legacy/json-form-utils.ts
similarity index 70%
rename from ui-ngx/src/app/shared/components/json-form/react/json-form-utils.ts
rename to ui-ngx/src/app/shared/legacy/json-form-utils.ts
index d75819b73d..87e0afb31c 100644
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-utils.ts
+++ b/ui-ngx/src/app/shared/legacy/json-form-utils.ts
@@ -14,63 +14,12 @@
 /// limitations under the License.
 ///
 
-import * as tv from 'tv4';
 import ObjectPath from 'objectpath';
 import _ from 'lodash';
 import {
   DefaultsFormOptions,
-  FormOption,
-  JsonFormData,
-  JsonSchemaData,
-  SchemaValidationResult
+  FormOption
 } from './json-form.models';
-import { isDefined, isEqual, isString, isUndefined } from '@core/utils';
-
-function validateBySchema(schema: any, value: any): SchemaValidationResult {
-  return tv.validateResult(value, schema);
-}
-
-function validate(form: any, value: any): SchemaValidationResult {
-
-  if (!form) {
-    return {valid: true};
-  }
-  const schema = form.schema;
-
-  if (!schema) {
-    return {valid: true};
-  }
-
-  if (value === '') {
-    value = undefined;
-  }
-
-  // Numbers fields will give a null value, which also means empty field
-  if (form.type === 'number' && value === null) {
-    value = undefined;
-  }
-
-  if (form.type === 'number' && isNaN(parseFloat(value))) {
-    value = undefined;
-  }
-  const wrap: any = {type: 'object', properties: {}};
-  const propName = form.key[form.key.length - 1];
-  wrap.properties[propName] = schema;
-
-  if (form.required) {
-    wrap.required = [propName];
-  }
-  const valueWrap = {};
-  if (typeof value !== 'undefined') {
-    valueWrap[propName] = value;
-  }
-
-  const tv4Result: SchemaValidationResult = tv.validateResult(valueWrap, wrap);
-  if (tv4Result != null && !tv4Result.valid && form.validationMessage != null && typeof value !== 'undefined') {
-    tv4Result.error.message = form.validationMessage;
-  }
-  return tv4Result;
-}
 
 function stripNullType(type: any): string {
   if (Array.isArray(type) && type.length === 2) {
@@ -438,155 +387,7 @@ function merge(schema: any, form: any[], ignore: { [key: string]: boolean }, opt
   }));
 }
 
-function selectOrSet(projection: string | (string | number)[], obj: any, valueToSet?: any): any {
-  const numRe = /^\d+$/;
-
-  if (!obj) {
-    obj = this;
-  }
-  const parts = typeof projection === 'string' ? ObjectPath.parse(projection) : projection;
-
-  if (typeof valueToSet !== 'undefined' && parts.length === 1) {
-    obj[parts[0]] = valueToSet;
-    return obj;
-  }
-
-  if (typeof valueToSet !== 'undefined' && typeof obj[parts[0]] === 'undefined') {
-    obj[parts[0]] = parts.length > 2 && numRe.test(parts[1]) ? [] : {};
-  }
-
-  let value = obj[parts[0]];
-  for (let i = 1; i < parts.length; i++) {
-    if (parts[i] === '') {
-      return undefined;
-    }
-    if (typeof valueToSet !== 'undefined') {
-      if (i === parts.length - 1) {
-        value[parts[i]] = valueToSet;
-        return valueToSet;
-      } else {
-        let tmp = value[parts[i]];
-        if (typeof tmp === 'undefined' || tmp === null) {
-          tmp = numRe.test(parts[i + 1]) ? [] : {};
-          value[parts[i]] = tmp;
-        }
-        value = tmp;
-      }
-    } else if (value) {
-      value = value[parts[i]];
-    }
-  }
-  return value;
-}
-
-function updateValue(projection: string | (string | number)[], obj: any, valueToSet: any): boolean {
-  const numRe = /^\d+$/;
-
-  if (!obj) {
-    obj = this;
-  }
-
-  if (!obj) {
-    return false;
-  }
-
-  const parts: string[] = isString(projection) ? ObjectPath.parse(projection) : projection;
-
-  if (parts.length === 1) {
-    return setValue(obj, parts[0], valueToSet);
-  }
-
-  if (isUndefined(obj[parts[0]])) {
-    obj[parts[0]] = parts.length > 2 && numRe.test(parts[1]) ? [] : {};
-  }
-
-  let value = obj[parts[0]];
-  for (let i = 1; i < parts.length; i++) {
-    if (parts[i] === '') {
-      return false;
-    }
-    if (i === parts.length - 1) {
-      return setValue(value, parts[i], valueToSet);
-    } else {
-      let tmp = value[parts[i]];
-      if (isUndefined(tmp) || tmp === null) {
-        tmp = numRe.test(parts[i + 1]) ? [] : {};
-        value[parts[i]] = tmp;
-      }
-      value = tmp;
-    }
-  }
-  return value;
-}
-
-
-function setValue(obj: any, key: string, val: any): boolean {
-  let changed = false;
-  if (obj) {
-    if (isUndefined(val)) {
-      if (isDefined(obj[key])) {
-        delete obj[key];
-        changed = true;
-      }
-    } else {
-      changed = !isEqual(obj[key], val);
-      obj[key] = val;
-    }
-  }
-  return changed;
-}
-
-function traverseSchema(schema: JsonSchemaData, fn: (prop: any, path: string[]) => any, path?: string[], ignoreArrays?: boolean) {
-  ignoreArrays = typeof ignoreArrays !== 'undefined' ? ignoreArrays : true;
-
-  path = path || [];
-
-  const traverse = ($schema: JsonSchemaData, $fn: (prop: any, path: string[]) => any, $path: string[]) => {
-    $fn($schema, $path);
-    if ($schema.properties) {
-      for (const k of Object.keys($schema.properties)) {
-        if ($schema.properties.hasOwnProperty(k)) {
-          const currentPath = $path.slice();
-          currentPath.push(k);
-          traverse($schema.properties[k], $fn, currentPath);
-        }
-      }
-    }
-    if (!ignoreArrays && $schema.items) {
-      const arrPath = $path.slice();
-      arrPath.push('');
-      traverse($schema.items, $fn, arrPath);
-    }
-  };
-
-  traverse(schema, fn, path || []);
-}
-
-function traverseForm(form: JsonFormData, fn: (form: JsonFormData) => any) {
-  fn(form);
-  if (form.items) {
-    form.items.forEach((f) => {
-      traverseForm(f, fn);
-    });
-  }
-
-  if (form.tabs) {
-    form.tabs.forEach((tab) => {
-      tab.items.forEach((f) => {
-        traverseForm(f, fn);
-      });
-    });
-  }
-}
-
-
 const utils = {
-  validateBySchema,
-  validate,
-  merge,
-  updateValue,
-  selectOrSet,
-  traverseSchema,
-  traverseForm
+  merge
 };
 export default utils;
diff --git a/ui-ngx/src/app/shared/legacy/json-form.models.ts b/ui-ngx/src/app/shared/legacy/json-form.models.ts
new file mode 100644
index 0000000000..ffd2830133
--- /dev/null
+++ b/ui-ngx/src/app/shared/legacy/json-form.models.ts
@@ -0,0 +1,88 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 FormOption {
+  formDefaults?: {
+    startEmpty?: boolean;
+    readonly?: boolean;
+  };
+  supressPropertyTitles?: boolean;
+}
+
+export interface DefaultsFormOptions {
+  global?: FormOption;
+  required?: boolean;
+  path?: string[];
+  lookup?: {[key: string]: any};
+  ignore?: {[key: string]: boolean};
+}
+
+export interface KeyLabelItem {
+  key: string;
+  label: string;
+  value?: string;
+}
+
+export interface JsonSchemaData {
+  type: string;
+  default: any;
+  items?: JsonSchemaData;
+  properties?: any;
+}
+
+export interface JsonFormData {
+  type: string;
+  key: (string | number)[];
+  title: string;
+  readonly: boolean;
+  required: boolean;
+  default?: any;
+  condition?: string;
+  conditionFunction?: Function;
+  style?: any;
+  rows?: number;
+  rowsMax?: number;
+  placeholder?: string;
+  schema: JsonSchemaData;
+  titleMap: {
+    value: any;
+    name: string;
+  }[];
+  items?: Array<KeyLabelItem> | Array<JsonFormData>;
+  tabs?: Array<JsonFormData>;
+  tags?: any;
+  helpId?: string;
+  startEmpty?: boolean;
+  [key: string]: any;
+}
+
+export interface GroupInfo {
+  formIndex: number;
+  GroupTitle: string;
+}
+
+export interface JsonSchema {
+  type: string;
+  title?: string;
+  properties: {[key: string]: any};
+  required?: string[];
+}
+
+export interface JsonSettingsSchema {
+  schema?: JsonSchema;
+  form?: any[];
+  groupInfoes?: GroupInfo[];
+}
diff --git a/ui-ngx/src/app/shared/models/ace/widget-completion.models.ts b/ui-ngx/src/app/shared/models/ace/widget-completion.models.ts
index b2b0b6235d..d6a2c0a25f 100644
--- a/ui-ngx/src/app/shared/models/ace/widget-completion.models.ts
+++ b/ui-ngx/src/app/shared/models/ace/widget-completion.models.ts
@@ -128,614 +128,620 @@ export const timewindowCompletion: TbEditorCompletion = {
   }
 };
 
-export const widgetContextCompletions: TbEditorCompletions = {
-  ctx: {
-    description: 'A reference to widget context that has all necessary API<br>and data used by widget instance.',
-    meta: 'object',
-    type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L83" target="_blank">WidgetContext</a>',
-    children: {
-      ...{
-        $container: {
-          description: 'Container element of the widget.<br>Can be used to dynamically access or modify widget DOM using jQuery API.',
-          meta: 'property',
-          type: 'jQuery Object'
-        },
-        $scope: {
-          description: 'Reference to the current widget component.<br>Can be used to access/modify component properties when widget is built using Angular approach.',
-          meta: 'property',
-          type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L274" target="_blank">IDynamicWidgetComponent</a>'
-        },
-        width: {
-          description: 'Current width of widget container in pixels.',
-          meta: 'property',
-          type: 'number'
-        },
-        height: {
-          description: 'Current height of widget container in pixels.',
-          meta: 'property',
-          type: 'number'
-        },
-        isEdit: {
-          description: 'Indicates whether the dashboard is in in the view or editing state.',
-          meta: 'property',
-          type: 'boolean'
-        },
-        isMobile: {
-          description: 'Indicates whether the dashboard view is less then 960px width (default mobile breakpoint).',
-          meta: 'property',
-          type: 'boolean'
-        },
-        widgetConfig: {
-          description: 'Common widget configuration containing properties such as <code>color</code> (text color), <code>backgroundColor</code> (widget background color), etc.',
-          meta: 'property',
-          type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L341" target="_blank">WidgetConfig</a>',
-          children: {
-            title: {
-              description: 'Widget title.',
-              meta: 'property',
-              type: 'string'
-            },
-            titleIcon: {
-              description: 'Widget title icon.',
-              meta: 'property',
-              type: 'string'
-            },
-            showTitle: {
-              description: 'Whether to show widget title.',
-              meta: 'property',
-              type: 'boolean'
-            },
-            showTitleIcon: {
-              description: 'Whether to show widget title icon.',
-              meta: 'property',
-              type: 'boolean'
-            },
-            iconColor: {
-              description: 'Widget title icon color.',
-              meta: 'property',
-              type: 'string'
-            },
-            iconSize: {
-              description: 'Widget title icon size.',
-              meta: 'property',
-              type: 'string'
-            },
-            titleTooltip: {
-              description: 'Widget title tooltip content.',
-              meta: 'property',
-              type: 'string'
-            },
-            dropShadow: {
-              description: 'Enable/disable widget card shadow.',
-              meta: 'property',
-              type: 'boolean'
-            },
-            enableFullscreen: {
-              description: 'Whether to enable fullscreen button on widget.',
-              meta: 'property',
-              type: 'boolean'
-            },
-            useDashboardTimewindow: {
-              description: 'Whether to use dashboard timewindow (applicable for timeseries widgets).',
-              meta: 'property',
-              type: 'boolean'
-            },
-            displayTimewindow: {
-              description: 'Whether to display timewindow (applicable for timeseries widgets).',
-              meta: 'property',
-              type: 'boolean'
-            },
-            showLegend: {
-              description: 'Whether to show legend.',
-              meta: 'property',
-              type: 'boolean'
-            },
-            legendConfig: {
-              description: 'Legend configuration.',
-              meta: 'property',
-              type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L198" target="_blank">LegendConfig</a>',
-              children: {
-                position: {
-                  description: 'Legend position. Possible values: <code>\'top\', \'bottom\', \'left\', \'right\'</code>',
-                  meta: 'property',
-                  type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L182" target="_blank">LegendPosition</a>',
-                },
-                direction: {
-                  description: 'Legend direction. Possible values: <code>\'column\', \'row\'</code>',
-                  meta: 'property',
-                  type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L170" target="_blank">LegendDirection</a>',
-                },
-                showMin: {
-                  description: 'Whether to display aggregated min values.',
-                  meta: 'property',
-                  type: 'boolean',
-                },
-                showMax: {
-                  description: 'Whether to display aggregated max values.',
-                  meta: 'property',
-                  type: 'boolean',
-                },
-                showAvg: {
-                  description: 'Whether to display aggregated average values.',
-                  meta: 'property',
-                  type: 'boolean',
-                },
-                showTotal: {
-                  description: 'Whether to display aggregated total values.',
-                  meta: 'property',
-                  type: 'boolean',
+export const widgetContextCompletionsWithSettings = (settingsCompletions?: TbEditorCompletions): TbEditorCompletions => {
+  return {
+    ctx: {
+      description: 'A reference to widget context that has all necessary API<br>and data used by widget instance.',
+      meta: 'object',
+      type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L83" target="_blank">WidgetContext</a>',
+      children: {
+        ...{
+          $container: {
+            description: 'Container element of the widget.<br>Can be used to dynamically access or modify widget DOM using jQuery API.',
+            meta: 'property',
+            type: 'jQuery Object'
+          },
+          $scope: {
+            description: 'Reference to the current widget component.<br>Can be used to access/modify component properties when widget is built using Angular approach.',
+            meta: 'property',
+            type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/modules/home/models/widget-component.models.ts#L274" target="_blank">IDynamicWidgetComponent</a>'
+          },
+          width: {
+            description: 'Current width of widget container in pixels.',
+            meta: 'property',
+            type: 'number'
+          },
+          height: {
+            description: 'Current height of widget container in pixels.',
+            meta: 'property',
+            type: 'number'
+          },
+          isEdit: {
+            description: 'Indicates whether the dashboard is in in the view or editing state.',
+            meta: 'property',
+            type: 'boolean'
+          },
+          isMobile: {
+            description: 'Indicates whether the dashboard view is less then 960px width (default mobile breakpoint).',
+            meta: 'property',
+            type: 'boolean'
+          },
+          widgetConfig: {
+            description: 'Common widget configuration containing properties such as <code>color</code> (text color), <code>backgroundColor</code> (widget background color), etc.',
+            meta: 'property',
+            type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L341" target="_blank">WidgetConfig</a>',
+            children: {
+              title: {
+                description: 'Widget title.',
+                meta: 'property',
+                type: 'string'
+              },
+              titleIcon: {
+                description: 'Widget title icon.',
+                meta: 'property',
+                type: 'string'
+              },
+              showTitle: {
+                description: 'Whether to show widget title.',
+                meta: 'property',
+                type: 'boolean'
+              },
+              showTitleIcon: {
+                description: 'Whether to show widget title icon.',
+                meta: 'property',
+                type: 'boolean'
+              },
+              iconColor: {
+                description: 'Widget title icon color.',
+                meta: 'property',
+                type: 'string'
+              },
+              iconSize: {
+                description: 'Widget title icon size.',
+                meta: 'property',
+                type: 'string'
+              },
+              titleTooltip: {
+                description: 'Widget title tooltip content.',
+                meta: 'property',
+                type: 'string'
+              },
+              dropShadow: {
+                description: 'Enable/disable widget card shadow.',
+                meta: 'property',
+                type: 'boolean'
+              },
+              enableFullscreen: {
+                description: 'Whether to enable fullscreen button on widget.',
+                meta: 'property',
+                type: 'boolean'
+              },
+              useDashboardTimewindow: {
+                description: 'Whether to use dashboard timewindow (applicable for timeseries widgets).',
+                meta: 'property',
+                type: 'boolean'
+              },
+              displayTimewindow: {
+                description: 'Whether to display timewindow (applicable for timeseries widgets).',
+                meta: 'property',
+                type: 'boolean'
+              },
+              showLegend: {
+                description: 'Whether to show legend.',
+                meta: 'property',
+                type: 'boolean'
+              },
+              legendConfig: {
+                description: 'Legend configuration.',
+                meta: 'property',
+                type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L198" target="_blank">LegendConfig</a>',
+                children: {
+                  position: {
+                    description: 'Legend position. Possible values: <code>\'top\', \'bottom\', \'left\', \'right\'</code>',
+                    meta: 'property',
+                    type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L182" target="_blank">LegendPosition</a>',
+                  },
+                  direction: {
+                    description: 'Legend direction. Possible values: <code>\'column\', \'row\'</code>',
+                    meta: 'property',
+                    type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L170" target="_blank">LegendDirection</a>',
+                  },
+                  showMin: {
+                    description: 'Whether to display aggregated min values.',
+                    meta: 'property',
+                    type: 'boolean',
+                  },
+                  showMax: {
+                    description: 'Whether to display aggregated max values.',
+                    meta: 'property',
+                    type: 'boolean',
+                  },
+                  showAvg: {
+                    description: 'Whether to display aggregated average values.',
+                    meta: 'property',
+                    type: 'boolean',
+                  },
+                  showTotal: {
+                    description: 'Whether to display aggregated total values.',
+                    meta: 'property',
+                    type: 'boolean',
+                  }
                 }
+              },
+              timewindow: timewindowCompletion,
+              mobileHeight: {
+                description: 'Widget height in mobile mode.',
+                meta: 'property',
+                type: 'number'
+              },
+              mobileOrder: {
+                description: 'Widget order in mobile mode.',
+                meta: 'property',
+                type: 'number'
+              },
+              color: {
+                description: 'Widget text color.',
+                meta: 'property',
+                type: 'string'
+              },
+              backgroundColor: {
+                description: 'Widget background color.',
+                meta: 'property',
+                type: 'string'
+              },
+              padding: {
+                description: 'Widget card padding.',
+                meta: 'property',
+                type: 'string'
+              },
+              margin: {
+                description: 'Widget card margin.',
+                meta: 'property',
+                type: 'string'
+              },
+              widgetStyle: {
+                description: 'Widget element style object.',
+                meta: 'property',
+                type: 'object'
+              },
+              titleStyle: {
+                description: 'Widget title element style object.',
+                meta: 'property',
+                type: 'object'
+              },
+              units: {
+                description: 'Optional property defining units text of values displayed by widget. Useful for simple widgets like cards or gauges.',
+                meta: 'property',
+                type: 'string'
+              },
+              decimals: {
+                description: 'Optional property defining how many positions should be used to display decimal part of the value number.',
+                meta: 'property',
+                type: 'number'
+              },
+              actions: {
+                description: 'Map of configured widget actions.',
+                meta: 'property',
+                type: 'object'
+              },
+              settings: {
+                description: 'Widget settings containing widget specific properties according to the defined settings form.',
+                meta: 'property',
+                type: 'object',
+                children: settingsCompletions
+              },
+              alarmSource: {
+                description: 'Configured alarm source for alarm widget type.',
+                meta: 'property',
+                type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L250" target="_blank">Datasource</a>'
+              },
+              alarmSearchStatus: {
+                description: 'Configured default alarm search status for alarm widget type.',
+                meta: 'property',
+                type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/alarm.models.ts#L41" target="_blank">AlarmSearchStatus</a>'
+              },
+              alarmsPollingInterval: {
+                description: 'Configured alarms polling interval for alarm widget type.',
+                meta: 'property',
+                type: 'number'
+              },
+              alarmsMaxCountLoad: {
+                description: 'Configured maximum alarms to load for alarm widget type.',
+                meta: 'property',
+                type: 'number'
+              },
+              alarmsFetchSize: {
+                description: 'Configured alarms page size used to load alarms.',
+                meta: 'property',
+                type: 'number'
+              },
+              datasources: {
+                description: 'Array of configured widget datasources.',
+                meta: 'property',
+                type: 'Array&lt;<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L250" target="_blank">Datasource</a>&gt;'
               }
-            },
-            timewindow: timewindowCompletion,
-            mobileHeight: {
-              description: 'Widget height in mobile mode.',
-              meta: 'property',
-              type: 'number'
-            },
-            mobileOrder: {
-              description: 'Widget order in mobile mode.',
-              meta: 'property',
-              type: 'number'
-            },
-            color: {
-              description: 'Widget text color.',
-              meta: 'property',
-              type: 'string'
-            },
-            backgroundColor: {
-              description: 'Widget background color.',
-              meta: 'property',
-              type: 'string'
-            },
-            padding: {
-              description: 'Widget card padding.',
-              meta: 'property',
-              type: 'string'
-            },
-            margin: {
-              description: 'Widget card margin.',
-              meta: 'property',
-              type: 'string'
-            },
-            widgetStyle: {
-              description: 'Widget element style object.',
-              meta: 'property',
-              type: 'object'
-            },
-            titleStyle: {
-              description: 'Widget title element style object.',
-              meta: 'property',
-              type: 'object'
-            },
-            units: {
-              description: 'Optional property defining units text of values displayed by widget. Useful for simple widgets like cards or gauges.',
-              meta: 'property',
-              type: 'string'
-            },
-            decimals: {
-              description: 'Optional property defining how many positions should be used to display decimal part of the value number.',
-              meta: 'property',
-              type: 'number'
-            },
-            actions: {
-              description: 'Map of configured widget actions.',
-              meta: 'property',
-              type: 'object'
-            },
-            settings: {
-              description: 'Object holding widget settings according to widget type.',
-              meta: 'property',
-              type: 'object'
-            },
-            alarmSource: {
-              description: 'Configured alarm source for alarm widget type.',
-              meta: 'property',
-              type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L250" target="_blank">Datasource</a>'
-            },
-            alarmSearchStatus: {
-              description: 'Configured default alarm search status for alarm widget type.',
-              meta: 'property',
-              type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/alarm.models.ts#L41" target="_blank">AlarmSearchStatus</a>'
-            },
-            alarmsPollingInterval: {
-              description: 'Configured alarms polling interval for alarm widget type.',
-              meta: 'property',
-              type: 'number'
-            },
-            alarmsMaxCountLoad: {
-              description: 'Configured maximum alarms to load for alarm widget type.',
-              meta: 'property',
-              type: 'number'
-            },
-            alarmsFetchSize: {
-              description: 'Configured alarms page size used to load alarms.',
-              meta: 'property',
-              type: 'number'
-            },
-            datasources: {
-              description: 'Array of configured widget datasources.',
-              meta: 'property',
-              type: 'Array&lt;<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L250" target="_blank">Datasource</a>&gt;'
             }
-          }
-        },
-        settings: {
-          description: 'Widget settings containing widget specific properties according to the defined <a href="https://thingsboard.io/docs/user-guide/contribution/widgets-development/#settings-schema-section" target="_blank">settings json schema</a>',
-          meta: 'property',
-          type: 'object'
-        },
-        datasources: {
-          description: 'Array of resolved widget datasources.',
-          meta: 'property',
-          type: 'Array&lt;<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L250" target="_blank">Datasource</a>&gt;'
-        },
-        data: {
-          description: 'Array of latest datasources data.',
-          meta: 'property',
-          type: 'Array&lt;<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L275" target="_blank">DatasourceData</a>&gt;'
-        },
-        timeWindow: {
-          description: 'Current widget timewindow (applicable for timeseries widgets).',
-          meta: 'property',
-          type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/time/time.models.ts#L104" target="_blank">WidgetTimewindow</a>'
-        },
-        units: {
-          description: 'Optional property defining units text of values displayed by widget. Useful for simple widgets like cards or gauges.',
-          meta: 'property',
-          type: 'string'
-        },
-        decimals: {
-          description: 'Optional property defining how many positions should be used to display decimal part of the value number.',
-          meta: 'property',
-          type: 'number'
-        },
-        currentUser: {
-          description: 'Current user object.',
-          meta: 'property',
-          type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/user.model.ts#L45" target="_blank">AuthUser</a>',
-          children: {
-            sub: {
-              description: 'User subject (email).',
-              meta: 'property',
-              type: 'string'
-            },
-            scopes: {
-              description: 'User security scopes.',
-              meta: 'property',
-              type: 'Array<string>'
-            },
-            userId: {
-              description: 'User id.',
-              meta: 'property',
-              type: 'string'
-            },
-            firstName: {
-              description: 'User first name.',
-              meta: 'property',
-              type: 'string'
-            },
-            lastName: {
-              description: 'User last name.',
-              meta: 'property',
-              type: 'string'
-            },
-            enabled: {
-              description: 'Whether is user enabled.',
-              meta: 'property',
-              type: 'boolean'
-            },
-            tenantId: {
-              description: 'Tenant id of the user.',
-              meta: 'property',
-              type: 'string'
-            },
-            customerId: {
-              description: 'Customer id of the user (available when user belongs to specific customer).',
-              meta: 'property',
-              type: 'string'
-            },
-            isPublic: {
-              description: 'Special flag indicating public user.',
-              meta: 'property',
-              type: 'boolean'
-            },
-            authority: {
-              description: 'User authority. Possible values: SYS_ADMIN, TENANT_ADMIN, CUSTOMER_USER',
-              meta: 'property',
-              type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/authority.enum.ts#L17" target="_blank">Authority</a>'
+          },
+          settings: {
+            description: 'Widget settings containing widget specific properties according to the defined settings form.',
+            meta: 'property',
+            type: 'object',
+            children: settingsCompletions
+          },
+          datasources: {
+            description: 'Array of resolved widget datasources.',
+            meta: 'property',
+            type: 'Array&lt;<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L250" target="_blank">Datasource</a>&gt;'
+          },
+          data: {
+            description: 'Array of latest datasources data.',
+            meta: 'property',
+            type: 'Array&lt;<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L275" target="_blank">DatasourceData</a>&gt;'
+          },
+          timeWindow: {
+            description: 'Current widget timewindow (applicable for timeseries widgets).',
+            meta: 'property',
+            type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/time/time.models.ts#L104" target="_blank">WidgetTimewindow</a>'
+          },
+          units: {
+            description: 'Optional property defining units text of values displayed by widget. Useful for simple widgets like cards or gauges.',
+            meta: 'property',
+            type: 'string'
+          },
+          decimals: {
+            description: 'Optional property defining how many positions should be used to display decimal part of the value number.',
+            meta: 'property',
+            type: 'number'
+          },
+          currentUser: {
+            description: 'Current user object.',
+            meta: 'property',
+            type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/user.model.ts#L45" target="_blank">AuthUser</a>',
+            children: {
+              sub: {
+                description: 'User subject (email).',
+                meta: 'property',
+                type: 'string'
+              },
+              scopes: {
+                description: 'User security scopes.',
+                meta: 'property',
+                type: 'Array<string>'
+              },
+              userId: {
+                description: 'User id.',
+                meta: 'property',
+                type: 'string'
+              },
+              firstName: {
+                description: 'User first name.',
+                meta: 'property',
+                type: 'string'
+              },
+              lastName: {
+                description: 'User last name.',
+                meta: 'property',
+                type: 'string'
+              },
+              enabled: {
+                description: 'Whether is user enabled.',
+                meta: 'property',
+                type: 'boolean'
+              },
+              tenantId: {
+                description: 'Tenant id of the user.',
+                meta: 'property',
+                type: 'string'
+              },
+              customerId: {
+                description: 'Customer id of the user (available when user belongs to specific customer).',
+                meta: 'property',
+                type: 'string'
+              },
+              isPublic: {
+                description: 'Special flag indicating public user.',
+                meta: 'property',
+                type: 'boolean'
+              },
+              authority: {
+                description: 'User authority. Possible values: SYS_ADMIN, TENANT_ADMIN, CUSTOMER_USER',
+                meta: 'property',
+                type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/authority.enum.ts#L17" target="_blank">Authority</a>'
+              }
             }
-          }
-        },
-        hideTitlePanel: {
-          description: 'Manages visibility of widget title panel. Useful for widget with custom title panels or different states. <b>updateWidgetParams()</b> function must be called after this property change.',
-          meta: 'property',
-          type: 'boolean'
-        },
-        widgetTitle: {
-          description: 'If set, will override configured widget title text. <b>updateWidgetParams()</b> function must be called after this property change.',
-          meta: 'property',
-          type: 'string'
-        },
-        detectChanges: {
-          description: 'Trigger change detection for current widget. Must be invoked when widget HTML template bindings should be updated due to widget data changes.',
-          meta: 'function'
-        },
-        updateWidgetParams: {
-          description: 'Updates widget with runtime set properties such as <b>widgetTitle</b>, <b>hideTitlePanel</b>, etc. Must be invoked in order these properties changes take effect.',
-          meta: 'function'
-        },
-        defaultSubscription: {
-          description: 'Default widget subscription object contains all subscription information,<br>including current data, according to the widget type.',
-          meta: 'property',
-          type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L220" target="_blank">IWidgetSubscription</a>'
-        },
-        timewindowFunctions: {
-          description: 'Object with timewindow functions used to manage widget data time frame. Can by used by Time-series or Alarm widgets.',
-          meta: 'property',
-          type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L45" target="_blank">TimewindowFunctions</a>',
-          children: {
-            onUpdateTimewindow: {
-              description: 'This function can be used to update current subscription time frame<br>to historical one identified by <code>startTimeMs</code> and <code>endTimeMs</code> arguments.',
-              meta: 'function',
-              args: [
-                {
-                  name: 'startTimeMs',
-                  description: 'Timewindow start time in UTC milliseconds',
-                  type: 'number'
-                },
-                {
-                  name: 'endTimeMs',
-                  description: 'Timewindow end time in UTC milliseconds',
-                  type: 'number'
-                }
-              ]
-            },
-            onResetTimewindow: {
-              description: 'Resets subscription time frame to default defined by widget timewindow component<br>or dashboard timewindow depending on widget settings.',
-              meta: 'function'
+          },
+          hideTitlePanel: {
+            description: 'Manages visibility of widget title panel. Useful for widget with custom title panels or different states. <b>updateWidgetParams()</b> function must be called after this property change.',
+            meta: 'property',
+            type: 'boolean'
+          },
+          widgetTitle: {
+            description: 'If set, will override configured widget title text. <b>updateWidgetParams()</b> function must be called after this property change.',
+            meta: 'property',
+            type: 'string'
+          },
+          detectChanges: {
+            description: 'Trigger change detection for current widget. Must be invoked when widget HTML template bindings should be updated due to widget data changes.',
+            meta: 'function'
+          },
+          updateWidgetParams: {
+            description: 'Updates widget with runtime set properties such as <b>widgetTitle</b>, <b>hideTitlePanel</b>, etc. Must be invoked in order these properties changes take effect.',
+            meta: 'function'
+          },
+          defaultSubscription: {
+            description: 'Default widget subscription object contains all subscription information,<br>including current data, according to the widget type.',
+            meta: 'property',
+            type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L220" target="_blank">IWidgetSubscription</a>'
+          },
+          timewindowFunctions: {
+            description: 'Object with timewindow functions used to manage widget data time frame. Can by used by Time-series or Alarm widgets.',
+            meta: 'property',
+            type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L45" target="_blank">TimewindowFunctions</a>',
+            children: {
+              onUpdateTimewindow: {
+                description: 'This function can be used to update current subscription time frame<br>to historical one identified by <code>startTimeMs</code> and <code>endTimeMs</code> arguments.',
+                meta: 'function',
+                args: [
+                  {
+                    name: 'startTimeMs',
+                    description: 'Timewindow start time in UTC milliseconds',
+                    type: 'number'
+                  },
+                  {
+                    name: 'endTimeMs',
+                    description: 'Timewindow end time in UTC milliseconds',
+                    type: 'number'
+                  }
+                ]
+              },
+              onResetTimewindow: {
+                description: 'Resets subscription time frame to default defined by widget timewindow component<br>or dashboard timewindow depending on widget settings.',
+                meta: 'function'
+              }
             }
-          }
-        },
-        controlApi: {
-          description: 'Object that provides API functions for RPC (Control) widgets.',
-          meta: 'property',
-          type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L58" target="_blank">RpcApi</a>',
-          children: {
-            sendOneWayCommand: {
-              description: 'Sends one way (without response) RPC command to the device.',
-              meta: 'function',
-              args: [
-                {
-                  name: 'method',
-                  description: 'RPC method name',
-                  type: 'string'
-                },
-                {
-                  name: 'params',
-                  description: 'RPC method params, custom json object',
-                  type: 'object',
-                  optional: true
-                },
-                {
-                  name: 'timeout',
-                  description: 'Maximum delay in milliseconds to wait until response/acknowledgement is received.',
-                  type: 'number',
-                  optional: true
-                },
-                {
-                  name: 'persistent',
-                  description: 'RPC request persistent',
-                  type: 'boolean',
-                  optional: true
-                },
-                {
-                  name: 'persistentPollingInterval',
-                  description: 'Polling interval in milliseconds to get persistent RPC command response',
-                  type: 'number',
-                  optional: true
+          },
+          controlApi: {
+            description: 'Object that provides API functions for RPC (Control) widgets.',
+            meta: 'property',
+            type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L58" target="_blank">RpcApi</a>',
+            children: {
+              sendOneWayCommand: {
+                description: 'Sends one way (without response) RPC command to the device.',
+                meta: 'function',
+                args: [
+                  {
+                    name: 'method',
+                    description: 'RPC method name',
+                    type: 'string'
+                  },
+                  {
+                    name: 'params',
+                    description: 'RPC method params, custom json object',
+                    type: 'object',
+                    optional: true
+                  },
+                  {
+                    name: 'timeout',
+                    description: 'Maximum delay in milliseconds to wait until response/acknowledgement is received.',
+                    type: 'number',
+                    optional: true
+                  },
+                  {
+                    name: 'persistent',
+                    description: 'RPC request persistent',
+                    type: 'boolean',
+                    optional: true
+                  },
+                  {
+                    name: 'persistentPollingInterval',
+                    description: 'Polling interval in milliseconds to get persistent RPC command response',
+                    type: 'number',
+                    optional: true
+                  }
+                ],
+                return: {
+                  description: 'A command execution Observable.',
+                  type: 'Observable&lt;any&gt;'
                 }
-              ],
-              return: {
-                description: 'A command execution Observable.',
-                type: 'Observable&lt;any&gt;'
-              }
-            },
-            sendTwoWayCommand: {
-              description: 'Sends two way (with response) RPC command to the device.',
-              meta: 'function',
-              args: [
-                {
-                  name: 'method',
-                  description: 'RPC method name',
-                  type: 'string'
-                },
-                {
-                  name: 'params',
-                  description: 'RPC method params, custom json object',
-                  type: 'object',
-                  optional: true
-                },
-                {
-                  name: 'timeout',
-                  description: 'Maximum delay in milliseconds to wait until response/acknowledgement is received.',
-                  type: 'number',
-                  optional: true
-                },
-                {
-                  name: 'persistent',
-                  description: 'RPC request persistent',
-                  type: 'boolean',
-                  optional: true
-                },
-                {
-                  name: 'persistentPollingInterval',
-                  description: 'Polling interval in milliseconds to get persistent RPC command response',
-                  type: 'number',
-                  optional: true
+              },
+              sendTwoWayCommand: {
+                description: 'Sends two way (with response) RPC command to the device.',
+                meta: 'function',
+                args: [
+                  {
+                    name: 'method',
+                    description: 'RPC method name',
+                    type: 'string'
+                  },
+                  {
+                    name: 'params',
+                    description: 'RPC method params, custom json object',
+                    type: 'object',
+                    optional: true
+                  },
+                  {
+                    name: 'timeout',
+                    description: 'Maximum delay in milliseconds to wait until response/acknowledgement is received.',
+                    type: 'number',
+                    optional: true
+                  },
+                  {
+                    name: 'persistent',
+                    description: 'RPC request persistent',
+                    type: 'boolean',
+                    optional: true
+                  },
+                  {
+                    name: 'persistentPollingInterval',
+                    description: 'Polling interval in milliseconds to get persistent RPC command response',
+                    type: 'number',
+                    optional: true
+                  }
+                ],
+                return: {
+                  description: 'A command execution Observable of response body.',
+                  type: 'Observable&lt;any&gt;'
                 }
-              ],
-              return: {
-                description: 'A command execution Observable of response body.',
-                type: 'Observable&lt;any&gt;'
               }
             }
-          }
-        },
-        actionsApi: {
-          description: 'Set of API functions to work with user defined actions.',
-          meta: 'property',
-          type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L67" target="_blank">WidgetActionsApi</a>',
-          children: {
-            getActionDescriptors: {
-              description: 'Get list of action descriptors for provided <code>actionSourceId</code>.',
-              meta: 'function',
-              args: [
-                {
-                  name: 'actionSourceId',
-                  description: 'Id of widget action source',
-                  type: 'string'
+          },
+          actionsApi: {
+            description: 'Set of API functions to work with user defined actions.',
+            meta: 'property',
+            type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L67" target="_blank">WidgetActionsApi</a>',
+            children: {
+              getActionDescriptors: {
+                description: 'Get list of action descriptors for provided <code>actionSourceId</code>.',
+                meta: 'function',
+                args: [
+                  {
+                    name: 'actionSourceId',
+                    description: 'Id of widget action source',
+                    type: 'string'
+                  }
+                ],
+                return: {
+                  description: 'The list of action descriptors',
+                  type: 'Array&lt;<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L323" target="_blank">WidgetActionDescriptor</a>&gt;'
                 }
-              ],
-              return: {
-                description: 'The list of action descriptors',
-                type: 'Array&lt;<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L323" target="_blank">WidgetActionDescriptor</a>&gt;'
+              },
+              handleWidgetAction: {
+                description: 'Handle action produced by particular action source.',
+                meta: 'function',
+                args: [
+                  {
+                    name: '$event',
+                    description: 'DOM event object associated with action.',
+                    type: 'Event'
+                  },
+                  {
+                    name: 'descriptor',
+                    description: 'An action descriptor.',
+                    type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L323" target="_blank">WidgetActionDescriptor</a>'
+                  },
+                  {
+                    name: 'entityId',
+                    description: 'Current entity id provided by action source if available.',
+                    type: entityIdHref,
+                    optional: true
+                  },
+                  {
+                    name: 'entityName',
+                    description: 'Current entity name provided by action source if available.',
+                    type: 'string',
+                    optional: true
+                  }
+                ]
               }
-            },
-            handleWidgetAction: {
-              description: 'Handle action produced by particular action source.',
-              meta: 'function',
-              args: [
-                {
-                  name: '$event',
-                  description: 'DOM event object associated with action.',
-                  type: 'Event'
-                },
-                {
-                  name: 'descriptor',
-                  description: 'An action descriptor.',
-                  type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/widget.models.ts#L323" target="_blank">WidgetActionDescriptor</a>'
-                },
-                {
-                  name: 'entityId',
-                  description: 'Current entity id provided by action source if available.',
-                  type: entityIdHref,
-                  optional: true
-                },
-                {
-                  name: 'entityName',
-                  description: 'Current entity name provided by action source if available.',
-                  type: 'string',
-                  optional: true
-                }
-              ]
             }
-          }
-        },
-        stateController: {
-          description: 'Reference to Dashboard state controller, providing API to manage current dashboard state.',
-          meta: 'property',
-          type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L121" target="_blank">IStateController</a>',
-          children: {
-            openState: {
-              description: 'Navigate to new dashboard state.',
-              meta: 'function',
-              args: [
-                {
-                  name: 'id',
-                  description: 'An id of the target dashboard state.',
+          },
+          stateController: {
+            description: 'Reference to Dashboard state controller, providing API to manage current dashboard state.',
+            meta: 'property',
+            type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L121" target="_blank">IStateController</a>',
+            children: {
+              openState: {
+                description: 'Navigate to new dashboard state.',
+                meta: 'function',
+                args: [
+                  {
+                    name: 'id',
+                    description: 'An id of the target dashboard state.',
+                    type: 'string'
+                  },
+                  {
+                    name: 'params',
+                    description: 'An object with state parameters to use by the new state.',
+                    type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L111" target="_blank">StateParams</a>',
+                    optional: true
+                  },
+                  {
+                    name: 'openRightLayout',
+                    description: 'An optional boolean argument to force open right dashboard layout if present in mobile view mode.',
+                    type: 'boolean',
+                    optional: true
+                  }
+                ]
+              },
+              pushAndOpenState: {
+                description: 'Navigate to new dashboard state and adding intermediate states.',
+                meta: 'function',
+                args: [
+                  {
+                    name: 'id',
+                    description: 'An array state object of the target dashboard state.',
+                    type: 'Array <a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L140" target="_blank">StateObject</a>',
+                  },
+                  {
+                    name: 'openRightLayout',
+                    description: 'An optional boolean argument to force open right dashboard layout if present in mobile view mode.',
+                    type: 'boolean',
+                    optional: true
+                  }
+                ]
+              },
+              updateState: {
+                description: 'Updates current dashboard state.',
+                meta: 'function',
+                args: [
+                  {
+                    name: 'id',
+                    description: 'An optional id of the target dashboard state to replace current state id.',
+                    type: 'string',
+                    optional: true
+                  },
+                  {
+                    name: 'params',
+                    description: 'An object with state parameters to update current state parameters.',
+                    type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L111" target="_blank">StateParams</a>',
+                    optional: true
+                  },
+                  {
+                    name: 'openRightLayout',
+                    description: 'An optional boolean argument to force open right dashboard layout if present in mobile view mode.',
+                    type: 'boolean',
+                    optional: true
+                  }
+                ]
+              },
+              getStateId: {
+                description: 'Get current dashboard state id.',
+                meta: 'function',
+                return: {
+                  description: 'current dashboard state id.',
                   type: 'string'
-                },
-                {
-                  name: 'params',
-                  description: 'An object with state parameters to use by the new state.',
-                  type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L111" target="_blank">StateParams</a>',
-                  optional: true
-                },
-                {
-                  name: 'openRightLayout',
-                  description: 'An optional boolean argument to force open right dashboard layout if present in mobile view mode.',
-                  type: 'boolean',
-                  optional: true
                 }
-              ]
-            },
-            pushAndOpenState: {
-              description: 'Navigate to new dashboard state and adding intermediate states.',
-              meta: 'function',
-              args: [
-                {
-                  name: 'id',
-                  description: 'An array state object of the target dashboard state.',
-                  type: 'Array <a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L140" target="_blank">StateObject</a>',
-                },
-                {
-                  name: 'openRightLayout',
-                  description: 'An optional boolean argument to force open right dashboard layout if present in mobile view mode.',
-                  type: 'boolean',
-                  optional: true
+              },
+              getStateParams: {
+                description: 'Get current dashboard state parameters.',
+                meta: 'function',
+                return: {
+                  description: 'current dashboard state parameters.',
+                  type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L111" target="_blank">StateParams</a>'
                 }
-              ]
-            },
-            updateState: {
-              description: 'Updates current dashboard state.',
-              meta: 'function',
-              args: [
-                {
-                  name: 'id',
-                  description: 'An optional id of the target dashboard state to replace current state id.',
-                  type: 'string',
-                  optional: true
-                },
-                {
-                  name: 'params',
-                  description: 'An object with state parameters to update current state parameters.',
-                  type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L111" target="_blank">StateParams</a>',
-                  optional: true
-                },
-                {
-                  name: 'openRightLayout',
-                  description: 'An optional boolean argument to force open right dashboard layout if present in mobile view mode.',
-                  type: 'boolean',
-                  optional: true
+              },
+              getStateParamsByStateId: {
+                description: 'Get state parameters for particular dashboard state identified by <code>id</code>.',
+                meta: 'function',
+                args: [
+                  {
+                    name: 'id',
+                    description: 'An id of the target dashboard state.',
+                    type: 'string'
+                  }
+                ],
+                return: {
+                  description: 'current dashboard state parameters.',
+                  type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L111" target="_blank">StateParams</a>'
                 }
-              ]
-            },
-            getStateId: {
-              description: 'Get current dashboard state id.',
-              meta: 'function',
-              return: {
-                description: 'current dashboard state id.',
-                type: 'string'
-              }
-            },
-            getStateParams: {
-              description: 'Get current dashboard state parameters.',
-              meta: 'function',
-              return: {
-                description: 'current dashboard state parameters.',
-                type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L111" target="_blank">StateParams</a>'
-              }
-            },
-            getStateParamsByStateId: {
-              description: 'Get state parameters for particular dashboard state identified by <code>id</code>.',
-              meta: 'function',
-              args: [
-                {
-                  name: 'id',
-                  description: 'An id of the target dashboard state.',
-                  type: 'string'
-                }
-              ],
-              return: {
-                description: 'current dashboard state parameters.',
-                type: '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/core/api/widget-api.models.ts#L111" target="_blank">StateParams</a>'
               }
             }
           }
-        }
-      },
-      ...serviceCompletions
+        },
+        ...serviceCompletions
+      }
     }
   }
 };
+
+export const widgetContextCompletions: TbEditorCompletions = widgetContextCompletionsWithSettings();
diff --git a/ui-ngx/src/app/shared/models/action-widget-settings.models.ts b/ui-ngx/src/app/shared/models/action-widget-settings.models.ts
index b1c47a1fd3..fd78ab30f0 100644
--- a/ui-ngx/src/app/shared/models/action-widget-settings.models.ts
+++ b/ui-ngx/src/app/shared/models/action-widget-settings.models.ts
@@ -25,7 +25,8 @@ export enum GetValueAction {
   GET_ATTRIBUTE = 'GET_ATTRIBUTE',
   GET_TIME_SERIES = 'GET_TIME_SERIES',
   GET_ALARM_STATUS = 'GET_ALARM_STATUS',
-  GET_DASHBOARD_STATE = 'GET_DASHBOARD_STATE'
+  GET_DASHBOARD_STATE = 'GET_DASHBOARD_STATE',
+  GET_DASHBOARD_STATE_OBJECT = 'GET_DASHBOARD_STATE_OBJECT',
 }
 
 export const getValueActions = Object.keys(GetValueAction) as GetValueAction[];
@@ -45,7 +46,8 @@ export const getValueActionTranslations = new Map<GetValueAction, string>(
     [GetValueAction.GET_ATTRIBUTE, 'widgets.value-action.get-attribute'],
     [GetValueAction.GET_TIME_SERIES, 'widgets.value-action.get-time-series'],
     [GetValueAction.GET_ALARM_STATUS, 'widgets.value-action.get-alarm-status'],
-    [GetValueAction.GET_DASHBOARD_STATE, 'widgets.value-action.get-dashboard-state']
+    [GetValueAction.GET_DASHBOARD_STATE, 'widgets.value-action.get-dashboard-state'],
+    [GetValueAction.GET_DASHBOARD_STATE_OBJECT, 'widgets.value-action.get-dashboard-state-object'],
   ]
 );
 
diff --git a/ui-ngx/src/app/shared/models/dynamic-form.models.ts b/ui-ngx/src/app/shared/models/dynamic-form.models.ts
new file mode 100644
index 0000000000..d0ee306f89
--- /dev/null
+++ b/ui-ngx/src/app/shared/models/dynamic-form.models.ts
@@ -0,0 +1,816 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { CustomTranslatePipe } from '@shared/pipe/custom-translate.pipe';
+import { TbEditorCompletion, TbEditorCompletions } from '@shared/models/ace/completion.models';
+import { deepClone, isDefinedAndNotNull, isEmptyStr, isString, isUndefinedOrNull } from '@core/utils';
+import { JsonFormData, JsonSchema, JsonSettingsSchema, KeyLabelItem } from '@shared/legacy/json-form.models';
+import JsonFormUtils from '@shared/legacy/json-form-utils';
+import { constantColor, Font } from '@shared/models/widget-settings.models';
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
+
+export enum FormPropertyType {
+  text = 'text',
+  number = 'number',
+  password = 'password',
+  textarea = 'textarea',
+  switch = 'switch',
+  select = 'select',
+  radios = 'radios',
+  datetime = 'datetime',
+  image = 'image',
+  javascript = 'javascript',
+  json = 'json',
+  html = 'html',
+  css = 'css',
+  markdown = 'markdown',
+  color = 'color',
+  color_settings = 'color_settings',
+  font = 'font',
+  units = 'units',
+  icon = 'icon',
+  fieldset = 'fieldset',
+  array = 'array',
+  htmlSection = 'htmlSection'
+}
+
+export const formPropertyTypes = Object.keys(FormPropertyType) as FormPropertyType[];
+
+export const formPropertyTypeTranslations = new Map<FormPropertyType, string>(
+  [
+    [FormPropertyType.text, 'dynamic-form.property.type-text'],
+    [FormPropertyType.number, 'dynamic-form.property.type-number'],
+    [FormPropertyType.password, 'dynamic-form.property.type-password'],
+    [FormPropertyType.textarea, 'dynamic-form.property.type-textarea'],
+    [FormPropertyType.switch, 'dynamic-form.property.type-switch'],
+    [FormPropertyType.select, 'dynamic-form.property.type-select'],
+    [FormPropertyType.radios, 'dynamic-form.property.type-radios'],
+    [FormPropertyType.datetime, 'dynamic-form.property.type-datetime'],
+    [FormPropertyType.image, 'dynamic-form.property.type-image'],
+    [FormPropertyType.javascript, 'dynamic-form.property.type-javascript'],
+    [FormPropertyType.json, 'dynamic-form.property.type-json'],
+    [FormPropertyType.html, 'dynamic-form.property.type-html'],
+    [FormPropertyType.css, 'dynamic-form.property.type-css'],
+    [FormPropertyType.markdown, 'dynamic-form.property.type-markdown'],
+    [FormPropertyType.color, 'dynamic-form.property.type-color'],
+    [FormPropertyType.color_settings, 'dynamic-form.property.type-color-settings'],
+    [FormPropertyType.font, 'dynamic-form.property.type-font'],
+    [FormPropertyType.units, 'dynamic-form.property.type-units'],
+    [FormPropertyType.icon, 'dynamic-form.property.type-icon'],
+    [FormPropertyType.fieldset, 'dynamic-form.property.type-fieldset'],
+    [FormPropertyType.array, 'dynamic-form.property.type-array'],
+    [FormPropertyType.htmlSection, 'dynamic-form.property.type-html-section']
+  ]
+);
+
+export const formPropertyRowClasses =
+  ['column', 'column-xs', 'column-lt-md', 'align-start', 'no-border', 'no-gap', 'no-padding', 'same-padding'];
+
+export const formPropertyFieldClasses =
+  ['medium-width', 'flex', 'flex-xs', 'flex-lt-md'];
+
+export type PropertyConditionFunction = (property: FormProperty, model: any) => boolean;
+
+export interface FormPropertyBase {
+  id: string;
+  name: string;
+  group?: string;
+  type: FormPropertyType;
+  default: any;
+  required?: boolean;
+  subLabel?: string;
+  divider?: boolean;
+  fieldSuffix?: string;
+  disableOnProperty?: string;
+  condition?: string;
+  conditionFunction?: PropertyConditionFunction;
+  disabled?: boolean;
+  visible?: boolean;
+  rowClass?: string;
+  fieldClass?: string;
+}
+
+export interface FormTextareaProperty extends FormPropertyBase {
+  rows?: number;
+}
+
+export interface FormNumberProperty extends FormPropertyBase {
+  min?: number;
+  max?: number;
+  step?: number;
+}
+
+export interface FormFieldSetProperty extends FormPropertyBase {
+  properties?: FormProperty[];
+}
+
+export interface FormArrayProperty extends FormPropertyBase {
+  arrayItemName?: string;
+  arrayItemType?: FormPropertyType;
+}
+
+export interface FormSelectItem {
+  value: any;
+  label: string;
+}
+
+export interface FormSelectProperty extends FormPropertyBase {
+  multiple?: boolean;
+  allowEmptyOption?: boolean;
+  items?: FormSelectItem[];
+  minItems?: number;
+  maxItems?: number;
+}
+
+export type FormPropertyDirection = 'row' | 'column';
+
+export interface FormRadiosProperty extends FormPropertyBase {
+  direction?: FormPropertyDirection;
+  items?: FormSelectItem[];
+}
+
+export type FormPropertyDateTimeType = 'date' | 'time' | 'datetime';
+
+export interface FormDateTimeProperty extends FormPropertyBase {
+  allowClear?: boolean;
+  dateTimeType?: FormPropertyDateTimeType;
+}
+
+export interface FormJavascriptProperty extends FormPropertyBase {
+  helpId?: string;
+}
+
+export interface FormMarkdownProperty extends FormPropertyBase {
+  helpId?: string;
+}
+
+export interface FormHtmlSection extends FormPropertyBase {
+  htmlClassList?: string[];
+  htmlContent?: string;
+}
+
+export type FormProperty = FormPropertyBase & FormTextareaProperty & FormNumberProperty & FormSelectProperty & FormRadiosProperty
+  & FormDateTimeProperty & FormJavascriptProperty & FormMarkdownProperty & FormFieldSetProperty & FormArrayProperty & FormHtmlSection;
+
+export const cleanupFormProperties = (properties: FormProperty[]): FormProperty[] => {
+  for (const property of properties) {
+    cleanupFormProperty(property);
+  }
+  return properties;
+}
+
+export const cleanupFormProperty = (property: FormProperty): FormProperty => {
+  if (property.type !== FormPropertyType.number) {
+    delete property.min;
+    delete property.max;
+    delete property.step;
+  }
+  if (property.type !== FormPropertyType.textarea) {
+    delete property.rows;
+  }
+  if (property.type !== FormPropertyType.fieldset) {
+    delete property.properties;
+  } else if (property.properties?.length) {
+    property.properties = cleanupFormProperties(property.properties);
+  }
+  if (property.type !== FormPropertyType.array) {
+    delete property.arrayItemName;
+    delete property.arrayItemType;
+  }
+  if (property.type !== FormPropertyType.select) {
+    delete property.multiple;
+    delete property.allowEmptyOption;
+    delete property.minItems;
+    delete property.maxItems;
+  }
+  if (property.type !== FormPropertyType.radios) {
+    delete property.direction;
+  }
+  if (![FormPropertyType.select, FormPropertyType.radios].includes(property.type)) {
+    delete property.items;
+  }
+  if (property.type !== FormPropertyType.datetime) {
+    delete property.allowClear;
+    delete property.dateTimeType;
+  }
+  if (![FormPropertyType.javascript, FormPropertyType.markdown].includes(property.type)) {
+    delete property.helpId;
+  }
+  if (property.type !== FormPropertyType.htmlSection) {
+    delete property.htmlClassList;
+    delete property.htmlContent;
+  }
+  for (const key of Object.keys(property)) {
+    const val = property[key];
+    if (isUndefinedOrNull(val) || isEmptyStr(val)) {
+      delete property[key];
+    }
+  }
+  return property;
+}
+
+export enum FormPropertyContainerType {
+  field = 'field',
+  row = 'row',
+  fieldset = 'fieldset',
+  array = 'array',
+  htmlSection = 'htmlSection'
+}
+
+export interface FormPropertyContainerBase {
+  type: FormPropertyContainerType;
+  label: string;
+  visible: boolean;
+}
+
+export interface FormPropertyRow extends FormPropertyContainerBase {
+  properties?: FormProperty[];
+  switch?: FormProperty;
+  rowClass?: string;
+  propertiesRowClass?: string;
+}
+
+export interface FormPropertyField extends FormPropertyContainerBase {
+  property?: FormProperty;
+}
+
+export interface FormPropertyFieldset extends FormPropertyContainerBase {
+  property?: FormProperty;
+  properties?: FormProperty[];
+}
+
+export interface FormPropertyArray extends FormPropertyContainerBase {
+  property?: FormProperty;
+  arrayItemProperty?: FormProperty;
+}
+
+export interface FormPropertyHtml extends FormPropertyContainerBase {
+  property?: FormProperty;
+  safeHtml?: SafeHtml;
+  htmlClass?: string;
+}
+
+export type FormPropertyContainer = FormPropertyField & FormPropertyRow & FormPropertyFieldset & FormPropertyHtml;
+
+export interface FormPropertyGroup {
+  title?: string;
+  containers: FormPropertyContainer[];
+  visible: boolean;
+}
+
+export const toPropertyGroups = (properties: FormProperty[],
+                                 isArrayItem: boolean,
+                                 customTranslate: CustomTranslatePipe,
+                                 sanitizer: DomSanitizer): FormPropertyGroup[] => {
+  const groups: {title: string, properties: FormProperty[]}[] = [];
+  for (let property of properties) {
+    if (!property.group) {
+      let group = groups.length ? groups[groups.length - 1] : null;
+      if (group && !group.title) {
+        group.properties.push(property);
+      } else {
+        groups.push({
+          title: null,
+          properties: [property]
+        });
+      }
+    } else {
+      let propertyGroup = groups.find(g => g.title === property.group);
+      if (!propertyGroup) {
+        propertyGroup = {
+          title: property.group,
+          properties: []
+        };
+        groups.push(propertyGroup);
+      }
+      propertyGroup.properties.push(property);
+    }
+  }
+  return groups.map(g => ({
+    title: g.title,
+    containers: toPropertyContainers(g.properties, isArrayItem, customTranslate, sanitizer),
+    visible: true
+  }));
+};
+
+const toPropertyContainers = (properties: FormProperty[],
+                              isArrayItem: boolean,
+                              customTranslate: CustomTranslatePipe,
+                              sanitizer: DomSanitizer): FormPropertyContainer[] => {
+  const result: FormPropertyContainer[] = [];
+  for (let property of properties) {
+    if (property.type === FormPropertyType.array) {
+      const propertyArray: FormPropertyArray = {
+        property,
+        label: property.name,
+        type: FormPropertyContainerType.array,
+        visible: true
+      };
+      const arrayItemProperty = deepClone(property);
+      arrayItemProperty.name = property.arrayItemName;
+      arrayItemProperty.type = property.arrayItemType;
+      arrayItemProperty.required = true;
+      delete arrayItemProperty.disableOnProperty;
+      delete arrayItemProperty.condition;
+      delete arrayItemProperty.conditionFunction;
+      delete arrayItemProperty.group;
+      propertyArray.arrayItemProperty = arrayItemProperty;
+      result.push(propertyArray);
+    } else if (property.type === FormPropertyType.fieldset) {
+      const propertyFieldset: FormPropertyFieldset = {
+        property,
+        label: property.name,
+        type: FormPropertyContainerType.fieldset,
+        properties: property.properties,
+        visible: true
+      };
+      result.push(propertyFieldset);
+    } else if (property.type === FormPropertyType.htmlSection) {
+      const propertyHtml: FormPropertyHtml = {
+        property,
+        label: property.name,
+        type: FormPropertyContainerType.htmlSection,
+        htmlClass: property.htmlClassList ? property.htmlClassList.join(' ') : '',
+        safeHtml: sanitizer.bypassSecurityTrustHtml(property.htmlContent),
+        visible: true
+      };
+      result.push(propertyHtml);
+    } else if (isSingleFieldPropertyType(property.type) || isArrayItem) {
+      const propertyField: FormPropertyField = {
+        property,
+        label: property.name,
+        type: FormPropertyContainerType.field,
+        visible: true
+      };
+      result.push(propertyField);
+    } else {
+      let propertyRow =
+        result.find(r => r.type === FormPropertyContainerType.row && r.label === property.name);
+      if (!propertyRow) {
+        propertyRow = {
+          label: property.name,
+          type: FormPropertyContainerType.row,
+          properties: [],
+          rowClass: property.rowClass,
+          propertiesRowClass: 'row flex-end align-center',
+          visible: true
+        };
+        result.push(propertyRow);
+        const rowClasses = (propertyRow.rowClass || '').split(' ').filter(cls => cls.trim().length > 0);
+        if (!rowClasses.includes('flex-wrap')) {
+          rowClasses.push('flex-wrap');
+        }
+        propertyRow.rowClass = rowClasses.join(' ');
+      }
+      if (property.type === FormPropertyType.switch) {
+        propertyRow.switch = property;
+      } else {
+        propertyRow.properties.push(property);
+      }
+    }
+  }
+  for (let container of result.filter(c =>
+    c.type === FormPropertyContainerType.row && !c.switch && c.properties?.length === 1)) {
+    const property = container.properties[0];
+    if (isInputFieldPropertyType(property.type)) {
+      const labelText = customTranslate.transform(property.name);
+      if (property.type !== FormPropertyType.number && labelText.length > 40) {
+        container.type = FormPropertyContainerType.field;
+        container.property = property;
+        delete container.properties;
+        delete container.rowClass;
+      } else {
+        container.propertiesRowClass = 'gt-xs:align-center xs:flex-col gt-xs:flex-row gt-xs:justify-end';
+        const rowClasses = (container.rowClass || '').split(' ').filter(cls => cls.trim().length > 0);
+        if (!rowClasses.includes('column-xs')) {
+          rowClasses.push('column-xs');
+        }
+        if (property.fieldClass && property.fieldClass.split(' ').includes('flex')) {
+          container.propertiesRowClass += ' overflow-hidden';
+          if (rowClasses.includes('flex-wrap')) {
+            rowClasses.splice(rowClasses.indexOf('flex-wrap'), 1);
+          }
+        }
+        container.rowClass = rowClasses.join(' ');
+      }
+    }
+  }
+  return result;
+}
+
+export const isPropertyTypeAllowedForRow = (type: FormPropertyType): boolean => {
+  return !isSingleFieldPropertyType(type) && ![FormPropertyType.fieldset, FormPropertyType.array, FormPropertyType.htmlSection].includes(type);
+}
+
+export const isSingleFieldPropertyType = (type: FormPropertyType): boolean => {
+  return [FormPropertyType.radios, FormPropertyType.textarea, FormPropertyType.image, FormPropertyType.javascript, FormPropertyType.json, FormPropertyType.html,
+    FormPropertyType.css, FormPropertyType.markdown].includes(type);
+}
+
+export const isInputFieldPropertyType = (type: FormPropertyType): boolean => {
+  return [FormPropertyType.text, FormPropertyType.password, FormPropertyType.number, FormPropertyType.select, FormPropertyType.datetime,
+    FormPropertyType.textarea].includes(type);
+}
+
+export const defaultFormProperties = (properties: FormProperty[]): {[id: string]: any} => {
+  const formProperties: {[id: string]: any} = {};
+  for (const property of properties) {
+    if (property.type !== FormPropertyType.htmlSection) {
+      formProperties[property.id] = defaultFormPropertyValue(property);
+    }
+  }
+  return formProperties;
+};
+
+export const defaultFormPropertyValue = (property: FormProperty): any => {
+  if (property.type === FormPropertyType.array) {
+    return [];
+  } else if (property.type === FormPropertyType.fieldset) {
+    const propertyValue: {[id: string]: any} = {};
+    for (const childProperty of property.properties) {
+      if (childProperty.type !== FormPropertyType.htmlSection) {
+        propertyValue[childProperty.id] = defaultFormPropertyValue(childProperty);
+      }
+    }
+    return propertyValue;
+  } else {
+    return property.default;
+  }
+}
+
+export const propertyValid = (property: FormProperty): boolean =>
+  !(!property.id || !property.name || !property.type || (property.type === FormPropertyType.array && !property.arrayItemType));
+
+export const defaultPropertyValue = (type: FormPropertyType): any => {
+  switch (type) {
+    case FormPropertyType.text:
+    case FormPropertyType.textarea:
+    case FormPropertyType.password:
+    case FormPropertyType.javascript:
+    case FormPropertyType.json:
+    case FormPropertyType.html:
+    case FormPropertyType.css:
+    case FormPropertyType.markdown:
+      return '';
+    case FormPropertyType.number:
+      return 0;
+    case FormPropertyType.switch:
+      return false;
+    case FormPropertyType.color:
+      return '#000';
+    case FormPropertyType.color_settings:
+      return constantColor('#000');
+    case FormPropertyType.font:
+      return {
+        size: 12,
+        sizeUnit: 'px',
+        family: 'Roboto',
+        weight: 'normal',
+        style: 'normal',
+        lineHeight: '1'
+      } as Font;
+    case FormPropertyType.units:
+      return '';
+    case FormPropertyType.icon:
+      return 'star';
+    case FormPropertyType.fieldset:
+    case FormPropertyType.array:
+    case FormPropertyType.select:
+    case FormPropertyType.radios:
+    case FormPropertyType.datetime:
+    case FormPropertyType.htmlSection:
+    case FormPropertyType.image:
+      return null;
+  }
+};
+
+export const formPropertyCompletions = (properties: FormProperty[], customTranslate: CustomTranslatePipe): TbEditorCompletions => {
+  const propertiesCompletions: TbEditorCompletions = {};
+  for (const property of properties) {
+    if (property.type !== FormPropertyType.htmlSection) {
+      propertiesCompletions[property.id] = formPropertyCompletion(property, customTranslate);
+    }
+  }
+  return propertiesCompletions;
+}
+
+export const formPropertyCompletion = (property: FormProperty, customTranslate: CustomTranslatePipe): TbEditorCompletion => {
+  let description = customTranslate.transform(property.name, property.name);
+  if (property.subLabel) {
+    description += ` <small>${customTranslate.transform(property.subLabel, property.subLabel)}</small>`;
+  }
+  const isArray = property.type === FormPropertyType.array;
+  const type = isArray ? property.arrayItemType : property.type;
+  if (type === FormPropertyType.select) {
+    if (property.multiple || isArray) {
+      description += '<br/><br/><code class="title"><b>Possible values of array element:</b></code>';
+    } else {
+      description += '<br/><br/><code class="title"><b>Possible values:</b></code>';
+    }
+    description += `<ul>${property.items.map(item => `<li>${item.value} <code style="font-size: 11px;">${typeof item.value}</code></li>`).join('\n')}</ul>`;
+  }
+  if (type === FormPropertyType.datetime) {
+    if (isArray) {
+      description += '<br/><br/><code class="title">Stores array of time values in milliseconds since midnight, January 1, 1970 UTC.</code>';
+    } else {
+      description += '<br/><br/><code class="title">Stores time value in milliseconds since midnight, January 1, 1970 UTC.</code>';
+    }
+  }
+  const completion: TbEditorCompletion = {
+    meta: 'property',
+    description,
+    type: formPropertyCompletionType(property)
+  };
+  if (type === FormPropertyType.fieldset && !isArray) {
+    completion.children = {};
+    for (const childProperty of property.properties) {
+      if (childProperty.type !== FormPropertyType.htmlSection) {
+        completion.children[childProperty.id] = formPropertyCompletion(childProperty, customTranslate);
+      }
+    }
+  }
+  return completion;
+};
+
+const formPropertyCompletionType = (property: FormProperty): string => {
+  const isArray = property.type === FormPropertyType.array;
+  const type = isArray ? property.arrayItemType : property.type;
+  let typeStr: string;
+  switch (type) {
+    case FormPropertyType.text:
+    case FormPropertyType.password:
+    case FormPropertyType.textarea:
+      typeStr = 'string';
+      break;
+    case FormPropertyType.number:
+      typeStr = 'number';
+      break;
+    case FormPropertyType.switch:
+      typeStr = 'boolean';
+      break;
+    case FormPropertyType.datetime:
+      typeStr = 'number';
+      break;
+    case FormPropertyType.image:
+      typeStr = 'image URL string';
+      break;
+    case FormPropertyType.select:
+    case FormPropertyType.radios:
+      const items = property.items || [];
+      const types: string[] = [];
+      items.forEach(item => {
+        const type = typeof item.value;
+        if (!types.includes(type)) {
+          types.push(type);
+        }
+      });
+      const typesString = types.length ? types.join(' | ') : 'string';
+      if (property.type === FormPropertyType.select && property.multiple) {
+        typeStr = `Array&lt;${typesString}&gt;`;
+      } else {
+        typeStr = typesString;
+      }
+      break;
+    case FormPropertyType.color:
+      typeStr = 'color string';
+      break;
+    case FormPropertyType.color_settings:
+      typeStr = 'ColorProcessor';
+      break;
+    case FormPropertyType.font:
+      typeStr = 'Font';
+      break;
+    case FormPropertyType.units:
+      typeStr = 'units string';
+      break;
+    case FormPropertyType.icon:
+      typeStr = 'icon string';
+      break;
+    case FormPropertyType.fieldset:
+      typeStr = 'object';
+      break;
+    case FormPropertyType.javascript:
+      typeStr = 'JavaScript function body string';
+      break;
+    case FormPropertyType.json:
+      typeStr = 'JSON string';
+      break;
+    case FormPropertyType.html:
+      typeStr = 'HTML string';
+      break;
+    case FormPropertyType.css:
+      typeStr = 'CSS string';
+      break;
+    case FormPropertyType.markdown:
+      typeStr = 'Markdown string';
+      break;
+    default:
+      typeStr = 'unknown';
+      break;
+  }
+  if (isArray) {
+    typeStr = `Array&lt;${typeStr}&gt;`;
+  }
+  return typeStr;
+};
+
+
+export const jsonFormSchemaToFormProperties = (rawSchema: string | any) : FormProperty[] => {
+  try {
+    const properties: FormProperty[] = [];
+    let settingsSchema: JsonSettingsSchema;
+    if (!rawSchema || rawSchema === '') {
+      settingsSchema = {};
+    } else {
+      settingsSchema = isString(rawSchema) ? JSON.parse(rawSchema) : rawSchema;
+    }
+    if (settingsSchema.schema) {
+      const schema = settingsSchema.schema;
+      const form = settingsSchema.form || ['*'];
+      const groupInfoes = settingsSchema.groupInfoes || [];
+      if (form.length > 0) {
+        if (groupInfoes.length) {
+          for (const info of groupInfoes) {
+            const theForm: any[] = form[info.formIndex];
+            properties.push(...schemaFormToProperties(schema, theForm, info.GroupTitle));
+          }
+        } else {
+          properties.push(...schemaFormToProperties(schema, form));
+        }
+      }
+    }
+    return properties;
+  } catch (e) {
+    console.warn('Failed to convert old JSON form schema to form properties:', e);
+    return [];
+  }
+}
+
+const schemaFormToProperties = (schema: JsonSchema, theForm: any[], groupTitle?: string): FormProperty[] => {
+  const merged = JsonFormUtils.merge(schema, theForm, {}, {
+    formDefaults: {
+      startEmpty: true
+    }
+  });
+  return merged.map((form: JsonFormData) => jsonFormDataToProperty(form, 0, groupTitle)).filter(p => p != null);
+}
+
+const jsonFormDataToProperty = (form: JsonFormData, level: number, groupTitle?: string): FormProperty => {
+  if (form.key && form.key.length > level) {
+    const id = form.key[level] + '';
+    let property: FormProperty = {
+      id,
+      name: form.title || id,
+      group: groupTitle,
+      type: null,
+      default: (isDefinedAndNotNull(form.default) ? form.default : form.schema?.default) || null,
+      required: isDefinedAndNotNull(form.required) ? form.required : false
+    };
+    if (form.condition?.length) {
+      property.condition = `return ${form.condition};`;
+    }
+    switch (form.type) {
+      case 'number':
+        property.type = FormPropertyType.number;
+        break;
+      case 'text':
+        property.type = FormPropertyType.text;
+        property.fieldClass = 'flex';
+        break;
+      case 'password':
+        property.type = FormPropertyType.password;
+        property.fieldClass = 'flex';
+        break;
+      case 'textarea':
+        property.type = FormPropertyType.textarea;
+        property.rows = form.rows || form.rowsMax || 2;
+        break;
+      case 'checkbox':
+        property.type = FormPropertyType.switch;
+        break;
+      case 'rc-select':
+        property.type = FormPropertyType.select;
+        if (form.items?.length) {
+          property.items = (form.items as KeyLabelItem[]).map(item => ({value: item.value, label: item.label}));
+        } else {
+          property.items = [];
+        }
+        property.multiple = form.multiple;
+        property.fieldClass = 'flex';
+        property.allowEmptyOption = isDefinedAndNotNull(form.allowClear) ? form.allowClear : false;
+        if (property.multiple) {
+          if (typeof (form.schema as any)?.minItems === 'number') {
+            property.minItems = (form.schema as any).minItems;
+          }
+          if (typeof (form.schema as any)?.maxItems === 'number') {
+            property.maxItems = (form.schema as any).maxItems;
+          }
+        }
+        break;
+      case 'select':
+        property.type = FormPropertyType.select;
+        if (form.titleMap?.length) {
+          property.items = form.titleMap.map(item => ({value: item.value, label: item.name}));
+        } else {
+          property.items = [];
+        }
+        property.multiple = false;
+        property.fieldClass = 'flex';
+        property.allowEmptyOption = false;
+        break;
+      case 'radios':
+        property.type = FormPropertyType.radios;
+        if (form.titleMap?.length) {
+          property.items = form.titleMap.map(item => ({value: item.value, label: item.name}));
+        } else {
+          property.items = [];
+        }
+        property.direction = form.direction === 'row' ? 'row' : 'column';
+        break;
+      case 'date':
+        property.type = FormPropertyType.datetime;
+        property.dateTimeType = 'date';
+        property.fieldClass = 'flex';
+        property.allowClear = true;
+        break;
+      case 'image':
+        property.type = FormPropertyType.image;
+        break;
+      case 'color':
+        property.type = FormPropertyType.color;
+        break;
+      case 'icon':
+        property.type = FormPropertyType.icon;
+        break;
+      case 'fieldset':
+        property.type = FormPropertyType.fieldset;
+        property.properties = form.items ? (form.items as JsonFormData[]).map(item =>
+          jsonFormDataToProperty(item, level+1)).filter(p => p !== null) : [];
+        break;
+      case 'javascript':
+        property.type = FormPropertyType.javascript;
+        property.helpId = form.helpId;
+        break;
+      case 'json':
+        property.type = FormPropertyType.json;
+        break;
+      case 'html':
+        property.type = FormPropertyType.html;
+        break;
+      case 'css':
+        property.type = FormPropertyType.css;
+        break;
+      case 'markdown':
+        property.type = FormPropertyType.markdown;
+        break;
+      case 'help':
+        property.type = FormPropertyType.htmlSection;
+        property.htmlContent = form.description || '';
+        property.htmlClassList = form.htmlClass ? form.htmlClass.split(' ') : [];
+        break;
+      case 'array':
+        if (form.items?.length) {
+          const arrayItemSchema = form.schema.items;
+          if (arrayItemSchema && arrayItemSchema.type && arrayItemSchema.type !== 'array') {
+            if (arrayItemSchema.type === 'object') {
+              property.arrayItemType = FormPropertyType.fieldset;
+              property.arrayItemName = '';
+              property.properties = form.items ? (form.items as JsonFormData[]).map(item =>
+                jsonFormDataToProperty(item, level+2)).filter(p => p !== null) : [];
+            } else {
+              const item: JsonFormData = form.items[0] as JsonFormData;
+              const arrayProperty = jsonFormDataToProperty(item, 0);
+              arrayProperty.arrayItemType = arrayProperty.type;
+              arrayProperty.arrayItemName = arrayProperty.name;
+              arrayProperty.id = property.id;
+              arrayProperty.name = property.name;
+              arrayProperty.group = property.group;
+              arrayProperty.condition = property.condition;
+              arrayProperty.required = property.required;
+              property = arrayProperty;
+            }
+            property.type = FormPropertyType.array;
+          }
+        }
+        break;
+    }
+    if (!property.type) {
+      return null;
+    }
+    return property;
+  }
+  return null;
+}
diff --git a/ui-ngx/src/app/shared/models/oauth2.models.ts b/ui-ngx/src/app/shared/models/oauth2.models.ts
index abc0ae1464..19a95a9788 100644
--- a/ui-ngx/src/app/shared/models/oauth2.models.ts
+++ b/ui-ngx/src/app/shared/models/oauth2.models.ts
@@ -80,11 +80,7 @@ export interface Domain extends BaseData<DomainId>, HasTenantId {
   propagateToEdge: boolean;
 }
 
-export interface HasOauth2Clients {
-  oauth2ClientInfos?: Array<OAuth2ClientInfo> | Array<string>;
-}
-
-export interface DomainInfo extends Domain, HasOauth2Clients {
+export interface DomainInfo extends Domain {
   oauth2ClientInfos?: Array<OAuth2ClientInfo> | Array<string>;
 }
 
diff --git a/ui-ngx/src/app/shared/models/rule-node.models.ts b/ui-ngx/src/app/shared/models/rule-node.models.ts
index a79fdbc376..471594f689 100644
--- a/ui-ngx/src/app/shared/models/rule-node.models.ts
+++ b/ui-ngx/src/app/shared/models/rule-node.models.ts
@@ -21,9 +21,7 @@ import { ComponentDescriptor } from '@shared/models/component-descriptor.models'
 import { FcEdge, FcNode } from 'ngx-flowchart';
 import { Observable } from 'rxjs';
 import { PageComponent } from '@shared/components/page.component';
-import { AfterViewInit, EventEmitter, Inject, OnInit, Directive, DestroyRef, inject } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { AppState } from '@core/core.state';
+import { AfterViewInit, DestroyRef, Directive, EventEmitter, inject, OnInit } from '@angular/core';
 import { AbstractControl, UntypedFormGroup } from '@angular/forms';
 import { RuleChainType } from '@shared/models/rule-chain.models';
 import { DebugRuleNodeEventBody } from '@shared/models/event.models';
@@ -103,7 +101,7 @@ export abstract class RuleNodeConfigurationComponent extends PageComponent imple
 
   private configurationSet = false;
   private disabledValue = false;
-  private destroyRef = inject(DestroyRef);
+  protected destroyRef = inject(DestroyRef);
 
   set disabled(value: boolean) {
     if (this.disabledValue !== value) {
@@ -134,8 +132,8 @@ export abstract class RuleNodeConfigurationComponent extends PageComponent imple
   configurationChangedEmiter = new EventEmitter<RuleNodeConfiguration>();
   configurationChanged = this.configurationChangedEmiter.asObservable();
 
-  protected constructor(@Inject(Store) protected store: Store<AppState>) {
-    super(store);
+  protected constructor(...args: unknown[]) {
+    super();
   }
 
   ngOnInit() {}
diff --git a/ui-ngx/src/app/shared/models/widget.models.ts b/ui-ngx/src/app/shared/models/widget.models.ts
index da92cc8a49..6e45e8705a 100644
--- a/ui-ngx/src/app/shared/models/widget.models.ts
+++ b/ui-ngx/src/app/shared/models/widget.models.ts
@@ -41,10 +41,11 @@ import { isNotEmptyStr, mergeDeepIgnoreArray } 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, HasVersion } from '@shared/models/entity.models';
+import { EntityInfoData, HasTenantId, HasVersion } from '@shared/models/entity.models';
 import { DataKeysCallbacks, DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 import { WidgetConfigCallbacks } from '@home/components/widget/config/widget-config.component.models';
 import { TbFunction } from '@shared/models/js-function.models';
+import { FormProperty, jsonFormSchemaToFormProperties } from '@shared/models/dynamic-form.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 export enum widgetType {
@@ -154,9 +155,9 @@ export interface WidgetTypeDescriptor {
   templateHtml: string;
   templateCss: string;
   controllerScript: TbFunction;
-  settingsSchema?: string | any;
-  dataKeySettingsSchema?: string | any;
-  latestDataKeySettingsSchema?: string | any;
+  settingsForm?: FormProperty[];
+  dataKeySettingsForm?: FormProperty[];
+  latestDataKeySettingsForm?: FormProperty[];
   settingsDirective?: string;
   dataKeySettingsDirective?: string;
   latestDataKeySettingsDirective?: string;
@@ -194,9 +195,9 @@ export interface WidgetTypeParameters {
 
 export interface WidgetControllerDescriptor {
   widgetTypeFunction?: any;
-  settingsSchema?: string | any;
-  dataKeySettingsSchema?: string | any;
-  latestDataKeySettingsSchema?: string | any;
+  settingsForm?: FormProperty[];
+  dataKeySettingsForm?: FormProperty[];
+  latestDataKeySettingsForm?: FormProperty[];
   typeParameters?: WidgetTypeParameters;
   actionSources?: {[actionSourceId: string]: WidgetActionSource};
 }
@@ -236,6 +237,30 @@ export const isValidWidgetFullFqn = (fullFqn: string): boolean => {
   return false;
 };
 
+
+export const migrateWidgetTypeToDynamicForms = <T extends WidgetType>(widgetType: T): T => {
+  const descriptor = widgetType.descriptor;
+  if ((descriptor as any).settingsSchema) {
+    if (!descriptor.settingsForm?.length) {
+      descriptor.settingsForm = jsonFormSchemaToFormProperties((descriptor as any).settingsSchema);
+    }
+    delete (descriptor as any).settingsSchema;
+  }
+  if ((descriptor as any).dataKeySettingsSchema) {
+    if (!descriptor.dataKeySettingsForm?.length) {
+      descriptor.dataKeySettingsForm = jsonFormSchemaToFormProperties((descriptor as any).dataKeySettingsSchema);
+    }
+    delete (descriptor as any).dataKeySettingsSchema;
+  }
+  if ((descriptor as any).latestDataKeySettingsSchema) {
+    if (!descriptor.latestDataKeySettingsForm?.length) {
+      descriptor.latestDataKeySettingsForm = jsonFormSchemaToFormProperties((descriptor as any).latestDataKeySettingsSchema);
+    }
+    delete (descriptor as any).latestDataKeySettingsSchema;
+  }
+  return widgetType;
+}
+
 export interface WidgetType extends BaseWidgetType {
   descriptor: WidgetTypeDescriptor;
 }
@@ -245,6 +270,7 @@ export interface WidgetTypeInfo extends BaseWidgetType {
   description: string;
   tags: string[];
   widgetType: widgetType;
+  bundles?: EntityInfoData[];
 }
 
 export interface WidgetTypeDetails extends WidgetType, ExportableEntity<WidgetTypeId> {
@@ -813,22 +839,10 @@ export interface WidgetInfo extends BaseWidgetInfo {
   deprecated?: boolean;
 }
 
-export interface GroupInfo {
-  formIndex: number;
-  GroupTitle: string;
-}
-
-export interface JsonSchema {
-  type: string;
-  title?: string;
-  properties: {[key: string]: any};
-  required?: string[];
-}
-
-export interface JsonSettingsSchema {
-  schema?: JsonSchema;
-  form?: any[];
-  groupInfoes?: GroupInfo[];
+export interface DynamicFormData {
+  settingsForm?: FormProperty[];
+  model?: any;
+  settingsDirective?: string;
 }
 
 export interface WidgetPosition {
diff --git a/ui-ngx/src/app/shared/shared.module.ts b/ui-ngx/src/app/shared/shared.module.ts
index c1f243ae14..5b40dadf5f 100644
--- a/ui-ngx/src/app/shared/shared.module.ts
+++ b/ui-ngx/src/app/shared/shared.module.ts
@@ -121,7 +121,6 @@ import { TbJsonPipe } from '@shared/pipe/tbJson.pipe';
 import { ColorPickerDialogComponent } from '@shared/components/dialog/color-picker-dialog.component';
 import { ColorInputComponent } from '@shared/components/color-input.component';
 import { JsFuncComponent } from '@shared/components/js-func.component';
-import { JsonFormComponent } from '@shared/components/json-form/json-form.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';
@@ -362,7 +361,6 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
     ColorInputComponent,
     MaterialIconSelectComponent,
     NodeScriptTestDialogComponent,
-    JsonFormComponent,
     ImageInputComponent,
     MultipleImageInputComponent,
     FileInputComponent,
@@ -625,7 +623,6 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
     ColorInputComponent,
     MaterialIconSelectComponent,
     NodeScriptTestDialogComponent,
-    JsonFormComponent,
     ImageInputComponent,
     MultipleImageInputComponent,
     FileInputComponent,
diff --git a/ui-ngx/src/assets/help/en_US/rulenode/save_timeseries_node_advanced.md b/ui-ngx/src/assets/help/en_US/rulenode/save_timeseries_node_advanced.md
new file mode 100644
index 0000000000..44a037f180
--- /dev/null
+++ b/ui-ngx/src/assets/help/en_US/rulenode/save_timeseries_node_advanced.md
@@ -0,0 +1,29 @@
+#### Potential unexpected behavior with mixed processing strategies
+
+When configuring the processing strategies, certain combinations can lead to unexpected behavior. Consider the following scenarios:
+
+- **Disabling WebSocket (WS) updates**
+
+  If WS updates are disabled, any changes to the time series data won’t be pushed to dashboards (or other WS subscriptions).
+  This means that even if a database is updated, dashboards may not display the updated data until browser page is reloaded.
+
+- **Different deduplication intervals across actions**
+
+  When you configure different deduplication intervals for actions, the same incoming message might be processed differently for each action.
+  For example, a message might be stored immediately in the Time series table (if set to *On every message*) while not being stored in the Latest values table because its deduplication interval hasn’t elapsed.
+  Also, if the WebSocket updates are configured with a different interval, dashboards might show updates that do not match what is stored in the database.
+
+- **Skipping database storage**
+
+  Choosing to disable one or more persistence actions (for instance, skipping database storage for Time series or Latest values while keeping WS updates enabled) introduces the risk of having only partial data available:
+  - If a message is processed only for real-time notifications (WebSockets) and not stored in the database, historical queries may not match data on the dashboard.
+  - When processing strategies for Time series and Latest values are out-of-sync, telemetry data may be stored in one table (e.g., Time series) while the same data is absent in the other (e.g., Latest values).
+
+- **Deduplication cache clearing**
+
+  The deduplication mechanism uses a cache to track processed messages within each interval.
+  For performance and system stability reasons, this cache is periodically cleared.
+  As a result, if a cache entry is removed during the deduplication period, messages from the same originator may be processed more than once within that interval.
+  This means deduplication should be used as a performance optimization rather than an absolute guarantee of single processing per interval.
+
+We recommend using deduplication only when the occasional repeated processing is acceptable and won't cause system correctness issue or data inconsistencies.
diff --git a/ui-ngx/src/assets/help/en_US/widget/config/parse_value_get_dashboard_state_object_fn.md b/ui-ngx/src/assets/help/en_US/widget/config/parse_value_get_dashboard_state_object_fn.md
new file mode 100644
index 0000000000..ddc1ed7bc8
--- /dev/null
+++ b/ui-ngx/src/assets/help/en_US/widget/config/parse_value_get_dashboard_state_object_fn.md
@@ -0,0 +1,40 @@
+#### Parse value function
+
+<div class="divider"></div>
+<br/>
+
+*function (data): boolean*
+
+A JavaScript function that converts the current dashboard state object into a boolean value.
+
+**Parameters:**
+
+<ul>
+  <li><b>data:</b> <a href="https://github.com/thingsboard/thingsboard/blob/master/ui-ngx/src/app/core/api/widget-api.models.ts#L150" target="_blank">StateObject</a> - the current dashboard state object.
+   </li>
+</ul>
+
+**Returns:**
+
+`true` if the widget should be in an activated state, `false` otherwise.
+
+<div class="divider"></div>
+
+##### Examples
+
+* Check if the current dashboard state id is "default":
+
+```javascript
+return data.id === 'default' ? true : false;
+{:copy-code}
+```
+
+* Check if the current dashboard state parameters are empty:
+
+```javascript
+return Object.keys(data.params).length ? true : false;
+{:copy-code}
+```
+
+<br>
+<br>
diff --git a/ui-ngx/src/assets/help/en_US/widget/editor/examples/alarm_widget.md b/ui-ngx/src/assets/help/en_US/widget/editor/examples/alarm_widget.md
index c0126214c7..9853bebd43 100644
--- a/ui-ngx/src/assets/help/en_US/widget/editor/examples/alarm_widget.md
+++ b/ui-ngx/src/assets/help/en_US/widget/editor/examples/alarm_widget.md
@@ -40,32 +40,25 @@ The **Widget Editor** will be opened, pre-populated with the content of the defa
 {:copy-code}
 ```
 
- - Put the following JSON content inside the "Settings schema" tab of **Settings schema section**:
+ - Import the following JSON content inside the "Settings form" tab by clicking on 'Import form from JSON' button:
 
 ```json
-{
-    "schema": {
-        "type": "object",
-        "title": "AlarmTableSettings",
-        "properties": {
-            "alarmSeverityColorFunction": {
-                "title": "Alarm severity color function: f(severity)",
-                "type": "string",
-                "default": "if(severity == 'CRITICAL') {return 'red';} else if (severity == 'MAJOR') {return 'orange';} else return 'green'; "
-            }
-        },
-        "required": []
-    },
-    "form": [
-        {
-            "key": "alarmSeverityColorFunction",
-            "type": "javascript"
-        }
-    ]
-}
+[
+  {
+    "id": "alarmSeverityColorFunction",
+    "name": "Alarm severity color function: f(severity)",
+    "type": "javascript",
+    "default": "if (severity == 'CRITICAL') {\n    return 'red';\n} else if (severity == 'MAJOR') {\n    return 'orange';\n} else return 'green';",
+    "required": false
+  }
+]
 {:copy-code}
 ```
 
+ - Clear all 'form selector' fields in the "Widget settings" tab.
+
+ - Turn off 'Has basic mode' switch in the "Widget settings" tab.
+
  - Put the following JavaScript code inside the "JavaScript" section:
 
 ```javascript
diff --git a/ui-ngx/src/assets/help/en_US/widget/editor/examples/rpc_widget.md b/ui-ngx/src/assets/help/en_US/widget/editor/examples/rpc_widget.md
index 44abed8a46..7c7121cd44 100644
--- a/ui-ngx/src/assets/help/en_US/widget/editor/examples/rpc_widget.md
+++ b/ui-ngx/src/assets/help/en_US/widget/editor/examples/rpc_widget.md
@@ -40,35 +40,28 @@ The **Widget Editor** will open, pre-populated with default **Control** template
 {:copy-code}
 ```
 
- - Put the following JSON content inside the "Settings schema" tab of **Settings schema section**:
+ - Import the following JSON content inside the "Settings form" tab by clicking on 'Import form from JSON' button:
 
 ```json
-{
-    "schema": {
-        "type": "object",
-        "title": "Settings",
-        "properties": {
-            "oneWayElseTwoWay": {
-                "title": "Is One Way Command",
-                "type": "boolean",
-                "default": true
-            },
-            "requestTimeout": {
-                "title": "RPC request timeout",
-                "type": "number",
-                "default": 500
-            }
-        },
-        "required": []
-    },
-    "form": [
-        "oneWayElseTwoWay",
-        "requestTimeout"
-    ]
-}
+[
+  {
+    "id": "oneWayElseTwoWay",
+    "name": "Is One Way Command",
+    "type": "switch",
+    "default": true
+  },
+  {
+    "id": "requestTimeout",
+    "name": "RPC request timeout",
+    "type": "number",
+    "default": 500
+  }
+]
 {:copy-code}
 ```
 
+ - Clear value of 'Settings form selector' in the "Widget settings" tab. 
+   
  - Put the following JavaScript code inside the "JavaScript" section:
 
 ```javascript
diff --git a/ui-ngx/src/assets/help/en_US/widget/editor/examples/static_widget.md b/ui-ngx/src/assets/help/en_US/widget/editor/examples/static_widget.md
index d7c7901052..3a3bfe115d 100644
--- a/ui-ngx/src/assets/help/en_US/widget/editor/examples/static_widget.md
+++ b/ui-ngx/src/assets/help/en_US/widget/editor/examples/static_widget.md
@@ -17,28 +17,23 @@ The **Widget Editor** will be opened pre-populated with the content of default *
 {:copy-code}
 ```
 
- - Put the following JSON content inside the "Settings schema" tab of **Settings schema section**:
+ - Import the following JSON content inside the "Settings form" tab by clicking on 'Import form from JSON' button:
 
 ```json
-{
-    "schema": {
-        "type": "object",
-        "title": "Settings",
-        "properties": {
-            "alertContent": {
-                "title": "Alert content",
-                "type": "string",
-                "default": "Content derived from alertContent property of widget settings."
-            }
-        }
-    },
-    "form": [
-        "alertContent"
-    ]
-}
+[
+  {
+    "id": "alertContent",
+    "name": "Alert content",
+    "type": "text",
+    "default": "Content derived from alertContent property of widget settings.",
+    "fieldClass": "flex"
+  }
+]
 {:copy-code}
 ```
 
+ - Clear value of 'Settings form selector' in the "Widget settings" tab.
+
  - Put the following JavaScript code inside the "JavaScript" section:
 
 ```javascript
diff --git a/ui-ngx/src/assets/help/en_US/widget/editor/widget_js_fn.md b/ui-ngx/src/assets/help/en_US/widget/editor/widget_js_fn.md
index 32b005bedd..015bac28b4 100644
--- a/ui-ngx/src/assets/help/en_US/widget/editor/widget_js_fn.md
+++ b/ui-ngx/src/assets/help/en_US/widget/editor/widget_js_fn.md
@@ -10,18 +10,20 @@ Each widget function should be defined as a property of the **self** variable.
 
 In order to implement a new widget, the following JavaScript functions should be defined *(Note: each function is optional and can be implemented according to  widget specific behaviour):*
 
-|{:auto} **Function**                       | **Description**                                                                        |
-|------------------------------------|----------------------------------------------------------------------------------------|
-| ``` onInit() ```                   | The first function which is called when widget is ready for initialization. Should be used to prepare widget DOM, process widget settings and initial subscription information. |
-| ``` onDataUpdated() ```            | Called when the new data is available from the widget subscription. Latest data can be accessed from the <span trigger-style="fontSize: 16px;" trigger-text="<b>defaultSubscription</b>" tb-help-popup="widget/editor/widget_js_subscription_object"></span> object of widget context (**ctx**). |
-| ``` onResize() ```                 | Called when widget container is resized. Latest width and height can be obtained from widget context (**ctx**).             |
-| ``` onEditModeChanged() ```        | Called when dashboard editing mode is changed. Latest mode is handled by isEdit property of **ctx**.             |
-| ``` onMobileModeChanged() ```      | Called when dashboard view width crosses mobile breakpoint. Latest state is handled by isMobile property of **ctx**.                 |
-| ``` onDestroy() ```                | Called when widget element is destroyed. Should be used to cleanup all resources if necessary.            |
-| ``` getSettingsSchema() ```        | Optional function returning widget settings schema json as alternative to **Settings schema** of settings section.             |
-| ``` getDataKeySettingsSchema() ``` | Optional function returning particular data key settings schema json as alternative to **Data key settings schema** tab of settings section.                   |
-| ``` typeParameters() ```           | Returns [WidgetTypeParameters{:target="_blank"}](https://github.com/thingsboard/thingsboard/blob/2627fe51d491055d4140f16617ed543f7f5bd8f6/ui-ngx/src/app/shared/models/widget.models.ts#L151) object describing widget datasource parameters. See <span trigger-style="fontSize: 16px;" trigger-text="<b>Type parameters object</b>" tb-help-popup="widget/editor/widget_js_type_parameters_object"></span> |            |
-| ``` actionSources() ```            | Returns map describing available widget action sources ([WidgetActionSource{:target="_blank"}](https://github.com/thingsboard/thingsboard/blob/2627fe51d491055d4140f16617ed543f7f5bd8f6/ui-ngx/src/app/shared/models/widget.models.ts#L121)) used to define user actions. See <span trigger-style="fontSize: 16px;" trigger-text="<b>Action sources object</b>" tb-help-popup="widget/editor/widget_js_action_sources_object"></span> |
+| {:auto} **Function**              | **Description**                                                                                                                                                                                                                                                                                                                                                                                                                       |
+|-----------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| ``` onInit() ```                  | The first function which is called when widget is ready for initialization. Should be used to prepare widget DOM, process widget settings and initial subscription information.                                                                                                                                                                                                                                                       |
+| ``` onDataUpdated() ```           | Called when the new data is available from the widget subscription. Latest data can be accessed from the <span trigger-style="fontSize: 16px;" trigger-text="<b>defaultSubscription</b>" tb-help-popup="widget/editor/widget_js_subscription_object"></span> object of widget context (**ctx**).                                                                                                                                      |
+| ``` onResize() ```                | Called when widget container is resized. Latest width and height can be obtained from widget context (**ctx**).                                                                                                                                                                                                                                                                                                                       |
+| ``` onEditModeChanged() ```       | Called when dashboard editing mode is changed. Latest mode is handled by isEdit property of **ctx**.                                                                                                                                                                                                                                                                                                                                  |
+| ``` onMobileModeChanged() ```     | Called when dashboard view width crosses mobile breakpoint. Latest state is handled by isMobile property of **ctx**.                                                                                                                                                                                                                                                                                                                  |
+| ``` onDestroy() ```               | Called when widget element is destroyed. Should be used to cleanup all resources if necessary.                                                                                                                                                                                                                                                                                                                                        |
+| ``` getSettingsForm() ```         | Optional function returning widget settings form array as alternative to **Settings form** tab of settings section.                                                                                                                                                                                                                                                                                                                   |
+| ``` getDataKeySettingsForm() ```  | Optional function returning particular data key settings form array as alternative to **Data key settings form** tab of settings section.                                                                                                                                                                                                                                                                                             |
+| ``` typeParameters() ```          | Returns [WidgetTypeParameters{:target="_blank"}](https://github.com/thingsboard/thingsboard/blob/2627fe51d491055d4140f16617ed543f7f5bd8f6/ui-ngx/src/app/shared/models/widget.models.ts#L151) object describing widget datasource parameters. See <span trigger-style="fontSize: 16px;" trigger-text="<b>Type parameters object</b>" tb-help-popup="widget/editor/widget_js_type_parameters_object"></span>                           |            |
+| ``` actionSources() ```           | Returns map describing available widget action sources ([WidgetActionSource{:target="_blank"}](https://github.com/thingsboard/thingsboard/blob/2627fe51d491055d4140f16617ed543f7f5bd8f6/ui-ngx/src/app/shared/models/widget.models.ts#L121)) used to define user actions. See <span trigger-style="fontSize: 16px;" trigger-text="<b>Action sources object</b>" tb-help-popup="widget/editor/widget_js_action_sources_object"></span> |
+| ~~getSettingsSchema()~~           | **Deprecated**. Use getSettingsForm() function.                                                                                                                                                                                                                                                                                                                                                                                       |
+| ~~getDataKeySettingsSchema()~~    | **Deprecated**. Use getDataKeySettingsForm() function.                                                                                                                                                                                                                                                                                                                                                                                |
 
 <div class="divider"></div>
 
diff --git a/ui-ngx/src/assets/help/en_US/widget/editor/widget_js_subscription_object.md b/ui-ngx/src/assets/help/en_US/widget/editor/widget_js_subscription_object.md
index edef68210d..dbf4d991f8 100644
--- a/ui-ngx/src/assets/help/en_US/widget/editor/widget_js_subscription_object.md
+++ b/ui-ngx/src/assets/help/en_US/widget/editor/widget_js_subscription_object.md
@@ -26,7 +26,7 @@ For [Latest values{:target="_blank"}](${siteBaseUrl}/docs${docPlatformPrefix}/us
                     label: 'Sin', // label of the dataKey. Used as display value (for ex. in the widget legend section) 
                     color: '#ffffff', // color of the key. Can be used by widget to set color of the key data (for ex. lines in line chart or segments in the pie chart).  
                     funcBody: "", // only applicable for datasource with type "function" and "function" key type. Defines body of the function to generate simulated data.
-                    settings: {} // dataKey specific settings with structure according to the defined Data key settings json schema. See "Settings schema section".
+                    settings: {} // dataKey specific settings with structure according to the defined Data key settings form.
                },
                //...
            ]
@@ -72,7 +72,7 @@ For [Alarm widget{:target="_blank"}](${siteBaseUrl}/docs${docPlatformPrefix}/use
                  type: 'alarm', // type of the dataKey. Only "alarm" in this case. 
                  label: 'Severity', // label of the dataKey. Used as display value (for ex. as a column title in the Alarms table) 
                  color: '#ffffff', // color of the key. Can be used by widget to set color of the key data.  
-                 settings: {} // dataKey specific settings with structure according to the defined Data key settings json schema. See "Settings schema section".
+                 settings: {} // dataKey specific settings with structure according to the defined Data key settings form.
             },
             //...
           ] 
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 f187a77d6a..18801bda2c 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1617,6 +1617,92 @@
             "lwm2m-command": "Use the following documentation to connect the device through the LWM2M."
         }
     },
+    "dynamic-form": {
+        "property": {
+            "properties": "Properties",
+            "property": "Property",
+            "id": "Id",
+            "name": "Name",
+            "type": "Type",
+            "type-text": "Text",
+            "type-password": "Password",
+            "type-textarea": "Text area",
+            "type-number": "Number",
+            "type-switch": "Switch",
+            "type-select": "Select",
+            "type-radios": "Radio buttons",
+            "type-datetime": "Date/Time",
+            "type-image": "Image",
+            "type-javascript": "JavaScript",
+            "type-json": "JSON",
+            "type-html": "HTML",
+            "type-css": "CSS",
+            "type-markdown": "Markdown",
+            "type-color": "Color",
+            "type-color-settings": "Color settings",
+            "type-font": "Font",
+            "type-units": "Units",
+            "type-icon": "Icon",
+            "type-fieldset": "Fieldset",
+            "type-array": "Array",
+            "type-html-section": "HTML section",
+            "group-title": "Group title",
+            "no-properties": "No properties configured",
+            "add-property": "Add property",
+            "property-settings": "Property settings",
+            "remove-property": "Remove property",
+            "default-value": "Default value",
+            "value-required": "Value required",
+            "number-settings": "Number settings",
+            "min": "Min",
+            "max": "Max",
+            "step": "Step",
+            "selected-options-limit": "Selected options limit",
+            "advanced-ui-settings": "Advanced UI settings",
+            "disable-on-property": "Disable on property",
+            "display-condition-function": "Display condition function",
+            "sub-label": "Sub label",
+            "vertical-divider-after": "Vertical divider after",
+            "input-field-suffix": "Input field suffix",
+            "property-row-classes": "Property row classes",
+            "property-field-classes": "Property field classes",
+            "not-unique-property-ids-error": "Property Ids must be unique!",
+            "enable-multiple-select": "Enable multiple select",
+            "allow-empty-select-option": "Allow empty option",
+            "select-options": "Select options",
+            "not-unique-select-option-value-error": "Select option values must be unique!",
+            "value": "Value",
+            "label": "Label",
+            "add-option": "Add option",
+            "no-options": "No options configured",
+            "remove-option": "Remove option",
+            "textarea-rows": "Textarea rows",
+            "help-id": "Help id",
+            "buttons-direction": "Buttons direction",
+            "direction-row": "Row",
+            "direction-column": "Column",
+            "radio-button-options": "Radio button options",
+            "datetime-type": "Date/Time field type",
+            "datetime-type-date": "Date",
+            "datetime-type-time": "Time",
+            "datetime-type-datetime": "Date/Time",
+            "enable-clear-button": "Enable clear button",
+            "html-section-settings": "HTML section settings",
+            "html-section-classes": "HTML section classes",
+            "html-section-content": "HTML section content",
+            "array-item": "Array item",
+            "item-type": "Item type",
+            "item-name": "Item name",
+            "no-items": "No items"
+        },
+        "clear-form": "Clear form",
+        "clear-form-prompt": "Are you sure you want to remove all form properties?",
+        "import-form": "Import form from JSON",
+        "export-form": "Export form to JSON",
+        "json-file": "JSON file",
+        "json-content": "JSON content",
+        "invalid-form-json-file-error": "Unable to import form from JSON: Invalid form JSON data structure."
+    },
     "asset-profile": {
         "asset-profile": "Asset profile",
         "asset-profiles": "Asset profiles",
@@ -2501,9 +2587,7 @@
         "select-entity-view": "Select entity view",
         "make-public": "Make entity view public",
         "make-private": "Make entity view private",
-        "start-date": "Start date",
         "start-ts": "Start time",
-        "end-date": "End date",
         "end-ts": "End time",
         "date-limits": "Date limits",
         "client-attributes": "Client attributes",
@@ -3099,38 +3183,6 @@
             "not-unique-behavior-ids-error": "Behavior Ids must be unique!",
             "default-settings": "Default settings"
         },
-        "property": {
-            "property": "Property",
-            "id": "Id",
-            "name": "Name",
-            "type": "Type",
-            "type-text": "Text",
-            "type-number": "Number",
-            "type-switch": "Switch",
-            "type-color": "Color",
-            "type-color-settings": "Color settings",
-            "type-font": "Font",
-            "type-units": "Units",
-            "type-icon": "Icon",
-            "no-properties": "No properties configured",
-            "add-property": "Add property",
-            "property-settings": "Property settings",
-            "remove-property": "Remove property",
-            "default-value": "Default value",
-            "value-required": "Value required",
-            "number-settings": "Number settings",
-            "min": "Min",
-            "max": "Max",
-            "step": "Step",
-            "advanced-ui-settings": "Advanced UI settings",
-            "disable-on-property": "Disable on property",
-            "sub-label": "Sub label",
-            "vertical-divider-after": "Vertical divider after",
-            "input-field-suffix": "Input field suffix",
-            "property-row-classes": "Property row classes",
-            "property-field-classes": "Property field classes",
-            "not-unique-property-ids-error": "Property Ids must be unique!"
-        },
         "symbol": {
             "symbol": "SCADA symbol",
             "fluid-presence": "Fluid presence",
@@ -3166,6 +3218,7 @@
             "bottom-fluid-color": "Bottom fluid color",
             "display": "Display",
             "value": "Value",
+            "decimals": "Decimals",
             "units": "Units",
             "flow-meter-value-hint": "Double value showing on flow meter display",
             "value-hint": "Double value indicating the current value",
@@ -3198,8 +3251,11 @@
             "rotation-animation-speed-hint": "Double value indicating rotation animation speed. 1 - normal speed, 0 - no animation, < 1 - slower animation, > 1 - faster animation.",
             "on-click": "On click",
             "on-click-hint": "Action invoked when user clicks on the component.",
+            "connectors-positions": "Connectors positions",
+            "right-connector": "Right connector",
             "right-top-connector": "Right top connector",
             "right-bottom-connector": "Right bottom connector",
+            "left-connector": "Left connector",
             "left-top-connector": "Left top connector",
             "left-bottom-connector": "Left bottom connector",
             "top-left-connector": "Top left connector",
@@ -3287,6 +3343,8 @@
             "min-max-value": "Min and max value",
             "min-value": "Min",
             "max-value": "Max",
+            "progress-bar": "Progress bar",
+            "progress-arrow": "Progress arrow",
             "warning-scale-color": "Warning scale color",
             "critical-scale-color": "Critical scale color",
             "scale-color": "Scale color",
@@ -3309,7 +3367,65 @@
             "low-critical-state-hint": "Double value indicates a low critical range up to the min value scale.",
             "filter-color": "Filter color",
             "colors": "Colors",
-            "alarm-colors": "Alarm colors"
+            "indicator-colors": "Indicator colors",
+            "enabled": "Enabled",
+            "disabled": "Disabled",
+            "on": "ON",
+            "off": "OFF",
+            "on-off-state": "On/Off state",
+            "on-off-state-hint": "Indicates whether the component is in the On or Off state.",
+            "on-update-state": "On update state",
+            "on-update-state-hint": "Action invoked when the user clicks to update the state to On.",
+            "off-update-state": "Off update state",
+            "off-update-state-hint": "Action invoked when the user clicks to update the state to Off.",
+            "voltage": "Voltage",
+            "input-voltage": "Input voltage",
+            "input-voltage-hint": "Double value indicates input voltage value.",
+            "output-voltage": "Output voltage",
+            "output-voltage-hint": "Double value indicates output voltage value.",
+            "first-phase-voltage": "First phase voltage",
+            "second-phase-voltage": "Second phase voltage",
+            "third-phase-voltage": "Third phase voltage",
+            "phase-voltage-hint": "Double value indicates voltage value for current phase",
+            "voltage-hint": "Double value indicates current voltage",
+            "current-voltage-color": "Current voltage color",
+            "phase-indicator-color": "Phase indicator color",
+            "measured": "Measured",
+            "measured-hint": "Double value indicates energy usage in kilowatt-hours",
+            "day-rate": "Day rate",
+            "night-rate": "Night rate",
+            "off-peak-rate": "Off-peak rate",
+            "peak-rate": "Peak rate",
+            "export-rate": "Export rate",
+            "operating-mode": "Operating mode",
+            "bypass-mode": "Bypass",
+            "operating-mode-hint": "Integer value indication the current operating mode (0 - OFF, 1 - ON, 2 - BYPASS)",
+            "connected": "Connected",
+            "connected-hint": "Indicates whether component is in connected state.",
+            "disconnected": "Disconnected",
+            "indicator": "Indicator",
+            "operation-mode": "Operation mode",
+            "operation-mode-hint": "Indicates whether inverter is in Mains or Inverter mode.",
+            "operation-mode-indicators-color": "Operation mode indicators color",
+            "mains-on-mode": "Mains on",
+            "inverter-on-mode": "Inverter on",
+            "charging-mode": "Charging mode",
+            "charging-mode-hint": "Integer value indication the current charging mode (1 - Bulk, 2 - Absorption, 3 - Float)",
+            "charging-mode-indicators-color": "Charging mode indicators color",
+            "inverter-faults": "Faults",
+            "inverter-fault-indicators-color": "Fault indicators color",
+            "overload-fault": "Overload",
+            "overload-fault-hint": "Indicates whether inverter is in overload condition.",
+            "low-battery-fault": "Low battery",
+            "low-battery-fault-hint": "Indicates whether battery is excessively discharged.",
+            "temperature-fault": "Temperature",
+            "temperature-fault-hint": "Indicates whether high temperature in an inverter.",
+            "triangle": "Triangle",
+            "socket": "Socket",
+            "left-button": "Left button",
+            "right-button": "Right button",
+            "alarm-colors": "Alarm colors",
+            "hook-color": "Hook color"
         }
     },
     "item": {
@@ -3525,6 +3641,8 @@
         "add-bundle": "Add bundle",
         "title": "Title",
         "title-required": "Title is required",
+        "title-cannot-contain-only-spaces": "Title cannot contain only spaces",
+        "title-max-length": "Title should be less than 256",
         "oauth-clients": "OAuth 2.0 clients",
         "android-app": "Android App",
         "android-application": "Android Application",
@@ -3556,6 +3674,7 @@
         "page-name": "Page name",
         "page-name-required": "Page name is required.",
         "page-name-cannot-contain-only-spaces": "Page name cannot contain only spaces.",
+        "page-name-max-length": "Page name should be less than 256",
         "page-type": "Page type",
         "pages-types": {
             "dashboard": "Dashboard",
@@ -4307,6 +4426,760 @@
         "queue-hint": "Select a queue for message forwarding to another queue.  'Main' queue is used by default.",
         "queue-singleton-hint": "Select a queue for message forwarding in multi-instance environments. 'Main' queue is used by default."
     },
+    "rule-node-config": {
+        "id": "Id",
+        "additional-info": "Additional Info",
+        "advanced-settings": "Advanced settings",
+        "create-entity-if-not-exists": "Create new entity if it doesn't exist",
+        "create-entity-if-not-exists-hint": "If enabled, a new entity with specified parameters will be created unless it already exists. Existing entities will be used as is for relation.",
+        "select-device-connectivity-event": "Select device connectivity event",
+        "entity-name-pattern": "Name pattern",
+        "device-name-pattern": "Device name",
+        "asset-name-pattern": "Asset name",
+        "entity-view-name-pattern": "Entity view name",
+        "customer-title-pattern": "Customer title",
+        "dashboard-name-pattern": "Dashboard title",
+        "user-name-pattern": "User email",
+        "edge-name-pattern": "Edge name",
+        "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 title",
+        "customer-name-pattern-required": "Customer title is required",
+        "customer-name-pattern-hint": "Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.",
+        "create-customer-if-not-exists": "Create new customer if it doesn't exist",
+        "unassign-from-customer": "Unassign from specific customer if originator is dashboard",
+        "unassign-from-customer-tooltip": "Only dashboards can be assigned to multiple customers at once. \nIf the message originator is a dashboard, you need to explicitly specify the customer's title to unassign from.",
+        "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",
+        "attributes-scope": "Attributes scope",
+        "attributes-scope-value": "Attributes scope value",
+        "attributes-scope-value-copy": "Copy attributes scope value",
+        "attributes-scope-hint": "Use the 'scope' metadata key to dynamically set the attribute scope per message. If provided, this overrides the scope set in the configuration.",
+        "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": "Time series keys",
+        "timeseries-keys-required": "At least one time series key should be selected.",
+        "add-timeseries-key": "Add time series key",
+        "add-message-field": "Add message field",
+        "relation-search-parameters": "Relation search parameters",
+        "relation-parameters": "Relation 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.",
+        "max-relation-level-invalid": "Value should be an integer.",
+        "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",
+        "fields-mapping-hint": "If the message field is set to $entityId, the message originator's id will be saved to the specified table column.",
+        "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",
+        "default-ttl-required": "Default TTL is required.",
+        "default-ttl-hint": "Rule node will fetch Time-to-Live (TTL) value from the message metadata. If no value is present, it defaults to the TTL specified in the configuration. If the value is set to 0, the TTL from the tenant profile configuration will be applied.",
+        "default-ttl-zero-hint": "TTL will not be applied if its value is set to 0.",
+        "min-default-ttl-message": "Only 0 minimum TTL is allowed.",
+        "generation-parameters": "Generation parameters",
+        "message-count": "Generated messages limit (0 - unlimited)",
+        "message-count-required": "Generated messages limit is required.",
+        "min-message-count-message": "Only 0 minimum message count is allowed.",
+        "period-seconds": "Period in seconds",
+        "period-seconds-required": "Period is required.",
+        "generation-frequency-seconds": "Generation frequency in seconds",
+        "generation-frequency-required": "Generation frequency is required.",
+        "min-generation-frequency-message": "Only 1 second minimum is allowed.",
+        "script-lang-tbel": "TBEL",
+        "script-lang-js": "JS",
+        "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",
+        "current-rule-node": "Current Rule Node",
+        "current-tenant": "Current Tenant",
+        "generator-function": "Generator function",
+        "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",
+        "reply-routing-configuration": "Reply Routing Configuration",
+        "rpc-reply-routing-configuration-hint": "These configuration parameters specify the metadata key names used to identify the service, session, and request for sending a reply back.",
+        "reply-routing-configuration-hint": "These configuration parameters specify the metadata key names used to identify the service and request for sending a reply back.",
+        "request-id-metadata-attribute": "Request Id",
+        "service-id-metadata-attribute": "Service Id",
+        "session-id-metadata-attribute": "Session Id",
+        "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",
+        "max-response-size": "Max response size (in KB)",
+        "max-response-size-hint": "The maximum amount of memory allocated for buffering data when decoding or encoding HTTP messages, such as JSON or XML payloads",
+        "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.",
+        "memory-buffer-size-range": "Memory buffer size must be between 0 and {{max}} KB",
+        "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-with-specific-entity": "Delete relation with specific entity",
+        "delete-relation-with-specific-entity-hint": "If enabled, will delete the relation with just one specific entity. Otherwise, the relation will be removed with all matching entities.",
+        "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.",
+        "int-range": "Value must not exceed the maximum integer limit (2147483648)",
+        "min-interval-seconds-message": "Only 1 second minimum interval is allowed.",
+        "output-timeseries-key-prefix": "Output time series key prefix",
+        "output-timeseries-key-prefix-required": "Output time series key prefix required.",
+        "separator-hint": "You should 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": "The table must be created in your Cassandra cluster and its name must start with the prefix 'cs_tb_' to avoid the data insertion to the common TB tables. Enter the table name here without the 'cs_tb_' prefix.",
+        "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;\"",
+        "ignore-null-strings": "Ignore null strings",
+        "ignore-null-strings-hint": "If selected rule node will ignore entity fields with empty value.",
+        "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.",
+        "device-profile-node-hint": "Useful if you have duration or repeating conditions to ensure continuity of alarm state evaluation.",
+        "persist-alarm-rules": "Persist state of alarm rules",
+        "persist-alarm-rules-hint": "If enabled, the rule node will store the state of processing to the database.",
+        "fetch-alarm-rules": "Fetch state of alarm rules",
+        "fetch-alarm-rules-hint": "If enabled, the rule node will restore the state of processing on initialization and ensure that alarms are raised even after server restarts. Otherwise, the state will be restored when the first message from the device arrives.",
+        "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.",
+        "use-server-ts": "Use server timestamp",
+        "use-server-ts-hint": "Use the server’s current timestamp for time series data that lacks an explicit timestamp. This helps maintain proper ordering when processing messages from multiple sources or when messages arrive out of sequence.",
+        "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.",
+        "kv-map-single-pattern-hint": "Input field 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",
+        "attribute-type-description": "Fetch attribute value from database",
+        "attribute-type-result-description": "Store result as an entity attribute in the database",
+        "constant-type": "Constant",
+        "constant-type-description": "Define constant value",
+        "time-series-type": "Time series",
+        "time-series-type-description": "Fetch latest time-series value from database",
+        "time-series-type-result-description": "Store result as an entity time-series in the database",
+        "message-body-type": "Message",
+        "message-body-type-description": "Fetch argument value from incoming message",
+        "message-body-type-result-description": "Add result to the outgoing message",
+        "message-metadata-type": "Metadata",
+        "message-metadata-type-description": "Fetch argument value from incoming message metadata",
+        "message-metadata-result-description": "Add result to the outgoing message 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": "time series 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 time series from {{startInterval}} {{startIntervalTimeUnit}} ago to {{endInterval}} {{endIntervalTimeUnit}} ago.",
+        "fetch-timeseries-from-to-invalid": "Fetch time series 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 message 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.",
+        "forward-msg-default-rule-chain": "Forward message to the originator's default rule chain",
+        "forward-msg-default-rule-chain-tooltip": "If enabled, message will be forwarded to the originator's default rule chain, or rule chain from configuration, if originator has no default rule chain defined in the entity profile.",
+        "exclude-zero-deltas": "Exclude zero deltas from outbound message",
+        "exclude-zero-deltas-hint": "If enabled, the \"{{outputValueKey}}\" output key will be added to the outbound message if its value is not zero.",
+        "exclude-zero-deltas-time-difference-hint": "If enabled, the \"{{outputValueKey}}\" and \"{{periodValueKey}}\" output keys will be added to the outbound message only if the \"{{outputValueKey}}\" value is not zero.",
+        "search-direction-from": "From originator to target entity",
+        "search-direction-to": "From target entity to originator",
+        "del-relation-direction-from": "From originator",
+        "del-relation-direction-to": "To originator",
+        "target-entity": "Target entity",
+        "function-configuration": "Function configuration",
+        "function-name": "Function name",
+        "function-name-required": "Function name is required.",
+        "qualifier": "Qualifier",
+        "qualifier-hint": "If the qualifier is not specified, the default qualifier \"$LATEST\" will be used.",
+        "aws-credentials": "AWS Credentials",
+        "connection-timeout": "Connection timeout",
+        "connection-timeout-required": "Connection timeout is required.",
+        "connection-timeout-min": "Min connection timeout is 0.",
+        "connection-timeout-hint": "The amount of time to wait in seconds when initially establishing a connection before giving up and timing out. A value of 0 means infinity, and is not recommended.",
+        "request-timeout": "Request timeout",
+        "request-timeout-required": "Request timeout is required",
+        "request-timeout-min": "Min request timeout is 0",
+        "request-timeout-hint": "The amount of time to wait in seconds for the request to complete before giving up and timing out. A value of 0 means infinity, and is not recommended.",
+        "units": "Units",
+        "tell-failure-aws-lambda": "Tell Failure if AWS Lambda function execution raises exception",
+        "tell-failure-aws-lambda-hint": "Rule node forces failure of message processing if AWS Lambda function execution raises exception.",
+        "basic-mode": "Basic",
+        "advanced-mode": "Advanced",
+        "save-time-series": {
+            "processing-settings": "Processing settings",
+            "processing-settings-hint": "Define how incoming messages are processed. In Basic mode, select a preconfigured processing strategy or enable only WebSocket updates. Advanced mode allows you to select individual processing strategies for each action.",
+            "advanced-settings-hint": "Be cautious when configuring processing strategies. Certain combinations can lead to unexpected behavior.",
+            "strategy": "Strategy",
+            "deduplication-interval": "Deduplication interval",
+            "deduplication-interval-required": "Deduplication interval is required",
+            "deduplication-interval-min-max-range": "Deduplication interval should be at least 1 second and at most 1 day",
+            "strategy-type": {
+                "every-message": "On every message",
+                "skip": "Skip",
+                "deduplicate": "Deduplicate",
+                "web-sockets-only": "WebSockets only"
+            },
+            "time-series": "Time series",
+            "latest": "Latest values",
+            "web-sockets": "WebSockets"
+        },
+        "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-types": {
+            "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."
+        }
+    },
     "timezone": {
       "timezone": "Time zone",
       "select-timezone": "Select time zone",
@@ -5439,9 +6312,9 @@
         "html": "HTML",
         "tidy": "Tidy",
         "css": "CSS",
-        "settings-schema": "Settings schema",
-        "datakey-settings-schema": "Data key settings schema",
-        "latest-datakey-settings-schema": "Latest data key settings schema",
+        "settings-form": "Settings form",
+        "data-key-settings-form": "Data key settings form",
+        "latest-data-key-settings-form": "Latest data key settings form",
         "widget-settings": "Widget settings",
         "description": "Description",
         "tags": "Tags",
@@ -5749,6 +6622,8 @@
             "layout-outlined-icon": "Outlined.Icon",
             "main": "Main",
             "background": "Background",
+            "button-icon-on": "Button icon 'On'",
+            "button-icon-off": "Button icon 'Off'",
             "power-on-colors": "Power 'On' colors",
             "power-off-colors": "Power 'Off' colors",
             "disabled-colors": "Disabled colors",
@@ -5801,6 +6676,41 @@
             "preview": "Preview",
             "copy-style-from": "Copy style from"
         },
+        "value-stepper": {
+            "behavior": "Behavior",
+            "simplified": "Simplified",
+            "filled": "Filled",
+            "outlined": "Outlined",
+            "volume": "Volume",
+            "initial-state": "Initial state",
+            "initial-state-hint": "Action to get the initial value.",
+            "disabled-state": "Disabled state",
+            "disabled-state-hint": "Configure condition under which the component is disabled.",
+            "right-button-click": "Right button click",
+            "right-button-click-hint": "Action while pressing on right button.",
+            "left-button-click": "Left button click",
+            "left-button-click-hint": "Action while pressing on left button.",
+            "auto-scale": "Auto scale",
+            "value-range": "Range",
+            "min-range": "Min",
+            "max-range": "Max",
+            "value-increment-decrement-step": "Value increment/decrement step",
+            "value": "Value",
+            "value-box-background": "Value box background",
+            "border": "Border",
+            "button-appearance": "Button appearance",
+            "left": "Left",
+            "right": "Right",
+            "left-button": "Left button",
+            "right-button": "Right button",
+            "icon": "Icon",
+            "color-palette": "Color palette",
+            "main": "Main",
+            "background": "Background",
+            "button-icon-on": "Button icon 'On'",
+            "button-on-colors": "Power 'On' colors",
+            "disabled-colors": "Disabled colors"
+        },
         "button-state": {
             "activated-state": "Activated state",
             "activated-state-hint": "Configure condition under which the button is active.",
@@ -6550,6 +7460,7 @@
             "datakey-value-type-date": "Date",
             "datakey-value-type-time": "Time",
             "datakey-value-type-select": "Select",
+            "datakey-value-type-radio": "Radio",
             "datakey-value-type-color": "Color",
             "value-is-required": "Value is required",
             "ability-to-edit-attribute": "Ability to edit attribute",
@@ -6590,7 +7501,16 @@
             "set-value-function": "setValue function",
             "json-invalid": "JSON value has an invalid format",
             "title": "Title",
-            "cancel-button-label": "'Cancel' button label"
+            "cancel-button-label": "'Cancel' button label",
+            "radio-button-settings": "Radio button settings",
+            "color": "Color",
+            "columns": "Columns",
+            "radio-options": "Radio options",
+            "no-radio-options": "No radio options configured",
+            "add-radio-option": "Add radio option",
+            "radio-label-position": "Label position",
+            "radio-label-position-before": "Before",
+            "radio-label-position-after": "After"
         },
         "invalid-qr-code-text": "Invalid input text for QR code. Input should have a string type",
         "qr-code": {
@@ -7474,15 +8394,18 @@
             "set-attribute": "Set attribute",
             "get-time-series": "Get time series",
             "get-alarm-status": "Get alarm status",
-            "get-dashboard-state": "Get dashboard state",
+            "get-dashboard-state": "Get dashboard state id",
+            "get-dashboard-state-object": "Get dashboard state object",
             "add-time-series": "Add time series",
             "execute-rpc-text": "Execute RPC method '{{methodName}}'",
             "get-time-series-text": "Use time series '{{key}}'",
             "get-attribute-text": "Use attribute '{{key}}'",
             "get-alarm-status-text": "Use alarm status",
             "get-dashboard-state-text": "Use dashboard state",
-            "when-dashboard-state-is-text": "When dashboard state is '{{state}}'",
-            "when-dashboard-state-function-is-text": "When f(dashboard state) is '{{state}}'",
+            "get-dashboard-state-object-text": "Use dashboard state object",
+            "when-dashboard-state-is-text": "When dashboard state id is '{{state}}'",
+            "when-dashboard-state-function-is-text": "When f(dashboard state id) is '{{state}}'",
+            "when-dashboard-state-object-function-is-text": "When f(dashboard state object) is '{{state}}'",
             "set-attribute-to-value-text": "Set '{{key}}' attribute to: {{value}}",
             "add-time-series-value-text": "Add '{{key}}' time series value: {{value}}",
             "set-attribute-text": "Set '{{key}}' attribute",
diff --git a/ui-ngx/src/assets/widget/value-stepper/filled.svg b/ui-ngx/src/assets/widget/value-stepper/filled.svg
new file mode 100644
index 0000000000..26c94b92cd
--- /dev/null
+++ b/ui-ngx/src/assets/widget/value-stepper/filled.svg
@@ -0,0 +1 @@
+<svg width="214" height="76" fill="none" xmlns="http://www.w3.org/2000/svg"><g filter="url(#a)"><rect x="8.5" y="4.5" width="197" height="59" rx="4" fill="#fff" shape-rendering="crispEdges"/><rect x="21" y="18.5" width="31" height="31" rx="15.5" stroke="#305680"/><rect x="24.5" y="22" width="24" height="24" rx="12" fill="#305680"/><path d="m38.5 40 1.41-1.41L35.33 34l4.58-4.59L38.5 28l-6 6 6 6Z" fill="#fff"/><path d="M65 22a3.5 3.5 0 0 1 3.5-3.5h77A3.5 3.5 0 0 1 149 22v24a3.5 3.5 0 0 1-3.5 3.5h-77A3.5 3.5 0 0 1 65 46V22Z" fill="#305680" fill-opacity=".04"/><path d="M65 22a3.5 3.5 0 0 1 3.5-3.5h77A3.5 3.5 0 0 1 149 22v24a3.5 3.5 0 0 1-3.5 3.5h-77A3.5 3.5 0 0 1 65 46V22Z" stroke="#305680"/><path d="M88.59 37.5V39h-7.63v-1.29l3.7-4.04c.41-.46.73-.85.97-1.19.23-.33.4-.63.49-.9a2.3 2.3 0 0 0-.06-1.73c-.13-.27-.32-.5-.58-.65a1.7 1.7 0 0 0-.93-.24c-.42 0-.77.1-1.06.27-.28.19-.5.44-.65.76a2.6 2.6 0 0 0-.22 1.1h-1.88c0-.67.15-1.27.46-1.82.3-.55.73-.99 1.3-1.3a4.1 4.1 0 0 1 2.08-.5c.76 0 1.4.13 1.94.38.53.26.93.62 1.2 1.09a3.36 3.36 0 0 1 .25 2.72 5 5 0 0 1-.49 1.04 9 9 0 0 1-.74 1.04c-.28.35-.6.7-.94 1.05l-2.46 2.71h5.25Zm9.27-9.88v1.04L93.3 39h-1.98l4.54-9.88h-5.9v-1.5h7.89Zm1.98 10.44c0-.29.1-.53.3-.73.2-.2.46-.3.8-.3s.6.1.8.3c.2.2.3.44.3.73a1 1 0 0 1-.3.74c-.2.2-.46.3-.8.3s-.6-.1-.8-.3a1 1 0 0 1-.3-.74Zm6.49-4.35-1.5-.37.61-5.72h6.14v1.6H107l-.32 2.79a3.67 3.67 0 0 1 1.81-.46c.54 0 1.02.09 1.44.26.42.17.79.43 1.08.76.3.33.53.73.68 1.2a5 5 0 0 1 0 3.07 3.17 3.17 0 0 1-1.85 2.03c-.46.19-1.01.29-1.65.29a4.6 4.6 0 0 1-1.36-.2 3.73 3.73 0 0 1-1.17-.62 3.14 3.14 0 0 1-1.19-2.42h1.85c.05.37.15.69.3.95.16.25.38.45.64.58a2 2 0 0 0 .92.2c.32 0 .6-.05.83-.16.23-.11.42-.27.57-.48.15-.22.27-.47.34-.75a3.62 3.62 0 0 0-.02-1.87 1.98 1.98 0 0 0-.38-.72c-.17-.2-.38-.36-.63-.47a2.13 2.13 0 0 0-.88-.17c-.45 0-.8.07-1.04.2-.23.13-.45.29-.65.48Zm11.75-4.16c0-.38.1-.72.28-1.04.19-.32.44-.57.75-.76a1.96 1.96 0 0 1 2.05 0c.31.19.56.44.74.76.19.32.28.66.28 1.04s-.1.73-.28 1.05c-.18.31-.43.56-.74.74a2.04 2.04 0 0 1-2.8-.74 2.03 2.03 0 0 1-.28-1.05Zm1.05 0a1 1 0 0 0 1 1 .97.97 0 0 0 .98-1 1 1 0 0 0-.27-.72.93.93 0 0 0-.7-.3c-.28 0-.51.1-.71.3-.2.2-.3.43-.3.72Zm12.19 5.75h1.95a4.5 4.5 0 0 1-.62 1.99 3.72 3.72 0 0 1-1.5 1.37 5 5 0 0 1-2.33.5 4.15 4.15 0 0 1-3.34-1.45c-.4-.48-.71-1.04-.92-1.7-.21-.66-.32-1.4-.32-2.22v-.95c0-.81.1-1.55.32-2.22.22-.66.53-1.22.94-1.69.4-.47.9-.84 1.46-1.09a4.78 4.78 0 0 1 1.93-.37c.9 0 1.67.17 2.3.5.62.33 1.1.8 1.45 1.38.35.59.56 1.26.64 2.02h-1.95c-.05-.48-.17-.9-.35-1.25a1.77 1.77 0 0 0-.76-.8 2.73 2.73 0 0 0-1.33-.28c-.45 0-.84.08-1.17.25a2.2 2.2 0 0 0-.84.73c-.22.33-.39.72-.5 1.2-.11.47-.17 1-.17 1.6v.97c0 .57.05 1.1.15 1.56.1.47.26.86.47 1.2.21.33.48.59.81.77.33.18.72.27 1.18.27.56 0 1-.08 1.35-.26.35-.18.61-.44.8-.78.17-.34.3-.76.35-1.25Z" fill="#000" fill-opacity=".87"/><rect x="162" y="18.5" width="31" height="31" rx="15.5" stroke="#305680"/><rect x="165.5" y="22" width="24" height="24" rx="12" fill="#305680"/><path d="m175.5 28-1.41 1.41 4.58 4.59-4.58 4.59L175.5 40l6-6-6-6Z" fill="#fff"/></g><defs><filter id="a" x=".5" y=".5" width="213" height="75" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" 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 values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/><feBlend in2="BackgroundImageFix" result="effect1_dropShadow_5669_166705"/><feBlend in="SourceGraphic" in2="effect1_dropShadow_5669_166705" result="shape"/></filter></defs></svg>
\ No newline at end of file
diff --git a/ui-ngx/src/assets/widget/value-stepper/simplified.svg b/ui-ngx/src/assets/widget/value-stepper/simplified.svg
new file mode 100644
index 0000000000..8a71ad47c8
--- /dev/null
+++ b/ui-ngx/src/assets/widget/value-stepper/simplified.svg
@@ -0,0 +1 @@
+<svg width="214" height="76" fill="none" xmlns="http://www.w3.org/2000/svg"><g filter="url(#a)"><rect x="8.83" y="4.5" width="197" height="59" rx="4" fill="#fff" shape-rendering="crispEdges"/><rect x="20.83" y="18" width="32" height="32" rx="16" fill="#305680"/><path d="m38.83 40 1.41-1.41L35.66 34l4.58-4.59-1.4-1.41-6 6 6 6Z" fill="#fff"/><rect x="65.33" y="18.5" width="84" height="31" rx="3.5" fill="#305680" fill-opacity=".04"/><rect x="65.33" y="18.5" width="84" height="31" rx="3.5" stroke="#305680"/><path d="M88.92 37.5V39h-7.63v-1.29l3.7-4.04c.41-.46.73-.85.97-1.19.23-.33.4-.63.49-.9a2.3 2.3 0 0 0-.05-1.73c-.13-.27-.33-.5-.58-.65a1.7 1.7 0 0 0-.93-.24c-.42 0-.78.1-1.06.27-.3.19-.5.44-.65.76a2.6 2.6 0 0 0-.22 1.1h-1.88c0-.67.15-1.27.45-1.82.3-.55.74-.99 1.31-1.3a4.1 4.1 0 0 1 2.07-.5c.76 0 1.4.13 1.94.38.53.26.93.62 1.21 1.09.28.47.42 1.02.42 1.66 0 .36-.06.7-.17 1.06a5 5 0 0 1-.5 1.04c-.2.35-.45.7-.73 1.04-.3.35-.6.7-.95 1.05l-2.46 2.71h5.25Zm9.27-9.88v1.04L93.65 39h-1.99l4.54-9.88h-5.89v-1.5h7.88Zm1.98 10.44c0-.29.1-.53.3-.73.2-.2.46-.3.8-.3s.61.1.8.3c.2.2.3.44.3.73a1 1 0 0 1-.3.74c-.19.2-.46.3-.8.3s-.6-.1-.8-.3a1 1 0 0 1-.3-.74Zm6.5-4.35-1.5-.37.6-5.72h6.14v1.6h-4.57l-.31 2.79a3.67 3.67 0 0 1 1.8-.46c.54 0 1.02.09 1.44.26.43.17.79.43 1.09.76.3.33.52.73.68 1.2a5 5 0 0 1 0 3.07c-.16.45-.38.86-.7 1.2-.3.36-.69.63-1.16.83a4.6 4.6 0 0 1-3.02.09 3.73 3.73 0 0 1-1.16-.62 3.14 3.14 0 0 1-1.18-2.42h1.84c.05.37.15.69.3.95.17.25.38.45.65.58a2 2 0 0 0 .92.2c.32 0 .59-.05.82-.16.23-.11.42-.27.57-.48.16-.22.27-.47.34-.75a3.62 3.62 0 0 0-.01-1.87 1.98 1.98 0 0 0-.39-.72c-.16-.2-.37-.36-.63-.47a2.13 2.13 0 0 0-.88-.17c-.45 0-.8.07-1.03.2-.24.13-.46.29-.66.48Zm11.74-4.16c0-.38.1-.72.28-1.04.19-.32.44-.57.75-.76a1.96 1.96 0 0 1 2.06 0c.3.19.55.44.73.76.19.32.28.66.28 1.04s-.1.73-.28 1.05a1.97 1.97 0 0 1-1.76 1.02 2.04 2.04 0 0 1-1.78-1.02 2.03 2.03 0 0 1-.28-1.05Zm1.06 0a1 1 0 0 0 1 1 .97.97 0 0 0 .98-1 1 1 0 0 0-.28-.72.93.93 0 0 0-.7-.3c-.27 0-.5.1-.7.3-.2.2-.3.43-.3.72Zm12.18 5.75h1.96a4.5 4.5 0 0 1-.63 1.99 3.72 3.72 0 0 1-1.5 1.37 5 5 0 0 1-2.33.5 4.15 4.15 0 0 1-3.34-1.45c-.4-.48-.7-1.04-.92-1.7-.21-.66-.31-1.4-.31-2.22v-.95c0-.81.1-1.55.32-2.22a4.9 4.9 0 0 1 .93-1.69c.4-.47.9-.84 1.46-1.09a4.78 4.78 0 0 1 1.93-.37c.91 0 1.68.17 2.3.5.63.33 1.11.8 1.45 1.38.35.59.57 1.26.64 2.02h-1.95c-.05-.48-.17-.9-.34-1.25a1.77 1.77 0 0 0-.77-.8 2.73 2.73 0 0 0-1.33-.28c-.44 0-.84.08-1.17.25a2.2 2.2 0 0 0-.83.73c-.23.33-.4.72-.51 1.2-.11.47-.17 1-.17 1.6v.97c0 .57.05 1.1.15 1.56.1.47.26.86.47 1.2.22.33.49.59.81.77.33.18.72.27 1.18.27.56 0 1.01-.08 1.35-.26.35-.18.62-.44.8-.78.18-.34.3-.76.35-1.25Z" fill="#000" fill-opacity=".87"/><rect x="161.83" y="18" width="32" height="32" rx="16" fill="#305680"/><path d="m175.83 28-1.4 1.41L179 34l-4.58 4.59 1.41 1.41 6-6-6-6Z" fill="#fff"/></g><defs><filter id="a" x=".83" y=".5" width="213" height="75" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" 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 values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/><feBlend in2="BackgroundImageFix" result="effect1_dropShadow_5669_166701"/><feBlend in="SourceGraphic" in2="effect1_dropShadow_5669_166701" result="shape"/></filter></defs></svg>
\ No newline at end of file
diff --git a/ui-ngx/src/assets/widget/value-stepper/volume.svg b/ui-ngx/src/assets/widget/value-stepper/volume.svg
new file mode 100644
index 0000000000..96bda9fa7a
--- /dev/null
+++ b/ui-ngx/src/assets/widget/value-stepper/volume.svg
@@ -0,0 +1 @@
+<svg width="214" height="76" fill="none" xmlns="http://www.w3.org/2000/svg"><g filter="url(#a)"><rect x="8.17" y="4.5" width="197" height="59" rx="4" fill="#fff" shape-rendering="crispEdges"/><g filter="url(#b)"><rect x="20.17" y="18" width="32" height="32" rx="16" fill="url(#c)" shape-rendering="crispEdges"/><rect x="24.17" y="22" width="24" height="24" rx="12" fill="#305680"/><rect x="24.17" y="22" width="24" height="24" rx="12" stroke="#fff" stroke-width="1.5"/><path d="m38.17 40 1.4-1.41L35 34l4.58-4.59L38.17 28l-6 6 6 6Z" fill="#fff"/></g><path d="M67.16 17.5a3.5 3.5 0 0 0-3.5 3.5v26a3.5 3.5 0 0 0 3.5 3.5h79a3.5 3.5 0 0 0 3.5-3.5V21a3.5 3.5 0 0 0-3.5-3.5h-79Z" fill="#305680" fill-opacity=".04"/><path d="M67.16 17.5a3.5 3.5 0 0 0-3.5 3.5v26a3.5 3.5 0 0 0 3.5 3.5h79a3.5 3.5 0 0 0 3.5-3.5V21a3.5 3.5 0 0 0-3.5-3.5h-79Z" stroke="#305680"/><path d="M88.25 37.5V39h-7.62v-1.29l3.7-4.04c.4-.46.73-.85.96-1.19.24-.33.4-.63.5-.9a2.3 2.3 0 0 0-.06-1.73c-.13-.27-.32-.5-.58-.65a1.7 1.7 0 0 0-.93-.24c-.42 0-.78.1-1.06.27-.29.19-.5.44-.65.76a2.6 2.6 0 0 0-.22 1.1h-1.88c0-.67.15-1.27.45-1.82.3-.55.74-.99 1.31-1.3a4.1 4.1 0 0 1 2.07-.5c.76 0 1.41.13 1.94.38.53.26.94.62 1.21 1.09.28.47.42 1.02.42 1.66 0 .36-.05.7-.17 1.06a5 5 0 0 1-.49 1.04c-.2.35-.46.7-.74 1.04-.29.35-.6.7-.95 1.05L83 37.5h5.25Zm9.28-9.88v1.04L92.98 39h-1.99l4.54-9.88h-5.89v-1.5h7.89Zm1.97 10.44c0-.29.1-.53.3-.73.2-.2.47-.3.8-.3.35 0 .62.1.8.3.2.2.3.44.3.73a1 1 0 0 1-.3.74c-.19.2-.45.3-.8.3-.33 0-.6-.1-.8-.3a1 1 0 0 1-.3-.74Zm6.5-4.35-1.5-.37.61-5.72h6.13v1.6h-4.57l-.3 2.79a3.67 3.67 0 0 1 1.8-.46c.53 0 1.01.09 1.43.26.43.17.8.43 1.09.76.3.33.52.73.68 1.2a5 5 0 0 1 0 3.07 3.17 3.17 0 0 1-1.85 2.03 4.6 4.6 0 0 1-3.02.09 3.73 3.73 0 0 1-1.16-.62 3.14 3.14 0 0 1-1.19-2.42h1.84c.05.37.15.69.3.95.17.25.38.45.65.58a2 2 0 0 0 .92.2c.32 0 .6-.05.82-.16.23-.11.42-.27.57-.48.16-.22.27-.47.35-.75a3.62 3.62 0 0 0-.02-1.87 1.98 1.98 0 0 0-.38-.72c-.17-.2-.38-.36-.64-.47a2.13 2.13 0 0 0-.88-.17c-.45 0-.79.07-1.03.2-.23.13-.45.29-.66.48Zm11.74-4.16a2.14 2.14 0 0 1 1.03-1.8 1.96 1.96 0 0 1 2.06 0c.3.19.55.44.73.76a2.02 2.02 0 0 1 0 2.1c-.18.3-.42.55-.73.73a2.04 2.04 0 0 1-2.8-.74 2.03 2.03 0 0 1-.29-1.05Zm1.06 0a1 1 0 0 0 1 1 .97.97 0 0 0 .98-1 1 1 0 0 0-.28-.72.93.93 0 0 0-.7-.3c-.27 0-.5.1-.7.3-.2.2-.3.43-.3.72Zm12.19 5.75h1.95a4.5 4.5 0 0 1-.63 1.99 3.72 3.72 0 0 1-1.49 1.37 5 5 0 0 1-2.33.5 4.15 4.15 0 0 1-3.34-1.45c-.4-.48-.72-1.04-.93-1.7-.2-.66-.31-1.4-.31-2.22v-.95c0-.81.1-1.55.32-2.22a4.9 4.9 0 0 1 .94-1.69c.4-.47.89-.84 1.46-1.09a4.78 4.78 0 0 1 1.93-.37c.9 0 1.67.17 2.3.5.62.33 1.1.8 1.45 1.38.35.59.56 1.26.64 2.02h-1.96c-.05-.48-.16-.9-.34-1.25a1.77 1.77 0 0 0-.77-.8 2.73 2.73 0 0 0-1.32-.28c-.45 0-.84.08-1.17.25a2.2 2.2 0 0 0-.84.73c-.22.33-.4.72-.5 1.2-.12.47-.17 1-.17 1.6v.97c0 .57.05 1.1.15 1.56.1.47.26.86.46 1.2.22.33.49.59.82.77.33.18.72.27 1.18.27.55 0 1-.08 1.35-.26.35-.18.61-.44.79-.78.18-.34.3-.76.36-1.25Z" fill="#000" fill-opacity=".87"/><g filter="url(#d)"><rect x="161.17" y="18" width="32" height="32" rx="16" fill="url(#e)" shape-rendering="crispEdges"/><rect x="165.17" y="22" width="24" height="24" rx="12" fill="#305680"/><rect x="165.17" y="22" width="24" height="24" rx="12" stroke="#fff" stroke-width="1.5"/><path d="m175.17 28-1.41 1.41 4.58 4.59-4.58 4.59 1.4 1.41 6-6-6-6Z" fill="#fff"/></g></g><defs><filter id="a" x=".17" y=".5" width="213" height="75" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" 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 values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/><feBlend in2="BackgroundImageFix" result="effect1_dropShadow_5875_230652"/><feBlend in="SourceGraphic" in2="effect1_dropShadow_5875_230652" result="shape"/></filter><filter id="b" x="12.17" y="14" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" 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 values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.08 0"/><feBlend in2="BackgroundImageFix" result="effect1_dropShadow_5875_230652"/><feBlend in="SourceGraphic" in2="effect1_dropShadow_5875_230652" result="shape"/></filter><filter id="d" x="153.17" y="14" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" 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 values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.08 0"/><feBlend in2="BackgroundImageFix" result="effect1_dropShadow_5875_230652"/><feBlend in="SourceGraphic" in2="effect1_dropShadow_5875_230652" result="shape"/></filter><linearGradient id="c" x1="26.51" y1="46.83" x2="44.96" y2="21.03" gradientUnits="userSpaceOnUse"><stop stop-color="#CCC"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="e" x1="167.51" y1="46.83" x2="185.96" y2="21.03" gradientUnits="userSpaceOnUse"><stop stop-color="#CCC"/><stop offset="1" stop-color="#fff"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/ui-ngx/src/form.scss b/ui-ngx/src/form.scss
index 4a4d018f26..c73a4fc9b4 100644
--- a/ui-ngx/src/form.scss
+++ b/ui-ngx/src/form.scss
@@ -54,6 +54,16 @@
       padding: 12px;
       gap: 8px;
     }
+    &.no-padding-right {
+      padding-right: 0;
+      .mat-expansion-panel {
+        &.tb-settings {
+          > .mat-expansion-panel-header {
+            padding-right: 16px;
+          }
+        }
+      }
+    }
     &.no-padding-bottom {
       padding-bottom: 0;
     }
@@ -213,7 +223,7 @@
     }
     .mat-divider-vertical {
       height: 56px;
-      margin-top: -7px;
+      margin-top: -9px;
       margin-bottom: -7px;
     }
     .mat-mdc-form-field, tb-unit-input {
@@ -388,6 +398,9 @@
             border-color: rgba(0, 0, 0, 0.12);
           }
         }
+        .mdc-notched-outline__notch {
+          border-left: none;
+        }
         .mdc-floating-label {
           top: 20px;
           font-weight: 400;
diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss
index c394a29826..dbc69fb9dd 100644
--- a/ui-ngx/src/styles.scss
+++ b/ui-ngx/src/styles.scss
@@ -58,6 +58,10 @@ tb-root {
  * TYPE DEFAULTS
  ***************/
 
+* {
+  box-sizing: border-box;
+}
+
 body,
 button,
 html,
diff --git a/ui-ngx/src/tsconfig.app.json b/ui-ngx/src/tsconfig.app.json
index 7a029aa8c7..7c7b2e93d4 100644
--- a/ui-ngx/src/tsconfig.app.json
+++ b/ui-ngx/src/tsconfig.app.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../out-tsc/app",
     "types": ["node", "jquery", "flot", "tooltipster", "tinycolor2", "js-beautify",
-       "react", "react-dom", "raphael", "canvas-gauges", "systemjs"]
+       "raphael", "canvas-gauges", "systemjs"]
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,
diff --git a/ui-ngx/tailwind.config.js b/ui-ngx/tailwind.config.js
index e53b102710..b71b4eb235 100644
--- a/ui-ngx/tailwind.config.js
+++ b/ui-ngx/tailwind.config.js
@@ -93,6 +93,7 @@ module.exports = {
         '0.75': '0.1875rem',
         '1.25': '0.3125rem',
         '3.75': '0.9375rem',
+        '5.5': '1.375rem',
         '6.25': '1.5625rem'
       },
       minHeight: {
@@ -152,6 +153,7 @@ module.exports = {
         '7.5': '1.875rem',
         '25': '6.25rem',
         '37.5': '9.375rem',
+        '50': '12.5rem',
         '62.5': '15.625rem',
         '72.5': '18.125rem'
       },
diff --git a/ui-ngx/tsconfig.json b/ui-ngx/tsconfig.json
index 61712840f4..c667775ba9 100644
--- a/ui-ngx/tsconfig.json
+++ b/ui-ngx/tsconfig.json
@@ -14,7 +14,6 @@
     "target": "ES2022",
     "module": "es2020",
     "emitDecoratorMetadata": true,
-    "jsx": "react",
     "resolveJsonModule": true,
     "typeRoots": [
       "node_modules/@types",
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index b7e5e21e55..01a0062a39 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -34,7 +34,7 @@
     "@angular-devkit/build-angular" "^18.0.0"
     "@angular-devkit/core" "^18.0.0"
 
-"@angular-devkit/architect@0.1802.12", "@angular-devkit/architect@>=0.1800.0 < 0.1900.0":
+"@angular-devkit/architect@0.1802.12", "@angular-devkit/architect@>= 0.1800.0 < 0.1900.0", "@angular-devkit/architect@>=0.1800.0 < 0.1900.0":
   version "0.1802.12"
   resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1802.12.tgz#096f8e9cf71f8848c6f0172c03f3f1135509e133"
   integrity sha512-bepVb2/GtJppYKaeW8yTGE6egmoWZ7zagFDsmBdbF+BYp+HmeoPsclARcdryBPVq68zedyTRdvhWSUTbw1AYuw==
@@ -120,7 +120,7 @@
     "@angular-devkit/architect" "0.1802.12"
     rxjs "7.8.1"
 
-"@angular-devkit/core@18.2.12", "@angular-devkit/core@^18.0.0":
+"@angular-devkit/core@18.2.12", "@angular-devkit/core@>= 18.0.0 < 19.0.0", "@angular-devkit/core@^18.0.0":
   version "18.2.12"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-18.2.12.tgz#fb514e9b3c9ea87ddaa1582d3947f1b094c9b387"
   integrity sha512-NtB6ypsaDyPE6/fqWOdfTmACs+yK5RqfH5tStEzWFeeDsIEDYKsJ06ypuRep7qTjYus5Rmttk0Ds+cFgz8JdUQ==
@@ -132,7 +132,7 @@
     rxjs "7.8.1"
     source-map "0.7.4"
 
-"@angular-devkit/schematics@18.2.12":
+"@angular-devkit/schematics@18.2.12", "@angular-devkit/schematics@>= 18.0.0 < 19.0.0":
   version "18.2.12"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-18.2.12.tgz#15d1a8611bf9f18215435604672411b1929bf4d1"
   integrity sha512-mMea9txHbnCX5lXLHlo0RAgfhFHDio45/jMsREM2PA8UtVf2S8ltXz7ZwUrUyMQRv8vaSfn4ijDstF4hDMnRgQ==
@@ -143,59 +143,64 @@
     ora "5.4.1"
     rxjs "7.8.1"
 
-"@angular-eslint/builder@18.4.2":
-  version "18.4.2"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/builder/-/builder-18.4.2.tgz#28a4833919ede3db0a1d905fd903485588282115"
-  integrity sha512-eyI9sreaM9ukA24PCJoSqsjCYOiBf3TZ/Q1WY8PG0SwQWc03qJNqPl5K+/Ptmsc1RtoDCLCU6uaOBFPhb9lDxw==
+"@angular-eslint/builder@18.4.3":
+  version "18.4.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/builder/-/builder-18.4.3.tgz#800b8a68b464ddfc0d737b0ad38c7804b463d8e1"
+  integrity sha512-NzmrXlr7GFE+cjwipY/CxBscZXNqnuK0us1mO6Z2T6MeH6m+rRcdlY/rZyKoRniyNNvuzl6vpEsfMIMmnfebrA==
+  dependencies:
+    "@angular-devkit/architect" ">= 0.1800.0 < 0.1900.0"
+    "@angular-devkit/core" ">= 18.0.0 < 19.0.0"
 
-"@angular-eslint/bundled-angular-compiler@18.4.2":
-  version "18.4.2"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.4.2.tgz#3d9827d6aea627e77a93b223af1dc56a3ea5e258"
-  integrity sha512-K7pqmZI3Dl75zlLexyaM7bw4xdgk/3bhP1B6uqDKML9+vIIvccCR2bGvqFurqeFbJlMykzb3H4jytT+HpqV4tg==
+"@angular-eslint/bundled-angular-compiler@18.4.3":
+  version "18.4.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.4.3.tgz#0810f76045b854782e6370953cf5324112a65f80"
+  integrity sha512-zdrA8mR98X+U4YgHzUKmivRU+PxzwOL/j8G7eTOvBuq8GPzsP+hvak+tyxlgeGm9HsvpFj9ERHLtJ0xDUPs8fg==
 
-"@angular-eslint/eslint-plugin-template@18.4.2":
-  version "18.4.2"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.4.2.tgz#5cc70866b7d15fcc85f11cf497283969d3a98c9b"
-  integrity sha512-v9msmIdZK6lOEC4ScDeYKFLpszpJ5Ei+8ifkT7fXXKmPaWtPJtMbW+VGOUNm5Ezi+xByAGCn1qU+OF2aJ/4CLw==
+"@angular-eslint/eslint-plugin-template@18.4.3":
+  version "18.4.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.4.3.tgz#3e9820735f087afad193361e3081fad54dbf4e51"
+  integrity sha512-ijGlX2N01ayMXTpeQivOA31AszO8OEbu9ZQUCxnu9AyMMhxyi2q50bujRChAvN9YXQfdQtbxuajxV6+aiWb5BQ==
   dependencies:
-    "@angular-eslint/bundled-angular-compiler" "18.4.2"
-    "@angular-eslint/utils" "18.4.2"
+    "@angular-eslint/bundled-angular-compiler" "18.4.3"
+    "@angular-eslint/utils" "18.4.3"
     aria-query "5.3.2"
     axobject-query "4.1.0"
 
-"@angular-eslint/eslint-plugin@18.4.2":
-  version "18.4.2"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-18.4.2.tgz#c64b016f404521175c9484145f814787c2a31c00"
-  integrity sha512-Oem4W2P54cPADN9rJenLj90rqDPUQWx5kZiz84FCnsSn5DBdsI5LGQoogNT9y3Jx/9VL/VGIMMA5B6qG+0hVlg==
+"@angular-eslint/eslint-plugin@18.4.3":
+  version "18.4.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-18.4.3.tgz#7618bc6056086a98ed4d888f31185fc62e6be2d1"
+  integrity sha512-AyJbupiwTBR81P6T59v+aULEnPpZBCBxL2S5QFWfAhNCwWhcof4GihvdK2Z87yhvzDGeAzUFSWl/beJfeFa+PA==
   dependencies:
-    "@angular-eslint/bundled-angular-compiler" "18.4.2"
-    "@angular-eslint/utils" "18.4.2"
+    "@angular-eslint/bundled-angular-compiler" "18.4.3"
+    "@angular-eslint/utils" "18.4.3"
 
-"@angular-eslint/schematics@18.4.2":
-  version "18.4.2"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/schematics/-/schematics-18.4.2.tgz#2dceb682958faceaf7bdf48cf5484d1546544d56"
-  integrity sha512-pZCc3NhfwRT5S0DGXTzKbl3dD4I8K4LRYot+Aq4rzY5LtiGHDSi4PKu2M0OBSRrQFQXq7/2gDXGO0AvH6LX97w==
+"@angular-eslint/schematics@18.4.3":
+  version "18.4.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/schematics/-/schematics-18.4.3.tgz#1d6e9026e0054d556c37750ccff0ecce701561c1"
+  integrity sha512-D5maKn5e6n58+8n7jLFLD4g+RGPOPeDSsvPc1sqial5tEKLxAJQJS9WZ28oef3bhkob6C60D+1H0mMmEEVvyVA==
   dependencies:
-    "@angular-eslint/eslint-plugin" "18.4.2"
-    "@angular-eslint/eslint-plugin-template" "18.4.2"
+    "@angular-devkit/core" ">= 18.0.0 < 19.0.0"
+    "@angular-devkit/schematics" ">= 18.0.0 < 19.0.0"
+    "@angular-eslint/eslint-plugin" "18.4.3"
+    "@angular-eslint/eslint-plugin-template" "18.4.3"
     ignore "6.0.2"
     semver "7.6.3"
     strip-json-comments "3.1.1"
 
-"@angular-eslint/template-parser@18.4.2":
-  version "18.4.2"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/template-parser/-/template-parser-18.4.2.tgz#9e7d75b53ac8c50bfffeb01dadb297846ebbbed8"
-  integrity sha512-KGjDLUxMsdjaxC+8VTxCG07Q6qshOTWMYTvp2LZ4QBySDQnQuFwsIJIJfU8jJwzJCkPKfVpnyuHggAn7fdYnxA==
+"@angular-eslint/template-parser@18.4.3":
+  version "18.4.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/template-parser/-/template-parser-18.4.3.tgz#2c6c396563a278a6f2dfdb3fbe9d4310ad0c6dc6"
+  integrity sha512-JZMPtEB8yNip3kg4WDEWQyObSo2Hwf+opq2ElYuwe85GQkGhfJSJ2CQYo4FSwd+c5MUQAqESNRg9QqGYauDsiw==
   dependencies:
-    "@angular-eslint/bundled-angular-compiler" "18.4.2"
+    "@angular-eslint/bundled-angular-compiler" "18.4.3"
     eslint-scope "^8.0.2"
 
-"@angular-eslint/utils@18.4.2":
-  version "18.4.2"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/utils/-/utils-18.4.2.tgz#65486d64ba0a6f67fa6c9658812492ed74a1a2e2"
-  integrity sha512-+c0r33QSkAnGmu/DYAPfzJJk5QDX4TP2d6EFtsenrufqRkZqrOcK4Q5t61J92Ukkr03XoqTzTDSBjlwAfM56Rw==
+"@angular-eslint/utils@18.4.3":
+  version "18.4.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/utils/-/utils-18.4.3.tgz#1ad0558b21aaa987ce69604a7624d4b213e84d8c"
+  integrity sha512-w0bJ9+ELAEiPBSTPPm9bvDngfu1d8JbzUhvs2vU+z7sIz/HMwUZT5S4naypj2kNN0gZYGYrW0lt+HIbW87zTAQ==
   dependencies:
-    "@angular-eslint/bundled-angular-compiler" "18.4.2"
+    "@angular-eslint/bundled-angular-compiler" "18.4.3"
 
 "@angular/animations@18.2.13":
   version "18.2.13"
@@ -499,7 +504,7 @@
     "@babel/traverse" "^7.25.9"
     "@babel/types" "^7.25.9"
 
-"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.24.7", "@babel/helper-module-imports@^7.25.9":
+"@babel/helper-module-imports@^7.24.7", "@babel/helper-module-imports@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715"
   integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==
@@ -1296,7 +1301,7 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.25.0", "@babel/runtime@^7.25.6", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+"@babel/runtime@^7.8.4":
   version "7.26.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
   integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
@@ -1382,113 +1387,6 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.6.1.tgz#593da7a17a31a72a874e313677183334a49b01c9"
   integrity sha512-boghen8F0Q8D+0/Q1/1r6DUEieUJ8w2a1gIknExMSHBsJFOr2+0KUfHiVYBvucPwl3+RU5PFBK833FjFCh3BhA==
 
-"@emotion/babel-plugin@^11.12.0":
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.12.0.tgz#7b43debb250c313101b3f885eba634f1d723fcc2"
-  integrity sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/runtime" "^7.18.3"
-    "@emotion/hash" "^0.9.2"
-    "@emotion/memoize" "^0.9.0"
-    "@emotion/serialize" "^1.2.0"
-    babel-plugin-macros "^3.1.0"
-    convert-source-map "^1.5.0"
-    escape-string-regexp "^4.0.0"
-    find-root "^1.1.0"
-    source-map "^0.5.7"
-    stylis "4.2.0"
-
-"@emotion/cache@^11.13.0", "@emotion/cache@^11.13.1":
-  version "11.13.1"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.13.1.tgz#fecfc54d51810beebf05bf2a161271a1a91895d7"
-  integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==
-  dependencies:
-    "@emotion/memoize" "^0.9.0"
-    "@emotion/sheet" "^1.4.0"
-    "@emotion/utils" "^1.4.0"
-    "@emotion/weak-memoize" "^0.4.0"
-    stylis "4.2.0"
-
-"@emotion/hash@^0.9.2":
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.2.tgz#ff9221b9f58b4dfe61e619a7788734bd63f6898b"
-  integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==
-
-"@emotion/is-prop-valid@^1.3.0":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.3.1.tgz#8d5cf1132f836d7adbe42cf0b49df7816fc88240"
-  integrity sha512-/ACwoqx7XQi9knQs/G0qKvv5teDMhD7bXYns9N/wM8ah8iNb8jZ2uNO0YOgiq2o2poIvVtJS2YALasQuMSQ7Kw==
-  dependencies:
-    "@emotion/memoize" "^0.9.0"
-
-"@emotion/memoize@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.9.0.tgz#745969d649977776b43fc7648c556aaa462b4102"
-  integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==
-
-"@emotion/react@11.13.3":
-  version "11.13.3"
-  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.13.3.tgz#a69d0de2a23f5b48e0acf210416638010e4bd2e4"
-  integrity sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg==
-  dependencies:
-    "@babel/runtime" "^7.18.3"
-    "@emotion/babel-plugin" "^11.12.0"
-    "@emotion/cache" "^11.13.0"
-    "@emotion/serialize" "^1.3.1"
-    "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0"
-    "@emotion/utils" "^1.4.0"
-    "@emotion/weak-memoize" "^0.4.0"
-    hoist-non-react-statics "^3.3.1"
-
-"@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0", "@emotion/serialize@^1.3.1":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.3.2.tgz#e1c1a2e90708d5d85d81ccaee2dfeb3cc0cccf7a"
-  integrity sha512-grVnMvVPK9yUVE6rkKfAJlYZgo0cu3l9iMC77V7DW6E1DUIrU68pSEXRmFZFOFB1QFo57TncmOcvcbMDWsL4yA==
-  dependencies:
-    "@emotion/hash" "^0.9.2"
-    "@emotion/memoize" "^0.9.0"
-    "@emotion/unitless" "^0.10.0"
-    "@emotion/utils" "^1.4.1"
-    csstype "^3.0.2"
-
-"@emotion/sheet@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.4.0.tgz#c9299c34d248bc26e82563735f78953d2efca83c"
-  integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==
-
-"@emotion/styled@11.13.0":
-  version "11.13.0"
-  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.13.0.tgz#633fd700db701472c7a5dbef54d6f9834e9fb190"
-  integrity sha512-tkzkY7nQhW/zC4hztlwucpT8QEZ6eUzpXDRhww/Eej4tFfO0FxQYWRyg/c5CCXa4d/f174kqeXYjuQRnhzf6dA==
-  dependencies:
-    "@babel/runtime" "^7.18.3"
-    "@emotion/babel-plugin" "^11.12.0"
-    "@emotion/is-prop-valid" "^1.3.0"
-    "@emotion/serialize" "^1.3.0"
-    "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0"
-    "@emotion/utils" "^1.4.0"
-
-"@emotion/unitless@^0.10.0":
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.10.0.tgz#2af2f7c7e5150f497bdabd848ce7b218a27cf745"
-  integrity sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==
-
-"@emotion/use-insertion-effect-with-fallbacks@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz#1a818a0b2c481efba0cf34e5ab1e0cb2dcb9dfaf"
-  integrity sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==
-
-"@emotion/utils@^1.4.0", "@emotion/utils@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.4.1.tgz#b3adbb43de12ee2149541c4f1337d2eb7774f0ad"
-  integrity sha512-BymCXzCG3r72VKJxaYVwOXATqXIZ85cuvg0YOUDxMGNrKc1DJRZk8MgV5wyXRyEayIMd4FuXJIUgTBXvDNW5cA==
-
-"@emotion/weak-memoize@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz#5e13fac887f08c44f76b0ccaf3370eb00fec9bb6"
-  integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==
-
 "@es-joy/jsdoccomment@~0.49.0":
   version "0.49.0"
   resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.49.0.tgz#e5ec1eda837c802eca67d3b29e577197f14ba1db"
@@ -1631,18 +1529,20 @@
   integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
 
 "@eslint/config-array@^0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.19.0.tgz#3251a528998de914d59bb21ba4c11767cf1b3519"
-  integrity sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.19.1.tgz#734aaea2c40be22bbb1f2a9dac687c57a6a4c984"
+  integrity sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==
   dependencies:
-    "@eslint/object-schema" "^2.1.4"
+    "@eslint/object-schema" "^2.1.5"
     debug "^4.3.1"
     minimatch "^3.1.2"
 
 "@eslint/core@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.9.0.tgz#168ee076f94b152c01ca416c3e5cf82290ab4fcd"
-  integrity sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.9.1.tgz#31763847308ef6b7084a4505573ac9402c51f9d1"
+  integrity sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==
+  dependencies:
+    "@types/json-schema" "^7.0.15"
 
 "@eslint/eslintrc@^3.2.0":
   version "3.2.0"
@@ -1659,50 +1559,23 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@9.15.0":
-  version "9.15.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.15.0.tgz#df0e24fe869143b59731942128c19938fdbadfb5"
-  integrity sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==
+"@eslint/js@9.17.0":
+  version "9.17.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.17.0.tgz#1523e586791f80376a6f8398a3964455ecc651ec"
+  integrity sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==
 
-"@eslint/object-schema@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843"
-  integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==
+"@eslint/object-schema@^2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.5.tgz#8670a8f6258a2be5b2c620ff314a1d984c23eb2e"
+  integrity sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==
 
 "@eslint/plugin-kit@^0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz#812980a6a41ecf3a8341719f92a6d1e784a2e0e8"
-  integrity sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz#2b78e7bb3755784bb13faa8932a1d994d6537792"
+  integrity sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==
   dependencies:
     levn "^0.4.1"
 
-"@floating-ui/core@^1.6.0":
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.8.tgz#aa43561be075815879305965020f492cdb43da12"
-  integrity sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==
-  dependencies:
-    "@floating-ui/utils" "^0.2.8"
-
-"@floating-ui/dom@^1.0.0":
-  version "1.6.11"
-  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.11.tgz#8631857838d34ee5712339eb7cbdfb8ad34da723"
-  integrity sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==
-  dependencies:
-    "@floating-ui/core" "^1.6.0"
-    "@floating-ui/utils" "^0.2.8"
-
-"@floating-ui/react-dom@^2.1.1":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.1.2.tgz#a1349bbf6a0e5cb5ded55d023766f20a4d439a31"
-  integrity sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==
-  dependencies:
-    "@floating-ui/dom" "^1.0.0"
-
-"@floating-ui/utils@^0.2.8":
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.8.tgz#21a907684723bbbaa5f0974cf7730bd797eb8e62"
-  integrity sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==
-
 "@flowjs/flow.js@^2.14.1":
   version "2.14.1"
   resolved "https://registry.yarnpkg.com/@flowjs/flow.js/-/flow.js-2.14.1.tgz#267d9f9d0958f32267ea5815c2a7cc09b9219304"
@@ -2150,181 +2023,6 @@
   resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz#0aa5502d547b57abfc4ac492de68e2006e417242"
   integrity sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==
 
-"@mui/base@5.0.0-beta.58":
-  version "5.0.0-beta.58"
-  resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.58.tgz#66ae4e1aaef8cfd9ae81bd55a70ce76b02eb5d3e"
-  integrity sha512-P0E7ZrxOuyYqBvVv9w8k7wm+Xzx/KRu+BGgFcR2htTsGCpJNQJCSUXNUZ50MUmSU9hzqhwbQWNXhV1MBTl6F7A==
-  dependencies:
-    "@babel/runtime" "^7.25.0"
-    "@floating-ui/react-dom" "^2.1.1"
-    "@mui/types" "^7.2.15"
-    "@mui/utils" "6.0.0-rc.0"
-    "@popperjs/core" "^2.11.8"
-    clsx "^2.1.1"
-    prop-types "^15.8.1"
-
-"@mui/core-downloads-tracker@^6.1.2":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-6.1.2.tgz#a15eb14d433100f734e56929f842c2ccc7cab691"
-  integrity sha512-1oE4U38/TtzLWRYWEm/m70dUbpcvBx0QvDVg6NtpOmSNQC1Mbx0X/rNvYDdZnn8DIsAiVQ+SZ3am6doSswUQ4g==
-
-"@mui/icons-material@6.1.2":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-6.1.2.tgz#3e4537c312687afbdd2fd289d5412731d5da3d11"
-  integrity sha512-7NNcjW5JoT9jHagrVbARA1o41vQY2xezDamtke+mEKKZmsJyejfRBOacSrPDfjZQ//lyhIjNKyzAwisxYJR47w==
-  dependencies:
-    "@babel/runtime" "^7.25.6"
-
-"@mui/lab@6.0.0-beta.10":
-  version "6.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-6.0.0-beta.10.tgz#cf6dce21e8491aa00facc0d6b1cd357bfb2ed58e"
-  integrity sha512-eqCBz5SZS8Un9To3UcjH01AxkOOgvme/g0ZstFC8Nz1Kg5/EJMA0ByhKS5AvUMzUKrv0FXMdbuPqbBvF3bVrXg==
-  dependencies:
-    "@babel/runtime" "^7.25.6"
-    "@mui/base" "5.0.0-beta.58"
-    "@mui/system" "^6.1.1"
-    "@mui/types" "^7.2.17"
-    "@mui/utils" "^6.1.1"
-    clsx "^2.1.1"
-    prop-types "^15.8.1"
-
-"@mui/material@6.1.2":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@mui/material/-/material-6.1.2.tgz#9f47bfa6adcf3b8245799cbf4c027e3cb949bcc6"
-  integrity sha512-5TtHeAVX9D5d2LYfB1GAUn29BcVETVsrQ76Dwb2SpAfQGW3JVy4deJCAd0RrIkI3eEUrsl0E4xuBdreszxdTTg==
-  dependencies:
-    "@babel/runtime" "^7.25.6"
-    "@mui/core-downloads-tracker" "^6.1.2"
-    "@mui/system" "^6.1.2"
-    "@mui/types" "^7.2.17"
-    "@mui/utils" "^6.1.2"
-    "@popperjs/core" "^2.11.8"
-    "@types/react-transition-group" "^4.4.11"
-    clsx "^2.1.1"
-    csstype "^3.1.3"
-    prop-types "^15.8.1"
-    react-is "^18.3.1"
-    react-transition-group "^4.4.5"
-
-"@mui/private-theming@^6.1.2":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-6.1.2.tgz#1e093c7194dd9f8a511179e0e5c5b10798a4bfae"
-  integrity sha512-S8WcjZdNdi++8UhrrY8Lton5h/suRiQexvdTfdcPAlbajlvgM+kx+uJstuVIEyTb3gMkxzIZep87knZ0tqcR0g==
-  dependencies:
-    "@babel/runtime" "^7.25.6"
-    "@mui/utils" "^6.1.2"
-    prop-types "^15.8.1"
-
-"@mui/styled-engine@^6.1.2":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-6.1.2.tgz#bef156ac2e47a67d49982ddb5fa4211974740a26"
-  integrity sha512-uKOfWkR23X39xj7th2nyTcCHqInTAXtUnqD3T5qRVdJcOPvu1rlgTleTwJC/FJvWZJBU6ieuTWDhbcx5SNViHQ==
-  dependencies:
-    "@babel/runtime" "^7.25.6"
-    "@emotion/cache" "^11.13.1"
-    "@emotion/sheet" "^1.4.0"
-    csstype "^3.1.3"
-    prop-types "^15.8.1"
-
-"@mui/styles@6.1.2":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-6.1.2.tgz#24bc654cdb0aae369348453ee8d25e3a9c1ace56"
-  integrity sha512-fsQkTCyyBnjsmy7CM0LG95PJZAhTsmoC/iNk4ihVYmdubMQEeGXzeAWL8E6QBChCnANmjZwm2h5ENyLnCUUuzg==
-  dependencies:
-    "@babel/runtime" "^7.25.6"
-    "@emotion/hash" "^0.9.2"
-    "@mui/private-theming" "^6.1.2"
-    "@mui/types" "^7.2.17"
-    "@mui/utils" "^6.1.2"
-    clsx "^2.1.1"
-    csstype "^3.1.3"
-    hoist-non-react-statics "^3.3.2"
-    jss "^10.10.0"
-    jss-plugin-camel-case "^10.10.0"
-    jss-plugin-default-unit "^10.10.0"
-    jss-plugin-global "^10.10.0"
-    jss-plugin-nested "^10.10.0"
-    jss-plugin-props-sort "^10.10.0"
-    jss-plugin-rule-value-function "^10.10.0"
-    jss-plugin-vendor-prefixer "^10.10.0"
-    prop-types "^15.8.1"
-
-"@mui/system@6.1.2", "@mui/system@^6.1.1", "@mui/system@^6.1.2":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@mui/system/-/system-6.1.2.tgz#28840b04c6fc70780620759d67de2c20bdc7d1c7"
-  integrity sha512-mzW7F1ZMIYS1aLON48Nrk9c65OrVEVQ+R4lUcTWs1lCSul0VGK23eo4dmY0NX5PS7Oe4xz3P5B9tQZZ7SYgxcg==
-  dependencies:
-    "@babel/runtime" "^7.25.6"
-    "@mui/private-theming" "^6.1.2"
-    "@mui/styled-engine" "^6.1.2"
-    "@mui/types" "^7.2.17"
-    "@mui/utils" "^6.1.2"
-    clsx "^2.1.1"
-    csstype "^3.1.3"
-    prop-types "^15.8.1"
-
-"@mui/types@^7.2.15", "@mui/types@^7.2.17":
-  version "7.2.17"
-  resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.17.tgz#329826062d4079de5ea2b97007575cebbba1fdbc"
-  integrity sha512-oyumoJgB6jDV8JFzRqjBo2daUuHpzDjoO/e3IrRhhHo/FxJlaVhET6mcNrKHUq2E+R+q3ql0qAtvQ4rfWHhAeQ==
-
-"@mui/utils@6.0.0-rc.0":
-  version "6.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-6.0.0-rc.0.tgz#208c12c919b5cd1731f9d14784c05c35294a893e"
-  integrity sha512-tBp0ILEXDL0bbDDT8PnZOjCqSm5Dfk2N0Z45uzRw+wVl6fVvloC9zw8avl+OdX1Bg3ubs/ttKn8nRNv17bpM5A==
-  dependencies:
-    "@babel/runtime" "^7.25.0"
-    "@mui/types" "^7.2.15"
-    "@types/prop-types" "^15.7.12"
-    clsx "^2.1.1"
-    prop-types "^15.8.1"
-    react-is "^18.3.1"
-
-"@mui/utils@^5.16.6":
-  version "5.16.6"
-  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.16.6.tgz#905875bbc58d3dcc24531c3314a6807aba22a711"
-  integrity sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA==
-  dependencies:
-    "@babel/runtime" "^7.23.9"
-    "@mui/types" "^7.2.15"
-    "@types/prop-types" "^15.7.12"
-    clsx "^2.1.1"
-    prop-types "^15.8.1"
-    react-is "^18.3.1"
-
-"@mui/utils@^6.1.1", "@mui/utils@^6.1.2":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-6.1.2.tgz#3717cd9373324a92e48c34f74385350104be652c"
-  integrity sha512-6+B1YZ8cCBWD1fc3RjqpclF9UA0MLUiuXhyCO+XowD/Z2ku5IlxeEhHHlgglyBWFGMu4kib4YU3CDsG5/zVjJQ==
-  dependencies:
-    "@babel/runtime" "^7.25.6"
-    "@mui/types" "^7.2.17"
-    "@types/prop-types" "^15.7.13"
-    clsx "^2.1.1"
-    prop-types "^15.8.1"
-    react-is "^18.3.1"
-
-"@mui/x-date-pickers@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-7.18.0.tgz#264158195aeeaf32a00519718f6c67c165b06711"
-  integrity sha512-12tXIoMj9vpS8fS/bS3kWPCoVrH38vNGCxgplI0vOnUrN9rJuYJz3agLPJe1S0xciTw+9W8ZSe3soaW+owoz1Q==
-  dependencies:
-    "@babel/runtime" "^7.25.6"
-    "@mui/utils" "^5.16.6"
-    "@mui/x-internals" "7.18.0"
-    "@types/react-transition-group" "^4.4.11"
-    clsx "^2.1.1"
-    prop-types "^15.8.1"
-    react-transition-group "^4.4.5"
-
-"@mui/x-internals@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@mui/x-internals/-/x-internals-7.18.0.tgz#f079968d4f7ea93e63be9faf6ba8558d6f12923b"
-  integrity sha512-lzCHOWIR0cAIY1bGrWSprYerahbnH5C31ql/2OWCEjcngL2NAV1M6oKI2Vp4HheqzJ822c60UyWyapvyjSzY/A==
-  dependencies:
-    "@babel/runtime" "^7.25.6"
-    "@mui/utils" "^5.16.6"
-
 "@nghedgehog/core@^0.0.4":
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/@nghedgehog/core/-/core-0.0.4.tgz#4e3231847d0dac557a2e2dbdf1e3a52b106dd57c"
@@ -2482,32 +2180,6 @@
   resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31"
   integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==
 
-"@popperjs/core@^2.11.8":
-  version "2.11.8"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
-  integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
-
-"@rc-component/portal@^1.1.0":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@rc-component/portal/-/portal-1.1.2.tgz#55db1e51d784e034442e9700536faaa6ab63fc71"
-  integrity sha512-6f813C0IsasTZms08kfA8kPAGxbbkYToa8ALaiDIGGECU4i9hj8Plgbx0sNJDrey3EtHO30hmdaxtT0138xZcg==
-  dependencies:
-    "@babel/runtime" "^7.18.0"
-    classnames "^2.3.2"
-    rc-util "^5.24.4"
-
-"@rc-component/trigger@^2.1.1":
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/@rc-component/trigger/-/trigger-2.2.3.tgz#b47e945115e2d0a7f7e067dbb9ed76c91c1b4385"
-  integrity sha512-X1oFIpKoXAMXNDYCviOmTfuNuYxE4h5laBsyCqVAVMjNHxoF3/uiyA7XdegK1XbCvBbCZ6P6byWrEoDRpKL8+A==
-  dependencies:
-    "@babel/runtime" "^7.23.2"
-    "@rc-component/portal" "^1.1.0"
-    classnames "^2.3.2"
-    rc-motion "^2.0.0"
-    rc-resize-observer "^1.3.1"
-    rc-util "^5.38.0"
-
 "@rollup/rollup-android-arm-eabi@4.22.4":
   version "4.22.4"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz#8b613b9725e8f9479d142970b106b6ae878610d5"
@@ -3118,16 +2790,6 @@
   dependencies:
     undici-types "~6.19.2"
 
-"@types/parse-json@^4.0.0":
-  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@*", "@types/prop-types@^15.7.12", "@types/prop-types@^15.7.13":
-  version "15.7.13"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.13.tgz#2af91918ee12d9d32914feb13f5326658461b451"
-  integrity sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==
-
 "@types/qs@*":
   version "6.9.16"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.16.tgz#52bba125a07c0482d26747d5d4947a64daf8f794"
@@ -3143,28 +2805,6 @@
   resolved "https://registry.yarnpkg.com/@types/raphael/-/raphael-2.3.9.tgz#d53bb8930431524f42987a8a19815c0d42a61eb5"
   integrity sha512-K1dZwoLNvEN+mvleFU/t2swG9Z4SE5Vub7dA5wDYojH0bVTQ8ZAP+lNsl91t1njdu/B+roSEL4QXC67I7Hpiag==
 
-"@types/react-dom@18.3.0":
-  version "18.3.0"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0"
-  integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react-transition-group@^4.4.11":
-  version "4.4.11"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.11.tgz#d963253a611d757de01ebb241143b1017d5d63d5"
-  integrity sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react@*", "@types/react@18.3.10":
-  version "18.3.10"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.10.tgz#6edc26dc22ff8c9c226d3c7bf8357b013c842219"
-  integrity sha512-02sAAlBnP39JgXwkAq3PeU9DVaaGpZyF3MGcC0MKgQVkZor5IiiDAipVaxQHtDJAmO4GIy/rVBy/LzVj76Cyqg==
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^3.0.2"
-
 "@types/retry@0.12.2":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a"
@@ -3235,62 +2875,62 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^8.16.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.16.0.tgz#ac56825bcdf3b392fc76a94b1315d4a162f201a6"
-  integrity sha512-5YTHKV8MYlyMI6BaEG7crQ9BhSc8RxzshOReKwZwRWN0+XvvTOm+L/UYLCYxFpfwYuAAqhxiq4yae0CMFwbL7Q==
+"@typescript-eslint/eslint-plugin@8.18.1":
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.1.tgz#992e5ac1553ce20d0d46aa6eccd79dc36dedc805"
+  integrity sha512-Ncvsq5CT3Gvh+uJG0Lwlho6suwDfUXH0HztslDf5I+F2wAFAZMRwYLEorumpKLzmO2suAXZ/td1tBg4NZIi9CQ==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "8.16.0"
-    "@typescript-eslint/type-utils" "8.16.0"
-    "@typescript-eslint/utils" "8.16.0"
-    "@typescript-eslint/visitor-keys" "8.16.0"
+    "@typescript-eslint/scope-manager" "8.18.1"
+    "@typescript-eslint/type-utils" "8.18.1"
+    "@typescript-eslint/utils" "8.18.1"
+    "@typescript-eslint/visitor-keys" "8.18.1"
     graphemer "^1.4.0"
     ignore "^5.3.1"
     natural-compare "^1.4.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/parser@^8.16.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.16.0.tgz#ee5b2d6241c1ab3e2e53f03fd5a32d8e266d8e06"
-  integrity sha512-D7DbgGFtsqIPIFMPJwCad9Gfi/hC0PWErRRHFnaCWoEDYi5tQUDiJCTmGUbBiLzjqAck4KcXt9Ayj0CNlIrF+w==
+"@typescript-eslint/parser@8.18.1":
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.18.1.tgz#c258bae062778b7696793bc492249027a39dfb95"
+  integrity sha512-rBnTWHCdbYM2lh7hjyXqxk70wvon3p2FyaniZuey5TrcGBpfhVp0OxOa6gxr9Q9YhZFKyfbEnxc24ZnVbbUkCA==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.16.0"
-    "@typescript-eslint/types" "8.16.0"
-    "@typescript-eslint/typescript-estree" "8.16.0"
-    "@typescript-eslint/visitor-keys" "8.16.0"
+    "@typescript-eslint/scope-manager" "8.18.1"
+    "@typescript-eslint/types" "8.18.1"
+    "@typescript-eslint/typescript-estree" "8.18.1"
+    "@typescript-eslint/visitor-keys" "8.18.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@8.16.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.16.0.tgz#ebc9a3b399a69a6052f3d88174456dd399ef5905"
-  integrity sha512-mwsZWubQvBki2t5565uxF0EYvG+FwdFb8bMtDuGQLdCCnGPrDEDvm1gtfynuKlnpzeBRqdFCkMf9jg1fnAK8sg==
+"@typescript-eslint/scope-manager@8.18.1":
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.18.1.tgz#52cedc3a8178d7464a70beffed3203678648e55b"
+  integrity sha512-HxfHo2b090M5s2+/9Z3gkBhI6xBH8OJCFjH9MhQ+nnoZqxU3wNxkLT+VWXWSFWc3UF3Z+CfPAyqdCTdoXtDPCQ==
   dependencies:
-    "@typescript-eslint/types" "8.16.0"
-    "@typescript-eslint/visitor-keys" "8.16.0"
+    "@typescript-eslint/types" "8.18.1"
+    "@typescript-eslint/visitor-keys" "8.18.1"
 
-"@typescript-eslint/type-utils@8.16.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.16.0.tgz#585388735f7ac390f07c885845c3d185d1b64740"
-  integrity sha512-IqZHGG+g1XCWX9NyqnI/0CX5LL8/18awQqmkZSl2ynn8F76j579dByc0jhfVSnSnhf7zv76mKBQv9HQFKvDCgg==
+"@typescript-eslint/type-utils@8.18.1":
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.18.1.tgz#10f41285475c0bdee452b79ff7223f0e43a7781e"
+  integrity sha512-jAhTdK/Qx2NJPNOTxXpMwlOiSymtR2j283TtPqXkKBdH8OAMmhiUfP0kJjc/qSE51Xrq02Gj9NY7MwK+UxVwHQ==
   dependencies:
-    "@typescript-eslint/typescript-estree" "8.16.0"
-    "@typescript-eslint/utils" "8.16.0"
+    "@typescript-eslint/typescript-estree" "8.18.1"
+    "@typescript-eslint/utils" "8.18.1"
     debug "^4.3.4"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/types@8.16.0", "@typescript-eslint/types@^8.16.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.16.0.tgz#49c92ae1b57942458ab83d9ec7ccab3005e64737"
-  integrity sha512-NzrHj6thBAOSE4d9bsuRNMvk+BvaQvmY4dDglgkgGC0EW/tB3Kelnp3tAKH87GEwzoxgeQn9fNGRyFJM/xd+GQ==
+"@typescript-eslint/types@8.18.1", "@typescript-eslint/types@^8.0.0":
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.18.1.tgz#d7f4f94d0bba9ebd088de840266fcd45408a8fff"
+  integrity sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==
 
-"@typescript-eslint/typescript-estree@8.16.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.16.0.tgz#9d741e56e5b13469b5190e763432ce5551a9300c"
-  integrity sha512-E2+9IzzXMc1iaBy9zmo+UYvluE3TW7bCGWSF41hVWUE01o8nzr1rvOQYSxelxr6StUvRcTMe633eY8mXASMaNw==
+"@typescript-eslint/typescript-estree@8.18.1":
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.1.tgz#2a86cd64b211a742f78dfa7e6f4860413475367e"
+  integrity sha512-z8U21WI5txzl2XYOW7i9hJhxoKKNG1kcU4RzyNvKrdZDmbjkmLBo8bgeiOJmA06kizLI76/CCBAAGlTlEeUfyg==
   dependencies:
-    "@typescript-eslint/types" "8.16.0"
-    "@typescript-eslint/visitor-keys" "8.16.0"
+    "@typescript-eslint/types" "8.18.1"
+    "@typescript-eslint/visitor-keys" "8.18.1"
     debug "^4.3.4"
     fast-glob "^3.3.2"
     is-glob "^4.0.3"
@@ -3298,22 +2938,22 @@
     semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/utils@8.16.0", "@typescript-eslint/utils@^8.16.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.16.0.tgz#c71264c437157feaa97842809836254a6fc833c3"
-  integrity sha512-C1zRy/mOL8Pj157GiX4kaw7iyRLKfJXBR3L82hk5kS/GyHcOFmy4YUq/zfZti72I9wnuQtA/+xzft4wCC8PJdA==
+"@typescript-eslint/utils@8.18.1", "@typescript-eslint/utils@^8.0.0":
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.18.1.tgz#c4199ea23fc823c736e2c96fd07b1f7235fa92d5"
+  integrity sha512-8vikiIj2ebrC4WRdcAdDcmnu9Q/MXXwg+STf40BVfT8exDqBCUPdypvzcUPxEqRGKg9ALagZ0UWcYCtn+4W2iQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "8.16.0"
-    "@typescript-eslint/types" "8.16.0"
-    "@typescript-eslint/typescript-estree" "8.16.0"
+    "@typescript-eslint/scope-manager" "8.18.1"
+    "@typescript-eslint/types" "8.18.1"
+    "@typescript-eslint/typescript-estree" "8.18.1"
 
-"@typescript-eslint/visitor-keys@8.16.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.16.0.tgz#d5086afc060b01ff7a4ecab8d49d13d5a7b07705"
-  integrity sha512-pq19gbaMOmFE3CbL0ZB8J8BFCo2ckfHBfaIsaOZgBIF4EoISJIdLX5xRhd0FGB0LlHReNRuzoJoMGpTjq8F2CQ==
+"@typescript-eslint/visitor-keys@8.18.1":
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.1.tgz#344b4f6bc83f104f514676facf3129260df7610a"
+  integrity sha512-Vj0WLm5/ZsD013YeUKn+K0y8p1M0jPpxOkKdbD1wB0ns53a5piVY02zjf072TblEweAbcYiFiPoSMF3kp+VhhQ==
   dependencies:
-    "@typescript-eslint/types" "8.16.0"
+    "@typescript-eslint/types" "8.18.1"
     eslint-visitor-keys "^4.2.0"
 
 "@vitejs/plugin-basic-ssl@1.1.0":
@@ -3470,7 +3110,7 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-ace-builds@1.36.5, ace-builds@^1.32.8:
+ace-builds@1.36.5:
   version "1.36.5"
   resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.36.5.tgz#ae9cc7a32eccc2f484926131c00545cd6b78a6a6"
   integrity sha512-mZ5KVanRT6nLRDLqtG/1YQQLX/gZVC/v526cm1Ru/MTSlrbweSmqv2ZT0d2GaHpJq035MwCMIrj+LgDAUnDXrg==
@@ -3573,6 +3213,21 @@ ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+angular-eslint@~18.4.3:
+  version "18.4.3"
+  resolved "https://registry.yarnpkg.com/angular-eslint/-/angular-eslint-18.4.3.tgz#d149df075304af9d4f57661c6886b0e1135c2f2b"
+  integrity sha512-0ZjLzzADGRLUhZC8ZpwSo6CE/m6QhQB/oljMJ0mEfP+lB1sy1v8PBKNsJboIcfEEgGW669Z/efVQ3df88yJLYg==
+  dependencies:
+    "@angular-devkit/core" ">= 18.0.0 < 19.0.0"
+    "@angular-devkit/schematics" ">= 18.0.0 < 19.0.0"
+    "@angular-eslint/builder" "18.4.3"
+    "@angular-eslint/eslint-plugin" "18.4.3"
+    "@angular-eslint/eslint-plugin-template" "18.4.3"
+    "@angular-eslint/schematics" "18.4.3"
+    "@angular-eslint/template-parser" "18.4.3"
+    "@typescript-eslint/types" "^8.0.0"
+    "@typescript-eslint/utils" "^8.0.0"
+
 angular-gridster2@~18.0.1:
   version "18.0.1"
   resolved "https://registry.yarnpkg.com/angular-gridster2/-/angular-gridster2-18.0.1.tgz#ad04eff2c05aa693fe892ee66b6aa5e956e4dd13"
@@ -3790,11 +3445,6 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-attr-accept@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b"
-  integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==
-
 autoprefixer@10.4.20, autoprefixer@^10.4.20:
   version "10.4.20"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.20.tgz#5caec14d43976ef42e32dcb4bd62878e96be5b3b"
@@ -3827,15 +3477,6 @@ babel-loader@9.1.3:
     find-cache-dir "^4.0.0"
     schema-utils "^4.0.0"
 
-babel-plugin-macros@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
-  integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    cosmiconfig "^7.0.0"
-    resolve "^1.19.0"
-
 babel-plugin-polyfill-corejs2@^0.4.10:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33"
@@ -4129,11 +3770,6 @@ ci-info@^3.7.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
-classnames@2.x, classnames@^2.2.1, classnames@^2.2.6, classnames@^2.3.2:
-  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"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
@@ -4212,11 +3848,6 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-clsx@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
-  integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
-
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -4363,7 +3994,7 @@ content-type@~1.0.4, content-type@~1.0.5:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
 
-convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+convert-source-map@^1.5.1, convert-source-map@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
@@ -4433,17 +4064,6 @@ cose-base@^2.2.0:
   dependencies:
     layout-base "^2.0.0"
 
-cosmiconfig@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
-  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
 cosmiconfig@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.0.tgz#34c3fc58287b915f3ae905ab6dc3de258b55ad9d"
@@ -4483,7 +4103,7 @@ critters@0.0.24:
     postcss "^8.4.23"
     postcss-media-query-parser "^0.2.3"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.3, cross-spawn@^7.0.5:
+cross-spawn@^7.0.0, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
   integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
@@ -4524,14 +4144,6 @@ css-select@^5.1.0:
     domutils "^3.0.1"
     nth-check "^2.0.1"
 
-css-vendor@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d"
-  integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==
-  dependencies:
-    "@babel/runtime" "^7.8.3"
-    is-in-browser "^1.0.2"
-
 css-what@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
@@ -4542,11 +4154,6 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-csstype@^3.0.2, csstype@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
-  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
-
 cytoscape-cose-bilkent@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz#762fa121df9930ffeb51a495d87917c570ac209b"
@@ -5062,14 +4669,6 @@ doctrine@^2.1.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-helpers@^5.0.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
-  integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==
-  dependencies:
-    "@babel/runtime" "^7.8.7"
-    csstype "^3.0.2"
-
 dom-serializer@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
@@ -5474,17 +5073,17 @@ eslint-visitor-keys@^4.2.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
   integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
 
-eslint@~9.15.0:
-  version "9.15.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.15.0.tgz#77c684a4e980e82135ebff8ee8f0a9106ce6b8a6"
-  integrity sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==
+eslint@~9.17.0:
+  version "9.17.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.17.0.tgz#faa1facb5dd042172fdc520106984b5c2421bb0c"
+  integrity sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.12.1"
     "@eslint/config-array" "^0.19.0"
     "@eslint/core" "^0.9.0"
     "@eslint/eslintrc" "^3.2.0"
-    "@eslint/js" "9.15.0"
+    "@eslint/js" "9.17.0"
     "@eslint/plugin-kit" "^0.2.3"
     "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"
@@ -5493,7 +5092,7 @@ eslint@~9.15.0:
     "@types/json-schema" "^7.0.15"
     ajv "^6.12.4"
     chalk "^4.0.0"
-    cross-spawn "^7.0.5"
+    cross-spawn "^7.0.6"
     debug "^4.3.2"
     escape-string-regexp "^4.0.0"
     eslint-scope "^8.2.0"
@@ -5703,13 +5302,6 @@ file-entry-cache@^8.0.0:
   dependencies:
     flat-cache "^4.0.0"
 
-file-selector@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.6.0.tgz#fa0a8d9007b829504db4d07dd4de0310b65287dc"
-  integrity sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==
-  dependencies:
-    tslib "^2.4.0"
-
 fill-range@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
@@ -5745,11 +5337,6 @@ find-replace@^3.0.0:
   dependencies:
     array-back "^3.0.1"
 
-find-root@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
-  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
-
 find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -6126,13 +5713,6 @@ hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
   dependencies:
     function-bind "^1.1.2"
 
-hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
-  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
-  dependencies:
-    react-is "^16.7.0"
-
 hosted-git-info@^7.0.0:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.2.tgz#9b751acac097757667f30114607ef7b661ff4f17"
@@ -6267,11 +5847,6 @@ hyperdyperid@^1.2.0:
   resolved "https://registry.yarnpkg.com/hyperdyperid/-/hyperdyperid-1.2.0.tgz#59668d323ada92228d2a869d3e474d5a33b69e6b"
   integrity sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==
 
-hyphenate-style-name@^1.0.3:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz#1797bf50369588b47b72ca6d5e65374607cf4436"
-  integrity sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==
-
 iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -6511,11 +6086,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-in-browser@^1.0.2, is-in-browser@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
-  integrity sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g==
-
 is-inside-container@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4"
@@ -6746,7 +6316,7 @@ js-cookie@^3.0.5:
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.5.tgz#0b7e2fd0c01552c58ba86e0841f94dc2557dcdbc"
   integrity sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==
 
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^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==
@@ -6861,76 +6431,6 @@ jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
-jss-plugin-camel-case@^10.10.0:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz#27ea159bab67eb4837fa0260204eb7925d4daa1c"
-  integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    hyphenate-style-name "^1.0.3"
-    jss "10.10.0"
-
-jss-plugin-default-unit@^10.10.0:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz#db3925cf6a07f8e1dd459549d9c8aadff9804293"
-  integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.10.0"
-
-jss-plugin-global@^10.10.0:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz#1c55d3c35821fab67a538a38918292fc9c567efd"
-  integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.10.0"
-
-jss-plugin-nested@^10.10.0:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz#db872ed8925688806e77f1fc87f6e62264513219"
-  integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.10.0"
-    tiny-warning "^1.0.2"
-
-jss-plugin-props-sort@^10.10.0:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz#67f4dd4c70830c126f4ec49b4b37ccddb680a5d7"
-  integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.10.0"
-
-jss-plugin-rule-value-function@^10.10.0:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz#7d99e3229e78a3712f78ba50ab342e881d26a24b"
-  integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.10.0"
-    tiny-warning "^1.0.2"
-
-jss-plugin-vendor-prefixer@^10.10.0:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz#c01428ef5a89f2b128ec0af87a314d0c767931c7"
-  integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    css-vendor "^2.0.8"
-    jss "10.10.0"
-
-jss@10.10.0, jss@^10.10.0:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-10.10.0.tgz#a75cc85b0108c7ac8c7b7d296c520a3e4fbc6ccc"
-  integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    csstype "^3.0.2"
-    is-in-browser "^1.1.3"
-    tiny-warning "^1.0.2"
-
 jstree-bootstrap-theme@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/jstree-bootstrap-theme/-/jstree-bootstrap-theme-1.0.1.tgz#7d5edc73a846e8da7f94f57a1cc5ddee9d9eab4b"
@@ -7221,22 +6721,12 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
-
-lodash.isequal@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
-
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@4.17.21, lodash@^4.0.1, lodash@^4.17.14:
+lodash@4.17.21, lodash@^4.17.14:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -7265,13 +6755,6 @@ log-update@^6.1.0:
     strip-ansi "^7.1.0"
     wrap-ansi "^9.0.0"
 
-loose-envify@^1.1.0, loose-envify@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
 lru-cache@^10.0.1, lru-cache@^10.2.0:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
@@ -7913,7 +7396,7 @@ nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
-object-assign@^4.0.1, object-assign@^4.1.1:
+object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
@@ -8185,7 +7668,7 @@ parse-imports@^2.1.1:
     es-module-lexer "^1.5.3"
     slashes "^3.0.12"
 
-parse-json@^5.0.0, parse-json@^5.2.0:
+parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
@@ -8292,11 +7775,6 @@ path-to-regexp@0.1.10:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
   integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==
 
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
 path-type@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-5.0.0.tgz#14b01ed7aea7ddf9c7c3f46181d4d04f9c785bb8"
@@ -8505,11 +7983,6 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prettier@^2.8.3:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
-  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
-
 prismjs@^1.27.0, prismjs@^1.28.0:
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12"
@@ -8538,15 +8011,6 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-prop-types@^15.6.2, prop-types@^15.8.1:
-  version "15.8.1"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
-  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.13.1"
-
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -8632,128 +8096,6 @@ rbush@^3.0.1:
   dependencies:
     quickselect "^2.0.0"
 
-rc-motion@^2.0.0, rc-motion@^2.0.1:
-  version "2.9.3"
-  resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.9.3.tgz#b1bdaf816f1ccb3e4b3b0c531c3037a59286379e"
-  integrity sha512-rkW47ABVkic7WEB0EKJqzySpvDqwl60/tdkY7hWP7dYnh5pm0SzJpo54oW3TDUGXV5wfxXFmMkxrzRRbotQ0+w==
-  dependencies:
-    "@babel/runtime" "^7.11.1"
-    classnames "^2.2.1"
-    rc-util "^5.43.0"
-
-rc-overflow@^1.3.1:
-  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.37.0"
-
-rc-resize-observer@^1.0.0, rc-resize-observer@^1.3.1:
-  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.38.0"
-    resize-observer-polyfill "^1.5.1"
-
-rc-select@14.15.2:
-  version "14.15.2"
-  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.15.2.tgz#d85fcf3a708bdf837b003feeed653347b8980ad0"
-  integrity sha512-oNoXlaFmpqXYcQDzcPVLrEqS2J9c+/+oJuGrlXeVVX/gVgrbHa5YcyiRUXRydFjyuA7GP3elRuLF7Y3Tfwltlw==
-  dependencies:
-    "@babel/runtime" "^7.10.1"
-    "@rc-component/trigger" "^2.1.1"
-    classnames "2.x"
-    rc-motion "^2.0.1"
-    rc-overflow "^1.3.1"
-    rc-util "^5.16.1"
-    rc-virtual-list "^3.5.2"
-
-rc-util@^5.15.0, rc-util@^5.16.1, rc-util@^5.24.4, rc-util@^5.37.0, rc-util@^5.38.0, rc-util@^5.43.0:
-  version "5.43.0"
-  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.43.0.tgz#bba91fbef2c3e30ea2c236893746f3e9b05ecc4c"
-  integrity sha512-AzC7KKOXFqAdIBqdGWepL9Xn7cm3vnAmjlHqUnoQaTMZYhM4VlXGLkkHHxj/BZ7Td0+SOPKB4RGPboBVKT9htw==
-  dependencies:
-    "@babel/runtime" "^7.18.3"
-    react-is "^18.2.0"
-
-rc-virtual-list@3.5.2, rc-virtual-list@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.5.2.tgz#5e1028869bae900eacbae6788d4eca7210736006"
-  integrity sha512-sE2G9hTPjVmatQni8OP2Kx33+Oth6DMKm67OblBBmgMBJDJQOOFpSGH7KZ6Pm85rrI2IGxDRXZCr0QhYOH2pfQ==
-  dependencies:
-    "@babel/runtime" "^7.20.0"
-    classnames "^2.2.6"
-    rc-resize-observer "^1.0.0"
-    rc-util "^5.15.0"
-
-react-ace@12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-12.0.0.tgz#d40afc7382092109eead7227d9426f55dcc2209d"
-  integrity sha512-PstU6CSMfYIJknb4su2Fa0WgLXzq2ufQgR6fjcSWuGT1hGTHkBzuKw+SncV8PuLCdSJBJc1VehPhyeXlWByG/g==
-  dependencies:
-    ace-builds "^1.32.8"
-    diff-match-patch "^1.0.5"
-    lodash.get "^4.4.2"
-    lodash.isequal "^4.5.0"
-    prop-types "^15.8.1"
-
-react-dom@18.3.1:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
-  integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
-  dependencies:
-    loose-envify "^1.1.0"
-    scheduler "^0.23.2"
-
-react-dropzone@14.2.9:
-  version "14.2.9"
-  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-14.2.9.tgz#193a33f9035e29fc91abf24e50de5d66cfa7c8c0"
-  integrity sha512-jRZsMC7h48WONsOLHcmhyn3cRWJoIPQjPApvt/sJVfnYaB3Qltn025AoRTTJaj4WdmmgmLl6tUQg1s0wOhpodQ==
-  dependencies:
-    attr-accept "^2.2.2"
-    file-selector "^0.6.0"
-    prop-types "^15.8.1"
-
-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==
-
-react-is@^18.2.0, react-is@^18.3.1:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
-  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
-
-react-transition-group@^4.4.5:
-  version "4.4.5"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
-  integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    dom-helpers "^5.0.1"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-
-react@18.3.1:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
-  integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
-  dependencies:
-    loose-envify "^1.1.0"
-
-reactcss@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
-  integrity sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==
-  dependencies:
-    lodash "^4.0.1"
-
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -8888,11 +8230,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
-resize-observer-polyfill@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
-  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
@@ -8909,7 +8246,7 @@ resolve-url-loader@5.0.0:
     postcss "^8.2.14"
     source-map "0.6.1"
 
-resolve@1.22.8, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.22.4, resolve@^1.22.8:
+resolve@1.22.8, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.22.4, resolve@^1.22.8:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -9092,13 +8429,6 @@ sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f"
   integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==
 
-scheduler@^0.23.2:
-  version "0.23.2"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
-  integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==
-  dependencies:
-    loose-envify "^1.1.0"
-
 schema-inspector@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/schema-inspector/-/schema-inspector-2.1.0.tgz#85096fbc78162a420262ed41b82e60ac927767b2"
@@ -9408,11 +8738,6 @@ source-map@0.7.4:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
   integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
 
-source-map@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
-
 spdx-correct@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
@@ -9621,11 +8946,6 @@ strip-json-comments@3.1.1, strip-json-comments@^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.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51"
-  integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==
-
 stylis@^4.3.1:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.4.tgz#ca5c6c4a35c4784e4e93a2a24dc4e9fa075250a4"
@@ -9810,11 +9130,6 @@ tiny-emitter@^2.0.0:
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
   integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
 
-tiny-warning@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
-  integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
-
 tinycolor2@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.6.0.tgz#f98007460169b0263b97072c5ae92484ce02d09e"
@@ -9941,11 +9256,6 @@ tuf-js@^2.2.1:
     debug "^4.3.4"
     make-fetch-happen "^13.0.1"
 
-tv4@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/tv4/-/tv4-1.3.0.tgz#d020c846fadd50c855abb25ebaecc68fc10f7963"
-  integrity sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw==
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -10020,6 +9330,15 @@ typeface-roboto@^1.1.13:
   resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-1.1.13.tgz#9c4517cb91e311706c74823e857b4bac9a764ae5"
   integrity sha512-YXvbd3a1QTREoD+FJoEkl0VQNJoEjewR2H11IjVv4bp6ahuIcw0yyw/3udC4vJkHw3T3cUh85FTg8eWef3pSaw==
 
+typescript-eslint@^8.18.1:
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.18.1.tgz#197b284b6769678ed77d9868df180eeaf61108eb"
+  integrity sha512-Mlaw6yxuaDEPQvb/2Qwu3/TfgeBHy9iTJ3mTwe7OvpPmF6KPQjVOfGyEJpPv6Ez2C34OODChhXrzYw/9phI0MQ==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "8.18.1"
+    "@typescript-eslint/parser" "8.18.1"
+    "@typescript-eslint/utils" "8.18.1"
+
 typescript@~5.5.4:
   version "5.5.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
@@ -10504,11 +9823,6 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
 yaml@^2.2.2, yaml@^2.3.4:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773"