diff --git a/application/pom.xml b/application/pom.xml
index 0d9982f281..b653465050 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -144,21 +144,6 @@
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.mqttv5.client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.cassandraunit</groupId>
-            <artifactId>cassandra-unit</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-validator</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.thingsboard</groupId>
             <artifactId>ui-ngx</artifactId>
@@ -329,6 +314,11 @@
             <artifactId>spring-test-dbunit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>cassandra</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
diff --git a/application/src/main/data/json/demo/dashboards/gateways.json b/application/src/main/data/json/demo/dashboards/gateways.json
index 0a18b10a52..6051fbd514 100644
--- a/application/src/main/data/json/demo/dashboards/gateways.json
+++ b/application/src/main/data/json/demo/dashboards/gateways.json
@@ -131,7 +131,7 @@
                 "name": "Add device",
                 "icon": "add",
                 "type": "customPretty",
-                "customHtml": "<form #addDeviceForm=\"ngForm\" [formGroup]=\"addDeviceFormGroup\"\n      (ngSubmit)=\"save()\" style=\"width: 480px;\">\n  <mat-toolbar fxLayout=\"row\" color=\"primary\">\n    <h2>Add device</h2>\n    <span fxFlex></span>\n    <button mat-button mat-icon-button\n            (click)=\"cancel()\"\n            type=\"button\">\n      <mat-icon class=\"material-icons\">close</mat-icon>\n    </button>\n  </mat-toolbar>\n  <mat-progress-bar color=\"warn\" mode=\"indeterminate\" *ngIf=\"isLoading$ | async\">\n  </mat-progress-bar>\n  <div style=\"height: 4px;\" *ngIf=\"!(isLoading$ | async)\"></div>\n  <div mat-dialog-content>\n      <div class=\"mat-padding\" fxLayout=\"column\">\n            <mat-form-field class=\"mat-block\">\n                <mat-label>Device name</mat-label>\n                <input matInput formControlName=\"deviceName\" required>\n                <mat-error *ngIf=\"addDeviceFormGroup.get('deviceName').hasError('required')\">\n                    Device name is required.\n                </mat-error>\n            </mat-form-field>\n            <div formGroupName=\"attributes\" fxFlex fxLayout=\"row\" fxLayoutGap=\"8px\">\n                <mat-form-field fxFlex=\"50\" class=\"mat-block\">\n                    <mat-label>Latitude</mat-label>\n                    <input type=\"number\" step=\"any\" matInput formControlName=\"latitude\">\n                </mat-form-field>\n                <mat-form-field fxFlex=\"50\" class=\"mat-block\">\n                    <mat-label>Longitude</mat-label>\n                    <input type=\"number\" step=\"any\" matInput formControlName=\"longitude\">\n                </mat-form-field>\n            </div>\n            <mat-form-field class=\"mat-block\">\n                <mat-label>Label</mat-label>\n                <input matInput formControlName=\"deviceLabel\">\n            </mat-form-field>\n      </div>  \n  </div>\n  <div mat-dialog-actions fxLayout=\"row\">\n    <span fxFlex></span>\n    <button mat-button mat-raised-button color=\"primary\"\n            type=\"submit\"\n            [disabled]=\"(isLoading$ | async) || addDeviceForm.invalid || !addDeviceForm.dirty\">\n      Create\n    </button>\n    <button mat-button color=\"primary\"\n            style=\"margin-right: 20px;\"\n            type=\"button\"\n            [disabled]=\"(isLoading$ | async)\"\n            (click)=\"cancel()\" cdkFocusInitial>\n      Cancel\n    </button>\n  </div>\n</form>\n",
+                "customHtml": "<form #addDeviceForm=\"ngForm\" [formGroup]=\"addDeviceFormGroup\"\n      (ngSubmit)=\"save()\" style=\"width: 480px;\">\n  <mat-toolbar fxLayout=\"row\" color=\"primary\">\n    <h2>Add device</h2>\n    <span fxFlex></span>\n    <button mat-icon-button\n            (click)=\"cancel()\"\n            type=\"button\">\n      <mat-icon class=\"material-icons\">close</mat-icon>\n    </button>\n  </mat-toolbar>\n  <mat-progress-bar color=\"warn\" mode=\"indeterminate\" *ngIf=\"isLoading$ | async\">\n  </mat-progress-bar>\n  <div style=\"height: 4px;\" *ngIf=\"!(isLoading$ | async)\"></div>\n  <div mat-dialog-content>\n      <div class=\"mat-padding\" fxLayout=\"column\">\n            <mat-form-field class=\"mat-block\">\n                <mat-label>Device name</mat-label>\n                <input matInput formControlName=\"deviceName\" required>\n                <mat-error *ngIf=\"addDeviceFormGroup.get('deviceName').hasError('required')\">\n                    Device name is required.\n                </mat-error>\n            </mat-form-field>\n            <div formGroupName=\"attributes\" fxFlex fxLayout=\"row\" fxLayoutGap=\"8px\">\n                <mat-form-field fxFlex=\"50\" class=\"mat-block\">\n                    <mat-label>Latitude</mat-label>\n                    <input type=\"number\" step=\"any\" matInput formControlName=\"latitude\">\n                </mat-form-field>\n                <mat-form-field fxFlex=\"50\" class=\"mat-block\">\n                    <mat-label>Longitude</mat-label>\n                    <input type=\"number\" step=\"any\" matInput formControlName=\"longitude\">\n                </mat-form-field>\n            </div>\n            <mat-form-field class=\"mat-block\">\n                <mat-label>Label</mat-label>\n                <input matInput formControlName=\"deviceLabel\">\n            </mat-form-field>\n      </div>  \n  </div>\n  <div mat-dialog-actions fxLayout=\"row\">\n    <span fxFlex></span>\n    <button mat-button mat-raised-button color=\"primary\"\n            type=\"submit\"\n            [disabled]=\"(isLoading$ | async) || addDeviceForm.invalid || !addDeviceForm.dirty\">\n      Create\n    </button>\n    <button mat-button color=\"primary\"\n            style=\"margin-right: 20px;\"\n            type=\"button\"\n            [disabled]=\"(isLoading$ | async)\"\n            (click)=\"cancel()\" cdkFocusInitial>\n      Cancel\n    </button>\n  </div>\n</form>\n",
                 "customCss": "",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\nlet deviceService = $injector.get(widgetContext.servicesMap.get('deviceService'));\nlet attributeService = $injector.get(widgetContext.servicesMap.get('attributeService'));\n\nopenAddDeviceDialog();\n\nfunction openAddDeviceDialog() {\n    customDialog.customDialog(htmlTemplate, AddDeviceDialogController).subscribe();\n}\n\nfunction AddDeviceDialogController(instance) {\n    let vm = instance;\n    \n    vm.addDeviceFormGroup = vm.fb.group({\n      deviceName: ['', [vm.validators.required]],\n      deviceLabel: [''],\n      attributes: vm.fb.group({\n          latitude: [null],\n          longitude: [null]\n      })      \n    });\n    \n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n    \n    vm.save = function() {\n        vm.addDeviceFormGroup.markAsPristine();\n        let device = {\n            additionalInfo: {gateway: true},\n            name: vm.addDeviceFormGroup.get('deviceName').value,\n            type: 'gateway',\n            label: vm.addDeviceFormGroup.get('deviceLabel').value\n        };\n        deviceService.saveDevice(device).subscribe(\n            function (device) {\n                saveAttributes(device.id).subscribe(\n                    function () {\n                        widgetContext.updateAliases();\n                        vm.dialogRef.close(null);\n                    }\n                );\n            }\n        );\n    };\n    \n    function saveAttributes(entityId) {\n        let attributes = vm.addDeviceFormGroup.get('attributes').value;\n        let attributesArray = [];\n        for (let key in attributes) {\n            attributesArray.push({key: key, value: attributes[key]});\n        }\n        if (attributesArray.length > 0) {\n            return attributeService.saveEntityAttributes(entityId, \"SERVER_SCOPE\", attributesArray);\n        } else {\n            return widgetContext.rxjs.of([]);\n        }\n    }\n}\n",
                 "customResources": [],
@@ -160,7 +160,7 @@
                 "name": "Edit device",
                 "icon": "edit",
                 "type": "customPretty",
-                "customHtml": "<form #editDeviceForm=\"ngForm\" [formGroup]=\"editDeviceFormGroup\"\n      (ngSubmit)=\"save()\" style=\"width: 480px;\">\n  <mat-toolbar fxLayout=\"row\" color=\"primary\">\n    <h2>Edit device</h2>\n    <span fxFlex></span>\n    <button mat-button mat-icon-button\n            (click)=\"cancel()\"\n            type=\"button\">\n      <mat-icon class=\"material-icons\">close</mat-icon>\n    </button>\n  </mat-toolbar>\n  <mat-progress-bar color=\"warn\" mode=\"indeterminate\" *ngIf=\"isLoading$ | async\">\n  </mat-progress-bar>\n  <div style=\"height: 4px;\" *ngIf=\"!(isLoading$ | async)\"></div>\n  <div mat-dialog-content>\n      <div class=\"mat-padding\" fxLayout=\"column\">\n            <mat-form-field class=\"mat-block\">\n                <mat-label>Device name</mat-label>\n                <input matInput formControlName=\"deviceName\" required>\n                <mat-error *ngIf=\"editDeviceFormGroup.get('deviceName').hasError('required')\">\n                    Device name is required.\n                </mat-error>\n            </mat-form-field>\n            <div formGroupName=\"attributes\" fxFlex fxLayout=\"row\" fxLayoutGap=\"8px\">\n                <mat-form-field fxFlex=\"50\" class=\"mat-block\">\n                    <mat-label>Latitude</mat-label>\n                    <input type=\"number\" step=\"any\" matInput formControlName=\"latitude\">\n                </mat-form-field>\n                <mat-form-field fxFlex=\"50\" class=\"mat-block\">\n                    <mat-label>Longitude</mat-label>\n                    <input type=\"number\" step=\"any\" matInput formControlName=\"longitude\">\n                </mat-form-field>\n            </div>\n            <mat-form-field class=\"mat-block\">\n                <mat-label>Label</mat-label>\n                <input matInput formControlName=\"deviceLabel\">\n            </mat-form-field>\n      </div>  \n  </div>\n  <div mat-dialog-actions fxLayout=\"row\">\n    <span fxFlex></span>\n    <button mat-button mat-raised-button color=\"primary\"\n            type=\"submit\"\n            [disabled]=\"(isLoading$ | async) || editDeviceForm.invalid || !editDeviceForm.dirty\">\n      Update\n    </button>\n    <button mat-button color=\"primary\"\n            style=\"margin-right: 20px;\"\n            type=\"button\"\n            [disabled]=\"(isLoading$ | async)\"\n            (click)=\"cancel()\" cdkFocusInitial>\n      Cancel\n    </button>\n  </div>\n</form>\n",
+                "customHtml": "<form #editDeviceForm=\"ngForm\" [formGroup]=\"editDeviceFormGroup\"\n      (ngSubmit)=\"save()\" style=\"width: 480px;\">\n  <mat-toolbar fxLayout=\"row\" color=\"primary\">\n    <h2>Edit device</h2>\n    <span fxFlex></span>\n    <button mat-icon-button\n            (click)=\"cancel()\"\n            type=\"button\">\n      <mat-icon class=\"material-icons\">close</mat-icon>\n    </button>\n  </mat-toolbar>\n  <mat-progress-bar color=\"warn\" mode=\"indeterminate\" *ngIf=\"isLoading$ | async\">\n  </mat-progress-bar>\n  <div style=\"height: 4px;\" *ngIf=\"!(isLoading$ | async)\"></div>\n  <div mat-dialog-content>\n      <div class=\"mat-padding\" fxLayout=\"column\">\n            <mat-form-field class=\"mat-block\">\n                <mat-label>Device name</mat-label>\n                <input matInput formControlName=\"deviceName\" required>\n                <mat-error *ngIf=\"editDeviceFormGroup.get('deviceName').hasError('required')\">\n                    Device name is required.\n                </mat-error>\n            </mat-form-field>\n            <div formGroupName=\"attributes\" fxFlex fxLayout=\"row\" fxLayoutGap=\"8px\">\n                <mat-form-field fxFlex=\"50\" class=\"mat-block\">\n                    <mat-label>Latitude</mat-label>\n                    <input type=\"number\" step=\"any\" matInput formControlName=\"latitude\">\n                </mat-form-field>\n                <mat-form-field fxFlex=\"50\" class=\"mat-block\">\n                    <mat-label>Longitude</mat-label>\n                    <input type=\"number\" step=\"any\" matInput formControlName=\"longitude\">\n                </mat-form-field>\n            </div>\n            <mat-form-field class=\"mat-block\">\n                <mat-label>Label</mat-label>\n                <input matInput formControlName=\"deviceLabel\">\n            </mat-form-field>\n      </div>  \n  </div>\n  <div mat-dialog-actions fxLayout=\"row\">\n    <span fxFlex></span>\n    <button mat-button mat-raised-button color=\"primary\"\n            type=\"submit\"\n            [disabled]=\"(isLoading$ | async) || editDeviceForm.invalid || !editDeviceForm.dirty\">\n      Update\n    </button>\n    <button mat-button color=\"primary\"\n            style=\"margin-right: 20px;\"\n            type=\"button\"\n            [disabled]=\"(isLoading$ | async)\"\n            (click)=\"cancel()\" cdkFocusInitial>\n      Cancel\n    </button>\n  </div>\n</form>\n",
                 "customCss": "/*=======================================================================*/\n/*==========  There are two examples: for edit and add entity  ==========*/\n/*=======================================================================*/\n/*========================  Edit entity example  ========================*/\n/*=======================================================================*/\n/*\n.edit-entity-form md-input-container {\n    padding-right: 10px;\n}\n\n.edit-entity-form .boolean-value-input {\n    padding-left: 5px;\n}\n\n.edit-entity-form .boolean-value-input .checkbox-label {\n    margin-bottom: 8px;\n    color: rgba(0,0,0,0.54);\n    font-size: 12px;\n}\n\n.relations-list .header {\n    padding-right: 5px;\n    padding-bottom: 5px;\n    padding-left: 5px;\n}\n\n.relations-list .header .cell {\n    padding-right: 5px;\n    padding-left: 5px;\n    font-size: 12px;\n    font-weight: 700;\n    color: rgba(0, 0, 0, .54);\n    white-space: nowrap;\n}\n\n.relations-list .body {\n    padding-right: 5px;\n    padding-bottom: 15px;\n    padding-left: 5px;\n}\n\n.relations-list .body .row {\n    padding-top: 5px;\n}\n\n.relations-list .body .cell {\n    padding-right: 5px;\n    padding-left: 5px;\n}\n\n.relations-list .body md-autocomplete-wrap md-input-container {\n    height: 30px;\n}\n\n.relations-list .body .md-button {\n    margin: 0;\n}\n\n.relations-list.old-relations tb-entity-select tb-entity-autocomplete button {\n    display: none;\n} \n*/\n/*========================================================================*/\n/*=========================  Add entity example  =========================*/\n/*========================================================================*/\n/*\n.add-entity-form md-input-container {\n    padding-right: 10px;\n}\n\n.add-entity-form .boolean-value-input {\n    padding-left: 5px;\n}\n\n.add-entity-form .boolean-value-input .checkbox-label {\n    margin-bottom: 8px;\n    color: rgba(0,0,0,0.54);\n    font-size: 12px;\n}\n\n.relations-list .header {\n    padding-right: 5px;\n    padding-bottom: 5px;\n    padding-left: 5px;\n}\n\n.relations-list .header .cell {\n    padding-right: 5px;\n    padding-left: 5px;\n    font-size: 12px;\n    font-weight: 700;\n    color: rgba(0, 0, 0, .54);\n    white-space: nowrap;\n}\n\n.relations-list .body {\n    padding-right: 5px;\n    padding-bottom: 15px;\n    padding-left: 5px;\n}\n\n.relations-list .body .row {\n    padding-top: 5px;\n}\n\n.relations-list .body .cell {\n    padding-right: 5px;\n    padding-left: 5px;\n}\n\n.relations-list .body md-autocomplete-wrap md-input-container {\n    height: 30px;\n}\n\n.relations-list .body .md-button {\n    margin: 0;\n}\n*/\n",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\nlet deviceService = $injector.get(widgetContext.servicesMap.get('deviceService'));\nlet attributeService = $injector.get(widgetContext.servicesMap.get('attributeService'));\n\nopenEditDeviceDialog();\n\nfunction openEditDeviceDialog() {\n    customDialog.customDialog(htmlTemplate, EditDeviceDialogController).subscribe();\n}\n\nfunction EditDeviceDialogController(instance) {\n    let vm = instance;\n    \n    vm.device = null;\n    vm.attributes = {};\n    \n    vm.editDeviceFormGroup = vm.fb.group({\n      deviceName: ['', [vm.validators.required]],\n      deviceLabel: [''],\n      attributes: vm.fb.group({\n          latitude: [null],\n          longitude: [null]\n      })      \n    });\n    \n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n    \n    vm.save = function() {\n        vm.editDeviceFormGroup.markAsPristine();\n        vm.device.name = vm.editDeviceFormGroup.get('deviceName').value;\n        vm.device.label = vm.editDeviceFormGroup.get('deviceLabel').value;\n        deviceService.saveDevice(vm.device).subscribe(\n            function () {\n                saveAttributes().subscribe(\n                    function () {\n                        widgetContext.updateAliases();\n                        vm.dialogRef.close(null);\n                    }\n                );\n            }\n        );\n    };\n    \n    getEntityInfo();\n    \n    function getEntityInfo() {\n        deviceService.getDevice(entityId.id).subscribe(\n            function (device) {\n                attributeService.getEntityAttributes(entityId, 'SERVER_SCOPE',\n                                                    ['latitude', 'longitude']).subscribe(\n                   function (attributes) {\n                        for (let i = 0; i < attributes.length; i++) {\n                            vm.attributes[attributes[i].key] = attributes[i].value; \n                        }\n                        vm.device = device;\n                        vm.editDeviceFormGroup.patchValue(\n                            {\n                                deviceName: vm.device.name,\n                                deviceLabel: vm.device.label,\n                                attributes: {\n                                    latitude: vm.attributes.latitude,\n                                    longitude: vm.attributes.longitude\n                                }\n                            }, {emitEvent: false}\n                        );\n                   } \n                );\n            }\n        );    \n    }\n    \n    function saveAttributes() {\n        let attributes = vm.editDeviceFormGroup.get('attributes').value;\n        let attributesArray = [];\n        for (let key in attributes) {\n            attributesArray.push({key: key, value: attributes[key]});\n        }\n        if (attributesArray.length > 0) {\n            return attributeService.saveEntityAttributes(entityId, 'SERVER_SCOPE', attributesArray);\n        } else {\n            return widgetContext.rxjs.of([]);\n        }\n    }\n}\n",
                 "customResources": [],
diff --git a/application/src/main/data/json/demo/dashboards/thermostats.json b/application/src/main/data/json/demo/dashboards/thermostats.json
index 4f486effdf..c014d8875a 100644
--- a/application/src/main/data/json/demo/dashboards/thermostats.json
+++ b/application/src/main/data/json/demo/dashboards/thermostats.json
@@ -215,6 +215,8 @@
             "displayDetails": true,
             "allowAcknowledgment": true,
             "allowClear": true,
+            "allowAssign": true,
+            "displayComments": true,
             "displayPagination": true,
             "defaultPageSize": 10,
             "defaultSortOrder": "-createdTime",
@@ -277,6 +279,14 @@
                 "color": "#607d8b",
                 "settings": {},
                 "_hash": 0.7977920750136249
+              },
+              {
+                "name": "assignee",
+                "type": "alarm",
+                "label": "Assignee",
+                "color": "#9c27b0",
+                "settings": {},
+                "_hash": 0.8678751039018493
               }
             ]
           },
diff --git a/application/src/main/data/json/system/widget_bundles/alarm_widgets.json b/application/src/main/data/json/system/widget_bundles/alarm_widgets.json
index 448fcaf52c..e7a97b36f8 100644
--- a/application/src/main/data/json/system/widget_bundles/alarm_widgets.json
+++ b/application/src/main/data/json/system/widget_bundles/alarm_widgets.json
@@ -23,7 +23,7 @@
         "dataKeySettingsSchema": "",
         "settingsDirective": "tb-alarms-table-widget-settings",
         "dataKeySettingsDirective": "tb-alarms-table-key-settings",
-        "defaultConfig": "{\"timewindow\":{\"realtime\":{\"interval\":1000,\"timewindowMs\":86400000},\"aggregation\":{\"type\":\"NONE\",\"limit\":200}},\"showTitle\":true,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"4px\",\"settings\":{\"enableSelection\":true,\"enableSearch\":true,\"displayDetails\":true,\"allowAcknowledgment\":true,\"allowClear\":true,\"displayPagination\":true,\"defaultPageSize\":10,\"defaultSortOrder\":\"-createdTime\",\"enableSelectColumnDisplay\":true,\"enableStickyAction\":false,\"enableFilter\":true},\"title\":\"Alarms table\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400,\"padding\":\"5px 10px 5px 10px\"},\"useDashboardTimewindow\":false,\"showLegend\":false,\"alarmSource\":{\"type\":\"function\",\"dataKeys\":[{\"name\":\"createdTime\",\"type\":\"alarm\",\"label\":\"Created time\",\"color\":\"#2196f3\",\"settings\":{\"useCellStyleFunction\":false,\"cellStyleFunction\":\"\",\"useCellContentFunction\":false,\"cellContentFunction\":\"\"},\"_hash\":0.021092237451093787},{\"name\":\"originator\",\"type\":\"alarm\",\"label\":\"Originator\",\"color\":\"#4caf50\",\"settings\":{\"useCellStyleFunction\":false,\"cellStyleFunction\":\"\",\"useCellContentFunction\":false,\"cellContentFunction\":\"\"},\"_hash\":0.2780007688856758},{\"name\":\"type\",\"type\":\"alarm\",\"label\":\"Type\",\"color\":\"#f44336\",\"settings\":{\"useCellStyleFunction\":false,\"cellStyleFunction\":\"\",\"useCellContentFunction\":false,\"cellContentFunction\":\"\"},\"_hash\":0.7323586880398418},{\"name\":\"severity\",\"type\":\"alarm\",\"label\":\"Severity\",\"color\":\"#ffc107\",\"settings\":{\"useCellStyleFunction\":false,\"useCellContentFunction\":false},\"_hash\":0.09927019860088193},{\"name\":\"status\",\"type\":\"alarm\",\"label\":\"Status\",\"color\":\"#607d8b\",\"settings\":{\"useCellStyleFunction\":false,\"cellStyleFunction\":\"\",\"useCellContentFunction\":false,\"cellContentFunction\":\"\"},\"_hash\":0.6588418951443418}],\"entityAliasId\":null,\"name\":\"alarms\"},\"alarmSearchStatus\":\"ANY\",\"alarmsPollingInterval\":5,\"showTitleIcon\":false,\"titleIcon\":\"more_horiz\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"displayTimewindow\":true,\"actions\":{},\"alarmStatusList\":[],\"alarmSeverityList\":[],\"alarmTypeList\":[],\"searchPropagatedAlarms\":false}"
+        "defaultConfig": "{\"timewindow\":{\"realtime\":{\"interval\":1000,\"timewindowMs\":86400000},\"aggregation\":{\"type\":\"NONE\",\"limit\":200}},\"showTitle\":true,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"4px\",\"settings\":{\"enableSelection\":true,\"enableSearch\":true,\"displayDetails\":true,\"allowAcknowledgment\":true,\"allowClear\":true,\"allowAssign\":true,\"displayComments\":true,\"displayPagination\":true,\"defaultPageSize\":10,\"defaultSortOrder\":\"-createdTime\",\"enableSelectColumnDisplay\":true,\"enableStickyAction\":false,\"enableFilter\":true},\"title\":\"Alarms table\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400,\"padding\":\"5px 10px 5px 10px\"},\"useDashboardTimewindow\":false,\"showLegend\":false,\"alarmSource\":{\"type\":\"function\",\"dataKeys\":[{\"name\":\"createdTime\",\"type\":\"alarm\",\"label\":\"Created time\",\"color\":\"#2196f3\",\"settings\":{\"useCellStyleFunction\":false,\"cellStyleFunction\":\"\",\"useCellContentFunction\":false,\"cellContentFunction\":\"\"},\"_hash\":0.021092237451093787},{\"name\":\"originator\",\"type\":\"alarm\",\"label\":\"Originator\",\"color\":\"#4caf50\",\"settings\":{\"useCellStyleFunction\":false,\"cellStyleFunction\":\"\",\"useCellContentFunction\":false,\"cellContentFunction\":\"\"},\"_hash\":0.2780007688856758},{\"name\":\"type\",\"type\":\"alarm\",\"label\":\"Type\",\"color\":\"#f44336\",\"settings\":{\"useCellStyleFunction\":false,\"cellStyleFunction\":\"\",\"useCellContentFunction\":false,\"cellContentFunction\":\"\"},\"_hash\":0.7323586880398418},{\"name\":\"severity\",\"type\":\"alarm\",\"label\":\"Severity\",\"color\":\"#ffc107\",\"settings\":{\"useCellStyleFunction\":false,\"useCellContentFunction\":false},\"_hash\":0.09927019860088193},{\"name\":\"status\",\"type\":\"alarm\",\"label\":\"Status\",\"color\":\"#607d8b\",\"settings\":{\"useCellStyleFunction\":false,\"cellStyleFunction\":\"\",\"useCellContentFunction\":false,\"cellContentFunction\":\"\"},\"_hash\":0.6588418951443418},{\"name\":\"assignee\",\"type\":\"alarm\",\"label\":\"Assignee\",\"color\":\"#9c27b0\",\"settings\":{},\"_hash\":0.5008441077416634}],\"entityAliasId\":null,\"name\":\"alarms\"},\"alarmSearchStatus\":\"ANY\",\"alarmsPollingInterval\":5,\"showTitleIcon\":false,\"titleIcon\":\"more_horiz\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"displayTimewindow\":true,\"actions\":{},\"alarmStatusList\":[],\"alarmSeverityList\":[],\"alarmTypeList\":[],\"searchPropagatedAlarms\":false}"
       }
     }
   ]
diff --git a/application/src/main/data/upgrade/3.4.4/schema_update.sql b/application/src/main/data/upgrade/3.4.4/schema_update.sql
index f8c133f352..d71fc158ef 100644
--- a/application/src/main/data/upgrade/3.4.4/schema_update.sql
+++ b/application/src/main/data/upgrade/3.4.4/schema_update.sql
@@ -14,6 +14,70 @@
 -- limitations under the License.
 --
 
+-- USER CREDENTIALS START
+
+ALTER TABLE user_credentials
+    ADD COLUMN IF NOT EXISTS additional_info varchar NOT NULL DEFAULT '{}';
+
+UPDATE user_credentials
+    SET additional_info = json_build_object('userPasswordHistory', (u.additional_info::json -> 'userPasswordHistory'))
+    FROM tb_user u WHERE user_credentials.user_id = u.id AND u.additional_info::jsonb ? 'userPasswordHistory';
+
+UPDATE tb_user SET additional_info = tb_user.additional_info::jsonb - 'userPasswordHistory' WHERE additional_info::jsonb ? 'userPasswordHistory';
+
+-- USER CREDENTIALS END
+
+-- ALARM ASSIGN TO USER START
+
+ALTER TABLE alarm ADD COLUMN IF NOT EXISTS assign_ts BIGINT DEFAULT 0;
+ALTER TABLE alarm ADD COLUMN IF NOT EXISTS assignee_id UUID;
+
+CREATE INDEX IF NOT EXISTS idx_alarm_tenant_assignee_created_time ON alarm(tenant_id, assignee_id, created_time DESC);
+
+-- ALARM ASSIGN TO USER END
+
+-- ALARM STATUS REFACTORING START
+
+ALTER TABLE alarm ADD COLUMN IF NOT EXISTS acknowledged boolean;
+ALTER TABLE alarm ADD COLUMN IF NOT EXISTS cleared boolean;
+
+ALTER TABLE alarm ADD COLUMN IF NOT EXISTS status varchar; -- to avoid failure of the subsequent upgrade.
+UPDATE alarm SET acknowledged = true, cleared = true WHERE status = 'CLEARED_ACK';
+UPDATE alarm SET acknowledged = true, cleared = false WHERE status = 'ACTIVE_ACK';
+UPDATE alarm SET acknowledged = false, cleared = true WHERE status = 'CLEARED_UNACK';
+UPDATE alarm SET acknowledged = false, cleared = false WHERE status = 'ACTIVE_UNACK';
+
+-- Drop index by 'status' column and replace with new one that has only active alarms;
+DROP INDEX IF EXISTS idx_alarm_originator_alarm_type_active;
+CREATE INDEX IF NOT EXISTS idx_alarm_originator_alarm_type_active
+    ON alarm USING btree (originator_id, type) WHERE cleared = false;
+
+-- Cover index by alarm type to optimize propagated alarm queries;
+DROP INDEX IF EXISTS idx_entity_alarm_entity_id_alarm_type_created_time_alarm_id;
+CREATE INDEX IF NOT EXISTS idx_entity_alarm_entity_id_alarm_type_created_time_alarm_id ON entity_alarm
+USING btree (tenant_id, entity_id, alarm_type, created_time DESC) INCLUDE(alarm_id);
+
+DROP INDEX IF EXISTS idx_alarm_tenant_status_created_time;
+ALTER TABLE alarm DROP COLUMN IF EXISTS status;
+
+-- Update old alarms and set their state to clear, if there are newer alarms.
+UPDATE alarm a
+SET cleared = TRUE
+WHERE cleared = FALSE
+  AND id != (SELECT l.id
+             FROM alarm l
+             WHERE l.tenant_id = a.tenant_id
+               AND l.originator_id = a.originator_id
+               AND l.type = a.type
+             ORDER BY l.created_time DESC, l.id
+             LIMIT 1);
+
+VACUUM FULL ANALYZE alarm;
+
+-- ALARM STATUS REFACTORING END
+
+-- ALARM COMMENTS START
+
 CREATE TABLE IF NOT EXISTS alarm_comment (
     id uuid NOT NULL,
     created_time bigint NOT NULL,
@@ -30,3 +94,256 @@ CREATE TABLE IF NOT EXISTS user_settings (
     settings varchar(100000),
     CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES tb_user(id) ON DELETE CASCADE
 );
+
+-- ALARM COMMENTS END
+
+-- ALARM INFO VIEW
+
+DROP VIEW IF EXISTS alarm_info CASCADE;
+CREATE VIEW alarm_info AS
+SELECT a.*,
+(CASE WHEN a.acknowledged AND a.cleared THEN 'CLEARED_ACK'
+      WHEN NOT a.acknowledged AND a.cleared THEN 'CLEARED_UNACK'
+      WHEN a.acknowledged AND NOT a.cleared THEN 'ACTIVE_ACK'
+      WHEN NOT a.acknowledged AND NOT a.cleared THEN 'ACTIVE_UNACK' END) as status,
+COALESCE(CASE WHEN a.originator_type = 0 THEN (select title from tenant where id = a.originator_id)
+              WHEN a.originator_type = 1 THEN (select title from customer where id = a.originator_id)
+              WHEN a.originator_type = 2 THEN (select email from tb_user where id = a.originator_id)
+              WHEN a.originator_type = 3 THEN (select title from dashboard where id = a.originator_id)
+              WHEN a.originator_type = 4 THEN (select name from asset where id = a.originator_id)
+              WHEN a.originator_type = 5 THEN (select name from device where id = a.originator_id)
+              WHEN a.originator_type = 9 THEN (select name from entity_view where id = a.originator_id)
+              WHEN a.originator_type = 13 THEN (select name from device_profile where id = a.originator_id)
+              WHEN a.originator_type = 14 THEN (select name from asset_profile where id = a.originator_id)
+              WHEN a.originator_type = 18 THEN (select name from edge where id = a.originator_id) END
+    , 'Deleted') originator_name,
+COALESCE(CASE WHEN a.originator_type = 0 THEN (select title from tenant where id = a.originator_id)
+              WHEN a.originator_type = 1 THEN (select COALESCE(title, email) from customer where id = a.originator_id)
+              WHEN a.originator_type = 2 THEN (select email from tb_user where id = a.originator_id)
+              WHEN a.originator_type = 3 THEN (select title from dashboard where id = a.originator_id)
+              WHEN a.originator_type = 4 THEN (select COALESCE(label, name) from asset where id = a.originator_id)
+              WHEN a.originator_type = 5 THEN (select COALESCE(label, name) from device where id = a.originator_id)
+              WHEN a.originator_type = 9 THEN (select name from entity_view where id = a.originator_id)
+              WHEN a.originator_type = 13 THEN (select name from device_profile where id = a.originator_id)
+              WHEN a.originator_type = 14 THEN (select name from asset_profile where id = a.originator_id)
+              WHEN a.originator_type = 18 THEN (select COALESCE(label, name) from edge where id = a.originator_id) END
+    , 'Deleted') as originator_label,
+u.first_name as assignee_first_name, u.last_name as assignee_last_name, u.email as assignee_email
+FROM alarm a
+LEFT JOIN tb_user u ON u.id = a.assignee_id;
+
+-- ALARM INFO VIEW END
+
+-- ALARM FUNCTIONS START
+
+DROP FUNCTION IF EXISTS create_or_update_active_alarm;
+CREATE OR REPLACE FUNCTION create_or_update_active_alarm(
+                                        t_id uuid, c_id uuid, a_id uuid, a_created_ts bigint,
+                                        a_o_id uuid, a_o_type integer, a_type varchar,
+                                        a_severity varchar, a_start_ts bigint, a_end_ts bigint,
+                                        a_details varchar,
+                                        a_propagate boolean, a_propagate_to_owner boolean,
+                                        a_propagate_to_tenant boolean, a_propagation_types varchar,
+                                        a_creation_enabled boolean)
+    RETURNS varchar
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    null_id constant uuid = '13814000-1dd2-11b2-8080-808080808080'::uuid;
+    existing  alarm;
+    result    alarm_info;
+    row_count integer;
+BEGIN
+    SELECT * INTO existing FROM alarm a WHERE a.originator_id = a_o_id AND a.type = a_type AND a.cleared = false ORDER BY a.start_ts DESC FOR UPDATE;
+    IF existing.id IS NULL THEN
+        IF a_creation_enabled = FALSE THEN
+            RETURN json_build_object('success', false)::text;
+        END IF;
+        IF c_id = null_id THEN
+            c_id = NULL;
+        end if;
+        INSERT INTO alarm
+            (tenant_id, customer_id, id, created_time,
+             originator_id, originator_type, type,
+             severity, start_ts, end_ts,
+             additional_info,
+             propagate, propagate_to_owner, propagate_to_tenant, propagate_relation_types,
+             acknowledged, ack_ts,
+             cleared, clear_ts,
+             assignee_id, assign_ts)
+             VALUES
+            (t_id, c_id, a_id, a_created_ts,
+             a_o_id, a_o_type, a_type,
+             a_severity, a_start_ts, a_end_ts,
+             a_details,
+             a_propagate, a_propagate_to_owner, a_propagate_to_tenant, a_propagation_types,
+             false, 0, false, 0, NULL, 0);
+        SELECT * INTO result FROM alarm_info a WHERE a.id = a_id AND a.tenant_id = t_id;
+        RETURN json_build_object('success', true, 'created', true, 'modified', true, 'alarm', row_to_json(result))::text;
+    ELSE
+        UPDATE alarm a
+        SET severity                 = a_severity,
+            start_ts                 = a_start_ts,
+            end_ts                   = a_end_ts,
+            additional_info          = a_details,
+            propagate                = a_propagate,
+            propagate_to_owner       = a_propagate_to_owner,
+            propagate_to_tenant      = a_propagate_to_tenant,
+            propagate_relation_types = a_propagation_types
+        WHERE a.id = existing.id
+          AND a.tenant_id = t_id
+          AND (severity != a_severity OR start_ts != a_start_ts OR end_ts != a_end_ts OR additional_info != a_details
+            OR propagate != a_propagate OR propagate_to_owner != a_propagate_to_owner OR
+               propagate_to_tenant != a_propagate_to_tenant OR propagate_relation_types != a_propagation_types);
+        GET DIAGNOSTICS row_count = ROW_COUNT;
+        SELECT * INTO result FROM alarm_info a WHERE a.id = existing.id AND a.tenant_id = t_id;
+        IF row_count > 0 THEN
+            RETURN json_build_object('success', true, 'modified', true, 'alarm', row_to_json(result), 'old', row_to_json(existing))::text;
+        ELSE
+            RETURN json_build_object('success', true, 'modified', false, 'alarm', row_to_json(result))::text;
+        END IF;
+    END IF;
+END
+$$;
+
+DROP FUNCTION IF EXISTS update_alarm;
+CREATE OR REPLACE FUNCTION update_alarm(t_id uuid, a_id uuid, a_severity varchar, a_start_ts bigint, a_end_ts bigint,
+                                        a_details varchar,
+                                        a_propagate boolean, a_propagate_to_owner boolean,
+                                        a_propagate_to_tenant boolean, a_propagation_types varchar)
+    RETURNS varchar
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    existing  alarm;
+    result    alarm_info;
+    row_count integer;
+BEGIN
+    SELECT * INTO existing FROM alarm a WHERE a.id = a_id AND a.tenant_id = t_id FOR UPDATE;
+    IF existing IS NULL THEN
+        RETURN json_build_object('success', false)::text;
+    END IF;
+    UPDATE alarm a
+    SET severity                 = a_severity,
+        start_ts                 = a_start_ts,
+        end_ts                   = a_end_ts,
+        additional_info          = a_details,
+        propagate                = a_propagate,
+        propagate_to_owner       = a_propagate_to_owner,
+        propagate_to_tenant      = a_propagate_to_tenant,
+        propagate_relation_types = a_propagation_types
+    WHERE a.id = a_id
+      AND a.tenant_id = t_id
+      AND (severity != a_severity OR start_ts != a_start_ts OR end_ts != a_end_ts OR additional_info != a_details
+        OR propagate != a_propagate OR propagate_to_owner != a_propagate_to_owner OR
+           propagate_to_tenant != a_propagate_to_tenant OR propagate_relation_types != a_propagation_types);
+    GET DIAGNOSTICS row_count = ROW_COUNT;
+    SELECT * INTO result FROM alarm_info a WHERE a.id = a_id AND a.tenant_id = t_id;
+    IF row_count > 0 THEN
+        RETURN json_build_object('success', true, 'modified', row_count > 0, 'alarm', row_to_json(result), 'old', row_to_json(existing))::text;
+    ELSE
+        RETURN json_build_object('success', true, 'modified', row_count > 0, 'alarm', row_to_json(result))::text;
+    END IF;
+END
+$$;
+
+DROP FUNCTION IF EXISTS acknowledge_alarm;
+CREATE OR REPLACE FUNCTION acknowledge_alarm(t_id uuid, a_id uuid, a_ts bigint)
+    RETURNS varchar
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    existing alarm;
+    result   alarm_info;
+    modified boolean = FALSE;
+BEGIN
+    SELECT * INTO existing FROM alarm a WHERE a.id = a_id AND a.tenant_id = t_id FOR UPDATE;
+    IF existing IS NULL THEN
+        RETURN json_build_object('success', false)::text;
+    END IF;
+
+    IF NOT (existing.acknowledged) THEN
+        modified = TRUE;
+        UPDATE alarm a SET acknowledged = true, ack_ts = a_ts WHERE a.id = a_id AND a.tenant_id = t_id;
+    END IF;
+    SELECT * INTO result FROM alarm_info a WHERE a.id = a_id AND a.tenant_id = t_id;
+    RETURN json_build_object('success', true, 'modified', modified, 'alarm', row_to_json(result))::text;
+END
+$$;
+
+DROP FUNCTION IF EXISTS clear_alarm;
+CREATE OR REPLACE FUNCTION clear_alarm(t_id uuid, a_id uuid, a_ts bigint, a_details varchar)
+    RETURNS varchar
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    existing alarm;
+    result   alarm_info;
+    cleared boolean = FALSE;
+BEGIN
+    SELECT * INTO existing FROM alarm a WHERE a.id = a_id AND a.tenant_id = t_id FOR UPDATE;
+    IF existing IS NULL THEN
+        RETURN json_build_object('success', false)::text;
+    END IF;
+    IF NOT(existing.cleared) THEN
+        cleared = TRUE;
+        UPDATE alarm a SET cleared = true, clear_ts = a_ts, additional_info = a_details WHERE a.id = a_id AND a.tenant_id = t_id;
+    END IF;
+    SELECT * INTO result FROM alarm_info a WHERE a.id = a_id AND a.tenant_id = t_id;
+    RETURN json_build_object('success', true, 'cleared', cleared, 'alarm', row_to_json(result))::text;
+END
+$$;
+
+DROP FUNCTION IF EXISTS assign_alarm;
+CREATE OR REPLACE FUNCTION assign_alarm(t_id uuid, a_id uuid, u_id uuid, a_ts bigint)
+    RETURNS varchar
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    existing alarm;
+    result   alarm_info;
+    modified boolean = FALSE;
+BEGIN
+    SELECT * INTO existing FROM alarm a WHERE a.id = a_id AND a.tenant_id = t_id FOR UPDATE;
+    IF existing IS NULL THEN
+        RETURN json_build_object('success', false)::text;
+    END IF;
+    IF existing.assignee_id IS NULL OR existing.assignee_id != u_id THEN
+        modified = TRUE;
+        UPDATE alarm a SET assignee_id = u_id, assign_ts = a_ts WHERE a.id = a_id AND a.tenant_id = t_id;
+    END IF;
+    SELECT * INTO result FROM alarm_info a WHERE a.id = a_id AND a.tenant_id = t_id;
+    RETURN json_build_object('success', true, 'modified', modified, 'alarm', row_to_json(result))::text;
+END
+$$;
+
+DROP FUNCTION IF EXISTS unassign_alarm;
+CREATE OR REPLACE FUNCTION unassign_alarm(t_id uuid, a_id uuid, a_ts bigint)
+    RETURNS varchar
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    existing alarm;
+    result   alarm_info;
+    modified boolean = FALSE;
+BEGIN
+    SELECT * INTO existing FROM alarm a WHERE a.id = a_id AND a.tenant_id = t_id FOR UPDATE;
+    IF existing IS NULL THEN
+        RETURN json_build_object('success', false)::text;
+    END IF;
+    IF existing.assignee_id IS NOT NULL THEN
+        modified = TRUE;
+        UPDATE alarm a SET assignee_id = NULL, assign_ts = a_ts WHERE a.id = a_id AND a.tenant_id = t_id;
+    END IF;
+    SELECT * INTO result FROM alarm_info a WHERE a.id = a_id AND a.tenant_id = t_id;
+    RETURN json_build_object('success', true, 'modified', modified, 'alarm', row_to_json(result))::text;
+END
+$$;
+
+-- ALARM FUNCTIONS END
diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
index 02ede2edaa..0c3589a077 100644
--- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
@@ -116,7 +116,7 @@ import java.util.stream.Collectors;
  * @author Andrew Shvayka
  */
 @Slf4j
-class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
+public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
 
     static final String SESSION_TIMEOUT_MESSAGE = "session timeout!";
     final TenantId tenantId;
diff --git a/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java b/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java
index 47355d6c44..9a6ffb0e32 100644
--- a/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java
@@ -15,6 +15,8 @@
  */
 package org.thingsboard.server.config;
 
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpStatus;
@@ -40,11 +42,15 @@ import java.util.Map;
 @Configuration
 @TbCoreComponent
 @EnableWebSocket
+@RequiredArgsConstructor
+@Slf4j
 public class WebSocketConfiguration implements WebSocketConfigurer {
 
     public static final String WS_PLUGIN_PREFIX = "/api/ws/plugins/";
     private static final String WS_PLUGIN_MAPPING = WS_PLUGIN_PREFIX + "**";
 
+    private final WebSocketHandler wsHandler;
+
     @Bean
     public ServletServerContainerFactoryBean createWebSocketContainer() {
         ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean();
@@ -55,7 +61,11 @@ public class WebSocketConfiguration implements WebSocketConfigurer {
 
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        registry.addHandler(wsHandler(), WS_PLUGIN_MAPPING).setAllowedOriginPatterns("*")
+        if (!(wsHandler instanceof TbWebSocketHandler)) {
+            log.error("TbWebSocketHandler expected but [{}] provided", wsHandler);
+            throw new RuntimeException("TbWebSocketHandler expected but " + wsHandler + " provided");
+        }
+        registry.addHandler(wsHandler, WS_PLUGIN_MAPPING).setAllowedOriginPatterns("*")
                 .addInterceptors(new HttpSessionHandshakeInterceptor(), new HandshakeInterceptor() {
 
                     @Override
@@ -82,11 +92,6 @@ public class WebSocketConfiguration implements WebSocketConfigurer {
                 });
     }
 
-    @Bean
-    public WebSocketHandler wsHandler() {
-        return new TbWebSocketHandler();
-    }
-
     protected SecurityUser getCurrentUser() throws ThingsboardException {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (authentication != null && authentication.getPrincipal() instanceof SecurityUser) {
diff --git a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
index d810fdede7..78ee6620fe 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmQuery;
@@ -41,16 +42,23 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.alarm.TbAlarmService;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.UserPrincipal;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
+import java.util.UUID;
+
 import static org.thingsboard.server.controller.ControllerConstants.ALARM_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ALARM_INFO_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ALARM_SORT_PROPERTY_ALLOWABLE_VALUES;
+import static org.thingsboard.server.controller.ControllerConstants.ASSIGNEE_ID;
+import static org.thingsboard.server.controller.ControllerConstants.ASSIGN_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_ID;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_TYPE;
@@ -79,6 +87,7 @@ public class AlarmController extends BaseController {
     private static final String ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES = "ANY, ACTIVE, CLEARED, ACK, UNACK";
     private static final String ALARM_QUERY_STATUS_DESCRIPTION = "A string value representing one of the AlarmStatus enumeration value";
     private static final String ALARM_QUERY_STATUS_ALLOWABLE_VALUES = "ACTIVE_UNACK, ACTIVE_ACK, CLEARED_UNACK, CLEARED_ACK";
+    private static final String ALARM_QUERY_ASSIGNEE_DESCRIPTION = "A string value representing the assignee user id. For example, '784f394c-42b6-435a-983c-b7beff2784f9'";
     private static final String ALARM_QUERY_TEXT_SEARCH_DESCRIPTION = "The case insensitive 'substring' filter based on of next alarm fields: type, severity or status";
     private static final String ALARM_QUERY_START_TIME_DESCRIPTION = "The start timestamp in milliseconds of the search time range over the Alarm class field: 'createdTime'.";
     private static final String ALARM_QUERY_END_TIME_DESCRIPTION = "The end timestamp in milliseconds of the search time range over the Alarm class field: 'createdTime'.";
@@ -93,12 +102,8 @@ public class AlarmController extends BaseController {
     public Alarm getAlarmById(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
                               @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
-        try {
-            AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
-            return checkAlarmId(alarmId, Operation.READ);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
+        AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
+        return checkAlarmId(alarmId, Operation.READ);
     }
 
     @ApiOperation(value = "Get Alarm Info (getAlarmInfoById)",
@@ -110,15 +115,11 @@ public class AlarmController extends BaseController {
     public AlarmInfo getAlarmInfoById(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
                                       @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
-        try {
-            AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
-            return checkAlarmInfoId(alarmId, Operation.READ);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
+        AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
+        return checkAlarmInfoId(alarmId, Operation.READ);
     }
 
-    @ApiOperation(value = "Create or update Alarm (saveAlarm)",
+    @ApiOperation(value = "Create or Update Alarm (saveAlarm)",
             notes = "Creates or Updates the Alarm. " +
                     "When creating alarm, platform generates Alarm Id as " + UUID_WIKI_LINK +
                     "The newly created Alarm id will be present in the response. Specify existing Alarm id to update the alarm. " +
@@ -135,7 +136,9 @@ public class AlarmController extends BaseController {
     @ResponseBody
     public Alarm saveAlarm(@ApiParam(value = "A JSON value representing the alarm.") @RequestBody Alarm alarm) throws ThingsboardException {
         alarm.setTenantId(getTenantId());
+        checkNotNull(alarm.getOriginator());
         checkEntity(alarm.getId(), alarm, Resource.ALARM);
+        checkEntityId(alarm.getOriginator(), Operation.READ);
         return tbAlarmService.save(alarm, getCurrentUser());
     }
 
@@ -158,11 +161,12 @@ public class AlarmController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/{alarmId}/ack", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
-    public void ackAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
+    public AlarmInfo ackAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
         checkParameter(ALARM_ID, strAlarmId);
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
         Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
-        tbAlarmService.ack(alarm, getCurrentUser()).get();
+        //TODO: return correct error code if the alarm is not found or already cleared
+        return tbAlarmService.ack(alarm, getCurrentUser());
     }
 
     @ApiOperation(value = "Clear Alarm (clearAlarm)",
@@ -172,11 +176,50 @@ public class AlarmController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/{alarmId}/clear", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
-    public void clearAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
+    public AlarmInfo clearAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
+        checkParameter(ALARM_ID, strAlarmId);
+        AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
+        Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
+        //TODO: return correct error code if the alarm is not found or already cleared
+        return tbAlarmService.clear(alarm, getCurrentUser());
+    }
+
+    @ApiOperation(value = "Assign/Reassign Alarm (assignAlarm)",
+            notes = "Assign the Alarm. " +
+                    "Once assigned, the 'assign_ts' field will be set to current timestamp and special rule chain event 'ALARM_ASSIGNED' " +
+                    "(or ALARM_REASSIGNED in case of assigning already assigned alarm) will be generated. " +
+                    "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/alarm/{alarmId}/assign/{assigneeId}", method = RequestMethod.POST)
+    @ResponseStatus(value = HttpStatus.OK)
+    public Alarm assignAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
+                             @PathVariable(ALARM_ID) String strAlarmId,
+                             @ApiParam(value = ASSIGN_ID_PARAM_DESCRIPTION)
+                             @PathVariable(ASSIGNEE_ID) String strAssigneeId
+    ) throws Exception {
         checkParameter(ALARM_ID, strAlarmId);
+        checkParameter(ASSIGNEE_ID, strAssigneeId);
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
         Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
-        tbAlarmService.clear(alarm, getCurrentUser()).get();
+        UserId assigneeId = new UserId(UUID.fromString(strAssigneeId));
+        checkUserId(assigneeId, Operation.READ);
+        return tbAlarmService.assign(alarm, assigneeId, System.currentTimeMillis(), getCurrentUser());
+    }
+
+    @ApiOperation(value = "Unassign Alarm (unassignAlarm)",
+            notes = "Unassign the Alarm. " +
+                    "Once unassigned, the 'assign_ts' field will be set to current timestamp and special rule chain event 'ALARM_UNASSIGNED' will be generated. " +
+                    "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/alarm/{alarmId}/assign", method = RequestMethod.DELETE)
+    @ResponseStatus(value = HttpStatus.OK)
+    public Alarm unassignAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
+                               @PathVariable(ALARM_ID) String strAlarmId
+    ) throws Exception {
+        checkParameter(ALARM_ID, strAlarmId);
+        AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
+        Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
+        return tbAlarmService.unassign(alarm, System.currentTimeMillis(), getCurrentUser());
     }
 
     @ApiOperation(value = "Get Alarms (getAlarms)",
@@ -194,6 +237,8 @@ public class AlarmController extends BaseController {
             @RequestParam(required = false) String searchStatus,
             @ApiParam(value = ALARM_QUERY_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_STATUS_ALLOWABLE_VALUES)
             @RequestParam(required = false) String status,
+            @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+            @RequestParam(required = false) String assigneeId,
             @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
             @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
@@ -221,10 +266,14 @@ public class AlarmController extends BaseController {
                     "and 'status' can't be specified at the same time!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
         }
         checkEntityId(entityId, Operation.READ);
+        UserId assigneeUserId = null;
+        if (assigneeId != null) {
+            assigneeUserId = new UserId(UUID.fromString(assigneeId));
+        }
         TimePageLink pageLink = createTimePageLink(pageSize, page, textSearch, sortProperty, sortOrder, startTime, endTime);
 
         try {
-            return checkNotNull(alarmService.findAlarms(getCurrentUser().getTenantId(), new AlarmQuery(entityId, pageLink, alarmSearchStatus, alarmStatus, fetchOriginator)).get());
+            return checkNotNull(alarmService.findAlarms(getCurrentUser().getTenantId(), new AlarmQuery(entityId, pageLink, alarmSearchStatus, alarmStatus, assigneeUserId, fetchOriginator)).get());
         } catch (Exception e) {
             throw handleException(e);
         }
@@ -244,6 +293,8 @@ public class AlarmController extends BaseController {
             @RequestParam(required = false) String searchStatus,
             @ApiParam(value = ALARM_QUERY_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_STATUS_ALLOWABLE_VALUES)
             @RequestParam(required = false) String status,
+            @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+            @RequestParam(required = false) String assigneeId,
             @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
             @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
@@ -267,13 +318,17 @@ public class AlarmController extends BaseController {
             throw new ThingsboardException("Invalid alarms search query: Both parameters 'searchStatus' " +
                     "and 'status' can't be specified at the same time!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
         }
+        UserId assigneeUserId = null;
+        if (assigneeId != null) {
+            assigneeUserId = new UserId(UUID.fromString(assigneeId));
+        }
         TimePageLink pageLink = createTimePageLink(pageSize, page, textSearch, sortProperty, sortOrder, startTime, endTime);
 
         try {
             if (getCurrentUser().isCustomerUser()) {
-                return checkNotNull(alarmService.findCustomerAlarms(getCurrentUser().getTenantId(), getCurrentUser().getCustomerId(), new AlarmQuery(null, pageLink, alarmSearchStatus, alarmStatus, fetchOriginator)).get());
+                return checkNotNull(alarmService.findCustomerAlarms(getCurrentUser().getTenantId(), getCurrentUser().getCustomerId(), new AlarmQuery(null, pageLink, alarmSearchStatus, alarmStatus, assigneeUserId, fetchOriginator)).get());
             } else {
-                return checkNotNull(alarmService.findAlarms(getCurrentUser().getTenantId(), new AlarmQuery(null, pageLink, alarmSearchStatus, alarmStatus, fetchOriginator)).get());
+                return checkNotNull(alarmService.findAlarms(getCurrentUser().getTenantId(), new AlarmQuery(null, pageLink, alarmSearchStatus, alarmStatus, assigneeUserId, fetchOriginator)).get());
             }
         } catch (Exception e) {
             throw handleException(e);
@@ -295,7 +350,9 @@ public class AlarmController extends BaseController {
             @ApiParam(value = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES)
             @RequestParam(required = false) String searchStatus,
             @ApiParam(value = ALARM_QUERY_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_STATUS_ALLOWABLE_VALUES)
-            @RequestParam(required = false) String status
+            @RequestParam(required = false) String status,
+            @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+            @RequestParam(required = false) String assigneeId
     ) throws ThingsboardException {
         checkParameter("EntityId", strEntityId);
         checkParameter("EntityType", strEntityType);
@@ -308,7 +365,7 @@ public class AlarmController extends BaseController {
         }
         checkEntityId(entityId, Operation.READ);
         try {
-            return alarmService.findHighestAlarmSeverity(getCurrentUser().getTenantId(), entityId, alarmSearchStatus, alarmStatus);
+            return alarmService.findHighestAlarmSeverity(getCurrentUser().getTenantId(), entityId, alarmSearchStatus, alarmStatus, assigneeId);
         } catch (Exception e) {
             throw handleException(e);
         }
diff --git a/application/src/main/java/org/thingsboard/server/controller/AuthController.java b/application/src/main/java/org/thingsboard/server/controller/AuthController.java
index c73ac1ae66..113c292380 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AuthController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AuthController.java
@@ -20,6 +20,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -41,11 +42,13 @@ import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.security.event.UserCredentialsInvalidationEvent;
 import org.thingsboard.server.common.data.security.event.UserSessionInvalidationEvent;
 import org.thingsboard.server.common.data.security.model.SecuritySettings;
 import org.thingsboard.server.common.data.security.model.UserPasswordPolicy;
+import org.thingsboard.server.common.msg.tools.TbRateLimits;
 import org.thingsboard.server.dao.audit.AuditLogService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.auth.rest.RestAuthenticationDetails;
@@ -62,6 +65,8 @@ import org.thingsboard.server.service.security.system.SystemSecurityService;
 import javax.servlet.http.HttpServletRequest;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 @RestController
 @TbCoreComponent
@@ -69,6 +74,10 @@ import java.net.URISyntaxException;
 @Slf4j
 @RequiredArgsConstructor
 public class AuthController extends BaseController {
+
+    @Value("${server.rest.rate_limits.reset_password_per_user:5:3600}")
+    private String defaultLimitsConfiguration;
+    private final ConcurrentMap<UserId, TbRateLimits> resetPasswordRateLimits = new ConcurrentHashMap<>();
     private final BCryptPasswordEncoder passwordEncoder;
     private final JwtTokenFactory tokenFactory;
     private final MailService mailService;
@@ -211,7 +220,12 @@ public class AuthController extends BaseController {
         HttpStatus responseStatus;
         String resetURI = "/login/resetPassword";
         UserCredentials userCredentials = userService.findUserCredentialsByResetToken(TenantId.SYS_TENANT_ID, resetToken);
+
         if (userCredentials != null) {
+            TbRateLimits tbRateLimits = getTbRateLimits(userCredentials.getUserId());
+            if (!tbRateLimits.tryConsume()) {
+                return ResponseEntity.status(HttpStatus.TOO_MANY_REQUESTS).build();
+            }
             try {
                 URI location = new URI(resetURI + "?resetToken=" + resetToken);
                 headers.setLocation(location);
@@ -323,4 +337,9 @@ public class AuthController extends BaseController {
             throw handleException(e);
         }
     }
+
+    private TbRateLimits getTbRateLimits(UserId userId) {
+        return resetPasswordRateLimits.computeIfAbsent(userId,
+                key -> new TbRateLimits(defaultLimitsConfiguration, true));
+    }
 }
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 92536b985a..8505b710d5 100644
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
@@ -613,7 +613,6 @@ public abstract class BaseController {
             throw handleException(e, false);
         }
     }
-
     Device checkDeviceId(DeviceId deviceId, Operation operation) throws ThingsboardException {
         try {
             validateId(deviceId, "Incorrect deviceId " + deviceId);
@@ -725,7 +724,7 @@ public abstract class BaseController {
     AlarmInfo checkAlarmInfoId(AlarmId alarmId, Operation operation) throws ThingsboardException {
         try {
             validateId(alarmId, "Incorrect alarmId " + alarmId);
-            AlarmInfo alarmInfo = alarmService.findAlarmInfoByIdAsync(getCurrentUser().getTenantId(), alarmId).get();
+            AlarmInfo alarmInfo = alarmService.findAlarmInfoById(getCurrentUser().getTenantId(), alarmId);
             checkNotNull(alarmInfo, "Alarm with id [" + alarmId + "] is not found");
             accessControlService.checkPermission(getCurrentUser(), Resource.ALARM, operation, alarmId, alarmInfo);
             return alarmInfo;
diff --git a/application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java b/application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java
index 768d98e403..53734b8633 100644
--- a/application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java
+++ b/application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java
@@ -27,6 +27,7 @@ public class ControllerConstants {
     protected static final String EDGE_ID = "edgeId";
     protected static final String RPC_ID = "rpcId";
     protected static final String ENTITY_ID = "entityId";
+    protected static final String ASSIGNEE_ID = "assigneeId";
     protected static final String PAGE_DATA_PARAMETERS = "You can specify parameters to filter the results. " +
             "The result is wrapped with PageData object that allows you to iterate over result set using pagination. " +
             "See the 'Model' tab of the Response Class for more details. ";
@@ -44,6 +45,7 @@ public class ControllerConstants {
     protected static final String USER_ID_PARAM_DESCRIPTION = "A string value representing the user id. For example, '784f394c-42b6-435a-983c-b7beff2784f9'";
     protected static final String ASSET_ID_PARAM_DESCRIPTION = "A string value representing the asset id. For example, '784f394c-42b6-435a-983c-b7beff2784f9'";
     protected static final String ALARM_ID_PARAM_DESCRIPTION = "A string value representing the alarm id. For example, '784f394c-42b6-435a-983c-b7beff2784f9'";
+    protected static final String ASSIGN_ID_PARAM_DESCRIPTION = "A string value representing the user id. For example, '784f394c-42b6-435a-983c-b7beff2784f9'";
 
     protected static final String ALARM_COMMENT_ID_PARAM_DESCRIPTION = "A string value representing the alarm comment id. For example, '784f394c-42b6-435a-983c-b7beff2784f9'";
     protected static final String ENTITY_ID_PARAM_DESCRIPTION = "A string value representing the entity id. For example, '784f394c-42b6-435a-983c-b7beff2784f9'";
diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
index 716b7ef60f..1d429e9157 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
@@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
@@ -38,6 +39,7 @@ import org.thingsboard.server.common.data.query.EntityDataPageLink;
 import org.thingsboard.server.common.data.query.EntityDataQuery;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.query.EntityQueryService;
+import org.thingsboard.server.service.security.permission.Operation;
 
 import static org.thingsboard.server.controller.ControllerConstants.ALARM_DATA_QUERY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_COUNT_QUERY_DESCRIPTION;
@@ -61,11 +63,7 @@ public class EntityQueryController extends BaseController {
             @ApiParam(value = "A JSON value representing the entity count query. See API call notes above for more details.")
             @RequestBody EntityCountQuery query) throws ThingsboardException {
         checkNotNull(query);
-        try {
-            return this.entityQueryService.countEntitiesByQuery(getCurrentUser(), query);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
+        return this.entityQueryService.countEntitiesByQuery(getCurrentUser(), query);
     }
 
     @ApiOperation(value = "Find Entity Data by Query", notes = ENTITY_DATA_QUERY_DESCRIPTION)
@@ -76,11 +74,7 @@ public class EntityQueryController extends BaseController {
             @ApiParam(value = "A JSON value representing the entity data query. See API call notes above for more details.")
             @RequestBody EntityDataQuery query) throws ThingsboardException {
         checkNotNull(query);
-        try {
-            return this.entityQueryService.findEntityDataByQuery(getCurrentUser(), query);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
+        return this.entityQueryService.findEntityDataByQuery(getCurrentUser(), query);
     }
 
     @ApiOperation(value = "Find Alarms by Query", notes = ALARM_DATA_QUERY_DESCRIPTION)
@@ -91,11 +85,12 @@ public class EntityQueryController extends BaseController {
             @ApiParam(value = "A JSON value representing the alarm data query. See API call notes above for more details.")
             @RequestBody AlarmDataQuery query) throws ThingsboardException {
         checkNotNull(query);
-        try {
-            return this.entityQueryService.findAlarmDataByQuery(getCurrentUser(), query);
-        } catch (Exception e) {
-            throw handleException(e);
+        checkNotNull(query.getPageLink());
+        UserId assigneeId = query.getPageLink().getAssigneeId();
+        if (assigneeId != null) {
+            checkUserId(assigneeId, Operation.READ);
         }
+        return this.entityQueryService.findAlarmDataByQuery(getCurrentUser(), query);
     }
 
     @ApiOperation(value = "Find Entity Keys by Query",
@@ -112,15 +107,11 @@ public class EntityQueryController extends BaseController {
             @RequestParam("attributes") boolean isAttributes) throws ThingsboardException {
         TenantId tenantId = getTenantId();
         checkNotNull(query);
-        try {
-            EntityDataPageLink pageLink = query.getPageLink();
-            if (pageLink.getPageSize() > MAX_PAGE_SIZE) {
-                pageLink.setPageSize(MAX_PAGE_SIZE);
-            }
-            return entityQueryService.getKeysByQuery(getCurrentUser(), tenantId, query, isTimeseries, isAttributes);
-        } catch (Exception e) {
-            throw handleException(e);
+        EntityDataPageLink pageLink = query.getPageLink();
+        if (pageLink.getPageSize() > MAX_PAGE_SIZE) {
+            pageLink.setPageSize(MAX_PAGE_SIZE);
         }
+        return entityQueryService.getKeysByQuery(getCurrentUser(), tenantId, query, isTimeseries, isAttributes);
     }
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
index c689ae3593..f43607b24c 100644
--- a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
+++ b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
@@ -67,8 +67,8 @@ import static org.thingsboard.server.service.telemetry.DefaultTelemetryWebSocket
 @Slf4j
 public class TbWebSocketHandler extends TextWebSocketHandler implements TelemetryWebSocketMsgEndpoint {
 
-    private static final ConcurrentMap<String, SessionMetaData> internalSessionMap = new ConcurrentHashMap<>();
-    private static final ConcurrentMap<String, String> externalSessionMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<String, SessionMetaData> internalSessionMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<String, String> externalSessionMap = new ConcurrentHashMap<>();
 
 
     @Autowired
@@ -82,13 +82,13 @@ public class TbWebSocketHandler extends TextWebSocketHandler implements Telemetr
     @Value("${server.ws.ping_timeout:30000}")
     private long pingTimeout;
 
-    private ConcurrentMap<String, TelemetryWebSocketSessionRef> blacklistedSessions = new ConcurrentHashMap<>();
-    private ConcurrentMap<String, TbRateLimits> perSessionUpdateLimits = new ConcurrentHashMap<>();
+    private final ConcurrentMap<String, TelemetryWebSocketSessionRef> blacklistedSessions = new ConcurrentHashMap<>();
+    private final ConcurrentMap<String, TbRateLimits> perSessionUpdateLimits = new ConcurrentHashMap<>();
 
-    private ConcurrentMap<TenantId, Set<String>> tenantSessionsMap = new ConcurrentHashMap<>();
-    private ConcurrentMap<CustomerId, Set<String>> customerSessionsMap = new ConcurrentHashMap<>();
-    private ConcurrentMap<UserId, Set<String>> regularUserSessionsMap = new ConcurrentHashMap<>();
-    private ConcurrentMap<UserId, Set<String>> publicUserSessionsMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<TenantId, Set<String>> tenantSessionsMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<CustomerId, Set<String>> customerSessionsMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<UserId, Set<String>> regularUserSessionsMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<UserId, Set<String>> publicUserSessionsMap = new ConcurrentHashMap<>();
 
     @Override
     public void handleTextMessage(WebSocketSession session, TextMessage message) {
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 67b79136ed..5674517ee1 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
@@ -86,6 +86,12 @@ public class EntityActionService {
             case ALARM_CLEAR:
                 msgType = DataConstants.ALARM_CLEAR;
                 break;
+            case ALARM_ASSIGN:
+                msgType = DataConstants.ALARM_ASSIGN;
+                break;
+            case ALARM_UNASSIGN:
+                msgType = DataConstants.ALARM_UNASSIGN;
+                break;
             case ALARM_DELETE:
                 msgType = DataConstants.ALARM_DELETE;
                 break;
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java
index 551412a756..d85750f7d2 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java
@@ -48,7 +48,7 @@ public abstract class BaseAlarmProcessor extends BaseEdgeProcessor {
             return Futures.immediateFuture(null);
         }
         try {
-            Alarm existentAlarm = alarmService.findLatestByOriginatorAndType(tenantId, originatorId, alarmUpdateMsg.getType()).get();
+            Alarm existentAlarm = alarmService.findLatestActiveByOriginatorAndType(tenantId, originatorId, alarmUpdateMsg.getType());
             switch (alarmUpdateMsg.getMsgType()) {
                 case ENTITY_CREATED_RPC_MESSAGE:
                 case ENTITY_UPDATED_RPC_MESSAGE:
@@ -62,7 +62,9 @@ public abstract class BaseAlarmProcessor extends BaseEdgeProcessor {
                         existentAlarm.setClearTs(alarmUpdateMsg.getClearTs());
                         existentAlarm.setPropagate(alarmUpdateMsg.getPropagate());
                     }
-                    existentAlarm.setStatus(AlarmStatus.valueOf(alarmUpdateMsg.getStatus()));
+                    var alarmStatus = AlarmStatus.valueOf(alarmUpdateMsg.getStatus());
+                    existentAlarm.setCleared(alarmStatus.isCleared());
+                    existentAlarm.setAcknowledged(alarmStatus.isAck());
                     existentAlarm.setAckTs(alarmUpdateMsg.getAckTs());
                     existentAlarm.setEndTs(alarmUpdateMsg.getEndTs());
                     existentAlarm.setDetails(JacksonUtil.OBJECT_MAPPER.readTree(alarmUpdateMsg.getDetails()));
@@ -70,18 +72,18 @@ public abstract class BaseAlarmProcessor extends BaseEdgeProcessor {
                     break;
                 case ALARM_ACK_RPC_MESSAGE:
                     if (existentAlarm != null) {
-                        alarmService.ackAlarm(tenantId, existentAlarm.getId(), alarmUpdateMsg.getAckTs());
+                        alarmService.acknowledgeAlarm(tenantId, existentAlarm.getId(), alarmUpdateMsg.getAckTs());
                     }
                     break;
                 case ALARM_CLEAR_RPC_MESSAGE:
                     if (existentAlarm != null) {
                         alarmService.clearAlarm(tenantId, existentAlarm.getId(),
-                                JacksonUtil.OBJECT_MAPPER.readTree(alarmUpdateMsg.getDetails()), alarmUpdateMsg.getAckTs());
+                                alarmUpdateMsg.getAckTs(), JacksonUtil.OBJECT_MAPPER.readTree(alarmUpdateMsg.getDetails()));
                     }
                     break;
                 case ENTITY_DELETED_RPC_MESSAGE:
                     if (existentAlarm != null) {
-                        alarmService.deleteAlarm(tenantId, existentAlarm.getId());
+                        alarmService.delAlarm(tenantId, existentAlarm.getId());
                     }
                     break;
             }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
index f12010d5d5..3156ff404b 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
@@ -76,7 +76,7 @@ public abstract class AbstractTbEntityService {
 
     protected ListenableFuture<Void> removeAlarmsByEntityId(TenantId tenantId, EntityId entityId) {
         ListenableFuture<PageData<AlarmInfo>> alarmsFuture =
-                alarmService.findAlarms(tenantId, new AlarmQuery(entityId, new TimePageLink(Integer.MAX_VALUE), null, null, false));
+                alarmService.findAlarms(tenantId, new AlarmQuery(entityId, new TimePageLink(Integer.MAX_VALUE), null, null, null, false));
 
         ListenableFuture<List<AlarmId>> alarmIdsFuture = Futures.transform(alarmsFuture, page ->
                 page.getData().stream().map(AlarmInfo::getId).collect(Collectors.toList()), dbExecutor);
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java
index a6620152ac..03a0671162 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java
@@ -308,6 +308,10 @@ public class DefaultTbNotificationEntityService implements TbNotificationEntityS
                 return EdgeEventActionType.ALARM_ACK;
             case ALARM_CLEAR:
                 return EdgeEventActionType.ALARM_CLEAR;
+            case ALARM_ASSIGN:
+                return EdgeEventActionType.ALARM_ASSIGN;
+            case ALARM_UNASSIGN:
+                return EdgeEventActionType.ALARM_UNASSIGN;
             case DELETED:
                 return EdgeEventActionType.DELETED;
             case RELATION_ADD_OR_UPDATE:
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
index 46b56dec30..e452a766a4 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
@@ -15,22 +15,25 @@
  */
 package org.thingsboard.server.service.entitiy.alarm;
 
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmAssignee;
 import org.thingsboard.server.common.data.alarm.AlarmComment;
 import org.thingsboard.server.common.data.alarm.AlarmCommentType;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
 import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 import org.thingsboard.server.service.entitiy.AbstractTbEntityService;
 
 import java.util.List;
@@ -44,9 +47,34 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
         ActionType actionType = alarm.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
         TenantId tenantId = alarm.getTenantId();
         try {
-            Alarm savedAlarm = checkNotNull(alarmSubscriptionService.createOrUpdateAlarm(alarm));
-            notificationEntityService.notifyCreateOrUpdateAlarm(savedAlarm, actionType, user);
-            return savedAlarm;
+            AlarmApiCallResult result;
+            if (alarm.getId() == null) {
+                result = alarmSubscriptionService.createAlarm(AlarmCreateOrUpdateActiveRequest.fromAlarm(alarm, user.getId()));
+            } else {
+                result = alarmSubscriptionService.updateAlarm(AlarmUpdateRequest.fromAlarm(alarm, user.getId()));
+            }
+            if (!result.isSuccessful()) {
+                throw new ThingsboardException(ThingsboardErrorCode.ITEM_NOT_FOUND);
+            }
+            actionType = result.isCreated() ? ActionType.ADDED : ActionType.UPDATED;
+            if (result.isModified()) {
+                notificationEntityService.notifyCreateOrUpdateAlarm(result.getAlarm(), actionType, user);
+            }
+            AlarmInfo resultAlarm = result.getAlarm();
+            if (alarm.isAcknowledged() && !resultAlarm.isAcknowledged()) {
+                resultAlarm = ack(resultAlarm, alarm.getAckTs(), user);
+            }
+            if (alarm.isCleared() && !resultAlarm.isCleared()) {
+                resultAlarm = clear(resultAlarm, alarm.getClearTs(), user);
+            }
+            UserId newAssignee = alarm.getAssigneeId();
+            UserId curAssignee = resultAlarm.getAssigneeId();
+            if (newAssignee != null && !newAssignee.equals(curAssignee)) {
+                resultAlarm = assign(alarm, newAssignee, alarm.getAssignTs(), user);
+            } else if (newAssignee == null && curAssignee != null) {
+                resultAlarm = unassign(alarm, alarm.getAssignTs(), user);
+            }
+            return new Alarm(resultAlarm);
         } catch (Exception e) {
             notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ALARM), alarm, actionType, user, e);
             throw e;
@@ -54,43 +82,110 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
     }
 
     @Override
-    public ListenableFuture<Void> ack(Alarm alarm, User user) {
-        long ackTs = System.currentTimeMillis();
-        ListenableFuture<Boolean> future = alarmSubscriptionService.ackAlarm(alarm.getTenantId(), alarm.getId(), ackTs);
-        return Futures.transform(future, result -> {
+    public AlarmInfo ack(Alarm alarm, User user) throws ThingsboardException {
+        return ack(alarm, System.currentTimeMillis(), user);
+    }
+
+    @Override
+    public AlarmInfo ack(Alarm alarm, long ackTs, User user) throws ThingsboardException {
+        AlarmApiCallResult result = alarmSubscriptionService.acknowledgeAlarm(alarm.getTenantId(), alarm.getId(), getOrDefault(ackTs));
+        if (!result.isSuccessful()) {
+            throw new ThingsboardException(ThingsboardErrorCode.ITEM_NOT_FOUND);
+        }
+        if (result.isModified()) {
             AlarmComment alarmComment = AlarmComment.builder()
                     .alarmId(alarm.getId())
                     .type(AlarmCommentType.SYSTEM)
                     .comment(JacksonUtil.newObjectNode().put("text", String.format("Alarm was acknowledged by user %s",
-                                            (user.getFirstName() == null || user.getLastName() == null) ? user.getName() : user.getFirstName() + " " + user.getLastName()))
-                            .put("userId", user.getId().toString()))
+                            (user.getFirstName() == null || user.getLastName() == null) ? user.getName() : user.getFirstName() + " " + user.getLastName()))
+                            .put("userId", user.getId().toString())
+                            .put("subtype", "ACK"))
                     .build();
             alarmCommentService.createOrUpdateAlarmComment(alarm.getTenantId(), alarmComment);
-            alarm.setAckTs(ackTs);
-            alarm.setStatus(alarm.getStatus().isCleared() ? AlarmStatus.CLEARED_ACK : AlarmStatus.ACTIVE_ACK);
-            notificationEntityService.notifyCreateOrUpdateAlarm(alarm, ActionType.ALARM_ACK, user);
-            return null;
-        }, MoreExecutors.directExecutor());
+            notificationEntityService.notifyCreateOrUpdateAlarm(result.getAlarm(), ActionType.ALARM_ACK, user);
+        } else {
+            throw new ThingsboardException("Alarm was already acknowledged!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+        }
+        return result.getAlarm();
+    }
+
+    @Override
+    public AlarmInfo clear(Alarm alarm, User user) throws ThingsboardException {
+        return clear(alarm, System.currentTimeMillis(), user);
     }
 
     @Override
-    public ListenableFuture<Void> clear(Alarm alarm, User user) {
-        long clearTs = System.currentTimeMillis();
-        ListenableFuture<Boolean> future = alarmSubscriptionService.clearAlarm(alarm.getTenantId(), alarm.getId(), null, clearTs);
-        return Futures.transform(future, result -> {
+    public AlarmInfo clear(Alarm alarm, long clearTs, User user) throws ThingsboardException {
+        AlarmApiCallResult result = alarmSubscriptionService.clearAlarm(alarm.getTenantId(), alarm.getId(), getOrDefault(clearTs), null);
+        if (!result.isSuccessful()) {
+            throw new ThingsboardException(ThingsboardErrorCode.ITEM_NOT_FOUND);
+        }
+        if (result.isCleared()) {
             AlarmComment alarmComment = AlarmComment.builder()
                     .alarmId(alarm.getId())
                     .type(AlarmCommentType.SYSTEM)
                     .comment(JacksonUtil.newObjectNode().put("text", String.format("Alarm was cleared by user %s",
-                                    (user.getFirstName() == null || user.getLastName() == null) ? user.getName() : user.getFirstName() + " " + user.getLastName()))
-                            .put("userId", user.getId().toString()))
+                            (user.getFirstName() == null || user.getLastName() == null) ? user.getName() : user.getFirstName() + " " + user.getLastName()))
+                            .put("userId", user.getId().toString())
+                            .put("subtype", "CLEAR"))
+                    .build();
+            alarmCommentService.createOrUpdateAlarmComment(alarm.getTenantId(), alarmComment);
+            notificationEntityService.notifyCreateOrUpdateAlarm(result.getAlarm(), ActionType.ALARM_CLEAR, user);
+        } else {
+            throw new ThingsboardException("Alarm was already cleared!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+        }
+        return result.getAlarm();
+    }
+
+    @Override
+    public AlarmInfo assign(Alarm alarm, UserId assigneeId, long assignTs, User user) throws ThingsboardException {
+        AlarmApiCallResult result = alarmSubscriptionService.assignAlarm(alarm.getTenantId(), alarm.getId(), assigneeId, getOrDefault(assignTs));
+        if (!result.isSuccessful()) {
+            throw new ThingsboardException(ThingsboardErrorCode.ITEM_NOT_FOUND);
+        }
+        AlarmInfo alarmInfo = result.getAlarm();
+        if (result.isModified()) {
+            AlarmAssignee assignee = alarmInfo.getAssignee();
+            AlarmComment alarmComment = AlarmComment.builder()
+                    .alarmId(alarm.getId())
+                    .type(AlarmCommentType.SYSTEM)
+                    .comment(JacksonUtil.newObjectNode().put("text", String.format("Alarm was assigned by user %s to user %s",
+                            (user.getFirstName() == null || user.getLastName() == null) ? user.getName() : user.getFirstName() + " " + user.getLastName(),
+                            (assignee.getFirstName() == null || assignee.getLastName() == null) ? assignee.getEmail() : assignee.getFirstName() + " " + assignee.getLastName()))
+                            .put("userId", user.getId().toString())
+                            .put("assigneeId", assignee.getId().toString())
+                            .put("subtype", "ASSIGN"))
+                    .build();
+            alarmCommentService.createOrUpdateAlarmComment(alarm.getTenantId(), alarmComment);
+            notificationEntityService.notifyCreateOrUpdateAlarm(result.getAlarm(), ActionType.ALARM_ASSIGN, user);
+        } else {
+            throw new ThingsboardException("Alarm was already assigned to this user!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+        }
+        return alarmInfo;
+    }
+
+    @Override
+    public AlarmInfo unassign(Alarm alarm, long unassignTs, User user) throws ThingsboardException {
+        AlarmApiCallResult result = alarmSubscriptionService.unassignAlarm(alarm.getTenantId(), alarm.getId(), getOrDefault(unassignTs));
+        if (!result.isSuccessful()) {
+            throw new ThingsboardException(ThingsboardErrorCode.ITEM_NOT_FOUND);
+        }
+        AlarmInfo alarmInfo = result.getAlarm();
+        if (result.isModified()) {
+            AlarmComment alarmComment = AlarmComment.builder()
+                    .alarmId(alarm.getId())
+                    .type(AlarmCommentType.SYSTEM)
+                    .comment(JacksonUtil.newObjectNode().put("text", String.format("Alarm was unassigned by user %s",
+                            (user.getFirstName() == null || user.getLastName() == null) ? user.getName() : user.getFirstName() + " " + user.getLastName()))
+                            .put("userId", user.getId().toString())
+                            .put("subtype", "ASSIGN"))
                     .build();
             alarmCommentService.createOrUpdateAlarmComment(alarm.getTenantId(), alarmComment);
-            alarm.setClearTs(clearTs);
-            alarm.setStatus(alarm.getStatus().isAck() ? AlarmStatus.CLEARED_ACK : AlarmStatus.CLEARED_UNACK);
-            notificationEntityService.notifyCreateOrUpdateAlarm(alarm, ActionType.ALARM_CLEAR, user);
-            return null;
-        }, MoreExecutors.directExecutor());
+            notificationEntityService.notifyCreateOrUpdateAlarm(result.getAlarm(), ActionType.ALARM_UNASSIGN, user);
+        } else {
+            throw new ThingsboardException("Alarm was already unassigned!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+        }
+        return alarmInfo;
     }
 
     @Override
@@ -101,4 +196,8 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
                 relatedEdgeIds, user, JacksonUtil.toString(alarm));
         return alarmSubscriptionService.deleteAlarm(tenantId, alarm.getId());
     }
+
+    private static long getOrDefault(long ts) {
+        return ts > 0 ? ts : System.currentTimeMillis();
+    }
 }
\ No newline at end of file
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java
index f6746e20cc..a2ae9c8cc7 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java
@@ -15,18 +15,27 @@
  */
 package org.thingsboard.server.service.entitiy.alarm;
 
-import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.UserId;
 
 public interface TbAlarmService {
 
     Alarm save(Alarm entity, User user) throws ThingsboardException;
 
-    ListenableFuture<Void> ack(Alarm alarm, User user);
+    AlarmInfo ack(Alarm alarm, User user) throws ThingsboardException;
 
-    ListenableFuture<Void> clear(Alarm alarm, User user);
+    AlarmInfo ack(Alarm alarm, long ackTs, User user) throws ThingsboardException;
+
+    AlarmInfo clear(Alarm alarm, User user) throws ThingsboardException;
+
+    AlarmInfo clear(Alarm alarm, long clearTs, User user) throws ThingsboardException;
+
+    AlarmInfo assign(Alarm alarm, UserId assigneeId, long assignTs, User user) throws ThingsboardException;
+
+    AlarmInfo unassign(Alarm alarm, long unassignTs, User user) throws ThingsboardException;
 
     Boolean delete(Alarm alarm, User user);
 }
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 13f8672d67..43d6a4df0a 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
@@ -556,7 +556,7 @@ public class DefaultDataUpdateService implements DataUpdateService {
             };
 
     private void updateTenantAlarmsCustomer(TenantId tenantId, String name, AtomicLong processed) {
-        AlarmQuery alarmQuery = new AlarmQuery(null, new TimePageLink(1000), null, null, false);
+        AlarmQuery alarmQuery = new AlarmQuery(null, new TimePageLink(1000), null, null, null, false);
         PageData<AlarmInfo> alarms = alarmDao.findAlarms(tenantId, alarmQuery);
         boolean hasNext = true;
         while (hasNext) {
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
index b8d0da0678..b55b965330 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
@@ -26,6 +26,7 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rpc.RpcError;
@@ -35,6 +36,7 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.rpc.FromDeviceRpcResponse;
 import org.thingsboard.server.common.stats.StatsFactory;
+import org.thingsboard.server.common.data.alarm.AlarmAssigneeUpdate;
 import org.thingsboard.server.service.security.auth.jwt.settings.JwtSettingsService;
 import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
@@ -502,13 +504,14 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
             subscriptionManagerService.onAlarmUpdate(
                     TenantId.fromUUID(new UUID(proto.getTenantIdMSB(), proto.getTenantIdLSB())),
                     TbSubscriptionUtils.toEntityId(proto.getEntityType(), proto.getEntityIdMSB(), proto.getEntityIdLSB()),
-                    JacksonUtil.fromString(proto.getAlarm(), Alarm.class), callback);
+                    JacksonUtil.fromString(proto.getAlarm(), AlarmInfo.class),
+                    callback);
         } else if (msg.hasAlarmDelete()) {
             TbAlarmDeleteProto proto = msg.getAlarmDelete();
             subscriptionManagerService.onAlarmDeleted(
                     TenantId.fromUUID(new UUID(proto.getTenantIdMSB(), proto.getTenantIdLSB())),
                     TbSubscriptionUtils.toEntityId(proto.getEntityType(), proto.getEntityIdMSB(), proto.getEntityIdLSB()),
-                    JacksonUtil.fromString(proto.getAlarm(), Alarm.class), callback);
+                    JacksonUtil.fromString(proto.getAlarm(), AlarmInfo.class), callback);
         } else {
             throwNotHandled(msg, callback);
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java b/application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java
index 1a81c6617f..726a5d98f0 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java
@@ -228,8 +228,7 @@ public class DefaultSystemSecurityService implements SystemSecurityService {
 
         if (userCredentials != null && isPositiveInteger(passwordPolicy.getPasswordReuseFrequencyDays())) {
             long passwordReuseFrequencyTs = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(passwordPolicy.getPasswordReuseFrequencyDays());
-            User user = userService.findUserById(tenantId, userCredentials.getUserId());
-            JsonNode additionalInfo = user.getAdditionalInfo();
+            JsonNode additionalInfo = userCredentials.getAdditionalInfo();
             if (additionalInfo instanceof ObjectNode && additionalInfo.has(UserServiceImpl.USER_PASSWORD_HISTORY)) {
                 JsonNode userPasswordHistoryJson = additionalInfo.get(UserServiceImpl.USER_PASSWORD_HISTORY);
                 Map<String, String> userPasswordHistoryMap = JacksonUtil.convertValue(userPasswordHistoryJson, new TypeReference<>() {});
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
index 96b6c446d5..74089bac3e 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
@@ -26,6 +26,7 @@ import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -40,6 +41,7 @@ import org.thingsboard.server.common.data.kv.TsKvEntry;
 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.data.alarm.AlarmAssigneeUpdate;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.gen.transport.TransportProtos.LocalSubscriptionServiceMsgProto;
@@ -268,7 +270,7 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
                 updateDeviceInactivityTimeout(tenantId, entityId, attributes);
             } else if (TbAttributeSubscriptionScope.SHARED_SCOPE.name().equalsIgnoreCase(scope) && notifyDevice) {
                 clusterService.pushMsgToCore(DeviceAttributesEventNotificationMsg.onUpdate(tenantId,
-                                new DeviceId(entityId.getId()), DataConstants.SHARED_SCOPE, new ArrayList<>(attributes))
+                        new DeviceId(entityId.getId()), DataConstants.SHARED_SCOPE, new ArrayList<>(attributes))
                         , null);
             }
         }
@@ -292,7 +294,7 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
     }
 
     @Override
-    public void onAlarmUpdate(TenantId tenantId, EntityId entityId, Alarm alarm, TbCallback callback) {
+    public void onAlarmUpdate(TenantId tenantId, EntityId entityId, AlarmInfo alarm, TbCallback callback) {
         onLocalAlarmSubUpdate(entityId,
                 s -> {
                     if (TbSubscriptionType.ALARMS.equals(s.getType())) {
@@ -301,15 +303,14 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
                         return null;
                     }
                 },
-                s -> alarm.getCreatedTime() >= s.getTs(),
-                s -> alarm,
-                false
+                s -> alarm.getCreatedTime() >= s.getTs() || alarm.getAssignTs() >= s.getTs(),
+                alarm, false
         );
         callback.onSuccess();
     }
 
     @Override
-    public void onAlarmDeleted(TenantId tenantId, EntityId entityId, Alarm alarm, TbCallback callback) {
+    public void onAlarmDeleted(TenantId tenantId, EntityId entityId, AlarmInfo alarm, TbCallback callback) {
         onLocalAlarmSubUpdate(entityId,
                 s -> {
                     if (TbSubscriptionType.ALARMS.equals(s.getType())) {
@@ -319,8 +320,7 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
                     }
                 },
                 s -> alarm.getCreatedTime() >= s.getTs(),
-                s -> alarm,
-                true
+                alarm, true
         );
         callback.onSuccess();
     }
@@ -354,7 +354,7 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
                 deleteDeviceInactivityTimeout(tenantId, entityId, keys);
             } else if (TbAttributeSubscriptionScope.SHARED_SCOPE.name().equalsIgnoreCase(scope) && notifyDevice) {
                 clusterService.pushMsgToCore(DeviceAttributesEventNotificationMsg.onDelete(tenantId,
-                                new DeviceId(entityId.getId()), scope, keys), null);
+                        new DeviceId(entityId.getId()), scope, keys), null);
             }
         }
         callback.onSuccess();
@@ -414,19 +414,20 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
     private void onLocalAlarmSubUpdate(EntityId entityId,
                                        Function<TbSubscription, TbAlarmsSubscription> castFunction,
                                        Predicate<TbAlarmsSubscription> filterFunction,
-                                       Function<TbAlarmsSubscription, Alarm> processFunction, boolean deleted) {
+                                       AlarmInfo alarm, boolean deleted) {
         Set<TbSubscription> entitySubscriptions = subscriptionsByEntityId.get(entityId);
+        if (alarm == null) {
+            log.warn("[{}] empty alarm update!", entityId);
+            return;
+        }
         if (entitySubscriptions != null) {
             entitySubscriptions.stream().map(castFunction).filter(Objects::nonNull).filter(filterFunction).forEach(s -> {
-                Alarm alarm = processFunction.apply(s);
-                if (alarm != null) {
-                    if (serviceId.equals(s.getServiceId())) {
-                        AlarmSubscriptionUpdate update = new AlarmSubscriptionUpdate(s.getSubscriptionId(), alarm, deleted);
-                        localSubscriptionService.onSubscriptionUpdate(s.getSessionId(), update, TbCallback.EMPTY);
-                    } else {
-                        TopicPartitionInfo tpi = notificationsTopicService.getNotificationsTopic(ServiceType.TB_CORE, s.getServiceId());
-                        toCoreNotificationsProducer.send(tpi, toProto(s, alarm, deleted), null);
-                    }
+                if (serviceId.equals(s.getServiceId())) {
+                    AlarmSubscriptionUpdate update = new AlarmSubscriptionUpdate(s.getSubscriptionId(), alarm, deleted);
+                    localSubscriptionService.onSubscriptionUpdate(s.getSessionId(), update, TbCallback.EMPTY);
+                } else {
+                    TopicPartitionInfo tpi = notificationsTopicService.getNotificationsTopic(ServiceType.TB_CORE, s.getServiceId());
+                    toCoreNotificationsProducer.send(tpi, toProto(s, alarm, deleted), null);
                 }
             });
         } else {
@@ -557,12 +558,12 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
         });
 
         ToCoreNotificationMsg toCoreMsg = ToCoreNotificationMsg.newBuilder().setToLocalSubscriptionServiceMsg(
-                        LocalSubscriptionServiceMsgProto.newBuilder().setSubUpdate(builder.build()).build())
+                LocalSubscriptionServiceMsgProto.newBuilder().setSubUpdate(builder.build()).build())
                 .build();
         return new TbProtoQueueMsg<>(subscription.getEntityId().getId(), toCoreMsg);
     }
 
-    private TbProtoQueueMsg<ToCoreNotificationMsg> toProto(TbSubscription subscription, Alarm alarm, boolean deleted) {
+    private TbProtoQueueMsg<ToCoreNotificationMsg> toProto(TbSubscription subscription, AlarmInfo alarm, boolean deleted) {
         TbAlarmSubscriptionUpdateProto.Builder builder = TbAlarmSubscriptionUpdateProto.newBuilder();
 
         builder.setSessionId(subscription.getSessionId());
@@ -571,8 +572,8 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
         builder.setDeleted(deleted);
 
         ToCoreNotificationMsg toCoreMsg = ToCoreNotificationMsg.newBuilder().setToLocalSubscriptionServiceMsg(
-                        LocalSubscriptionServiceMsgProto.newBuilder()
-                                .setAlarmSubUpdate(builder.build()).build())
+                LocalSubscriptionServiceMsgProto.newBuilder()
+                        .setAlarmSubUpdate(builder.build()).build())
                 .build();
         return new TbProtoQueueMsg<>(subscription.getEntityId().getId(), toCoreMsg);
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/SubscriptionManagerService.java b/application/src/main/java/org/thingsboard/server/service/subscription/SubscriptionManagerService.java
index a3a2062fa6..410b2a4a1c 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/SubscriptionManagerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/SubscriptionManagerService.java
@@ -17,11 +17,13 @@ package org.thingsboard.server.service.subscription;
 
 import org.springframework.context.ApplicationListener;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
 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 org.thingsboard.server.common.msg.queue.TbCallback;
+import org.thingsboard.server.common.data.alarm.AlarmAssigneeUpdate;
 import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
 
 import java.util.List;
@@ -42,9 +44,9 @@ public interface SubscriptionManagerService extends ApplicationListener<Partitio
 
     void onTimeSeriesDelete(TenantId tenantId, EntityId entityId, List<String> keys, TbCallback callback);
 
-    void onAlarmUpdate(TenantId tenantId, EntityId entityId, Alarm alarm, TbCallback callback);
+    void onAlarmUpdate(TenantId tenantId, EntityId entityId, AlarmInfo alarm, TbCallback callback);
 
-    void onAlarmDeleted(TenantId tenantId, EntityId entityId, Alarm alarm, TbCallback callback);
+    void onAlarmDeleted(TenantId tenantId, EntityId entityId, AlarmInfo alarm, TbCallback callback);
 
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmDataSubCtx.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmDataSubCtx.java
index c8cbf19b4c..c90302998a 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmDataSubCtx.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmDataSubCtx.java
@@ -20,7 +20,9 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
+import org.thingsboard.server.common.data.alarm.AlarmStatusFilter;
 import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.kv.Aggregation;
@@ -63,10 +65,8 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> {
 
     private final AlarmService alarmService;
     @Getter
-    @Setter
     private final LinkedHashMap<EntityId, EntityData> entitiesMap;
     @Getter
-    @Setter
     private final HashMap<AlarmId, AlarmData> alarmsMap;
 
     private final int maxEntitiesPerAlarmSubscription;
@@ -225,8 +225,7 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> {
             boolean matchesFilter = filter(alarm);
             if (onCurrentPage) {
                 if (matchesFilter) {
-                    AlarmData updated = new AlarmData(alarm, current.getOriginatorName(), current.getEntityId());
-                    updated.getLatest().putAll(current.getLatest());
+                    AlarmData updated = new AlarmData(subscriptionUpdate.getAlarm(), current);
                     alarmsMap.put(alarmId, updated);
                     sendWsMsg(new AlarmDataUpdate(cmdId, null, Collections.singletonList(updated), maxEntitiesPerAlarmSubscription, data.getTotalElements()));
                 } else {
@@ -270,8 +269,24 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> {
         if (filter.getStatusList() != null && !filter.getStatusList().isEmpty()) {
             boolean matches = false;
             for (AlarmSearchStatus status : filter.getStatusList()) {
-                if (status.getStatuses().contains(alarm.getStatus())) {
-                    matches = true;
+                switch (status) {
+                    case ANY:
+                        matches = true;
+                        break;
+                    case ACK:
+                        matches = alarm.isAcknowledged();
+                        break;
+                    case UNACK:
+                        matches = !alarm.isAcknowledged();
+                        break;
+                    case CLEARED:
+                        matches = alarm.isCleared();
+                        break;
+                    case ACTIVE:
+                        matches = !alarm.isCleared();
+                        break;
+                }
+                if (matches) {
                     break;
                 }
             }
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java
index 4fd934b298..c30ac9f0d5 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java
@@ -17,6 +17,8 @@ package org.thingsboard.server.service.subscription;
 
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmAssigneeUpdate;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -189,8 +191,8 @@ public class TbSubscriptionUtils {
         if (proto.getErrorCode() > 0) {
             return new AlarmSubscriptionUpdate(proto.getSubscriptionId(), SubscriptionErrorCode.forCode(proto.getErrorCode()), proto.getErrorMsg());
         } else {
-            Alarm alarm = JacksonUtil.fromString(proto.getAlarm(), Alarm.class);
-            return new AlarmSubscriptionUpdate(proto.getSubscriptionId(), alarm);
+            AlarmInfo alarm = JacksonUtil.fromString(proto.getAlarm(), AlarmInfo.class);
+            return new AlarmSubscriptionUpdate(proto.getSubscriptionId(), alarm, proto.getDeleted());
         }
     }
 
@@ -316,7 +318,7 @@ public class TbSubscriptionUtils {
         return entry;
     }
 
-    public static ToCoreMsg toAlarmUpdateProto(TenantId tenantId, EntityId entityId, Alarm alarm) {
+    public static ToCoreMsg toAlarmUpdateProto(TenantId tenantId, EntityId entityId, AlarmInfo alarm) {
         TbAlarmUpdateProto.Builder builder = TbAlarmUpdateProto.newBuilder();
         builder.setEntityType(entityId.getEntityType().name());
         builder.setEntityIdMSB(entityId.getId().getMostSignificantBits());
@@ -329,7 +331,7 @@ public class TbSubscriptionUtils {
         return ToCoreMsg.newBuilder().setToSubscriptionMgrMsg(msgBuilder.build()).build();
     }
 
-    public static ToCoreMsg toAlarmDeletedProto(TenantId tenantId, EntityId entityId, Alarm alarm) {
+    public static ToCoreMsg toAlarmDeletedProto(TenantId tenantId, EntityId entityId, AlarmInfo alarm) {
         TbAlarmDeleteProto.Builder builder = TbAlarmDeleteProto.newBuilder();
         builder.setEntityType(entityId.getEntityType().name());
         builder.setEntityIdMSB(entityId.getId().getMostSignificantBits());
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
index a7b46deaa9..6eb5f16b27 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
@@ -29,14 +29,18 @@ import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmComment;
 import org.thingsboard.server.common.data.alarm.AlarmCommentType;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmModificationRequest;
 import org.thingsboard.server.common.data.alarm.AlarmQuery;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
 import org.thingsboard.server.common.data.id.AlarmId;
 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.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
@@ -44,6 +48,7 @@ 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.alarm.AlarmApiCallResult;
 import org.thingsboard.server.dao.alarm.AlarmCommentService;
 import org.thingsboard.server.dao.alarm.AlarmOperationResult;
 import org.thingsboard.server.dao.alarm.AlarmService;
@@ -92,6 +97,41 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
         return "alarm";
     }
 
+    @Override
+    public AlarmApiCallResult createAlarm(AlarmCreateOrUpdateActiveRequest request) {
+        boolean creationEnabled = apiUsageStateService.getApiUsageState(request.getTenantId()).isAlarmCreationEnabled();
+        var result = alarmService.createAlarm(request, creationEnabled);
+        if (result.isCreated()) {
+            apiUsageClient.report(request.getTenantId(), null, ApiUsageRecordKey.CREATED_ALARMS_COUNT);
+        }
+        return withWsCallback(request, result);
+    }
+
+    @Override
+    public AlarmApiCallResult updateAlarm(AlarmUpdateRequest request) {
+        return withWsCallback(alarmService.updateAlarm(request));
+    }
+
+    @Override
+    public AlarmApiCallResult acknowledgeAlarm(TenantId tenantId, AlarmId alarmId, long ackTs) {
+        return withWsCallback(alarmService.acknowledgeAlarm(tenantId, alarmId, ackTs));
+    }
+
+    @Override
+    public AlarmApiCallResult clearAlarm(TenantId tenantId, AlarmId alarmId, long clearTs, JsonNode details) {
+        return withWsCallback(alarmService.clearAlarm(tenantId, alarmId, clearTs, details));
+    }
+
+    @Override
+    public AlarmApiCallResult assignAlarm(TenantId tenantId, AlarmId alarmId, UserId assigneeId, long assignTs) {
+        return withWsCallback(alarmService.assignAlarm(tenantId, alarmId, assigneeId, assignTs));
+    }
+
+    @Override
+    public AlarmApiCallResult unassignAlarm(TenantId tenantId, AlarmId alarmId, long assignTs) {
+        return withWsCallback(alarmService.unassignAlarm(tenantId, alarmId, assignTs));
+    }
+
     @Override
     public Alarm createOrUpdateAlarm(Alarm alarm) {
         AlarmOperationResult result = alarmService.createOrUpdateAlarm(alarm, apiUsageStateService.getApiUsageState(alarm.getTenantId()).isAlarmCreationEnabled());
@@ -115,29 +155,29 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
 
     @Override
     public Boolean deleteAlarm(TenantId tenantId, AlarmId alarmId) {
-        AlarmOperationResult result = alarmService.deleteAlarm(tenantId, alarmId);
+        AlarmApiCallResult result = alarmService.delAlarm(tenantId, alarmId);
         onAlarmDeleted(result);
         return result.isSuccessful();
     }
 
     @Override
     public ListenableFuture<Boolean> ackAlarm(TenantId tenantId, AlarmId alarmId, long ackTs) {
-        ListenableFuture<AlarmOperationResult> result = alarmService.ackAlarm(tenantId, alarmId, ackTs);
+        ListenableFuture<AlarmApiCallResult> result = Futures.immediateFuture(alarmService.acknowledgeAlarm(tenantId, alarmId, ackTs));
         Futures.addCallback(result, new AlarmUpdateCallback(), wsCallBackExecutor);
-        return Futures.transform(result, AlarmOperationResult::isSuccessful, wsCallBackExecutor);
+        return Futures.transform(result, AlarmApiCallResult::isSuccessful, wsCallBackExecutor);
     }
 
     @Override
     public ListenableFuture<Boolean> clearAlarm(TenantId tenantId, AlarmId alarmId, JsonNode details, long clearTs) {
-        ListenableFuture<AlarmOperationResult> result = clearAlarmForResult(tenantId, alarmId, details, clearTs);
-        return Futures.transform(result, AlarmOperationResult::isSuccessful, wsCallBackExecutor);
+        AlarmApiCallResult result = alarmService.clearAlarm(tenantId, alarmId, clearTs, details);
+        return Futures.transform(Futures.immediateFuture(result), AlarmApiCallResult::isSuccessful, wsCallBackExecutor);
     }
 
     @Override
     public ListenableFuture<AlarmOperationResult> clearAlarmForResult(TenantId tenantId, AlarmId alarmId, JsonNode details, long clearTs) {
-        ListenableFuture<AlarmOperationResult> result = alarmService.clearAlarm(tenantId, alarmId, details, clearTs);
-        Futures.addCallback(result, new AlarmUpdateCallback(), wsCallBackExecutor);
-        return result;
+        AlarmApiCallResult result = alarmService.clearAlarm(tenantId, alarmId, clearTs, details);
+        Futures.addCallback(Futures.immediateFuture(result), new AlarmUpdateCallback(), wsCallBackExecutor);
+        return Futures.immediateFuture(new AlarmOperationResult(result));
     }
 
     @Override
@@ -151,8 +191,8 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
     }
 
     @Override
-    public ListenableFuture<AlarmInfo> findAlarmInfoByIdAsync(TenantId tenantId, AlarmId alarmId) {
-        return alarmService.findAlarmInfoByIdAsync(tenantId, alarmId);
+    public AlarmInfo findAlarmInfoById(TenantId tenantId, AlarmId alarmId) {
+        return alarmService.findAlarmInfoById(tenantId, alarmId);
     }
 
     @Override
@@ -166,8 +206,8 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
     }
 
     @Override
-    public AlarmSeverity findHighestAlarmSeverity(TenantId tenantId, EntityId entityId, AlarmSearchStatus alarmSearchStatus, AlarmStatus alarmStatus) {
-        return alarmService.findHighestAlarmSeverity(tenantId, entityId, alarmSearchStatus, alarmStatus);
+    public AlarmSeverity findHighestAlarmSeverity(TenantId tenantId, EntityId entityId, AlarmSearchStatus alarmSearchStatus, AlarmStatus alarmStatus, String assigneeId) {
+        return alarmService.findHighestAlarmSeverity(tenantId, entityId, alarmSearchStatus, alarmStatus, assigneeId);
     }
 
     @Override
@@ -175,15 +215,41 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
         return alarmService.findAlarmDataByQueryForEntities(tenantId, query, orderedEntityIds);
     }
 
+    @Override
+    public Alarm findLatestActiveByOriginatorAndType(TenantId tenantId, EntityId originator, String type) {
+        return alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, type);
+    }
+
     @Override
     public ListenableFuture<Alarm> findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type) {
         return alarmService.findLatestByOriginatorAndType(tenantId, originator, type);
     }
 
+    @Deprecated
     private void onAlarmUpdated(AlarmOperationResult result) {
         wsCallBackExecutor.submit(() -> {
             Alarm alarm = result.getAlarm();
-            TenantId tenantId = result.getAlarm().getTenantId();
+            TenantId tenantId = alarm.getTenantId();
+            for (EntityId entityId : result.getPropagatedEntitiesList()) {
+                TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_CORE, tenantId, entityId);
+                if (currentPartitions.contains(tpi)) {
+                    if (subscriptionManagerService.isPresent()) {
+                        subscriptionManagerService.get().onAlarmUpdate(tenantId, entityId, new AlarmInfo(alarm), TbCallback.EMPTY);
+                    } else {
+                        log.warn("Possible misconfiguration because subscriptionManagerService is null!");
+                    }
+                } else {
+                    TransportProtos.ToCoreMsg toCoreMsg = TbSubscriptionUtils.toAlarmUpdateProto(tenantId, entityId, new AlarmInfo(alarm));
+                    clusterService.pushMsgToCore(tpi, entityId.getId(), toCoreMsg, null);
+                }
+            }
+        });
+    }
+
+    private void onAlarmUpdated(AlarmApiCallResult result) {
+        wsCallBackExecutor.submit(() -> {
+            AlarmInfo alarm = result.getAlarm();
+            TenantId tenantId = alarm.getTenantId();
             for (EntityId entityId : result.getPropagatedEntitiesList()) {
                 TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_CORE, tenantId, entityId);
                 if (currentPartitions.contains(tpi)) {
@@ -200,10 +266,10 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
         });
     }
 
-    private void onAlarmDeleted(AlarmOperationResult result) {
+    private void onAlarmDeleted(AlarmApiCallResult result) {
         wsCallBackExecutor.submit(() -> {
-            Alarm alarm = result.getAlarm();
-            TenantId tenantId = result.getAlarm().getTenantId();
+            AlarmInfo alarm = result.getAlarm();
+            TenantId tenantId = alarm.getTenantId();
             for (EntityId entityId : result.getPropagatedEntitiesList()) {
                 TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_CORE, tenantId, entityId);
                 if (currentPartitions.contains(tpi)) {
@@ -220,9 +286,9 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
         });
     }
 
-    private class AlarmUpdateCallback implements FutureCallback<AlarmOperationResult> {
+    private class AlarmUpdateCallback implements FutureCallback<AlarmApiCallResult> {
         @Override
-        public void onSuccess(@Nullable AlarmOperationResult result) {
+        public void onSuccess(@Nullable AlarmApiCallResult result) {
             onAlarmUpdated(result);
         }
 
@@ -232,4 +298,27 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
         }
     }
 
+    private AlarmApiCallResult withWsCallback(AlarmApiCallResult result) {
+        return withWsCallback(null, result);
+    }
+
+    private AlarmApiCallResult withWsCallback(AlarmModificationRequest request, AlarmApiCallResult result) {
+        if (result.isSuccessful() && result.isModified()) {
+            Futures.addCallback(Futures.immediateFuture(result), new AlarmUpdateCallback(), wsCallBackExecutor);
+            if (result.isSeverityChanged()) {
+                AlarmInfo alarm = result.getAlarm();
+                AlarmComment.AlarmCommentBuilder alarmComment = AlarmComment.builder()
+                        .alarmId(alarm.getId())
+                        .type(AlarmCommentType.SYSTEM)
+                        .comment(JacksonUtil.newObjectNode().put("text",
+                                String.format("Alarm severity was updated from %s to %s", result.getOldSeverity(), alarm.getSeverity())));
+                if (request != null && request.getUserId() != null) {
+                    alarmComment.userId(request.getUserId());
+                }
+                alarmCommentService.createOrUpdateAlarmComment(alarm.getTenantId(), alarmComment.build());
+            }
+        }
+        return result;
+    }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
index a2a0d0fd8e..ffde6192ec 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
@@ -16,7 +16,6 @@
 package org.thingsboard.server.service.telemetry;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Function;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -27,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.socket.CloseStatus;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.DataConstants;
@@ -95,6 +95,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -112,7 +114,6 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
     private static final Aggregation DEFAULT_AGGREGATION = Aggregation.NONE;
     private static final int UNKNOWN_SUBSCRIPTION_ID = 0;
     private static final String PROCESSING_MSG = "[{}] Processing: {}";
-    private static final ObjectMapper jsonMapper = new ObjectMapper();
     private static final String FAILED_TO_FETCH_DATA = "Failed to fetch data!";
     private static final String FAILED_TO_FETCH_ATTRIBUTES = "Failed to fetch attributes!";
     private static final String SESSION_META_DATA_NOT_FOUND = "Session meta-data not found!";
@@ -147,10 +148,10 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
     @Value("${server.ws.ping_timeout:30000}")
     private long pingTimeout;
 
-    private ConcurrentMap<TenantId, Set<String>> tenantSubscriptionsMap = new ConcurrentHashMap<>();
-    private ConcurrentMap<CustomerId, Set<String>> customerSubscriptionsMap = new ConcurrentHashMap<>();
-    private ConcurrentMap<UserId, Set<String>> regularUserSubscriptionsMap = new ConcurrentHashMap<>();
-    private ConcurrentMap<UserId, Set<String>> publicUserSubscriptionsMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<TenantId, Set<String>> tenantSubscriptionsMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<CustomerId, Set<String>> customerSubscriptionsMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<UserId, Set<String>> regularUserSubscriptionsMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<UserId, Set<String>> publicUserSubscriptionsMap = new ConcurrentHashMap<>();
 
     private ExecutorService executor;
     private String serviceId;
@@ -204,7 +205,7 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
         }
 
         try {
-            TelemetryPluginCmdsWrapper cmdsWrapper = jsonMapper.readValue(msg, TelemetryPluginCmdsWrapper.class);
+            TelemetryPluginCmdsWrapper cmdsWrapper = JacksonUtil.OBJECT_MAPPER.readValue(msg, TelemetryPluginCmdsWrapper.class);
             if (cmdsWrapper != null) {
                 if (cmdsWrapper.getAttrSubCmds() != null) {
                     cmdsWrapper.getAttrSubCmds().forEach(cmd -> {
@@ -450,7 +451,6 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
             @Override
             public void onSuccess(List<AttributeKvEntry> data) {
                 List<TsKvEntry> attributesData = data.stream().map(d -> new BasicTsKvEntry(d.getLastUpdateTs(), d)).collect(Collectors.toList());
-                sendWsMsg(sessionRef, new TelemetrySubscriptionUpdate(cmd.getCmdId(), attributesData));
 
                 Map<String, Long> subState = new HashMap<>(keys.size());
                 keys.forEach(key -> subState.put(key, 0L));
@@ -458,6 +458,7 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
 
                 TbAttributeSubscriptionScope scope = StringUtils.isEmpty(cmd.getScope()) ? TbAttributeSubscriptionScope.ANY_SCOPE : TbAttributeSubscriptionScope.valueOf(cmd.getScope());
 
+                Lock subLock = new ReentrantLock();
                 TbAttributeSubscription sub = TbAttributeSubscription.builder()
                         .serviceId(serviceId)
                         .sessionId(sessionId)
@@ -467,9 +468,24 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
                         .allKeys(false)
                         .keyStates(subState)
                         .scope(scope)
-                        .updateConsumer(DefaultTelemetryWebSocketService.this::sendWsMsg)
+                        .updateConsumer((sessionId, update) -> {
+                            subLock.lock();
+                            try {
+                                sendWsMsg(sessionId, update);
+                            } finally {
+                                subLock.unlock();
+                            }
+                        })
                         .build();
-                oldSubService.addSubscription(sub);
+
+                subLock.lock();
+                try{
+                    oldSubService.addSubscription(sub);
+                    sendWsMsg(sessionRef, new TelemetrySubscriptionUpdate(cmd.getCmdId(), attributesData));
+                } finally {
+                    subLock.unlock();
+                }
+
             }
 
             @Override
@@ -550,13 +566,13 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
             @Override
             public void onSuccess(List<AttributeKvEntry> data) {
                 List<TsKvEntry> attributesData = data.stream().map(d -> new BasicTsKvEntry(d.getLastUpdateTs(), d)).collect(Collectors.toList());
-                sendWsMsg(sessionRef, new TelemetrySubscriptionUpdate(cmd.getCmdId(), attributesData));
 
                 Map<String, Long> subState = new HashMap<>(attributesData.size());
                 attributesData.forEach(v -> subState.put(v.getKey(), v.getTs()));
 
                 TbAttributeSubscriptionScope scope = StringUtils.isEmpty(cmd.getScope()) ? TbAttributeSubscriptionScope.ANY_SCOPE : TbAttributeSubscriptionScope.valueOf(cmd.getScope());
 
+                Lock subLock = new ReentrantLock();
                 TbAttributeSubscription sub = TbAttributeSubscription.builder()
                         .serviceId(serviceId)
                         .sessionId(sessionId)
@@ -565,9 +581,24 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
                         .entityId(entityId)
                         .allKeys(true)
                         .keyStates(subState)
-                        .updateConsumer(DefaultTelemetryWebSocketService.this::sendWsMsg)
-                        .scope(scope).build();
-                oldSubService.addSubscription(sub);
+                        .updateConsumer((sessionId, update) -> {
+                            subLock.lock();
+                            try {
+                                sendWsMsg(sessionId, update);
+                            } finally {
+                                subLock.unlock();
+                            }
+                        })
+                        .scope(scope)
+                        .build();
+
+                subLock.lock();
+                try {
+                    oldSubService.addSubscription(sub);
+                    sendWsMsg(sessionRef, new TelemetrySubscriptionUpdate(cmd.getCmdId(), attributesData));
+                } finally {
+                    subLock.unlock();
+                }
             }
 
             @Override
@@ -636,20 +667,34 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
         FutureCallback<List<TsKvEntry>> callback = new FutureCallback<List<TsKvEntry>>() {
             @Override
             public void onSuccess(List<TsKvEntry> data) {
-                sendWsMsg(sessionRef, new TelemetrySubscriptionUpdate(cmd.getCmdId(), data));
                 Map<String, Long> subState = new HashMap<>(data.size());
                 data.forEach(v -> subState.put(v.getKey(), v.getTs()));
 
+                Lock subLock = new ReentrantLock();
                 TbTimeseriesSubscription sub = TbTimeseriesSubscription.builder()
                         .serviceId(serviceId)
                         .sessionId(sessionId)
                         .subscriptionId(cmd.getCmdId())
                         .tenantId(sessionRef.getSecurityCtx().getTenantId())
                         .entityId(entityId)
-                        .updateConsumer(DefaultTelemetryWebSocketService.this::sendWsMsg)
+                        .updateConsumer((sessionId, update) -> {
+                            subLock.lock();
+                            try {
+                                sendWsMsg(sessionId, update);
+                            } finally {
+                                subLock.unlock();
+                            }
+                        })
                         .allKeys(true)
                         .keyStates(subState).build();
-                oldSubService.addSubscription(sub);
+
+                subLock.lock();
+                try {
+                    oldSubService.addSubscription(sub);
+                    sendWsMsg(sessionRef, new TelemetrySubscriptionUpdate(cmd.getCmdId(), data));
+                } finally {
+                    subLock.unlock();
+                }
             }
 
             @Override
@@ -673,21 +718,35 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
         return new FutureCallback<>() {
             @Override
             public void onSuccess(List<TsKvEntry> data) {
-                sendWsMsg(sessionRef, new TelemetrySubscriptionUpdate(cmd.getCmdId(), data));
                 Map<String, Long> subState = new HashMap<>(keys.size());
                 keys.forEach(key -> subState.put(key, startTs));
                 data.forEach(v -> subState.put(v.getKey(), v.getTs()));
 
+                Lock subLock = new ReentrantLock();
                 TbTimeseriesSubscription sub = TbTimeseriesSubscription.builder()
                         .serviceId(serviceId)
                         .sessionId(sessionId)
                         .subscriptionId(cmd.getCmdId())
                         .tenantId(sessionRef.getSecurityCtx().getTenantId())
                         .entityId(entityId)
-                        .updateConsumer(DefaultTelemetryWebSocketService.this::sendWsMsg)
+                        .updateConsumer((sessionId, update) -> {
+                            subLock.lock();
+                            try {
+                                sendWsMsg(sessionId, update);
+                            } finally {
+                                subLock.unlock();
+                            }
+                        })
                         .allKeys(false)
                         .keyStates(subState).build();
-                oldSubService.addSubscription(sub);
+
+                subLock.lock();
+                try{
+                    oldSubService.addSubscription(sub);
+                    sendWsMsg(sessionRef, new TelemetrySubscriptionUpdate(cmd.getCmdId(), data));
+                } finally {
+                    subLock.unlock();
+                }
             }
 
             @Override
@@ -793,7 +852,7 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
 
     private void sendWsMsg(TelemetryWebSocketSessionRef sessionRef, int cmdId, Object update) {
         try {
-            String msg = jsonMapper.writeValueAsString(update);
+            String msg = JacksonUtil.OBJECT_MAPPER.writeValueAsString(update);
             executor.submit(() -> {
                 try {
                     msgEndpoint.send(sessionRef, cmdId, msg);
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/sub/AlarmSubscriptionUpdate.java b/application/src/main/java/org/thingsboard/server/service/telemetry/sub/AlarmSubscriptionUpdate.java
index ca3876464e..4961f901c5 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/sub/AlarmSubscriptionUpdate.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/sub/AlarmSubscriptionUpdate.java
@@ -17,15 +17,8 @@ package org.thingsboard.server.service.telemetry.sub;
 
 import lombok.Getter;
 import org.thingsboard.server.common.data.alarm.Alarm;
-import org.thingsboard.server.common.data.kv.TsKvEntry;
-import org.thingsboard.server.common.data.query.AlarmData;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
+import org.thingsboard.server.common.data.alarm.AlarmAssigneeUpdate;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
 
 public class AlarmSubscriptionUpdate {
 
@@ -36,15 +29,15 @@ public class AlarmSubscriptionUpdate {
     @Getter
     private String errorMsg;
     @Getter
-    private Alarm alarm;
+    private AlarmInfo alarm;
     @Getter
     private boolean alarmDeleted;
 
-    public AlarmSubscriptionUpdate(int subscriptionId, Alarm alarm) {
+    public AlarmSubscriptionUpdate(int subscriptionId, AlarmInfo alarm) {
         this(subscriptionId, alarm, false);
     }
 
-    public AlarmSubscriptionUpdate(int subscriptionId, Alarm alarm, boolean alarmDeleted) {
+    public AlarmSubscriptionUpdate(int subscriptionId, AlarmInfo alarm, boolean alarmDeleted) {
         super();
         this.subscriptionId = subscriptionId;
         this.alarm = alarm;
@@ -64,7 +57,7 @@ public class AlarmSubscriptionUpdate {
 
     @Override
     public String toString() {
-        return "AlarmUpdate [subscriptionId=" + subscriptionId + ", errorCode=" + errorCode + ", errorMsg=" + errorMsg + ", alarm="
-                + alarm + "]";
+        return "AlarmUpdate [subscriptionId=" + subscriptionId + ", errorCode=" + errorCode + ", errorMsg=" + errorMsg +
+                ", alarm=" + alarm + "]";
     }
-}
+}
\ No newline at end of file
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 7b1ce89ccd..0c0ff3e0c9 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
@@ -65,7 +65,6 @@ import org.thingsboard.server.common.msg.EncryptionUtil;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.dao.device.DeviceCredentialsService;
 import org.thingsboard.server.dao.device.DeviceProvisionService;
 import org.thingsboard.server.dao.device.DeviceService;
@@ -95,6 +94,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceLwM2MC
 import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceTokenRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceX509CertRequestMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
@@ -290,6 +290,7 @@ public class DefaultTransportApiService implements TransportApiService {
                     device.setType(requestMsg.getDeviceType());
                     device.setCustomerId(gateway.getCustomerId());
                     DeviceProfile deviceProfile = deviceProfileCache.findOrCreateDeviceProfile(gateway.getTenantId(), requestMsg.getDeviceType());
+
                     device.setDeviceProfileId(deviceProfile.getId());
                     ObjectNode additionalInfo = JacksonUtil.newObjectNode();
                     additionalInfo.put(DataConstants.LAST_CONNECTED_GATEWAY, gatewayId.toString());
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 6ea3208208..ea059fcb2d 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
@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.TenantId;
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 61bef18bcd..10c4c9edac 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -73,6 +73,8 @@ server:
       min_timeout: "${MIN_SERVER_SIDE_RPC_TIMEOUT:5000}"
       # Default value of the server side RPC timeout.
       default_timeout: "${DEFAULT_SERVER_SIDE_RPC_TIMEOUT:10000}"
+    rate_limits:
+      reset_password_per_user: "${RESET_PASSWORD_PER_USER_RATE_LIMIT_CONFIGURATION:5:3600}"
 
 # Application info
 app:
@@ -1210,3 +1212,4 @@ management:
       exposure:
         # Expose metrics endpoint (use value 'prometheus' to enable prometheus metrics).
         include: '${METRICS_ENDPOINTS_EXPOSE:info}'
+
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
index 06cee7b71d..32d1f65765 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
@@ -52,7 +52,7 @@ public abstract class AbstractControllerTest extends AbstractNotifyEntityTest {
     @LocalServerPort
     protected int wsPort;
 
-    private TbTestWebSocketClient wsClient; // lazy
+    private volatile TbTestWebSocketClient wsClient; // lazy
 
     public TbTestWebSocketClient getWsClient() {
         if (wsClient == null) {
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
index 6c42c7604d..b3025a2d64 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
@@ -18,7 +18,10 @@ package org.thingsboard.server.controller;
 import lombok.extern.slf4j.Slf4j;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.thingsboard.server.actors.service.ActorService;
+import org.thingsboard.server.actors.service.DefaultActorService;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasName;
@@ -38,6 +41,7 @@ import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.ToDeviceActorNotificationMsg;
 import org.thingsboard.server.dao.audit.AuditLogService;
 import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.service.session.DeviceSessionCacheService;
 
 import java.util.ArrayList;
 import java.util.List;
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 aa4febc303..c09f259aaa 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -26,6 +26,7 @@ import io.jsonwebtoken.Header;
 import io.jsonwebtoken.Jwt;
 import io.jsonwebtoken.Jwts;
 import lombok.extern.slf4j.Slf4j;
+import org.awaitility.Awaitility;
 import org.hamcrest.Matcher;
 import org.hibernate.exception.ConstraintViolationException;
 import org.junit.After;
@@ -49,6 +50,7 @@ import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.mock.http.MockHttpInputMessage;
 import org.springframework.mock.http.MockHttpOutputMessage;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultActions;
@@ -57,9 +59,15 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.context.WebApplicationContext;
-import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.MailService;
-import org.thingsboard.rule.engine.api.util.TbNodeUtils;
+import org.thingsboard.server.actors.DefaultTbActorSystem;
+import org.thingsboard.server.actors.TbActorId;
+import org.thingsboard.server.actors.TbActorMailbox;
+import org.thingsboard.server.actors.TbEntityActorId;
+import org.thingsboard.server.actors.device.DeviceActor;
+import org.thingsboard.server.actors.device.DeviceActorMessageProcessor;
+import org.thingsboard.server.actors.device.SessionInfo;
+import org.thingsboard.server.actors.service.DefaultActorService;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileType;
@@ -79,6 +87,7 @@ import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeCon
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 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.HasId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -89,9 +98,11 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.config.ThingsboardSecurityConfiguration;
 import org.thingsboard.server.dao.Dao;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRequest;
 import org.thingsboard.server.service.security.auth.rest.LoginRequest;
 
@@ -103,6 +114,10 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -167,6 +182,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     protected TenantId differentTenantId;
     protected CustomerId differentCustomerId;
     protected UserId customerUserId;
+    protected UserId differentCustomerUserId;
 
     @SuppressWarnings("rawtypes")
     private HttpMessageConverter mappingJackson2HttpMessageConverter;
@@ -180,6 +196,12 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     @Autowired
     private TenantProfileService tenantProfileService;
 
+    @Autowired
+    public TimeseriesService tsService;
+
+    @Autowired
+    protected DefaultActorService actorService;
+
     @SpyBean
     protected MailService mailService;
 
@@ -211,17 +233,6 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
                 this.mappingJackson2HttpMessageConverter);
     }
 
-    @BeforeClass
-    public static void beforeWebTestClass() throws Exception {
-
-    }
-
-    @AfterClass
-    public static void afterWebTestClass() throws Exception {
-        Mockito.clearAllCaches();
-    }
-
-
     @Before
     public void setupWebTest() throws Exception {
         log.debug("Executing web test setup");
@@ -374,7 +385,8 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
             differentCustomerUser.setCustomerId(savedDifferentCustomer.getId());
             differentCustomerUser.setEmail(DIFFERENT_CUSTOMER_USER_EMAIL);
 
-            createUserAndLogin(differentCustomerUser, DIFFERENT_CUSTOMER_USER_PASSWORD);
+            differentCustomerUser = createUserAndLogin(differentCustomerUser, DIFFERENT_CUSTOMER_USER_PASSWORD);
+            differentCustomerUserId = differentCustomerUser.getId();
         }
     }
 
@@ -841,4 +853,37 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         return (T) field.get(target);
     }
 
+    protected int getDeviceActorSubscriptionCount(DeviceId deviceId, FeatureType featureType) {
+        DeviceActorMessageProcessor processor = getDeviceActorProcessor(deviceId);
+        Map<UUID, SessionInfo> subscriptions = (Map<UUID, SessionInfo>) ReflectionTestUtils.getField(processor, getMapName(featureType));
+        return subscriptions.size();
+    }
+
+    protected void awaitForDeviceActorToReceiveSubscription(DeviceId deviceId, FeatureType featureType, int subscriptionCount) {
+        DeviceActorMessageProcessor processor = getDeviceActorProcessor(deviceId);
+        Map<UUID, SessionInfo> subscriptions = (Map<UUID, SessionInfo>) ReflectionTestUtils.getField(processor, getMapName(featureType));
+        Awaitility.await("Device actor received subscription command from the transport").atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> subscriptions.size() == subscriptionCount);
+    }
+
+    protected static String getMapName(FeatureType featureType) {
+        switch (featureType) {
+            case ATTRIBUTES:
+                return "attributeSubscriptions";
+            case RPC:
+                return "rpcSubscriptions";
+            default:
+                throw new RuntimeException("Not supported feature " + featureType + "!");
+        }
+    }
+
+    protected DeviceActorMessageProcessor getDeviceActorProcessor(DeviceId deviceId) {
+        DefaultTbActorSystem actorSystem = (DefaultTbActorSystem) ReflectionTestUtils.getField(actorService, "system");
+        ConcurrentMap<TbActorId, TbActorMailbox> actors = (ConcurrentMap<TbActorId, TbActorMailbox>) ReflectionTestUtils.getField(actorSystem, "actors");
+        Awaitility.await("Device actor was created").atMost(TIMEOUT, TimeUnit.SECONDS)
+                .until(() -> actors.containsKey(new TbEntityActorId(deviceId)));
+        TbActorMailbox actorMailbox = actors.get(new TbEntityActorId(deviceId));
+        DeviceActor actor = (DeviceActor) ReflectionTestUtils.getField(actorMailbox, "actor");
+        return (DeviceActorMessageProcessor) ReflectionTestUtils.getField(actor, "processor");
+    }
+
 }
diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseAlarmCommentControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseAlarmCommentControllerTest.java
index 7c8b3c4db8..8566d9d6a4 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseAlarmCommentControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseAlarmCommentControllerTest.java
@@ -79,7 +79,6 @@ public abstract class BaseAlarmCommentControllerTest extends AbstractControllerT
                 .tenantId(tenantId)
                 .customerId(customerId)
                 .originator(customerDevice.getId())
-                .status(AlarmStatus.ACTIVE_UNACK)
                 .severity(AlarmSeverity.CRITICAL)
                 .type("test alarm type")
                 .build();
@@ -316,7 +315,6 @@ public abstract class BaseAlarmCommentControllerTest extends AbstractControllerT
 
         Alarm alarm = Alarm.builder()
                 .originator(device.getId())
-                .status(AlarmStatus.ACTIVE_UNACK)
                 .severity(AlarmSeverity.CRITICAL)
                 .type("Test")
                 .build();
diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseAlarmControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseAlarmControllerTest.java
index 175f833c1c..6a94cc5a1e 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseAlarmControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseAlarmControllerTest.java
@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.web.servlet.ResultActions;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
@@ -124,7 +125,8 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
         Assert.assertNotNull(updatedAlarm);
         Assert.assertEquals(AlarmSeverity.MAJOR, updatedAlarm.getSeverity());
 
-        testNotifyEntityAllOneTime(updatedAlarm, updatedAlarm.getId(), updatedAlarm.getOriginator(),
+        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + updatedAlarm.getId(), AlarmInfo.class);
+        testNotifyEntityAllOneTime(foundAlarm, updatedAlarm.getId(), updatedAlarm.getOriginator(),
                 tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.UPDATED);
     }
 
@@ -140,8 +142,57 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
         Assert.assertNotNull(updatedAlarm);
         Assert.assertEquals(AlarmSeverity.MAJOR, updatedAlarm.getSeverity());
 
-        testNotifyEntityAllOneTime(updatedAlarm, updatedAlarm.getId(), updatedAlarm.getOriginator(),
+        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + updatedAlarm.getId(), AlarmInfo.class);
+        testNotifyEntityAllOneTime(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
                 tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.UPDATED);
+
+        alarm = updatedAlarm;
+        alarm.setAcknowledged(true);
+        alarm.setAckTs(System.currentTimeMillis() - 1000);
+        updatedAlarm = doPost("/api/alarm", alarm, Alarm.class);
+        Assert.assertNotNull(updatedAlarm);
+        Assert.assertTrue(updatedAlarm.isAcknowledged());
+        Assert.assertEquals(alarm.getAckTs(), updatedAlarm.getAckTs());
+
+        foundAlarm = doGet("/api/alarm/info/" + updatedAlarm.getId(), AlarmInfo.class);
+        testNotifyEntityAllOneTime(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+                tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ALARM_ACK);
+
+        alarm = updatedAlarm;
+        alarm.setCleared(true);
+        alarm.setClearTs(System.currentTimeMillis() - 1000);
+        updatedAlarm = doPost("/api/alarm", alarm, Alarm.class);
+        Assert.assertNotNull(updatedAlarm);
+        Assert.assertTrue(updatedAlarm.isCleared());
+        Assert.assertEquals(alarm.getClearTs(), updatedAlarm.getClearTs());
+
+        foundAlarm = doGet("/api/alarm/info/" + updatedAlarm.getId(), AlarmInfo.class);
+        testNotifyEntityAllOneTime(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+                tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ALARM_CLEAR);
+
+        alarm = updatedAlarm;
+        alarm.setAssigneeId(tenantAdminUserId);
+        alarm.setAssignTs(System.currentTimeMillis() - 1000);
+        updatedAlarm = doPost("/api/alarm", alarm, Alarm.class);
+        Assert.assertNotNull(updatedAlarm);
+        Assert.assertEquals(tenantAdminUserId, updatedAlarm.getAssigneeId());
+        Assert.assertEquals(alarm.getAssignTs(), updatedAlarm.getAssignTs());
+
+        foundAlarm = doGet("/api/alarm/info/" + updatedAlarm.getId(), AlarmInfo.class);
+        testNotifyEntityAllOneTime(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+                tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ALARM_ASSIGN);
+
+        alarm = updatedAlarm;
+        alarm.setAssigneeId(null);
+        alarm.setAssignTs(System.currentTimeMillis() - 1000);
+        updatedAlarm = doPost("/api/alarm", alarm, Alarm.class);
+        Assert.assertNotNull(updatedAlarm);
+        Assert.assertNull(updatedAlarm.getAssigneeId());
+        Assert.assertEquals(alarm.getAssignTs(), updatedAlarm.getAssignTs());
+
+        foundAlarm = doGet("/api/alarm/info/" + updatedAlarm.getId(), AlarmInfo.class);
+        testNotifyEntityAllOneTime(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+                tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ALARM_UNASSIGN);
     }
 
     @Test
@@ -187,7 +238,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
 
         doDelete("/api/alarm/" + alarm.getId()).andExpect(status().isOk());
 
-        testNotifyEntityOneTimeMsgToEdgeServiceNever(alarm, alarm.getId(), alarm.getOriginator(),
+        testNotifyEntityOneTimeMsgToEdgeServiceNever(new Alarm(alarm), alarm.getId(), alarm.getOriginator(),
                 tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.DELETED);
     }
 
@@ -200,7 +251,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
 
         doDelete("/api/alarm/" + alarm.getId()).andExpect(status().isOk());
 
-        testNotifyEntityOneTimeMsgToEdgeServiceNever(alarm, alarm.getId(), alarm.getOriginator(),
+        testNotifyEntityOneTimeMsgToEdgeServiceNever(new Alarm(alarm), alarm.getId(), alarm.getOriginator(),
                 tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED);
     }
 
@@ -245,7 +296,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
 
         doPost("/api/alarm/" + alarm.getId() + "/clear").andExpect(status().isOk());
 
-        Alarm foundAlarm = doGet("/api/alarm/" + alarm.getId(), Alarm.class);
+        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
         Assert.assertNotNull(foundAlarm);
         Assert.assertEquals(AlarmStatus.CLEARED_UNACK, foundAlarm.getStatus());
 
@@ -261,7 +312,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
         Mockito.reset(tbClusterService, auditLogService);
 
         doPost("/api/alarm/" + alarm.getId() + "/clear").andExpect(status().isOk());
-        Alarm foundAlarm = doGet("/api/alarm/" + alarm.getId(), Alarm.class);
+        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
         Assert.assertNotNull(foundAlarm);
         Assert.assertEquals(AlarmStatus.CLEARED_UNACK, foundAlarm.getStatus());
 
@@ -278,7 +329,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
 
         doPost("/api/alarm/" + alarm.getId() + "/ack").andExpect(status().isOk());
 
-        Alarm foundAlarm = doGet("/api/alarm/" + alarm.getId(), Alarm.class);
+        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
         Assert.assertNotNull(foundAlarm);
         Assert.assertEquals(AlarmStatus.ACTIVE_ACK, foundAlarm.getStatus());
 
@@ -348,6 +399,135 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
                 .andExpect(statusReason(containsString(msgErrorPermission)));
     }
 
+    @Test
+    public void testAssignAlarm() throws Exception {
+        loginTenantAdmin();
+        Alarm alarm = createAlarm(TEST_ALARM_TYPE);
+        Mockito.reset(tbClusterService, auditLogService);
+        long beforeAssignmentTs = System.currentTimeMillis();
+        Thread.sleep(2);
+
+        doPost("/api/alarm/" + alarm.getId() + "/assign/" + tenantAdminUserId.getId()).andExpect(status().isOk());
+        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
+        Assert.assertNotNull(foundAlarm);
+        Assert.assertEquals(tenantAdminUserId, foundAlarm.getAssigneeId());
+        Assert.assertTrue(foundAlarm.getAssignTs() > beforeAssignmentTs && foundAlarm.getAssignTs() < System.currentTimeMillis());
+
+        testNotifyEntityAllOneTime(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+                tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ALARM_ASSIGN);
+    }
+
+    @Test
+    public void testAssignAlarmViaDifferentTenant() throws Exception {
+        loginTenantAdmin();
+        Alarm alarm = createAlarm(TEST_ALARM_TYPE);
+
+        loginDifferentTenant();
+
+        Mockito.reset(tbClusterService, auditLogService);
+
+        doPost("/api/alarm/" + alarm.getId() + "/assign/" + tenantAdminUserId.getId()).andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void testReassignAlarm() throws Exception {
+        loginTenantAdmin();
+        Alarm alarm = createAlarm(TEST_ALARM_TYPE);
+        Mockito.reset(tbClusterService, auditLogService);
+        long beforeAssignmentTs = System.currentTimeMillis();
+        Thread.sleep(2);
+
+        doPost("/api/alarm/" + alarm.getId() + "/assign/" + tenantAdminUserId.getId()).andExpect(status().isOk());
+
+        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
+        Assert.assertNotNull(foundAlarm);
+        Assert.assertEquals(tenantAdminUserId, foundAlarm.getAssigneeId());
+        Assert.assertTrue(foundAlarm.getAssignTs() > beforeAssignmentTs && foundAlarm.getAssignTs() < System.currentTimeMillis());
+
+        testNotifyEntityAllOneTime(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+                tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ALARM_ASSIGN);
+
+        logout();
+
+        loginCustomerUser();
+        Mockito.reset(tbClusterService, auditLogService);
+        beforeAssignmentTs = System.currentTimeMillis();
+        Thread.sleep(2);
+
+        doPost("/api/alarm/" + alarm.getId() + "/assign/" + customerUserId.getId()).andExpect(status().isOk());
+
+        foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
+        Assert.assertNotNull(foundAlarm);
+        Assert.assertEquals(customerUserId, foundAlarm.getAssigneeId());
+        Assert.assertTrue(foundAlarm.getAssignTs() > beforeAssignmentTs && foundAlarm.getAssignTs() < System.currentTimeMillis());
+
+        testNotifyEntityAllOneTime(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+                tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.ALARM_ASSIGN);
+    }
+
+    @Test
+    public void testUnassignAlarm() throws Exception {
+        loginTenantAdmin();
+        Alarm alarm = createAlarm(TEST_ALARM_TYPE);
+        Mockito.reset(tbClusterService, auditLogService);
+        long beforeAssignmentTs = System.currentTimeMillis();
+        Thread.sleep(2);
+
+        doPost("/api/alarm/" + alarm.getId() + "/assign/" + tenantAdminUserId.getId()).andExpect(status().isOk());
+        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
+        Assert.assertNotNull(foundAlarm);
+        Assert.assertEquals(tenantAdminUserId, foundAlarm.getAssigneeId());
+        Assert.assertTrue(foundAlarm.getAssignTs() > beforeAssignmentTs && foundAlarm.getAssignTs() < System.currentTimeMillis());
+
+        testNotifyEntityAllOneTime(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+                tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ALARM_ASSIGN);
+
+        beforeAssignmentTs = System.currentTimeMillis();
+        Thread.sleep(2);
+        doDelete("/api/alarm/" + alarm.getId() + "/assign").andExpect(status().isOk());
+        foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
+        Assert.assertNotNull(foundAlarm);
+        Assert.assertNull(foundAlarm.getAssigneeId());
+        Assert.assertTrue(foundAlarm.getAssignTs() > beforeAssignmentTs && foundAlarm.getAssignTs() < System.currentTimeMillis());
+
+        testNotifyEntityAllOneTime(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+                tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ALARM_UNASSIGN);
+    }
+
+    @Test
+    public void testUnassignTenantAlarmViaCustomer() throws Exception {
+        loginTenantAdmin();
+        Alarm alarm = createAlarm(TEST_ALARM_TYPE);
+        Mockito.reset(tbClusterService, auditLogService);
+        long beforeAssignmentTs = System.currentTimeMillis();
+        Thread.sleep(2);
+
+        doPost("/api/alarm/" + alarm.getId() + "/assign/" + tenantAdminUserId.getId()).andExpect(status().isOk());
+        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
+        Assert.assertNotNull(foundAlarm);
+        Assert.assertEquals(tenantAdminUserId, foundAlarm.getAssigneeId());
+        Assert.assertTrue(foundAlarm.getAssignTs() > beforeAssignmentTs && foundAlarm.getAssignTs() < System.currentTimeMillis());
+
+        testNotifyEntityAllOneTime(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+                tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ALARM_ASSIGN);
+
+        logout();
+        loginCustomerUser();
+
+        Mockito.reset(tbClusterService, auditLogService);
+        beforeAssignmentTs = System.currentTimeMillis();
+        Thread.sleep(2);
+
+        doDelete("/api/alarm/" + alarm.getId() + "/assign").andExpect(status().isOk());
+        foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
+        Assert.assertNotNull(foundAlarm);
+        Assert.assertNull(foundAlarm.getAssigneeId());
+        Assert.assertTrue(foundAlarm.getAssignTs() > beforeAssignmentTs && foundAlarm.getAssignTs() < System.currentTimeMillis());
+
+        testNotifyEntityAllOneTime(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+                tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.ALARM_UNASSIGN);
+    }
+
     @Test
     public void testFindAlarmsViaCustomerUser() throws Exception {
         loginCustomerUser();
@@ -364,7 +544,8 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
         var response = doGetTyped(
                 "/api/alarm/" + EntityType.DEVICE + "/"
                         + customerDevice.getUuidId() + "?page=0&pageSize=" + size,
-                new TypeReference<PageData<AlarmInfo>>() {}
+                new TypeReference<PageData<AlarmInfo>>() {
+                }
         );
         var foundAlarmInfos = response.getData();
         Assert.assertNotNull("Found pageData is null", foundAlarmInfos);
@@ -412,7 +593,6 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
 
         Alarm alarm = Alarm.builder()
                 .originator(device.getId())
-                .status(AlarmStatus.ACTIVE_UNACK)
                 .severity(AlarmSeverity.CRITICAL)
                 .type("Test")
                 .build();
@@ -431,7 +611,8 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
         this.token = tokens.get("token").asText();
 
         PageData<AlarmInfo> pageData = doGetTyped(
-                "/api/alarm/DEVICE/" + device.getUuidId() + "?page=0&pageSize=1", new TypeReference<PageData<AlarmInfo>>() {}
+                "/api/alarm/DEVICE/" + device.getUuidId() + "?page=0&pageSize=1", new TypeReference<PageData<AlarmInfo>>() {
+                }
         );
 
         Assert.assertNotNull("Found pageData is null", pageData);
@@ -457,12 +638,11 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
         testEntityDaoWithRelationsTransactionalException(alarmDao, customerDevice.getId(), alarmId, "/api/alarm/" + alarmId);
     }
 
-    private Alarm createAlarm(String type) throws Exception {
+    private AlarmInfo createAlarm(String type) throws Exception {
         Alarm alarm = Alarm.builder()
                 .tenantId(tenantId)
                 .customerId(customerId)
                 .originator(customerDevice.getId())
-                .status(AlarmStatus.ACTIVE_UNACK)
                 .severity(AlarmSeverity.CRITICAL)
                 .type(type)
                 .build();
@@ -470,6 +650,10 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
         alarm = doPost("/api/alarm", alarm, Alarm.class);
         Assert.assertNotNull(alarm);
 
-        return alarm;
+        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
+        Assert.assertNotNull(foundAlarm);
+        Assert.assertEquals(alarm, new Alarm(foundAlarm));
+
+        return foundAlarm;
     }
 }
diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java
index 09fb5c505d..ce354749f3 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java
@@ -548,7 +548,7 @@ public abstract class BaseWebsocketApiTest extends AbstractControllerTest {
         SingleEntityFilter entityFilter = new SingleEntityFilter();
         entityFilter.setSingleEntity(tenantId);
 
-        assertThatNoException().isThrownBy(() -> {
+        assertThatNoException().as("subscribeForAttributes").isThrownBy(() -> {
             JsonNode update = getWsClient().subscribeForAttributes(tenantId, TbAttributeSubscriptionScope.SERVER_SCOPE.name(), List.of("attr"));
             assertThat(update.get("errorMsg").isNull()).isTrue();
             assertThat(update.get("errorCode").asInt()).isEqualTo(SubscriptionErrorCode.NO_ERROR.getCode());
@@ -560,7 +560,7 @@ public abstract class BaseWebsocketApiTest extends AbstractControllerTest {
                 new BaseAttributeKvEntry(System.currentTimeMillis(), new StringDataEntry("attr", expectedAttrValue))
         ));
         JsonNode update = JacksonUtil.toJsonNode(getWsClient().waitForUpdate());
-        assertThat(update).isNotNull();
+        assertThat(update).as("waitForUpdate").isNotNull();
         assertThat(update.get("data").get("attr").get(0).get(1).asText()).isEqualTo(expectedAttrValue);
     }
 
@@ -569,15 +569,17 @@ public abstract class BaseWebsocketApiTest extends AbstractControllerTest {
         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();
             }
         });
-        latch.await(3, TimeUnit.SECONDS);
+        assertThat(latch.await(TIMEOUT, TimeUnit.SECONDS)).as("await sendTelemetry callback");
     }
 
     private void sendAttributes(Device device, TbAttributeSubscriptionScope scope, List<AttributeKvEntry> attrData) throws InterruptedException {
@@ -589,14 +591,16 @@ public abstract class BaseWebsocketApiTest extends AbstractControllerTest {
         tsService.saveAndNotify(tenantId, entityId, scope.name(), 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();
             }
         });
-        latch.await(3, TimeUnit.SECONDS);
+        assertThat(latch.await(TIMEOUT, TimeUnit.SECONDS)).as("await sendAttributes callback").isTrue();
     }
 }
diff --git a/application/src/test/java/org/thingsboard/server/controller/TbTestWebSocketClient.java b/application/src/test/java/org/thingsboard/server/controller/TbTestWebSocketClient.java
index db26e9f6df..1f9ac4ea69 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TbTestWebSocketClient.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TbTestWebSocketClient.java
@@ -47,6 +47,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 public class TbTestWebSocketClient extends WebSocketClient {
 
+    private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(30);
     private volatile String lastMsg;
     private volatile CountDownLatch reply;
     private volatile CountDownLatch update;
@@ -87,12 +88,14 @@ public class TbTestWebSocketClient extends WebSocketClient {
     }
 
     public void registerWaitForUpdate(int count) {
+        log.debug("registerWaitForUpdate [{}]", count);
         lastMsg = null;
         update = new CountDownLatch(count);
     }
 
     @Override
     public void send(String text) throws NotYetConnectedException {
+        log.debug("send [{}]", text);
         reply = new CountDownLatch(1);
         super.send(text);
     }
@@ -110,21 +113,31 @@ public class TbTestWebSocketClient extends WebSocketClient {
     }
 
     public String waitForUpdate() {
-        return waitForUpdate(TimeUnit.SECONDS.toMillis(3));
+        return waitForUpdate(TIMEOUT);
     }
 
     public String waitForUpdate(long ms) {
+        log.debug("waitForUpdate [{}]", ms);
         try {
-            update.await(ms, TimeUnit.MILLISECONDS);
+            if (!update.await(ms, TimeUnit.MILLISECONDS)) {
+                log.warn("Failed to await update (waiting time [{}]ms elapsed)", ms, new RuntimeException("stacktrace"));
+            }
         } catch (InterruptedException e) {
-            log.warn("Failed to await reply", e);
+            log.warn("Failed to await update", e);
         }
         return lastMsg;
     }
 
     public String waitForReply() {
+        return waitForReply(TIMEOUT);
+    }
+
+    public String waitForReply(long ms) {
+        log.debug("waitForReply [{}]", ms);
         try {
-            reply.await(3, TimeUnit.SECONDS);
+            if (!reply.await(ms, TimeUnit.MILLISECONDS)) {
+                log.warn("Failed to await reply (waiting time [{}]ms elapsed)", ms, new RuntimeException("stacktrace"));
+            }
         } catch (InterruptedException e) {
             log.warn("Failed to await reply", e);
         }
diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseAlarmEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseAlarmEdgeTest.java
index 5014280b07..1cf2cd44bb 100644
--- a/application/src/test/java/org/thingsboard/server/edge/BaseAlarmEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/BaseAlarmEdgeTest.java
@@ -76,7 +76,6 @@ abstract public class BaseAlarmEdgeTest extends AbstractEdgeTest {
         Device device = findDeviceByName("Edge Device 1");
         Alarm alarm = new Alarm();
         alarm.setOriginator(device.getId());
-        alarm.setStatus(AlarmStatus.ACTIVE_UNACK);
         alarm.setType("alarm");
         alarm.setSeverity(AlarmSeverity.CRITICAL);
         edgeImitator.expectMessageAmount(1);
diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java
index b266465bd1..98508e72ce 100644
--- a/application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java
@@ -49,6 +49,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
+import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.gen.edge.v1.AttributesRequestMsg;
 import org.thingsboard.server.gen.edge.v1.DeviceCredentialsRequestMsg;
@@ -668,6 +669,7 @@ abstract public class BaseDeviceEdgeTest extends AbstractEdgeTest {
         client.connectAndWait(deviceCredentials.getCredentialsId());
         MqttTestCallback onUpdateCallback = new MqttTestCallback();
         client.setCallback(onUpdateCallback);
+
         client.subscribeAndWait("v1/devices/me/attributes", MqttQoS.AT_MOST_ONCE);
 
         edgeImitator.expectResponsesAmount(1);
diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
index f9916d27a0..93aeb17de6 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
@@ -27,9 +27,10 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.Alarm;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 import org.thingsboard.server.dao.alarm.AlarmCommentService;
 import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.customer.CustomerService;
@@ -81,36 +82,41 @@ public class DefaultTbAlarmServiceTest {
 
     @Test
     public void testSave() throws ThingsboardException {
-        var alarm = new Alarm();
-        when(alarmSubscriptionService.createOrUpdateAlarm(alarm)).thenReturn(alarm);
+        var alarm = new AlarmInfo();
+        when(alarmSubscriptionService.createAlarm(any())).thenReturn(AlarmApiCallResult.builder()
+                .successful(true)
+                .modified(true)
+                .alarm(alarm)
+                .build());
         service.save(alarm, new User());
 
         verify(notificationEntityService, times(1)).notifyCreateOrUpdateAlarm(any(), any(), any());
-        verify(alarmSubscriptionService, times(1)).createOrUpdateAlarm(eq(alarm));
+        verify(alarmSubscriptionService, times(1)).createAlarm(any());
     }
 
     @Test
-    public void testAck() {
+    public void testAck() throws ThingsboardException {
         var alarm = new Alarm();
-        alarm.setStatus(AlarmStatus.ACTIVE_UNACK);
-        when(alarmSubscriptionService.ackAlarm(any(), any(), anyLong())).thenReturn(Futures.immediateFuture(true));
+        when(alarmSubscriptionService.acknowledgeAlarm(any(), any(), anyLong()))
+                .thenReturn(AlarmApiCallResult.builder().successful(true).modified(true).build());
         service.ack(alarm, new User(new UserId(UUID.randomUUID())));
 
         verify(alarmCommentService, times(1)).createOrUpdateAlarmComment(any(), any());
         verify(notificationEntityService, times(1)).notifyCreateOrUpdateAlarm(any(), any(), any());
-        verify(alarmSubscriptionService, times(1)).ackAlarm(any(), any(), anyLong());
+        verify(alarmSubscriptionService, times(1)).acknowledgeAlarm(any(), any(), anyLong());
     }
 
     @Test
-    public void testClear() {
+    public void testClear() throws ThingsboardException {
         var alarm = new Alarm();
-        alarm.setStatus(AlarmStatus.ACTIVE_ACK);
-        when(alarmSubscriptionService.clearAlarm(any(), any(), any(), anyLong())).thenReturn(Futures.immediateFuture(true));
+        alarm.setAcknowledged(true);
+        when(alarmSubscriptionService.clearAlarm(any(), any(), anyLong(), any()))
+                .thenReturn(AlarmApiCallResult.builder().successful(true).cleared(true).build());
         service.clear(alarm, new User(new UserId(UUID.randomUUID())));
 
         verify(alarmCommentService, times(1)).createOrUpdateAlarmComment(any(), any());
         verify(notificationEntityService, times(1)).notifyCreateOrUpdateAlarm(any(), any(), any());
-        verify(alarmSubscriptionService, times(1)).clearAlarm(any(), any(), any(), anyLong());
+        verify(alarmSubscriptionService, times(1)).clearAlarm(any(), any(), anyLong(), any());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java b/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
index ce02296733..b0282832bc 100644
--- a/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
@@ -21,6 +21,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.junit.rules.ExpectedException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.EntityInfo;
@@ -237,7 +238,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resourceService.delete(savedResource, null);
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveTbResourceWithExistsFileName() throws Exception {
         TbResource resource = new TbResource();
         resource.setTenantId(tenantId);
@@ -256,23 +257,27 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setData("Test Data");
 
         try {
-            resourceService.save(resource2);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                resourceService.save(resource2);
+            });
         } finally {
             resourceService.delete(savedResource, null);
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveTbResourceWithEmptyTitle() throws Exception {
         TbResource resource = new TbResource();
         resource.setTenantId(tenantId);
         resource.setResourceType(ResourceType.JKS);
         resource.setFileName(DEFAULT_FILE_NAME);
         resource.setData("Test Data");
-        resourceService.save(resource);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            resourceService.save(resource);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveTbResourceWithInvalidTenant() throws Exception {
         TbResource resource = new TbResource();
         resource.setTenantId(TenantId.fromUUID(Uuids.timeBased()));
@@ -280,7 +285,9 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setTitle("My resource");
         resource.setFileName(DEFAULT_FILE_NAME);
         resource.setData("Test Data");
-        resourceService.save(resource);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            resourceService.save(resource);
+        });
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/transport/TransportNoSqlTestSuite.java b/application/src/test/java/org/thingsboard/server/transport/TransportNoSqlTestSuite.java
index 41cc4c2b76..ab2f6b9bca 100644
--- a/application/src/test/java/org/thingsboard/server/transport/TransportNoSqlTestSuite.java
+++ b/application/src/test/java/org/thingsboard/server/transport/TransportNoSqlTestSuite.java
@@ -15,30 +15,14 @@
  */
 package org.thingsboard.server.transport;
 
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
 import org.junit.runner.RunWith;
-import org.thingsboard.server.dao.CustomCassandraCQLUnit;
-import org.thingsboard.server.queue.memory.InMemoryStorage;
-
-import java.util.Arrays;
+import org.thingsboard.server.dao.AbstractNoSqlContainer;
 
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({
         "org.thingsboard.server.transport.*.telemetry.timeseries.nosql.*Test",
 })
-public class TransportNoSqlTestSuite {
-
-    @ClassRule
-    public static CustomCassandraCQLUnit cassandraUnit =
-            new CustomCassandraCQLUnit(
-                    Arrays.asList(
-                            new ClassPathCQLDataSet("cassandra/schema-keyspace.cql", false, false),
-                            new ClassPathCQLDataSet("cassandra/schema-ts.cql", false, false),
-                            new ClassPathCQLDataSet("cassandra/schema-ts-latest.cql", false, false)
-                    ),
-                    "cassandra-test.yaml", 30000l);
+public class TransportNoSqlTestSuite extends AbstractNoSqlContainer {
 
 }
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
index 6cb6e49e79..6b84761208 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
@@ -16,7 +16,9 @@
 package org.thingsboard.server.transport.mqtt;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.netty.handler.codec.mqtt.MqttQoS;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -36,9 +38,12 @@ import org.thingsboard.server.common.data.device.profile.JsonTransportPayloadCon
 import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
 import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
+import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.transport.AbstractTransportIntegrationTest;
+import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestClient;
 
 import java.util.List;
 
@@ -103,6 +108,8 @@ public abstract class AbstractMqttIntegrationTest extends AbstractTransportInteg
             if (StringUtils.hasLength(config.getAttributesTopicFilter())) {
                 mqttDeviceProfileTransportConfiguration.setDeviceAttributesTopic(config.getAttributesTopicFilter());
             }
+            mqttDeviceProfileTransportConfiguration.setSparkplug(config.isSparkplug());
+            mqttDeviceProfileTransportConfiguration.setSparkplugAttributesMetricNames(config.sparkplugAttributesMetricNames);
             mqttDeviceProfileTransportConfiguration.setSendAckOnValidationException(config.isSendAckOnValidationException());
             TransportPayloadTypeConfiguration transportPayloadTypeConfiguration;
             if (TransportPayloadType.JSON.equals(transportPayloadType)) {
@@ -176,4 +183,25 @@ public abstract class AbstractMqttIntegrationTest extends AbstractTransportInteg
         builder.addAllKv(kvProtos);
         return builder.build();
     }
+
+    protected void subscribeAndWait(MqttTestClient client, String attrSubTopic, DeviceId deviceId, FeatureType featureType) throws MqttException {
+        int subscriptionCount = getDeviceActorSubscriptionCount(deviceId, featureType);
+        client.subscribeAndWait(attrSubTopic, MqttQoS.AT_MOST_ONCE);
+        // TODO: This test awaits for the device actor to receive the subscription. Ideally it should not happen. See details below:
+        // The transport layer acknowledge subscription request once the message about subscription is in the queue.
+        // Test sends data immediately after acknowledgement.
+        // But there is a time lag between push to the queue and read from the queue in the tb-core component.
+        // Ideally, we should reply to device with SUBACK only when the device actor on the tb-core receives the message.
+        awaitForDeviceActorToReceiveSubscription(deviceId, featureType, subscriptionCount + 1);
+    }
+
+    protected void subscribeAndCheckSubscription(MqttTestClient client, String attrSubTopic, DeviceId deviceId, FeatureType featureType) throws MqttException {
+        client.subscribeAndWait(attrSubTopic, MqttQoS.AT_MOST_ONCE);
+        // TODO: This test awaits for the device actor to receive the subscription. Ideally it should not happen. See details below:
+        // The transport layer acknowledge subscription request once the message about subscription is in the queue.
+        // Test sends data immediately after acknowledgement.
+        // But there is a time lag between push to the queue and read from the queue in the tb-core component.
+        // Ideally, we should reply to device with SUBACK only when the device actor on the tb-core receives the message.
+        awaitForDeviceActorToReceiveSubscription(deviceId, featureType, 1);
+    }
 }
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/MqttTestConfigProperties.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/MqttTestConfigProperties.java
index 8bedc48b73..5815adae76 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/MqttTestConfigProperties.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/MqttTestConfigProperties.java
@@ -20,12 +20,16 @@ import lombok.Data;
 import org.thingsboard.server.common.data.DeviceProfileProvisionType;
 import org.thingsboard.server.common.data.TransportPayloadType;
 
+import java.util.Set;
+
 @Data
 @Builder
 public class MqttTestConfigProperties {
 
     String deviceName;
     String gatewayName;
+    boolean isSparkplug;
+    Set<String> sparkplugAttributesMetricNames;
 
     TransportPayloadType transportPayloadType;
 
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/MqttTestClient.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/MqttTestClient.java
index 511dabb5b7..e4b3058dfd 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/MqttTestClient.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/MqttTestClient.java
@@ -31,7 +31,7 @@ public class MqttTestClient {
 
     private static final String MQTT_URL = "tcp://localhost:1883";
     private static final int TIMEOUT = 30; // seconds
-    private static final long TIMEOUT_MS = TimeUnit.SECONDS.toMillis(TIMEOUT);
+    public static final long TIMEOUT_MS = TimeUnit.SECONDS.toMillis(TIMEOUT);
 
     private final MqttAsyncClient client;
 
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/attributes/AbstractMqttAttributesIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/attributes/AbstractMqttAttributesIntegrationTest.java
index 7feafead95..f8165b0237 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/attributes/AbstractMqttAttributesIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/attributes/AbstractMqttAttributesIntegrationTest.java
@@ -32,12 +32,14 @@ import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportC
 import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
 import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
+import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.DeviceTypeFilter;
 import org.thingsboard.server.common.data.query.EntityData;
 import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.EntityKeyType;
 import org.thingsboard.server.common.data.query.SingleEntityFilter;
+import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.gen.transport.TransportApiProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.service.telemetry.cmd.v2.EntityDataUpdate;
@@ -121,13 +123,16 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
     // subscribe to attributes updates from server methods
 
     protected void processJsonTestSubscribeToAttributesUpdates(String attrSubTopic) throws Exception {
+        DeviceId deviceId = savedDevice.getId();
+
         MqttTestClient client = new MqttTestClient();
         client.connectAndWait(accessToken);
         MqttTestCallback onUpdateCallback = new MqttTestCallback();
         client.setCallback(onUpdateCallback);
-        client.subscribeAndWait(attrSubTopic, MqttQoS.AT_MOST_ONCE);
 
-        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        subscribeAndWait(client, attrSubTopic, deviceId, FeatureType.ATTRIBUTES);
+
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + deviceId.getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
         assertThat(onUpdateCallback.getSubscribeLatch().await(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS))
                 .as("await onUpdateCallback").isTrue();
 
@@ -135,7 +140,7 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
 
         MqttTestCallback onDeleteCallback = new MqttTestCallback();
         client.setCallback(onDeleteCallback);
-        doDelete("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/SHARED_SCOPE?keys=sharedJson", String.class);
+        doDelete("/api/plugins/telemetry/DEVICE/" + deviceId.getId() + "/SHARED_SCOPE?keys=sharedJson", String.class);
         assertThat(onDeleteCallback.getSubscribeLatch().await(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS))
                 .as("await onDeleteCallback").isTrue();
         validateUpdateAttributesJsonResponse(onDeleteCallback, SHARED_ATTRIBUTES_DELETED_RESPONSE);
@@ -147,7 +152,7 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
         client.connectAndWait(accessToken);
         MqttTestCallback onUpdateCallback = new MqttTestCallback();
         client.setCallback(onUpdateCallback);
-        client.subscribeAndWait(attrSubTopic, MqttQoS.AT_MOST_ONCE);
+        subscribeAndWait(client, attrSubTopic, savedDevice.getId(), FeatureType.ATTRIBUTES);
 
         doPostAsync("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
         assertThat(onUpdateCallback.getSubscribeLatch().await(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS))
@@ -213,7 +218,7 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
 
         assertNotNull(savedDevice);
 
-        client.subscribeAndWait(GATEWAY_ATTRIBUTES_TOPIC, MqttQoS.AT_MOST_ONCE);
+        subscribeAndCheckSubscription(client, GATEWAY_ATTRIBUTES_TOPIC, savedDevice.getId(), FeatureType.ATTRIBUTES);
 
         doPostAsync("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
         assertThat(onUpdateCallback.getSubscribeLatch().await(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS))
@@ -244,7 +249,8 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
                 20,
                 100);
         assertNotNull(device);
-        client.subscribeAndWait(GATEWAY_ATTRIBUTES_TOPIC, MqttQoS.AT_MOST_ONCE);
+
+        subscribeAndCheckSubscription(client, GATEWAY_ATTRIBUTES_TOPIC, device.getId(), FeatureType.ATTRIBUTES);
         doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
         validateProtoGatewayUpdateAttributesResponse(onUpdateCallback, deviceName);
         MqttTestCallback onDeleteCallback = new MqttTestCallback();
@@ -409,7 +415,8 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
         Awaitility.await()
                 .atMost(10, TimeUnit.SECONDS)
                 .until(() -> {
-                    List<Map<String, Object>> attributes = doGetAsyncTyped(attributeValuesUrl, new TypeReference<>() {});
+                    List<Map<String, Object>> attributes = doGetAsyncTyped(attributeValuesUrl, new TypeReference<>() {
+                    });
                     return attributes.size() == 5;
                 });
 
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/credentials/BasicMqttCredentialsTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/credentials/BasicMqttCredentialsTest.java
index 32f7647048..3880141c36 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/credentials/BasicMqttCredentialsTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/credentials/BasicMqttCredentialsTest.java
@@ -20,6 +20,7 @@ import org.eclipse.paho.client.mqttv3.MqttException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.StringUtils;
@@ -115,7 +116,7 @@ public class BasicMqttCredentialsTest extends AbstractMqttIntegrationTest {
         testTelemetryIsDelivered(accessToken2Device, mqttTestClient5);
     }
 
-    @Test(expected = MqttException.class)
+    @Test
     public void testCorrectClientIdAndUserNameButWrongPassword() throws Exception {
         // Not correct. Correct clientId and username, but wrong password
         MqttTestClient mqttTestClient = new MqttTestClient(CLIENT_ID);
@@ -125,7 +126,9 @@ public class BasicMqttCredentialsTest extends AbstractMqttIntegrationTest {
         } catch (MqttException e) {
             Assert.assertEquals(4, e.getReasonCode()); // 4 - Reason code for bad username or password in MQTT v3
         }
-        testTelemetryIsNotDelivered(clientIdAndUserNameAndPasswordDevice3, mqttTestClient);
+        Assertions.assertThrows(MqttException.class, () -> {
+            testTelemetryIsNotDelivered(clientIdAndUserNameAndPasswordDevice3, mqttTestClient);
+        });
     }
 
     private void testTelemetryIsDelivered(Device device, MqttTestClient client) throws Exception {
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/rpc/AbstractMqttServerSideRpcIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/rpc/AbstractMqttServerSideRpcIntegrationTest.java
index 8610365af8..924b4d50a6 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/rpc/AbstractMqttServerSideRpcIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/rpc/AbstractMqttServerSideRpcIntegrationTest.java
@@ -37,6 +37,7 @@ import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportC
 import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
 import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
+import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.gen.transport.TransportApiProtos;
 import org.thingsboard.server.transport.mqtt.AbstractMqttIntegrationTest;
 import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestCallback;
@@ -82,7 +83,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
         client.connectAndWait(accessToken);
         MqttTestCallback callback = new MqttTestCallback(rpcSubTopic.replace("+", "0"));
         client.setCallback(callback);
-        client.subscribeAndWait(rpcSubTopic, MqttQoS.AT_MOST_ONCE);
+        subscribeAndWait(client, rpcSubTopic, savedDevice.getId(), FeatureType.RPC);
 
         String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}";
         String result = doPostAsync("/api/rpc/oneway/" + savedDevice.getId(), setGpioRequest, String.class, status().isOk());
@@ -119,7 +120,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
     protected void processJsonTwoWayRpcTest(String rpcSubTopic) throws Exception {
         MqttTestClient client = new MqttTestClient();
         client.connectAndWait(accessToken);
-        client.subscribeAndWait(rpcSubTopic, MqttQoS.AT_LEAST_ONCE);
+        subscribeAndWait(client, rpcSubTopic, savedDevice.getId(), FeatureType.RPC);
         MqttTestRpcJsonCallback callback = new MqttTestRpcJsonCallback(client, rpcSubTopic.replace("+", "0"));
         client.setCallback(callback);
         String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"26\",\"value\": 1}}";
@@ -133,7 +134,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
     protected void processProtoTwoWayRpcTest(String rpcSubTopic) throws Exception {
         MqttTestClient client = new MqttTestClient();
         client.connectAndWait(accessToken);
-        client.subscribeAndWait(rpcSubTopic, MqttQoS.AT_LEAST_ONCE);
+        subscribeAndWait(client, rpcSubTopic, savedDevice.getId(), FeatureType.RPC);
 
         MqttTestRpcProtoCallback callback = new MqttTestRpcProtoCallback(client, rpcSubTopic.replace("+", "0"));
         client.setCallback(callback);
@@ -194,7 +195,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
         client.enableManualAcks();
         MqttTestSequenceCallback callback = new MqttTestSequenceCallback(client, 10, result);
         client.setCallback(callback);
-        client.subscribeAndWait(DEVICE_RPC_REQUESTS_SUB_TOPIC, MqttQoS.AT_LEAST_ONCE);
+        subscribeAndWait(client, DEVICE_RPC_REQUESTS_SUB_TOPIC, savedDevice.getId(), FeatureType.RPC);
 
         callback.getSubscribeLatch().await(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
         assertEquals(expected, result);
@@ -223,6 +224,8 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
         MqttTestCallback  callback = new MqttTestCallback(GATEWAY_RPC_TOPIC);
         client.setCallback(callback);
         client.subscribeAndWait(GATEWAY_RPC_TOPIC, MqttQoS.AT_MOST_ONCE);
+        subscribeAndCheckSubscription(client, GATEWAY_RPC_TOPIC, savedDevice.getId(), FeatureType.RPC);
+
         String setGpioRequest = "{\"method\": \"toggle_gpio\", \"params\": {\"pin\":1}}";
         String deviceId = savedDevice.getId().getId().toString();
         String result = doPostAsync("/api/rpc/oneway/" + deviceId, setGpioRequest, String.class, status().isOk());
@@ -269,7 +272,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
 
         MqttTestRpcJsonCallback callback = new MqttTestRpcJsonCallback(client, GATEWAY_RPC_TOPIC);
         client.setCallback(callback);
-        client.subscribeAndWait(GATEWAY_RPC_TOPIC, MqttQoS.AT_MOST_ONCE);
+        subscribeAndCheckSubscription(client, GATEWAY_RPC_TOPIC, savedDevice.getId(), FeatureType.RPC);
 
         String setGpioRequest = "{\"method\": \"toggle_gpio\", \"params\": {\"pin\":1}}";
         String deviceId = savedDevice.getId().getId().toString();
@@ -292,7 +295,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
 
         MqttTestRpcProtoCallback callback = new MqttTestRpcProtoCallback(client, GATEWAY_RPC_TOPIC);
         client.setCallback(callback);
-        client.subscribeAndWait(GATEWAY_RPC_TOPIC, MqttQoS.AT_MOST_ONCE);
+        subscribeAndCheckSubscription(client, GATEWAY_RPC_TOPIC, savedDevice.getId(), FeatureType.RPC);
 
         String setGpioRequest = "{\"method\": \"toggle_gpio\", \"params\": {\"pin\":1}}";
         String deviceId = savedDevice.getId().getId().toString();
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/MqttV5TestClient.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/MqttV5TestClient.java
index b7ce8d10d3..76629b5a66 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/MqttV5TestClient.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/MqttV5TestClient.java
@@ -89,7 +89,9 @@ public class MqttV5TestClient { // We should copy part of MqttV3TestClient, due
         if (client == null) {
             throw new RuntimeException("Failed to connect! MqttAsyncClient is not initialized!");
         }
-        return client.connect(options);
+        IMqttToken connect = client.connect(options);
+        connect.waitForCompletion(TIMEOUT_MS);
+        return connect;
     }
 
     public void disconnectAndWait() throws MqttException {
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/AbstractMqttV5ClientSparkplugTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/AbstractMqttV5ClientSparkplugTest.java
new file mode 100644
index 0000000000..99134be5d4
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/AbstractMqttV5ClientSparkplugTest.java
@@ -0,0 +1,462 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.sparkplug;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.mqttv5.client.IMqttToken;
+import org.eclipse.paho.mqttv5.client.MqttCallback;
+import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
+import org.eclipse.paho.mqttv5.client.MqttDisconnectResponse;
+import org.eclipse.paho.mqttv5.common.MqttException;
+import org.eclipse.paho.mqttv5.common.MqttMessage;
+import org.eclipse.paho.mqttv5.common.packet.MqttConnAck;
+import org.eclipse.paho.mqttv5.common.packet.MqttProperties;
+import org.eclipse.paho.mqttv5.common.packet.MqttReturnCode;
+import org.eclipse.paho.mqttv5.common.packet.MqttWireMessage;
+import org.junit.Assert;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.TransportPayloadType;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.BooleanDataEntry;
+import org.thingsboard.server.common.data.kv.DoubleDataEntry;
+import org.thingsboard.server.common.data.kv.JsonDataEntry;
+import org.thingsboard.server.common.data.kv.LongDataEntry;
+import org.thingsboard.server.common.data.kv.StringDataEntry;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.gen.transport.mqtt.SparkplugBProto;
+import org.thingsboard.server.transport.mqtt.AbstractMqttIntegrationTest;
+import org.thingsboard.server.transport.mqtt.MqttTestConfigProperties;
+import org.thingsboard.server.transport.mqtt.mqttv5.MqttV5TestClient;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.awaitility.Awaitility.await;
+import static org.eclipse.paho.mqttv5.common.packet.MqttWireMessage.MESSAGE_TYPE_CONNACK;
+import static org.thingsboard.common.util.JacksonUtil.newArrayNode;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType.Bytes;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType.Int16;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType.Int32;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType.Int64;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType.Int8;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType.UInt16;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType.UInt32;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType.UInt64;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType.UInt8;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMetricUtil.createMetric;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugTopicUtil.NAMESPACE;
+
+/**
+ * Created by nickAS21 on 12.01.23
+ */
+@Slf4j
+public abstract class AbstractMqttV5ClientSparkplugTest extends AbstractMqttIntegrationTest {
+
+    protected MqttV5TestClient client;
+    protected SparkplugMqttCallback mqttCallback;
+    protected Calendar calendar = Calendar.getInstance();
+    protected ThreadLocalRandom random = ThreadLocalRandom.current();
+
+    protected static final String groupId = "SparkplugBGroupId";
+    protected static final String edgeNode = "SparkpluBNode";
+    protected static final String keysBdSeq = "bdSeq";
+    protected static final String alias = "Failed Telemetry/Attribute proto sparkplug payload. SparkplugMessageType ";
+    protected String deviceId = "Test Sparkplug B Device";
+    protected int bdSeq = 0;
+    protected int seq = 0;
+    protected static final long PUBLISH_TS_DELTA_MS = 86400000;// Publish start TS <-> 24h
+
+    // NBIRTH
+    protected static final String keyNodeRebirth = "Node Control/Rebirth";
+
+    //*BIRTH
+    protected static final MetricDataType metricBirthDataType_Int32 = Int32;
+    protected static final String metricBirthName_Int32 = "Device Metric int32";
+    protected Set<String> sparkplugAttributesMetricNames;
+
+    public void beforeSparkplugTest() throws Exception {
+        MqttTestConfigProperties configProperties = MqttTestConfigProperties.builder()
+                .gatewayName("Test Connect Sparkplug client node")
+                .isSparkplug(true)
+                .sparkplugAttributesMetricNames(sparkplugAttributesMetricNames)
+                .transportPayloadType(TransportPayloadType.PROTOBUF)
+                .build();
+        processBeforeTest(configProperties);
+    }
+
+    public void clientWithCorrectNodeAccessTokenWithNDEATH() throws Exception {
+        long ts = calendar.getTimeInMillis();
+        long value = bdSeq = 0;
+        clientWithCorrectNodeAccessTokenWithNDEATH(ts, value);
+    }
+
+    public void clientWithCorrectNodeAccessTokenWithNDEATH(long ts, long value) throws Exception {
+        IMqttToken connectionResult = clientConnectWithNDEATH(ts, value);
+        MqttWireMessage response = connectionResult.getResponse();
+        Assert.assertEquals(MESSAGE_TYPE_CONNACK, response.getType());
+        MqttConnAck connAckMsg = (MqttConnAck) response;
+        Assert.assertEquals(MqttReturnCode.RETURN_CODE_SUCCESS, connAckMsg.getReturnCode());
+    }
+
+    public IMqttToken clientConnectWithNDEATH(long ts, long value, String... nameSpaceBad) throws Exception {
+        String key = keysBdSeq;
+        MetricDataType metricDataType = Int64;
+        SparkplugBProto.Payload.Builder deathPayload = SparkplugBProto.Payload.newBuilder()
+                .setTimestamp(calendar.getTimeInMillis());
+        deathPayload.addMetrics(createMetric(value, ts, key, metricDataType));
+        byte[] deathBytes = deathPayload.build().toByteArray();
+        this.client = new MqttV5TestClient();
+        this.mqttCallback = new SparkplugMqttCallback();
+        this.client.setCallback(this.mqttCallback);
+        MqttConnectionOptions options = new MqttConnectionOptions();
+        options.setUserName(gatewayAccessToken);
+        String nameSpace = nameSpaceBad.length == 0 ? NAMESPACE : nameSpaceBad[0];
+        String topic = nameSpace + "/" + groupId + "/" + SparkplugMessageType.NDEATH.name() + "/" + edgeNode;
+        MqttMessage msg = new MqttMessage();
+        msg.setId(0);
+        msg.setPayload(deathBytes);
+        options.setWill(topic, msg);
+        return client.connect(options);
+    }
+
+    protected List<Device> connectClientWithCorrectAccessTokenWithNDEATHCreatedDevices(int cntDevices, long ts) throws Exception {
+        List<Device> devices = new ArrayList<>();
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+        MetricDataType metricDataType = Int32;
+        String key = "Node Metric int32";
+        int valueDeviceInt32 = 1024;
+        SparkplugBProto.Payload.Metric metric = createMetric(valueDeviceInt32, ts, key, metricDataType);
+        SparkplugBProto.Payload.Builder payloadBirthNode = SparkplugBProto.Payload.newBuilder()
+                .setTimestamp(ts)
+                .setSeq(getBdSeqNum());
+        payloadBirthNode.addMetrics(metric);
+        payloadBirthNode.setTimestamp(ts);
+        if (client.isConnected()) {
+            client.publish(NAMESPACE + "/" + groupId + "/" + SparkplugMessageType.NBIRTH.name() + "/" + edgeNode,
+                    payloadBirthNode.build().toByteArray(), 0, false);
+        }
+
+        valueDeviceInt32 = 4024;
+        metric = createMetric(valueDeviceInt32, ts, metricBirthName_Int32,  metricBirthDataType_Int32);
+        for (int i = 0; i < cntDevices; i++) {
+            SparkplugBProto.Payload.Builder payloadBirthDevice = SparkplugBProto.Payload.newBuilder()
+                    .setTimestamp(ts)
+                    .setSeq(getSeqNum());
+            String deviceName = deviceId + "_" + i;
+
+            payloadBirthDevice.addMetrics(metric);
+            if (client.isConnected()) {
+                client.publish(NAMESPACE + "/" + groupId + "/" + SparkplugMessageType.DBIRTH.name() + "/" + edgeNode + "/" + deviceName,
+                        payloadBirthDevice.build().toByteArray(), 0, false);
+                AtomicReference<Device> device = new AtomicReference<>();
+                await(alias + "find device [" + deviceName + "] after created")
+                        .atMost(200, TimeUnit.SECONDS)
+                        .until(() -> {
+                            device.set(doGet("/api/tenant/devices?deviceName=" + deviceName, Device.class));
+                            return device.get() != null;
+                        });
+                devices.add(device.get());
+            }
+
+        }
+
+        Assert.assertEquals(cntDevices, devices.size());
+        return devices;
+    }
+
+    protected long getBdSeqNum() throws Exception {
+        if (bdSeq == 256) {
+            bdSeq = 0;
+        }
+        return bdSeq++;
+    }
+
+    protected long getSeqNum() throws Exception {
+        if (seq == 256) {
+            seq = 0;
+        }
+        return seq++;
+    }
+
+    protected List<String> connectionWithNBirth(MetricDataType metricDataType, String metricKey, Object metricValue) throws Exception {
+        List<String> listKeys = new ArrayList<>();
+        SparkplugBProto.Payload.Builder payloadBirthNode = SparkplugBProto.Payload.newBuilder()
+                .setTimestamp(calendar.getTimeInMillis());
+        long ts = calendar.getTimeInMillis() - PUBLISH_TS_DELTA_MS;
+        long valueBdSec = getBdSeqNum();
+        payloadBirthNode.addMetrics(createMetric(valueBdSec, ts, keysBdSeq, Int64));
+        listKeys.add(SparkplugMessageType.NBIRTH.name() + " " + keysBdSeq);
+        payloadBirthNode.addMetrics(createMetric(false, ts, keyNodeRebirth, MetricDataType.Boolean));
+        listKeys.add(keyNodeRebirth);
+
+        payloadBirthNode.addMetrics(createMetric(metricValue, ts, metricKey, metricDataType));
+        listKeys.add(metricKey);
+
+        if (client.isConnected()) {
+            client.publish(NAMESPACE + "/" + groupId + "/" + SparkplugMessageType.NBIRTH.name() + "/" + edgeNode,
+                    payloadBirthNode.build().toByteArray(), 0, false);
+        }
+        return listKeys;
+    }
+
+    protected void createdAddMetricValuePrimitiveTsKv(List<TsKvEntry> listTsKvEntry, List<String> listKeys,
+                                                      SparkplugBProto.Payload.Builder dataPayload, long ts) throws ThingsboardException {
+
+        String keys = "MyInt8";
+        listTsKvEntry.add(createdAddMetricTsKvLong(dataPayload, keys, nextInt8(), ts, Int8));
+        listKeys.add(keys);
+
+        keys = "MyInt16";
+        listTsKvEntry.add(createdAddMetricTsKvLong(dataPayload, keys, nextInt16(), ts, Int16));
+        listKeys.add(keys);
+
+        keys = "MyInt32";
+        listTsKvEntry.add(createdAddMetricTsKvLong(dataPayload, keys, nextInt32(), ts, Int32));
+        listKeys.add(keys);
+
+        keys = "MyInt64";
+        listTsKvEntry.add(createdAddMetricTsKvLong(dataPayload, keys, nextInt64(), ts, Int64));
+        listKeys.add(keys);
+
+        keys = "MyUInt8";
+        listTsKvEntry.add(createdAddMetricTsKvLong(dataPayload, keys, nextUInt8(), ts, UInt8));
+        listKeys.add(keys);
+
+        keys = "MyUInt16";
+        listTsKvEntry.add(createdAddMetricTsKvLong(dataPayload, keys, nextUInt16(), ts, UInt16));
+        listKeys.add(keys);
+
+        keys = "MyUInt32";
+        listTsKvEntry.add(createdAddMetricTsKvLong(dataPayload, keys, nextUInt32(), ts, UInt32));
+        listKeys.add(keys);
+
+        keys = "MyUInt64";
+        listTsKvEntry.add(createdAddMetricTsKvLong(dataPayload, keys, nextUInt64(), ts, UInt64));
+        listKeys.add(keys);
+
+        keys = "MyFloat";
+        listTsKvEntry.add(createdAddMetricTsKvFloat(dataPayload, keys, nextFloat(0, 100), ts, MetricDataType.Float));
+        listKeys.add(keys);
+
+        keys = "MyDateTime";
+        listTsKvEntry.add(createdAddMetricTsKvLong(dataPayload, keys, nextDateTime(), ts, MetricDataType.DateTime));
+        listKeys.add(keys);
+
+        keys = "MyDouble";
+        listTsKvEntry.add(createdAddMetricTsKvDouble(dataPayload, keys, nextDouble(), ts, MetricDataType.Double));
+        listKeys.add(keys);
+
+        keys = "MyBoolean";
+        listTsKvEntry.add(createdAddMetricTsKvBoolean(dataPayload, keys, nextBoolean(), ts, MetricDataType.Boolean));
+        listKeys.add(keys);
+
+        keys = "MyString";
+        listTsKvEntry.add(createdAddMetricTsKvString(dataPayload, keys, nextString(), ts, MetricDataType.String));
+        listKeys.add(keys);
+
+        keys = "MyText";
+        listTsKvEntry.add(createdAddMetricTsKvString(dataPayload, keys, nextString(), ts, MetricDataType.Text));
+        listKeys.add(keys);
+
+        keys = "MyUUID";
+        listTsKvEntry.add(createdAddMetricTsKvString(dataPayload, keys, nextString(), ts, MetricDataType.UUID));
+        listKeys.add(keys);
+
+    }
+
+    protected void createdAddMetricValueArraysPrimitiveTsKv(List<TsKvEntry> listTsKvEntry, List<String> listKeys,
+                                                            SparkplugBProto.Payload.Builder dataPayload, long ts) throws ThingsboardException {
+        String keys = "MyBytesArray";
+        byte[] bytes = {nextInt8(), nextInt8(), nextInt8()};
+        createdAddMetricTsKvJson(dataPayload, keys, bytes, ts, Bytes, listTsKvEntry, listKeys);
+    }
+
+    private TsKvEntry createdAddMetricTsKvLong(SparkplugBProto.Payload.Builder dataPayload, String key, Object value,
+                                               long ts, MetricDataType metricDataType) throws ThingsboardException {
+        TsKvEntry tsKvEntry = new BasicTsKvEntry(ts, new LongDataEntry(key, Long.valueOf(String.valueOf(value))));
+        dataPayload.addMetrics(createMetric(value, ts, key, metricDataType));
+        return tsKvEntry;
+    }
+
+    private TsKvEntry createdAddMetricTsKvFloat(SparkplugBProto.Payload.Builder dataPayload, String key, float value,
+                                                long ts, MetricDataType metricDataType) throws ThingsboardException {
+        Double dd = Double.parseDouble(Float.toString(value));
+        TsKvEntry tsKvEntry = new BasicTsKvEntry(ts, new DoubleDataEntry(key, dd));
+        dataPayload.addMetrics(createMetric(value, ts, key, metricDataType));
+        return tsKvEntry;
+    }
+
+    private TsKvEntry createdAddMetricTsKvDouble(SparkplugBProto.Payload.Builder dataPayload, String key, double value,
+                                                 long ts, MetricDataType metricDataType) throws ThingsboardException {
+        Long l = Double.valueOf(value).longValue();
+        TsKvEntry tsKvEntry = new BasicTsKvEntry(ts, new LongDataEntry(key, l));
+        dataPayload.addMetrics(createMetric(value, ts, key, metricDataType));
+        return tsKvEntry;
+    }
+
+    private TsKvEntry createdAddMetricTsKvBoolean(SparkplugBProto.Payload.Builder dataPayload, String key, boolean value,
+                                                  long ts, MetricDataType metricDataType) throws ThingsboardException {
+        TsKvEntry tsKvEntry = new BasicTsKvEntry(ts, new BooleanDataEntry(key, value));
+        dataPayload.addMetrics(createMetric(value, ts, key, metricDataType));
+        return tsKvEntry;
+    }
+
+    private TsKvEntry createdAddMetricTsKvString(SparkplugBProto.Payload.Builder dataPayload, String key, String value,
+                                                 long ts, MetricDataType metricDataType) throws ThingsboardException {
+        TsKvEntry tsKvEntry = new BasicTsKvEntry(ts, new StringDataEntry(key, value));
+        dataPayload.addMetrics(createMetric(value, ts, key, metricDataType));
+        return tsKvEntry;
+    }
+
+    private void createdAddMetricTsKvJson(SparkplugBProto.Payload.Builder dataPayload, String key,
+                                          Object values, long ts, MetricDataType metricDataType,
+                                          List<TsKvEntry> listTsKvEntry,
+                                          List<String> listKeys) throws ThingsboardException {
+        ArrayNode nodeArray = newArrayNode();
+        switch (metricDataType) {
+            case Bytes:
+                for (byte b : (byte[]) values) {
+                    nodeArray.add(b);
+                }
+                break;
+            default:
+                throw new IllegalStateException("Unexpected value: " + metricDataType);
+        }
+        if (nodeArray.size() > 0) {
+            Optional<TsKvEntry> tsKvEntryOptional = Optional.of(new BasicTsKvEntry(ts, new JsonDataEntry(key, nodeArray.toString())));
+            if (tsKvEntryOptional.isPresent()) {
+                dataPayload.addMetrics(createMetric(values, ts, key, metricDataType));
+                listTsKvEntry.add(tsKvEntryOptional.get());
+                listKeys.add(key);
+            }
+        }
+    }
+
+    private byte nextInt8() {
+        return (byte) random.nextInt(Byte.MIN_VALUE, Byte.MAX_VALUE);
+    }
+
+    private short nextUInt8() {
+        return (short) random.nextInt(0, Byte.MAX_VALUE * 2 + 1);
+    }
+
+    private short nextInt16() {
+        return (short) random.nextInt(Short.MIN_VALUE, Short.MAX_VALUE);
+    }
+
+    private int nextUInt16() {
+        return random.nextInt(0, Short.MAX_VALUE * 2 + 1);
+    }
+
+    protected int nextInt32() {
+        return random.nextInt(Integer.MIN_VALUE, Integer.MAX_VALUE);
+    }
+
+    protected long nextUInt32() {
+        long l = Integer.MAX_VALUE;
+        return random.nextLong(0, l * 2 + 1);
+    }
+
+    private long nextInt64() {
+        return random.nextLong(Long.MIN_VALUE, Long.MAX_VALUE);
+    }
+
+    private long nextUInt64() {
+        double d = Long.MAX_VALUE;
+        return random.nextLong(0, (long) (d * 2 + 1));
+    }
+
+    protected double nextDouble() {
+        return random.nextDouble(Long.MIN_VALUE, Long.MAX_VALUE);
+    }
+
+    private long nextDateTime() {
+        long min = calendar.getTimeInMillis() - PUBLISH_TS_DELTA_MS;
+        long max = calendar.getTimeInMillis();
+        return random.nextLong(min, max);
+    }
+
+    protected float nextFloat(float min, float max) {
+        if (min >= max)
+            throw new IllegalArgumentException("max must be greater than min");
+        float result = ThreadLocalRandom.current().nextFloat() * (max - min) + min;
+        if (result >= max) // correct for rounding
+            result = Float.intBitsToFloat(Float.floatToIntBits(max) - 1);
+        return result;
+    }
+
+    protected boolean nextBoolean() {
+        return random.nextBoolean();
+    }
+
+    protected String nextString() {
+        return java.util.UUID.randomUUID().toString();
+    }
+
+    public class SparkplugMqttCallback  implements MqttCallback {
+        private final List<SparkplugBProto.Payload.Metric> messageArrivedMetrics = new ArrayList<>();
+
+        @Override
+        public void disconnected(MqttDisconnectResponse mqttDisconnectResponse) {
+
+        }
+
+        @Override
+        public void mqttErrorOccurred(MqttException e) {
+
+        }
+
+        @Override
+        public void messageArrived(String topic, MqttMessage mqttMsg) throws Exception {
+            SparkplugBProto.Payload sparkplugBProtoNode = SparkplugBProto.Payload.parseFrom(mqttMsg.getPayload());
+            messageArrivedMetrics.addAll(sparkplugBProtoNode.getMetricsList());
+        }
+
+        @Override
+        public void deliveryComplete(IMqttToken iMqttToken) {
+
+        }
+
+        @Override
+        public void connectComplete(boolean b, String s) {
+
+        }
+
+        @Override
+        public void authPacketArrived(int i, MqttProperties mqttProperties) {
+
+        }
+
+        public List<SparkplugBProto.Payload.Metric> getMessageArrivedMetrics() {
+            return messageArrivedMetrics;
+        }
+
+        public void deleteMessageArrivedMetrics(int id) {
+            messageArrivedMetrics.remove(id);
+        }
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/attributes/AbstractMqttV5ClientSparkplugAttributesTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/attributes/AbstractMqttV5ClientSparkplugAttributesTest.java
new file mode 100644
index 0000000000..04349d0672
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/attributes/AbstractMqttV5ClientSparkplugAttributesTest.java
@@ -0,0 +1,432 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.sparkplug.attributes;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import io.netty.handler.codec.mqtt.MqttQoS;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Assert;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.transport.mqtt.sparkplug.AbstractMqttV5ClientSparkplugTest;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.awaitility.Awaitility.await;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.thingsboard.server.common.data.DataConstants.CLIENT_SCOPE;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType.UInt32;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType.NCMD;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugTopicUtil.NAMESPACE;
+
+/**
+ * Created by nickAS21 on 12.01.23
+ */
+@Slf4j
+public abstract class AbstractMqttV5ClientSparkplugAttributesTest extends AbstractMqttV5ClientSparkplugTest {
+
+    protected void processClientWithCorrectAccessTokenPublishNCMDReBirth() throws Exception {
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+        List<String> listKeys = connectionWithNBirth(metricBirthDataType_Int32, metricBirthName_Int32, nextInt32());
+        // Shared attribute "Node Control/Rebirth" = true. type = NCMD.
+        boolean value = true;
+        Assert.assertTrue(listKeys.contains(keyNodeRebirth));
+        String SHARED_ATTRIBUTES_PAYLOAD = "{\"" + keyNodeRebirth + "\":" + value + "}";
+        Assert.assertTrue("Connection node is failed", client.isConnected());
+        client.subscribeAndWait(NAMESPACE + "/" + groupId + "/" + NCMD.name() + "/" + edgeNode + "/#", MqttQoS.AT_MOST_ONCE);
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(keyNodeRebirth, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertTrue(mqttCallback.getMessageArrivedMetrics().get(0).getBooleanValue());
+    }
+
+    /**
+     * If boolean - send long 0 or 1
+     * If String - try to parse long
+     * If double - cast long
+     * If we can't parse, cast, or JSON there - debug the message with the id of the devise/node, tenant,
+     * the name and type of the attribute into an error and don't send anything.
+     */
+    protected void processClientWithCorrectAccessTokenPublishNCMD_BooleanType_IfMetricFailedTypeCheck_SendValueOk() throws Exception {
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+        MetricDataType metricDataType = MetricDataType.Boolean;
+        String metricKey = "MyBoolean";
+        Object metricValue = nextBoolean();
+        connectionWithNBirth(metricDataType, metricKey, metricValue);
+        Assert.assertTrue("Connection node is failed", client.isConnected());
+        client.subscribeAndWait(NAMESPACE + "/" + groupId + "/" + NCMD.name() + "/" + edgeNode + "/#", MqttQoS.AT_MOST_ONCE);
+
+        // Boolean <-> String
+        boolean expectedValue = true;
+        String valueStr = "123";
+        String SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueStr + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getBooleanValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        expectedValue = false;
+        valueStr = "0";
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueStr + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getBooleanValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        // Boolean <-> Integer
+        expectedValue = true;
+        Integer valueInt = nextInt32();
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueInt + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getBooleanValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        expectedValue = false;
+        valueInt = 0;
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueInt + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getBooleanValue());
+    }
+
+    protected void processClientWithCorrectAccessTokenPublishNCMD_LongType_IfMetricFailedTypeCheck_SendValueOk() throws Exception {
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+        MetricDataType metricDataType = UInt32;
+        String metricKey = "MyLong";
+        Object metricValue = nextUInt32();
+        connectionWithNBirth(metricDataType, metricKey, metricValue);
+        Assert.assertTrue("Connection node is failed", client.isConnected());
+        client.subscribeAndWait(NAMESPACE + "/" + groupId + "/" + NCMD.name() + "/" + edgeNode + "/#", MqttQoS.AT_MOST_ONCE);
+
+        // Long <-> String
+        String valueStr = "123";
+        long expectedValue = Long.valueOf(valueStr);
+
+        String SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueStr + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getLongValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        // Long <-> Boolean
+        Boolean valueBoolean = true;
+        expectedValue = 1L;
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueBoolean + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getLongValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        valueBoolean = false;
+        expectedValue = 0L;
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueBoolean + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getLongValue());
+    }
+
+    protected void processClientWithCorrectAccessTokenPublishNCMD_FloatType_IfMetricFailedTypeCheck_SendValueOk() throws Exception {
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+        MetricDataType metricDataType = MetricDataType.Float;
+        String metricKey = "MyFloat";
+        Object metricValue = nextFloat(30, 400);
+        connectionWithNBirth(metricDataType, metricKey, metricValue);
+        Assert.assertTrue("Connection node is failed", client.isConnected());
+        client.subscribeAndWait(NAMESPACE + "/" + groupId + "/" + NCMD.name() + "/" + edgeNode + "/#", MqttQoS.AT_MOST_ONCE);
+
+        // Float <-> String
+        String valueStr = "123.345";
+        float expectedValue = Float.valueOf(valueStr);
+
+        String SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueStr + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertTrue(expectedValue == mqttCallback.getMessageArrivedMetrics().get(0).getFloatValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        // Float <-> Boolean
+        Boolean valueBoolean = true;
+        expectedValue = 1f;
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueBoolean + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertTrue(expectedValue == mqttCallback.getMessageArrivedMetrics().get(0).getFloatValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        valueBoolean = false;
+        expectedValue = 0f;
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueBoolean + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertTrue(expectedValue == mqttCallback.getMessageArrivedMetrics().get(0).getFloatValue());
+    }
+
+    protected void processClientWithCorrectAccessTokenPublishNCMD_DoubleType_IfMetricFailedTypeCheck_SendValueOk() throws Exception {
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+        MetricDataType metricDataType = MetricDataType.Double;
+        String metricKey = "MyDouble";
+        Object metricValue = nextDouble();
+        connectionWithNBirth(metricDataType, metricKey, metricValue);
+        Assert.assertTrue("Connection node is failed", client.isConnected());
+        client.subscribeAndWait(NAMESPACE + "/" + groupId + "/" + NCMD.name() + "/" + edgeNode + "/#", MqttQoS.AT_MOST_ONCE);
+
+        // Double <-> String
+        String valueStr = "123345456";
+        double expectedValue = Double.valueOf(valueStr);
+
+        String SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueStr + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertTrue(expectedValue == mqttCallback.getMessageArrivedMetrics().get(0).getDoubleValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        // Double <-> Boolean
+        Boolean valueBoolean = true;
+        expectedValue = 1d;
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueBoolean + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertTrue(expectedValue == mqttCallback.getMessageArrivedMetrics().get(0).getDoubleValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        valueBoolean = false;
+        expectedValue = 0d;
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueBoolean + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertTrue(expectedValue == mqttCallback.getMessageArrivedMetrics().get(0).getDoubleValue());
+    }
+
+    protected void processClientWithCorrectAccessTokenPublishNCMD_StringType_IfMetricFailedTypeCheck_SendValueOk() throws Exception {
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+        MetricDataType metricDataType = MetricDataType.String;
+        String metricKey = "MyString";
+        Object metricValue = nextString();
+        connectionWithNBirth(metricDataType, metricKey, metricValue);
+        Assert.assertTrue("Connection node is failed", client.isConnected());
+        client.subscribeAndWait(NAMESPACE + "/" + groupId + "/" + NCMD.name() + "/" + edgeNode + "/#", MqttQoS.AT_MOST_ONCE);
+
+        // String <-> Long
+        long valueLong = 123345456L;
+        String expectedValue = String.valueOf(valueLong);
+
+        String SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueLong + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getStringValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        // String <-> Boolean
+        Boolean valueBoolean = true;
+        expectedValue = "true";
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueBoolean + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getStringValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        valueBoolean = false;
+        expectedValue = "false";
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricKey + "\":" + valueBoolean + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricKey, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getStringValue());
+    }
+
+    protected void processClientDeviceWithCorrectAccessTokenPublishWithBirth_SharedAttribute() throws Exception {
+        long ts = calendar.getTimeInMillis();
+        List<Device> devices = connectClientWithCorrectAccessTokenWithNDEATHCreatedDevices(1, ts);
+
+        // Integer <-> Integer
+        int expectedValueInt = 123456;
+
+        String SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricBirthName_Int32 + "\":" + expectedValueInt + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + devices.get(0).getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.DBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricBirthName_Int32, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(metricBirthName_Int32, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValueInt, mqttCallback.getMessageArrivedMetrics().get(0).getIntValue());
+    }
+
+    protected void processClientDeviceWithCorrectAccessTokenPublishWithBirth_SharedAttributes_LongType_IfMetricFailedTypeCheck_SendValueOk() throws Exception {
+        long ts = calendar.getTimeInMillis();
+        List<Device> devices = connectClientWithCorrectAccessTokenWithNDEATHCreatedDevices(1, ts);
+
+        // Int <-> String
+        String valueStr = "123";
+        long expectedValue = Long.valueOf(valueStr);
+
+        String SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricBirthName_Int32 + "\":" + valueStr + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + devices.get(0).getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.DBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricBirthName_Int32, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getIntValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        // Int <-> Boolean
+        Boolean valueBoolean = true;
+        expectedValue = 1;
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricBirthName_Int32 + "\":" + valueBoolean + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + devices.get(0).getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricBirthName_Int32, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getIntValue());
+        mqttCallback.deleteMessageArrivedMetrics(0);
+
+        valueBoolean = false;
+        expectedValue = 0;
+        SHARED_ATTRIBUTES_PAYLOAD = "{\"" + metricBirthName_Int32 + "\":" + valueBoolean + "}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + devices.get(0).getId().getId() + "/attributes/SHARED_SCOPE", SHARED_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(metricBirthName_Int32, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertEquals(expectedValue, mqttCallback.getMessageArrivedMetrics().get(0).getIntValue());
+    }
+
+    protected void processClientNodeWithCorrectAccessTokenPublish_AttributesInProfileContainsKeyAttributes() throws Exception {
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+        connectionWithNBirth(metricBirthDataType_Int32, metricBirthName_Int32, nextInt32());
+        String urlTemplate = "/api/plugins/telemetry/DEVICE/" + savedGateway.getId().getId() + "/keys/attributes/" + CLIENT_SCOPE;
+        AtomicReference<List<String>> actualKeys = new AtomicReference<>();
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    actualKeys.set(doGetAsyncTyped(urlTemplate, new TypeReference<>() {
+                    }));
+                    return actualKeys.get().size() == 1;
+                });
+        Assert.assertEquals(metricBirthName_Int32, actualKeys.get().get(0));
+    }
+
+    protected void processClientDeviceWithCorrectAccessTokenPublish_AttributesInProfileContainsKeyAttributes() throws Exception {
+        long ts = calendar.getTimeInMillis();
+        List<Device> devices = connectClientWithCorrectAccessTokenWithNDEATHCreatedDevices(1, ts);
+        String urlTemplate = "/api/plugins/telemetry/DEVICE/" + devices.get(0).getId().getId() + "/keys/attributes/" + CLIENT_SCOPE;
+        AtomicReference<List<String>> actualKeys = new AtomicReference<>();
+        await(alias + SparkplugMessageType.DBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    actualKeys.set(doGetAsyncTyped(urlTemplate, new TypeReference<>() {
+                    }));
+                    return actualKeys.get().size() == 1;
+                });
+        Assert.assertEquals(metricBirthName_Int32, actualKeys.get().get(0));
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/attributes/MqttV5ClientSparkplugBAttributesInProfileTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/attributes/MqttV5ClientSparkplugBAttributesInProfileTest.java
new file mode 100644
index 0000000000..1d5a2c127f
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/attributes/MqttV5ClientSparkplugBAttributesInProfileTest.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.sparkplug.attributes;
+
+import org.eclipse.paho.mqttv5.common.MqttException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+import java.util.HashSet;
+
+/**
+ * Created by nickAS21 on 12.01.23
+ */
+@DaoSqlTest
+public class MqttV5ClientSparkplugBAttributesInProfileTest extends AbstractMqttV5ClientSparkplugAttributesTest {
+
+    @Before
+    public void beforeTest() throws Exception {
+        sparkplugAttributesMetricNames = new HashSet<>();
+        sparkplugAttributesMetricNames.add(metricBirthName_Int32);
+        beforeSparkplugTest();
+    }
+
+    @After
+    public void afterTest () throws MqttException {
+        if (client.isConnected()) {
+            client.disconnect();        }
+    }
+
+    @Test
+    public void testClientNodeWithCorrectAccessTokenPublish_AttributesInProfileContainsKeyAttributes() throws Exception {
+        processClientNodeWithCorrectAccessTokenPublish_AttributesInProfileContainsKeyAttributes();
+    }
+
+    @Test
+    public void testClientDeviceWithCorrectAccessTokenPublish_AttributesInProfileContainsKeyAttributes() throws Exception {
+        processClientDeviceWithCorrectAccessTokenPublish_AttributesInProfileContainsKeyAttributes();
+    }
+
+}
\ No newline at end of file
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/attributes/MqttV5ClientSparkplugBAttributesTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/attributes/MqttV5ClientSparkplugBAttributesTest.java
new file mode 100644
index 0000000000..f5d42046b7
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/attributes/MqttV5ClientSparkplugBAttributesTest.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.sparkplug.attributes;
+
+import org.eclipse.paho.mqttv5.common.MqttException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+/**
+ * Created by nickAS21 on 12.01.23
+ */
+@DaoSqlTest
+public class MqttV5ClientSparkplugBAttributesTest extends AbstractMqttV5ClientSparkplugAttributesTest {
+
+    @Before
+    public void beforeTest() throws Exception {
+        beforeSparkplugTest();
+    }
+
+    @After
+    public void afterTest () throws MqttException {
+        if (client.isConnected()) {
+            client.disconnect();        }
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenPublishNCMDReBirth() throws Exception {
+        processClientWithCorrectAccessTokenPublishNCMDReBirth();
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenPublishNCMD_BooleanType_IfMetricFailedTypeCheck_SendValueOk() throws Exception {
+        processClientWithCorrectAccessTokenPublishNCMD_BooleanType_IfMetricFailedTypeCheck_SendValueOk();
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenPublishNCMD_LongType_IfMetricFailedTypeCheck_SendValueOk() throws Exception {
+        processClientWithCorrectAccessTokenPublishNCMD_LongType_IfMetricFailedTypeCheck_SendValueOk();
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenPublishNCMD_FloatType_IfMetricFailedTypeCheck_SendValueOk() throws Exception {
+        processClientWithCorrectAccessTokenPublishNCMD_FloatType_IfMetricFailedTypeCheck_SendValueOk();
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenPublishNCMD_DoubleType_IfMetricFailedTypeCheck_SendValueOk() throws Exception {
+        processClientWithCorrectAccessTokenPublishNCMD_DoubleType_IfMetricFailedTypeCheck_SendValueOk();
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenPublishNCMD_StringType_IfMetricFailedTypeCheck_SendValueOk() throws Exception {
+        processClientWithCorrectAccessTokenPublishNCMD_StringType_IfMetricFailedTypeCheck_SendValueOk();
+    }
+
+    @Test
+    public void testClientDeviceWithCorrectAccessTokenPublishWithBirth_SharedAttribute() throws Exception {
+        processClientDeviceWithCorrectAccessTokenPublishWithBirth_SharedAttribute();
+    }
+
+    @Test
+    public void testClientDeviceWithCorrectAccessTokenPublishWithBirth_SharedAttributes_LongType_IfMetricFailedTypeCheck_SendValueOk() throws Exception {
+        processClientDeviceWithCorrectAccessTokenPublishWithBirth_SharedAttributes_LongType_IfMetricFailedTypeCheck_SendValueOk();
+    }
+
+}
\ No newline at end of file
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/connection/AbstractMqttV5ClientSparkplugConnectionTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/connection/AbstractMqttV5ClientSparkplugConnectionTest.java
new file mode 100644
index 0000000000..5f9b794739
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/connection/AbstractMqttV5ClientSparkplugConnectionTest.java
@@ -0,0 +1,178 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.sparkplug.connection;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.mqttv5.common.MqttException;
+import org.junit.Assert;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.LongDataEntry;
+import org.thingsboard.server.common.data.kv.StringDataEntry;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.gen.transport.mqtt.SparkplugBProto;
+import org.thingsboard.server.transport.mqtt.mqttv5.MqttV5TestClient;
+import org.thingsboard.server.transport.mqtt.sparkplug.AbstractMqttV5ClientSparkplugTest;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.awaitility.Awaitility.await;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugConnectionState.OFFLINE;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugConnectionState.ONLINE;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType.STATE;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType.messageName;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugTopicUtil.NAMESPACE;
+
+/**
+ * Created by nickAS21 on 12.01.23
+ */
+@Slf4j
+public abstract class AbstractMqttV5ClientSparkplugConnectionTest extends AbstractMqttV5ClientSparkplugTest {
+
+    protected void processClientWithCorrectNodeAccessTokenWithNDEATH_Test() throws Exception {
+        long ts = calendar.getTimeInMillis() - PUBLISH_TS_DELTA_MS;
+        long value = bdSeq = 0;
+        clientWithCorrectNodeAccessTokenWithNDEATH(ts, value);
+
+        String keys = SparkplugMessageType.NDEATH.name() + " " + keysBdSeq;
+        TsKvEntry expectedTsKvEntry = new BasicTsKvEntry(ts, new LongDataEntry(keys, value));
+        AtomicReference<ListenableFuture<Optional<TsKvEntry>>> finalFuture = new AtomicReference<>();
+        await(alias + SparkplugMessageType.NDEATH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    finalFuture.set(tsService.findLatest(tenantId, savedGateway.getId(), keys));
+                    return finalFuture.get().get().isPresent();
+                });
+        TsKvEntry actualTsKvEntry = finalFuture.get().get().get();
+        Assert.assertEquals(expectedTsKvEntry, actualTsKvEntry);
+    }
+
+    protected void processClientWithCorrectNodeAccessTokenWithoutNDEATH_Test() throws Exception {
+        this.client = new MqttV5TestClient();
+        MqttException actualException = Assert.assertThrows(MqttException.class, () -> client.connectAndWait(gatewayAccessToken));
+        String expectedMessage = "Server unavailable.";
+        int expectedReasonCode = 136;
+        Assert.assertEquals(expectedMessage, actualException.getMessage());
+        Assert.assertEquals(expectedReasonCode, actualException.getReasonCode());
+    }
+
+    protected void processClientWithCorrectNodeAccessTokenNameSpaceInvalid_Test() throws Exception {
+        long ts = calendar.getTimeInMillis() - PUBLISH_TS_DELTA_MS;
+        long value = bdSeq = 0;
+        MqttException actualException = Assert.assertThrows(MqttException.class, () -> clientConnectWithNDEATH(ts, value, "spBv1.2"));
+        String expectedMessage = "Server unavailable.";
+        int expectedReasonCode = 136;
+        Assert.assertEquals(expectedMessage, actualException.getMessage());
+        Assert.assertEquals(expectedReasonCode, actualException.getReasonCode());
+    }
+
+    protected void processClientWithCorrectAccessTokenWithNDEATHCreatedDevices(int cntDevices) throws Exception {
+        long ts = calendar.getTimeInMillis();
+        connectClientWithCorrectAccessTokenWithNDEATHCreatedDevices(cntDevices, ts);
+    }
+
+    protected void processConnectClientWithCorrectAccessTokenWithNDEATH_State_ONLINE_ALL(int cntDevices) throws Exception {
+        long ts = calendar.getTimeInMillis();
+        List<Device> devices = connectClientWithCorrectAccessTokenWithNDEATHCreatedDevices(cntDevices, ts);
+
+        TsKvEntry tsKvEntry = new BasicTsKvEntry(ts, new StringDataEntry(messageName(STATE), ONLINE.name()));
+        AtomicReference<ListenableFuture<List<TsKvEntry>>> finalFuture = new AtomicReference<>();
+        await(alias + messageName(STATE) + ", device: " + savedGateway.getName())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    finalFuture.set(tsService.findAllLatest(tenantId, savedGateway.getId()));
+                    return finalFuture.get().get().contains(tsKvEntry);
+                });
+
+        for (Device device : devices) {
+            await(alias + messageName(STATE) + ", device: " + device.getName())
+                    .atMost(40, TimeUnit.SECONDS)
+                    .until(() -> {
+                        finalFuture.set(tsService.findAllLatest(tenantId, device.getId()));
+                        return finalFuture.get().get().contains(tsKvEntry);
+                    });
+        }
+    }
+
+    protected void processConnectClientWithCorrectAccessTokenWithNDEATH_State_ONLINE_All_Then_OneDeviceOFFLINE(int cntDevices, int indexDeviceDisconnect) throws Exception {
+        long ts = calendar.getTimeInMillis();
+        List<Device> devices = connectClientWithCorrectAccessTokenWithNDEATHCreatedDevices(cntDevices, ts);
+
+        TsKvEntry tsKvEntry = new BasicTsKvEntry(ts, new StringDataEntry(messageName(STATE), OFFLINE.name()));
+        AtomicReference<ListenableFuture<List<TsKvEntry>>> finalFuture = new AtomicReference<>();
+
+        SparkplugBProto.Payload.Builder payloadDeathDevice = SparkplugBProto.Payload.newBuilder()
+                .setTimestamp(ts)
+                .setSeq(getSeqNum());
+        if (client.isConnected()) {
+            List<Device> devicesList = new ArrayList<>(devices);
+            Device device =  devicesList.get(indexDeviceDisconnect);
+            client.publish(NAMESPACE + "/" + groupId + "/" + SparkplugMessageType.DDEATH.name() + "/" + edgeNode + "/" + device.getName(),
+                    payloadDeathDevice.build().toByteArray(), 0, false);
+            await(alias + messageName(STATE) + ", device: " + device.getName())
+                    .atMost(40, TimeUnit.SECONDS)
+                    .until(() -> {
+                        finalFuture.set(tsService.findAllLatest(tenantId, device.getId()));
+                        return findEqualsKeyValueInKvEntrys(finalFuture.get().get(), tsKvEntry);
+                    });
+        }
+    }
+
+    protected void processConnectClientWithCorrectAccessTokenWithNDEATH_State_ONLINE_All_Then_OFFLINE_All(int cntDevices) throws Exception {
+        long ts = calendar.getTimeInMillis();
+        List<Device> devices = connectClientWithCorrectAccessTokenWithNDEATHCreatedDevices(cntDevices, ts);
+
+        TsKvEntry tsKvEntry = new BasicTsKvEntry(ts, new StringDataEntry(messageName(STATE), OFFLINE.name()));
+        AtomicReference<ListenableFuture<List<TsKvEntry>>> finalFuture = new AtomicReference<>();
+
+        if (client.isConnected()) {
+            client.disconnect();
+
+            await(alias + messageName(STATE) + ", device: " + savedGateway.getName())
+                    .atMost(40, TimeUnit.SECONDS)
+                    .until(() -> {
+                        finalFuture.set(tsService.findAllLatest(tenantId, savedGateway.getId()));
+                        return findEqualsKeyValueInKvEntrys(finalFuture.get().get(), tsKvEntry);
+                    });
+
+            List<Device> devicesList = new ArrayList<>(devices);
+            for (Device device : devicesList) {
+                await(alias + messageName(STATE) + ", device: " + device.getName())
+                        .atMost(40, TimeUnit.SECONDS)
+                        .until(() -> {
+                            finalFuture.set(tsService.findAllLatest(tenantId, device.getId()));
+                            return findEqualsKeyValueInKvEntrys(finalFuture.get().get(), tsKvEntry);
+                        });
+            }
+        }
+    }
+
+    private boolean findEqualsKeyValueInKvEntrys(List<TsKvEntry> finalFuture, TsKvEntry tsKvEntry) {
+        for (TsKvEntry kvEntry : finalFuture) {
+            if (kvEntry.getKey().equals(tsKvEntry.getKey()) && kvEntry.getValue().equals(tsKvEntry.getValue())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/connection/MqttV5ClientSparkplugBConnectionTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/connection/MqttV5ClientSparkplugBConnectionTest.java
new file mode 100644
index 0000000000..71c9391a29
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/connection/MqttV5ClientSparkplugBConnectionTest.java
@@ -0,0 +1,82 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.sparkplug.connection;
+
+import org.eclipse.paho.mqttv5.common.MqttException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+/**
+ * Created by nickAS21 on 12.01.23
+ */
+@DaoSqlTest
+public class MqttV5ClientSparkplugBConnectionTest extends AbstractMqttV5ClientSparkplugConnectionTest {
+
+    @Before
+    public void beforeTest() throws Exception {
+        beforeSparkplugTest();
+    }
+
+    @After
+    public void afterTest() throws MqttException {
+        if (client.isConnected()) {
+            client.disconnect();
+        }
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenWithNDEATH() throws Exception {
+        processClientWithCorrectNodeAccessTokenWithNDEATH_Test();
+    }
+
+    @Test
+    public void testClientWithCorrectNodeAccessTokenWithoutNDEATH() throws Exception {
+        processClientWithCorrectNodeAccessTokenWithoutNDEATH_Test();
+    }
+
+    @Test
+    public void testClientWithCorrectNodeAccessTokenNameSpaceInvalid() throws Exception {
+        processClientWithCorrectNodeAccessTokenNameSpaceInvalid_Test();
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenWithNDEATHCreatedOneDevice() throws Exception {
+        processClientWithCorrectAccessTokenWithNDEATHCreatedDevices(1);
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenWithNDEATHCreatedTwoDevice() throws Exception {
+        processClientWithCorrectAccessTokenWithNDEATHCreatedDevices(2);
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenWithNDEATH_State_ONLINE_ALL() throws Exception {
+        processConnectClientWithCorrectAccessTokenWithNDEATH_State_ONLINE_ALL(3);
+    }
+
+    @Test
+    public void testConnectClientWithCorrectAccessTokenWithNDEATH_State_ONLINE_All_Then_OneDeviceOFFLINE() throws Exception {
+        processConnectClientWithCorrectAccessTokenWithNDEATH_State_ONLINE_All_Then_OneDeviceOFFLINE(3, 1);
+    }
+
+    @Test
+    public void testConnectClientWithCorrectAccessTokenWithNDEATH_State_ONLINE_All_Then_OFFLINE_All() throws Exception {
+        processConnectClientWithCorrectAccessTokenWithNDEATH_State_ONLINE_All_Then_OFFLINE_All(3);
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/rpc/AbstractMqttV5RpcSparkplugTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/rpc/AbstractMqttV5RpcSparkplugTest.java
new file mode 100644
index 0000000000..b08baac875
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/rpc/AbstractMqttV5RpcSparkplugTest.java
@@ -0,0 +1,108 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.sparkplug.rpc;
+
+import io.netty.handler.codec.mqtt.MqttQoS;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Assert;
+import org.junit.Test;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.transport.mqtt.sparkplug.AbstractMqttV5ClientSparkplugTest;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static org.awaitility.Awaitility.await;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.thingsboard.server.common.data.exception.ThingsboardErrorCode.INVALID_ARGUMENTS;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType.DCMD;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType.NCMD;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugTopicUtil.NAMESPACE;
+
+@Slf4j
+public abstract class AbstractMqttV5RpcSparkplugTest  extends AbstractMqttV5ClientSparkplugTest {
+
+    private static final int metricBirthValue_Int32 = 123456;
+    private static final String sparkplugRpcRequest = "{\"metricName\":\"" + metricBirthName_Int32 + "\",\"value\":" + metricBirthValue_Int32 + "}";
+
+    @Test
+    public void processClientNodeWithCorrectAccessTokenPublish_TwoWayRpc_Success() throws Exception {
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+        connectionWithNBirth(metricBirthDataType_Int32, metricBirthName_Int32, nextInt32());
+        Assert.assertTrue("Connection node is failed", client.isConnected());
+        client.subscribeAndWait(NAMESPACE + "/" + groupId + "/" + NCMD.name() + "/" + edgeNode + "/#", MqttQoS.AT_MOST_ONCE);
+        String expected = "{\"result\":\"Success: " + SparkplugMessageType.NCMD.name() + "\"}";
+        String actual = sendRPCSparkplug(NCMD.name(), sparkplugRpcRequest, savedGateway);
+        await(alias + SparkplugMessageType.NCMD.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(expected, actual);
+        Assert.assertEquals(metricBirthName_Int32, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertTrue(metricBirthValue_Int32 == mqttCallback.getMessageArrivedMetrics().get(0).getIntValue());
+    }
+
+    @Test
+    public void processClientDeviceWithCorrectAccessTokenPublish_TwoWayRpc_Success() throws Exception {
+        long ts = calendar.getTimeInMillis();
+        List<Device> devices = connectClientWithCorrectAccessTokenWithNDEATHCreatedDevices(1, ts);
+        String expected = "{\"result\":\"Success: " + DCMD.name() + "\"}";
+        String actual = sendRPCSparkplug(DCMD.name() , sparkplugRpcRequest, devices.get(0));
+        await(alias + NCMD.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    return mqttCallback.getMessageArrivedMetrics().size() == 1;
+                });
+        Assert.assertEquals(expected, actual);
+        Assert.assertEquals(metricBirthName_Int32, mqttCallback.getMessageArrivedMetrics().get(0).getName());
+        Assert.assertTrue(metricBirthValue_Int32 == mqttCallback.getMessageArrivedMetrics().get(0).getIntValue());
+    }
+
+    @Test
+    public void processClientNodeWithCorrectAccessTokenPublish_TwoWayRpc_InvalidTypeMessage_INVALID_ARGUMENTS() throws Exception {
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+        connectionWithNBirth(metricBirthDataType_Int32, metricBirthName_Int32, nextInt32());
+        Assert.assertTrue("Connection node is failed", client.isConnected());
+        client.subscribeAndWait(NAMESPACE + "/" + groupId + "/" + NCMD.name() + "/" + edgeNode + "/#", MqttQoS.AT_MOST_ONCE);
+        String invalidateTypeMessageName = "RCMD";
+        String expected = "{\"result\":\"" + INVALID_ARGUMENTS + "\",\"error\":\"Failed to convert device RPC command to MQTT msg: " +
+                invalidateTypeMessageName + "{\\\"metricName\\\":\\\"" + metricBirthName_Int32 + "\\\",\\\"value\\\":" + metricBirthValue_Int32 + "}\"}";
+        String actual = sendRPCSparkplug(invalidateTypeMessageName, sparkplugRpcRequest, savedGateway);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void processClientNodeWithCorrectAccessTokenPublish_TwoWayRpc_InBirthNotHaveMetric_BAD_REQUEST_PARAMS() throws Exception {
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+        connectionWithNBirth(metricBirthDataType_Int32, metricBirthName_Int32, nextInt32());
+        Assert.assertTrue("Connection node is failed", client.isConnected());
+        client.subscribeAndWait(NAMESPACE + "/" + groupId + "/" + NCMD.name() + "/" + edgeNode + "/#", MqttQoS.AT_MOST_ONCE);
+        String metricNameBad = metricBirthName_Int32 + "_Bad";
+        String sparkplugRpcRequestBad = "{\"metricName\":\"" + metricNameBad + "\",\"value\":" + metricBirthValue_Int32 + "}";
+        String expected = "{\"result\":\"BAD_REQUEST_PARAMS\",\"error\":\"Failed send To Node Rpc Request: " +
+                DCMD.name() + ". This node does not have a metricName: [" + metricNameBad + "]\"}";
+        String actual = sendRPCSparkplug(DCMD.name(), sparkplugRpcRequestBad, savedGateway);
+        Assert.assertEquals(expected, actual);
+     }
+
+    private String sendRPCSparkplug(String nameTypeMessage, String keyValue, Device device) throws Exception {
+        String setRpcRequest = "{\"method\": \"" + nameTypeMessage + "\", \"params\": " + keyValue + "}";
+        return doPostAsync("/api/plugins/rpc/twoway/" + device.getId().getId(), setRpcRequest, String.class, status().isOk());
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/rpc/MqttV5RpcSparkplugTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/rpc/MqttV5RpcSparkplugTest.java
new file mode 100644
index 0000000000..9f568b550f
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/rpc/MqttV5RpcSparkplugTest.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.sparkplug.rpc;
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.mqttv5.common.MqttException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+@DaoSqlTest
+@Slf4j
+public class MqttV5RpcSparkplugTest  extends AbstractMqttV5RpcSparkplugTest {
+
+    @Before
+    public void beforeTest() throws Exception {
+        beforeSparkplugTest();
+    }
+
+    @After
+    public void afterTest() throws MqttException {
+        if (client.isConnected()) {
+            client.disconnect();
+        }
+    }
+
+    @Test
+    public void testClientNodeWithCorrectAccessTokenPublish_TwoWayRpc_Success() throws Exception {
+        processClientNodeWithCorrectAccessTokenPublish_TwoWayRpc_Success();
+    }
+
+    @Test
+    public void testClientDeviceWithCorrectAccessTokenPublish_TwoWayRpc_Success() throws Exception {
+        processClientDeviceWithCorrectAccessTokenPublish_TwoWayRpc_Success();
+    }
+
+    @Test
+    public void testClientNodeWithCorrectAccessTokenPublish_TwoWayRpc_InvalidTypeMessage_INVALID_ARGUMENTS() throws Exception {
+        processClientNodeWithCorrectAccessTokenPublish_TwoWayRpc_InvalidTypeMessage_INVALID_ARGUMENTS();
+    }
+
+    @Test
+    public void testClientNodeWithCorrectAccessTokenPublish_TwoWayRpc_InBirthNotHaveMetric_BAD_REQUEST_PARAMS() throws Exception {
+        processClientNodeWithCorrectAccessTokenPublish_TwoWayRpc_InvalidTypeMessage_INVALID_ARGUMENTS();
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/timeseries/AbstractMqttV5ClientSparkplugTelemetryTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/timeseries/AbstractMqttV5ClientSparkplugTelemetryTest.java
new file mode 100644
index 0000000000..587494f869
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/timeseries/AbstractMqttV5ClientSparkplugTelemetryTest.java
@@ -0,0 +1,113 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.sparkplug.timeseries;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Assert;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.gen.transport.mqtt.SparkplugBProto;
+import org.thingsboard.server.transport.mqtt.sparkplug.AbstractMqttV5ClientSparkplugTest;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.awaitility.Awaitility.await;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugTopicUtil.NAMESPACE;
+
+/**
+ * Created by nickAS21 on 12.01.23
+ */
+@Slf4j
+public abstract class AbstractMqttV5ClientSparkplugTelemetryTest extends AbstractMqttV5ClientSparkplugTest {
+
+    protected void processClientWithCorrectAccessTokenPublishNBIRTH() throws Exception {
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+        List<String> listKeys = connectionWithNBirth(metricBirthDataType_Int32, metricBirthName_Int32, nextInt32());
+        Assert.assertTrue("Connection node is failed", client.isConnected());
+        AtomicReference<ListenableFuture<List<TsKvEntry>>> finalFuture = new AtomicReference<>();
+        await(alias + SparkplugMessageType.NBIRTH.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    finalFuture.set(tsService.findLatest(tenantId, savedGateway.getId(), listKeys));
+                    return !finalFuture.get().get().isEmpty();
+                });
+        Assert.assertEquals(listKeys.size(), finalFuture.get().get().size());
+    }
+
+    protected void processClientWithCorrectAccessTokenPushNodeMetricBuildPrimitiveSimple() throws Exception {
+        List<String> listKeys = new ArrayList<>();
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+
+        String messageTypeName = SparkplugMessageType.NDATA.name();
+
+        List<TsKvEntry> listTsKvEntry = new ArrayList<>();
+
+        SparkplugBProto.Payload.Builder ndataPayload = SparkplugBProto.Payload.newBuilder()
+                .setTimestamp(calendar.getTimeInMillis())
+                .setSeq(getSeqNum());
+        long ts = calendar.getTimeInMillis() - PUBLISH_TS_DELTA_MS;
+
+        createdAddMetricValuePrimitiveTsKv(listTsKvEntry, listKeys, ndataPayload, ts);
+
+        if (client.isConnected()) {
+            client.publish(NAMESPACE + "/" + groupId + "/" + messageTypeName + "/" + edgeNode,
+                    ndataPayload.build().toByteArray(), 0, false);
+        }
+
+        AtomicReference<ListenableFuture<List<TsKvEntry>>> finalFuture = new AtomicReference<>();
+        await(alias + SparkplugMessageType.NDATA.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    finalFuture.set(tsService.findAllLatest(tenantId, savedGateway.getId()));
+                    return finalFuture.get().get().size() == (listTsKvEntry.size() + 1);
+                });
+        Assert.assertTrue("Actual tsKvEntrys is not containsAll Expected tsKvEntrys", finalFuture.get().get().containsAll(listTsKvEntry));
+    }
+
+    protected void processClientWithCorrectAccessTokenPushNodeMetricBuildArraysPrimitiveSimple() throws Exception {
+        clientWithCorrectNodeAccessTokenWithNDEATH();
+
+        String messageTypeName = SparkplugMessageType.NDATA.name();
+        List<String> listKeys = new ArrayList<>();
+        List<TsKvEntry> listTsKvEntry = new ArrayList<>();
+
+        SparkplugBProto.Payload.Builder ndataPayload = SparkplugBProto.Payload.newBuilder()
+                .setTimestamp(calendar.getTimeInMillis())
+                .setSeq(getSeqNum());
+        long ts = calendar.getTimeInMillis() - PUBLISH_TS_DELTA_MS;
+
+        createdAddMetricValueArraysPrimitiveTsKv(listTsKvEntry, listKeys, ndataPayload, ts);
+
+        if (client.isConnected()) {
+            client.publish(NAMESPACE + "/" + groupId + "/" + messageTypeName + "/" + edgeNode,
+                    ndataPayload.build().toByteArray(), 0, false);
+        }
+
+        AtomicReference<ListenableFuture<List<TsKvEntry>>> finalFuture = new AtomicReference<>();
+        await(alias + SparkplugMessageType.NDATA.name())
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    finalFuture.set(tsService.findAllLatest(tenantId, savedGateway.getId()));
+                    return finalFuture.get().get().size() == (listTsKvEntry.size() + 1);
+                });
+        Assert.assertTrue("Actual tsKvEntrys is not containsAll Expected tsKvEntrys", finalFuture.get().get().containsAll(listTsKvEntry));
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/timeseries/MqttV5ClientSparkplugBTelemetryTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/timeseries/MqttV5ClientSparkplugBTelemetryTest.java
new file mode 100644
index 0000000000..bdd6c7b9b3
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/timeseries/MqttV5ClientSparkplugBTelemetryTest.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.sparkplug.timeseries;
+
+import org.eclipse.paho.mqttv5.common.MqttException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+/**
+ * Created by nickAS21 on 12.01.23
+ */
+@DaoSqlTest
+public class MqttV5ClientSparkplugBTelemetryTest extends AbstractMqttV5ClientSparkplugTelemetryTest {
+
+    @Before
+    public void beforeTest() throws Exception {
+        beforeSparkplugTest();
+    }
+
+    @After
+    public void afterTest () throws MqttException {
+        if (client.isConnected()) {
+            client.disconnect();        }
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenPublishNBIRTH() throws Exception {
+        processClientWithCorrectAccessTokenPublishNBIRTH();
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenPushNodeMetricBuildPrimitiveSimple() throws Exception {
+        processClientWithCorrectAccessTokenPushNodeMetricBuildPrimitiveSimple();
+    }
+
+    @Test
+    public void testClientWithCorrectAccessTokenPushNodeMetricBuildPArraysPrimitiveSimple() throws Exception {
+        processClientWithCorrectAccessTokenPushNodeMetricBuildArraysPrimitiveSimple();
+    }
+
+}
\ No newline at end of file
diff --git a/application/src/test/resources/application-test.properties b/application/src/test/resources/application-test.properties
index a4bedd9527..ad86ff736b 100644
--- a/application/src/test/resources/application-test.properties
+++ b/application/src/test/resources/application-test.properties
@@ -67,4 +67,3 @@ sql.ttl.audit_logs.ttl=2592000
 
 sql.edge_events.partition_size=168
 sql.ttl.edge_events.edge_event_ttl=2592000
-spring.test.context.cache.maxSize=1
\ No newline at end of file
diff --git a/application/src/test/resources/logback-test.xml b/application/src/test/resources/logback-test.xml
index c79a7d3905..23e6d8c2f6 100644
--- a/application/src/test/resources/logback-test.xml
+++ b/application/src/test/resources/logback-test.xml
@@ -13,10 +13,11 @@
     <logger name="org.springframework" level="WARN"/>
     <logger name="org.springframework.boot.test" level="WARN"/>
     <logger name="org.apache.cassandra" level="WARN"/>
-    <logger name="org.cassandraunit" level="INFO"/>
+    <logger name="org.testcontainers" level="INFO" />
     <logger name="org.eclipse.leshan" level="INFO"/>
     <logger name="org.thingsboard.server.controller.AbstractWebTest" level="INFO"/>
 
+
     <!-- mute TelemetryEdgeSqlTest that causes a lot of randomly generated errors -->
     <logger name="org.thingsboard.server.service.edge.rpc.EdgeGrpcSession" level="OFF"/>
 
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 a9f262d6ca..c5af954392 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
@@ -108,6 +108,10 @@ public abstract class RedisTbTransactionalCache<K extends Serializable, V extend
 
     @Override
     public void evict(Collection<K> keys) {
+        //Redis expects at least 1 key to delete. Otherwise - ERR wrong number of arguments for 'del' command
+        if (keys.isEmpty()) {
+            return;
+        }
         try (var connection = connectionFactory.getConnection()) {
             connection.del(keys.stream().map(this::getRawKey).toArray(byte[][]::new));
         }
diff --git a/common/cluster-api/src/main/proto/queue.proto b/common/cluster-api/src/main/proto/queue.proto
index d8c55c5917..f4992cbba7 100644
--- a/common/cluster-api/src/main/proto/queue.proto
+++ b/common/cluster-api/src/main/proto/queue.proto
@@ -186,6 +186,7 @@ message GetOrCreateDeviceFromGatewayRequestMsg {
   int64 gatewayIdLSB = 2;
   string deviceName = 3;
   string deviceType = 4;
+  bool sparkplug = 5;
 }
 
 message GetOrCreateDeviceFromGatewayResponseMsg {
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmApiCallResult.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmApiCallResult.java
new file mode 100644
index 0000000000..a8aebf16e7
--- /dev/null
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmApiCallResult.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.alarm;
+
+import lombok.Builder;
+import lombok.Data;
+import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.id.EntityId;
+
+import java.util.List;
+
+
+@Data
+public class AlarmApiCallResult {
+
+    private final boolean successful;
+    private final boolean created;
+    private final boolean modified;
+    private final boolean cleared;
+    private final AlarmInfo alarm;
+    private final Alarm old;
+    private final List<EntityId> propagatedEntitiesList;
+
+    @Builder
+    private AlarmApiCallResult(boolean successful, boolean created, boolean modified, boolean cleared, AlarmInfo alarm, Alarm old, List<EntityId> propagatedEntitiesList) {
+        this.successful = successful;
+        this.created = created;
+        this.modified = modified;
+        this.cleared = cleared;
+        this.alarm = alarm;
+        this.old = old;
+        this.propagatedEntitiesList = propagatedEntitiesList;
+    }
+
+    public AlarmApiCallResult(AlarmApiCallResult other, List<EntityId> propagatedEntitiesList) {
+        this.successful = other.successful;
+        this.created = other.created;
+        this.modified = other.modified;
+        this.cleared = other.cleared;
+        this.alarm = other.alarm;
+        this.old = other.old;
+        this.propagatedEntitiesList = propagatedEntitiesList;
+    }
+
+    public boolean isSeverityChanged() {
+        if (alarm == null || old == null) {
+            return false;
+        } else {
+            return !alarm.getSeverity().equals(old.getSeverity());
+        }
+    }
+
+    public AlarmSeverity getOldSeverity() {
+        return isSeverityChanged() ? old.getSeverity() : null;
+    }
+
+    public boolean isPropagationChanged() {
+        if (created) {
+            return true;
+        }
+        if (alarm == null || old == null) {
+            return false;
+        }
+        return (alarm.isPropagate() != old.isPropagate()) ||
+                (alarm.isPropagateToOwner() != old.isPropagateToOwner()) ||
+                (alarm.isPropagateToTenant() != old.isPropagateToTenant()) ||
+                (!alarm.getPropagateRelationTypes().equals(old.getPropagateRelationTypes()));
+    }
+
+}
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmOperationResult.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmOperationResult.java
index 6125d4a255..e3a05a4e2f 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmOperationResult.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmOperationResult.java
@@ -16,16 +16,20 @@
 package org.thingsboard.server.dao.alarm;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmAssigneeUpdate;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.id.EntityId;
 
 import java.util.Collections;
 import java.util.List;
 
+@Builder
 @Data
 @AllArgsConstructor
+@Deprecated
 public class AlarmOperationResult {
     private final Alarm alarm;
     private final boolean successful;
@@ -40,4 +44,21 @@ public class AlarmOperationResult {
     public AlarmOperationResult(Alarm alarm, boolean successful, List<EntityId> propagatedEntitiesList) {
         this(alarm, successful, false, null, propagatedEntitiesList);
     }
+
+    public AlarmOperationResult(Alarm alarm, boolean successful, boolean created, List<EntityId> propagatedEntitiesList) {
+        this.alarm = alarm;
+        this.successful = successful;
+        this.created = created;
+        this.propagatedEntitiesList = propagatedEntitiesList;
+        this.oldSeverity = null;
+    }
+
+    //Temporary while we have not removed the AlarmOperationResult.
+    public AlarmOperationResult(AlarmApiCallResult result) {
+        this.alarm = result.getAlarm() != null ? new Alarm(result.getAlarm()) : null;
+        this.successful = result.isSuccessful() && (result.isCreated() || result.isModified());
+        this.created = result.isCreated();
+        this.oldSeverity = result.getOldSeverity();
+        this.propagatedEntitiesList = result.getPropagatedEntitiesList();
+    }
 }
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java
index 2c60c41062..ad2aa1814f 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java
@@ -23,10 +23,13 @@ import org.thingsboard.server.common.data.alarm.AlarmQuery;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
 import org.thingsboard.server.common.data.id.AlarmId;
 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.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
@@ -34,35 +37,76 @@ import org.thingsboard.server.dao.entity.EntityDaoService;
 
 import java.util.Collection;
 
-/**
- * Created by ashvayka on 11.05.17.
- */
+
 public interface AlarmService extends EntityDaoService {
 
+    /*
+     *  New API, since 3.5.
+     */
+
+    /**
+     * Designed for atomic operations over active alarms.
+     * Only one active alarm may exist for the pair {originatorId, alarmType}
+     */
+    AlarmApiCallResult createAlarm(AlarmCreateOrUpdateActiveRequest request);
+
+    /**
+     * Designed for atomic operations over active alarms.
+     * Only one active alarm may exist for the pair {originatorId, alarmType}
+     */
+    AlarmApiCallResult createAlarm(AlarmCreateOrUpdateActiveRequest request, boolean alarmCreationEnabled);
+
+    /**
+     * Designed to update existing alarm. Accepts only part of the alarm fields.
+     */
+    AlarmApiCallResult updateAlarm(AlarmUpdateRequest request);
+
+    AlarmApiCallResult acknowledgeAlarm(TenantId tenantId, AlarmId alarmId, long ackTs);
+
+    AlarmApiCallResult clearAlarm(TenantId tenantId, AlarmId alarmId, long clearTs, JsonNode details);
+
+    AlarmApiCallResult assignAlarm(TenantId tenantId, AlarmId alarmId, UserId assigneeId, long ts);
+
+    AlarmApiCallResult unassignAlarm(TenantId tenantId, AlarmId alarmId, long ts);
+
+    AlarmApiCallResult delAlarm(TenantId tenantId, AlarmId alarmId);
+
+    /*
+     *  Legacy API, before 3.5.
+     */
+    @Deprecated(since = "3.5.0", forRemoval = true)
     AlarmOperationResult createOrUpdateAlarm(Alarm alarm);
 
+    @Deprecated(since = "3.5.0", forRemoval = true)
     AlarmOperationResult createOrUpdateAlarm(Alarm alarm, boolean alarmCreationEnabled);
 
-    AlarmOperationResult deleteAlarm(TenantId tenantId, AlarmId alarmId);
-
+    @Deprecated(since = "3.5.0", forRemoval = true)
     ListenableFuture<AlarmOperationResult> ackAlarm(TenantId tenantId, AlarmId alarmId, long ackTs);
 
+    @Deprecated(since = "3.5.0", forRemoval = true)
     ListenableFuture<AlarmOperationResult> clearAlarm(TenantId tenantId, AlarmId alarmId, JsonNode details, long clearTs);
 
+    @Deprecated(since = "3.5.0", forRemoval = true)
+    AlarmOperationResult deleteAlarm(TenantId tenantId, AlarmId alarmId);
+
+    @Deprecated(since = "3.5.0", forRemoval = true)
+    ListenableFuture<Alarm> findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type);
+
+    // Other API
     Alarm findAlarmById(TenantId tenantId, AlarmId alarmId);
 
     ListenableFuture<Alarm> findAlarmByIdAsync(TenantId tenantId, AlarmId alarmId);
 
-    ListenableFuture<AlarmInfo> findAlarmInfoByIdAsync(TenantId tenantId, AlarmId alarmId);
+    AlarmInfo findAlarmInfoById(TenantId tenantId, AlarmId alarmId);
 
     ListenableFuture<PageData<AlarmInfo>> findAlarms(TenantId tenantId, AlarmQuery query);
 
     ListenableFuture<PageData<AlarmInfo>> findCustomerAlarms(TenantId tenantId, CustomerId customerId, AlarmQuery query);
 
     AlarmSeverity findHighestAlarmSeverity(TenantId tenantId, EntityId entityId, AlarmSearchStatus alarmSearchStatus,
-                                           AlarmStatus alarmStatus);
+                                           AlarmStatus alarmStatus, String assigneeId);
 
-    ListenableFuture<Alarm> findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type);
+    Alarm findLatestActiveByOriginatorAndType(TenantId tenantId, EntityId originator, String type);
 
     PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId,
                                                         AlarmDataQuery query, Collection<EntityId> orderedEntityIds);
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityService.java
index 9a9e000e4c..f2317efa05 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityService.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.dao.entity;
 
+import org.thingsboard.server.common.data.id.NameLabelAndCustomerDetails;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -29,10 +30,13 @@ public interface EntityService {
 
     Optional<String> fetchEntityName(TenantId tenantId, EntityId entityId);
 
+    Optional<String> fetchEntityLabel(TenantId tenantId, EntityId entityId);
+
     Optional<CustomerId> fetchEntityCustomerId(TenantId tenantId, EntityId entityId);
 
+    Optional<NameLabelAndCustomerDetails> fetchNameLabelAndCustomerDetails(TenantId tenantId, EntityId entityId);
+
     long countEntitiesByQuery(TenantId tenantId, CustomerId customerId, EntityCountQuery query);
 
     PageData<EntityData> findEntityDataByQuery(TenantId tenantId, CustomerId customerId, EntityDataQuery query);
-
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ContactBased.java b/common/data/src/main/java/org/thingsboard/server/common/data/ContactBased.java
index efe92977cc..d8904f03e6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ContactBased.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ContactBased.java
@@ -21,7 +21,7 @@ import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
 @EqualsAndHashCode(callSuper = true)
-public abstract class ContactBased<I extends UUIDBased> extends SearchTextBasedWithAdditionalInfo<I> implements HasName {
+public abstract class ContactBased<I extends UUIDBased> extends SearchTextBasedWithAdditionalInfo<I> implements HasEmail {
 
     private static final long serialVersionUID = 5047448057830660988L;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java b/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
index c9847b0078..d194fb7755 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
@@ -29,7 +29,7 @@ import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
 @EqualsAndHashCode(callSuper = true)
-public class Customer extends ContactBased<CustomerId> implements HasTenantId, ExportableEntity<CustomerId> {
+public class Customer extends ContactBased<CustomerId> implements HasTenantId, ExportableEntity<CustomerId>, HasTitle {
 
     private static final long serialVersionUID = -1599722990298929275L;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java
index e273e1b97e..7c166e53e3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java
@@ -31,7 +31,7 @@ import java.util.Objects;
 import java.util.Set;
 
 @ApiModel
-public class DashboardInfo extends SearchTextBased<DashboardId> implements HasName, HasTenantId {
+public class DashboardInfo extends SearchTextBased<DashboardId> implements HasName, HasTenantId, HasTitle {
 
     private TenantId tenantId;
     @NoXss
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
index 2cc9836864..fd35c0a67a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
@@ -74,6 +74,8 @@ public class DataConstants {
     public static final String TIMESERIES_DELETED = "TIMESERIES_DELETED";
     public static final String ALARM_ACK = "ALARM_ACK";
     public static final String ALARM_CLEAR = "ALARM_CLEAR";
+    public static final String ALARM_ASSIGN = "ALARM_ASSIGN";
+    public static final String ALARM_UNASSIGN = "ALARM_UNASSIGN";
     public static final String ALARM_DELETE = "ALARM_DELETE";
     public static final String ENTITY_ASSIGNED_FROM_TENANT = "ENTITY_ASSIGNED_FROM_TENANT";
     public static final String ENTITY_ASSIGNED_TO_TENANT = "ENTITY_ASSIGNED_TO_TENANT";
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Device.java b/common/data/src/main/java/org/thingsboard/server/common/data/Device.java
index c1517e2230..27457bda34 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/Device.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/Device.java
@@ -40,7 +40,7 @@ import java.util.Optional;
 @ApiModel
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
-public class Device extends SearchTextBasedWithAdditionalInfo<DeviceId> implements HasName, HasTenantId, HasCustomerId, HasOtaPackage, ExportableEntity<DeviceId> {
+public class Device extends SearchTextBasedWithAdditionalInfo<DeviceId> implements HasLabel, HasTenantId, HasCustomerId, HasOtaPackage, ExportableEntity<DeviceId> {
 
     private static final long serialVersionUID = 2807343040519543363L;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
index 4b5bb65bcb..1d547fd60c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
@@ -19,5 +19,25 @@ package org.thingsboard.server.common.data;
  * @author Andrew Shvayka
  */
 public enum EntityType {
-    TENANT, CUSTOMER, USER, DASHBOARD, ASSET, DEVICE, ALARM, RULE_CHAIN, RULE_NODE, ENTITY_VIEW, WIDGETS_BUNDLE, WIDGET_TYPE, TENANT_PROFILE, DEVICE_PROFILE, ASSET_PROFILE, API_USAGE_STATE, TB_RESOURCE, OTA_PACKAGE, EDGE, RPC, QUEUE;
+    TENANT,
+    CUSTOMER,
+    USER,
+    DASHBOARD,
+    ASSET,
+    DEVICE,
+    ALARM,
+    RULE_CHAIN,
+    RULE_NODE,
+    ENTITY_VIEW,
+    WIDGETS_BUNDLE,
+    WIDGET_TYPE,
+    TENANT_PROFILE,
+    DEVICE_PROFILE,
+    ASSET_PROFILE,
+    API_USAGE_STATE,
+    TB_RESOURCE,
+    OTA_PACKAGE,
+    EDGE,
+    RPC,
+    QUEUE
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/HasEmail.java b/common/data/src/main/java/org/thingsboard/server/common/data/HasEmail.java
new file mode 100644
index 0000000000..fd7fbf19fd
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/HasEmail.java
@@ -0,0 +1,22 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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;
+
+public interface HasEmail extends HasName {
+
+    String getEmail();
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/HasLabel.java b/common/data/src/main/java/org/thingsboard/server/common/data/HasLabel.java
new file mode 100644
index 0000000000..fe4f46c9de
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/HasLabel.java
@@ -0,0 +1,22 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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;
+
+public interface HasLabel extends HasName {
+
+    String getLabel();
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/HasTitle.java b/common/data/src/main/java/org/thingsboard/server/common/data/HasTitle.java
new file mode 100644
index 0000000000..aab1c6c346
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/HasTitle.java
@@ -0,0 +1,22 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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;
+
+public interface HasTitle {
+
+    String getTitle();
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
index c917d15910..c468cb24f8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
@@ -36,7 +36,7 @@ import org.thingsboard.server.common.data.ota.OtaPackageType;
 @Slf4j
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class OtaPackageInfo extends SearchTextBasedWithAdditionalInfo<OtaPackageId> implements HasName, HasTenantId {
+public class OtaPackageInfo extends SearchTextBasedWithAdditionalInfo<OtaPackageId> implements HasName, HasTenantId, HasTitle {
 
     private static final long serialVersionUID = 3168391583570815419L;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java b/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
index 6a2b0a58d6..3b38aa57c1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
@@ -18,9 +18,14 @@ package org.thingsboard.server.common.data;
 import com.google.common.base.Splitter;
 import org.apache.commons.lang3.RandomStringUtils;
 
+import java.security.SecureRandom;
+import java.util.Base64;
+
 import static org.apache.commons.lang3.StringUtils.repeat;
 
 public class StringUtils {
+    public static final SecureRandom RANDOM = new SecureRandom();
+
     public static final String EMPTY = "";
 
     public static final int INDEX_NOT_FOUND = -1;
@@ -180,4 +185,11 @@ public class StringUtils {
         return RandomStringUtils.randomAlphabetic(count);
     }
 
+    public static String generateSafeToken(int length) {
+        byte[] bytes = new byte[length];
+        RANDOM.nextBytes(bytes);
+        Base64.Encoder encoder = Base64.getUrlEncoder().withoutPadding();
+        return encoder.encodeToString(bytes);
+    }
+
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java b/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java
index f9c70a2c19..7e5210e344 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java
@@ -28,7 +28,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 
 @ApiModel
 @EqualsAndHashCode(callSuper = true)
-public class Tenant extends ContactBased<TenantId> implements HasTenantId {
+public class Tenant extends ContactBased<TenantId> implements HasTenantId, HasTitle {
 
     private static final long serialVersionUID = 8057243243859922101L;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
index 9db30fd466..34fec2cd82 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data.alarm;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModel;
@@ -22,6 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.HasCustomerId;
 import org.thingsboard.server.common.data.HasName;
@@ -30,6 +32,7 @@ import org.thingsboard.server.common.data.id.AlarmId;
 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.id.UserId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
@@ -40,8 +43,10 @@ import java.util.List;
  */
 @ApiModel
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Builder
 @AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, HasCustomerId {
 
     @ApiModelProperty(position = 3, value = "JSON object with Tenant Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
@@ -58,25 +63,31 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
     private EntityId originator;
     @ApiModelProperty(position = 8, required = true, value = "Alarm severity", example = "CRITICAL")
     private AlarmSeverity severity;
-    @ApiModelProperty(position = 9, required = true, value = "Alarm status", example = "CLEARED_UNACK")
-    private AlarmStatus status;
-    @ApiModelProperty(position = 10, value = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
+    @ApiModelProperty(position = 9, required = true, value = "Acknowledged", example = "true")
+    private boolean acknowledged;
+    @ApiModelProperty(position = 10, required = true, value = "Cleared", example = "false")
+    private boolean cleared;
+    @ApiModelProperty(position = 11, value = "Alarm assignee user id")
+    private UserId assigneeId;
+    @ApiModelProperty(position = 12, value = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
     private long startTs;
-    @ApiModelProperty(position = 11, value = "Timestamp of the alarm end time(last time update), in milliseconds", example = "1634111163522")
+    @ApiModelProperty(position = 13, value = "Timestamp of the alarm end time(last time update), in milliseconds", example = "1634111163522")
     private long endTs;
-    @ApiModelProperty(position = 12, value = "Timestamp of the alarm acknowledgement, in milliseconds", example = "1634115221948")
+    @ApiModelProperty(position = 14, value = "Timestamp of the alarm acknowledgement, in milliseconds", example = "1634115221948")
     private long ackTs;
-    @ApiModelProperty(position = 13, value = "Timestamp of the alarm clearing, in milliseconds", example = "1634114528465")
+    @ApiModelProperty(position = 15, value = "Timestamp of the alarm clearing, in milliseconds", example = "1634114528465")
     private long clearTs;
-    @ApiModelProperty(position = 14, value = "JSON object with alarm details")
+    @ApiModelProperty(position = 16, value = "Timestamp of the alarm assignment, in milliseconds", example = "1634115928465")
+    private long assignTs;
+    @ApiModelProperty(position = 17, value = "JSON object with alarm details")
     private transient JsonNode details;
-    @ApiModelProperty(position = 15, value = "Propagation flag to specify if alarm should be propagated to parent entities of alarm originator", example = "true")
+    @ApiModelProperty(position = 18, value = "Propagation flag to specify if alarm should be propagated to parent entities of alarm originator", example = "true")
     private boolean propagate;
-    @ApiModelProperty(position = 16, value = "Propagation flag to specify if alarm should be propagated to the owner (tenant or customer) of alarm originator", example = "true")
+    @ApiModelProperty(position = 19, value = "Propagation flag to specify if alarm should be propagated to the owner (tenant or customer) of alarm originator", example = "true")
     private boolean propagateToOwner;
-    @ApiModelProperty(position = 17, value = "Propagation flag to specify if alarm should be propagated to the tenant entity", example = "true")
+    @ApiModelProperty(position = 20, value = "Propagation flag to specify if alarm should be propagated to the tenant entity", example = "true")
     private boolean propagateToTenant;
-    @ApiModelProperty(position = 18, value = "JSON array of relation types that should be used for propagation. " +
+    @ApiModelProperty(position = 21, value = "JSON array of relation types that should be used for propagation. " +
             "By default, 'propagateRelationTypes' array is empty which means that the alarm will be propagated based on any relation type to parent entities. " +
             "This parameter should be used only in case when 'propagate' parameter is set to true, otherwise, 'propagateRelationTypes' array will be ignored.")
     private List<String> propagateRelationTypes;
@@ -97,11 +108,14 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
         this.type = alarm.getType();
         this.originator = alarm.getOriginator();
         this.severity = alarm.getSeverity();
-        this.status = alarm.getStatus();
+        this.assigneeId = alarm.getAssigneeId();
         this.startTs = alarm.getStartTs();
         this.endTs = alarm.getEndTs();
+        this.acknowledged = alarm.isAcknowledged();
         this.ackTs = alarm.getAckTs();
         this.clearTs = alarm.getClearTs();
+        this.cleared = alarm.isCleared();
+        this.assignTs = alarm.getAssignTs();
         this.details = alarm.getDetails();
         this.propagate = alarm.isPropagate();
         this.propagateToOwner = alarm.isPropagateToOwner();
@@ -119,7 +133,7 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
     @ApiModelProperty(position = 1, value = "JSON object with the alarm Id. " +
             "Specify this field to update the alarm. " +
             "Referencing non-existing alarm Id will cause error. " +
-            "Omit this field to create new alarm." )
+            "Omit this field to create new alarm.")
     @Override
     public AlarmId getId() {
         return super.getId();
@@ -132,4 +146,19 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
         return super.getCreatedTime();
     }
 
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    @ApiModelProperty(position = 22, required = true, value = "status of the Alarm", example = "ACTIVE_UNACK", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    public AlarmStatus getStatus() {
+        return toStatus(cleared, acknowledged);
+    }
+
+    public static AlarmStatus toStatus(boolean cleared, boolean acknowledged) {
+
+        if (cleared) {
+            return acknowledged ? AlarmStatus.CLEARED_ACK : AlarmStatus.CLEARED_UNACK;
+        } else {
+            return acknowledged ? AlarmStatus.ACTIVE_ACK : AlarmStatus.ACTIVE_UNACK;
+        }
+    }
+
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmAssignee.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmAssignee.java
new file mode 100644
index 0000000000..20ed7b549c
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmAssignee.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.alarm;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import org.thingsboard.server.common.data.id.UserId;
+
+import java.io.Serializable;
+
+@Builder
+@AllArgsConstructor
+@Data
+public class AlarmAssignee implements Serializable {
+
+    private static final long serialVersionUID = 6628286223963972860L;
+
+    private final UserId id;
+    private final String firstName;
+    private final String lastName;
+    private final String email;
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmAssigneeUpdate.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmAssigneeUpdate.java
new file mode 100644
index 0000000000..d1f32e927b
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmAssigneeUpdate.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.alarm;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class AlarmAssigneeUpdate implements Serializable {
+
+    private static final long serialVersionUID = -2391676304697483808L;
+
+    private final boolean deleted;
+    private final AlarmAssignee assignee;
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCreateOrUpdateActiveRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCreateOrUpdateActiveRequest.java
new file mode 100644
index 0000000000..ecf882e2c9
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCreateOrUpdateActiveRequest.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.alarm;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+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.id.UserId;
+import org.thingsboard.server.common.data.validation.Length;
+import org.thingsboard.server.common.data.validation.NoXss;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+@Data
+@Builder
+public class AlarmCreateOrUpdateActiveRequest implements AlarmModificationRequest {
+
+    @NotNull
+    @ApiModelProperty(position = 1, value = "JSON object with Tenant Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    private TenantId tenantId;
+    @ApiModelProperty(position = 2, value = "JSON object with Customer Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    private CustomerId customerId;
+    @NotNull
+    @ApiModelProperty(position = 3, required = true, value = "representing type of the Alarm", example = "High Temperature Alarm")
+    @Length(fieldName = "type")
+    private String type;
+    @NotNull
+    @ApiModelProperty(position = 4, required = true, value = "JSON object with alarm originator id")
+    private EntityId originator;
+    @NotNull
+    @ApiModelProperty(position = 5, required = true, value = "Alarm severity", example = "CRITICAL")
+    private AlarmSeverity severity;
+    @ApiModelProperty(position = 6, value = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
+    private long startTs;
+    @ApiModelProperty(position = 7, value = "Timestamp of the alarm end time(last time update), in milliseconds", example = "1634111163522")
+    private long endTs;
+    @NoXss
+    @ApiModelProperty(position = 8, value = "JSON object with alarm details")
+    private JsonNode details;
+    @Valid
+    @ApiModelProperty(position = 9, value = "JSON object with propagation details")
+    private AlarmPropagationInfo propagation;
+
+    private UserId userId;
+
+    public static AlarmCreateOrUpdateActiveRequest fromAlarm(Alarm a) {
+        return fromAlarm(a, null);
+    }
+
+    public static AlarmCreateOrUpdateActiveRequest fromAlarm(Alarm a, UserId userId) {
+        return AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(a.getTenantId())
+                .customerId(a.getCustomerId())
+                .type(a.getType())
+                .originator(a.getOriginator())
+                .severity((a.getSeverity()))
+                .startTs(a.getStartTs())
+                .endTs(a.getEndTs())
+                .details(a.getDetails())
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(a.isPropagate())
+                        .propagateToOwner(a.isPropagateToOwner())
+                        .propagateToTenant(a.isPropagateToTenant())
+                        .propagateRelationTypes(a.getPropagateRelationTypes()).build())
+                .userId(userId)
+                .build();
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmInfo.java
index 5483c519db..405097f6f5 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmInfo.java
@@ -17,15 +17,36 @@ package org.thingsboard.server.common.data.alarm;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.thingsboard.server.common.data.User;
 
+import java.util.Objects;
+
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 @ApiModel
 public class AlarmInfo extends Alarm {
 
     private static final long serialVersionUID = 2807343093519543363L;
 
+    @Getter
+    @Setter
     @ApiModelProperty(position = 19, value = "Alarm originator name", example = "Thermostat")
     private String originatorName;
 
+    @Getter
+    @Setter
+    @ApiModelProperty(position = 20, value = "Alarm originator label", example = "Thermostat label")
+    private String originatorLabel;
+
+    @Getter
+    @Setter
+    @ApiModelProperty(position = 21, value = "Alarm assignee")
+    private AlarmAssignee assignee;
+
     public AlarmInfo() {
         super();
     }
@@ -34,35 +55,18 @@ public class AlarmInfo extends Alarm {
         super(alarm);
     }
 
-    public AlarmInfo(Alarm alarm, String originatorName) {
-        super(alarm);
-        this.originatorName = originatorName;
-    }
-
-    public String getOriginatorName() {
-        return originatorName;
+    public AlarmInfo(AlarmInfo alarmInfo) {
+        super(alarmInfo);
+        this.originatorName = alarmInfo.originatorName;
+        this.originatorLabel = alarmInfo.originatorLabel;
+        this.assignee = alarmInfo.getAssignee();
     }
 
-    public void setOriginatorName(String originatorName) {
+    public AlarmInfo(Alarm alarm, String originatorName, String originatorLabel, AlarmAssignee assignee) {
+        super(alarm);
         this.originatorName = originatorName;
+        this.originatorLabel = originatorLabel;
+        this.assignee = assignee;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-
-        AlarmInfo alarmInfo = (AlarmInfo) o;
-
-        return originatorName != null ? originatorName.equals(alarmInfo.originatorName) : alarmInfo.originatorName == null;
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + (originatorName != null ? originatorName.hashCode() : 0);
-        return result;
-    }
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmModificationRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmModificationRequest.java
new file mode 100644
index 0000000000..e40cb15d22
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmModificationRequest.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.alarm;
+
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+
+public interface AlarmModificationRequest {
+
+    TenantId getTenantId();
+
+    long getStartTs();
+
+    long getEndTs();
+
+    void setStartTs(long startTs);
+
+    void setEndTs(long endTs);
+
+    UserId getUserId();
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmPropagationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmPropagationInfo.java
new file mode 100644
index 0000000000..10069f8dbe
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmPropagationInfo.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.alarm;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.thingsboard.server.common.data.validation.NoXss;
+
+import java.util.Collections;
+import java.util.List;
+
+@Builder
+@Data
+public class AlarmPropagationInfo {
+
+    public static AlarmPropagationInfo EMPTY = new AlarmPropagationInfo(false, false, false, Collections.emptyList());
+
+    @ApiModelProperty(position = 1, value = "Propagation flag to specify if alarm should be propagated to parent entities of alarm originator", example = "true")
+    private boolean propagate;
+    @ApiModelProperty(position = 2, value = "Propagation flag to specify if alarm should be propagated to the owner (tenant or customer) of alarm originator", example = "true")
+    private boolean propagateToOwner;
+    @ApiModelProperty(position = 3, value = "Propagation flag to specify if alarm should be propagated to the tenant entity", example = "true")
+    private boolean propagateToTenant;
+    @NoXss
+    @ApiModelProperty(position = 4, value = "JSON array of relation types that should be used for propagation. " +
+            "By default, 'propagateRelationTypes' array is empty which means that the alarm will be propagated based on any relation type to parent entities. " +
+            "This parameter should be used only in case when 'propagate' parameter is set to true, otherwise, 'propagateRelationTypes' array will be ignored.")
+    private List<String> propagateRelationTypes;
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmQuery.java
index a923b54abc..e4d0fb32df 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmQuery.java
@@ -19,6 +19,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.TimePageLink;
 
 /**
@@ -33,6 +34,8 @@ public class AlarmQuery {
     private TimePageLink pageLink;
     private AlarmSearchStatus searchStatus;
     private AlarmStatus status;
+    private UserId assigneeId;
+    @Deprecated
     private Boolean fetchOriginator;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSearchStatus.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSearchStatus.java
index 92af75c8f0..4225f6efbb 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSearchStatus.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSearchStatus.java
@@ -15,26 +15,12 @@
  */
 package org.thingsboard.server.common.data.alarm;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
 public enum AlarmSearchStatus {
 
-    ANY(AlarmStatus.values()),
-    ACTIVE(AlarmStatus.ACTIVE_ACK, AlarmStatus.ACTIVE_UNACK),
-    CLEARED(AlarmStatus.CLEARED_ACK, AlarmStatus.CLEARED_UNACK),
-    ACK(AlarmStatus.ACTIVE_ACK, AlarmStatus.CLEARED_ACK),
-    UNACK(AlarmStatus.ACTIVE_UNACK, AlarmStatus.CLEARED_UNACK);
-
-    @JsonIgnore
-    @Getter
-    private Set<AlarmStatus> statuses;
+    ANY,
+    ACTIVE,
+    CLEARED,
+    ACK,
+    UNACK;
 
-    AlarmSearchStatus(AlarmStatus... statuses) {
-        this.statuses = new LinkedHashSet<>(Arrays.asList(statuses));
-    }
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmStatusFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmStatusFilter.java
new file mode 100644
index 0000000000..c8f40fa048
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmStatusFilter.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.alarm;
+
+import java.util.List;
+import java.util.Optional;
+
+public class AlarmStatusFilter {
+
+    private static final AlarmStatusFilter EMPTY = new AlarmStatusFilter(Optional.empty(), Optional.empty());
+
+    private final Optional<Boolean> clearFilter;
+    private final Optional<Boolean> ackFilter;
+
+    private AlarmStatusFilter(Optional<Boolean> clearFilter, Optional<Boolean> ackFilter) {
+        this.clearFilter = clearFilter;
+        this.ackFilter = ackFilter;
+    }
+
+    public static AlarmStatusFilter from(AlarmQuery query) {
+        if (query.getSearchStatus() != null) {
+            return AlarmStatusFilter.from(query.getSearchStatus());
+        } else if (query.getStatus() != null) {
+            return AlarmStatusFilter.from(query.getStatus());
+        }
+        return AlarmStatusFilter.empty();
+    }
+
+    public static AlarmStatusFilter from(AlarmSearchStatus alarmSearchStatus) {
+        switch (alarmSearchStatus) {
+            case ACK:
+                return new AlarmStatusFilter(Optional.empty(), Optional.of(true));
+            case UNACK:
+                return new AlarmStatusFilter(Optional.empty(), Optional.of(false));
+            case ACTIVE:
+                return new AlarmStatusFilter(Optional.of(false), Optional.empty());
+            case CLEARED:
+                return new AlarmStatusFilter(Optional.of(true), Optional.empty());
+            default:
+                return EMPTY;
+        }
+    }
+
+    public static AlarmStatusFilter from(AlarmStatus alarmStatus) {
+        switch (alarmStatus) {
+            case ACTIVE_UNACK:
+                return new AlarmStatusFilter(Optional.of(false), Optional.of(false));
+            case ACTIVE_ACK:
+                return new AlarmStatusFilter(Optional.of(false), Optional.of(true));
+            case CLEARED_UNACK:
+                return new AlarmStatusFilter(Optional.of(true), Optional.of(false));
+            case CLEARED_ACK:
+                return new AlarmStatusFilter(Optional.of(true), Optional.of(true));
+            default:
+                return EMPTY;
+        }
+    }
+
+    public static AlarmStatusFilter empty() {
+        return EMPTY;
+    }
+
+    public boolean hasAnyFilter() {
+        return clearFilter.isPresent() || ackFilter.isPresent();
+    }
+
+    public boolean hasClearFilter() {
+        return clearFilter.isPresent();
+    }
+
+    public boolean hasAckFilter() {
+        return ackFilter.isPresent();
+    }
+
+    public boolean getClearFilter() {
+        return clearFilter.orElseThrow(() -> new RuntimeException("Clear filter is not set! Use `hasClearFilter` to check."));
+    }
+
+    public boolean getAckFilter() {
+        return ackFilter.orElseThrow(() -> new RuntimeException("Ack filter is not set! Use `hasAckFilter` to check."));
+    }
+
+
+    public static AlarmStatusFilter fromList(List<AlarmSearchStatus> list) {
+        if (list == null || list.isEmpty() || list.contains(AlarmSearchStatus.ANY)) {
+            return EMPTY;
+        }
+        boolean clearFilter = list.contains(AlarmSearchStatus.CLEARED);
+        boolean activeFilter = list.contains(AlarmSearchStatus.ACTIVE);
+        Optional<Boolean> clear = Optional.empty();
+        if (clearFilter && !activeFilter || !clearFilter && activeFilter) {
+            clear = Optional.of(clearFilter);
+        }
+
+        boolean ackFilter = list.contains(AlarmSearchStatus.ACK);
+        boolean unackFilter = list.contains(AlarmSearchStatus.UNACK);
+        Optional<Boolean> ack = Optional.empty();
+        if (ackFilter && !unackFilter || !ackFilter && unackFilter) {
+            ack = Optional.of(ackFilter);
+        }
+        return new AlarmStatusFilter(clear, ack);
+    }
+
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmUpdateRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmUpdateRequest.java
new file mode 100644
index 0000000000..23edafd6d2
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmUpdateRequest.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.alarm;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+import org.thingsboard.server.common.data.id.AlarmId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.validation.NoXss;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+@Data
+@Builder
+public class AlarmUpdateRequest implements AlarmModificationRequest {
+
+    @NotNull
+    @ApiModelProperty(position = 1, value = "JSON object with Tenant Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    private TenantId tenantId;
+    @NotNull
+    @ApiModelProperty(position = 2, value = "JSON object with the alarm Id. " +
+            "Specify this field to update the alarm. " +
+            "Referencing non-existing alarm Id will cause error. " +
+            "Omit this field to create new alarm.")
+    private AlarmId alarmId;
+    @NotNull
+    @ApiModelProperty(position = 3, required = true, value = "Alarm severity", example = "CRITICAL")
+    private AlarmSeverity severity;
+    @ApiModelProperty(position = 4, value = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
+    private long startTs;
+    @ApiModelProperty(position = 5, value = "Timestamp of the alarm end time(last time update), in milliseconds", example = "1634111163522")
+    private long endTs;
+    @NoXss
+    @ApiModelProperty(position = 6, value = "JSON object with alarm details")
+    private JsonNode details;
+    @Valid
+    @ApiModelProperty(position = 7, value = "JSON object with propagation details")
+    private AlarmPropagationInfo propagation;
+
+    private UserId userId;
+
+    public static AlarmUpdateRequest fromAlarm(Alarm a) {
+        return fromAlarm(a, null);
+    }
+
+    public static AlarmUpdateRequest fromAlarm(Alarm a, UserId userId) {
+        return AlarmUpdateRequest.builder()
+                .tenantId(a.getTenantId())
+                .alarmId(a.getId())
+                .severity((a.getSeverity()))
+                .startTs(a.getStartTs())
+                .endTs(a.getEndTs())
+                .details(a.getDetails())
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(a.isPropagate())
+                        .propagateToOwner(a.isPropagateToOwner())
+                        .propagateToTenant(a.isPropagateToTenant())
+                        .propagateRelationTypes(a.getPropagateRelationTypes()).build())
+                .userId(userId)
+                .build();
+    }
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/EntityAlarm.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/EntityAlarm.java
index e15557cdfe..8f25c0cbc5 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/EntityAlarm.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/EntityAlarm.java
@@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.id.AlarmId;
 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.id.UserId;
 
 @Data
 @NoArgsConstructor
@@ -35,6 +36,7 @@ public class EntityAlarm implements HasTenantId {
     private String alarmType;
 
     private CustomerId customerId;
+    private UserId assigneeId;
     private AlarmId alarmId;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java b/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java
index 0721b1b310..d5f4efa6c2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java
@@ -23,6 +23,7 @@ import lombok.Getter;
 import lombok.Setter;
 import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.HasCustomerId;
+import org.thingsboard.server.common.data.HasLabel;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo;
@@ -37,7 +38,7 @@ import java.util.Optional;
 
 @ApiModel
 @EqualsAndHashCode(callSuper = true)
-public class Asset extends SearchTextBasedWithAdditionalInfo<AssetId> implements HasName, HasTenantId, HasCustomerId, ExportableEntity<AssetId> {
+public class Asset extends SearchTextBasedWithAdditionalInfo<AssetId> implements HasLabel, HasTenantId, HasCustomerId, ExportableEntity<AssetId> {
 
     private static final long serialVersionUID = 2807343040519543363L;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/audit/ActionType.java b/common/data/src/main/java/org/thingsboard/server/common/data/audit/ActionType.java
index 876444a1dd..b479f1a236 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/audit/ActionType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/audit/ActionType.java
@@ -40,6 +40,8 @@ public enum ActionType {
     ALARM_ACK(false),
     ALARM_CLEAR(false),
     ALARM_DELETE(false),
+    ALARM_ASSIGN(false),
+    ALARM_UNASSIGN(false),
     LOGIN(false),
     LOGOUT(false),
     LOCKOUT(false),
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java
index 9b944d7902..37ef1b65ac 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java
@@ -16,7 +16,6 @@
 package org.thingsboard.server.common.data.device.profile;
 
 import lombok.Data;
-import org.thingsboard.server.common.data.DeviceProfileType;
 import org.thingsboard.server.common.data.DeviceTransportType;
 
 @Data
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java
index ae36567ae7..d0b83e56d6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java
@@ -19,6 +19,8 @@ import lombok.Data;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.validation.NoXss;
 
+import java.util.Set;
+
 @Data
 public class MqttDeviceProfileTransportConfiguration implements DeviceProfileTransportConfiguration {
 
@@ -27,6 +29,8 @@ public class MqttDeviceProfileTransportConfiguration implements DeviceProfileTra
     @NoXss
     private String deviceAttributesTopic = MqttTopics.DEVICE_ATTRIBUTES_TOPIC;
     private TransportPayloadTypeConfiguration transportPayloadTypeConfiguration;
+    private boolean sparkplug;
+    private Set<String> sparkplugAttributesMetricNames;
     private boolean sendAckOnValidationException;
 
     @Override
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
index 34c0c31428..4304abfb1d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
@@ -21,6 +21,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Setter;
 import lombok.ToString;
 import org.thingsboard.server.common.data.HasCustomerId;
+import org.thingsboard.server.common.data.HasLabel;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo;
@@ -35,7 +36,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 @EqualsAndHashCode(callSuper = true)
 @ToString
 @Setter
-public class Edge extends SearchTextBasedWithAdditionalInfo<EdgeId> implements HasName, HasTenantId, HasCustomerId {
+public class Edge extends SearchTextBasedWithAdditionalInfo<EdgeId> implements HasLabel, HasTenantId, HasCustomerId {
 
     private static final long serialVersionUID = 4934987555236873728L;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java
index f57881a63b..9b813ae89c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java
@@ -31,6 +31,8 @@ public enum EdgeEventActionType {
     RPC_CALL,
     ALARM_ACK,
     ALARM_CLEAR,
+    ALARM_ASSIGN,
+    ALARM_UNASSIGN,
     ASSIGNED_TO_EDGE,
     UNASSIGNED_FROM_EDGE,
     CREDENTIALS_REQUEST,
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
index c0960347bc..d3eaddf737 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
@@ -25,6 +25,14 @@ import java.util.UUID;
  */
 public class EntityIdFactory {
 
+    public static EntityId getByTypeAndUuid(int type, String uuid) {
+        return getByTypeAndUuid(EntityType.values()[type], UUID.fromString(uuid));
+    }
+
+    public static EntityId getByTypeAndUuid(String type, String uuid) {
+        return getByTypeAndUuid(EntityType.valueOf(type), UUID.fromString(uuid));
+    }
+
     public static EntityId getByTypeAndId(String type, String uuid) {
         return getByTypeAndUuid(EntityType.valueOf(type), UUID.fromString(uuid));
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/NameLabelAndCustomerDetails.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/NameLabelAndCustomerDetails.java
new file mode 100644
index 0000000000..8d7413b438
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/NameLabelAndCustomerDetails.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.id;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class NameLabelAndCustomerDetails {
+    private final String name;
+    private final String label;
+    private final CustomerId customerId;
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmData.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmData.java
index d63a5a95bd..1ae434f28c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmData.java
@@ -15,24 +15,36 @@
  */
 package org.thingsboard.server.common.data.query;
 
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmAssignee;
+import org.thingsboard.server.common.data.alarm.AlarmAssigneeUpdate;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.id.EntityId;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
+@EqualsAndHashCode(callSuper = true)
 public class AlarmData extends AlarmInfo {
 
+    private static final long serialVersionUID = -7042457913823369638L;
+
     @Getter
     private final EntityId entityId;
     @Getter
     private final Map<EntityKeyType, Map<String, TsValue>> latest;
 
-    public AlarmData(Alarm alarm, String originatorName, EntityId entityId) {
-        super(alarm, originatorName);
+    public AlarmData(AlarmInfo main, AlarmData prototype) {
+        super(main);
+        this.entityId = prototype.entityId;
+        this.latest = new HashMap<>();
+        this.latest.putAll(prototype.getLatest());
+    }
+
+    public AlarmData(Alarm alarm, EntityId entityId) {
+        super(alarm);
         this.entityId = entityId;
         this.latest = new HashMap<>();
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java
index e46deddfd7..9c0253272c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java
@@ -19,11 +19,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
 import lombok.ToString;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.id.UserId;
 
 import java.util.List;
 
@@ -41,6 +40,7 @@ public class AlarmDataPageLink extends EntityDataPageLink {
     private List<AlarmSearchStatus> statusList;
     private List<AlarmSeverity> severityList;
     private boolean searchPropagatedAlarms;
+    private UserId assigneeId;
 
     public AlarmDataPageLink() {
         super();
@@ -49,7 +49,8 @@ public class AlarmDataPageLink extends EntityDataPageLink {
     public AlarmDataPageLink(int pageSize, int page, String textSearch, EntityDataSortOrder sortOrder, boolean dynamic,
                              boolean searchPropagatedAlarms,
                              long startTs, long endTs, long timeWindow,
-                             List<String> typeList, List<AlarmSearchStatus> statusList, List<AlarmSeverity> severityList) {
+                             List<String> typeList, List<AlarmSearchStatus> statusList, List<AlarmSeverity> severityList,
+                             UserId assigneeId) {
         super(pageSize, page, textSearch, sortOrder, dynamic);
         this.searchPropagatedAlarms = searchPropagatedAlarms;
         this.startTs = startTs;
@@ -58,6 +59,7 @@ public class AlarmDataPageLink extends EntityDataPageLink {
         this.typeList = typeList;
         this.statusList = statusList;
         this.severityList = severityList;
+        this.assigneeId = assigneeId;
     }
 
     @JsonIgnore
@@ -65,7 +67,8 @@ public class AlarmDataPageLink extends EntityDataPageLink {
         return new AlarmDataPageLink(this.getPageSize(), this.getPage() + 1, this.getTextSearch(), this.getSortOrder(), this.isDynamic(),
                 this.searchPropagatedAlarms,
                 this.startTs, this.endTs, this.timeWindow,
-                this.typeList, this.statusList, this.severityList
+                this.typeList, this.statusList, this.severityList,
+                this.assigneeId
         );
     }
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/UserCredentials.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/UserCredentials.java
index 900fd966e8..c9bd9fbad2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/UserCredentials.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/UserCredentials.java
@@ -15,10 +15,20 @@
  */
 package org.thingsboard.server.common.data.security;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.id.UserCredentialsId;
 import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.validation.Length;
+import org.thingsboard.server.common.data.validation.NoXss;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo.getJson;
+import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo.setJson;
 
 @EqualsAndHashCode(callSuper = true)
 public class UserCredentials extends BaseData<UserCredentialsId> {
@@ -30,6 +40,20 @@ public class UserCredentials extends BaseData<UserCredentialsId> {
     private String password;
     private String activateToken;
     private String resetToken;
+
+    @NoXss
+    private transient JsonNode additionalInfo;
+
+    @JsonIgnore
+    private byte[] additionalInfoBytes;
+
+    public JsonNode getAdditionalInfo() {
+        return getJson(() -> additionalInfo, () -> additionalInfoBytes);
+    }
+
+    public void setAdditionalInfo(JsonNode settings) {
+        setJson(settings, json -> this.additionalInfo = json, bytes -> this.additionalInfoBytes = bytes);
+    }
     
     public UserCredentials() {
         super();
@@ -46,6 +70,7 @@ public class UserCredentials extends BaseData<UserCredentialsId> {
         this.enabled = userCredentials.isEnabled();
         this.activateToken = userCredentials.getActivateToken();
         this.resetToken = userCredentials.getResetToken();
+        setAdditionalInfo(userCredentials.getAdditionalInfo());
     }
 
     public UserId getUserId() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/BaseWidgetType.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/BaseWidgetType.java
index d47876b268..a7e9fee82a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/widget/BaseWidgetType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/BaseWidgetType.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.widget;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.BaseData;
+import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
@@ -25,7 +26,7 @@ import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
 @Data
-public class BaseWidgetType extends BaseData<WidgetTypeId> implements HasTenantId {
+public class BaseWidgetType extends BaseData<WidgetTypeId> implements HasName, HasTenantId {
 
     private static final long serialVersionUID = 8388684344603660756L;
 
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 876438f834..679dead962 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
@@ -25,6 +25,7 @@ import lombok.Setter;
 import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasTenantId;
+import org.thingsboard.server.common.data.HasTitle;
 import org.thingsboard.server.common.data.SearchTextBased;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.WidgetsBundleId;
@@ -33,7 +34,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 
 @ApiModel
 @EqualsAndHashCode(callSuper = true)
-public class WidgetsBundle extends SearchTextBased<WidgetsBundleId> implements HasName, HasTenantId, ExportableEntity<WidgetsBundleId> {
+public class WidgetsBundle extends SearchTextBased<WidgetsBundleId> implements HasName, HasTenantId, ExportableEntity<WidgetsBundleId>, HasTitle {
 
     private static final long serialVersionUID = -7627368878362410489L;
 
diff --git a/common/data/src/test/java/org/thingsboard/server/common/data/UUIDConverterTest.java b/common/data/src/test/java/org/thingsboard/server/common/data/UUIDConverterTest.java
index e2af72892f..cad0d9370c 100644
--- a/common/data/src/test/java/org/thingsboard/server/common/data/UUIDConverterTest.java
+++ b/common/data/src/test/java/org/thingsboard/server/common/data/UUIDConverterTest.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data;
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 
@@ -58,9 +59,11 @@ public class UUIDConverterTest {
         Assert.assertEquals(UUID.fromString("58e0a7d7-eebc-11d8-9669-0800200c9a66"), result);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void nonV1UuidToStringTest() {
-        UUIDConverter.fromTimeUUID(UUID.fromString("58e0a7d7-eebc-01d8-9669-0800200c9a66"));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            UUIDConverter.fromTimeUUID(UUID.fromString("58e0a7d7-eebc-01d8-9669-0800200c9a66"));
+        });
     }
 
     @Test
diff --git a/common/transport/mqtt/pom.xml b/common/transport/mqtt/pom.xml
index 9604110e13..ae0b35e44d 100644
--- a/common/transport/mqtt/pom.xml
+++ b/common/transport/mqtt/pom.xml
@@ -97,6 +97,19 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.xolstice.maven.plugins</groupId>
+                <artifactId>protobuf-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/common/transport/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 c64fe57b94..0d43fc6c93 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
@@ -17,11 +17,11 @@ package org.thingsboard.server.transport.mqtt;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.gson.JsonParseException;
+import com.google.protobuf.InvalidProtocolBufferException;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.codec.mqtt.MqttConnAckMessage;
-import io.netty.handler.codec.mqtt.MqttConnAckVariableHeader;
 import io.netty.handler.codec.mqtt.MqttConnectMessage;
 import io.netty.handler.codec.mqtt.MqttConnectReturnCode;
 import io.netty.handler.codec.mqtt.MqttFixedHeader;
@@ -43,6 +43,8 @@ import io.netty.util.ReferenceCountUtil;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.core.ResponseCode;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -50,6 +52,8 @@ import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.TransportPayloadType;
 import org.thingsboard.server.common.data.device.profile.MqttTopics;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
@@ -69,13 +73,20 @@ import org.thingsboard.server.common.transport.util.SslUtil;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceX509CertRequestMsg;
+import org.thingsboard.server.gen.transport.mqtt.SparkplugBProto;
 import org.thingsboard.server.queue.scheduler.SchedulerComponent;
 import org.thingsboard.server.transport.mqtt.adaptors.MqttTransportAdaptor;
+import org.thingsboard.server.transport.mqtt.adaptors.ProtoMqttAdaptor;
 import org.thingsboard.server.transport.mqtt.session.DeviceSessionCtx;
 import org.thingsboard.server.transport.mqtt.session.GatewaySessionHandler;
 import org.thingsboard.server.transport.mqtt.session.MqttTopicMatcher;
+import org.thingsboard.server.transport.mqtt.session.SparkplugNodeSessionHandler;
 import org.thingsboard.server.transport.mqtt.util.ReturnCode;
 import org.thingsboard.server.transport.mqtt.util.ReturnCodeResolver;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugRpcRequestHeader;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugRpcResponseBody;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugTopic;
 
 import javax.net.ssl.SSLPeerUnverifiedException;
 import java.io.IOException;
@@ -84,6 +95,7 @@ import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -95,15 +107,19 @@ 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.CONNACK;
 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;
-import static io.netty.handler.codec.mqtt.MqttMessageType.UNSUBACK;
 import static io.netty.handler.codec.mqtt.MqttQoS.AT_LEAST_ONCE;
 import static io.netty.handler.codec.mqtt.MqttQoS.AT_MOST_ONCE;
 import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_CLOSED;
 import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_OPEN;
+import static org.thingsboard.server.common.transport.service.DefaultTransportService.SUBSCRIBE_TO_ATTRIBUTE_UPDATES_ASYNC_MSG;
+import static org.thingsboard.server.common.transport.service.DefaultTransportService.SUBSCRIBE_TO_RPC_ASYNC_MSG;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType.NDEATH;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugConnectionState.OFFLINE;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMetricUtil.getTsKvProto;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugTopicUtil.parseTopicPublish;
 
 /**
  * @author Andrew Shvayka
@@ -120,7 +136,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     private static final MqttQoS MAX_SUPPORTED_QOS_LVL = AT_LEAST_ONCE;
 
     private final UUID sessionId;
-    private final MqttTransportContext context;
+    protected final MqttTransportContext context;
     private final TransportService transportService;
     private final SchedulerComponent scheduler;
     private final SslHandler sslHandler;
@@ -129,6 +145,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     final DeviceSessionCtx deviceSessionCtx;
     volatile InetSocketAddress address;
     volatile GatewaySessionHandler gatewaySessionHandler;
+    volatile SparkplugNodeSessionHandler sparkplugSessionHandler;
 
     private final ConcurrentHashMap<String, String> otaPackSessions;
     private final ConcurrentHashMap<String, Integer> chunkSizes;
@@ -320,12 +337,15 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
         String topicName = mqttMsg.variableHeader().topicName();
         int msgId = mqttMsg.variableHeader().packetId();
         log.trace("[{}][{}] Processing publish msg [{}][{}]!", sessionId, deviceSessionCtx.getDeviceId(), topicName, msgId);
-
         if (topicName.startsWith(MqttTopics.BASE_GATEWAY_API_TOPIC)) {
             if (gatewaySessionHandler != null) {
                 handleGatewayPublishMsg(ctx, topicName, msgId, mqttMsg);
                 transportService.reportActivity(deviceSessionCtx.getSessionInfo());
+            } else {
+                log.error("[gatewaySessionHandler] is null, [{}] Failed to process publish msg [{}][{}]", sessionId, topicName, msgId);
             }
+        } else if (sparkplugSessionHandler != null) {
+            handleSparkplugPublishMsg(ctx, topicName, mqttMsg);
         } else {
             processDevicePublish(ctx, mqttMsg, topicName, msgId);
         }
@@ -368,6 +388,46 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
         }
     }
 
+    private void handleSparkplugPublishMsg(ChannelHandlerContext ctx, String topicName, MqttPublishMessage mqttMsg) {
+        int msgId = mqttMsg.variableHeader().packetId();
+        try {
+            SparkplugTopic sparkplugTopic = parseTopicPublish(topicName);
+            if (sparkplugTopic.isNode()) {
+                // A node topic
+                SparkplugBProto.Payload sparkplugBProtoNode = SparkplugBProto.Payload.parseFrom(ProtoMqttAdaptor.toBytes(mqttMsg.payload()));
+                switch (sparkplugTopic.getType()) {
+                    case NBIRTH:
+                    case NCMD:
+                    case NDATA:
+                        sparkplugSessionHandler.onAttributesTelemetryProto(msgId, sparkplugBProtoNode, deviceSessionCtx.getDeviceInfo().getDeviceName(), sparkplugTopic);
+                        break;
+                    default:
+                }
+            } else {
+                // A device topic
+                SparkplugBProto.Payload sparkplugBProtoDevice = SparkplugBProto.Payload.parseFrom(ProtoMqttAdaptor.toBytes(mqttMsg.payload()));
+                switch (sparkplugTopic.getType()) {
+                    case DBIRTH:
+                    case DCMD:
+                    case DDATA:
+                        sparkplugSessionHandler.onAttributesTelemetryProto(msgId, sparkplugBProtoDevice, sparkplugTopic.getDeviceId(), sparkplugTopic);
+                        break;
+                    case DDEATH:
+                        sparkplugSessionHandler.onDeviceDisconnect(mqttMsg, sparkplugTopic.getDeviceId());
+                        break;
+                    default:
+                }
+            }
+        } catch (RuntimeException e) {
+            log.error("[{}] Failed to process publish msg [{}][{}]", sessionId, topicName, msgId, e);
+            ack(ctx, msgId, ReturnCode.IMPLEMENTATION_SPECIFIC);
+            ctx.close();
+        } catch (AdaptorException | ThingsboardException | InvalidProtocolBufferException e) {
+            log.error("[{}] Failed to process publish msg [{}][{}]", sessionId, topicName, msgId, e);
+            sendAckOrCloseSession(ctx, topicName, msgId);
+        }
+    }
+
     private void processDevicePublish(ChannelHandlerContext ctx, MqttPublishMessage mqttMsg, String topicName, int msgId) {
         try {
             Matcher fwMatcher;
@@ -628,69 +688,74 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
             String topic = subscription.topicName();
             MqttQoS reqQoS = subscription.qualityOfService();
             try {
-                switch (topic) {
-                    case MqttTopics.DEVICE_ATTRIBUTES_TOPIC: {
-                        processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V1);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_TOPIC: {
-                        processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_JSON_TOPIC: {
-                        processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_JSON);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_PROTO_TOPIC: {
-                        processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_PROTO);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_TOPIC: {
-                        processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V1);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_TOPIC: {
-                        processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_JSON_TOPIC: {
-                        processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_JSON);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_PROTO_TOPIC: {
-                        processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_PROTO);
-                        activityReported = true;
-                        break;
+                if (sparkplugSessionHandler != null) {
+                    sparkplugSessionHandler.handleSparkplugSubscribeMsg(grantedQoSList, subscription, reqQoS);
+                    activityReported = true;
+                } else {
+                    switch (topic) {
+                        case MqttTopics.DEVICE_ATTRIBUTES_TOPIC: {
+                            processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V1);
+                            activityReported = true;
+                            break;
+                        }
+                        case MqttTopics.DEVICE_ATTRIBUTES_SHORT_TOPIC: {
+                            processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2);
+                            activityReported = true;
+                            break;
+                        }
+                        case MqttTopics.DEVICE_ATTRIBUTES_SHORT_JSON_TOPIC: {
+                            processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_JSON);
+                            activityReported = true;
+                            break;
+                        }
+                        case MqttTopics.DEVICE_ATTRIBUTES_SHORT_PROTO_TOPIC: {
+                            processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_PROTO);
+                            activityReported = true;
+                            break;
+                        }
+                        case MqttTopics.DEVICE_RPC_REQUESTS_SUB_TOPIC: {
+                            processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V1);
+                            activityReported = true;
+                            break;
+                        }
+                        case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_TOPIC: {
+                            processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2);
+                            activityReported = true;
+                            break;
+                        }
+                        case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_JSON_TOPIC: {
+                            processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_JSON);
+                            activityReported = true;
+                            break;
+                        }
+                        case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_PROTO_TOPIC: {
+                            processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_PROTO);
+                            activityReported = true;
+                            break;
+                        }
+                        case MqttTopics.DEVICE_RPC_RESPONSE_SUB_TOPIC:
+                        case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_TOPIC:
+                        case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_JSON_TOPIC:
+                        case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_PROTO_TOPIC:
+                        case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_TOPIC:
+                        case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_TOPIC:
+                        case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_JSON_TOPIC:
+                        case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_PROTO_TOPIC:
+                        case MqttTopics.GATEWAY_ATTRIBUTES_TOPIC:
+                        case MqttTopics.GATEWAY_RPC_TOPIC:
+                        case MqttTopics.GATEWAY_ATTRIBUTES_RESPONSE_TOPIC:
+                        case MqttTopics.DEVICE_PROVISION_RESPONSE_TOPIC:
+                        case MqttTopics.DEVICE_FIRMWARE_RESPONSES_TOPIC:
+                        case MqttTopics.DEVICE_FIRMWARE_ERROR_TOPIC:
+                        case MqttTopics.DEVICE_SOFTWARE_RESPONSES_TOPIC:
+                        case MqttTopics.DEVICE_SOFTWARE_ERROR_TOPIC:
+                            registerSubQoS(topic, grantedQoSList, reqQoS);
+                            break;
+                        default:
+                            log.warn("[{}] Failed to subscribe to [{}][{}]", sessionId, topic, reqQoS);
+                            grantedQoSList.add(ReturnCodeResolver.getSubscriptionReturnCode(deviceSessionCtx.getMqttVersion(), ReturnCode.TOPIC_FILTER_INVALID));
+                            break;
                     }
-                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_TOPIC:
-                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_TOPIC:
-                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_JSON_TOPIC:
-                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_PROTO_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_JSON_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_PROTO_TOPIC:
-                    case MqttTopics.GATEWAY_ATTRIBUTES_TOPIC:
-                    case MqttTopics.GATEWAY_RPC_TOPIC:
-                    case MqttTopics.GATEWAY_ATTRIBUTES_RESPONSE_TOPIC:
-                    case MqttTopics.DEVICE_PROVISION_RESPONSE_TOPIC:
-                    case MqttTopics.DEVICE_FIRMWARE_RESPONSES_TOPIC:
-                    case MqttTopics.DEVICE_FIRMWARE_ERROR_TOPIC:
-                    case MqttTopics.DEVICE_SOFTWARE_RESPONSES_TOPIC:
-                    case MqttTopics.DEVICE_SOFTWARE_ERROR_TOPIC:
-                        registerSubQoS(topic, grantedQoSList, reqQoS);
-                        break;
-                    default:
-                        log.warn("[{}] Failed to subscribe to [{}][{}]", sessionId, topic, reqQoS);
-                        grantedQoSList.add(ReturnCodeResolver.getSubscriptionReturnCode(deviceSessionCtx.getMqttVersion(), ReturnCode.TOPIC_FILTER_INVALID));
-                        break;
                 }
             } catch (Exception e) {
                 log.warn("[{}] Failed to subscribe to [{}][{}]", sessionId, topic, reqQoS, e);
@@ -715,7 +780,16 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
         registerSubQoS(topic, grantedQoSList, reqQoS);
     }
 
-    private void registerSubQoS(String topic, List<Integer> grantedQoSList, MqttQoS reqQoS) {
+    public void processAttributesRpcSubscribeSparkplugNode(List<Integer> grantedQoSList, MqttQoS reqQoS) {
+        transportService.process(TransportProtos.TransportToDeviceActorMsg.newBuilder()
+                .setSessionInfo(deviceSessionCtx.getSessionInfo())
+                .setSubscribeToAttributes(SUBSCRIBE_TO_ATTRIBUTE_UPDATES_ASYNC_MSG)
+                .setSubscribeToRPC(SUBSCRIBE_TO_RPC_ASYNC_MSG)
+                .build(), null);
+        registerSubQoS(MqttTopics.DEVICE_ATTRIBUTES_TOPIC, grantedQoSList, reqQoS);
+    }
+
+    public void registerSubQoS(String topic, List<Integer> grantedQoSList, MqttQoS reqQoS) {
         grantedQoSList.add(getMinSupportedQos(reqQoS));
         mqttQoSMap.put(new MqttTopicMatcher(topic), getMinSupportedQos(reqQoS));
     }
@@ -986,6 +1060,39 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
         }
     }
 
+    private void checkSparkplugNodeSession(MqttConnectMessage connectMessage, ChannelHandlerContext ctx) {
+        try {
+            if (sparkplugSessionHandler == null) {
+                SparkplugTopic sparkplugTopicNode = validatedSparkplugTopicConnectedNode(connectMessage);
+                if (sparkplugTopicNode != null) {
+                    SparkplugBProto.Payload sparkplugBProtoNode = SparkplugBProto.Payload.parseFrom(connectMessage.payload().willMessageInBytes());
+                    sparkplugSessionHandler = new SparkplugNodeSessionHandler(this, deviceSessionCtx, sessionId, sparkplugTopicNode);
+                    sparkplugSessionHandler.onAttributesTelemetryProto(0, sparkplugBProtoNode,
+                            deviceSessionCtx.getDeviceInfo().getDeviceName(), sparkplugTopicNode);
+                } else {
+                    log.trace("[{}][{}] Failed to fetch sparkplugDevice connect:  sparkplugTopicName without SparkplugMessageType.NDEATH.", sessionId, deviceSessionCtx.getDeviceInfo().getDeviceName());
+                    throw new ThingsboardException("Invalid request body", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+                }
+            }
+        } catch (Exception e) {
+            log.trace("[{}][{}] Failed to fetch sparkplugDevice connect, sparkplugTopicName", sessionId, deviceSessionCtx.getDeviceInfo().getDeviceName(), e);
+            ctx.writeAndFlush(createMqttConnAckMsg(ReturnCode.SERVER_UNAVAILABLE_5, connectMessage));
+            ctx.close();
+        }
+    }
+
+    private SparkplugTopic validatedSparkplugTopicConnectedNode(MqttConnectMessage connectMessage) throws ThingsboardException {
+        if (StringUtils.isNotBlank(connectMessage.payload().willTopic())
+                && connectMessage.payload().willMessageInBytes() != null
+                && connectMessage.payload().willMessageInBytes().length > 0) {
+            SparkplugTopic sparkplugTopicNode = parseTopicPublish(connectMessage.payload().willTopic());
+            if (NDEATH.equals(sparkplugTopicNode.getType())) {
+                return sparkplugTopicNode;
+            }
+        }
+        return null;
+    }
+
     @Override
     public void operationComplete(Future<? super Void> future) throws Exception {
         log.trace("[{}] Channel closed!", sessionId);
@@ -998,14 +1105,19 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
             transportService.process(deviceSessionCtx.getSessionInfo(), SESSION_EVENT_MSG_CLOSED, null);
             transportService.deregisterSession(deviceSessionCtx.getSessionInfo());
             if (gatewaySessionHandler != null) {
-                gatewaySessionHandler.onGatewayDisconnect();
+                gatewaySessionHandler.onDevicesDisconnect();
+            }
+            if (sparkplugSessionHandler != null) {
+                // add Msg Telemetry node: key STATE type: String value: OFFLINE ts: sparkplugBProto.getTimestamp()
+                sparkplugSessionHandler.sendSparkplugStateOnTelemetry(deviceSessionCtx.getSessionInfo(),
+                        deviceSessionCtx.getDeviceInfo().getDeviceName(), OFFLINE, new Date().getTime());
+                sparkplugSessionHandler.onDevicesDisconnect();
             }
             deviceSessionCtx.setDisconnected();
         }
         deviceSessionCtx.release();
     }
 
-
     private void onValidateDeviceResponse(ValidateDeviceCredentialsResponse msg, ChannelHandlerContext ctx, MqttConnectMessage connectMessage) {
         if (!msg.hasDeviceInfo()) {
             context.onAuthFailure(address);
@@ -1032,7 +1144,11 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
                 @Override
                 public void onSuccess(Void msg) {
                     SessionMetaData sessionMetaData = transportService.registerAsyncSession(deviceSessionCtx.getSessionInfo(), MqttTransportHandler.this);
-                    checkGatewaySession(sessionMetaData);
+                    if (deviceSessionCtx.isSparkplug()) {
+                        checkSparkplugNodeSession(connectMessage, ctx);
+                    } else {
+                        checkGatewaySession(sessionMetaData);
+                    }
                     ctx.writeAndFlush(createMqttConnAckMsg(ReturnCode.SUCCESS, connectMessage));
                     deviceSessionCtx.setConnected(true);
                     log.debug("[{}] Client connected!", sessionId);
@@ -1068,10 +1184,24 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     @Override
     public void onAttributeUpdate(UUID sessionId, TransportProtos.AttributeUpdateNotificationMsg notification) {
         log.trace("[{}] Received attributes update notification to device", sessionId);
-        String topic = attrSubTopicType.getAttributesSubTopic();
-        MqttTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(attrSubTopicType);
         try {
-            adaptor.convertToPublish(deviceSessionCtx, notification, topic).ifPresent(deviceSessionCtx.getChannel()::writeAndFlush);
+            if (sparkplugSessionHandler != null) {
+                log.trace("[{}] Received attributes update notification to sparkplug device", sessionId);
+                notification.getSharedUpdatedList().forEach(tsKvProto -> {
+                    if (sparkplugSessionHandler.getNodeBirthMetrics().containsKey(tsKvProto.getKv().getKey())) {
+                        SparkplugTopic sparkplugTopic = new SparkplugTopic(sparkplugSessionHandler.getSparkplugTopicNode(),
+                                SparkplugMessageType.NCMD);
+                        sparkplugSessionHandler.createSparkplugMqttPublishMsg(tsKvProto,
+                                sparkplugTopic.toString(),
+                                sparkplugSessionHandler.getNodeBirthMetrics().get(tsKvProto.getKv().getKey()))
+                                .ifPresent(sparkplugSessionHandler::writeAndFlush);
+                    }
+                });
+            } else {
+                String topic = attrSubTopicType.getAttributesSubTopic();
+                MqttTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(attrSubTopicType);
+                adaptor.convertToPublish(deviceSessionCtx, notification, topic).ifPresent(deviceSessionCtx.getChannel()::writeAndFlush);
+            }
         } catch (Exception e) {
             log.trace("[{}] Failed to convert device attributes update to MQTT msg", sessionId, e);
         }
@@ -1080,47 +1210,84 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     @Override
     public void onRemoteSessionCloseCommand(UUID sessionId, TransportProtos.SessionCloseNotificationProto sessionCloseNotification) {
         log.trace("[{}] Received the remote command to close the session: {}", sessionId, sessionCloseNotification.getMessage());
+        transportService.deregisterSession(deviceSessionCtx.getSessionInfo());
         deviceSessionCtx.getChannel().close();
     }
 
     @Override
     public void onToDeviceRpcRequest(UUID sessionId, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) {
         log.trace("[{}] Received RPC command to device", sessionId);
-        String baseTopic = rpcSubTopicType.getRpcRequestTopicBase();
-        MqttTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(rpcSubTopicType);
         try {
-            adaptor.convertToPublish(deviceSessionCtx, rpcRequest, baseTopic).ifPresent(payload -> {
-                int msgId = ((MqttPublishMessage) payload).variableHeader().packetId();
-                if (isAckExpected(payload)) {
-                    rpcAwaitingAck.put(msgId, rpcRequest);
-                    context.getScheduler().schedule(() -> {
-                        TransportProtos.ToDeviceRpcRequestMsg msg = rpcAwaitingAck.remove(msgId);
-                        if (msg != null) {
-                            transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.TIMEOUT, TransportServiceCallback.EMPTY);
-                        }
-                    }, Math.max(0, Math.min(deviceSessionCtx.getContext().getTimeout(), rpcRequest.getExpirationTime() - System.currentTimeMillis())), TimeUnit.MILLISECONDS);
-                }
-                var cf = publish(payload, deviceSessionCtx);
-                cf.addListener(result -> {
-                    if (result.cause() == null) {
-                        if (!isAckExpected(payload)) {
-                            transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.DELIVERED, TransportServiceCallback.EMPTY);
-                        } else if (rpcRequest.getPersisted()) {
-                            transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.SENT, TransportServiceCallback.EMPTY);
-                        }
-                    } else {
-                        // TODO: send error
-                    }
-                });
-            });
+            if (sparkplugSessionHandler != null) {
+                handleToSparkplugDeviceRpcRequest(rpcRequest);
+            } else {
+                String baseTopic = rpcSubTopicType.getRpcRequestTopicBase();
+                MqttTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(rpcSubTopicType);
+                adaptor.convertToPublish(deviceSessionCtx, rpcRequest, baseTopic)
+                        .ifPresent(payload -> sendToDeviceRpcRequest(payload, rpcRequest, deviceSessionCtx.getSessionInfo()));
+            }
         } catch (Exception e) {
-            transportService.process(deviceSessionCtx.getSessionInfo(),
-                    TransportProtos.ToDeviceRpcResponseMsg.newBuilder()
-                            .setRequestId(rpcRequest.getRequestId()).setError("Failed to convert device RPC command to MQTT msg").build(), TransportServiceCallback.EMPTY);
             log.trace("[{}] Failed to convert device RPC command to MQTT msg", sessionId, e);
+            this.sendErrorRpcResponse(deviceSessionCtx.getSessionInfo(), rpcRequest.getRequestId(),
+                    ThingsboardErrorCode.INVALID_ARGUMENTS,
+                    "Failed to convert device RPC command to MQTT msg: " + rpcRequest.getMethodName() + rpcRequest.getParams());
         }
     }
 
+    private void handleToSparkplugDeviceRpcRequest(TransportProtos.ToDeviceRpcRequestMsg rpcRequest) throws ThingsboardException {
+        SparkplugMessageType messageType = SparkplugMessageType.parseMessageType(rpcRequest.getMethodName());
+        SparkplugRpcRequestHeader header;
+        if (StringUtils.isNotEmpty(rpcRequest.getParams())) {
+            header = JacksonUtil.fromString(rpcRequest.getParams(), SparkplugRpcRequestHeader.class);
+        } else {
+            header = new SparkplugRpcRequestHeader();
+        }
+        header.setMessageType(messageType.name());
+        TransportProtos.TsKvProto tsKvProto = getTsKvProto(header.getMetricName(), header.getValue(), new Date().getTime());
+        if (sparkplugSessionHandler.getNodeBirthMetrics().containsKey(tsKvProto.getKv().getKey())) {
+            SparkplugTopic sparkplugTopic = new SparkplugTopic(sparkplugSessionHandler.getSparkplugTopicNode(),
+                    messageType);
+            sparkplugSessionHandler.createSparkplugMqttPublishMsg(tsKvProto,
+                    sparkplugTopic.toString(),
+                    sparkplugSessionHandler.getNodeBirthMetrics().get(tsKvProto.getKv().getKey()))
+                    .ifPresent(payload -> sendToDeviceRpcRequest(payload, rpcRequest, deviceSessionCtx.getSessionInfo()));
+        } else {
+            sendErrorRpcResponse(deviceSessionCtx.getSessionInfo(), rpcRequest.getRequestId(),
+                    ThingsboardErrorCode.BAD_REQUEST_PARAMS, "Failed send To Node Rpc Request: " +
+                            rpcRequest.getMethodName() + ". This node does not have a metricName: [" + tsKvProto.getKv().getKey() + "]");
+        }
+    }
+
+    public void sendToDeviceRpcRequest(MqttMessage payload, TransportProtos.ToDeviceRpcRequestMsg rpcRequest, TransportProtos.SessionInfoProto sessionInfo) {
+        int msgId = ((MqttPublishMessage) payload).variableHeader().packetId();
+        if (isAckExpected(payload)) {
+            rpcAwaitingAck.put(msgId, rpcRequest);
+            context.getScheduler().schedule(() -> {
+                TransportProtos.ToDeviceRpcRequestMsg msg = rpcAwaitingAck.remove(msgId);
+                if (msg != null) {
+                    transportService.process(sessionInfo, rpcRequest, RpcStatus.TIMEOUT, TransportServiceCallback.EMPTY);
+                }
+            }, Math.max(0, Math.min(deviceSessionCtx.getContext().getTimeout(), rpcRequest.getExpirationTime() - System.currentTimeMillis())), TimeUnit.MILLISECONDS);
+        }
+        var cf = publish(payload, deviceSessionCtx);
+        cf.addListener(result -> {
+            if (result.cause() == null) {
+                if (!isAckExpected(payload)) {
+                    transportService.process(sessionInfo, rpcRequest, RpcStatus.DELIVERED, TransportServiceCallback.EMPTY);
+                } else if (rpcRequest.getPersisted()) {
+                    transportService.process(sessionInfo, rpcRequest, RpcStatus.SENT, TransportServiceCallback.EMPTY);
+                }
+                if (sparkplugSessionHandler != null) {
+                    this.sendSuccessRpcResponse(sessionInfo, rpcRequest.getRequestId(), ResponseCode.CONTENT, "Success: " + rpcRequest.getMethodName());
+                }
+            } else {
+                log.trace("[{}] Failed send To Device Rpc Request [{}]", sessionId, rpcRequest.getMethodName());
+                this.sendErrorRpcResponse(sessionInfo, rpcRequest.getRequestId(),
+                        ThingsboardErrorCode.INVALID_ARGUMENTS, " Failed send To Device Rpc Request: " + rpcRequest.getMethodName());
+            }
+        });
+    }
+
     @Override
     public void onToServerRpcResponse(TransportProtos.ToServerRpcResponseMsg rpcResponse) {
         log.trace("[{}] Received RPC response from server", sessionId);
@@ -1158,4 +1325,16 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
         ctx.close();
     }
 
+    public void sendErrorRpcResponse(TransportProtos.SessionInfoProto sessionInfo, int requestId, ThingsboardErrorCode result, String errorMsg) {
+        String payload = JacksonUtil.toString(SparkplugRpcResponseBody.builder().result(result.name()).error(errorMsg).build());
+        TransportProtos.ToDeviceRpcResponseMsg msg = TransportProtos.ToDeviceRpcResponseMsg.newBuilder().setRequestId(requestId).setError(payload).build();
+        transportService.process(sessionInfo, msg, null);
+    }
+
+    public void sendSuccessRpcResponse(TransportProtos.SessionInfoProto sessionInfo, int requestId, ResponseCode result, String successMsg) {
+        String payload = JacksonUtil.toString(SparkplugRpcResponseBody.builder().result(result.getName()).result(successMsg).build());
+        TransportProtos.ToDeviceRpcResponseMsg msg = TransportProtos.ToDeviceRpcResponseMsg.newBuilder().setRequestId(requestId).setError(payload).build();
+        transportService.process(sessionInfo, msg, null);
+    }
+
 }
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewayDeviceSessionContext.java
similarity index 93%
rename from common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java
rename to common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewayDeviceSessionContext.java
index a12a590610..e265a4c2f1 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewayDeviceSessionContext.java
@@ -35,14 +35,14 @@ import java.util.concurrent.ConcurrentMap;
  * Created by ashvayka on 19.01.17.
  */
 @Slf4j
-public class GatewayDeviceSessionCtx extends MqttDeviceAwareSessionContext implements SessionMsgListener {
+public abstract class AbstractGatewayDeviceSessionContext<T extends AbstractGatewaySessionHandler> extends MqttDeviceAwareSessionContext implements SessionMsgListener {
 
-    private final GatewaySessionHandler parent;
+    protected final T parent;
     private final TransportService transportService;
 
-    public GatewayDeviceSessionCtx(GatewaySessionHandler parent, TransportDeviceInfo deviceInfo,
-                                   DeviceProfile deviceProfile, ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap,
-                                   TransportService transportService) {
+    public AbstractGatewayDeviceSessionContext(T parent, TransportDeviceInfo deviceInfo,
+                                               DeviceProfile deviceProfile, ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap,
+                                               TransportService transportService) {
         super(UUID.randomUUID(), mqttQoSMap);
         this.parent = parent;
         setSessionInfo(SessionInfoProto.newBuilder()
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
new file mode 100644
index 0000000000..2bb59dc9e8
--- /dev/null
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
@@ -0,0 +1,767 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.session;
+
+
+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.SettableFuture;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.ProtocolStringList;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.mqtt.MqttMessage;
+import io.netty.handler.codec.mqtt.MqttPublishMessage;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ConcurrentReferenceHashMap;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.transport.TransportService;
+import org.thingsboard.server.common.transport.TransportServiceCallback;
+import org.thingsboard.server.common.transport.adaptor.AdaptorException;
+import org.thingsboard.server.common.transport.adaptor.JsonConverter;
+import org.thingsboard.server.common.transport.adaptor.ProtoConverter;
+import org.thingsboard.server.common.transport.auth.GetOrCreateDeviceFromGatewayResponse;
+import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
+import org.thingsboard.server.gen.transport.TransportApiProtos;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.gen.transport.TransportProtos.GetOrCreateDeviceFromGatewayRequestMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
+import org.thingsboard.server.transport.mqtt.MqttTransportContext;
+import org.thingsboard.server.transport.mqtt.MqttTransportHandler;
+import org.thingsboard.server.transport.mqtt.adaptors.JsonMqttAdaptor;
+import org.thingsboard.server.transport.mqtt.adaptors.MqttTransportAdaptor;
+import org.thingsboard.server.transport.mqtt.adaptors.ProtoMqttAdaptor;
+import org.thingsboard.server.transport.mqtt.util.ReturnCode;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugConnectionState;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import static org.springframework.util.ConcurrentReferenceHashMap.ReferenceType;
+import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_CLOSED;
+import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_OPEN;
+import static org.thingsboard.server.common.transport.service.DefaultTransportService.SUBSCRIBE_TO_ATTRIBUTE_UPDATES_ASYNC_MSG;
+import static org.thingsboard.server.common.transport.service.DefaultTransportService.SUBSCRIBE_TO_RPC_ASYNC_MSG;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugConnectionState.OFFLINE;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType.STATE;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType.messageName;
+
+/**
+ * Created by ashvayka on 19.01.17.
+ */
+@Slf4j
+public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDeviceSessionContext> {
+
+    protected static final String DEFAULT_DEVICE_TYPE = "default";
+    private static final String CAN_T_PARSE_VALUE = "Can't parse value: ";
+    private static final String DEVICE_PROPERTY = "device";
+
+    protected final MqttTransportContext context;
+    protected final TransportService transportService;
+    protected final TransportDeviceInfo gateway;
+    protected final UUID sessionId;
+    private final ConcurrentMap<String, Lock> deviceCreationLockMap;
+    private final ConcurrentMap<String, T> devices;
+    private final ConcurrentMap<String, ListenableFuture<T>> deviceFutures;
+    protected final ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap;
+    protected final ChannelHandlerContext channel;
+    protected final DeviceSessionCtx deviceSessionCtx;
+
+    public AbstractGatewaySessionHandler(DeviceSessionCtx deviceSessionCtx, UUID sessionId) {
+        this.context = deviceSessionCtx.getContext();
+        this.transportService = context.getTransportService();
+        this.deviceSessionCtx = deviceSessionCtx;
+        this.gateway = deviceSessionCtx.getDeviceInfo();
+        this.sessionId = sessionId;
+        this.devices = new ConcurrentHashMap<>();
+        this.deviceFutures = new ConcurrentHashMap<>();
+        this.deviceCreationLockMap = createWeakMap();
+        this.mqttQoSMap = deviceSessionCtx.getMqttQoSMap();
+        this.channel = deviceSessionCtx.getChannel();
+    }
+
+    ConcurrentReferenceHashMap<String, Lock> createWeakMap() {
+        return new ConcurrentReferenceHashMap<>(16, ReferenceType.WEAK);
+    }
+
+    public void onDeviceDisconnect(MqttPublishMessage mqttMsg) throws AdaptorException {
+        if (isJsonPayloadType()) {
+            onDeviceDisconnectJson(mqttMsg);
+        } else {
+            onGatewayDeviceDisconnectProto(mqttMsg);
+        }
+    }
+
+    public void onDeviceClaim(MqttPublishMessage mqttMsg) throws AdaptorException {
+        int msgId = getMsgId(mqttMsg);
+        ByteBuf payload = mqttMsg.payload();
+        if (isJsonPayloadType()) {
+            onDeviceClaimJson(msgId, payload);
+        } else {
+            onDeviceClaimProto(msgId, payload);
+        }
+    }
+
+    public void onDeviceAttributes(MqttPublishMessage mqttMsg) throws AdaptorException {
+        int msgId = getMsgId(mqttMsg);
+        ByteBuf payload = mqttMsg.payload();
+        if (isJsonPayloadType()) {
+            onDeviceAttributesJson(msgId, payload);
+        } else {
+            onDeviceAttributesProto(msgId, payload);
+        }
+    }
+
+    public void onDeviceAttributesRequest(MqttPublishMessage mqttMsg) throws AdaptorException {
+        if (isJsonPayloadType()) {
+            onDeviceAttributesRequestJson(mqttMsg);
+        } else {
+            onDeviceAttributesRequestProto(mqttMsg);
+        }
+    }
+
+    public void onDeviceRpcResponse(MqttPublishMessage mqttMsg) throws AdaptorException {
+        int msgId = getMsgId(mqttMsg);
+        ByteBuf payload = mqttMsg.payload();
+        if (isJsonPayloadType()) {
+            onDeviceRpcResponseJson(msgId, payload);
+        } else {
+            onDeviceRpcResponseProto(msgId, payload);
+        }
+    }
+
+    public void onDevicesDisconnect() {
+        devices.forEach(this::deregisterSession);
+    }
+
+    public void onDeviceDeleted(String deviceName) {
+        deregisterSession(deviceName);
+    }
+
+    public String getNodeId() {
+        return context.getNodeId();
+    }
+
+    public UUID getSessionId() {
+        return sessionId;
+    }
+
+    public MqttTransportAdaptor getPayloadAdaptor() {
+        return deviceSessionCtx.getPayloadAdaptor();
+    }
+
+    void deregisterSession(String deviceName) {
+        MqttDeviceAwareSessionContext deviceSessionCtx = devices.remove(deviceName);
+        if (deviceSessionCtx != null) {
+            deregisterSession(deviceName, deviceSessionCtx);
+        } else {
+            log.debug("[{}] Device [{}] was already removed from the gateway session", sessionId, deviceName);
+        }
+    }
+
+    public ChannelFuture writeAndFlush(MqttMessage mqttMessage) {
+        return channel.writeAndFlush(mqttMessage);
+    }
+
+    int nextMsgId() {
+        return deviceSessionCtx.nextMsgId();
+    }
+
+    protected boolean isJsonPayloadType() {
+        return deviceSessionCtx.isJsonPayloadType();
+    }
+
+    protected void processOnConnect(MqttPublishMessage msg, String deviceName, String deviceType) {
+        log.trace("[{}] onDeviceConnect: {}", sessionId, deviceName);
+        Futures.addCallback(onDeviceConnect(deviceName, deviceType), new FutureCallback<>() {
+            @Override
+            public void onSuccess(@Nullable T result) {
+                ack(msg, ReturnCode.SUCCESS);
+                log.trace("[{}] onDeviceConnectOk: {}", sessionId, deviceName);
+            }
+
+            @Override
+            public void onFailure(Throwable t) {
+                log.warn("[{}] Failed to process device connect command: {}", sessionId, deviceName, t);
+
+            }
+        }, context.getExecutor());
+    }
+
+    ListenableFuture<T> onDeviceConnect(String deviceName, String deviceType) {
+        T result = devices.get(deviceName);
+        if (result == null) {
+            Lock deviceCreationLock = deviceCreationLockMap.computeIfAbsent(deviceName, s -> new ReentrantLock());
+            deviceCreationLock.lock();
+            try {
+                result = devices.get(deviceName);
+                if (result == null) {
+                    return getDeviceCreationFuture(deviceName, deviceType);
+                } else {
+                    return Futures.immediateFuture(result);
+                }
+            } finally {
+                deviceCreationLock.unlock();
+            }
+        } else {
+            return Futures.immediateFuture(result);
+        }
+    }
+
+    private ListenableFuture<T> getDeviceCreationFuture(String deviceName, String deviceType) {
+        final SettableFuture<T> futureToSet = SettableFuture.create();
+        ListenableFuture<T> future = deviceFutures.putIfAbsent(deviceName, futureToSet);
+        if (future != null) {
+            return future;
+        }
+        try {
+            transportService.process(GetOrCreateDeviceFromGatewayRequestMsg.newBuilder()
+                            .setDeviceName(deviceName)
+                            .setDeviceType(deviceType)
+                            .setGatewayIdMSB(gateway.getDeviceId().getId().getMostSignificantBits())
+                            .setGatewayIdLSB(gateway.getDeviceId().getId().getLeastSignificantBits())
+                            .setSparkplug(this.deviceSessionCtx.isSparkplug())
+                            .build(),
+                    new TransportServiceCallback<>() {
+                        @Override
+                        public void onSuccess(GetOrCreateDeviceFromGatewayResponse msg) {
+                            T deviceSessionCtx = newDeviceSessionCtx(msg);
+                            if (devices.putIfAbsent(deviceName, deviceSessionCtx) == null) {
+                                log.trace("[{}] First got or created device [{}], type [{}] for the gateway session", sessionId, deviceName, deviceType);
+                                SessionInfoProto deviceSessionInfo = deviceSessionCtx.getSessionInfo();
+                                transportService.registerAsyncSession(deviceSessionInfo, deviceSessionCtx);
+                                transportService.process(TransportProtos.TransportToDeviceActorMsg.newBuilder()
+                                        .setSessionInfo(deviceSessionInfo)
+                                        .setSessionEvent(SESSION_EVENT_MSG_OPEN)
+                                        .setSubscribeToAttributes(SUBSCRIBE_TO_ATTRIBUTE_UPDATES_ASYNC_MSG)
+                                        .setSubscribeToRPC(SUBSCRIBE_TO_RPC_ASYNC_MSG)
+                                        .build(), null);
+                            }
+                            futureToSet.set(devices.get(deviceName));
+                            deviceFutures.remove(deviceName);
+                        }
+
+                        @Override
+                        public void onError(Throwable e) {
+                            log.warn("[{}] Failed to process device connect command: {}", sessionId, deviceName, e);
+                            futureToSet.setException(e);
+                            deviceFutures.remove(deviceName);
+                        }
+                    });
+            return futureToSet;
+        } catch (Throwable e) {
+            deviceFutures.remove(deviceName);
+            throw e;
+        }
+    }
+
+    protected abstract T newDeviceSessionCtx(GetOrCreateDeviceFromGatewayResponse msg);
+
+    protected int getMsgId(MqttPublishMessage mqttMsg) {
+        return mqttMsg.variableHeader().packetId();
+    }
+
+    protected void onDeviceConnectJson(MqttPublishMessage mqttMsg) throws AdaptorException {
+        JsonElement json = getJson(mqttMsg);
+        String deviceName = checkDeviceName(getDeviceName(json));
+        String deviceType = getDeviceType(json);
+        processOnConnect(mqttMsg, deviceName, deviceType);
+    }
+
+    protected void onDeviceConnectProto(MqttPublishMessage mqttMsg) throws AdaptorException {
+        try {
+            TransportApiProtos.ConnectMsg connectProto = TransportApiProtos.ConnectMsg.parseFrom(getBytes(mqttMsg.payload()));
+            String deviceName = checkDeviceName(connectProto.getDeviceName());
+            String deviceType = StringUtils.isEmpty(connectProto.getDeviceType()) ? DEFAULT_DEVICE_TYPE : connectProto.getDeviceType();
+            processOnConnect(mqttMsg, deviceName, deviceType);
+        } catch (RuntimeException | InvalidProtocolBufferException e) {
+            throw new AdaptorException(e);
+        }
+    }
+
+    private void onDeviceDisconnectJson(MqttPublishMessage msg) throws AdaptorException {
+        String deviceName = checkDeviceName(getDeviceName(getJson(msg)));
+        processOnDisconnect(msg, deviceName);
+    }
+
+    protected void onGatewayDeviceDisconnectProto(MqttPublishMessage mqttMsg) throws AdaptorException {
+        try {
+            TransportApiProtos.DisconnectMsg connectProto = TransportApiProtos.DisconnectMsg.parseFrom(getBytes(mqttMsg.payload()));
+            String deviceName = checkDeviceName(connectProto.getDeviceName());
+            processOnDisconnect(mqttMsg, deviceName);
+        } catch (RuntimeException | InvalidProtocolBufferException e) {
+            throw new AdaptorException(e);
+        }
+    }
+
+    void processOnDisconnect(MqttPublishMessage msg, String deviceName) {
+        deregisterSession(deviceName);
+        ack(msg, ReturnCode.SUCCESS);
+    }
+
+    protected void onDeviceTelemetryJson(int msgId, ByteBuf payload) throws AdaptorException {
+        JsonElement json = JsonMqttAdaptor.validateJsonPayload(sessionId, payload);
+        if (json.isJsonObject()) {
+            JsonObject jsonObj = json.getAsJsonObject();
+            for (Map.Entry<String, JsonElement> deviceEntry : jsonObj.entrySet()) {
+                String deviceName = deviceEntry.getKey();
+                Futures.addCallback(checkDeviceConnected(deviceName),
+                        new FutureCallback<>() {
+                            @Override
+                            public void onSuccess(@Nullable T deviceCtx) {
+                                if (!deviceEntry.getValue().isJsonArray()) {
+                                    throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
+                                }
+                                try {
+                                    TransportProtos.PostTelemetryMsg postTelemetryMsg = JsonConverter.convertToTelemetryProto(deviceEntry.getValue().getAsJsonArray());
+                                    processPostTelemetryMsg(deviceCtx, postTelemetryMsg, deviceName, msgId);
+                                } catch (Throwable e) {
+                                    log.warn("[{}][{}] Failed to convert telemetry: {}", gateway.getDeviceId(), deviceName, deviceEntry.getValue(), e);
+                                    channel.close();
+                                }
+                            }
+
+                            @Override
+                            public void onFailure(Throwable t) {
+                                log.debug("[{}] Failed to process device telemetry command: {}", sessionId, deviceName, t);
+                            }
+                        }, context.getExecutor());
+            }
+        } else {
+            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
+        }
+    }
+
+    protected void onDeviceTelemetryProto(int msgId, ByteBuf payload) throws AdaptorException {
+        try {
+            TransportApiProtos.GatewayTelemetryMsg telemetryMsgProto = TransportApiProtos.GatewayTelemetryMsg.parseFrom(getBytes(payload));
+            List<TransportApiProtos.TelemetryMsg> deviceMsgList = telemetryMsgProto.getMsgList();
+            if (!CollectionUtils.isEmpty(deviceMsgList)) {
+                deviceMsgList.forEach(telemetryMsg -> {
+                    String deviceName = checkDeviceName(telemetryMsg.getDeviceName());
+                    Futures.addCallback(checkDeviceConnected(deviceName),
+                            new FutureCallback<>() {
+                                @Override
+                                public void onSuccess(@Nullable T deviceCtx) {
+                                    TransportProtos.PostTelemetryMsg msg = telemetryMsg.getMsg();
+                                    try {
+                                        TransportProtos.PostTelemetryMsg postTelemetryMsg = ProtoConverter.validatePostTelemetryMsg(msg.toByteArray());
+                                        processPostTelemetryMsg(deviceCtx, postTelemetryMsg, deviceName, msgId);
+                                    } catch (Throwable e) {
+                                        log.warn("[{}][{}] Failed to convert telemetry: {}", gateway.getDeviceId(), deviceName, msg, e);
+                                        channel.close();
+                                    }
+                                }
+
+                                @Override
+                                public void onFailure(Throwable t) {
+                                    log.debug("[{}] Failed to process device telemetry command: {}", sessionId, deviceName, t);
+                                }
+                            }, context.getExecutor());
+                });
+            } else {
+                log.debug("[{}] Devices telemetry messages is empty for: [{}]", sessionId, gateway.getDeviceId());
+                throw new IllegalArgumentException("[" + sessionId + "] Devices telemetry messages is empty for [" + gateway.getDeviceId() + "]");
+            }
+        } catch (RuntimeException | InvalidProtocolBufferException e) {
+            throw new AdaptorException(e);
+        }
+    }
+
+    public void processPostTelemetryMsg(MqttDeviceAwareSessionContext deviceCtx, TransportProtos.PostTelemetryMsg postTelemetryMsg, String deviceName, int msgId) {
+        transportService.process(deviceCtx.getSessionInfo(), postTelemetryMsg, getPubAckCallback(channel, deviceName, msgId, postTelemetryMsg));
+    }
+
+    public TransportProtos.PostTelemetryMsg postTelemetryMsgCreated(TransportProtos.KeyValueProto keyValueProto, long ts) {
+        List<TransportProtos.KeyValueProto> result = new ArrayList<>();
+        result.add(keyValueProto);
+        TransportProtos.PostTelemetryMsg.Builder request = TransportProtos.PostTelemetryMsg.newBuilder();
+        TransportProtos.TsKvListProto.Builder builder = TransportProtos.TsKvListProto.newBuilder();
+        builder.setTs(ts);
+        builder.addAllKv(result);
+        request.addTsKvList(builder.build());
+        return request.build();
+    }
+
+    private void onDeviceClaimJson(int msgId, ByteBuf payload) throws AdaptorException {
+        JsonElement json = JsonMqttAdaptor.validateJsonPayload(sessionId, payload);
+        if (json.isJsonObject()) {
+            JsonObject jsonObj = json.getAsJsonObject();
+            for (Map.Entry<String, JsonElement> deviceEntry : jsonObj.entrySet()) {
+                String deviceName = deviceEntry.getKey();
+                Futures.addCallback(checkDeviceConnected(deviceName),
+                        new FutureCallback<>() {
+                            @Override
+                            public void onSuccess(@Nullable T deviceCtx) {
+                                if (!deviceEntry.getValue().isJsonObject()) {
+                                    throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
+                                }
+                                try {
+                                    DeviceId deviceId = deviceCtx.getDeviceId();
+                                    TransportProtos.ClaimDeviceMsg claimDeviceMsg = JsonConverter.convertToClaimDeviceProto(deviceId, deviceEntry.getValue());
+                                    processClaimDeviceMsg(deviceCtx, claimDeviceMsg, deviceName, msgId);
+                                } catch (Throwable e) {
+                                    log.warn("[{}][{}] Failed to convert claim message: {}", gateway.getDeviceId(), deviceName, deviceEntry.getValue(), e);
+                                }
+                            }
+
+                            @Override
+                            public void onFailure(Throwable t) {
+                                log.debug("[{}] Failed to process device claiming command: {}", sessionId, deviceName, t);
+                            }
+                        }, context.getExecutor());
+            }
+        } else {
+            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
+        }
+    }
+
+    private void onDeviceClaimProto(int msgId, ByteBuf payload) throws AdaptorException {
+        try {
+            TransportApiProtos.GatewayClaimMsg claimMsgProto = TransportApiProtos.GatewayClaimMsg.parseFrom(getBytes(payload));
+            List<TransportApiProtos.ClaimDeviceMsg> claimMsgList = claimMsgProto.getMsgList();
+            if (!CollectionUtils.isEmpty(claimMsgList)) {
+                claimMsgList.forEach(claimDeviceMsg -> {
+                    String deviceName = checkDeviceName(claimDeviceMsg.getDeviceName());
+                    Futures.addCallback(checkDeviceConnected(deviceName),
+                            new FutureCallback<>() {
+                                @Override
+                                public void onSuccess(@Nullable T deviceCtx) {
+                                    TransportApiProtos.ClaimDevice claimRequest = claimDeviceMsg.getClaimRequest();
+                                    if (claimRequest == null) {
+                                        throw new IllegalArgumentException("Claim request for device: " + deviceName + " is null!");
+                                    }
+                                    try {
+                                        DeviceId deviceId = deviceCtx.getDeviceId();
+                                        TransportProtos.ClaimDeviceMsg claimDeviceMsg = ProtoConverter.convertToClaimDeviceProto(deviceId, claimRequest.toByteArray());
+                                        processClaimDeviceMsg(deviceCtx, claimDeviceMsg, deviceName, msgId);
+                                    } catch (Throwable e) {
+                                        log.warn("[{}][{}] Failed to convert claim message: {}", gateway.getDeviceId(), deviceName, claimRequest, e);
+                                    }
+                                }
+
+                                @Override
+                                public void onFailure(Throwable t) {
+                                    log.debug("[{}] Failed to process device claiming command: {}", sessionId, deviceName, t);
+                                }
+                            }, context.getExecutor());
+                });
+            } else {
+                log.debug("[{}] Devices claim messages is empty for: [{}]", sessionId, gateway.getDeviceId());
+                throw new IllegalArgumentException("[" + sessionId + "] Devices claim messages is empty for [" + gateway.getDeviceId() + "]");
+            }
+        } catch (RuntimeException | InvalidProtocolBufferException e) {
+            throw new AdaptorException(e);
+        }
+    }
+
+    private void processClaimDeviceMsg(MqttDeviceAwareSessionContext deviceCtx, TransportProtos.ClaimDeviceMsg claimDeviceMsg, String deviceName, int msgId) {
+        transportService.process(deviceCtx.getSessionInfo(), claimDeviceMsg, getPubAckCallback(channel, deviceName, msgId, claimDeviceMsg));
+    }
+
+    private void onDeviceAttributesJson(int msgId, ByteBuf payload) throws AdaptorException {
+        JsonElement json = JsonMqttAdaptor.validateJsonPayload(sessionId, payload);
+        if (json.isJsonObject()) {
+            JsonObject jsonObj = json.getAsJsonObject();
+            for (Map.Entry<String, JsonElement> deviceEntry : jsonObj.entrySet()) {
+                String deviceName = deviceEntry.getKey();
+                Futures.addCallback(checkDeviceConnected(deviceName),
+                        new FutureCallback<>() {
+                            @Override
+                            public void onSuccess(@Nullable T deviceCtx) {
+                                if (!deviceEntry.getValue().isJsonObject()) {
+                                    throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
+                                }
+                                TransportProtos.PostAttributeMsg postAttributeMsg = JsonConverter.convertToAttributesProto(deviceEntry.getValue().getAsJsonObject());
+                                processPostAttributesMsg(deviceCtx, postAttributeMsg, deviceName, msgId);
+                            }
+
+                            @Override
+                            public void onFailure(Throwable t) {
+                                log.debug("[{}] Failed to process device attributes command: {}", sessionId, deviceName, t);
+                            }
+                        }, context.getExecutor());
+            }
+        } else {
+            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
+        }
+    }
+
+    private void onDeviceAttributesProto(int msgId, ByteBuf payload) throws AdaptorException {
+        try {
+            TransportApiProtos.GatewayAttributesMsg attributesMsgProto = TransportApiProtos.GatewayAttributesMsg.parseFrom(getBytes(payload));
+            List<TransportApiProtos.AttributesMsg> attributesMsgList = attributesMsgProto.getMsgList();
+            if (!CollectionUtils.isEmpty(attributesMsgList)) {
+                attributesMsgList.forEach(attributesMsg -> {
+                    String deviceName = checkDeviceName(attributesMsg.getDeviceName());
+                    Futures.addCallback(checkDeviceConnected(deviceName),
+                            new FutureCallback<>() {
+                                @Override
+                                public void onSuccess(@Nullable T deviceCtx) {
+                                    TransportProtos.PostAttributeMsg kvListProto = attributesMsg.getMsg();
+                                    if (kvListProto == null) {
+                                        throw new IllegalArgumentException("Attributes List for device: " + deviceName + " is empty!");
+                                    }
+                                    try {
+                                        TransportProtos.PostAttributeMsg postAttributeMsg = ProtoConverter.validatePostAttributeMsg(kvListProto.toByteArray());
+                                        processPostAttributesMsg(deviceCtx, postAttributeMsg, deviceName, msgId);
+                                    } catch (Throwable e) {
+                                        log.warn("[{}][{}] Failed to process device attributes command: {}", gateway.getDeviceId(), deviceName, kvListProto, e);
+                                    }
+                                }
+
+                                @Override
+                                public void onFailure(Throwable t) {
+                                    log.debug("[{}] Failed to process device attributes command: {}", sessionId, deviceName, t);
+                                }
+                            }, context.getExecutor());
+                });
+            } else {
+                log.debug("[{}] Devices attributes keys list is empty for: [{}]", sessionId, gateway.getDeviceId());
+                throw new IllegalArgumentException("[" + sessionId + "] Devices attributes keys list is empty for [" + gateway.getDeviceId() + "]");
+            }
+        } catch (RuntimeException | InvalidProtocolBufferException e) {
+            throw new AdaptorException(e);
+        }
+    }
+
+    protected void processPostAttributesMsg(MqttDeviceAwareSessionContext deviceCtx, TransportProtos.PostAttributeMsg postAttributeMsg, String deviceName, int msgId) {
+        transportService.process(deviceCtx.getSessionInfo(), postAttributeMsg, getPubAckCallback(channel, deviceName, msgId, postAttributeMsg));
+    }
+
+    private void onDeviceAttributesRequestJson(MqttPublishMessage msg) throws AdaptorException {
+        JsonElement json = JsonMqttAdaptor.validateJsonPayload(sessionId, msg.payload());
+        if (json.isJsonObject()) {
+            JsonObject jsonObj = json.getAsJsonObject();
+            int requestId = jsonObj.get("id").getAsInt();
+            String deviceName = jsonObj.get(DEVICE_PROPERTY).getAsString();
+            boolean clientScope = jsonObj.get("client").getAsBoolean();
+            Set<String> keys;
+            if (jsonObj.has("key")) {
+                keys = Collections.singleton(jsonObj.get("key").getAsString());
+            } else {
+                JsonArray keysArray = jsonObj.get("keys").getAsJsonArray();
+                keys = new HashSet<>();
+                for (JsonElement keyObj : keysArray) {
+                    keys.add(keyObj.getAsString());
+                }
+            }
+            TransportProtos.GetAttributeRequestMsg requestMsg = toGetAttributeRequestMsg(requestId, clientScope, keys);
+            processGetAttributeRequestMessage(msg, deviceName, requestMsg);
+        } else {
+            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
+        }
+    }
+
+    private void onDeviceAttributesRequestProto(MqttPublishMessage mqttMsg) throws AdaptorException {
+        try {
+            TransportApiProtos.GatewayAttributesRequestMsg gatewayAttributesRequestMsg = TransportApiProtos.GatewayAttributesRequestMsg.parseFrom(getBytes(mqttMsg.payload()));
+            String deviceName = checkDeviceName(gatewayAttributesRequestMsg.getDeviceName());
+            int requestId = gatewayAttributesRequestMsg.getId();
+            boolean clientScope = gatewayAttributesRequestMsg.getClient();
+            ProtocolStringList keysList = gatewayAttributesRequestMsg.getKeysList();
+            Set<String> keys = new HashSet<>(keysList);
+            TransportProtos.GetAttributeRequestMsg requestMsg = toGetAttributeRequestMsg(requestId, clientScope, keys);
+            processGetAttributeRequestMessage(mqttMsg, deviceName, requestMsg);
+        } catch (RuntimeException | InvalidProtocolBufferException e) {
+            throw new AdaptorException(e);
+        }
+    }
+
+    private void onDeviceRpcResponseJson(int msgId, ByteBuf payload) throws AdaptorException {
+        JsonElement json = JsonMqttAdaptor.validateJsonPayload(sessionId, payload);
+        if (json.isJsonObject()) {
+            JsonObject jsonObj = json.getAsJsonObject();
+            String deviceName = jsonObj.get(DEVICE_PROPERTY).getAsString();
+            Futures.addCallback(checkDeviceConnected(deviceName),
+                    new FutureCallback<>() {
+                        @Override
+                        public void onSuccess(@Nullable T deviceCtx) {
+                            Integer requestId = jsonObj.get("id").getAsInt();
+                            String data = jsonObj.get("data").toString();
+                            TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = TransportProtos.ToDeviceRpcResponseMsg.newBuilder()
+                                    .setRequestId(requestId).setPayload(data).build();
+                            processRpcResponseMsg(deviceCtx, rpcResponseMsg, deviceName, msgId);
+                        }
+
+                        @Override
+                        public void onFailure(Throwable t) {
+                            log.debug("[{}] Failed to process device Rpc response command: {}", sessionId, deviceName, t);
+                        }
+                    }, context.getExecutor());
+        } else {
+            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
+        }
+    }
+
+    private void onDeviceRpcResponseProto(int msgId, ByteBuf payload) throws AdaptorException {
+        try {
+            TransportApiProtos.GatewayRpcResponseMsg gatewayRpcResponseMsg = TransportApiProtos.GatewayRpcResponseMsg.parseFrom(getBytes(payload));
+            String deviceName = checkDeviceName(gatewayRpcResponseMsg.getDeviceName());
+            Futures.addCallback(checkDeviceConnected(deviceName),
+                    new FutureCallback<>() {
+                        @Override
+                        public void onSuccess(@Nullable T deviceCtx) {
+                            Integer requestId = gatewayRpcResponseMsg.getId();
+                            String data = gatewayRpcResponseMsg.getData();
+                            TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = TransportProtos.ToDeviceRpcResponseMsg.newBuilder()
+                                    .setRequestId(requestId).setPayload(data).build();
+                            processRpcResponseMsg(deviceCtx, rpcResponseMsg, deviceName, msgId);
+                        }
+
+                        @Override
+                        public void onFailure(Throwable t) {
+                            log.debug("[{}] Failed to process device Rpc response command: {}", sessionId, deviceName, t);
+                        }
+                    }, context.getExecutor());
+        } catch (RuntimeException | InvalidProtocolBufferException e) {
+            throw new AdaptorException(e);
+        }
+    }
+
+    private void processRpcResponseMsg(MqttDeviceAwareSessionContext deviceCtx, TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg, String deviceName, int msgId) {
+        transportService.process(deviceCtx.getSessionInfo(), rpcResponseMsg, getPubAckCallback(channel, deviceName, msgId, rpcResponseMsg));
+    }
+
+    private void processGetAttributeRequestMessage(MqttPublishMessage mqttMsg, String deviceName, TransportProtos.GetAttributeRequestMsg requestMsg) {
+        int msgId = getMsgId(mqttMsg);
+        Futures.addCallback(checkDeviceConnected(deviceName),
+                new FutureCallback<>() {
+                    @Override
+                    public void onSuccess(@Nullable T deviceCtx) {
+                        transportService.process(deviceCtx.getSessionInfo(), requestMsg, getPubAckCallback(channel, deviceName, msgId, requestMsg));
+                    }
+
+                    @Override
+                    public void onFailure(Throwable t) {
+                        ack(mqttMsg, ReturnCode.IMPLEMENTATION_SPECIFIC);
+                        log.debug("[{}] Failed to process device attributes request command: {}", sessionId, deviceName, t);
+                    }
+                }, context.getExecutor());
+    }
+
+    private TransportProtos.GetAttributeRequestMsg toGetAttributeRequestMsg(int requestId, boolean clientScope, Set<String> keys) {
+        TransportProtos.GetAttributeRequestMsg.Builder result = TransportProtos.GetAttributeRequestMsg.newBuilder();
+        result.setRequestId(requestId);
+
+        if (clientScope) {
+            result.addAllClientAttributeNames(keys);
+        } else {
+            result.addAllSharedAttributeNames(keys);
+        }
+        return result.build();
+    }
+
+    protected ListenableFuture<T> checkDeviceConnected(String deviceName) {
+        T ctx = devices.get(deviceName);
+        if (ctx == null) {
+            log.debug("[{}] Missing device [{}] for the gateway session", sessionId, deviceName);
+            return onDeviceConnect(deviceName, DEFAULT_DEVICE_TYPE);
+        } else {
+            return Futures.immediateFuture(ctx);
+        }
+    }
+
+    protected String checkDeviceName(String deviceName) {
+        if (StringUtils.isEmpty(deviceName)) {
+            throw new RuntimeException("Device name is empty!");
+        } else {
+            return deviceName;
+        }
+    }
+
+    private String getDeviceName(JsonElement json) {
+        return json.getAsJsonObject().get(DEVICE_PROPERTY).getAsString();
+    }
+
+    private String getDeviceType(JsonElement json) {
+        JsonElement type = json.getAsJsonObject().get("type");
+        return type == null || type instanceof JsonNull ? DEFAULT_DEVICE_TYPE : type.getAsString();
+    }
+
+    private JsonElement getJson(MqttPublishMessage mqttMsg) throws AdaptorException {
+        return JsonMqttAdaptor.validateJsonPayload(sessionId, mqttMsg.payload());
+    }
+
+    protected byte[] getBytes(ByteBuf payload) {
+        return ProtoMqttAdaptor.toBytes(payload);
+    }
+
+    protected void ack(MqttPublishMessage msg, ReturnCode returnCode) {
+        int msgId = getMsgId(msg);
+        if (msgId > 0) {
+            writeAndFlush(MqttTransportHandler.createMqttPubAckMsg(deviceSessionCtx, msgId, returnCode));
+        }
+    }
+
+    private void deregisterSession(String deviceName, MqttDeviceAwareSessionContext deviceSessionCtx) {
+        if (this.deviceSessionCtx.isSparkplug()) {
+            sendSparkplugStateOnTelemetry(deviceSessionCtx.getSessionInfo(),
+                    deviceSessionCtx.getDeviceInfo().getDeviceName(), OFFLINE, new Date().getTime());
+        }
+        transportService.deregisterSession(deviceSessionCtx.getSessionInfo());
+        transportService.process(deviceSessionCtx.getSessionInfo(), SESSION_EVENT_MSG_CLOSED, null);
+        log.debug("[{}] Removed device [{}] from the gateway session", sessionId, deviceName);
+    }
+
+    public void sendSparkplugStateOnTelemetry(TransportProtos.SessionInfoProto sessionInfo, String deviceName, SparkplugConnectionState connectionState, long ts) {
+        TransportProtos.KeyValueProto.Builder keyValueProtoBuilder = TransportProtos.KeyValueProto.newBuilder();
+        keyValueProtoBuilder.setKey(messageName(STATE));
+        keyValueProtoBuilder.setType(TransportProtos.KeyValueType.STRING_V);
+        keyValueProtoBuilder.setStringV(connectionState.name());
+        TransportProtos.PostTelemetryMsg postTelemetryMsg = postTelemetryMsgCreated(keyValueProtoBuilder.build(), ts);
+        transportService.process(sessionInfo, postTelemetryMsg, getPubAckCallback(channel, deviceName, -1, postTelemetryMsg));
+    }
+
+    private <T> TransportServiceCallback<Void> getPubAckCallback(final ChannelHandlerContext ctx, final String deviceName, final int msgId, final T msg) {
+        return new TransportServiceCallback<Void>() {
+            @Override
+            public void onSuccess(Void dummy) {
+                log.trace("[{}][{}] Published msg: {}", sessionId, deviceName, msg);
+                if (msgId > 0) {
+                    ctx.writeAndFlush(MqttTransportHandler.createMqttPubAckMsg(deviceSessionCtx, msgId, ReturnCode.SUCCESS));
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                log.trace("[{}] Failed to publish msg: {} for device: {}", sessionId, msg, deviceName, e);
+                ctx.close();
+            }
+        };
+    }
+
+}
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionContext.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionContext.java
new file mode 100644
index 0000000000..e94a98d287
--- /dev/null
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionContext.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.session;
+
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.transport.TransportService;
+import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
+
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * Created by nickAS21 on 26.12.22
+ */
+public class GatewayDeviceSessionContext extends AbstractGatewayDeviceSessionContext<GatewaySessionHandler> {
+
+    public GatewayDeviceSessionContext(GatewaySessionHandler parent,
+                                       TransportDeviceInfo deviceInfo,
+                                       DeviceProfile deviceProfile,
+                                       ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap,
+                                       TransportService transportService) {
+        super(parent, deviceInfo, deviceProfile, mqttQoSMap, transportService);
+    }
+
+}
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java
index bf40cb8439..de0f2a502b 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java
@@ -15,100 +15,20 @@
  */
 package org.thingsboard.server.transport.mqtt.session;
 
-
-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.SettableFuture;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonNull;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ProtocolStringList;
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.mqtt.MqttMessage;
 import io.netty.handler.codec.mqtt.MqttPublishMessage;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ConcurrentReferenceHashMap;
-import org.thingsboard.server.common.data.StringUtils;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.transport.TransportService;
-import org.thingsboard.server.common.transport.TransportServiceCallback;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
-import org.thingsboard.server.common.transport.adaptor.JsonConverter;
-import org.thingsboard.server.common.transport.adaptor.ProtoConverter;
 import org.thingsboard.server.common.transport.auth.GetOrCreateDeviceFromGatewayResponse;
-import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
-import org.thingsboard.server.gen.transport.TransportApiProtos;
-import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.gen.transport.TransportProtos.GetOrCreateDeviceFromGatewayRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
-import org.thingsboard.server.transport.mqtt.MqttTransportContext;
-import org.thingsboard.server.transport.mqtt.MqttTransportHandler;
-import org.thingsboard.server.transport.mqtt.adaptors.JsonMqttAdaptor;
-import org.thingsboard.server.transport.mqtt.adaptors.MqttTransportAdaptor;
-import org.thingsboard.server.transport.mqtt.adaptors.ProtoMqttAdaptor;
-import org.thingsboard.server.transport.mqtt.util.ReturnCode;
 
-import javax.annotation.Nullable;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import static org.springframework.util.ConcurrentReferenceHashMap.ReferenceType;
-import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_CLOSED;
-import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_OPEN;
-import static org.thingsboard.server.common.transport.service.DefaultTransportService.SUBSCRIBE_TO_ATTRIBUTE_UPDATES_ASYNC_MSG;
-import static org.thingsboard.server.common.transport.service.DefaultTransportService.SUBSCRIBE_TO_RPC_ASYNC_MSG;
 
 /**
- * Created by ashvayka on 19.01.17.
+ * Created by nickAS21 on 26.12.22
  */
-@Slf4j
-public class GatewaySessionHandler {
-
-    private static final String DEFAULT_DEVICE_TYPE = "default";
-    private static final String CAN_T_PARSE_VALUE = "Can't parse value: ";
-    private static final String DEVICE_PROPERTY = "device";
-
-    private final MqttTransportContext context;
-    private final TransportService transportService;
-    private final TransportDeviceInfo gateway;
-    private final UUID sessionId;
-    private final ConcurrentMap<String, Lock> deviceCreationLockMap;
-    private final ConcurrentMap<String, GatewayDeviceSessionCtx> devices;
-    private final ConcurrentMap<String, ListenableFuture<GatewayDeviceSessionCtx>> deviceFutures;
-    private final ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap;
-    private final ChannelHandlerContext channel;
-    private final DeviceSessionCtx deviceSessionCtx;
+public class GatewaySessionHandler extends AbstractGatewaySessionHandler {
 
     public GatewaySessionHandler(DeviceSessionCtx deviceSessionCtx, UUID sessionId) {
-        this.context = deviceSessionCtx.getContext();
-        this.transportService = context.getTransportService();
-        this.deviceSessionCtx = deviceSessionCtx;
-        this.gateway = deviceSessionCtx.getDeviceInfo();
-        this.sessionId = sessionId;
-        this.devices = new ConcurrentHashMap<>();
-        this.deviceFutures = new ConcurrentHashMap<>();
-        this.deviceCreationLockMap = createWeakMap();
-        this.mqttQoSMap = deviceSessionCtx.getMqttQoSMap();
-        this.channel = deviceSessionCtx.getChannel();
-    }
-
-    ConcurrentReferenceHashMap<String, Lock> createWeakMap() {
-        return new ConcurrentReferenceHashMap<>(16, ReferenceType.WEAK);
+        super(deviceSessionCtx, sessionId);
     }
 
     public void onDeviceConnect(MqttPublishMessage mqttMsg) throws AdaptorException {
@@ -119,14 +39,6 @@ public class GatewaySessionHandler {
         }
     }
 
-    public void onDeviceDisconnect(MqttPublishMessage mqttMsg) throws AdaptorException {
-        if (isJsonPayloadType()) {
-            onDeviceDisconnectJson(mqttMsg);
-        } else {
-            onDeviceDisconnectProto(mqttMsg);
-        }
-    }
-
     public void onDeviceTelemetry(MqttPublishMessage mqttMsg) throws AdaptorException {
         int msgId = getMsgId(mqttMsg);
         ByteBuf payload = mqttMsg.payload();
@@ -137,614 +49,9 @@ public class GatewaySessionHandler {
         }
     }
 
-    public void onDeviceClaim(MqttPublishMessage mqttMsg) throws AdaptorException {
-        int msgId = getMsgId(mqttMsg);
-        ByteBuf payload = mqttMsg.payload();
-        if (isJsonPayloadType()) {
-            onDeviceClaimJson(msgId, payload);
-        } else {
-            onDeviceClaimProto(msgId, payload);
-        }
-    }
-
-    public void onDeviceAttributes(MqttPublishMessage mqttMsg) throws AdaptorException {
-        int msgId = getMsgId(mqttMsg);
-        ByteBuf payload = mqttMsg.payload();
-        if (isJsonPayloadType()) {
-            onDeviceAttributesJson(msgId, payload);
-        } else {
-            onDeviceAttributesProto(msgId, payload);
-        }
-    }
-
-    public void onDeviceAttributesRequest(MqttPublishMessage mqttMsg) throws AdaptorException {
-        if (isJsonPayloadType()) {
-            onDeviceAttributesRequestJson(mqttMsg);
-        } else {
-            onDeviceAttributesRequestProto(mqttMsg);
-        }
-    }
-
-    public void onDeviceRpcResponse(MqttPublishMessage mqttMsg) throws AdaptorException {
-        int msgId = getMsgId(mqttMsg);
-        ByteBuf payload = mqttMsg.payload();
-        if (isJsonPayloadType()) {
-            onDeviceRpcResponseJson(msgId, payload);
-        } else {
-            onDeviceRpcResponseProto(msgId, payload);
-        }
-    }
-
-    public void onGatewayDisconnect() {
-        devices.forEach(this::deregisterSession);
-    }
-
-    public void onDeviceDeleted(String deviceName) {
-        deregisterSession(deviceName);
-    }
-
-    public String getNodeId() {
-        return context.getNodeId();
-    }
-
-    public UUID getSessionId() {
-        return sessionId;
-    }
-
-    public MqttTransportAdaptor getPayloadAdaptor() {
-        return deviceSessionCtx.getPayloadAdaptor();
-    }
-
-    void deregisterSession(String deviceName) {
-        GatewayDeviceSessionCtx deviceSessionCtx = devices.remove(deviceName);
-        if (deviceSessionCtx != null) {
-            deregisterSession(deviceName, deviceSessionCtx);
-        } else {
-            log.debug("[{}] Device [{}] was already removed from the gateway session", sessionId, deviceName);
-        }
-    }
-
-    ChannelFuture writeAndFlush(MqttMessage mqttMessage) {
-        return channel.writeAndFlush(mqttMessage);
-    }
-
-    int nextMsgId() {
-        return deviceSessionCtx.nextMsgId();
-    }
-
-    private boolean isJsonPayloadType() {
-        return deviceSessionCtx.isJsonPayloadType();
-    }
-
-    private void processOnConnect(MqttPublishMessage msg, String deviceName, String deviceType) {
-        log.trace("[{}] onDeviceConnect: {}", sessionId, deviceName);
-        Futures.addCallback(onDeviceConnect(deviceName, deviceType), new FutureCallback<GatewayDeviceSessionCtx>() {
-            @Override
-            public void onSuccess(@Nullable GatewayDeviceSessionCtx result) {
-                ack(msg, ReturnCode.SUCCESS);
-                log.trace("[{}] onDeviceConnectOk: {}", sessionId, deviceName);
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                log.warn("[{}] Failed to process device connect command: {}", sessionId, deviceName, t);
-
-            }
-        }, context.getExecutor());
-    }
-
-    private ListenableFuture<GatewayDeviceSessionCtx> onDeviceConnect(String deviceName, String deviceType) {
-        GatewayDeviceSessionCtx result = devices.get(deviceName);
-        if (result == null) {
-            Lock deviceCreationLock = deviceCreationLockMap.computeIfAbsent(deviceName, s -> new ReentrantLock());
-            deviceCreationLock.lock();
-            try {
-                result = devices.get(deviceName);
-                if (result == null) {
-                    return getDeviceCreationFuture(deviceName, deviceType);
-                } else {
-                    return Futures.immediateFuture(result);
-                }
-            } finally {
-                deviceCreationLock.unlock();
-            }
-        } else {
-            return Futures.immediateFuture(result);
-        }
-    }
-
-    private ListenableFuture<GatewayDeviceSessionCtx> getDeviceCreationFuture(String deviceName, String deviceType) {
-        final SettableFuture<GatewayDeviceSessionCtx> futureToSet = SettableFuture.create();
-        ListenableFuture<GatewayDeviceSessionCtx> future = deviceFutures.putIfAbsent(deviceName, futureToSet);
-        if (future != null) {
-            return future;
-        }
-            try {
-                transportService.process(GetOrCreateDeviceFromGatewayRequestMsg.newBuilder()
-                                .setDeviceName(deviceName)
-                                .setDeviceType(deviceType)
-                                .setGatewayIdMSB(gateway.getDeviceId().getId().getMostSignificantBits())
-                                .setGatewayIdLSB(gateway.getDeviceId().getId().getLeastSignificantBits()).build(),
-                        new TransportServiceCallback<GetOrCreateDeviceFromGatewayResponse>() {
-                            @Override
-                            public void onSuccess(GetOrCreateDeviceFromGatewayResponse msg) {
-                                GatewayDeviceSessionCtx deviceSessionCtx = new GatewayDeviceSessionCtx(GatewaySessionHandler.this, msg.getDeviceInfo(), msg.getDeviceProfile(), mqttQoSMap, transportService);
-                                if (devices.putIfAbsent(deviceName, deviceSessionCtx) == null) {
-                                    log.trace("[{}] First got or created device [{}], type [{}] for the gateway session", sessionId, deviceName, deviceType);
-                                    SessionInfoProto deviceSessionInfo = deviceSessionCtx.getSessionInfo();
-                                    transportService.registerAsyncSession(deviceSessionInfo, deviceSessionCtx);
-                                    transportService.process(TransportProtos.TransportToDeviceActorMsg.newBuilder()
-                                            .setSessionInfo(deviceSessionInfo)
-                                            .setSessionEvent(SESSION_EVENT_MSG_OPEN)
-                                            .setSubscribeToAttributes(SUBSCRIBE_TO_ATTRIBUTE_UPDATES_ASYNC_MSG)
-                                            .setSubscribeToRPC(SUBSCRIBE_TO_RPC_ASYNC_MSG)
-                                            .build(), null);
-                                }
-                                futureToSet.set(devices.get(deviceName));
-                                deviceFutures.remove(deviceName);
-                            }
-
-                            @Override
-                            public void onError(Throwable e) {
-                                log.warn("[{}] Failed to process device connect command: {}", sessionId, deviceName, e);
-                                futureToSet.setException(e);
-                                deviceFutures.remove(deviceName);
-                            }
-                        });
-                return futureToSet;
-            } catch (Throwable e) {
-                deviceFutures.remove(deviceName);
-                throw e;
-            }
-    }
-
-    private int getMsgId(MqttPublishMessage mqttMsg) {
-        return mqttMsg.variableHeader().packetId();
-    }
-
-    private void onDeviceConnectJson(MqttPublishMessage mqttMsg) throws AdaptorException {
-        JsonElement json = getJson(mqttMsg);
-        String deviceName = checkDeviceName(getDeviceName(json));
-        String deviceType = getDeviceType(json);
-        processOnConnect(mqttMsg, deviceName, deviceType);
-    }
-
-    private void onDeviceConnectProto(MqttPublishMessage mqttMsg) throws AdaptorException {
-        try {
-            TransportApiProtos.ConnectMsg connectProto = TransportApiProtos.ConnectMsg.parseFrom(getBytes(mqttMsg.payload()));
-            String deviceName = checkDeviceName(connectProto.getDeviceName());
-            String deviceType = StringUtils.isEmpty(connectProto.getDeviceType()) ? DEFAULT_DEVICE_TYPE : connectProto.getDeviceType();
-            processOnConnect(mqttMsg, deviceName, deviceType);
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void onDeviceDisconnectJson(MqttPublishMessage msg) throws AdaptorException {
-        String deviceName = checkDeviceName(getDeviceName(getJson(msg)));
-        processOnDisconnect(msg, deviceName);
-    }
-
-    private void onDeviceDisconnectProto(MqttPublishMessage mqttMsg) throws AdaptorException {
-        try {
-            TransportApiProtos.DisconnectMsg connectProto = TransportApiProtos.DisconnectMsg.parseFrom(getBytes(mqttMsg.payload()));
-            String deviceName = checkDeviceName(connectProto.getDeviceName());
-            processOnDisconnect(mqttMsg, deviceName);
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void processOnDisconnect(MqttPublishMessage msg, String deviceName) {
-        deregisterSession(deviceName);
-        ack(msg, ReturnCode.SUCCESS);
-    }
-
-    private void onDeviceTelemetryJson(int msgId, ByteBuf payload) throws AdaptorException {
-        JsonElement json = JsonMqttAdaptor.validateJsonPayload(sessionId, payload);
-        if (json.isJsonObject()) {
-            JsonObject jsonObj = json.getAsJsonObject();
-            for (Map.Entry<String, JsonElement> deviceEntry : jsonObj.entrySet()) {
-                String deviceName = deviceEntry.getKey();
-                Futures.addCallback(checkDeviceConnected(deviceName),
-                        new FutureCallback<>() {
-                            @Override
-                            public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                                if (!deviceEntry.getValue().isJsonArray()) {
-                                    throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-                                }
-                                try {
-                                    TransportProtos.PostTelemetryMsg postTelemetryMsg = JsonConverter.convertToTelemetryProto(deviceEntry.getValue().getAsJsonArray());
-                                    processPostTelemetryMsg(deviceCtx, postTelemetryMsg, deviceName, msgId);
-                                } catch (Throwable e) {
-                                    log.warn("[{}][{}] Failed to convert telemetry: {}", gateway.getDeviceId(), deviceName, deviceEntry.getValue(), e);
-                                    channel.close();
-                                }
-                            }
-
-                            @Override
-                            public void onFailure(Throwable t) {
-                                log.debug("[{}] Failed to process device telemetry command: {}", sessionId, deviceName, t);
-                            }
-                        }, context.getExecutor());
-            }
-        } else {
-            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-        }
-    }
-
-    private void onDeviceTelemetryProto(int msgId, ByteBuf payload) throws AdaptorException {
-        try {
-            TransportApiProtos.GatewayTelemetryMsg telemetryMsgProto = TransportApiProtos.GatewayTelemetryMsg.parseFrom(getBytes(payload));
-            List<TransportApiProtos.TelemetryMsg> deviceMsgList = telemetryMsgProto.getMsgList();
-            if (!CollectionUtils.isEmpty(deviceMsgList)) {
-                deviceMsgList.forEach(telemetryMsg -> {
-                    String deviceName = checkDeviceName(telemetryMsg.getDeviceName());
-                    Futures.addCallback(checkDeviceConnected(deviceName),
-                            new FutureCallback<GatewayDeviceSessionCtx>() {
-                                @Override
-                                public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                                    TransportProtos.PostTelemetryMsg msg = telemetryMsg.getMsg();
-                                    try {
-                                        TransportProtos.PostTelemetryMsg postTelemetryMsg = ProtoConverter.validatePostTelemetryMsg(msg.toByteArray());
-                                        processPostTelemetryMsg(deviceCtx, postTelemetryMsg, deviceName, msgId);
-                                    } catch (Throwable e) {
-                                        log.warn("[{}][{}] Failed to convert telemetry: {}", gateway.getDeviceId(), deviceName, msg, e);
-                                        channel.close();
-                                    }
-                                }
-
-                                @Override
-                                public void onFailure(Throwable t) {
-                                    log.debug("[{}] Failed to process device telemetry command: {}", sessionId, deviceName, t);
-                                }
-                            }, context.getExecutor());
-                });
-            } else {
-                log.debug("[{}] Devices telemetry messages is empty for: [{}]", sessionId, gateway.getDeviceId());
-                throw new IllegalArgumentException("[" + sessionId + "] Devices telemetry messages is empty for [" + gateway.getDeviceId() + "]");
-            }
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void processPostTelemetryMsg(GatewayDeviceSessionCtx deviceCtx, TransportProtos.PostTelemetryMsg postTelemetryMsg, String deviceName, int msgId) {
-        transportService.process(deviceCtx.getSessionInfo(), postTelemetryMsg, getPubAckCallback(channel, deviceName, msgId, postTelemetryMsg));
-    }
-
-    private void onDeviceClaimJson(int msgId, ByteBuf payload) throws AdaptorException {
-        JsonElement json = JsonMqttAdaptor.validateJsonPayload(sessionId, payload);
-        if (json.isJsonObject()) {
-            JsonObject jsonObj = json.getAsJsonObject();
-            for (Map.Entry<String, JsonElement> deviceEntry : jsonObj.entrySet()) {
-                String deviceName = deviceEntry.getKey();
-                Futures.addCallback(checkDeviceConnected(deviceName),
-                        new FutureCallback<GatewayDeviceSessionCtx>() {
-                            @Override
-                            public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                                if (!deviceEntry.getValue().isJsonObject()) {
-                                    throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-                                }
-                                try {
-                                    DeviceId deviceId = deviceCtx.getDeviceId();
-                                    TransportProtos.ClaimDeviceMsg claimDeviceMsg = JsonConverter.convertToClaimDeviceProto(deviceId, deviceEntry.getValue());
-                                    processClaimDeviceMsg(deviceCtx, claimDeviceMsg, deviceName, msgId);
-                                } catch (Throwable e) {
-                                    log.warn("[{}][{}] Failed to convert claim message: {}", gateway.getDeviceId(), deviceName, deviceEntry.getValue(), e);
-                                }
-                            }
-
-                            @Override
-                            public void onFailure(Throwable t) {
-                                log.debug("[{}] Failed to process device claiming command: {}", sessionId, deviceName, t);
-                            }
-                        }, context.getExecutor());
-            }
-        } else {
-            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-        }
-    }
-
-    private void onDeviceClaimProto(int msgId, ByteBuf payload) throws AdaptorException {
-        try {
-            TransportApiProtos.GatewayClaimMsg claimMsgProto = TransportApiProtos.GatewayClaimMsg.parseFrom(getBytes(payload));
-            List<TransportApiProtos.ClaimDeviceMsg> claimMsgList = claimMsgProto.getMsgList();
-            if (!CollectionUtils.isEmpty(claimMsgList)) {
-                claimMsgList.forEach(claimDeviceMsg -> {
-                    String deviceName = checkDeviceName(claimDeviceMsg.getDeviceName());
-                    Futures.addCallback(checkDeviceConnected(deviceName),
-                            new FutureCallback<GatewayDeviceSessionCtx>() {
-                                @Override
-                                public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                                    TransportApiProtos.ClaimDevice claimRequest = claimDeviceMsg.getClaimRequest();
-                                    if (claimRequest == null) {
-                                        throw new IllegalArgumentException("Claim request for device: " + deviceName + " is null!");
-                                    }
-                                    try {
-                                        DeviceId deviceId = deviceCtx.getDeviceId();
-                                        TransportProtos.ClaimDeviceMsg claimDeviceMsg = ProtoConverter.convertToClaimDeviceProto(deviceId, claimRequest.toByteArray());
-                                        processClaimDeviceMsg(deviceCtx, claimDeviceMsg, deviceName, msgId);
-                                    } catch (Throwable e) {
-                                        log.warn("[{}][{}] Failed to convert claim message: {}", gateway.getDeviceId(), deviceName, claimRequest, e);
-                                    }
-                                }
-
-                                @Override
-                                public void onFailure(Throwable t) {
-                                    log.debug("[{}] Failed to process device claiming command: {}", sessionId, deviceName, t);
-                                }
-                            }, context.getExecutor());
-                });
-            } else {
-                log.debug("[{}] Devices claim messages is empty for: [{}]", sessionId, gateway.getDeviceId());
-                throw new IllegalArgumentException("[" + sessionId + "] Devices claim messages is empty for [" + gateway.getDeviceId() + "]");
-            }
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void processClaimDeviceMsg(GatewayDeviceSessionCtx deviceCtx, TransportProtos.ClaimDeviceMsg claimDeviceMsg, String deviceName, int msgId) {
-        transportService.process(deviceCtx.getSessionInfo(), claimDeviceMsg, getPubAckCallback(channel, deviceName, msgId, claimDeviceMsg));
-    }
-
-    private void onDeviceAttributesJson(int msgId, ByteBuf payload) throws AdaptorException {
-        JsonElement json = JsonMqttAdaptor.validateJsonPayload(sessionId, payload);
-        if (json.isJsonObject()) {
-            JsonObject jsonObj = json.getAsJsonObject();
-            for (Map.Entry<String, JsonElement> deviceEntry : jsonObj.entrySet()) {
-                String deviceName = deviceEntry.getKey();
-                Futures.addCallback(checkDeviceConnected(deviceName),
-                        new FutureCallback<GatewayDeviceSessionCtx>() {
-                            @Override
-                            public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                                if (!deviceEntry.getValue().isJsonObject()) {
-                                    throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-                                }
-                                TransportProtos.PostAttributeMsg postAttributeMsg = JsonConverter.convertToAttributesProto(deviceEntry.getValue().getAsJsonObject());
-                                processPostAttributesMsg(deviceCtx, postAttributeMsg, deviceName, msgId);
-                            }
-
-                            @Override
-                            public void onFailure(Throwable t) {
-                                log.debug("[{}] Failed to process device attributes command: {}", sessionId, deviceName, t);
-                            }
-                        }, context.getExecutor());
-            }
-        } else {
-            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-        }
-    }
-
-    private void onDeviceAttributesProto(int msgId, ByteBuf payload) throws AdaptorException {
-        try {
-            TransportApiProtos.GatewayAttributesMsg attributesMsgProto = TransportApiProtos.GatewayAttributesMsg.parseFrom(getBytes(payload));
-            List<TransportApiProtos.AttributesMsg> attributesMsgList = attributesMsgProto.getMsgList();
-            if (!CollectionUtils.isEmpty(attributesMsgList)) {
-                attributesMsgList.forEach(attributesMsg -> {
-                    String deviceName = checkDeviceName(attributesMsg.getDeviceName());
-                    Futures.addCallback(checkDeviceConnected(deviceName),
-                            new FutureCallback<GatewayDeviceSessionCtx>() {
-                                @Override
-                                public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                                    TransportProtos.PostAttributeMsg kvListProto = attributesMsg.getMsg();
-                                    if (kvListProto == null) {
-                                        throw new IllegalArgumentException("Attributes List for device: " + deviceName + " is empty!");
-                                    }
-                                    try {
-                                        TransportProtos.PostAttributeMsg postAttributeMsg = ProtoConverter.validatePostAttributeMsg(kvListProto.toByteArray());
-                                        processPostAttributesMsg(deviceCtx, postAttributeMsg, deviceName, msgId);
-                                    } catch (Throwable e) {
-                                        log.warn("[{}][{}] Failed to process device attributes command: {}", gateway.getDeviceId(), deviceName, kvListProto, e);
-                                    }
-                                }
-
-                                @Override
-                                public void onFailure(Throwable t) {
-                                    log.debug("[{}] Failed to process device attributes command: {}", sessionId, deviceName, t);
-                                }
-                            }, context.getExecutor());
-                });
-            } else {
-                log.debug("[{}] Devices attributes keys list is empty for: [{}]", sessionId, gateway.getDeviceId());
-                throw new IllegalArgumentException("[" + sessionId + "] Devices attributes keys list is empty for [" + gateway.getDeviceId() + "]");
-            }
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void processPostAttributesMsg(GatewayDeviceSessionCtx deviceCtx, TransportProtos.PostAttributeMsg postAttributeMsg, String deviceName, int msgId) {
-        transportService.process(deviceCtx.getSessionInfo(), postAttributeMsg, getPubAckCallback(channel, deviceName, msgId, postAttributeMsg));
-    }
-
-    private void onDeviceAttributesRequestJson(MqttPublishMessage msg) throws AdaptorException {
-        JsonElement json = JsonMqttAdaptor.validateJsonPayload(sessionId, msg.payload());
-        if (json.isJsonObject()) {
-            JsonObject jsonObj = json.getAsJsonObject();
-            int requestId = jsonObj.get("id").getAsInt();
-            String deviceName = jsonObj.get(DEVICE_PROPERTY).getAsString();
-            boolean clientScope = jsonObj.get("client").getAsBoolean();
-            Set<String> keys;
-            if (jsonObj.has("key")) {
-                keys = Collections.singleton(jsonObj.get("key").getAsString());
-            } else {
-                JsonArray keysArray = jsonObj.get("keys").getAsJsonArray();
-                keys = new HashSet<>();
-                for (JsonElement keyObj : keysArray) {
-                    keys.add(keyObj.getAsString());
-                }
-            }
-            TransportProtos.GetAttributeRequestMsg requestMsg = toGetAttributeRequestMsg(requestId, clientScope, keys);
-            processGetAttributeRequestMessage(msg, deviceName, requestMsg);
-        } else {
-            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-        }
-    }
-
-    private void onDeviceAttributesRequestProto(MqttPublishMessage mqttMsg) throws AdaptorException {
-        try {
-            TransportApiProtos.GatewayAttributesRequestMsg gatewayAttributesRequestMsg = TransportApiProtos.GatewayAttributesRequestMsg.parseFrom(getBytes(mqttMsg.payload()));
-            String deviceName = checkDeviceName(gatewayAttributesRequestMsg.getDeviceName());
-            int requestId = gatewayAttributesRequestMsg.getId();
-            boolean clientScope = gatewayAttributesRequestMsg.getClient();
-            ProtocolStringList keysList = gatewayAttributesRequestMsg.getKeysList();
-            Set<String> keys = new HashSet<>(keysList);
-            TransportProtos.GetAttributeRequestMsg requestMsg = toGetAttributeRequestMsg(requestId, clientScope, keys);
-            processGetAttributeRequestMessage(mqttMsg, deviceName, requestMsg);
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void onDeviceRpcResponseJson(int msgId, ByteBuf payload) throws AdaptorException {
-        JsonElement json = JsonMqttAdaptor.validateJsonPayload(sessionId, payload);
-        if (json.isJsonObject()) {
-            JsonObject jsonObj = json.getAsJsonObject();
-            String deviceName = jsonObj.get(DEVICE_PROPERTY).getAsString();
-            Futures.addCallback(checkDeviceConnected(deviceName),
-                    new FutureCallback<GatewayDeviceSessionCtx>() {
-                        @Override
-                        public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                            Integer requestId = jsonObj.get("id").getAsInt();
-                            String data = jsonObj.get("data").toString();
-                            TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = TransportProtos.ToDeviceRpcResponseMsg.newBuilder()
-                                    .setRequestId(requestId).setPayload(data).build();
-                            processRpcResponseMsg(deviceCtx, rpcResponseMsg, deviceName, msgId);
-                        }
-
-                        @Override
-                        public void onFailure(Throwable t) {
-                            log.debug("[{}] Failed to process device Rpc response command: {}", sessionId, deviceName, t);
-                        }
-                    }, context.getExecutor());
-        } else {
-            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-        }
+    @Override
+    protected GatewayDeviceSessionContext newDeviceSessionCtx(GetOrCreateDeviceFromGatewayResponse msg) {
+         return new GatewayDeviceSessionContext(this, msg.getDeviceInfo(), msg.getDeviceProfile(), mqttQoSMap, transportService);
     }
 
-    private void onDeviceRpcResponseProto(int msgId, ByteBuf payload) throws AdaptorException {
-        try {
-            TransportApiProtos.GatewayRpcResponseMsg gatewayRpcResponseMsg = TransportApiProtos.GatewayRpcResponseMsg.parseFrom(getBytes(payload));
-            String deviceName = checkDeviceName(gatewayRpcResponseMsg.getDeviceName());
-            Futures.addCallback(checkDeviceConnected(deviceName),
-                    new FutureCallback<GatewayDeviceSessionCtx>() {
-                        @Override
-                        public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                            Integer requestId = gatewayRpcResponseMsg.getId();
-                            String data = gatewayRpcResponseMsg.getData();
-                            TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = TransportProtos.ToDeviceRpcResponseMsg.newBuilder()
-                                    .setRequestId(requestId).setPayload(data).build();
-                            processRpcResponseMsg(deviceCtx, rpcResponseMsg, deviceName, msgId);
-                        }
-
-                        @Override
-                        public void onFailure(Throwable t) {
-                            log.debug("[{}] Failed to process device Rpc response command: {}", sessionId, deviceName, t);
-                        }
-                    }, context.getExecutor());
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void processRpcResponseMsg(GatewayDeviceSessionCtx deviceCtx, TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg, String deviceName, int msgId) {
-        transportService.process(deviceCtx.getSessionInfo(), rpcResponseMsg, getPubAckCallback(channel, deviceName, msgId, rpcResponseMsg));
-    }
-
-    private void processGetAttributeRequestMessage(MqttPublishMessage mqttMsg, String deviceName, TransportProtos.GetAttributeRequestMsg requestMsg) {
-        int msgId = getMsgId(mqttMsg);
-        Futures.addCallback(checkDeviceConnected(deviceName),
-                new FutureCallback<GatewayDeviceSessionCtx>() {
-                    @Override
-                    public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                        transportService.process(deviceCtx.getSessionInfo(), requestMsg, getPubAckCallback(channel, deviceName, msgId, requestMsg));
-                    }
-
-                    @Override
-                    public void onFailure(Throwable t) {
-                        ack(mqttMsg, ReturnCode.IMPLEMENTATION_SPECIFIC);
-                        log.debug("[{}] Failed to process device attributes request command: {}", sessionId, deviceName, t);
-                    }
-                }, context.getExecutor());
-    }
-
-    private TransportProtos.GetAttributeRequestMsg toGetAttributeRequestMsg(int requestId, boolean clientScope, Set<String> keys) {
-        TransportProtos.GetAttributeRequestMsg.Builder result = TransportProtos.GetAttributeRequestMsg.newBuilder();
-        result.setRequestId(requestId);
-
-        if (clientScope) {
-            result.addAllClientAttributeNames(keys);
-        } else {
-            result.addAllSharedAttributeNames(keys);
-        }
-        return result.build();
-    }
-
-    private ListenableFuture<GatewayDeviceSessionCtx> checkDeviceConnected(String deviceName) {
-        GatewayDeviceSessionCtx ctx = devices.get(deviceName);
-        if (ctx == null) {
-            log.debug("[{}] Missing device [{}] for the gateway session", sessionId, deviceName);
-            return onDeviceConnect(deviceName, DEFAULT_DEVICE_TYPE);
-        } else {
-            return Futures.immediateFuture(ctx);
-        }
-    }
-
-    private String checkDeviceName(String deviceName) {
-        if (StringUtils.isEmpty(deviceName)) {
-            throw new RuntimeException("Device name is empty!");
-        } else {
-            return deviceName;
-        }
-    }
-
-    private String getDeviceName(JsonElement json) {
-        return json.getAsJsonObject().get(DEVICE_PROPERTY).getAsString();
-    }
-
-    private String getDeviceType(JsonElement json) {
-        JsonElement type = json.getAsJsonObject().get("type");
-        return type == null || type instanceof JsonNull ? DEFAULT_DEVICE_TYPE : type.getAsString();
-    }
-
-    private JsonElement getJson(MqttPublishMessage mqttMsg) throws AdaptorException {
-        return JsonMqttAdaptor.validateJsonPayload(sessionId, mqttMsg.payload());
-    }
-
-    private byte[] getBytes(ByteBuf payload) {
-        return ProtoMqttAdaptor.toBytes(payload);
-    }
-
-    private void ack(MqttPublishMessage msg, ReturnCode returnCode) {
-        int msgId = getMsgId(msg);
-        if (msgId > 0) {
-            writeAndFlush(MqttTransportHandler.createMqttPubAckMsg(deviceSessionCtx, msgId, returnCode));
-        }
-    }
-
-    private void deregisterSession(String deviceName, GatewayDeviceSessionCtx deviceSessionCtx) {
-        transportService.deregisterSession(deviceSessionCtx.getSessionInfo());
-        transportService.process(deviceSessionCtx.getSessionInfo(), SESSION_EVENT_MSG_CLOSED, null);
-        log.debug("[{}] Removed device [{}] from the gateway session", sessionId, deviceName);
-    }
-
-    private <T> TransportServiceCallback<Void> getPubAckCallback(final ChannelHandlerContext ctx, final String deviceName, final int msgId, final T msg) {
-        return new TransportServiceCallback<Void>() {
-            @Override
-            public void onSuccess(Void dummy) {
-                log.trace("[{}][{}] Published msg: {}", sessionId, deviceName, msg);
-                if (msgId > 0) {
-                    ctx.writeAndFlush(MqttTransportHandler.createMqttPubAckMsg(deviceSessionCtx, msgId, ReturnCode.SUCCESS));
-                }
-            }
-
-            @Override
-            public void onError(Throwable e) {
-                log.trace("[{}] Failed to publish msg: {} for device: {}", sessionId, msg, deviceName, e);
-                ctx.close();
-            }
-        };
-    }
 }
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/MqttDeviceAwareSessionContext.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/MqttDeviceAwareSessionContext.java
index 4068604b19..0498eadd9f 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/MqttDeviceAwareSessionContext.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/MqttDeviceAwareSessionContext.java
@@ -16,18 +16,13 @@
 package org.thingsboard.server.transport.mqtt.session;
 
 import io.netty.handler.codec.mqtt.MqttQoS;
-import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.DeviceTransportType;
-import org.thingsboard.server.common.data.TransportPayloadType;
-import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
-import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.transport.session.DeviceAwareSessionContext;
-import org.thingsboard.server.transport.mqtt.util.MqttTopicFilter;
-import org.thingsboard.server.transport.mqtt.util.MqttTopicFilterFactory;
+import org.thingsboard.server.gen.transport.mqtt.SparkplugBProto;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugDeviceSessionContext.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugDeviceSessionContext.java
new file mode 100644
index 0000000000..fb4ab488a8
--- /dev/null
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugDeviceSessionContext.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.session;
+
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.transport.TransportService;
+import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.gen.transport.mqtt.SparkplugBProto;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugRpcRequestHeader;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugTopic;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Collectors;
+
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMetricUtil.getTsKvProto;
+
+@Slf4j
+public class SparkplugDeviceSessionContext extends AbstractGatewayDeviceSessionContext<SparkplugNodeSessionHandler> {
+
+    private final Map<String, SparkplugBProto.Payload.Metric> deviceBirthMetrics = new ConcurrentHashMap<>();
+
+    public SparkplugDeviceSessionContext(SparkplugNodeSessionHandler parent,
+                                         TransportDeviceInfo deviceInfo,
+                                         DeviceProfile deviceProfile,
+                                         ConcurrentMap<MqttTopicMatcher,
+                                                 Integer> mqttQoSMap,
+                                         TransportService transportService) {
+        super(parent, deviceInfo, deviceProfile, mqttQoSMap, transportService);
+    }
+
+    public  Map<String, SparkplugBProto.Payload.Metric> getDeviceBirthMetrics() {
+        return deviceBirthMetrics;
+    }
+
+    public void setDeviceBirthMetrics(java.util.List<org.thingsboard.server.gen.transport.mqtt.SparkplugBProto.Payload.Metric> metrics) {
+        this.deviceBirthMetrics.putAll(metrics.stream()
+                .collect(Collectors.toMap(SparkplugBProto.Payload.Metric::getName, metric -> metric)));
+    }
+
+
+    @Override
+    public void onAttributeUpdate(UUID sessionId, TransportProtos.AttributeUpdateNotificationMsg notification) {
+        log.trace("[{}] Received attributes update notification to sparkplug device", sessionId);
+        notification.getSharedUpdatedList().forEach(tsKvProto -> {
+            if (getDeviceBirthMetrics().containsKey(tsKvProto.getKv().getKey())) {
+                SparkplugTopic sparkplugTopic = new SparkplugTopic(parent.getSparkplugTopicNode(),
+                        SparkplugMessageType.DCMD, deviceInfo.getDeviceName());
+                parent.createSparkplugMqttPublishMsg(tsKvProto,
+                        sparkplugTopic.toString(),
+                        getDeviceBirthMetrics().get(tsKvProto.getKv().getKey()))
+                        .ifPresent(this.parent::writeAndFlush);
+            }
+        });
+    }
+
+    @Override
+    public void onToDeviceRpcRequest(UUID sessionId, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) {
+        log.trace("[{}] Received RPC Request notification to sparkplug device", sessionId);
+        try {
+            SparkplugMessageType messageType = SparkplugMessageType.parseMessageType(rpcRequest.getMethodName());
+            SparkplugRpcRequestHeader header = JacksonUtil.fromString(rpcRequest.getParams(), SparkplugRpcRequestHeader.class);
+            header.setMessageType(messageType.name());
+            TransportProtos.TsKvProto tsKvProto = getTsKvProto(header.getMetricName(), header.getValue(), new Date().getTime());
+            if (getDeviceBirthMetrics().containsKey(tsKvProto.getKv().getKey())) {
+                SparkplugTopic sparkplugTopic = new SparkplugTopic(parent.getSparkplugTopicNode(),
+                        messageType, deviceInfo.getDeviceName());
+                parent.createSparkplugMqttPublishMsg(tsKvProto,
+                        sparkplugTopic.toString(),
+                        getDeviceBirthMetrics().get(tsKvProto.getKv().getKey()))
+                        .ifPresent(payload -> parent.sendToDeviceRpcRequest(payload, rpcRequest, sessionInfo));
+            } else {
+                parent.sendErrorRpcResponse(sessionInfo, rpcRequest.getRequestId(),
+                        ThingsboardErrorCode.BAD_REQUEST_PARAMS, " Failed send To Device Rpc Request: " +
+                                rpcRequest.getMethodName() + ". This device does not have a metricName: [" + tsKvProto.getKv().getKey() + "]");
+            }
+        } catch (ThingsboardException e) {
+            parent.sendErrorRpcResponse(sessionInfo, rpcRequest.getRequestId(),
+                    ThingsboardErrorCode.BAD_REQUEST_PARAMS, " Failed send To Device Rpc Request: " +
+                            rpcRequest.getMethodName() + ". " + e.getMessage());
+        }
+    }
+
+}
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java
new file mode 100644
index 0000000000..fc480fa882
--- /dev/null
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java
@@ -0,0 +1,340 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.session;
+
+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.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
+import com.google.protobuf.Descriptors;
+import io.netty.handler.codec.mqtt.MqttMessage;
+import io.netty.handler.codec.mqtt.MqttPublishMessage;
+import io.netty.handler.codec.mqtt.MqttQoS;
+import io.netty.handler.codec.mqtt.MqttTopicSubscription;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.core.ResponseCode;
+import org.springframework.util.CollectionUtils;
+import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.transport.adaptor.AdaptorException;
+import org.thingsboard.server.common.transport.adaptor.JsonConverter;
+import org.thingsboard.server.common.transport.adaptor.ProtoConverter;
+import org.thingsboard.server.common.transport.auth.GetOrCreateDeviceFromGatewayResponse;
+import org.thingsboard.server.gen.transport.TransportApiProtos;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.gen.transport.mqtt.SparkplugBProto;
+import org.thingsboard.server.transport.mqtt.MqttTransportHandler;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType;
+import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugTopic;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType.DBIRTH;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMessageType.NBIRTH;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugConnectionState.ONLINE;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMetricUtil.createMetric;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMetricUtil.fromSparkplugBMetricToKeyValueProto;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugMetricUtil.validatedValueByTypeMetric;
+import static org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugTopicUtil.parseTopicSubscribe;
+
+/**
+ * Created by nickAS21 on 12.12.22
+ */
+@Slf4j
+public class SparkplugNodeSessionHandler extends AbstractGatewaySessionHandler<SparkplugDeviceSessionContext> {
+
+    private final SparkplugTopic sparkplugTopicNode;
+    private final Map<String, SparkplugBProto.Payload.Metric> nodeBirthMetrics;
+    private final MqttTransportHandler parent;
+
+    public SparkplugNodeSessionHandler(MqttTransportHandler parent, DeviceSessionCtx deviceSessionCtx, UUID sessionId,
+                                       SparkplugTopic sparkplugTopicNode) {
+        super(deviceSessionCtx, sessionId);
+        this.parent = parent;
+        this.sparkplugTopicNode = sparkplugTopicNode;
+        this.nodeBirthMetrics = new ConcurrentHashMap<>();
+    }
+
+    public void setNodeBirthMetrics(java.util.List<org.thingsboard.server.gen.transport.mqtt.SparkplugBProto.Payload.Metric> metrics) {
+        this.nodeBirthMetrics.putAll(metrics.stream()
+                .collect(Collectors.toMap(SparkplugBProto.Payload.Metric::getName, metric -> metric)));
+    }
+
+    public Map<String, SparkplugBProto.Payload.Metric> getNodeBirthMetrics() {
+        return this.nodeBirthMetrics;
+    }
+
+    public TransportProtos.PostTelemetryMsg convertToPostTelemetry(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
+        DeviceSessionCtx deviceSessionCtx = (DeviceSessionCtx) ctx;
+        byte[] bytes = getBytes(inbound.payload());
+        Descriptors.Descriptor telemetryDynamicMsgDescriptor = ProtoConverter.validateDescriptor(deviceSessionCtx.getTelemetryDynamicMsgDescriptor());
+        try {
+            return JsonConverter.convertToTelemetryProto(new JsonParser().parse(ProtoConverter.dynamicMsgToJson(bytes, telemetryDynamicMsgDescriptor)));
+        } catch (Exception e) {
+            log.debug("Failed to decode post telemetry request", e);
+            throw new AdaptorException(e);
+        }
+    }
+
+    public void onAttributesTelemetryProto(int msgId, SparkplugBProto.Payload sparkplugBProto, String deviceName, SparkplugTopic topic) throws AdaptorException, ThingsboardException {
+        checkDeviceName(deviceName);
+
+        ListenableFuture<MqttDeviceAwareSessionContext> contextListenableFuture;
+        if (topic.isNode()) {
+            if (topic.isType(NBIRTH)) {
+                sendSparkplugStateOnTelemetry(this.deviceSessionCtx.getSessionInfo(), deviceName, ONLINE,
+                        sparkplugBProto.getTimestamp());
+                setNodeBirthMetrics(sparkplugBProto.getMetricsList());
+            }
+            contextListenableFuture = Futures.immediateFuture(this.deviceSessionCtx);
+        } else {
+            ListenableFuture<SparkplugDeviceSessionContext> deviceCtx = onDeviceConnectProto(deviceName);
+            contextListenableFuture = Futures.transform(deviceCtx, ctx -> {
+                if (topic.isType(DBIRTH)) {
+                    sendSparkplugStateOnTelemetry(ctx.getSessionInfo(), deviceName, ONLINE,
+                            sparkplugBProto.getTimestamp());
+                    ctx.setDeviceBirthMetrics(sparkplugBProto.getMetricsList());
+                }
+                return ctx;
+            }, MoreExecutors.directExecutor());
+        }
+        Set<String> attributesMetricNames = ((MqttDeviceProfileTransportConfiguration) deviceSessionCtx
+                .getDeviceProfile().getProfileData().getTransportConfiguration()).getSparkplugAttributesMetricNames();
+        if (attributesMetricNames != null) {
+            List<TransportApiProtos.AttributesMsg> attributesMsgList = convertToPostAttributes(sparkplugBProto, attributesMetricNames, deviceName);
+            onDeviceAttributesProto(contextListenableFuture, msgId, attributesMsgList, deviceName);
+        }
+        List<TransportProtos.PostTelemetryMsg> postTelemetryMsgList = convertToPostTelemetry(sparkplugBProto, attributesMetricNames, topic.getType().name());
+        onDeviceTelemetryProto(contextListenableFuture, msgId, postTelemetryMsgList, deviceName);
+    }
+
+    public void onDeviceTelemetryProto(ListenableFuture<MqttDeviceAwareSessionContext> contextListenableFuture,
+                                       int msgId, List<TransportProtos.PostTelemetryMsg> postTelemetryMsgList, String deviceName) throws AdaptorException {
+        try {
+            int finalMsgId = msgId;
+            postTelemetryMsgList.forEach(telemetryMsg -> {
+                Futures.addCallback(contextListenableFuture,
+                        new FutureCallback<>() {
+                            @Override
+                            public void onSuccess(@Nullable MqttDeviceAwareSessionContext deviceCtx) {
+                                try {
+                                    processPostTelemetryMsg(deviceCtx, telemetryMsg, deviceName, finalMsgId);
+                                } catch (Throwable e) {
+                                    log.warn("[{}][{}] Failed to convert telemetry: {}", gateway.getDeviceId(), deviceName, telemetryMsg, e);
+                                    channel.close();
+                                }
+                            }
+
+                            @Override
+                            public void onFailure(Throwable t) {
+                                log.debug("[{}] Failed to process device telemetry command: {}", sessionId, deviceName, t);
+                            }
+                        }, context.getExecutor());
+            });
+        } catch (RuntimeException e) {
+            throw new AdaptorException(e);
+        }
+    }
+
+    private void onDeviceAttributesProto(ListenableFuture<MqttDeviceAwareSessionContext> contextListenableFuture, int msgId,
+                                         List<TransportApiProtos.AttributesMsg> attributesMsgList, String deviceName) throws AdaptorException {
+        try {
+            if (!CollectionUtils.isEmpty(attributesMsgList)) {
+                attributesMsgList.forEach(attributesMsg -> {
+                    Futures.addCallback(contextListenableFuture,
+                            new FutureCallback<>() {
+                                @Override
+                                public void onSuccess(@Nullable MqttDeviceAwareSessionContext deviceCtx) {
+                                    TransportProtos.PostAttributeMsg kvListProto = attributesMsg.getMsg();
+                                    try {
+                                        TransportProtos.PostAttributeMsg postAttributeMsg = ProtoConverter.validatePostAttributeMsg(kvListProto.toByteArray());
+                                        processPostAttributesMsg(deviceCtx, postAttributeMsg, deviceName, msgId);
+                                    } catch (Throwable e) {
+                                        log.warn("[{}][{}] Failed to process device attributes command: {}", gateway.getDeviceId(), deviceName, kvListProto, e);
+                                    }
+                                }
+
+                                @Override
+                                public void onFailure(Throwable t) {
+                                    log.debug("[{}] Failed to process device attributes command: {}", sessionId, deviceName, t);
+                                }
+                            }, context.getExecutor());
+                });
+            } else {
+                log.debug("[{}] Devices attributes keys list is empty for: [{}]", sessionId, gateway.getDeviceId());
+            }
+        } catch (RuntimeException e) {
+            throw new AdaptorException(e);
+        }
+    }
+
+    public void handleSparkplugSubscribeMsg(List<Integer> grantedQoSList, MqttTopicSubscription subscription,
+                                            MqttQoS reqQoS) throws ThingsboardException, AdaptorException,
+            ExecutionException, InterruptedException {
+        SparkplugTopic sparkplugTopic = parseTopicSubscribe(subscription.topicName());
+        if (sparkplugTopic.getGroupId() == null) {
+            // TODO SUBSCRIBE NameSpace
+        } else if (sparkplugTopic.getType() == null) {
+            // TODO SUBSCRIBE GroupId
+        } else if (sparkplugTopic.isNode()) {
+            // SUBSCRIBE Node
+            parent.processAttributesRpcSubscribeSparkplugNode(grantedQoSList, reqQoS);
+        } else {
+            // SUBSCRIBE Device - DO NOTHING, WE HAVE ALREADY SUBSCRIBED.
+            // TODO: track that node subscribed to # or to particular device.
+        }
+    }
+
+    public void onDeviceDisconnect(MqttPublishMessage mqttMsg, String deviceName) throws AdaptorException {
+        try {
+            processOnDisconnect(mqttMsg, deviceName);
+        } catch (RuntimeException e) {
+            throw new AdaptorException(e);
+        }
+    }
+
+    private ListenableFuture<SparkplugDeviceSessionContext> onDeviceConnectProto(String deviceName) throws ThingsboardException {
+        try {
+            String deviceType = this.gateway.getDeviceType() + "-node";
+            return onDeviceConnect(deviceName, deviceType);
+        } catch (RuntimeException e) {
+            log.error("Failed Sparkplug Device connect proto!", e);
+            throw new ThingsboardException(e, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+        }
+    }
+
+    private List<TransportProtos.PostTelemetryMsg> convertToPostTelemetry(SparkplugBProto.Payload sparkplugBProto, Set<String> attributesMetricNames, String topicTypeName) throws AdaptorException {
+        try {
+            List<TransportProtos.PostTelemetryMsg> msgs = new ArrayList<>();
+            for (SparkplugBProto.Payload.Metric protoMetric : sparkplugBProto.getMetricsList()) {
+                if (attributesMetricNames == null || !attributesMetricNames.contains(protoMetric.getName())) {
+                    long ts = protoMetric.getTimestamp();
+                    String key = "bdSeq".equals(protoMetric.getName()) ?
+                            topicTypeName + " " + protoMetric.getName() : protoMetric.getName();
+                    Optional<TransportProtos.KeyValueProto> keyValueProtoOpt = fromSparkplugBMetricToKeyValueProto(key, protoMetric);
+                    if (keyValueProtoOpt.isPresent()) {
+                        msgs.add(postTelemetryMsgCreated(keyValueProtoOpt.get(), ts));
+                    }
+                }
+            }
+
+            if (DBIRTH.name().equals(topicTypeName)) {
+                TransportProtos.KeyValueProto.Builder keyValueProtoBuilder = TransportProtos.KeyValueProto.newBuilder();
+                keyValueProtoBuilder.setKey(topicTypeName + " " + "seq");
+                keyValueProtoBuilder.setType(TransportProtos.KeyValueType.LONG_V);
+                keyValueProtoBuilder.setLongV(sparkplugBProto.getSeq());
+                msgs.add(postTelemetryMsgCreated(keyValueProtoBuilder.build(), sparkplugBProto.getTimestamp()));
+            }
+            return msgs;
+        } catch (IllegalStateException | JsonSyntaxException | ThingsboardException e) {
+            log.error("Failed to decode post telemetry request", e);
+            throw new AdaptorException(e);
+        }
+    }
+
+    private List<TransportApiProtos.AttributesMsg> convertToPostAttributes(SparkplugBProto.Payload sparkplugBProto,
+                                                                           Set<String> attributesMetricNames,
+                                                                           String deviceName) throws AdaptorException {
+        try {
+            List<TransportApiProtos.AttributesMsg> msgs = new ArrayList<>();
+            for (SparkplugBProto.Payload.Metric protoMetric : sparkplugBProto.getMetricsList()) {
+                if (attributesMetricNames.contains(protoMetric.getName())) {
+                    TransportApiProtos.AttributesMsg.Builder deviceAttributesMsgBuilder = TransportApiProtos.AttributesMsg.newBuilder();
+                    Optional<TransportProtos.PostAttributeMsg> msgOpt = getPostAttributeMsg(protoMetric);
+                    if (msgOpt.isPresent()) {
+                        deviceAttributesMsgBuilder.setDeviceName(deviceName);
+                        deviceAttributesMsgBuilder.setMsg(msgOpt.get());
+                        msgs.add(deviceAttributesMsgBuilder.build());
+                    }
+                }
+            }
+            return msgs;
+        } catch (IllegalStateException | JsonSyntaxException | ThingsboardException e) {
+            log.error("Failed to decode post telemetry request", e);
+            throw new AdaptorException(e);
+        }
+    }
+
+    private Optional<TransportProtos.PostAttributeMsg> getPostAttributeMsg(SparkplugBProto.Payload.Metric protoMetric) throws ThingsboardException {
+        Optional<TransportProtos.KeyValueProto> keyValueProtoOpt = fromSparkplugBMetricToKeyValueProto(protoMetric.getName(), protoMetric);
+        if (keyValueProtoOpt.isPresent()) {
+            TransportProtos.PostAttributeMsg.Builder builder = TransportProtos.PostAttributeMsg.newBuilder();
+            builder.addKv(keyValueProtoOpt.get());
+            return Optional.of(builder.build());
+        }
+        return Optional.empty();
+    }
+
+    public SparkplugTopic getSparkplugTopicNode() {
+        return this.sparkplugTopicNode;
+    }
+
+    public Optional<MqttPublishMessage> createSparkplugMqttPublishMsg(TransportProtos.TsKvProto tsKvProto,
+                                                                      String sparkplugTopic,
+                                                                      SparkplugBProto.Payload.Metric metricBirth) {
+        try {
+            long ts = tsKvProto.getTs();
+            MetricDataType metricDataType = MetricDataType.fromInteger(metricBirth.getDatatype());
+            Optional value = validatedValueByTypeMetric(tsKvProto.getKv(), metricDataType);
+            if (value.isPresent()) {
+                SparkplugBProto.Payload.Builder cmdPayload = SparkplugBProto.Payload.newBuilder()
+                        .setTimestamp(ts);
+                cmdPayload.addMetrics(createMetric(value.get(), ts, tsKvProto.getKv().getKey(), metricDataType));
+                byte[] payloadInBytes = cmdPayload.build().toByteArray();
+                return Optional.of(getPayloadAdaptor().createMqttPublishMsg(deviceSessionCtx, sparkplugTopic, payloadInBytes));
+            } else {
+                log.trace("DeviceId: [{}] tenantId: [{}] sessionId:[{}] Failed to convert device attributes [{}] response to MQTT sparkplug  msg",
+                        deviceSessionCtx.getDeviceInfo().getDeviceId(), deviceSessionCtx.getDeviceInfo().getTenantId(), sessionId, tsKvProto.getKv());
+            }
+        } catch (Exception e) {
+            log.trace("DeviceId: [{}] tenantId: [{}] sessionId:[{}] Failed to convert device attributes response to MQTT sparkplug  msg",
+                    deviceSessionCtx.getDeviceInfo().getDeviceId(), deviceSessionCtx.getDeviceInfo().getTenantId(), sessionId, e);
+            return Optional.empty();
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    protected SparkplugDeviceSessionContext newDeviceSessionCtx(GetOrCreateDeviceFromGatewayResponse msg) {
+        return new SparkplugDeviceSessionContext(this, msg.getDeviceInfo(), msg.getDeviceProfile(), mqttQoSMap, transportService);
+    }
+
+    protected void sendToDeviceRpcRequest(MqttMessage payload, TransportProtos.ToDeviceRpcRequestMsg rpcRequest, TransportProtos.SessionInfoProto sessionInfo) {
+        parent.sendToDeviceRpcRequest(payload, rpcRequest, sessionInfo);
+    }
+
+    protected void sendErrorRpcResponse(TransportProtos.SessionInfoProto sessionInfo, int requestId, ThingsboardErrorCode result, String errorMsg) {
+        parent.sendErrorRpcResponse(sessionInfo, requestId, result, errorMsg);
+    }
+
+    protected void sendSuccessRpcResponse(TransportProtos.SessionInfoProto sessionInfo, int requestId, ResponseCode result, String successMsg) {
+        parent.sendSuccessRpcResponse(sessionInfo, requestId, result, successMsg);
+    }
+
+
+}
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/MetricDataType.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/MetricDataType.java
new file mode 100644
index 0000000000..d5e781a402
--- /dev/null
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/MetricDataType.java
@@ -0,0 +1,156 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.util.sparkplug;
+
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.transport.adaptor.AdaptorException;
+import org.thingsboard.server.gen.transport.mqtt.SparkplugBProto;
+
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * Created by nickAS21 on 10.01.23
+ */
+
+@Slf4j
+public enum MetricDataType {
+
+    // Basic Types
+    Int8(1, Byte.class),
+    Int16(2, Short.class),
+    Int32(3, Integer.class),
+    Int64(4, Long.class),
+    UInt8(5, Short.class),
+    UInt16(6, Integer.class),
+    UInt32(7, Long.class),
+    UInt64(8, BigInteger.class),
+    Float(9, Float.class),
+    Double(10, Double.class),
+    Boolean(11, Boolean.class),
+    String(12, String.class),
+    DateTime(13, Date.class),
+    Text(14, String.class),
+
+    // Custom Types for Metrics
+    UUID(15, String.class),
+    DataSet(16, SparkplugBProto.Payload.DataSet.class),
+    Bytes(17, byte[].class),
+    File(18, SparkplugMetricUtil.File.class),
+    Template(19, SparkplugBProto.Payload.Template.class),
+
+    // PropertyValue Types (20 and 21) are NOT metric datatypes
+
+    // Unknown
+    Unknown(0, Object.class);
+
+    private Class<?> clazz = null;
+    private int intValue = 0;
+
+    /**
+     * Constructor
+     *
+     * @param intValue the integer value of this {@link MetricDataType}
+     * @param clazz    the {@link Class} type associated with this {@link MetricDataType}
+     */
+    private MetricDataType(int intValue, Class<?> clazz) {
+        this.intValue = intValue;
+        this.clazz = clazz;
+    }
+
+    /**
+     * Checks the type of a specified value against the specified {@link MetricDataType}
+     *
+     * @param value the {@link Object} value to check against the {@link MetricDataType}
+     * @throws AdaptorException if the value is not a valid type for the given {@link MetricDataType}
+     */
+    public void checkType(Object value) throws AdaptorException {
+        if (value != null && !clazz.isAssignableFrom(value.getClass())) {
+            String msgError = "Failed type check - " + clazz + " != " + ((value != null) ? value.getClass().toString() : "null");
+            log.debug(msgError);
+            throw new AdaptorException(msgError);
+        }
+    }
+
+    /**
+     * Returns an integer representation of the data type.
+     *
+     * @return an integer representation of the data type.
+     */
+    public int toIntValue() {
+        return this.intValue;
+    }
+
+    /**
+     * Converts the integer representation of the data type into a {@link MetricDataType} instance.
+     *
+     * @param i the integer representation of the data type.
+     * @return a {@link MetricDataType} instance.
+     */
+    public static MetricDataType fromInteger(int i) {
+        switch (i) {
+            case 1:
+                return Int8;
+            case 2:
+                return Int16;
+            case 3:
+                return Int32;
+            case 4:
+                return Int64;
+            case 5:
+                return UInt8;
+            case 6:
+                return UInt16;
+            case 7:
+                return UInt32;
+            case 8:
+                return UInt64;
+            case 9:
+                return Float;
+            case 10:
+                return Double;
+            case 11:
+                return Boolean;
+            case 12:
+                return String;
+            case 13:
+                return DateTime;
+            case 14:
+                return Text;
+            case 15:
+                return UUID;
+            case 16:
+                return DataSet;
+            case 17:
+                return Bytes;
+            case 18:
+                return File;
+            case 19:
+                return Template;
+            default:
+                return Unknown;
+        }
+    }
+
+    /**
+     * @return the class type for this DataType
+     */
+    public Class<?> getClazz() {
+        return clazz;
+    }
+
+
+}
\ No newline at end of file
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugConnectionState.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugConnectionState.java
new file mode 100644
index 0000000000..646dc1842e
--- /dev/null
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugConnectionState.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.util.sparkplug;
+
+public enum SparkplugConnectionState {
+    /**
+     * The EoN node should examine the payload of this
+     * message to ensure that it is a value of “ONLINE”
+     */
+    OFFLINE,
+    /**
+     * If the value is “OFFLINE”, this indicates the Primary Application
+     * has lost its MQTT Session to this particular MQTT Server.
+     */
+    ONLINE
+
+}
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugMessageType.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugMessageType.java
new file mode 100644
index 0000000000..f9ca6299bc
--- /dev/null
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugMessageType.java
@@ -0,0 +1,113 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.util.sparkplug;
+
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+
+/**
+ * An enumeration of Sparkplug MQTT message types.  The type provides an indication as to what the MQTT Payload of 
+ * message will contain.
+ */
+public enum SparkplugMessageType {
+	
+	/**
+	 * Birth certificate for MQTT Edge of Network (EoN) Nodes.
+	 */
+	NBIRTH,
+	
+	/**
+	 * Death certificate for MQTT Edge of Network (EoN) Nodes.
+	 */
+	NDEATH,
+	
+	/**
+	 * Birth certificate for MQTT Devices.
+	 */
+	DBIRTH,
+	
+	/**
+	 * Death certificate for MQTT Devices.
+	 */
+	DDEATH,
+	
+	/**
+	 * Edge of Network (EoN) Node data message.
+	 */
+	NDATA,
+	
+	/**
+	 * Device data message.
+	 */
+	DDATA,
+	
+	/**
+	 * Edge of Network (EoN) Node command message.
+	 */
+	NCMD,
+	
+	/**
+	 * Device command message.
+	 */
+	DCMD,
+	
+	/**
+	 * Critical application state message.
+	 */
+	STATE,
+	
+	/**
+	 * Device record message.
+	 */
+	DRECORD,
+	
+	/**
+	 * Edge of Network (EoN) Node record message.
+	 */
+	NRECORD;
+	
+	public static SparkplugMessageType parseMessageType(String type) throws ThingsboardException {
+		for (SparkplugMessageType messageType : SparkplugMessageType.values()) {
+			if (messageType.name().equals(type)) {
+				return messageType;
+			}
+		}
+		throw new ThingsboardException("Invalid message type: " + type, ThingsboardErrorCode.INVALID_ARGUMENTS);
+	}
+	public static String messageName(SparkplugMessageType type) {
+		return STATE.equals(type) ? "sparkplugConnectionState" : type.name();
+	}
+	
+	public boolean isDeath() {
+		return this.equals(DDEATH) || this.equals(NDEATH);
+	}
+	
+	public boolean isCommand() {
+		return this.equals(DCMD) || this.equals(NCMD);
+	}
+	
+	public boolean isData() {
+		return this.equals(DDATA) || this.equals(NDATA);
+	}
+	
+	public boolean isBirth() {
+		return this.equals(DBIRTH) || this.equals(NBIRTH);
+	}
+	
+	public boolean isRecord() {
+		return this.equals(DRECORD) || this.equals(NRECORD);
+	}
+}
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugMetricUtil.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugMetricUtil.java
new file mode 100644
index 0000000000..65bf6b2063
--- /dev/null
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugMetricUtil.java
@@ -0,0 +1,452 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.util.sparkplug;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.ser.std.FileSerializer;
+import com.google.protobuf.ByteString;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.gen.transport.mqtt.SparkplugBProto;
+
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+import java.text.NumberFormat;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import static org.thingsboard.common.util.JacksonUtil.newArrayNode;
+
+/**
+ * Provides utility methods for SparkplugB MQTT Payload Metric.
+ */
+@Slf4j
+public class SparkplugMetricUtil {
+
+    public static Optional<TransportProtos.KeyValueProto> fromSparkplugBMetricToKeyValueProto(String key, SparkplugBProto.Payload.Metric protoMetric) throws ThingsboardException {
+        // Check if the null flag has been set indicating that the value is null
+        if (protoMetric.getIsNull()) {
+            return Optional.empty();
+        }
+        // Otherwise convert the value based on the type
+        int metricType = protoMetric.getDatatype();
+        TransportProtos.KeyValueProto.Builder builderProto = TransportProtos.KeyValueProto.newBuilder();
+        ArrayNode nodeArray = newArrayNode();
+        MetricDataType metricDataType = MetricDataType.fromInteger(metricType);
+        try {
+            switch (metricDataType) {
+                case Boolean:
+                    return Optional.of(builderProto.setKey(key).setType(TransportProtos.KeyValueType.BOOLEAN_V)
+                            .setBoolV(protoMetric.getBooleanValue()).build());
+                case DateTime:
+                case Int64:
+                    return Optional.of(builderProto.setKey(key).setType(TransportProtos.KeyValueType.LONG_V)
+                            .setLongV(protoMetric.getLongValue()).build());
+                case Float:
+                    var f = new BigDecimal(String.valueOf(protoMetric.getFloatValue()));
+                    return Optional.of(builderProto.setKey(key).setType(TransportProtos.KeyValueType.DOUBLE_V)
+                            .setDoubleV(f.doubleValue()).build());
+                case Double:
+                    return Optional.of(builderProto.setKey(key).setType(TransportProtos.KeyValueType.LONG_V)
+                            .setLongV(Double.valueOf(protoMetric.getDoubleValue()).longValue()).build());
+                case Int8:
+                case UInt8:
+                case Int16:
+                case Int32:
+                case UInt16:
+                    return Optional.of(builderProto.setKey(key).setType(TransportProtos.KeyValueType.LONG_V)
+                            .setLongV(protoMetric.getIntValue()).build());
+                case UInt32:
+                case UInt64:
+                    if (protoMetric.hasIntValue()) {
+                        return Optional.of(builderProto.setKey(key).setType(TransportProtos.KeyValueType.LONG_V)
+                                .setLongV(protoMetric.getIntValue()).build());
+                    } else if (protoMetric.hasLongValue()) {
+                        return Optional.of(builderProto.setKey(key).setType(TransportProtos.KeyValueType.LONG_V)
+                                .setLongV(protoMetric.getLongValue()).build());
+                    } else {
+                        log.error("Invalid value for UInt32 datatype");
+                        throw new ThingsboardException("Invalid value for " + MetricDataType.fromInteger(metricType).name() + " datatype " + metricType, ThingsboardErrorCode.INVALID_ARGUMENTS);
+                    }
+                case String:
+                case Text:
+                case UUID:
+                    return Optional.of(builderProto.setKey(key).setType(TransportProtos.KeyValueType.STRING_V)
+                            .setStringV(protoMetric.getStringValue()).build());
+                // byte[]
+                case Bytes:
+                    ByteBuffer byteBuffer = ByteBuffer.wrap(protoMetric.getBytesValue().toByteArray());
+                    while (byteBuffer.hasRemaining()) {
+                        nodeArray.add(byteBuffer.get());
+                    }
+                    return Optional.of(builderProto.setKey(key).setType(TransportProtos.KeyValueType.JSON_V)
+                            .setJsonV(nodeArray.toString()).build());
+                case DataSet:
+                case Template:
+                case File:
+                    //TODO
+                    // Build the and create the DataSet
+                    /**
+                     SparkplugBProto.Payload.DataSet protoDataSet = protoMetric.getDatasetValue();
+                     return new SparkplugBProto.Payload.DataSet.Builder(protoDataSet.getNumOfColumns()).addColumnNames(protoDataSet.getColumnsList())
+                     .addTypes(convertDataSetDataTypes(protoDataSet.getTypesList()))
+                     .addRows(convertDataSetRows(protoDataSet.getRowsList(), protoDataSet.getTypesList()))
+                     .createDataSet();
+                     return Optional.of(builderProto.setKey(key).setType(TransportProtos.KeyValueType.STRING_V)
+                     .setStringV(protoDataSet.toString()).build());
+                     **/
+                    //TODO
+                    // Build the and create the Template
+                    /**
+                     SparkplugBProto.Payload.Template protoTemplate = protoMetric.getTemplateValue();
+                     return Optional.of(builderProto.setKey(key).setType(TransportProtos.KeyValueType.STRING_V)
+                     .setStringV( protoTemplate.toString()).build());
+                     **/
+                    //TODO
+                    // Build the and create the File
+                    /**
+                     String filename = protoMetric.getMetadata().getFileName();
+                     return Optional.of(builderPrbyteValueoto.setKey(key + "_" + filename).setType(TransportProtos.KeyValueType.STRING_V)
+                     .setStringV(Hex.encodeHexString((protoMetric.getBytesValue().toByteArray()))).build());
+                     **/
+                    return Optional.empty();
+                case Unknown:
+                default:
+                    throw new ThingsboardException("Failed to decode: Unknown MetricDataType " + metricType, ThingsboardErrorCode.INVALID_ARGUMENTS);
+            }
+        } catch (Exception e) {
+            log.error("", e);
+            return Optional.empty();
+        }
+    }
+
+    public static SparkplugBProto.Payload.Metric createMetric(Object value, long ts, String key, MetricDataType metricDataType) throws ThingsboardException {
+        SparkplugBProto.Payload.Metric metric = SparkplugBProto.Payload.Metric.newBuilder()
+                .setTimestamp(ts)
+                .setName(key)
+                .setDatatype(metricDataType.toIntValue())
+                .build();
+        switch (metricDataType) {
+            case Int8:      //  (byte)
+                return metric.toBuilder().setIntValue(((Byte) value).intValue()).build();
+            case Int16:     // (short)
+            case UInt8:
+                return metric.toBuilder().setIntValue(((Short) value).intValue()).build();
+            case UInt16:     //  (int)
+            case Int32:
+                return metric.toBuilder().setIntValue(((Integer) value).intValue()).build();
+            case UInt32:     // (long)
+            case Int64:
+            case UInt64:
+            case DateTime:
+                return metric.toBuilder().setLongValue(((Long) value).longValue()).build();
+            case Float:     // (float)
+                return metric.toBuilder().setFloatValue(((Float) value).floatValue()).build();
+            case Double:     // (double)
+                return metric.toBuilder().setDoubleValue(((Double) value).doubleValue()).build();
+            case Boolean:      // (boolean)
+                return metric.toBuilder().setBooleanValue(((Boolean) value).booleanValue()).build();
+            case String:        // String)
+            case Text:
+            case UUID:
+                return metric.toBuilder().setStringValue((String) value).build();
+            case Bytes:
+                ByteString byteString = ByteString.copyFrom((byte[]) value);
+                return metric.toBuilder().setBytesValue(byteString).build();
+            case DataSet:
+                return metric.toBuilder().setDatasetValue((SparkplugBProto.Payload.DataSet) value).build();
+            case File:
+                SparkplugMetricUtil.File file = (SparkplugMetricUtil.File) value;
+                ByteString byteFileString = ByteString.copyFrom(file.getBytes());
+                return metric.toBuilder().setBytesValue(byteFileString).build();
+            case Template:
+                return metric.toBuilder().setTemplateValue((SparkplugBProto.Payload.Template) value).build();
+            case Unknown:
+                throw new ThingsboardException("Invalid value for MetricDataType " + metricDataType.name(), ThingsboardErrorCode.INVALID_ARGUMENTS);
+        }
+        return metric;
+    }
+
+    public static TransportProtos.TsKvProto getTsKvProto(String key, Object value, long ts) throws ThingsboardException {
+        try {
+            TransportProtos.TsKvProto.Builder tsKvProtoBuilder = TransportProtos.TsKvProto.newBuilder();
+            TransportProtos.KeyValueProto.Builder keyValueProtoBuilder = TransportProtos.KeyValueProto.newBuilder();
+            keyValueProtoBuilder.setKey(key);
+            if (value instanceof String) {
+                keyValueProtoBuilder.setType(TransportProtos.KeyValueType.STRING_V);
+                keyValueProtoBuilder.setStringV((String) value);
+            } else if (value instanceof Integer) {
+                keyValueProtoBuilder.setType(TransportProtos.KeyValueType.LONG_V);
+                keyValueProtoBuilder.setLongV((Integer) value);
+            } else if (value instanceof Long) {
+                keyValueProtoBuilder.setType(TransportProtos.KeyValueType.LONG_V);
+                keyValueProtoBuilder.setLongV((Long) value);
+            } else if (value instanceof Boolean) {
+                keyValueProtoBuilder.setType(TransportProtos.KeyValueType.BOOLEAN_V);
+                keyValueProtoBuilder.setBoolV((Boolean) value);
+            } else if (value instanceof Double) {
+                keyValueProtoBuilder.setType(TransportProtos.KeyValueType.DOUBLE_V);
+                keyValueProtoBuilder.setDoubleV((Double) value);
+            } else if (value instanceof List) {
+                keyValueProtoBuilder.setType(TransportProtos.KeyValueType.JSON_V);
+                ArrayNode arrayNodeBytes = JacksonUtil.convertValue(value, ArrayNode.class);
+                keyValueProtoBuilder.setJsonV(arrayNodeBytes.toString());
+            } else {
+                throw new ThingsboardException("Failed to convert device/node RPC command to TsKvProto for Sparkplug MQT msg: value [" + value + "]", ThingsboardErrorCode.INVALID_ARGUMENTS);
+            }
+            tsKvProtoBuilder.setKv(keyValueProtoBuilder.build());
+            tsKvProtoBuilder.setTs(ts);
+            return tsKvProtoBuilder.build();
+        } catch (Exception e) {
+            throw new ThingsboardException("Failed to convert device/node RPC command to TsKvProto for Sparkplug MQT msg: value [" + value + "]", ThingsboardErrorCode.INVALID_ARGUMENTS);
+        }
+    }
+
+    public static Optional<Object> validatedValueByTypeMetric(TransportProtos.KeyValueProto kv, MetricDataType metricDataType) throws ThingsboardException {
+        if (kv.getTypeValue() <= 3) {
+            return validatedValuePrimitiveByTypeMetric(kv, metricDataType);
+        } else if (kv.getTypeValue() == 4) {
+            JsonNode arrayNode = JacksonUtil.fromString(kv.getJsonV(), JsonNode.class);
+            if (arrayNode.isArray()) {
+                return validatedValueJsonByTypeMetric(kv.getJsonV(), metricDataType);
+            }
+        } else {
+            throw new ThingsboardException("Invalid type KeyValueProto " + kv.toString() + " for MetricDataType " + metricDataType.name(), ThingsboardErrorCode.INVALID_ARGUMENTS);
+        }
+        return Optional.empty();
+    }
+
+    public static Optional<Object> validatedValuePrimitiveByTypeMetric(TransportProtos.KeyValueProto kv, MetricDataType metricDataType) throws ThingsboardException {
+        Optional<String> valueOpt = getValueKvProtoPrimitive(kv);
+        if (valueOpt.isPresent()) {
+            try {
+                switch (metricDataType) {
+                    // int
+                    case Int8:
+                    case Int16:
+                    case UInt8:
+                    case UInt16:
+                    case Int32:
+                        Optional<Integer> boolInt8 = booleanStringToInt(valueOpt.get());
+                        if (boolInt8.isPresent()) {
+                            return Optional.of(boolInt8.get());
+                        }
+                        try {
+                            return Optional.of(Integer.valueOf(valueOpt.get()));
+                        } catch (NumberFormatException eInt) {
+                            var i = new BigDecimal(valueOpt.get());
+                            if (i.longValue() <= Integer.MAX_VALUE) {
+                                return Optional.of(i.intValue());
+                            }
+                            throw new ThingsboardException("Invalid type value " + kv.toString() + " for MetricDataType "
+                                    + metricDataType.name(), eInt, ThingsboardErrorCode.INVALID_ARGUMENTS);
+                        }
+                        // long
+                    case UInt32:
+                    case Int64:
+                    case UInt64:
+                    case DateTime:
+                        Optional<Integer> boolInt64 = booleanStringToInt(valueOpt.get());
+                        if (boolInt64.isPresent()) {
+                            return Optional.of(Long.valueOf(boolInt64.get()));
+                        }
+                        var l = new BigDecimal(valueOpt.get());
+                        return Optional.of(l.longValue());
+                    // float
+                    case Float:
+                        Optional<Integer> boolFloat = booleanStringToInt(valueOpt.get());
+                        if (boolFloat.isPresent()) {
+                            var fb = new BigDecimal(boolFloat.get());
+                            return Optional.of(fb.floatValue());
+                        }
+                        var f = new BigDecimal(valueOpt.get());
+                        return Optional.of(f.floatValue());
+                    // double
+                    case Double:
+                        Optional<Integer> boolDouble = booleanStringToInt(valueOpt.get());
+                        if (boolDouble.isPresent()) {
+                            return Optional.of(Double.valueOf(boolDouble.get()));
+                        }
+                        var dd = new BigDecimal(valueOpt.get());
+                        return Optional.of(dd.doubleValue());
+                    case Boolean:
+                        if ("true".equals(valueOpt.get())) {
+                            return Optional.of(true);
+                        } else if ("false".equals(valueOpt.get())) {
+                            return Optional.of(false);
+                        } else {
+                            Number number = NumberFormat.getInstance().parse(valueOpt.get());
+                            if (StringUtils.isBlank(number.toString()) || "0".equals(number.toString())) { // ok 0
+                                return Optional.of(false);
+                            } else {
+                                return Optional.of(true);
+                            }
+                        }
+                    case String:
+                    case Text:
+                    case UUID:
+                        return Optional.of(valueOpt.get());
+                }
+            } catch (Exception e) {
+                log.trace("Invalid type value [{}] for MetricDataType [{}] [{}]", kv, metricDataType.name(), e.getMessage());
+                throw new ThingsboardException("Invalid type value " + kv.toString() + " for MetricDataType " + metricDataType.name(), e, ThingsboardErrorCode.INVALID_ARGUMENTS);
+            }
+        }
+        return Optional.empty();
+    }
+
+    public static Optional<Object> validatedValueJsonByTypeMetric(String arrayNodeStr, MetricDataType metricDataType) {
+        try {
+            Optional<Object> valueOpt;
+            switch (metricDataType) {
+                // byte[]
+                case Bytes:
+                    List<Byte> listBytes = JacksonUtil.fromString(arrayNodeStr, new TypeReference<>() {
+                    });
+                    byte[] bytes = new byte[listBytes.size()];
+                    for (int i = 0; i < listBytes.size(); i++) {
+                        bytes[i] = listBytes.get(i).byteValue();
+                    }
+                    return Optional.of(bytes);
+                case DataSet:
+                case File:
+                case Template:
+                    log.error("Invalid type value [{}] for MetricDataType [{}]", arrayNodeStr, metricDataType.name());
+                    return Optional.empty();
+                case Unknown:
+                default:
+                    log.error("Invalid MetricDataType [{}] type,  value [{}]", arrayNodeStr, metricDataType.name());
+                    return Optional.empty();
+            }
+        } catch (Exception e) {
+            log.error("Invalid type value [{}] for MetricDataType [{}] [{}]", arrayNodeStr, metricDataType.name(), e.getMessage());
+            return Optional.empty();
+        }
+    }
+
+    private static Optional<String> getValueKvProtoPrimitive(TransportProtos.KeyValueProto kv) {
+        if (kv.getTypeValue() == 0) {         // boolean
+            return Optional.of(String.valueOf(kv.getBoolV()));
+        } else if (kv.getTypeValue() == 1) {   // kvLong
+            return Optional.of(String.valueOf(kv.getLongV()));
+        } else if (kv.getTypeValue() == 2) {   // kvDouble/float
+            return Optional.of(String.valueOf(kv.getDoubleV()));
+        } else if (kv.getTypeValue() == 3) {   // kvString
+            return Optional.of(kv.getStringV());
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    private static Optional<Integer> booleanStringToInt(String booleanStr) {
+        if ("true".equals(booleanStr)) {
+            return Optional.of(1);
+        } else if ("false".equals(booleanStr)) {
+            return Optional.of(0);
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    @JsonIgnoreProperties(
+            value = {"fileName"})
+    @JsonSerialize(
+            using = FileSerializer.class)
+    public class File {
+
+        private String fileName;
+        private byte[] bytes;
+
+        /**
+         * Default Constructor
+         */
+        public File() {
+            super();
+        }
+
+        /**
+         * Constructor
+         *
+         * @param fileName the full file name path
+         * @param bytes    the array of bytes that represent the contents of the file
+         */
+        public File(String fileName, byte[] bytes) {
+            super();
+            this.fileName = fileName == null
+                    ? null
+                    : fileName.replace("/", System.getProperty("file.separator")).replace("\\",
+                    System.getProperty("file.separator"));
+            this.bytes = Arrays.copyOf(bytes, bytes.length);
+        }
+
+        /**
+         * Gets the full filename path
+         *
+         * @return the full filename path
+         */
+        public String getFileName() {
+            return fileName;
+        }
+
+        /**
+         * Sets the full filename path
+         *
+         * @param fileName the full filename path
+         */
+        public void setFileName(String fileName) {
+            this.fileName = fileName;
+        }
+
+        /**
+         * Gets the bytes that represent the contents of the file
+         *
+         * @return the bytes that represent the contents of the file
+         */
+        public byte[] getBytes() {
+            return bytes;
+        }
+
+        /**
+         * Sets the bytes that represent the contents of the file
+         *
+         * @param bytes the bytes that represent the contents of the file
+         */
+        public void setBytes(byte[] bytes) {
+            this.bytes = bytes;
+        }
+
+        @Override
+        public String toString() {
+            StringBuilder builder = new StringBuilder();
+            builder.append("File [fileName=");
+            builder.append(fileName);
+            builder.append(", bytes=");
+            builder.append(Arrays.toString(bytes));
+            builder.append("]");
+            return builder.toString();
+        }
+    }
+
+}
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugRpcRequestHeader.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugRpcRequestHeader.java
new file mode 100644
index 0000000000..1a9ed987f7
--- /dev/null
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugRpcRequestHeader.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.util.sparkplug;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class SparkplugRpcRequestHeader {
+
+    private String messageType;
+    private String metricName;
+    private Object value;
+
+}
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugRpcResponseBody.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugRpcResponseBody.java
new file mode 100644
index 0000000000..8f39a526c4
--- /dev/null
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugRpcResponseBody.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.util.sparkplug;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SparkplugRpcResponseBody {
+
+    private String result;
+    private String value;
+    private String error;
+
+}
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugTopic.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugTopic.java
new file mode 100644
index 0000000000..be721f11bb
--- /dev/null
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugTopic.java
@@ -0,0 +1,164 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.util.sparkplug;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+/**
+ * Created by nickAS21 on 12.12.22
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SparkplugTopic {
+
+    /**
+     * The Sparkplug namespace version.
+     * For the Sparkplug™ B version of the specification, the UTF-8 string constant for the namespace element will be: “spBv1.0”
+     */
+    private String namespace;
+
+    /**
+     * The ID of the logical grouping of Edge of Network (EoN) Nodes and devices.
+     */
+    private String groupId;
+
+    /**
+     * The ID of the Edge of Network (EoN) Node.
+     */
+    private String edgeNodeId;
+
+    /**
+     * The ID of the device.
+     */
+    private String deviceId;
+
+    /**
+     * The message type.
+     */
+    private SparkplugMessageType type;
+
+     /**
+     * Constructor (device).
+     *
+     * @param namespace the namespace.
+     * @param groupId the group ID.
+     * @param edgeNodeId the edge node ID.
+     * @param deviceId the device ID.
+     * @param type the message type.
+     */
+    public SparkplugTopic(String namespace, String groupId, String edgeNodeId, String deviceId, SparkplugMessageType type) {
+        super();
+        this.namespace = namespace;
+        this.groupId = groupId;
+        this.edgeNodeId = edgeNodeId;
+        this.deviceId = deviceId;
+        this.type = type;
+    }
+
+    /**
+     * Constructor (node).
+     *
+     * @param namespace the namespace.
+     * @param groupId the group ID.
+     * @param edgeNodeId the edge node ID.
+     * @param type the message type.
+     */
+    public SparkplugTopic(String namespace, String groupId, String edgeNodeId, SparkplugMessageType type) {
+        super();
+        this.namespace = namespace;
+        this.groupId = groupId;
+        this.edgeNodeId = edgeNodeId;
+        this.deviceId = null;
+        this.type = type;
+    }
+
+    public SparkplugTopic(SparkplugTopic sparkplugTopic,  SparkplugMessageType type) {
+        super();
+        this.namespace = sparkplugTopic.namespace;
+        this.groupId = sparkplugTopic.groupId;
+        this.edgeNodeId = sparkplugTopic.edgeNodeId;
+        this.deviceId = null;
+        this.type = type;
+    }
+    public SparkplugTopic(SparkplugTopic sparkplugTopic,  SparkplugMessageType type, String deviceId) {
+        super();
+        this.namespace = sparkplugTopic.namespace;
+        this.groupId = sparkplugTopic.groupId;
+        this.edgeNodeId = sparkplugTopic.edgeNodeId;
+        this.deviceId = deviceId;
+        this.type = type;
+    }
+
+    /**
+     * @return the Sparkplug namespace version
+     */
+    public String getNamespace() {
+        return namespace;
+    }
+
+    /**
+     * Returns the ID of the logical grouping of Edge of Network (EoN) Nodes and devices.
+     *
+     * @return the group ID
+     */
+    public String getGroupId() {
+        return groupId;
+    }
+
+    /**
+     * @return  the ID of the Edge of Network (EoN) Node
+     */
+    public String getEdgeNodeId() {
+        return edgeNodeId;
+    }
+
+    /**
+     * @return the device ID
+     */
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    /**
+     * @return the message type
+     */
+    public SparkplugMessageType getType() {
+        return type;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder(getNamespace()).append("/")
+                .append(getGroupId()).append("/")
+                .append(getType()).append("/")
+                .append(getEdgeNodeId());
+        if (getDeviceId() != null) {
+            sb.append("/").append(getDeviceId());
+        }
+        return sb.toString();
+    }
+
+    /**
+     * @param type the type to check
+     * @return true if this topic's type matches the passes in type, false otherwise
+     */
+    public boolean isType(SparkplugMessageType type) {
+        return this.type != null && this.type.equals(type);
+    }
+
+    public boolean isNode() {
+        return this.deviceId == null;
+    }
+}
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugTopicUtil.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugTopicUtil.java
new file mode 100644
index 0000000000..58b4319781
--- /dev/null
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugTopicUtil.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.mqtt.util.sparkplug;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Provides utility methods for handling Sparkplug MQTT message topics.
+ */
+public class SparkplugTopicUtil {
+
+    private static final Map<String, String[]> SPLIT_TOPIC_CACHE = new HashMap<String, String[]>();
+    private static final String TOPIC_INVALID_NUMBER = "Invalid number of topic elements: ";
+    public static final String NAMESPACE = "spBv1.0";
+
+    public static String[] getSplitTopic(String topic) {
+        String[] splitTopic = SPLIT_TOPIC_CACHE.get(topic);
+        if (splitTopic == null) {
+            splitTopic = topic.split("/");
+            SPLIT_TOPIC_CACHE.put(topic, splitTopic);
+        }
+
+        return splitTopic;
+    }
+
+    /**
+     * Serializes a {@link SparkplugTopic} instance in to a JSON string.
+     *
+     * @param topic a {@link SparkplugTopic} instance
+     * @return a JSON string
+     * @throws JsonProcessingException
+     */
+    public static String sparkplugTopicToString(SparkplugTopic topic) throws JsonProcessingException {
+        ObjectMapper mapper = new ObjectMapper();
+        return mapper.writeValueAsString(topic);
+    }
+
+    /**
+     * Parses a Sparkplug MQTT message topic string and returns a {@link SparkplugTopic} instance.
+     *
+     * @param topic a topic string
+     * @return a {@link SparkplugTopic} instance
+     * @throws ThingsboardException if an error occurs while parsing
+     */
+    public static SparkplugTopic parseTopicSubscribe(String topic) throws ThingsboardException {
+        // TODO "+", "$"
+        topic = topic.indexOf("#") > 0 ? topic.substring(0, topic.indexOf("#")) : topic;
+        return parseTopic(SparkplugTopicUtil.getSplitTopic(topic));
+    }
+
+    public static SparkplugTopic parseTopicPublish(String topic) throws ThingsboardException {
+        if (topic.contains("#") || topic.contains("$") || topic.contains("+")) {
+            throw new ThingsboardException("Invalid of topic elements for Publish", ThingsboardErrorCode.INVALID_ARGUMENTS);
+        } else {
+            String[] splitTopic = SparkplugTopicUtil.getSplitTopic(topic);
+            if (splitTopic.length < 4 || splitTopic.length > 5) {
+                throw new ThingsboardException(TOPIC_INVALID_NUMBER + splitTopic.length, ThingsboardErrorCode.INVALID_ARGUMENTS);
+            }
+            return parseTopic(splitTopic);
+        }
+    }
+
+    /**
+     * Parses a Sparkplug MQTT message topic string and returns a {@link SparkplugTopic} instance.
+     *
+     * @param splitTopic a topic split into tokens
+     * @return a {@link SparkplugTopic} instance
+     * @throws Exception if an error occurs while parsing
+     */
+    @SuppressWarnings("incomplete-switch")
+    public static SparkplugTopic parseTopic(String[] splitTopic) throws ThingsboardException {
+        int length = splitTopic.length;
+        if (length == 0) {
+			throw new ThingsboardException(TOPIC_INVALID_NUMBER + length, ThingsboardErrorCode.INVALID_ARGUMENTS);
+        } else {
+            SparkplugMessageType type;
+            String namespace, edgeNodeId, groupId, deviceId;
+            namespace = validateNameSpace(splitTopic[0]);
+            groupId = length > 1 ? splitTopic[1] : null;
+            type = length > 2 ? SparkplugMessageType.parseMessageType(splitTopic[2]) : null;
+            edgeNodeId = length > 3 ? splitTopic[3] : null;
+			deviceId = length > 4 ? splitTopic[4] : null;
+			return new SparkplugTopic(namespace, groupId, edgeNodeId, deviceId, type);
+        }
+    }
+
+    /**
+     * For the Sparkplug™ B version of the specification, the UTF-8 string constant for the namespace element will be: "spBv1.0"
+     * @param nameSpace
+     * @return
+     */
+    private static String validateNameSpace(String nameSpace)  throws ThingsboardException {
+        if (NAMESPACE.equals(nameSpace)) return nameSpace;
+        throw new ThingsboardException("The namespace [" + nameSpace + "] is not valid and must be [" + NAMESPACE + "] for the Sparkplug™ B version.", ThingsboardErrorCode.INVALID_ARGUMENTS);
+    }
+
+}
diff --git a/common/transport/mqtt/src/main/proto/sparkplug.proto b/common/transport/mqtt/src/main/proto/sparkplug.proto
new file mode 100644
index 0000000000..0d757391ff
--- /dev/null
+++ b/common/transport/mqtt/src/main/proto/sparkplug.proto
@@ -0,0 +1,204 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto3";
+
+import "google/protobuf/any.proto";
+
+
+option java_package = "org.thingsboard.server.gen.transport.mqtt";
+option java_outer_classname = "SparkplugBProto";
+
+message Payload {
+  /*
+      // Indexes of Data Types
+      // Unknown placeholder for future expansion.
+      Unknown         = 0;
+      // Basic Types
+      Int8            = 1;
+      Int16           = 2;
+      Int32           = 3;
+      Int64           = 4;
+      UInt8           = 5;
+      UInt16          = 6;
+      UInt32          = 7;
+      UInt64          = 8;
+      Float           = 9;
+      Double          = 10;
+      Boolean         = 11;
+      String          = 12;
+      DateTime        = 13;
+      Text            = 14;
+      // Additional Metric Types
+      UUID            = 15;
+      DataSet         = 16;
+      Bytes           = 17;
+      File            = 18;
+      Template        = 19;
+
+      // Additional PropertyValue Types
+      PropertySet     = 20;
+      PropertySetList = 21;
+  */
+
+  message Template {
+
+    message Parameter {
+      optional string name        = 1;
+      optional uint32 type        = 2;
+
+      oneof value {
+        uint32 int_value        = 3;
+        uint64 long_value       = 4;
+        float  float_value      = 5;
+        double double_value     = 6;
+        bool   boolean_value    = 7;
+        string string_value     = 8;
+        ParameterValueExtension extension_value = 9;
+      }
+
+      message ParameterValueExtension {
+        google.protobuf.Any extensions = 1;
+      }
+    }
+
+    optional string version         = 1;          // The version of the Template to prevent mismatches
+    repeated Metric metrics         = 2;          // Each metric is the name of the metric and the datatype of the member but does not contain a value
+    repeated Parameter parameters   = 3;
+    optional string template_ref    = 4;          // Reference to a template if this is extending a Template or an instance - must exist if an instance
+    optional bool is_definition     = 5;
+    google.protobuf.Any extensions  = 6;
+  }
+
+  message DataSet {
+
+    message DataSetValue {
+
+      oneof value {
+        uint32 int_value                        = 1;
+        uint64 long_value                       = 2;
+        float  float_value                      = 3;
+        double double_value                     = 4;
+        bool   boolean_value                    = 5;
+        string string_value                     = 6;
+        DataSetValueExtension extension_value   = 7;
+      }
+
+      message DataSetValueExtension {
+        google.protobuf.Any extensions  = 1;
+      }
+    }
+
+    message Row {
+      repeated DataSetValue elements  = 1;
+      google.protobuf.Any extensions  = 2;   // For third party extensions
+    }
+
+    optional uint64   num_of_columns    = 1;
+    repeated string   columns           = 2;
+    repeated uint32   types             = 3;
+    repeated Row      rows              = 4;
+    google.protobuf.Any extensions      = 5;   // For third party extensions
+  }
+
+  message PropertyValue {
+
+    optional uint32     type                    = 1;
+    optional bool       is_null                 = 2;
+
+    oneof value {
+      uint32          int_value               = 3;
+      uint64          long_value              = 4;
+      float           float_value             = 5;
+      double          double_value            = 6;
+      bool            boolean_value           = 7;
+      string          string_value            = 8;
+      PropertySet     propertyset_value       = 9;
+      PropertySetList propertysets_value      = 10;      // List of Property Values
+      PropertyValueExtension extension_value  = 11;
+    }
+
+    message PropertyValueExtension {
+      google.protobuf.Any extensions  = 1;
+    }
+  }
+
+  message PropertySet {
+    repeated string        keys     = 1;         // Names of the properties
+    repeated PropertyValue values   = 2;
+    google.protobuf.Any extensions  = 3;
+  }
+
+  message PropertySetList {
+    repeated PropertySet propertyset = 1;
+    google.protobuf.Any extensions  = 2;
+  }
+
+  message MetaData {
+    // Bytes specific metadata
+    optional bool   is_multi_part   = 1;
+
+    // General metadata
+    optional string content_type    = 2;        // Content/Media type
+    optional uint64 size            = 3;        // File size, String size, Multi-part size, etc
+    optional uint64 seq             = 4;        // Sequence number for multi-part messages
+
+    // File metadata
+    optional string file_name       = 5;        // File name
+    optional string file_type       = 6;        // File type (i.e. xml, json, txt, cpp, etc)
+    optional string md5             = 7;        // md5 of data
+
+    // Catchalls and future expansion
+    optional string description     = 8;        // Could be anything such as json or xml of custom properties
+    google.protobuf.Any extensions  = 9;
+  }
+
+  message Metric {
+
+    optional string   name          = 1;        // Metric name - should only be included on birth
+    optional uint64   alias         = 2;        // Metric alias - tied to name on birth and included in all later DATA messages
+    optional uint64   timestamp     = 3;        // Timestamp associated with data acquisition time
+    optional uint32   datatype      = 4;        // DataType of the metric/tag value
+    optional bool     is_historical = 5;        // If this is historical data and should not update real time tag
+    optional bool     is_transient  = 6;        // Tells consuming clients such as MQTT Engine to not store this as a tag
+    optional bool     is_null       = 7;        // If this is null - explicitly say so rather than using -1, false, etc for some datatypes.
+    optional MetaData metadata      = 8;        // Metadata for the payload
+    optional PropertySet properties = 9;
+
+    oneof value {
+      uint32   int_value                      = 10;
+      uint64   long_value                     = 11;
+      float    float_value                    = 12;
+      double   double_value                   = 13;
+      bool     boolean_value                  = 14;
+      string   string_value                   = 15;
+      bytes    bytes_value                    = 16;       // Bytes, File
+      DataSet  dataset_value                  = 17;
+      Template template_value                 = 18;
+      MetricValueExtension extension_value    = 19;
+    }
+
+    message MetricValueExtension {
+      google.protobuf.Any extensions  = 1;
+    }
+  }
+
+  optional uint64   timestamp     = 1;        // Timestamp at message sending time
+  repeated Metric   metrics       = 2;        // Repeated forever - no limit in Google Protobufs
+  optional uint64   seq           = 3;        // Sequence number
+  optional string   uuid          = 4;        // UUID to track message type in terms of schema definitions
+  optional bytes    body          = 5;        // To optionally bypass the whole definition above
+  google.protobuf.Any extensions  = 6;
+}
\ No newline at end of file
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 04bf2b964d..dc2ad73cc1 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
@@ -301,8 +301,8 @@ public class DefaultTransportService implements TransportService {
 
     @Override
     public TransportProtos.GetEntityProfileResponseMsg getEntityProfile(TransportProtos.GetEntityProfileRequestMsg msg) {
-        TbProtoQueueMsg<TransportProtos.TransportApiRequestMsg> protoMsg =
-                new TbProtoQueueMsg<>(UUID.randomUUID(), TransportProtos.TransportApiRequestMsg.newBuilder().setEntityProfileRequestMsg(msg).build());
+        TbProtoQueueMsg<TransportApiRequestMsg> protoMsg =
+                new TbProtoQueueMsg<>(UUID.randomUUID(), TransportApiRequestMsg.newBuilder().setEntityProfileRequestMsg(msg).build());
         try {
             TbProtoQueueMsg<TransportApiResponseMsg> response = transportApiRequestTemplate.send(protoMsg).get();
             return response.getValue().getEntityProfileResponseMsg();
@@ -313,8 +313,8 @@ public class DefaultTransportService implements TransportService {
 
     @Override
     public List<TransportProtos.GetQueueRoutingInfoResponseMsg> getQueueRoutingInfo(TransportProtos.GetAllQueueRoutingInfoRequestMsg msg) {
-        TbProtoQueueMsg<TransportProtos.TransportApiRequestMsg> protoMsg =
-                new TbProtoQueueMsg<>(UUID.randomUUID(), TransportProtos.TransportApiRequestMsg.newBuilder().setGetAllQueueRoutingInfoRequestMsg(msg).build());
+        TbProtoQueueMsg<TransportApiRequestMsg> protoMsg =
+                new TbProtoQueueMsg<>(UUID.randomUUID(), TransportApiRequestMsg.newBuilder().setGetAllQueueRoutingInfoRequestMsg(msg).build());
         try {
             TbProtoQueueMsg<TransportApiResponseMsg> response = transportApiRequestTemplate.send(protoMsg).get();
             return response.getValue().getGetQueueRoutingInfoResponseMsgsList();
@@ -325,8 +325,8 @@ public class DefaultTransportService implements TransportService {
 
     @Override
     public TransportProtos.GetResourceResponseMsg getResource(TransportProtos.GetResourceRequestMsg msg) {
-        TbProtoQueueMsg<TransportProtos.TransportApiRequestMsg> protoMsg =
-                new TbProtoQueueMsg<>(UUID.randomUUID(), TransportProtos.TransportApiRequestMsg.newBuilder().setResourceRequestMsg(msg).build());
+        TbProtoQueueMsg<TransportApiRequestMsg> protoMsg =
+                new TbProtoQueueMsg<>(UUID.randomUUID(), TransportApiRequestMsg.newBuilder().setResourceRequestMsg(msg).build());
         try {
             TbProtoQueueMsg<TransportApiResponseMsg> response = transportApiRequestTemplate.send(protoMsg).get();
             return response.getValue().getResourceResponseMsg();
@@ -337,8 +337,8 @@ public class DefaultTransportService implements TransportService {
 
     @Override
     public TransportProtos.GetSnmpDevicesResponseMsg getSnmpDevicesIds(TransportProtos.GetSnmpDevicesRequestMsg requestMsg) {
-        TbProtoQueueMsg<TransportProtos.TransportApiRequestMsg> protoMsg = new TbProtoQueueMsg<>(
-                UUID.randomUUID(), TransportProtos.TransportApiRequestMsg.newBuilder()
+        TbProtoQueueMsg<TransportApiRequestMsg> protoMsg = new TbProtoQueueMsg<>(
+                UUID.randomUUID(), TransportApiRequestMsg.newBuilder()
                 .setSnmpDevicesRequestMsg(requestMsg)
                 .build()
         );
@@ -354,7 +354,7 @@ public class DefaultTransportService implements TransportService {
     @Override
     public TransportProtos.GetDeviceResponseMsg getDevice(TransportProtos.GetDeviceRequestMsg requestMsg) {
         TbProtoQueueMsg<TransportApiRequestMsg> protoMsg = new TbProtoQueueMsg<>(
-                UUID.randomUUID(), TransportProtos.TransportApiRequestMsg.newBuilder()
+                UUID.randomUUID(), TransportApiRequestMsg.newBuilder()
                 .setDeviceRequestMsg(requestMsg)
                 .build()
         );
@@ -374,7 +374,7 @@ public class DefaultTransportService implements TransportService {
     @Override
     public TransportProtos.GetDeviceCredentialsResponseMsg getDeviceCredentials(TransportProtos.GetDeviceCredentialsRequestMsg requestMsg) {
         TbProtoQueueMsg<TransportApiRequestMsg> protoMsg = new TbProtoQueueMsg<>(
-                UUID.randomUUID(), TransportProtos.TransportApiRequestMsg.newBuilder()
+                UUID.randomUUID(), TransportApiRequestMsg.newBuilder()
                 .setDeviceCredentialsRequestMsg(requestMsg)
                 .build()
         );
@@ -720,8 +720,8 @@ public class DefaultTransportService implements TransportService {
     @Override
     public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.GetOtaPackageRequestMsg msg, TransportServiceCallback<TransportProtos.GetOtaPackageResponseMsg> callback) {
         if (checkLimits(sessionInfo, msg, callback)) {
-            TbProtoQueueMsg<TransportProtos.TransportApiRequestMsg> protoMsg =
-                    new TbProtoQueueMsg<>(UUID.randomUUID(), TransportProtos.TransportApiRequestMsg.newBuilder().setOtaPackageRequestMsg(msg).build());
+            TbProtoQueueMsg<TransportApiRequestMsg> protoMsg =
+                    new TbProtoQueueMsg<>(UUID.randomUUID(), TransportApiRequestMsg.newBuilder().setOtaPackageRequestMsg(msg).build());
 
             AsyncCallbackTemplate.withCallback(transportApiRequestTemplate.send(protoMsg), response -> {
                 callback.onSuccess(response.getValue().getOtaPackageResponseMsg());
@@ -864,7 +864,7 @@ public class DefaultTransportService implements TransportService {
         }
     }
 
-    protected void processToTransportMsg(TransportProtos.ToTransportMsg toSessionMsg) {
+    protected void processToTransportMsg(ToTransportMsg toSessionMsg) {
         UUID sessionId = new UUID(toSessionMsg.getSessionIdMSB(), toSessionMsg.getSessionIdLSB());
         SessionMetaData md = sessions.get(sessionId);
         if (md != null) {
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/session/DeviceAwareSessionContext.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/session/DeviceAwareSessionContext.java
index e226067042..4870cfc3ca 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/session/DeviceAwareSessionContext.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/session/DeviceAwareSessionContext.java
@@ -20,6 +20,8 @@ import lombok.Getter;
 import lombok.Setter;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
 import org.thingsboard.server.gen.transport.TransportProtos;
@@ -44,7 +46,7 @@ public abstract class DeviceAwareSessionContext implements SessionContext {
     protected volatile DeviceProfile deviceProfile;
     @Getter
     @Setter
-    private volatile TransportProtos.SessionInfoProto sessionInfo;
+    protected volatile TransportProtos.SessionInfoProto sessionInfo;
 
     @Setter
     private volatile boolean connected;
@@ -81,4 +83,14 @@ public abstract class DeviceAwareSessionContext implements SessionContext {
     public void setDisconnected() {
         this.connected = false;
     }
+
+    public boolean isSparkplug() {
+        DeviceProfileTransportConfiguration transportConfiguration = this.deviceProfile.getProfileData().getTransportConfiguration();
+        if (transportConfiguration instanceof MqttDeviceProfileTransportConfiguration) {
+            return ((MqttDeviceProfileTransportConfiguration) transportConfiguration).isSparkplug();
+        } else {
+            return false;
+        }
+    }
+
 }
diff --git a/common/transport/transport-api/src/test/java/JsonConverterTest.java b/common/transport/transport-api/src/test/java/JsonConverterTest.java
index a60516e784..39ed04a29a 100644
--- a/common/transport/transport-api/src/test/java/JsonConverterTest.java
+++ b/common/transport/transport-api/src/test/java/JsonConverterTest.java
@@ -16,20 +16,18 @@
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 
 import java.util.ArrayList;
 
-@RunWith(MockitoJUnitRunner.class)
 public class JsonConverterTest {
 
-    private static final JsonParser JSON_PARSER = new JsonParser();
+    private final JsonParser JSON_PARSER = new JsonParser();
 
-    @Before
+    @BeforeEach
     public void before() {
         JsonConverter.setTypeCastEnabled(true);
     }
@@ -88,15 +86,19 @@ public class JsonConverterTest {
         Assert.assertEquals("10000000000000000000", result.get(0L).get(0).getStrValue().get());
     }
 
-    @Test(expected = JsonSyntaxException.class)
+    @Test
     public void testParseBigDecimalOutOfLongRangeWithoutParsing() {
         JsonConverter.setTypeCastEnabled(false);
-        JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 89701010051400054084}"), 0L);
+        Assertions.assertThrows(JsonSyntaxException.class, () -> {
+            JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 89701010051400054084}"), 0L);
+        });
     }
 
-    @Test(expected = JsonSyntaxException.class)
+    @Test
     public void testParseBigDecimalOutOfLongRangeWithoutParsing2() {
         JsonConverter.setTypeCastEnabled(false);
-        JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 9.9701010061400066E19}"), 0L);
+        Assertions.assertThrows(JsonSyntaxException.class, () -> {
+            JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 9.9701010061400066E19}"), 0L);
+        });
     }
 }
diff --git a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
index 9120b45b6b..4638b81958 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
@@ -155,6 +155,14 @@ public class JacksonUtil {
         return mapper.createObjectNode();
     }
 
+    public static ArrayNode newArrayNode() {
+        return newArrayNode(OBJECT_MAPPER);
+    }
+
+    public static ArrayNode newArrayNode(ObjectMapper mapper) {
+        return mapper.createArrayNode();
+    }
+
     public static <T> T clone(T value) {
         @SuppressWarnings("unchecked")
         Class<T> valueClass = (Class<T>) value.getClass();
diff --git a/dao/pom.xml b/dao/pom.xml
index 30dc1adcf0..4fc8a3c08d 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -162,26 +162,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.cassandraunit</groupId>
-            <artifactId>cassandra-unit</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-validator</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cassandra</groupId>
-            <artifactId>cassandra-thrift</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
@@ -211,6 +191,11 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>cassandra</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java
index 103f25a4ac..3d2e7078a1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java
@@ -15,17 +15,21 @@
  */
 package org.thingsboard.server.dao.alarm;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmQuery;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.alarm.AlarmStatusFilter;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
 import org.thingsboard.server.common.data.alarm.EntityAlarm;
 import org.thingsboard.server.common.data.id.AlarmId;
 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.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.query.AlarmData;
@@ -44,12 +48,16 @@ public interface AlarmDao extends Dao<Alarm> {
 
     Alarm findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type);
 
+    Alarm findLatestActiveByOriginatorAndType(TenantId tenantId, EntityId originator, String type);
+
     ListenableFuture<Alarm> findLatestByOriginatorAndTypeAsync(TenantId tenantId, EntityId originator, String type);
 
     Alarm findAlarmById(TenantId tenantId, UUID key);
 
     ListenableFuture<Alarm> findAlarmByIdAsync(TenantId tenantId, UUID key);
 
+    AlarmInfo findAlarmInfoById(TenantId tenantId, UUID key);
+
     Alarm save(TenantId tenantId, Alarm alarm);
 
     PageData<AlarmInfo> findAlarms(TenantId tenantId, AlarmQuery query);
@@ -58,7 +66,7 @@ public interface AlarmDao extends Dao<Alarm> {
 
     PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, AlarmDataQuery query, Collection<EntityId> orderedEntityIds);
 
-    Set<AlarmSeverity> findAlarmSeverities(TenantId tenantId, EntityId entityId, Set<AlarmStatus> status);
+    Set<AlarmSeverity> findAlarmSeverities(TenantId tenantId, EntityId entityId, AlarmStatusFilter asf, String assigneeId);
 
     PageData<AlarmId> findAlarmsIdsByEndTsBeforeAndTenantId(Long time, TenantId tenantId, PageLink pageLink);
 
@@ -67,4 +75,17 @@ public interface AlarmDao extends Dao<Alarm> {
     List<EntityAlarm> findEntityAlarmRecords(TenantId tenantId, AlarmId id);
 
     void deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId);
+
+    AlarmApiCallResult createOrUpdateActiveAlarm(AlarmCreateOrUpdateActiveRequest request, boolean alarmCreationEnabled);
+
+    AlarmApiCallResult updateAlarm(AlarmUpdateRequest request);
+
+    AlarmApiCallResult acknowledgeAlarm(TenantId tenantId, AlarmId id, long ackTs);
+
+    AlarmApiCallResult clearAlarm(TenantId tenantId, AlarmId alarmId, long clearTs, JsonNode details);
+
+    AlarmApiCallResult assignAlarm(TenantId tenantId, AlarmId alarmId, UserId assigneeId, long assignTime);
+
+    AlarmApiCallResult unassignAlarm(TenantId tenantId, AlarmId alarmId, long unassignTime);
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
index 606eee468d..0dd2eebf87 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
@@ -20,20 +20,22 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.base.Function;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmModificationRequest;
+import org.thingsboard.server.common.data.alarm.AlarmStatusFilter;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmQuery;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
 import org.thingsboard.server.common.data.alarm.EntityAlarm;
 import org.thingsboard.server.common.data.exception.ApiUsageLimitsExceededException;
 import org.thingsboard.server.common.data.id.AlarmId;
@@ -41,6 +43,7 @@ import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
@@ -50,11 +53,11 @@ import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationsSearchParameters;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.entity.EntityService;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.service.ConstraintValidator;
 import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.tenant.TenantService;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -63,8 +66,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -73,32 +74,52 @@ import static org.thingsboard.server.dao.service.Validator.validateId;
 
 @Service("AlarmDaoService")
 @Slf4j
+@RequiredArgsConstructor
 public class BaseAlarmService extends AbstractEntityService implements AlarmService {
 
     public static final String INCORRECT_TENANT_ID = "Incorrect tenantId ";
-    public static final String INCORRECT_CUSTOMER_ID = "Incorrect customerId ";
 
-    @Autowired
-    private AlarmDao alarmDao;
+    private final TenantService tenantService;
+    private final AlarmDao alarmDao;
+    private final EntityService entityService;
+    private final DataValidator<Alarm> alarmDataValidator;
 
-    @Autowired
-    private EntityService entityService;
+    @Override
+    public AlarmApiCallResult updateAlarm(AlarmUpdateRequest request) {
+        validateAlarmRequest(request);
+        return withPropagated(alarmDao.updateAlarm(request));
+    }
 
-    @Autowired
-    private DataValidator<Alarm> alarmDataValidator;
+    @Override
+    public AlarmApiCallResult createAlarm(AlarmCreateOrUpdateActiveRequest request) {
+        return createAlarm(request, true);
+    }
 
-    protected ExecutorService readResultsProcessingExecutor;
+    @Override
+    public AlarmApiCallResult createAlarm(AlarmCreateOrUpdateActiveRequest request, boolean alarmCreationEnabled) {
+        validateAlarmRequest(request);
+        CustomerId customerId = entityService.fetchEntityCustomerId(request.getTenantId(), request.getOriginator()).orElse(null);
+        if (customerId == null && request.getCustomerId() != null) {
+            throw new DataValidationException("Can't assign alarm to customer. Originator is not assigned to customer!");
+        } else if (customerId != null && request.getCustomerId() != null && !customerId.equals(request.getCustomerId())) {
+            throw new DataValidationException("Can't assign alarm to customer. Originator belongs to different customer!");
+        }
+        request.setCustomerId(customerId);
+        AlarmApiCallResult result = alarmDao.createOrUpdateActiveAlarm(request, alarmCreationEnabled);
+        if (!result.isSuccessful() && !alarmCreationEnabled) {
+            throw new ApiUsageLimitsExceededException("Alarms creation is disabled");
+        }
+        return withPropagated(result);
+    }
 
-    @PostConstruct
-    public void startExecutor() {
-        readResultsProcessingExecutor = Executors.newCachedThreadPool(ThingsBoardThreadFactory.forName("alarm-service"));
+    @Override
+    public AlarmApiCallResult acknowledgeAlarm(TenantId tenantId, AlarmId alarmId, long ackTs) {
+        return withPropagated(alarmDao.acknowledgeAlarm(tenantId, alarmId, ackTs));
     }
 
-    @PreDestroy
-    public void stopExecutor() {
-        if (readResultsProcessingExecutor != null) {
-            readResultsProcessingExecutor.shutdownNow();
-        }
+    @Override
+    public AlarmApiCallResult clearAlarm(TenantId tenantId, AlarmId alarmId, long clearTs, JsonNode details) {
+        return withPropagated(alarmDao.clearAlarm(tenantId, alarmId, clearTs, details));
     }
 
     @Override
@@ -116,8 +137,9 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
             if (alarm.getEndTs() == 0L) {
                 alarm.setEndTs(alarm.getStartTs());
             }
-            alarm.setCustomerId(entityService.fetchEntityCustomerId(alarm.getTenantId(), alarm.getOriginator()).get());
+            alarm.setCustomerId(entityService.fetchEntityCustomerId(alarm.getTenantId(), alarm.getOriginator()).orElse(null));
             if (alarm.getId() == null) {
+                // Atomic update and return alarm + assignee.
                 Alarm existing = alarmDao.findLatestByOriginatorAndType(alarm.getTenantId(), alarm.getOriginator(), alarm.getType());
                 if (existing == null || existing.getStatus().isCleared()) {
                     if (!alarmCreationEnabled) {
@@ -135,6 +157,12 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
         }
     }
 
+    @Override
+    public Alarm findLatestActiveByOriginatorAndType(TenantId tenantId, EntityId originator, String type) {
+        return alarmDao.findLatestActiveByOriginatorAndType(tenantId, originator, type);
+    }
+
+    @Override
     public ListenableFuture<Alarm> findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type) {
         return alarmDao.findLatestByOriginatorAndTypeAsync(tenantId, originator, type);
     }
@@ -147,6 +175,20 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
         return alarmDao.findAlarmDataByQueryForEntities(tenantId, query, orderedEntityIds);
     }
 
+    @Override
+    @Transactional
+    public AlarmApiCallResult delAlarm(TenantId tenantId, AlarmId alarmId) {
+        log.debug("Deleting Alarm Id: {}", alarmId);
+        AlarmInfo alarm = alarmDao.findAlarmInfoById(tenantId, alarmId.getId());
+        if (alarm == null) {
+            return AlarmApiCallResult.builder().successful(false).build();
+        } else {
+            deleteEntityRelations(tenantId, alarm.getId());
+            alarmDao.removeById(tenantId, alarm.getUuidId());
+            return AlarmApiCallResult.builder().alarm(alarm).successful(true).build();
+        }
+    }
+
     @Override
     @Transactional
     public AlarmOperationResult deleteAlarm(TenantId tenantId, AlarmId alarmId) {
@@ -165,10 +207,10 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
         log.debug("New Alarm : {}", alarm);
         Alarm saved = alarmDao.save(alarm.getTenantId(), alarm);
         List<EntityId> propagatedEntitiesList = createEntityAlarmRecords(saved);
-        return new AlarmOperationResult(saved, true, true, null, propagatedEntitiesList);
+        return new AlarmOperationResult(saved, true, true, propagatedEntitiesList);
     }
 
-    private List<EntityId> createEntityAlarmRecords(Alarm alarm) throws InterruptedException, ExecutionException {
+    private List<EntityId> createEntityAlarmRecords(Alarm alarm) throws ExecutionException, InterruptedException {
         Set<EntityId> propagatedEntitiesSet = new LinkedHashSet<>();
         propagatedEntitiesSet.add(alarm.getOriginator());
         if (alarm.isPropagate()) {
@@ -226,45 +268,41 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
 
     @Override
     public ListenableFuture<AlarmOperationResult> ackAlarm(TenantId tenantId, AlarmId alarmId, long ackTime) {
-        return getAndUpdateAsync(tenantId, alarmId, new Function<Alarm, AlarmOperationResult>() {
-            @Nullable
-            @Override
-            public AlarmOperationResult apply(@Nullable Alarm alarm) {
-                if (alarm == null || alarm.getStatus().isAck()) {
-                    return new AlarmOperationResult(alarm, false);
-                } else {
-                    AlarmStatus oldStatus = alarm.getStatus();
-                    AlarmStatus newStatus = oldStatus.isCleared() ? AlarmStatus.CLEARED_ACK : AlarmStatus.ACTIVE_ACK;
-                    alarm.setStatus(newStatus);
-                    alarm.setAckTs(ackTime);
-                    alarm = alarmDao.save(alarm.getTenantId(), alarm);
-                    return new AlarmOperationResult(alarm, true, new ArrayList<>(getPropagationEntityIds(alarm)));
-                }
-            }
-        });
+        Alarm alarm = alarmDao.findAlarmById(tenantId, alarmId.getId());
+        if (alarm == null || alarm.getStatus().isAck()) {
+            return Futures.immediateFuture(new AlarmOperationResult(alarm, false));
+        } else {
+            alarm.setAcknowledged(true);
+            alarm.setAckTs(ackTime);
+            alarm = alarmDao.save(alarm.getTenantId(), alarm);
+            return Futures.immediateFuture(new AlarmOperationResult(alarm, true, new ArrayList<>(getPropagationEntityIds(alarm))));
+        }
     }
 
     @Override
     public ListenableFuture<AlarmOperationResult> clearAlarm(TenantId tenantId, AlarmId alarmId, JsonNode details, long clearTime) {
-        return getAndUpdateAsync(tenantId, alarmId, new Function<Alarm, AlarmOperationResult>() {
-            @Nullable
-            @Override
-            public AlarmOperationResult apply(@Nullable Alarm alarm) {
-                if (alarm == null || alarm.getStatus().isCleared()) {
-                    return new AlarmOperationResult(alarm, false);
-                } else {
-                    AlarmStatus oldStatus = alarm.getStatus();
-                    AlarmStatus newStatus = oldStatus.isAck() ? AlarmStatus.CLEARED_ACK : AlarmStatus.CLEARED_UNACK;
-                    alarm.setStatus(newStatus);
-                    alarm.setClearTs(clearTime);
-                    if (details != null) {
-                        alarm.setDetails(details);
-                    }
-                    alarm = alarmDao.save(alarm.getTenantId(), alarm);
-                    return new AlarmOperationResult(alarm, true, new ArrayList<>(getPropagationEntityIds(alarm)));
-                }
+        Alarm alarm = alarmDao.findAlarmById(tenantId, alarmId.getId());
+        if (alarm == null || alarm.getStatus().isCleared()) {
+            return Futures.immediateFuture(new AlarmOperationResult(alarm, false));
+        } else {
+            alarm.setCleared(true);
+            alarm.setClearTs(clearTime);
+            if (details != null) {
+                alarm.setDetails(details);
             }
-        });
+            alarm = alarmDao.save(alarm.getTenantId(), alarm);
+            return Futures.immediateFuture(new AlarmOperationResult(alarm, true, new ArrayList<>(getPropagationEntityIds(alarm))));
+        }
+    }
+
+    @Override
+    public AlarmApiCallResult assignAlarm(TenantId tenantId, AlarmId alarmId, UserId assigneeId, long assignTime) {
+        return withPropagated(alarmDao.assignAlarm(tenantId, alarmId, assigneeId, assignTime));
+    }
+
+    @Override
+    public AlarmApiCallResult unassignAlarm(TenantId tenantId, AlarmId alarmId, long unassignTime) {
+        return withPropagated(alarmDao.unassignAlarm(tenantId, alarmId, unassignTime));
     }
 
     @Override
@@ -282,60 +320,35 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
     }
 
     @Override
-    public ListenableFuture<AlarmInfo> findAlarmInfoByIdAsync(TenantId tenantId, AlarmId alarmId) {
+    public AlarmInfo findAlarmInfoById(TenantId tenantId, AlarmId alarmId) {
         log.trace("Executing findAlarmInfoByIdAsync [{}]", alarmId);
         validateId(alarmId, "Incorrect alarmId " + alarmId);
-        return Futures.transform(alarmDao.findAlarmByIdAsync(tenantId, alarmId.getId()),
-                a -> {
-                    AlarmInfo alarmInfo = new AlarmInfo(a);
-                    alarmInfo.setOriginatorName(
-                            entityService.fetchEntityName(tenantId, alarmInfo.getOriginator()).orElse("N/A"));
-                    return alarmInfo;
-                }, MoreExecutors.directExecutor());
+        return alarmDao.findAlarmInfoById(tenantId, alarmId.getId());
     }
 
     @Override
     public ListenableFuture<PageData<AlarmInfo>> findAlarms(TenantId tenantId, AlarmQuery query) {
-        PageData<AlarmInfo> alarms = alarmDao.findAlarms(tenantId, query);
-        if (query.getFetchOriginator() != null && query.getFetchOriginator().booleanValue()) {
-            return fetchAlarmsOriginators(tenantId, alarms);
-        }
-        return Futures.immediateFuture(alarms);
+        return Futures.immediateFuture(alarmDao.findAlarms(tenantId, query));
     }
 
     @Override
     public ListenableFuture<PageData<AlarmInfo>> findCustomerAlarms(TenantId tenantId, CustomerId customerId, AlarmQuery query) {
-        PageData<AlarmInfo> alarms = alarmDao.findCustomerAlarms(tenantId, customerId, query);
-        if (query.getFetchOriginator() != null && query.getFetchOriginator().booleanValue()) {
-            return fetchAlarmsOriginators(tenantId, alarms);
-        }
-        return Futures.immediateFuture(alarms);
-    }
-
-    private ListenableFuture<PageData<AlarmInfo>> fetchAlarmsOriginators(TenantId tenantId, PageData<AlarmInfo> alarms) {
-        List<ListenableFuture<AlarmInfo>> alarmFutures = new ArrayList<>(alarms.getData().size());
-        for (AlarmInfo alarmInfo : alarms.getData()) {
-            alarmInfo.setOriginatorName(
-                    entityService.fetchEntityName(tenantId, alarmInfo.getOriginator()).orElse("Deleted"));
-            alarmFutures.add(Futures.immediateFuture(alarmInfo));
-        }
-        return Futures.transform(Futures.successfulAsList(alarmFutures),
-                alarmInfos -> new PageData<>(alarmInfos, alarms.getTotalPages(), alarms.getTotalElements(),
-                        alarms.hasNext()), MoreExecutors.directExecutor());
+        return Futures.immediateFuture(alarmDao.findCustomerAlarms(tenantId, customerId, query));
     }
 
     @Override
     public AlarmSeverity findHighestAlarmSeverity(TenantId tenantId, EntityId entityId, AlarmSearchStatus alarmSearchStatus,
-                                                  AlarmStatus alarmStatus) {
-        Set<AlarmStatus> statusList = null;
+                                                  AlarmStatus alarmStatus, String assigneeId) {
+        AlarmStatusFilter asf;
         if (alarmSearchStatus != null) {
-            statusList = alarmSearchStatus.getStatuses();
+            asf = AlarmStatusFilter.from(alarmSearchStatus);
         } else if (alarmStatus != null) {
-            statusList = Collections.singleton(alarmStatus);
+            asf = AlarmStatusFilter.from(alarmStatus);
+        } else {
+            asf = AlarmStatusFilter.empty();
         }
 
-        Set<AlarmSeverity> alarmSeverities = alarmDao.findAlarmSeverities(tenantId, entityId, statusList);
-
+        Set<AlarmSeverity> alarmSeverities = alarmDao.findAlarmSeverities(tenantId, entityId, asf, assigneeId);
         return alarmSeverities.stream().min(AlarmSeverity::compareTo).orElse(null);
     }
 
@@ -357,10 +370,15 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
         if (alarm.getAckTs() > existing.getAckTs()) {
             existing.setAckTs(alarm.getAckTs());
         }
-        existing.setStatus(alarm.getStatus());
+        if (alarm.getAssignTs() > existing.getAssignTs()) {
+            existing.setAssignTs(alarm.getAssignTs());
+        }
+        existing.setAcknowledged(alarm.isAcknowledged());
+        existing.setCleared(alarm.isCleared());
         existing.setSeverity(alarm.getSeverity());
         existing.setDetails(alarm.getDetails());
         existing.setCustomerId(alarm.getCustomerId());
+        existing.setAssigneeId(alarm.getAssigneeId());
         existing.setPropagate(existing.isPropagate() || alarm.isPropagate());
         existing.setPropagateToOwner(existing.isPropagateToOwner() || alarm.isPropagateToOwner());
         existing.setPropagateToTenant(existing.isPropagateToTenant() || alarm.isPropagateToTenant());
@@ -378,6 +396,10 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
         return existing;
     }
 
+    private List<EntityId> getPropagationEntityIdsList(Alarm alarm) {
+        return new ArrayList<>(getPropagationEntityIds(alarm));
+    }
+
     private Set<EntityId> getPropagationEntityIds(Alarm alarm) {
         if (alarm.isPropagate() || alarm.isPropagateToOwner() || alarm.isPropagateToTenant()) {
             List<EntityAlarm> entityAlarms = alarmDao.findEntityAlarmRecords(alarm.getTenantId(), alarm.getId());
@@ -388,7 +410,7 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
     }
 
     private void createEntityAlarmRecord(TenantId tenantId, EntityId entityId, Alarm alarm) {
-        EntityAlarm entityAlarm = new EntityAlarm(tenantId, entityId, alarm.getCreatedTime(), alarm.getType(), alarm.getCustomerId(), alarm.getId());
+        EntityAlarm entityAlarm = new EntityAlarm(tenantId, entityId, alarm.getCreatedTime(), alarm.getType(), alarm.getCustomerId(), null, alarm.getId());
         try {
             alarmDao.createEntityAlarmRecord(entityAlarm);
         } catch (Exception e) {
@@ -396,12 +418,6 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
         }
     }
 
-    private <T> ListenableFuture<T> getAndUpdateAsync(TenantId tenantId, AlarmId alarmId, Function<Alarm, T> function) {
-        validateId(alarmId, "Alarm id should be specified!");
-        ListenableFuture<Alarm> entity = alarmDao.findAlarmByIdAsync(tenantId, alarmId.getId());
-        return Futures.transform(entity, function, readResultsProcessingExecutor);
-    }
-
     private <T> T getAndUpdate(TenantId tenantId, AlarmId alarmId, Function<Alarm, T> function) {
         validateId(alarmId, "Alarm id should be specified!");
         Alarm entity = alarmDao.findAlarmById(tenantId, alarmId.getId());
@@ -418,4 +434,39 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
         return EntityType.ALARM;
     }
 
+    //TODO: refactor to use efficient caching.
+    private AlarmApiCallResult withPropagated(AlarmApiCallResult result) {
+        if (result.isSuccessful() && result.getAlarm() != null) {
+            List<EntityId> propagationEntities;
+            if (result.isPropagationChanged()) {
+                try {
+                    propagationEntities = createEntityAlarmRecords(result.getAlarm());
+                } catch (ExecutionException | InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            } else {
+                propagationEntities = getPropagationEntityIdsList(result.getAlarm());
+            }
+            return new AlarmApiCallResult(result, propagationEntities);
+        } else {
+            return result;
+        }
+    }
+
+    private void validateAlarmRequest(AlarmModificationRequest request) {
+        ConstraintValidator.validateFields(request);
+        if (request.getEndTs() > 0 && request.getStartTs() > request.getEndTs()) {
+            throw new DataValidationException("Alarm start ts can't be greater then alarm end ts!");
+        }
+        if (!tenantService.tenantExists(request.getTenantId())) {
+            throw new DataValidationException("Alarm is referencing to non-existent tenant!");
+        }
+        if (request.getStartTs() == 0L) {
+            request.setStartTs(System.currentTimeMillis());
+        }
+        if (request.getEndTs() == 0L) {
+            request.setEndTs(request.getStartTs());
+        }
+    }
+
 }
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 584ae84531..017fe4315c 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
@@ -66,7 +66,7 @@ public class CachedAttributesService implements AttributesService {
     private final TbTransactionalCache<AttributeCacheKey, AttributeKvEntry> cache;
     private ListeningExecutorService cacheExecutor;
 
-    @Value("${cache.type}")
+    @Value("${cache.type:caffeine}")
     private String cacheType;
 
     public CachedAttributesService(AttributesDao attributesDao,
diff --git a/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java
index e6caddd80f..7aa785107e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java
@@ -166,6 +166,8 @@ public class AuditLogServiceImpl implements AuditLogService {
             case UPDATED:
             case ALARM_ACK:
             case ALARM_CLEAR:
+            case ALARM_ASSIGN:
+            case ALARM_UNASSIGN:
             case RELATIONS_DELETED:
             case ASSIGNED_TO_TENANT:
                 if (entity != null) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
index de6843e3a9..cbce9e48a1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
@@ -20,7 +20,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.thingsboard.server.common.data.HasCustomerId;
+import org.thingsboard.server.common.data.HasEmail;
+import org.thingsboard.server.common.data.HasLabel;
 import org.thingsboard.server.common.data.HasName;
+import org.thingsboard.server.common.data.HasTitle;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.id.NameLabelAndCustomerDetails;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
@@ -34,6 +39,7 @@ import org.thingsboard.server.common.data.query.RelationsQueryFilter;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 
 import java.util.Optional;
+import java.util.function.Function;
 
 import static org.thingsboard.server.common.data.id.EntityId.NULL_UUID;
 import static org.thingsboard.server.dao.service.Validator.validateEntityDataPageLink;
@@ -77,35 +83,67 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
     @Override
     public Optional<String> fetchEntityName(TenantId tenantId, EntityId entityId) {
         log.trace("Executing fetchEntityName [{}]", entityId);
-        EntityDaoService entityDaoService = entityServiceRegistry.getServiceByEntityType(entityId.getEntityType());
-        Optional<HasId<?>> hasIdOpt = entityDaoService.findEntity(tenantId, entityId);
-        if (hasIdOpt.isPresent()) {
-            HasId<?> hasId = hasIdOpt.get();
-            if (hasId instanceof HasName) {
-                HasName hasName = (HasName) hasId;
-                return Optional.ofNullable(hasName.getName());
-            }
-        }
-        return Optional.empty();
+        return fetchAndConvert(tenantId, entityId, this::getName);
+    }
+
+    @Override
+    public Optional<String> fetchEntityLabel(TenantId tenantId, EntityId entityId) {
+        log.trace("Executing fetchEntityLabel [{}]", entityId);
+        return fetchAndConvert(tenantId, entityId, this::getLabel);
     }
 
     @Override
     public Optional<CustomerId> fetchEntityCustomerId(TenantId tenantId, EntityId entityId) {
         log.trace("Executing fetchEntityCustomerId [{}]", entityId);
+        return fetchAndConvert(tenantId, entityId, this::getCustomerId);
+    }
+
+    @Override
+    public Optional<NameLabelAndCustomerDetails> fetchNameLabelAndCustomerDetails(TenantId tenantId, EntityId entityId) {
+        log.trace("Executing fetchNameLabelAndCustomerDetails [{}]", entityId);
+        return fetchAndConvert(tenantId, entityId, this::getNameLabelAndCustomerDetails);
+    }
+
+    private <T> Optional<T> fetchAndConvert(TenantId tenantId, EntityId entityId, Function<HasId<?>, T> converter) {
         EntityDaoService entityDaoService = entityServiceRegistry.getServiceByEntityType(entityId.getEntityType());
-        Optional<HasId<?>> hasIdOpt = entityDaoService.findEntity(tenantId, entityId);
-        if (hasIdOpt.isPresent()) {
-            HasId<?> hasId = hasIdOpt.get();
-            if (hasId instanceof HasCustomerId) {
-                HasCustomerId hasCustomerId = (HasCustomerId) hasId;
-                CustomerId customerId = hasCustomerId.getCustomerId();
-                if (customerId == null) {
-                    customerId = NULL_CUSTOMER_ID;
-                }
-                return Optional.of(customerId);
+        Optional<HasId<?>> entityOpt = entityDaoService.findEntity(tenantId, entityId);
+        return entityOpt.map(converter);
+    }
+
+    private String getName(HasId<?> entity) {
+        return entity instanceof HasName ? ((HasName) entity).getName() : null;
+    }
+
+    private String getLabel(HasId<?> entity) {
+        if (entity instanceof HasTitle && StringUtils.isNotEmpty(((HasTitle) entity).getTitle())) {
+            return ((HasTitle) entity).getTitle();
+        }
+        if (entity instanceof HasLabel && StringUtils.isNotEmpty(((HasLabel) entity).getLabel())) {
+            return ((HasLabel) entity).getLabel();
+        }
+        if (entity instanceof HasEmail && StringUtils.isNotEmpty(((HasEmail) entity).getEmail())) {
+            return ((HasEmail) entity).getEmail();
+        }
+        if (entity instanceof HasName && StringUtils.isNotEmpty(((HasName) entity).getName())) {
+            return ((HasName) entity).getName();
+        }
+        return null;
+    }
+
+    private CustomerId getCustomerId(HasId<?> entity) {
+        if (entity instanceof HasCustomerId) {
+            HasCustomerId hasCustomerId = (HasCustomerId) entity;
+            CustomerId customerId = hasCustomerId.getCustomerId();
+            if (customerId == null) {
+                customerId = NULL_CUSTOMER_ID;
             }
+            return customerId;
         }
-        return Optional.of(NULL_CUSTOMER_ID);
+        return NULL_CUSTOMER_ID;
+    }
+
+    private NameLabelAndCustomerDetails getNameLabelAndCustomerDetails(HasId<?> entity) {
+        return new NameLabelAndCustomerDetails(getName(entity), getLabel(entity), getCustomerId(entity));
     }
 
     private static void validateEntityCountQuery(EntityCountQuery query) {
@@ -126,7 +164,7 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
     }
 
     private static void validateRelationQuery(RelationsQueryFilter queryFilter) {
-        if (queryFilter.isMultiRoot() && queryFilter.getMultiRootEntitiesType() ==null){
+        if (queryFilter.isMultiRoot() && queryFilter.getMultiRootEntitiesType() == null) {
             throw new IncorrectParameterException("Multi-root relation query filter should contain 'multiRootEntitiesType'");
         }
         if (queryFilter.isMultiRoot() && CollectionUtils.isEmpty(queryFilter.getMultiRootEntityIds())) {
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 cf953583d1..0f4ee310c6 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
@@ -41,6 +41,7 @@ public class ModelConstants {
     public static final String USER_ID_PROPERTY = "user_id";
     public static final String TENANT_ID_PROPERTY = "tenant_id";
     public static final String CUSTOMER_ID_PROPERTY = "customer_id";
+    public static final String ASSIGNEE_ID_PROPERTY = "assignee_id";
     public static final String DEVICE_ID_PROPERTY = "device_id";
     public static final String TITLE_PROPERTY = "title";
     public static final String ALIAS_PROPERTY = "alias";
@@ -81,6 +82,7 @@ public class ModelConstants {
     public static final String USER_CREDENTIALS_PASSWORD_PROPERTY = "password"; //NOSONAR, the constant used to identify password column name (not password value itself)
     public static final String USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY = "activate_token";
     public static final String USER_CREDENTIALS_RESET_TOKEN_PROPERTY = "reset_token";
+    public static final String USER_CREDENTIALS_ADDITIONAL_PROPERTY = "additional_info";
 
     public static final String USER_CREDENTIALS_BY_USER_COLUMN_FAMILY_NAME = "user_credentials_by_user";
     public static final String USER_CREDENTIALS_BY_ACTIVATE_TOKEN_COLUMN_FAMILY_NAME = "user_credentials_by_activate_token";
@@ -286,24 +288,35 @@ public class ModelConstants {
      */
     public static final String ENTITY_ALARM_COLUMN_FAMILY_NAME = "entity_alarm";
     public static final String ALARM_COLUMN_FAMILY_NAME = "alarm";
+    public static final String ALARM_VIEW_NAME = "alarm_info";
     public static final String ALARM_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY;
     public static final String ALARM_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY;
     public static final String ALARM_TYPE_PROPERTY = "type";
-    public static final String ALARM_DETAILS_PROPERTY = "details";
+    public static final String ALARM_DETAILS_PROPERTY = ADDITIONAL_INFO_PROPERTY;
+    public static final String ALARM_STATUS_PROPERTY = "status";
     public static final String ALARM_ORIGINATOR_ID_PROPERTY = "originator_id";
     public static final String ALARM_ORIGINATOR_NAME_PROPERTY = "originator_name";
+    public static final String ALARM_ORIGINATOR_LABEL_PROPERTY = "originator_label";
     public static final String ALARM_ORIGINATOR_TYPE_PROPERTY = "originator_type";
     public static final String ALARM_SEVERITY_PROPERTY = "severity";
-    public static final String ALARM_STATUS_PROPERTY = "status";
+    public static final String ALARM_ASSIGNEE_ID_PROPERTY = "assignee_id";
+    public static final String ALARM_ASSIGNEE_FIRST_NAME_PROPERTY = "assignee_first_name";
+    public static final String ALARM_ASSIGNEE_LAST_NAME_PROPERTY = "assignee_last_name";
+    public static final String ALARM_ASSIGNEE_EMAIL_PROPERTY = "assignee_email";
     public static final String ALARM_START_TS_PROPERTY = "start_ts";
     public static final String ALARM_END_TS_PROPERTY = "end_ts";
+    public static final String ALARM_ACKNOWLEDGED_PROPERTY = "acknowledged";
     public static final String ALARM_ACK_TS_PROPERTY = "ack_ts";
+    public static final String ALARM_CLEARED_PROPERTY = "cleared";
     public static final String ALARM_CLEAR_TS_PROPERTY = "clear_ts";
+    public static final String ALARM_ASSIGN_TS_PROPERTY = "assign_ts";
     public static final String ALARM_PROPAGATE_PROPERTY = "propagate";
     public static final String ALARM_PROPAGATE_TO_OWNER_PROPERTY = "propagate_to_owner";
     public static final String ALARM_PROPAGATE_TO_TENANT_PROPERTY = "propagate_to_tenant";
     public static final String ALARM_PROPAGATE_RELATION_TYPES = "propagate_relation_types";
 
+    public static final String ALARM_OPERATION_RESULT_PROPERTY = "operation_result";
+
     public static final String ALARM_BY_ID_VIEW_NAME = "alarm_by_id";
 
     public static final String ALARM_COMMENT_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmEntity.java
index cf05ccda02..164e1518a1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmEntity.java
@@ -25,11 +25,11 @@ import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
@@ -43,7 +43,11 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.UUID;
 
+import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ACKNOWLEDGED_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ACK_TS_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ASSIGNEE_ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ASSIGN_TS_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ALARM_CLEARED_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_CLEAR_TS_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_CUSTOMER_ID_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_END_TS_PROPERTY;
@@ -55,7 +59,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.ALARM_PROPAGATE_TO
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_PROPAGATE_TO_TENANT_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_SEVERITY_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_START_TS_PROPERTY;
-import static org.thingsboard.server.dao.model.ModelConstants.ALARM_STATUS_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_TENANT_ID_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_TYPE_PROPERTY;
 
@@ -84,9 +87,9 @@ public abstract class AbstractAlarmEntity<T extends Alarm> extends BaseSqlEntity
     @Column(name = ALARM_SEVERITY_PROPERTY)
     private AlarmSeverity severity;
 
-    @Enumerated(EnumType.STRING)
-    @Column(name = ALARM_STATUS_PROPERTY)
-    private AlarmStatus status;
+    @Type(type="pg-uuid")
+    @Column(name = ALARM_ASSIGNEE_ID_PROPERTY)
+    private UUID assigneeId;
 
     @Column(name = ALARM_START_TS_PROPERTY)
     private Long startTs;
@@ -94,14 +97,23 @@ public abstract class AbstractAlarmEntity<T extends Alarm> extends BaseSqlEntity
     @Column(name = ALARM_END_TS_PROPERTY)
     private Long endTs;
 
+    @Column(name = ALARM_ACKNOWLEDGED_PROPERTY)
+    private boolean acknowledged;
+
     @Column(name = ALARM_ACK_TS_PROPERTY)
     private Long ackTs;
 
+    @Column(name = ALARM_CLEARED_PROPERTY)
+    private boolean cleared;
+
     @Column(name = ALARM_CLEAR_TS_PROPERTY)
     private Long clearTs;
 
+    @Column(name = ALARM_ASSIGN_TS_PROPERTY)
+    private Long assignTs;
+
     @Type(type = "json")
-    @Column(name = ModelConstants.ASSET_ADDITIONAL_INFO_PROPERTY)
+    @Column(name = ModelConstants.ALARM_DETAILS_PROPERTY)
     private JsonNode details;
 
     @Column(name = ALARM_PROPAGATE_PROPERTY)
@@ -136,7 +148,11 @@ public abstract class AbstractAlarmEntity<T extends Alarm> extends BaseSqlEntity
         this.originatorType = alarm.getOriginator().getEntityType();
         this.type = alarm.getType();
         this.severity = alarm.getSeverity();
-        this.status = alarm.getStatus();
+        this.acknowledged = alarm.isAcknowledged();
+        this.cleared = alarm.isCleared();
+        if (alarm.getAssigneeId() != null) {
+            this.assigneeId = alarm.getAssigneeId().getId();
+        }
         this.propagate = alarm.isPropagate();
         this.propagateToOwner = alarm.isPropagateToOwner();
         this.propagateToTenant = alarm.isPropagateToTenant();
@@ -144,11 +160,12 @@ public abstract class AbstractAlarmEntity<T extends Alarm> extends BaseSqlEntity
         this.endTs = alarm.getEndTs();
         this.ackTs = alarm.getAckTs();
         this.clearTs = alarm.getClearTs();
+        this.assignTs = alarm.getAssignTs();
         this.details = alarm.getDetails();
         if (!CollectionUtils.isEmpty(alarm.getPropagateRelationTypes())) {
             this.propagateRelationTypes = String.join(",", alarm.getPropagateRelationTypes());
         } else {
-            this.propagateRelationTypes = null;
+            this.propagateRelationTypes = "";
         }
     }
 
@@ -162,7 +179,9 @@ public abstract class AbstractAlarmEntity<T extends Alarm> extends BaseSqlEntity
         this.originatorType = alarmEntity.getOriginatorType();
         this.type = alarmEntity.getType();
         this.severity = alarmEntity.getSeverity();
-        this.status = alarmEntity.getStatus();
+        this.acknowledged = alarmEntity.isAcknowledged();
+        this.cleared = alarmEntity.isCleared();
+        this.assigneeId = alarmEntity.getAssigneeId();
         this.propagate = alarmEntity.getPropagate();
         this.propagateToOwner = alarmEntity.getPropagateToOwner();
         this.propagateToTenant = alarmEntity.getPropagateToTenant();
@@ -170,6 +189,7 @@ public abstract class AbstractAlarmEntity<T extends Alarm> extends BaseSqlEntity
         this.endTs = alarmEntity.getEndTs();
         this.ackTs = alarmEntity.getAckTs();
         this.clearTs = alarmEntity.getClearTs();
+        this.assignTs = alarmEntity.getAssignTs();
         this.details = alarmEntity.getDetails();
         this.propagateRelationTypes = alarmEntity.getPropagateRelationTypes();
     }
@@ -186,7 +206,11 @@ public abstract class AbstractAlarmEntity<T extends Alarm> extends BaseSqlEntity
         alarm.setOriginator(EntityIdFactory.getByTypeAndUuid(originatorType, originatorId));
         alarm.setType(type);
         alarm.setSeverity(severity);
-        alarm.setStatus(status);
+        alarm.setAcknowledged(acknowledged);
+        alarm.setCleared(cleared);
+        if (assigneeId != null) {
+            alarm.setAssigneeId(new UserId(assigneeId));
+        }
         alarm.setPropagate(propagate);
         alarm.setPropagateToOwner(propagateToOwner);
         alarm.setPropagateToTenant(propagateToTenant);
@@ -194,6 +218,7 @@ public abstract class AbstractAlarmEntity<T extends Alarm> extends BaseSqlEntity
         alarm.setEndTs(endTs);
         alarm.setAckTs(ackTs);
         alarm.setClearTs(clearTs);
+        alarm.setAssignTs(assignTs);
         alarm.setDetails(details);
         if (!StringUtils.isEmpty(propagateRelationTypes)) {
             alarm.setPropagateRelationTypes(Arrays.asList(propagateRelationTypes.split(",")));
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmInfoEntity.java
index 1218613e2a..40ecd19a02 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmInfoEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmInfoEntity.java
@@ -17,24 +17,63 @@ package org.thingsboard.server.dao.model.sql;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.TypeDef;
+import org.thingsboard.server.common.data.alarm.AlarmAssignee;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.dao.model.sqlts.latest.TsKvLatestEntity;
+import org.thingsboard.server.dao.sqlts.latest.SearchTsKvLatestRepository;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedNativeQueries;
+import javax.persistence.NamedNativeQuery;
+import javax.persistence.NamedStoredProcedureQuery;
+import javax.persistence.ParameterMode;
+import javax.persistence.StoredProcedureParameter;
+import javax.persistence.Table;
+
+import java.util.UUID;
+
+import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ASSIGNEE_EMAIL_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ASSIGNEE_FIRST_NAME_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ASSIGNEE_LAST_NAME_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ORIGINATOR_LABEL_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ORIGINATOR_NAME_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ALARM_STATUS_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ALARM_VIEW_NAME;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = ALARM_VIEW_NAME)
 public class AlarmInfoEntity extends AbstractAlarmEntity<AlarmInfo> {
 
+    @Column(name = ALARM_ORIGINATOR_NAME_PROPERTY)
     private String originatorName;
+    @Column(name = ALARM_ORIGINATOR_LABEL_PROPERTY)
+    private String originatorLabel;
+    @Column(name = ALARM_ASSIGNEE_FIRST_NAME_PROPERTY)
+    private String assigneeFirstName;
+    @Column(name = ALARM_ASSIGNEE_LAST_NAME_PROPERTY)
+    private String assigneeLastName;
+    @Column(name = ALARM_ASSIGNEE_EMAIL_PROPERTY)
+    private String assigneeEmail;
+    @Column(name = ALARM_STATUS_PROPERTY)
+    private String status;
 
     public AlarmInfoEntity() {
         super();
     }
 
-    public AlarmInfoEntity(AlarmEntity alarmEntity) {
-        super(alarmEntity);
-    }
-
     @Override
     public AlarmInfo toData() {
-        return new AlarmInfo(super.toAlarm(), this.originatorName);
+        AlarmInfo alarmInfo = new AlarmInfo(super.toAlarm());
+        alarmInfo.setOriginatorName(originatorName);
+        alarmInfo.setOriginatorLabel(originatorLabel);
+        if (getAssigneeId() != null) {
+            alarmInfo.setAssignee(new AlarmAssignee(new UserId(getAssigneeId()), assigneeFirstName, assigneeLastName, assigneeEmail));
+        }
+        return alarmInfo;
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityAlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityAlarmEntity.java
index ff16525235..282bca89e8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityAlarmEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityAlarmEntity.java
@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.dao.model.ToData;
 
 import javax.persistence.Column;
@@ -30,6 +31,7 @@ import javax.persistence.IdClass;
 import javax.persistence.Table;
 import java.util.UUID;
 
+import static org.thingsboard.server.dao.model.ModelConstants.ASSIGNEE_ID_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.CREATED_TIME_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.CUSTOMER_ID_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.ENTITY_ALARM_COLUMN_FAMILY_NAME;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java
index 97868a1e07..5229c2cad6 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java
@@ -15,8 +15,10 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.Type;
 import org.thingsboard.server.common.data.id.UserCredentialsId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.UserCredentials;
@@ -50,6 +52,10 @@ public final class UserCredentialsEntity extends BaseSqlEntity<UserCredentials>
     @Column(name = ModelConstants.USER_CREDENTIALS_RESET_TOKEN_PROPERTY, unique = true)
     private String resetToken;
 
+    @Type(type = "json")
+    @Column(name = ModelConstants.USER_CREDENTIALS_ADDITIONAL_PROPERTY)
+    private JsonNode additionalInfo;
+
     public UserCredentialsEntity() {
         super();
     }
@@ -66,6 +72,7 @@ public final class UserCredentialsEntity extends BaseSqlEntity<UserCredentials>
         this.password = userCredentials.getPassword();
         this.activateToken = userCredentials.getActivateToken();
         this.resetToken = userCredentials.getResetToken();
+        this.additionalInfo = userCredentials.getAdditionalInfo();
     }
 
     @Override
@@ -79,6 +86,7 @@ public final class UserCredentialsEntity extends BaseSqlEntity<UserCredentials>
         userCredentials.setPassword(password);
         userCredentials.setActivateToken(activateToken);
         userCredentials.setResetToken(resetToken);
+        userCredentials.setAdditionalInfo(additionalInfo);
         return userCredentials;
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java
index 7ffe7e7b45..8235a773e9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java
@@ -94,7 +94,7 @@ public abstract class CassandraAbstractDao {
             log.debug("Execute cassandra async statement {}", statementToString(statement));
         }
         if (statement.getConsistencyLevel() == null) {
-            statement.setConsistencyLevel(level);
+            statement = statement.setConsistencyLevel(level);
         }
         return rateExecutor.submit(new CassandraStatementTask(tenantId, getSession(), statement));
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
index 43e9069fac..49e0257daf 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
@@ -18,10 +18,11 @@ package org.thingsboard.server.dao.sql.alarm;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.jpa.repository.query.Procedure;
 import org.springframework.data.repository.query.Param;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.dao.model.sql.AlarmEntity;
 import org.thingsboard.server.dao.model.sql.AlarmInfoEntity;
 
@@ -39,7 +40,13 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                                                     @Param("alarmType") String alarmType,
                                                     Pageable pageable);
 
-    @Query(value = "SELECT new org.thingsboard.server.dao.model.sql.AlarmInfoEntity(a) FROM AlarmEntity a " +
+    @Query("SELECT a FROM AlarmEntity a WHERE a.originatorId = :originatorId AND a.type = :alarmType AND a.cleared = FALSE ORDER BY a.createdTime DESC")
+    List<AlarmEntity> findLatestActiveByOriginatorAndType(@Param("originatorId") UUID originatorId,
+                                                          @Param("alarmType") String alarmType,
+                                                          Pageable pageable);
+
+    @Query(value = "SELECT a " +
+            "FROM AlarmInfoEntity a " +
             "LEFT JOIN EntityAlarmEntity ea ON a.id = ea.alarmId " +
             "WHERE a.tenantId = :tenantId " +
             "AND ea.tenantId = :tenantId " +
@@ -47,14 +54,16 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
             "AND ea.entityType = :affectedEntityType " +
             "AND (:startTime IS NULL OR (a.createdTime >= :startTime AND ea.createdTime >= :startTime)) " +
             "AND (:endTime IS NULL OR (a.createdTime <= :endTime AND ea.createdTime <= :endTime)) " +
-            "AND ((:alarmStatuses) IS NULL OR a.status in (:alarmStatuses)) " +
+            "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
+            "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
+            "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
             "AND (LOWER(a.type) LIKE LOWER(CONCAT('%', :searchText, '%')) " +
             "  OR LOWER(a.severity) LIKE LOWER(CONCAT('%', :searchText, '%')) " +
             "  OR LOWER(a.status) LIKE LOWER(CONCAT('%', :searchText, '%'))) "
             ,
             countQuery = "" +
                     "SELECT count(a) " + //alarms with relations only
-                    "FROM AlarmEntity a " +
+                    "FROM AlarmInfoEntity a " +
                     "LEFT JOIN EntityAlarmEntity ea ON a.id = ea.alarmId " +
                     "WHERE a.tenantId = :tenantId " +
                     "AND ea.tenantId = :tenantId " +
@@ -62,7 +71,9 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                     "AND ea.entityType = :affectedEntityType " +
                     "AND (:startTime IS NULL OR (a.createdTime >= :startTime AND ea.createdTime >= :startTime)) " +
                     "AND (:endTime IS NULL OR (a.createdTime <= :endTime AND ea.createdTime <= :endTime)) " +
-                    "AND ((:alarmStatuses) IS NULL OR a.status in (:alarmStatuses)) " +
+                    "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
+                    "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
+                    "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
                     "AND (LOWER(a.type) LIKE LOWER(CONCAT('%', :searchText, '%')) " +
                     "  OR LOWER(a.severity) LIKE LOWER(CONCAT('%', :searchText, '%')) " +
                     "  OR LOWER(a.status) LIKE LOWER(CONCAT('%', :searchText, '%'))) ")
@@ -71,51 +82,69 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                                      @Param("affectedEntityType") String affectedEntityType,
                                      @Param("startTime") Long startTime,
                                      @Param("endTime") Long endTime,
-                                     @Param("alarmStatuses") Set<AlarmStatus> alarmStatuses,
+                                     @Param("clearFilterEnabled") boolean clearFilterEnabled,
+                                     @Param("clearFilter") boolean clearFilter,
+                                     @Param("ackFilterEnabled") boolean ackFilterEnabled,
+                                     @Param("ackFilter") boolean ackFilter,
+                                     @Param("assigneeId") String assigneeId,
                                      @Param("searchText") String searchText,
                                      Pageable pageable);
 
-    @Query(value = "SELECT new org.thingsboard.server.dao.model.sql.AlarmInfoEntity(a) FROM AlarmEntity a " +
+    @Query(value = "SELECT a " +
+            "FROM AlarmInfoEntity a " +
             "WHERE a.tenantId = :tenantId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND ((:alarmStatuses) IS NULL OR a.status in (:alarmStatuses)) " +
+            "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
+            "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
+            "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
             "AND (LOWER(a.type) LIKE LOWER(CONCAT('%', :searchText, '%')) " +
             "  OR LOWER(a.severity) LIKE LOWER(CONCAT('%', :searchText, '%')) " +
             "  OR LOWER(a.status) LIKE LOWER(CONCAT('%', :searchText, '%'))) ",
             countQuery = "" +
                     "SELECT count(a) " +
-                    "FROM AlarmEntity a " +
+                    "FROM AlarmInfoEntity a " +
                     "WHERE a.tenantId = :tenantId " +
                     "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
                     "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-                    "AND ((:alarmStatuses) IS NULL OR a.status in (:alarmStatuses)) " +
+                    "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
+                    "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
+                    "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
                     "AND (LOWER(a.type) LIKE LOWER(CONCAT('%', :searchText, '%')) " +
                     "  OR LOWER(a.severity) LIKE LOWER(CONCAT('%', :searchText, '%')) " +
                     "  OR LOWER(a.status) LIKE LOWER(CONCAT('%', :searchText, '%'))) ")
     Page<AlarmInfoEntity> findAllAlarms(@Param("tenantId") UUID tenantId,
                                         @Param("startTime") Long startTime,
                                         @Param("endTime") Long endTime,
-                                        @Param("alarmStatuses") Set<AlarmStatus> alarmStatuses,
+                                        @Param("clearFilterEnabled") boolean clearFilterEnabled,
+                                        @Param("clearFilter") boolean clearFilter,
+                                        @Param("ackFilterEnabled") boolean ackFilterEnabled,
+                                        @Param("ackFilter") boolean ackFilter,
+                                        @Param("assigneeId") String assigneeId,
                                         @Param("searchText") String searchText,
                                         Pageable pageable);
 
-    @Query(value = "SELECT new org.thingsboard.server.dao.model.sql.AlarmInfoEntity(a) FROM AlarmEntity a " +
+    @Query(value = "SELECT a " +
+            "FROM AlarmInfoEntity a " +
             "WHERE a.tenantId = :tenantId AND a.customerId = :customerId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND ((:alarmStatuses) IS NULL OR a.status in (:alarmStatuses)) " +
+            "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
+            "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
+            "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
             "AND (LOWER(a.type) LIKE LOWER(CONCAT('%', :searchText, '%')) " +
             "  OR LOWER(a.severity) LIKE LOWER(CONCAT('%', :searchText, '%')) " +
             "  OR LOWER(a.status) LIKE LOWER(CONCAT('%', :searchText, '%'))) "
             ,
             countQuery = "" +
                     "SELECT count(a) " +
-                    "FROM AlarmEntity a " +
+                    "FROM AlarmInfoEntity a " +
                     "WHERE a.tenantId = :tenantId AND a.customerId = :customerId " +
                     "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
                     "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-                    "AND ((:alarmStatuses) IS NULL OR a.status in (:alarmStatuses)) " +
+                    "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
+                    "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
+                    "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
                     "AND (LOWER(a.type) LIKE LOWER(CONCAT('%', :searchText, '%')) " +
                     "  OR LOWER(a.severity) LIKE LOWER(CONCAT('%', :searchText, '%')) " +
                     "  OR LOWER(a.status) LIKE LOWER(CONCAT('%', :searchText, '%'))) ")
@@ -123,7 +152,11 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                                              @Param("customerId") UUID customerId,
                                              @Param("startTime") Long startTime,
                                              @Param("endTime") Long endTime,
-                                             @Param("alarmStatuses") Set<AlarmStatus> alarmStatuses,
+                                             @Param("clearFilterEnabled") boolean clearFilterEnabled,
+                                             @Param("clearFilter") boolean clearFilter,
+                                             @Param("ackFilterEnabled") boolean ackFilterEnabled,
+                                             @Param("ackFilter") boolean ackFilter,
+                                             @Param("assigneeId") String assigneeId,
                                              @Param("searchText") String searchText,
                                              Pageable pageable);
 
@@ -133,13 +166,49 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
             "AND ea.tenantId = :tenantId " +
             "AND ea.entityId = :affectedEntityId " +
             "AND ea.entityType = :affectedEntityType " +
-            "AND ((:alarmStatuses) IS NULL OR a.status in (:alarmStatuses))")
+            "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
+            "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
+            "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId))")
     Set<AlarmSeverity> findAlarmSeverities(@Param("tenantId") UUID tenantId,
                                            @Param("affectedEntityId") UUID affectedEntityId,
                                            @Param("affectedEntityType") String affectedEntityType,
-                                           @Param("alarmStatuses") Set<AlarmStatus> alarmStatuses);
+                                           @Param("clearFilterEnabled") boolean clearFilterEnabled,
+                                           @Param("clearFilter") boolean clearFilter,
+                                           @Param("ackFilterEnabled") boolean ackFilterEnabled,
+                                           @Param("ackFilter") boolean ackFilter,
+                                           @Param("assigneeId") String assigneeId);
 
     @Query("SELECT a.id FROM AlarmEntity a WHERE a.tenantId = :tenantId AND a.createdTime < :time AND a.endTs < :time")
     Page<UUID> findAlarmsIdsByEndTsBeforeAndTenantId(@Param("time") Long time, @Param("tenantId") UUID tenantId, Pageable pageable);
 
+    @Query(value = "SELECT a FROM AlarmInfoEntity a WHERE a.tenantId = :tenantId AND a.id = :alarmId")
+    AlarmInfoEntity findAlarmInfoById(@Param("tenantId") UUID tenantId, @Param("alarmId") UUID alarmId);
+
+    @Procedure(procedureName = "create_or_update_active_alarm")
+    String createOrUpdateActiveAlarm(@Param("t_id") UUID tenantId, @Param("c_id") UUID customerId,
+                                     @Param("a_id") UUID alarmId, @Param("a_created_ts") long createdTime,
+                                     @Param("a_o_id") UUID originatorId, @Param("a_o_type") int originatorType,
+                                     @Param("a_type") String type, @Param("a_severity") String severity,
+                                     @Param("a_start_ts") long startTs, @Param("a_end_ts") long endTs, @Param("a_details") String detailsAsString,
+                                     @Param("a_propagate") boolean propagate, @Param("a_propagate_to_owner") boolean propagateToOwner,
+                                     @Param("a_propagate_to_tenant") boolean propagateToTenant, @Param("a_propagation_types") String propagationTypes,
+                                     @Param("a_creation_enabled") boolean alarmCreationEnabled);
+
+    @Procedure(procedureName = "update_alarm")
+    String updateAlarm(@Param("t_id") UUID tenantId, @Param("a_id") UUID alarmId, @Param("a_severity") String severity,
+                       @Param("a_start_ts") long startTs, @Param("a_end_ts") long endTs, @Param("a_details") String detailsAsString,
+                       @Param("a_propagate") boolean propagate, @Param("a_propagate_to_owner") boolean propagateToOwner,
+                       @Param("a_propagate_to_tenant") boolean propagateToTenant, @Param("a_propagation_types") String propagationTypes);
+
+    @Procedure(procedureName = "acknowledge_alarm")
+    String acknowledgeAlarm(@Param("t_id") UUID tenantId, @Param("a_id") UUID alarmId, @Param("a_ts") long ts);
+
+    @Procedure(procedureName = "clear_alarm")
+    String clearAlarm(@Param("t_id") UUID tenantId, @Param("a_id") UUID alarmId, @Param("a_ts") long ts, @Param("a_details") String details);
+
+    @Procedure(procedureName = "assign_alarm")
+    String assignAlarm(@Param("t_id") UUID tenantId, @Param("a_id") UUID alarmId, @Param("u_id") UUID userId, @Param("a_ts") long assignTime);
+
+    @Procedure(procedureName = "unassign_alarm")
+    String unassignAlarm(@Param("t_id") UUID tenantId, @Param("a_id") UUID alarmId, @Param("a_ts") long unassignTime);
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
index b8f508fef8..f1abd07d95 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
@@ -15,39 +15,54 @@
  */
 package org.thingsboard.server.dao.sql.alarm;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmAssignee;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmPropagationInfo;
 import org.thingsboard.server.common.data.alarm.AlarmQuery;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.alarm.AlarmStatusFilter;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
 import org.thingsboard.server.common.data.alarm.EntityAlarm;
 import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
 import org.thingsboard.server.dao.DaoUtil;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 import org.thingsboard.server.dao.alarm.AlarmDao;
+import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.model.sql.AlarmEntity;
 import org.thingsboard.server.dao.model.sql.EntityAlarmEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
 import org.thingsboard.server.dao.sql.query.AlarmQueryRepository;
 import org.thingsboard.server.dao.util.SqlDao;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
@@ -87,6 +102,15 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
         return latest.isEmpty() ? null : DaoUtil.getData(latest.get(0));
     }
 
+    @Override
+    public Alarm findLatestActiveByOriginatorAndType(TenantId tenantId, EntityId originator, String type) {
+        List<AlarmEntity> latest = alarmRepository.findLatestActiveByOriginatorAndType(
+                originator.getId(),
+                type,
+                PageRequest.of(0, 1));
+        return latest.isEmpty() ? null : DaoUtil.getData(latest.get(0));
+    }
+
     @Override
     public ListenableFuture<Alarm> findLatestByOriginatorAndTypeAsync(TenantId tenantId, EntityId originator, String type) {
         return service.submit(() -> findLatestByOriginatorAndType(tenantId, originator, type));
@@ -97,6 +121,11 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
         return findById(tenantId, key);
     }
 
+    @Override
+    public AlarmInfo findAlarmInfoById(TenantId tenantId, UUID key) {
+        return DaoUtil.getData(alarmRepository.findAlarmInfoById(tenantId.getId(), key));
+    }
+
     @Override
     public ListenableFuture<Alarm> findAlarmByIdAsync(TenantId tenantId, UUID key) {
         return findByIdAsync(tenantId, key);
@@ -106,11 +135,10 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
     public PageData<AlarmInfo> findAlarms(TenantId tenantId, AlarmQuery query) {
         log.trace("Try to find alarms by entity [{}], status [{}] and pageLink [{}]", query.getAffectedEntityId(), query.getStatus(), query.getPageLink());
         EntityId affectedEntity = query.getAffectedEntityId();
-        Set<AlarmStatus> statusSet = null;
-        if (query.getSearchStatus() != null) {
-            statusSet = query.getSearchStatus().getStatuses();
-        } else if (query.getStatus() != null) {
-            statusSet = Collections.singleton(query.getStatus());
+        AlarmStatusFilter asf = AlarmStatusFilter.from(query);
+        String assigneeId = null;
+        if (query.getAssigneeId() != null) {
+            assigneeId = query.getAssigneeId().toString();
         }
         if (affectedEntity != null) {
             return DaoUtil.toPageData(
@@ -120,7 +148,11 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                             affectedEntity.getEntityType().name(),
                             query.getPageLink().getStartTime(),
                             query.getPageLink().getEndTime(),
-                            statusSet,
+                            asf.hasClearFilter(),
+                            asf.hasClearFilter() && asf.getClearFilter(),
+                            asf.hasAckFilter(),
+                            asf.hasAckFilter() && asf.getAckFilter(),
+                            assigneeId,
                             Objects.toString(query.getPageLink().getTextSearch(), ""),
                             DaoUtil.toPageable(query.getPageLink())
                     )
@@ -131,7 +163,11 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                             tenantId.getId(),
                             query.getPageLink().getStartTime(),
                             query.getPageLink().getEndTime(),
-                            statusSet,
+                            asf.hasClearFilter(),
+                            asf.hasClearFilter() && asf.getClearFilter(),
+                            asf.hasAckFilter(),
+                            asf.hasAckFilter() && asf.getAckFilter(),
+                            assigneeId,
                             Objects.toString(query.getPageLink().getTextSearch(), ""),
                             DaoUtil.toPageable(query.getPageLink())
                     )
@@ -142,11 +178,10 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
     @Override
     public PageData<AlarmInfo> findCustomerAlarms(TenantId tenantId, CustomerId customerId, AlarmQuery query) {
         log.trace("Try to find customer alarms by status [{}] and pageLink [{}]", query.getStatus(), query.getPageLink());
-        Set<AlarmStatus> statusSet = null;
-        if (query.getSearchStatus() != null) {
-            statusSet = query.getSearchStatus().getStatuses();
-        } else if (query.getStatus() != null) {
-            statusSet = Collections.singleton(query.getStatus());
+        AlarmStatusFilter asf = AlarmStatusFilter.from(query);
+        String assigneeId = null;
+        if (query.getAssigneeId() != null) {
+            assigneeId = query.getAssigneeId().toString();
         }
         return DaoUtil.toPageData(
                 alarmRepository.findCustomerAlarms(
@@ -154,7 +189,11 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                         customerId.getId(),
                         query.getPageLink().getStartTime(),
                         query.getPageLink().getEndTime(),
-                        statusSet,
+                        asf.hasClearFilter(),
+                        asf.hasClearFilter() && asf.getClearFilter(),
+                        asf.hasAckFilter(),
+                        asf.hasAckFilter() && asf.getAckFilter(),
+                        assigneeId,
                         Objects.toString(query.getPageLink().getTextSearch(), ""),
                         DaoUtil.toPageable(query.getPageLink())
                 )
@@ -167,8 +206,13 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
     }
 
     @Override
-    public Set<AlarmSeverity> findAlarmSeverities(TenantId tenantId, EntityId entityId, Set<AlarmStatus> statuses) {
-        return alarmRepository.findAlarmSeverities(tenantId.getId(), entityId.getId(), entityId.getEntityType().name(), statuses);
+    public Set<AlarmSeverity> findAlarmSeverities(TenantId tenantId, EntityId entityId, AlarmStatusFilter asf, String assigneeId) {
+        return alarmRepository.findAlarmSeverities(tenantId.getId(), entityId.getId(), entityId.getEntityType().name(),
+                asf.hasClearFilter(),
+                asf.hasClearFilter() && asf.getClearFilter(),
+                asf.hasAckFilter(),
+                asf.hasAckFilter() && asf.getAckFilter(),
+                assigneeId);
     }
 
     @Override
@@ -195,6 +239,174 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
         entityAlarmRepository.deleteByEntityId(entityId.getId());
     }
 
+    @Override
+    public AlarmApiCallResult createOrUpdateActiveAlarm(AlarmCreateOrUpdateActiveRequest request, boolean alarmCreationEnabled) {
+        AlarmPropagationInfo ap = getSafePropagationInfo(request.getPropagation());
+        return toAlarmApiResult(alarmRepository.createOrUpdateActiveAlarm(
+                request.getTenantId().getId(),
+                request.getCustomerId() != null ? request.getCustomerId().getId() : CustomerId.NULL_UUID,
+                UUID.randomUUID(),
+                System.currentTimeMillis(),
+                request.getOriginator().getId(),
+                request.getOriginator().getEntityType().ordinal(),
+                request.getType(),
+                request.getSeverity().name(),
+                request.getStartTs(), request.getEndTs(),
+                getDetailsAsString(request.getDetails()),
+                ap.isPropagate(),
+                ap.isPropagateToOwner(),
+                ap.isPropagateToTenant(),
+                getPropagationTypes(ap),
+                alarmCreationEnabled
+        ));
+    }
+
+    @Override
+    public AlarmApiCallResult updateAlarm(AlarmUpdateRequest request) {
+        AlarmPropagationInfo ap = getSafePropagationInfo(request.getPropagation());
+        return toAlarmApiResult(alarmRepository.updateAlarm(
+                request.getTenantId().getId(),
+                request.getAlarmId().getId(),
+                request.getSeverity().name(),
+                request.getStartTs(), request.getEndTs(),
+                getDetailsAsString(request.getDetails()),
+                ap.isPropagate(),
+                ap.isPropagateToOwner(),
+                ap.isPropagateToTenant(),
+                getPropagationTypes(ap)
+        ));
+    }
+
+    @Override
+    public AlarmApiCallResult acknowledgeAlarm(TenantId tenantId, AlarmId id, long ackTs) {
+        return toAlarmApiResult(alarmRepository.acknowledgeAlarm(tenantId.getId(), id.getId(), ackTs));
+    }
+
+    @Override
+    public AlarmApiCallResult clearAlarm(TenantId tenantId, AlarmId id, long clearTs, JsonNode details) {
+        return toAlarmApiResult(alarmRepository.clearAlarm(tenantId.getId(), id.getId(), clearTs, getDetailsAsString(details)));
+    }
+
+    @Override
+    public AlarmApiCallResult assignAlarm(TenantId tenantId, AlarmId id, UserId assigneeId, long assignTime) {
+        return toAlarmApiResult(alarmRepository.assignAlarm(tenantId.getId(), id.getId(), assigneeId.getId(), assignTime));
+    }
+
+    @Override
+    public AlarmApiCallResult unassignAlarm(TenantId tenantId, AlarmId id, long unassignTime) {
+        return toAlarmApiResult(alarmRepository.unassignAlarm(tenantId.getId(), id.getId(), unassignTime));
+    }
+
+    @NotNull
+    private static String getPropagationTypes(AlarmPropagationInfo ap) {
+        String propagateRelationTypes;
+        if (!CollectionUtils.isEmpty(ap.getPropagateRelationTypes())) {
+            propagateRelationTypes = String.join(",", ap.getPropagateRelationTypes());
+        } else {
+            propagateRelationTypes = "";
+        }
+        return propagateRelationTypes;
+    }
+
+    private static AlarmPropagationInfo getSafePropagationInfo(AlarmPropagationInfo ap) {
+        return ap != null ? ap : AlarmPropagationInfo.EMPTY;
+    }
+
+    private static String getDetailsAsString(JsonNode details) {
+        var detailsStr = JacksonUtil.toString(details);
+        if (StringUtils.isEmpty(detailsStr)) {
+            detailsStr = "{}";
+        }
+        return detailsStr;
+    }
+
+    private AlarmApiCallResult toAlarmApiResult(String str) {
+        var json = JacksonUtil.toJsonNode(str);
+        var result = AlarmApiCallResult.builder();
+        boolean success = json.get("success").asBoolean();
+        result.successful(success);
+        if (success) {
+            boolean modified = false;
+            boolean created = false;
+            boolean cleared = false;
+            if (json.has("modified")) {
+                modified = json.get("modified").asBoolean();
+            }
+
+            if (json.has("created")) {
+                created = json.get("created").asBoolean();
+            }
+
+            if (json.has("cleared")) {
+                cleared = json.get("cleared").asBoolean();
+            }
+            result.created(created);
+            result.cleared(cleared);
+            result.modified(created || cleared || modified);
+            if (json.has("alarm") && !json.get("alarm").isNull()) {
+                result.alarm(toAlarmInfo(json.get("alarm")));
+            }
+            if (json.has("old") && !json.get("old").isNull()) {
+                result.old(toAlarm(json.get("old")));
+            }
+        }
+        return result.build();
+    }
+
+    private AlarmInfo toAlarmInfo(JsonNode json) {
+        AlarmInfo alarmInfo = new AlarmInfo(toAlarm(json));
+        getSafe(json, ModelConstants.ALARM_ORIGINATOR_NAME_PROPERTY).ifPresent(alarmInfo::setOriginatorName);
+        getSafe(json, ModelConstants.ALARM_ORIGINATOR_LABEL_PROPERTY).ifPresent(alarmInfo::setOriginatorLabel);
+        if (alarmInfo.getAssigneeId() != null) {
+            var assigneeBuilder = AlarmAssignee.builder().id(alarmInfo.getAssigneeId());
+            getSafe(json, ModelConstants.ALARM_ASSIGNEE_FIRST_NAME_PROPERTY).ifPresent(assigneeBuilder::firstName);
+            getSafe(json, ModelConstants.ALARM_ASSIGNEE_LAST_NAME_PROPERTY).ifPresent(assigneeBuilder::lastName);
+            getSafe(json, ModelConstants.ALARM_ASSIGNEE_EMAIL_PROPERTY).ifPresent(assigneeBuilder::email);
+            alarmInfo.setAssignee(assigneeBuilder.build());
+        }
+        return alarmInfo;
+    }
+
+    private Alarm toAlarm(JsonNode json) {
+        Alarm alarm = new Alarm(new AlarmId(UUID.fromString(json.get(ModelConstants.ID_PROPERTY).asText())));
+        alarm.setCreatedTime(json.get(ModelConstants.CREATED_TIME_PROPERTY).asLong());
+        getSafe(json, ModelConstants.TENANT_ID_COLUMN).ifPresent(s -> alarm.setTenantId(TenantId.fromUUID(UUID.fromString(s))));
+        getSafe(json, ModelConstants.CUSTOMER_ID_PROPERTY).ifPresent(s -> alarm.setCustomerId(new CustomerId(UUID.fromString(s))));
+        getSafe(json, ModelConstants.ASSIGNEE_ID_PROPERTY).ifPresent(s -> alarm.setAssigneeId(new UserId(UUID.fromString(s))));
+        alarm.setOriginator(EntityIdFactory.getByTypeAndUuid(
+                json.get(ModelConstants.ALARM_ORIGINATOR_TYPE_PROPERTY).asInt(),
+                json.get(ModelConstants.ALARM_ORIGINATOR_ID_PROPERTY).asText()));
+        getSafe(json, ModelConstants.ALARM_TYPE_PROPERTY).ifPresent(alarm::setType);
+        getSafe(json, ModelConstants.ALARM_SEVERITY_PROPERTY).map(AlarmSeverity::valueOf).ifPresent(alarm::setSeverity);
+        alarm.setAcknowledged(json.get(ModelConstants.ALARM_ACKNOWLEDGED_PROPERTY).asBoolean());
+        alarm.setCleared(json.get(ModelConstants.ALARM_CLEARED_PROPERTY).asBoolean());
+        alarm.setPropagate(json.get(ModelConstants.ALARM_PROPAGATE_PROPERTY).asBoolean());
+        alarm.setPropagateToOwner(json.get(ModelConstants.ALARM_PROPAGATE_TO_OWNER_PROPERTY).asBoolean());
+        alarm.setPropagateToTenant(json.get(ModelConstants.ALARM_PROPAGATE_TO_TENANT_PROPERTY).asBoolean());
+        alarm.setStartTs(json.get(ModelConstants.ALARM_START_TS_PROPERTY).asLong());
+        alarm.setEndTs(json.get(ModelConstants.ALARM_END_TS_PROPERTY).asLong());
+        alarm.setAckTs(json.get(ModelConstants.ALARM_ACK_TS_PROPERTY).asLong());
+        alarm.setClearTs(json.get(ModelConstants.ALARM_CLEAR_TS_PROPERTY).asLong());
+        alarm.setAssignTs(json.get(ModelConstants.ALARM_ASSIGN_TS_PROPERTY).asLong());
+        getSafe(json, ModelConstants.ALARM_DETAILS_PROPERTY).map(JacksonUtil::toJsonNode).ifPresent(alarm::setDetails);
+        alarm.setPropagateRelationTypes(getSafe(json, ModelConstants.ALARM_PROPAGATE_RELATION_TYPES).filter(StringUtils::isNoneEmpty)
+                .map(s -> Arrays.asList(s.split(","))).orElse(Collections.emptyList()));
+        return alarm;
+    }
+
+    private static Optional<String> getSafe(JsonNode json, String fieldName) {
+        if (json.has(fieldName)) {
+            var element = json.get(fieldName);
+            if (element.isNull() || !element.isTextual()) {
+                return Optional.empty();
+            } else {
+                return Optional.of(element.asText());
+            }
+        } else {
+            return Optional.empty();
+        }
+    }
+
     @Override
     public EntityType getEntityType() {
         return EntityType.ALARM;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/AlarmDataAdapter.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/AlarmDataAdapter.java
index 7943ce5178..a07887fb57 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/AlarmDataAdapter.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/AlarmDataAdapter.java
@@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmAssignee;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.AlarmId;
@@ -28,6 +29,7 @@ import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.EntityDataPageLink;
@@ -68,6 +70,7 @@ public class AlarmDataAdapter {
         alarm.setCreatedTime((long) row.get(ModelConstants.CREATED_TIME_PROPERTY));
         alarm.setAckTs((long) row.get(ModelConstants.ALARM_ACK_TS_PROPERTY));
         alarm.setClearTs((long) row.get(ModelConstants.ALARM_CLEAR_TS_PROPERTY));
+        alarm.setAssignTs((long) row.get(ModelConstants.ALARM_ASSIGN_TS_PROPERTY));
         alarm.setStartTs((long) row.get(ModelConstants.ALARM_START_TS_PROPERTY));
         alarm.setEndTs((long) row.get(ModelConstants.ALARM_END_TS_PROPERTY));
         Object additionalInfo = row.get(ModelConstants.ADDITIONAL_INFO_PROPERTY);
@@ -81,12 +84,23 @@ public class AlarmDataAdapter {
         EntityType originatorType = EntityType.values()[(int) row.get(ModelConstants.ALARM_ORIGINATOR_TYPE_PROPERTY)];
         UUID originatorId = (UUID) row.get(ModelConstants.ALARM_ORIGINATOR_ID_PROPERTY);
         alarm.setOriginator(EntityIdFactory.getByTypeAndUuid(originatorType, originatorId));
+        Object assigneeIdObj = row.get(ModelConstants.ASSIGNEE_ID_PROPERTY);
+        String assigneeFirstName = null;
+        String assigneeLastName = null;
+        String assigneeEmail = null;
+        if (assigneeIdObj != null) {
+            alarm.setAssigneeId(new UserId((UUID) row.get(ModelConstants.ALARM_ASSIGNEE_ID_PROPERTY)));
+            assigneeFirstName = (String) row.get(ModelConstants.ALARM_ASSIGNEE_FIRST_NAME_PROPERTY);
+            assigneeLastName = (String) row.get(ModelConstants.ALARM_ASSIGNEE_LAST_NAME_PROPERTY);
+            assigneeEmail = (String) row.get(ModelConstants.ALARM_ASSIGNEE_EMAIL_PROPERTY);
+        }
         alarm.setPropagate((boolean) row.get(ModelConstants.ALARM_PROPAGATE_PROPERTY));
         alarm.setPropagateToOwner((boolean) row.get(ModelConstants.ALARM_PROPAGATE_TO_OWNER_PROPERTY));
         alarm.setPropagateToTenant((boolean) row.get(ModelConstants.ALARM_PROPAGATE_TO_TENANT_PROPERTY));
         alarm.setType(row.get(ModelConstants.ALARM_TYPE_PROPERTY).toString());
         alarm.setSeverity(AlarmSeverity.valueOf(row.get(ModelConstants.ALARM_SEVERITY_PROPERTY).toString()));
-        alarm.setStatus(AlarmStatus.valueOf(row.get(ModelConstants.ALARM_STATUS_PROPERTY).toString()));
+        alarm.setAcknowledged((boolean) row.get(ModelConstants.ALARM_ACKNOWLEDGED_PROPERTY));
+        alarm.setCleared((boolean) row.get(ModelConstants.ALARM_CLEARED_PROPERTY));
         alarm.setTenantId(TenantId.fromUUID((UUID) row.get(ModelConstants.TENANT_ID_PROPERTY)));
         Object customerIdObj = row.get(ModelConstants.CUSTOMER_ID_PROPERTY);
         CustomerId customerId = customerIdObj != null ? new CustomerId((UUID) customerIdObj) : null;
@@ -105,7 +119,17 @@ public class AlarmDataAdapter {
         EntityId entityId = entityIdMap.get(entityUuid);
         Object originatorNameObj = row.get(ModelConstants.ALARM_ORIGINATOR_NAME_PROPERTY);
         String originatorName = originatorNameObj != null ? originatorNameObj.toString() : null;
-        return new AlarmData(alarm, originatorName, entityId);
+        Object originatorLabelObj = row.get(ModelConstants.ALARM_ORIGINATOR_LABEL_PROPERTY);
+        String originatorLabel = originatorLabelObj != null ? originatorLabelObj.toString() : null;
+
+        AlarmData alarmData = new AlarmData(alarm, entityId);
+        alarmData.setOriginatorName(originatorName);
+        alarmData.setOriginatorLabel(originatorLabel);
+        if (alarm.getAssigneeId() != null) {
+            alarmData.setAssignee(new AlarmAssignee(alarm.getAssigneeId(), assigneeFirstName, assigneeLastName, assigneeEmail));
+        }
+
+        return alarmData;
     }
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
index 543b8549c4..ecf9c1c95f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
@@ -19,11 +19,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.support.TransactionTemplate;
+import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.alarm.AlarmStatusFilter;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
@@ -35,6 +37,7 @@ import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.EntityKeyType;
 import org.thingsboard.server.dao.model.ModelConstants;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -51,46 +54,44 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
 
     private static final Map<String, String> alarmFieldColumnMap = new HashMap<>();
 
+    private static final String ASSIGNEE_EMAIL_KEY = "assigneeEmail";
+    private static final String ASSIGNEE_LAST_NAME_KEY = "assigneeLastName";
+    private static final String ASSIGNEE_FIRST_NAME_KEY = "assigneeFirstName";
+    private static final String ASSIGNEE_ID_KEY = "assigneeId";
+    private static final String ASSIGNEE_KEY = "assignee";
+
     static {
         alarmFieldColumnMap.put("createdTime", ModelConstants.CREATED_TIME_PROPERTY);
         alarmFieldColumnMap.put("ackTs", ModelConstants.ALARM_ACK_TS_PROPERTY);
         alarmFieldColumnMap.put("ackTime", ModelConstants.ALARM_ACK_TS_PROPERTY);
         alarmFieldColumnMap.put("clearTs", ModelConstants.ALARM_CLEAR_TS_PROPERTY);
         alarmFieldColumnMap.put("clearTime", ModelConstants.ALARM_CLEAR_TS_PROPERTY);
+        alarmFieldColumnMap.put("assignTime", ModelConstants.ALARM_ASSIGN_TS_PROPERTY);
         alarmFieldColumnMap.put("details", ModelConstants.ADDITIONAL_INFO_PROPERTY);
         alarmFieldColumnMap.put("endTs", ModelConstants.ALARM_END_TS_PROPERTY);
         alarmFieldColumnMap.put("endTime", ModelConstants.ALARM_END_TS_PROPERTY);
         alarmFieldColumnMap.put("startTs", ModelConstants.ALARM_START_TS_PROPERTY);
         alarmFieldColumnMap.put("startTime", ModelConstants.ALARM_START_TS_PROPERTY);
-        alarmFieldColumnMap.put("status", ModelConstants.ALARM_STATUS_PROPERTY);
+        alarmFieldColumnMap.put("acknowledged", ModelConstants.ALARM_ACKNOWLEDGED_PROPERTY);
+        alarmFieldColumnMap.put("cleared", ModelConstants.ALARM_CLEARED_PROPERTY);
         alarmFieldColumnMap.put("type", ModelConstants.ALARM_TYPE_PROPERTY);
         alarmFieldColumnMap.put("severity", ModelConstants.ALARM_SEVERITY_PROPERTY);
         alarmFieldColumnMap.put("originatorId", ModelConstants.ALARM_ORIGINATOR_ID_PROPERTY);
         alarmFieldColumnMap.put("originatorType", ModelConstants.ALARM_ORIGINATOR_TYPE_PROPERTY);
-        alarmFieldColumnMap.put("originator", "originator_name");
+        alarmFieldColumnMap.put(ASSIGNEE_ID_KEY, ModelConstants.ALARM_ASSIGNEE_ID_PROPERTY);
+        alarmFieldColumnMap.put("originator", ModelConstants.ALARM_ORIGINATOR_NAME_PROPERTY);
+        alarmFieldColumnMap.put("originatorLabel", ModelConstants.ALARM_ORIGINATOR_LABEL_PROPERTY);
+        alarmFieldColumnMap.put(ASSIGNEE_FIRST_NAME_KEY, ModelConstants.ALARM_ASSIGNEE_FIRST_NAME_PROPERTY);
+        alarmFieldColumnMap.put(ASSIGNEE_LAST_NAME_KEY, ModelConstants.ALARM_ASSIGNEE_LAST_NAME_PROPERTY);
+        alarmFieldColumnMap.put(ASSIGNEE_EMAIL_KEY, ModelConstants.ALARM_ASSIGNEE_EMAIL_PROPERTY);
     }
 
-    private static final String SELECT_ORIGINATOR_NAME = " COALESCE(CASE" +
-            " WHEN a.originator_type = " + EntityType.TENANT.ordinal() +
-            " THEN (select title from tenant where id = a.originator_id)" +
-            " WHEN a.originator_type = " + EntityType.CUSTOMER.ordinal() +
-            " THEN (select title from customer where id = a.originator_id)" +
-            " WHEN a.originator_type = " + EntityType.USER.ordinal() +
-            " THEN (select email from tb_user where id = a.originator_id)" +
-            " WHEN a.originator_type = " + EntityType.DASHBOARD.ordinal() +
-            " THEN (select title from dashboard where id = a.originator_id)" +
-            " WHEN a.originator_type = " + EntityType.ASSET.ordinal() +
-            " THEN (select name from asset where id = a.originator_id)" +
-            " WHEN a.originator_type = " + EntityType.DEVICE.ordinal() +
-            " THEN (select name from device where id = a.originator_id)" +
-            " WHEN a.originator_type = " + EntityType.ENTITY_VIEW.ordinal() +
-            " THEN (select name from entity_view where id = a.originator_id)" +
-            " END, 'Deleted') as originator_name";
-
     private static final String FIELDS_SELECTION = "select a.id as id," +
             " a.created_time as created_time," +
             " a.ack_ts as ack_ts," +
             " a.clear_ts as clear_ts," +
+            " a.assign_ts as assign_ts," +
+            " a.assignee_id as assignee_id," +
             " a.additional_info as additional_info," +
             " a.end_ts as end_ts," +
             " a.originator_id as originator_id," +
@@ -100,13 +101,19 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
             " a.propagate_to_tenant as propagate_to_tenant," +
             " a.severity as severity," +
             " a.start_ts as start_ts," +
-            " a.status as status, " +
             " a.tenant_id as tenant_id, " +
             " a.customer_id as customer_id, " +
             " a.propagate_relation_types as propagate_relation_types, " +
-            " a.type as type," + SELECT_ORIGINATOR_NAME + ", ";
+            " a.type as type, " +
+            " a.originator_name as originator_name, " +
+            " a.originator_label as originator_label, " +
+            " a.assignee_first_name as assignee_first_name, " +
+            " a.assignee_last_name as assignee_last_name, " +
+            " a.assignee_email as assignee_email, " +
+            " a.cleared as cleared, " +
+            " a.acknowledged as acknowledged, ";
 
-    private static final String JOIN_ENTITY_ALARMS = "inner join entity_alarm ea on a.id = ea.alarm_id";
+    private static final String JOIN_ENTITY_ALARMS = "inner join entity_alarm ea on a.id = ea.alarm_id ";
 
     protected final NamedParameterJdbcTemplate jdbcTemplate;
     private final TransactionTemplate transactionTemplate;
@@ -121,12 +128,12 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
 
     @Override
     public PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, AlarmDataQuery query, Collection<EntityId> orderedEntityIds) {
-        return transactionTemplate.execute(status -> {
+        return transactionTemplate.execute(trStatus -> {
             AlarmDataPageLink pageLink = query.getPageLink();
             QueryContext ctx = new QueryContext(new QuerySecurityContext(tenantId, null, EntityType.ALARM));
             ctx.addUuidListParameter("entity_ids", orderedEntityIds.stream().map(EntityId::getId).collect(Collectors.toList()));
             StringBuilder selectPart = new StringBuilder(FIELDS_SELECTION);
-            StringBuilder fromPart = new StringBuilder(" from alarm a ");
+            StringBuilder fromPart = new StringBuilder(" from alarm_info a ");
             StringBuilder wherePart = new StringBuilder(" where ");
             StringBuilder sortPart = new StringBuilder(" order by ");
             StringBuilder joinPart = new StringBuilder();
@@ -140,9 +147,25 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
                 selectPart.append(" a.originator_id as entity_id ");
             }
             EntityDataSortOrder sortOrder = pageLink.getSortOrder();
-            String textSearchQuery = buildTextSearchQuery(ctx, query.getAlarmFields(), pageLink.getTextSearch());
+
+            List<EntityKey> alarmFields = new ArrayList<>();
+            for (EntityKey key : query.getAlarmFields()) {
+                if (EntityKeyType.ALARM_FIELD.equals(key.getType()) && ASSIGNEE_KEY.equalsIgnoreCase(key.getKey())) {
+                    alarmFields.add(new EntityKey(EntityKeyType.ALARM_FIELD, ASSIGNEE_ID_KEY));
+                    alarmFields.add(new EntityKey(EntityKeyType.ALARM_FIELD, ASSIGNEE_FIRST_NAME_KEY));
+                    alarmFields.add(new EntityKey(EntityKeyType.ALARM_FIELD, ASSIGNEE_LAST_NAME_KEY));
+                    alarmFields.add(new EntityKey(EntityKeyType.ALARM_FIELD, ASSIGNEE_EMAIL_KEY));
+                } else {
+                    alarmFields.add(key);
+                }
+            }
+
+            String textSearchQuery = buildTextSearchQuery(ctx, alarmFields, pageLink.getTextSearch());
             if (sortOrder != null && sortOrder.getKey().getType().equals(EntityKeyType.ALARM_FIELD)) {
                 String sortOrderKey = sortOrder.getKey().getKey();
+                if ("status".equalsIgnoreCase(sortOrderKey)) {
+                    selectPart.append(", a.status as status ");
+                }
                 sortPart.append(alarmFieldColumnMap.getOrDefault(sortOrderKey, sortOrderKey))
                         .append(" ").append(sortOrder.getDirection().name());
                 if (pageLink.isSearchPropagatedAlarms()) {
@@ -225,14 +248,25 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
                 wherePart.append("a.severity in (:alarmSeverities)");
             }
 
-            if (pageLink.getStatusList() != null && !pageLink.getStatusList().isEmpty()) {
-                Set<AlarmStatus> statusSet = toStatusSet(pageLink.getStatusList());
-                if (!statusSet.isEmpty()) {
+            AlarmStatusFilter asf = AlarmStatusFilter.fromList(pageLink.getStatusList());
+            if (asf.hasAnyFilter()) {
+                if (asf.hasAckFilter()) {
                     addAndIfNeeded(wherePart, addAnd);
                     addAnd = true;
-                    ctx.addStringListParameter("alarmStatuses", statusSet.stream().map(AlarmStatus::name).collect(Collectors.toList()));
-                    wherePart.append(" a.status in (:alarmStatuses)");
+                    ctx.addBooleanParameter("ackStatus", asf.getAckFilter());
+                    wherePart.append(" a.acknowledged = :ackStatus");
                 }
+                if (asf.hasClearFilter()) {
+                    addAndIfNeeded(wherePart, addAnd);
+                    // addAnd = true; // not needed but stored as an example if someone adds new conditions
+                    ctx.addBooleanParameter("clearStatus", asf.getClearFilter());
+                    wherePart.append(" a.cleared = :clearStatus");
+                }
+            }
+
+            if (pageLink.getAssigneeId() != null) {
+                ctx.addUuidParameter("assigneeId", pageLink.getAssigneeId().getId());
+                wherePart.append(" a.assignee_id = :assigneeId");
             }
 
             String mainQuery = String.format("%s%s", selectPart, fromPart);
@@ -295,37 +329,6 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
         return permissionsQuery.toString();
     }
 
-    private Set<AlarmStatus> toStatusSet(List<AlarmSearchStatus> statusList) {
-        Set<AlarmStatus> result = new HashSet<>();
-        for (AlarmSearchStatus searchStatus : statusList) {
-            switch (searchStatus) {
-                case ACK:
-                    result.add(AlarmStatus.ACTIVE_ACK);
-                    result.add(AlarmStatus.CLEARED_ACK);
-                    break;
-                case UNACK:
-                    result.add(AlarmStatus.ACTIVE_UNACK);
-                    result.add(AlarmStatus.CLEARED_UNACK);
-                    break;
-                case CLEARED:
-                    result.add(AlarmStatus.CLEARED_ACK);
-                    result.add(AlarmStatus.CLEARED_UNACK);
-                    break;
-                case ACTIVE:
-                    result.add(AlarmStatus.ACTIVE_ACK);
-                    result.add(AlarmStatus.ACTIVE_UNACK);
-                    break;
-                default:
-                    break;
-            }
-            if (searchStatus == AlarmSearchStatus.ANY || result.size() == AlarmStatus.values().length) {
-                result.clear();
-                return result;
-            }
-        }
-        return result;
-    }
-
     private void addAndIfNeeded(StringBuilder wherePart, boolean addAnd) {
         if (addAnd) {
             wherePart.append(" and ");
diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
index c8c5175e5f..b99883c52f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
@@ -29,7 +29,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -40,7 +39,6 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.UserCredentials;
-import org.thingsboard.server.common.data.security.UserSettings;
 import org.thingsboard.server.common.data.security.event.UserCredentialsInvalidationEvent;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
@@ -51,6 +49,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
+import static org.thingsboard.server.common.data.StringUtils.generateSafeToken;
 import static org.thingsboard.server.dao.service.Validator.validateId;
 import static org.thingsboard.server.dao.service.Validator.validatePageLink;
 import static org.thingsboard.server.dao.service.Validator.validateString;
@@ -126,9 +125,10 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         if (user.getId() == null) {
             UserCredentials userCredentials = new UserCredentials();
             userCredentials.setEnabled(false);
-            userCredentials.setActivateToken(StringUtils.randomAlphanumeric(DEFAULT_TOKEN_LENGTH));
+            userCredentials.setActivateToken(generateSafeToken(DEFAULT_TOKEN_LENGTH));
             userCredentials.setUserId(new UserId(savedUser.getUuidId()));
-            saveUserCredentialsAndPasswordHistory(user.getTenantId(), userCredentials);
+            userCredentials.setAdditionalInfo(JacksonUtil.newObjectNode());
+            userCredentialsDao.save(user.getTenantId(), userCredentials);
         }
         return savedUser;
     }
@@ -158,7 +158,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
     public UserCredentials saveUserCredentials(TenantId tenantId, UserCredentials userCredentials) {
         log.trace("Executing saveUserCredentials [{}]", userCredentials);
         userCredentialsValidator.validate(userCredentials, data -> tenantId);
-        return saveUserCredentialsAndPasswordHistory(tenantId, userCredentials);
+        return userCredentialsDao.save(tenantId, userCredentials);
     }
 
     @Override
@@ -176,7 +176,9 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         userCredentials.setEnabled(true);
         userCredentials.setActivateToken(null);
         userCredentials.setPassword(password);
-
+        if (userCredentials.getPassword() != null) {
+            updatePasswordHistory(userCredentials);
+        }
         return saveUserCredentials(tenantId, userCredentials);
     }
 
@@ -192,7 +194,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         if (!userCredentials.isEnabled()) {
             throw new DisabledException(String.format("User credentials not enabled [%s]", email));
         }
-        userCredentials.setResetToken(StringUtils.randomAlphanumeric(DEFAULT_TOKEN_LENGTH));
+        userCredentials.setResetToken(generateSafeToken(DEFAULT_TOKEN_LENGTH));
         return saveUserCredentials(tenantId, userCredentials);
     }
 
@@ -202,7 +204,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         if (!userCredentials.isEnabled()) {
             throw new IncorrectParameterException("Unable to reset password for inactive user");
         }
-        userCredentials.setResetToken(StringUtils.randomAlphanumeric(DEFAULT_TOKEN_LENGTH));
+        userCredentials.setResetToken(generateSafeToken(DEFAULT_TOKEN_LENGTH));
         return saveUserCredentials(tenantId, userCredentials);
     }
 
@@ -212,7 +214,10 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         userCredentialsValidator.validate(userCredentials, data -> tenantId);
         userCredentialsDao.removeById(tenantId, userCredentials.getUuidId());
         userCredentials.setId(null);
-        return saveUserCredentialsAndPasswordHistory(tenantId, userCredentials);
+        if (userCredentials.getPassword() != null) {
+            updatePasswordHistory(userCredentials);
+        }
+        return userCredentialsDao.save(tenantId, userCredentials);
     }
 
     @Override
@@ -343,17 +348,8 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         return failedLoginAttempts;
     }
 
-    private UserCredentials saveUserCredentialsAndPasswordHistory(TenantId tenantId, UserCredentials userCredentials) {
-        UserCredentials result = userCredentialsDao.save(tenantId, userCredentials);
-        User user = findUserById(tenantId, userCredentials.getUserId());
-        if (userCredentials.getPassword() != null) {
-            updatePasswordHistory(user, userCredentials);
-        }
-        return result;
-    }
-
-    private void updatePasswordHistory(User user, UserCredentials userCredentials) {
-        JsonNode additionalInfo = user.getAdditionalInfo();
+    private void updatePasswordHistory(UserCredentials userCredentials) {
+        JsonNode additionalInfo = userCredentials.getAdditionalInfo();
         if (!(additionalInfo instanceof ObjectNode)) {
             additionalInfo = JacksonUtil.newObjectNode();
         }
@@ -374,8 +370,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
             userPasswordHistoryJson = JacksonUtil.valueToTree(userPasswordHistoryMap);
             ((ObjectNode) additionalInfo).set(USER_PASSWORD_HISTORY, userPasswordHistoryJson);
         }
-        user.setAdditionalInfo(additionalInfo);
-        saveUser(user);
+        userCredentials.setAdditionalInfo(additionalInfo);
     }
 
     private final PaginatedRemover<TenantId, User> tenantAdminsRemover = new PaginatedRemover<>() {
diff --git a/dao/src/main/resources/cassandra/schema-ts-latest.cql b/dao/src/main/resources/cassandra/schema-ts-latest.cql
index e3c72ab6da..6b76c6187c 100644
--- a/dao/src/main/resources/cassandra/schema-ts-latest.cql
+++ b/dao/src/main/resources/cassandra/schema-ts-latest.cql
@@ -15,7 +15,7 @@
 --
 
 CREATE TABLE IF NOT EXISTS thingsboard.ts_kv_latest_cf (
-    entity_type text, // (DEVICE, CUSTOMER, TENANT)
+    entity_type text, -- (DEVICE, CUSTOMER, TENANT)
     entity_id timeuuid,
     key text,
     ts bigint,
diff --git a/dao/src/main/resources/cassandra/schema-ts.cql b/dao/src/main/resources/cassandra/schema-ts.cql
index fb60ed9e78..ae8c11a703 100644
--- a/dao/src/main/resources/cassandra/schema-ts.cql
+++ b/dao/src/main/resources/cassandra/schema-ts.cql
@@ -15,7 +15,7 @@
 --
 
 CREATE TABLE IF NOT EXISTS thingsboard.ts_kv_cf (
-    entity_type text, // (DEVICE, CUSTOMER, TENANT)
+    entity_type text, -- (DEVICE, CUSTOMER, TENANT)
     entity_id timeuuid,
     key text,
     partition bigint,
@@ -29,7 +29,7 @@ CREATE TABLE IF NOT EXISTS thingsboard.ts_kv_cf (
 );
 
 CREATE TABLE IF NOT EXISTS thingsboard.ts_kv_partitions_cf (
-    entity_type text, // (DEVICE, CUSTOMER, TENANT)
+    entity_type text, -- (DEVICE, CUSTOMER, TENANT)
     entity_id timeuuid,
     key text,
     partition bigint,
diff --git a/dao/src/main/resources/sql/schema-entities-idx.sql b/dao/src/main/resources/sql/schema-entities-idx.sql
index a5b1261d40..518baf8df4 100644
--- a/dao/src/main/resources/sql/schema-entities-idx.sql
+++ b/dao/src/main/resources/sql/schema-entities-idx.sql
@@ -20,12 +20,20 @@ CREATE INDEX IF NOT EXISTS idx_alarm_originator_created_time ON alarm(originator
 
 CREATE INDEX IF NOT EXISTS idx_alarm_tenant_created_time ON alarm(tenant_id, created_time DESC);
 
-CREATE INDEX IF NOT EXISTS idx_alarm_tenant_status_created_time ON alarm(tenant_id, status, created_time DESC);
+-- Drop index by 'status' column and replace with new one that has only active alarms;
+CREATE INDEX IF NOT EXISTS idx_alarm_originator_alarm_type_active
+    ON alarm USING btree (originator_id, type) WHERE cleared = false;
 
 CREATE INDEX IF NOT EXISTS idx_alarm_tenant_alarm_type_created_time ON alarm(tenant_id, type, created_time DESC);
 
+CREATE INDEX IF NOT EXISTS idx_alarm_tenant_assignee_created_time ON alarm(tenant_id, assignee_id, created_time DESC);
+
 CREATE INDEX IF NOT EXISTS idx_entity_alarm_created_time ON entity_alarm(tenant_id, entity_id, created_time DESC);
 
+-- Cover index by alarm type to optimize propagated alarm queries;
+CREATE INDEX IF NOT EXISTS idx_entity_alarm_entity_id_alarm_type_created_time_alarm_id ON entity_alarm
+USING btree (tenant_id, entity_id, alarm_type, created_time DESC) INCLUDE(alarm_id);
+
 CREATE INDEX IF NOT EXISTS idx_entity_alarm_alarm_id ON entity_alarm(alarm_id);
 
 CREATE INDEX IF NOT EXISTS idx_relation_to_id ON relation(relation_type_group, to_type, to_id);
diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql
index b222cf4b96..9a975e1f5b 100644
--- a/dao/src/main/resources/sql/schema-entities.sql
+++ b/dao/src/main/resources/sql/schema-entities.sql
@@ -52,13 +52,16 @@ CREATE TABLE IF NOT EXISTS alarm (
     propagate boolean,
     severity varchar(255),
     start_ts bigint,
-    status varchar(255),
+    assign_ts bigint DEFAULT 0,
+    assignee_id uuid,
     tenant_id uuid,
     customer_id uuid,
     propagate_relation_types varchar,
     type varchar(255),
     propagate_to_owner boolean,
-    propagate_to_tenant boolean
+    propagate_to_tenant boolean,
+    acknowledged boolean,
+    cleared boolean
 );
 
 CREATE TABLE IF NOT EXISTS alarm_comment (
@@ -427,13 +430,6 @@ CREATE TABLE IF NOT EXISTS relation (
     additional_info varchar,
     CONSTRAINT relation_pkey PRIMARY KEY (from_id, from_type, relation_type_group, relation_type, to_id, to_type)
 );
--- ) PARTITION BY LIST (relation_type_group);
---
--- CREATE TABLE other_relations PARTITION OF relation DEFAULT;
--- CREATE TABLE common_relations PARTITION OF relation FOR VALUES IN ('COMMON');
--- CREATE TABLE alarm_relations PARTITION OF relation FOR VALUES IN ('ALARM');
--- CREATE TABLE dashboard_relations PARTITION OF relation FOR VALUES IN ('DASHBOARD');
--- CREATE TABLE rule_relations PARTITION OF relation FOR VALUES IN ('RULE_CHAIN', 'RULE_NODE');
 
 CREATE TABLE IF NOT EXISTS tb_user (
     id uuid NOT NULL CONSTRAINT tb_user_pkey PRIMARY KEY,
@@ -487,7 +483,8 @@ CREATE TABLE IF NOT EXISTS user_credentials (
     enabled boolean,
     password varchar(255),
     reset_token varchar(255) UNIQUE,
-    user_id uuid UNIQUE
+    user_id uuid UNIQUE,
+    additional_info varchar DEFAULT '{}'
 );
 
 CREATE TABLE IF NOT EXISTS widget_type (
@@ -795,4 +792,246 @@ CREATE TABLE IF NOT EXISTS user_settings (
     user_id uuid NOT NULL CONSTRAINT user_settings_pkey PRIMARY KEY,
     settings varchar(10000),
     CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES tb_user(id) ON DELETE CASCADE
-);
\ No newline at end of file
+);
+
+DROP VIEW IF EXISTS alarm_info CASCADE;
+CREATE VIEW alarm_info AS
+SELECT a.*,
+(CASE WHEN a.acknowledged AND a.cleared THEN 'CLEARED_ACK'
+      WHEN NOT a.acknowledged AND a.cleared THEN 'CLEARED_UNACK'
+      WHEN a.acknowledged AND NOT a.cleared THEN 'ACTIVE_ACK'
+      WHEN NOT a.acknowledged AND NOT a.cleared THEN 'ACTIVE_UNACK' END) as status,
+COALESCE(CASE WHEN a.originator_type = 0 THEN (select title from tenant where id = a.originator_id)
+              WHEN a.originator_type = 1 THEN (select title from customer where id = a.originator_id)
+              WHEN a.originator_type = 2 THEN (select email from tb_user where id = a.originator_id)
+              WHEN a.originator_type = 3 THEN (select title from dashboard where id = a.originator_id)
+              WHEN a.originator_type = 4 THEN (select name from asset where id = a.originator_id)
+              WHEN a.originator_type = 5 THEN (select name from device where id = a.originator_id)
+              WHEN a.originator_type = 9 THEN (select name from entity_view where id = a.originator_id)
+              WHEN a.originator_type = 13 THEN (select name from device_profile where id = a.originator_id)
+              WHEN a.originator_type = 14 THEN (select name from asset_profile where id = a.originator_id)
+              WHEN a.originator_type = 18 THEN (select name from edge where id = a.originator_id) END
+    , 'Deleted') originator_name,
+COALESCE(CASE WHEN a.originator_type = 0 THEN (select title from tenant where id = a.originator_id)
+              WHEN a.originator_type = 1 THEN (select COALESCE(title, email) from customer where id = a.originator_id)
+              WHEN a.originator_type = 2 THEN (select email from tb_user where id = a.originator_id)
+              WHEN a.originator_type = 3 THEN (select title from dashboard where id = a.originator_id)
+              WHEN a.originator_type = 4 THEN (select COALESCE(label, name) from asset where id = a.originator_id)
+              WHEN a.originator_type = 5 THEN (select COALESCE(label, name) from device where id = a.originator_id)
+              WHEN a.originator_type = 9 THEN (select name from entity_view where id = a.originator_id)
+              WHEN a.originator_type = 13 THEN (select name from device_profile where id = a.originator_id)
+              WHEN a.originator_type = 14 THEN (select name from asset_profile where id = a.originator_id)
+              WHEN a.originator_type = 18 THEN (select COALESCE(label, name) from edge where id = a.originator_id) END
+    , 'Deleted') as originator_label,
+u.first_name as assignee_first_name, u.last_name as assignee_last_name, u.email as assignee_email
+FROM alarm a
+LEFT JOIN tb_user u ON u.id = a.assignee_id;
+
+CREATE OR REPLACE FUNCTION create_or_update_active_alarm(
+                                        t_id uuid, c_id uuid, a_id uuid, a_created_ts bigint,
+                                        a_o_id uuid, a_o_type integer, a_type varchar,
+                                        a_severity varchar, a_start_ts bigint, a_end_ts bigint,
+                                        a_details varchar,
+                                        a_propagate boolean, a_propagate_to_owner boolean,
+                                        a_propagate_to_tenant boolean, a_propagation_types varchar,
+                                        a_creation_enabled boolean)
+    RETURNS varchar
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    null_id constant uuid = '13814000-1dd2-11b2-8080-808080808080'::uuid;
+    existing  alarm;
+    result    alarm_info;
+    row_count integer;
+BEGIN
+    SELECT * INTO existing FROM alarm a WHERE a.originator_id = a_o_id AND a.type = a_type AND a.cleared = false ORDER BY a.start_ts DESC FOR UPDATE;
+    IF existing.id IS NULL THEN
+        IF a_creation_enabled = FALSE THEN
+            RETURN json_build_object('success', false)::text;
+        END IF;
+        IF c_id = null_id THEN
+            c_id = NULL;
+        end if;
+        INSERT INTO alarm
+            (tenant_id, customer_id, id, created_time,
+             originator_id, originator_type, type,
+             severity, start_ts, end_ts,
+             additional_info,
+             propagate, propagate_to_owner, propagate_to_tenant, propagate_relation_types,
+             acknowledged, ack_ts,
+             cleared, clear_ts,
+             assignee_id, assign_ts)
+             VALUES
+            (t_id, c_id, a_id, a_created_ts,
+             a_o_id, a_o_type, a_type,
+             a_severity, a_start_ts, a_end_ts,
+             a_details,
+             a_propagate, a_propagate_to_owner, a_propagate_to_tenant, a_propagation_types,
+             false, 0, false, 0, NULL, 0);
+        SELECT * INTO result FROM alarm_info a WHERE a.id = a_id AND a.tenant_id = t_id;
+        RETURN json_build_object('success', true, 'created', true, 'modified', true, 'alarm', row_to_json(result))::text;
+    ELSE
+        UPDATE alarm a
+        SET severity                 = a_severity,
+            start_ts                 = a_start_ts,
+            end_ts                   = a_end_ts,
+            additional_info          = a_details,
+            propagate                = a_propagate,
+            propagate_to_owner       = a_propagate_to_owner,
+            propagate_to_tenant      = a_propagate_to_tenant,
+            propagate_relation_types = a_propagation_types
+        WHERE a.id = existing.id
+          AND a.tenant_id = t_id
+          AND (severity != a_severity OR start_ts != a_start_ts OR end_ts != a_end_ts OR additional_info != a_details
+            OR propagate != a_propagate OR propagate_to_owner != a_propagate_to_owner OR
+               propagate_to_tenant != a_propagate_to_tenant OR propagate_relation_types != a_propagation_types);
+        GET DIAGNOSTICS row_count = ROW_COUNT;
+        SELECT * INTO result FROM alarm_info a WHERE a.id = existing.id AND a.tenant_id = t_id;
+        IF row_count > 0 THEN
+            RETURN json_build_object('success', true, 'modified', true, 'alarm', row_to_json(result), 'old', row_to_json(existing))::text;
+        ELSE
+            RETURN json_build_object('success', true, 'modified', false, 'alarm', row_to_json(result))::text;
+        END IF;
+    END IF;
+END
+$$;
+
+DROP FUNCTION IF EXISTS update_alarm;
+CREATE OR REPLACE FUNCTION update_alarm(t_id uuid, a_id uuid, a_severity varchar, a_start_ts bigint, a_end_ts bigint,
+                                        a_details varchar,
+                                        a_propagate boolean, a_propagate_to_owner boolean,
+                                        a_propagate_to_tenant boolean, a_propagation_types varchar)
+    RETURNS varchar
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    existing  alarm;
+    result    alarm_info;
+    row_count integer;
+BEGIN
+    SELECT * INTO existing FROM alarm a WHERE a.id = a_id AND a.tenant_id = t_id FOR UPDATE;
+    IF existing IS NULL THEN
+        RETURN json_build_object('success', false)::text;
+    END IF;
+    UPDATE alarm a
+    SET severity                 = a_severity,
+        start_ts                 = a_start_ts,
+        end_ts                   = a_end_ts,
+        additional_info          = a_details,
+        propagate                = a_propagate,
+        propagate_to_owner       = a_propagate_to_owner,
+        propagate_to_tenant      = a_propagate_to_tenant,
+        propagate_relation_types = a_propagation_types
+    WHERE a.id = a_id
+      AND a.tenant_id = t_id
+      AND (severity != a_severity OR start_ts != a_start_ts OR end_ts != a_end_ts OR additional_info != a_details
+        OR propagate != a_propagate OR propagate_to_owner != a_propagate_to_owner OR
+           propagate_to_tenant != a_propagate_to_tenant OR propagate_relation_types != a_propagation_types);
+    GET DIAGNOSTICS row_count = ROW_COUNT;
+    SELECT * INTO result FROM alarm_info a WHERE a.id = a_id AND a.tenant_id = t_id;
+    IF row_count > 0 THEN
+        RETURN json_build_object('success', true, 'modified', row_count > 0, 'alarm', row_to_json(result), 'old', row_to_json(existing))::text;
+    ELSE
+        RETURN json_build_object('success', true, 'modified', row_count > 0, 'alarm', row_to_json(result))::text;
+    END IF;
+END
+$$;
+
+DROP FUNCTION IF EXISTS acknowledge_alarm;
+CREATE OR REPLACE FUNCTION acknowledge_alarm(t_id uuid, a_id uuid, a_ts bigint)
+    RETURNS varchar
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    existing alarm;
+    result   alarm_info;
+    modified boolean = FALSE;
+BEGIN
+    SELECT * INTO existing FROM alarm a WHERE a.id = a_id AND a.tenant_id = t_id FOR UPDATE;
+    IF existing IS NULL THEN
+        RETURN json_build_object('success', false)::text;
+    END IF;
+
+    IF NOT (existing.acknowledged) THEN
+        modified = TRUE;
+        UPDATE alarm a SET acknowledged = true, ack_ts = a_ts WHERE a.id = a_id AND a.tenant_id = t_id;
+    END IF;
+    SELECT * INTO result FROM alarm_info a WHERE a.id = a_id AND a.tenant_id = t_id;
+    RETURN json_build_object('success', true, 'modified', modified, 'alarm', row_to_json(result))::text;
+END
+$$;
+
+DROP FUNCTION IF EXISTS clear_alarm;
+CREATE OR REPLACE FUNCTION clear_alarm(t_id uuid, a_id uuid, a_ts bigint, a_details varchar)
+    RETURNS varchar
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    existing alarm;
+    result   alarm_info;
+    cleared boolean = FALSE;
+BEGIN
+    SELECT * INTO existing FROM alarm a WHERE a.id = a_id AND a.tenant_id = t_id FOR UPDATE;
+    IF existing IS NULL THEN
+        RETURN json_build_object('success', false)::text;
+    END IF;
+    IF NOT(existing.cleared) THEN
+        cleared = TRUE;
+        UPDATE alarm a SET cleared = true, clear_ts = a_ts, additional_info = a_details WHERE a.id = a_id AND a.tenant_id = t_id;
+    END IF;
+    SELECT * INTO result FROM alarm_info a WHERE a.id = a_id AND a.tenant_id = t_id;
+    RETURN json_build_object('success', true, 'cleared', cleared, 'alarm', row_to_json(result))::text;
+END
+$$;
+
+DROP FUNCTION IF EXISTS assign_alarm;
+CREATE OR REPLACE FUNCTION assign_alarm(t_id uuid, a_id uuid, u_id uuid, a_ts bigint)
+    RETURNS varchar
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    existing alarm;
+    result   alarm_info;
+    modified boolean = FALSE;
+BEGIN
+    SELECT * INTO existing FROM alarm a WHERE a.id = a_id AND a.tenant_id = t_id FOR UPDATE;
+    IF existing IS NULL THEN
+        RETURN json_build_object('success', false)::text;
+    END IF;
+    IF existing.assignee_id IS NULL OR existing.assignee_id != u_id THEN
+        modified = TRUE;
+        UPDATE alarm a SET assignee_id = u_id, assign_ts = a_ts WHERE a.id = a_id AND a.tenant_id = t_id;
+    END IF;
+    SELECT * INTO result FROM alarm_info a WHERE a.id = a_id AND a.tenant_id = t_id;
+    RETURN json_build_object('success', true, 'modified', modified, 'alarm', row_to_json(result))::text;
+END
+$$;
+
+DROP FUNCTION IF EXISTS unassign_alarm;
+CREATE OR REPLACE FUNCTION unassign_alarm(t_id uuid, a_id uuid, a_ts bigint)
+    RETURNS varchar
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    existing alarm;
+    result   alarm_info;
+    modified boolean = FALSE;
+BEGIN
+    SELECT * INTO existing FROM alarm a WHERE a.id = a_id AND a.tenant_id = t_id FOR UPDATE;
+    IF existing IS NULL THEN
+        RETURN json_build_object('success', false)::text;
+    END IF;
+    IF existing.assignee_id IS NOT NULL THEN
+        modified = TRUE;
+        UPDATE alarm a SET assignee_id = NULL, assign_ts = a_ts WHERE a.id = a_id AND a.tenant_id = t_id;
+    END IF;
+    SELECT * INTO result FROM alarm_info a WHERE a.id = a_id AND a.tenant_id = t_id;
+    RETURN json_build_object('success', true, 'modified', modified, 'alarm', row_to_json(result))::text;
+END
+$$;
\ No newline at end of file
diff --git a/dao/src/test/java/org/apache/cassandra/io/sstable/Descriptor.java b/dao/src/test/java/org/apache/cassandra/io/sstable/Descriptor.java
deleted file mode 100644
index 69a164f729..0000000000
--- a/dao/src/test/java/org/apache/cassandra/io/sstable/Descriptor.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.apache.cassandra.io.sstable;
-
-import java.io.File;
-import java.io.IOError;
-import java.io.IOException;
-import java.util.*;
-import java.util.regex.Pattern;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Objects;
-
-import org.apache.cassandra.db.Directories;
-import org.apache.cassandra.io.sstable.format.SSTableFormat;
-import org.apache.cassandra.io.sstable.format.Version;
-import org.apache.cassandra.io.sstable.metadata.IMetadataSerializer;
-import org.apache.cassandra.io.sstable.metadata.LegacyMetadataSerializer;
-import org.apache.cassandra.io.sstable.metadata.MetadataSerializer;
-import org.apache.cassandra.utils.Pair;
-
-import static org.apache.cassandra.io.sstable.Component.separator;
-
-/**
- * A SSTable is described by the keyspace and column family it contains data
- * for, a generation (where higher generations contain more recent data) and
- * an alphabetic version string.
- *
- * A descriptor can be marked as temporary, which influences generated filenames.
- */
-public class Descriptor
-{
-    public static String TMP_EXT = ".tmp";
-
-    /** canonicalized path to the directory where SSTable resides */
-    public final File directory;
-    /** version has the following format: <code>[a-z]+</code> */
-    public final Version version;
-    public final String ksname;
-    public final String cfname;
-    public final int generation;
-    public final SSTableFormat.Type formatType;
-    /** digest component - might be {@code null} for old, legacy sstables */
-    public final Component digestComponent;
-    private final int hashCode;
-
-    /**
-     * A descriptor that assumes CURRENT_VERSION.
-     */
-    @VisibleForTesting
-    public Descriptor(File directory, String ksname, String cfname, int generation)
-    {
-        this(SSTableFormat.Type.current().info.getLatestVersion(), directory, ksname, cfname, generation, SSTableFormat.Type.current(), null);
-    }
-
-    /**
-     * Constructor for sstable writers only.
-     */
-    public Descriptor(File directory, String ksname, String cfname, int generation, SSTableFormat.Type formatType)
-    {
-        this(formatType.info.getLatestVersion(), directory, ksname, cfname, generation, formatType, Component.digestFor(formatType.info.getLatestVersion().uncompressedChecksumType()));
-    }
-
-    @VisibleForTesting
-    public Descriptor(String version, File directory, String ksname, String cfname, int generation, SSTableFormat.Type formatType)
-    {
-        this(formatType.info.getVersion(version), directory, ksname, cfname, generation, formatType, Component.digestFor(formatType.info.getLatestVersion().uncompressedChecksumType()));
-    }
-
-    public Descriptor(Version version, File directory, String ksname, String cfname, int generation, SSTableFormat.Type formatType, Component digestComponent)
-    {
-        assert version != null && directory != null && ksname != null && cfname != null && formatType.info.getLatestVersion().getClass().equals(version.getClass());
-        this.version = version;
-        try
-        {
-            this.directory = directory.getCanonicalFile();
-        }
-        catch (IOException e)
-        {
-            throw new IOError(e);
-        }
-        this.ksname = ksname;
-        this.cfname = cfname;
-        this.generation = generation;
-        this.formatType = formatType;
-        this.digestComponent = digestComponent;
-
-        hashCode = Objects.hashCode(version, this.directory, generation, ksname, cfname, formatType);
-    }
-
-    public Descriptor withGeneration(int newGeneration)
-    {
-        return new Descriptor(version, directory, ksname, cfname, newGeneration, formatType, digestComponent);
-    }
-
-    public Descriptor withFormatType(SSTableFormat.Type newType)
-    {
-        return new Descriptor(newType.info.getLatestVersion(), directory, ksname, cfname, generation, newType, digestComponent);
-    }
-
-    public Descriptor withDigestComponent(Component newDigestComponent)
-    {
-        return new Descriptor(version, directory, ksname, cfname, generation, formatType, newDigestComponent);
-    }
-
-    public String tmpFilenameFor(Component component)
-    {
-        return filenameFor(component) + TMP_EXT;
-    }
-
-    public String filenameFor(Component component)
-    {
-        return baseFilename() + separator + component.name();
-    }
-
-    public String baseFilename()
-    {
-        StringBuilder buff = new StringBuilder();
-        buff.append(directory).append(File.separatorChar);
-        appendFileName(buff);
-        return buff.toString();
-    }
-
-    private void appendFileName(StringBuilder buff)
-    {
-        if (!version.hasNewFileName())
-        {
-            buff.append(ksname).append(separator);
-            buff.append(cfname).append(separator);
-        }
-        buff.append(version).append(separator);
-        buff.append(generation);
-        if (formatType != SSTableFormat.Type.LEGACY)
-            buff.append(separator).append(formatType.name);
-    }
-
-    public String relativeFilenameFor(Component component)
-    {
-        final StringBuilder buff = new StringBuilder();
-        appendFileName(buff);
-        buff.append(separator).append(component.name());
-        return buff.toString();
-    }
-
-    public SSTableFormat getFormat()
-    {
-        return formatType.info;
-    }
-
-    /** Return any temporary files found in the directory */
-    public List<File> getTemporaryFiles()
-    {
-        List<File> ret = new ArrayList<>();
-        File[] tmpFiles = directory.listFiles((dir, name) ->
-                name.endsWith(Descriptor.TMP_EXT));
-
-        for (File tmpFile : tmpFiles)
-            ret.add(tmpFile);
-
-        return ret;
-    }
-
-    /**
-     *  Files obsoleted by CASSANDRA-7066 : temporary files and compactions_in_progress. We support
-     *  versions 2.1 (ka) and 2.2 (la).
-     *  Temporary files have tmp- or tmplink- at the beginning for 2.2 sstables or after ks-cf- for 2.1 sstables
-     */
-
-    private final static String LEGACY_COMP_IN_PROG_REGEX_STR = "^compactions_in_progress(\\-[\\d,a-f]{32})?$";
-    private final static Pattern LEGACY_COMP_IN_PROG_REGEX = Pattern.compile(LEGACY_COMP_IN_PROG_REGEX_STR);
-    private final static String LEGACY_TMP_REGEX_STR = "^((.*)\\-(.*)\\-)?tmp(link)?\\-((?:l|k).)\\-(\\d)*\\-(.*)$";
-    private final static Pattern LEGACY_TMP_REGEX = Pattern.compile(LEGACY_TMP_REGEX_STR);
-
-    public static boolean isLegacyFile(File file)
-    {
-        if (file.isDirectory())
-            return file.getParentFile() != null &&
-                    file.getParentFile().getName().equalsIgnoreCase("system") &&
-                    LEGACY_COMP_IN_PROG_REGEX.matcher(file.getName()).matches();
-        else
-            return LEGACY_TMP_REGEX.matcher(file.getName()).matches();
-    }
-
-    public static boolean isValidFile(String fileName)
-    {
-        return fileName.endsWith(".db") && !LEGACY_TMP_REGEX.matcher(fileName).matches();
-    }
-
-    /**
-     * @see #fromFilename(File directory, String name)
-     * @param filename The SSTable filename
-     * @return Descriptor of the SSTable initialized from filename
-     */
-    public static Descriptor fromFilename(String filename)
-    {
-        return fromFilename(filename, false);
-    }
-
-    public static Descriptor fromFilename(String filename, SSTableFormat.Type formatType)
-    {
-        return fromFilename(filename).withFormatType(formatType);
-    }
-
-    public static Descriptor fromFilename(String filename, boolean skipComponent)
-    {
-        File file = new File(filename).getAbsoluteFile();
-        return fromFilename(file.getParentFile(), file.getName(), skipComponent).left;
-    }
-
-    public static Pair<Descriptor, String> fromFilename(File directory, String name)
-    {
-        return fromFilename(directory, name, false);
-    }
-
-    /**
-     * Filename of the form is vary by version:
-     *
-     * <ul>
-     *     <li>&lt;ksname&gt;-&lt;cfname&gt;-(tmp-)?&lt;version&gt;-&lt;gen&gt;-&lt;component&gt; for cassandra 2.0 and before</li>
-     *     <li>(&lt;tmp marker&gt;-)?&lt;version&gt;-&lt;gen&gt;-&lt;component&gt; for cassandra 3.0 and later</li>
-     * </ul>
-     *
-     * If this is for SSTable of secondary index, directory should ends with index name for 2.1+.
-     *
-     * @param directory The directory of the SSTable files
-     * @param name The name of the SSTable file
-     * @param skipComponent true if the name param should not be parsed for a component tag
-     *
-     * @return A Descriptor for the SSTable, and the Component remainder.
-     */
-    @SuppressWarnings("deprecation")
-    public static Pair<Descriptor, String> fromFilename(File directory, String name, boolean skipComponent)
-    {
-        File parentDirectory = directory != null ? directory : new File(".");
-
-        // tokenize the filename
-        StringTokenizer st = new StringTokenizer(name, String.valueOf(separator));
-        String nexttok;
-
-        // read tokens backwards to determine version
-        Deque<String> tokenStack = new ArrayDeque<>();
-        while (st.hasMoreTokens())
-        {
-            tokenStack.push(st.nextToken());
-        }
-
-        // component suffix
-        String component = skipComponent ? null : tokenStack.pop();
-
-        nexttok = tokenStack.pop();
-        // generation OR format type
-        SSTableFormat.Type fmt = SSTableFormat.Type.LEGACY;
-        if (!CharMatcher.digit().matchesAllOf(nexttok))
-        {
-            fmt = SSTableFormat.Type.validate(nexttok);
-            nexttok = tokenStack.pop();
-        }
-
-        // generation
-        int generation = Integer.parseInt(nexttok);
-
-        // version
-        nexttok = tokenStack.pop();
-
-        if (!Version.validate(nexttok))
-            throw new UnsupportedOperationException("SSTable " + name + " is too old to open.  Upgrade to 2.0 first, and run upgradesstables");
-
-        Version version = fmt.info.getVersion(nexttok);
-
-        // ks/cf names
-        String ksname, cfname;
-        if (version.hasNewFileName())
-        {
-            // for 2.1+ read ks and cf names from directory
-            File cfDirectory = parentDirectory;
-            // check if this is secondary index
-            String indexName = "";
-            if (cfDirectory.getName().startsWith(Directories.SECONDARY_INDEX_NAME_SEPARATOR))
-            {
-                indexName = cfDirectory.getName();
-                cfDirectory = cfDirectory.getParentFile();
-            }
-            if (cfDirectory.getName().equals(Directories.BACKUPS_SUBDIR))
-            {
-                cfDirectory = cfDirectory.getParentFile();
-            }
-            else if (cfDirectory.getParentFile().getName().equals(Directories.SNAPSHOT_SUBDIR))
-            {
-                cfDirectory = cfDirectory.getParentFile().getParentFile();
-            }
-            cfname = cfDirectory.getName().split("-")[0] + indexName;
-            ksname = cfDirectory.getParentFile().getName();
-        }
-        else
-        {
-            cfname = tokenStack.pop();
-            ksname = tokenStack.pop();
-        }
-        assert tokenStack.isEmpty() : "Invalid file name " + name + " in " + directory;
-
-        return Pair.create(new Descriptor(version, parentDirectory, ksname, cfname, generation, fmt,
-                        // _assume_ version from version
-                        Component.digestFor(version.uncompressedChecksumType())),
-                component);
-    }
-
-    @SuppressWarnings("deprecation")
-    public IMetadataSerializer getMetadataSerializer()
-    {
-        if (version.hasNewStatsFile())
-            return new MetadataSerializer();
-        else
-            return new LegacyMetadataSerializer();
-    }
-
-    /**
-     * @return true if the current Cassandra version can read the given sstable version
-     */
-    public boolean isCompatible()
-    {
-        return version.isCompatible();
-    }
-
-    @Override
-    public String toString()
-    {
-        return baseFilename();
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this)
-            return true;
-        if (!(o instanceof Descriptor))
-            return false;
-        Descriptor that = (Descriptor)o;
-        return that.directory.equals(this.directory)
-                && that.generation == this.generation
-                && that.ksname.equals(this.ksname)
-                && that.cfname.equals(this.cfname)
-                && that.formatType == this.formatType;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return hashCode;
-    }
-}
diff --git a/dao/src/test/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java b/dao/src/test/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java
deleted file mode 100644
index 350d27591f..0000000000
--- a/dao/src/test/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.apache.cassandra.io.sstable.format;
-
-import com.google.common.base.CharMatcher;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.db.RowIndexEntry;
-import org.apache.cassandra.db.SerializationHeader;
-import org.apache.cassandra.io.sstable.format.big.BigFormat;
-
-/**
- * Provides the accessors to data on disk.
- */
-public interface SSTableFormat
-{
-    static boolean enableSSTableDevelopmentTestMode = Boolean.getBoolean("cassandra.test.sstableformatdevelopment");
-
-
-    Version getLatestVersion();
-    Version getVersion(String version);
-
-    SSTableWriter.Factory getWriterFactory();
-    SSTableReader.Factory getReaderFactory();
-
-    RowIndexEntry.IndexSerializer<?> getIndexSerializer(CFMetaData cfm, Version version, SerializationHeader header);
-
-    public static enum Type
-    {
-        //Used internally to refer to files with no
-        //format flag in the filename
-        LEGACY("big", BigFormat.instance),
-
-        //The original sstable format
-        BIG("big", BigFormat.instance);
-
-        public final SSTableFormat info;
-        public final String name;
-
-        public static Type current()
-        {
-            return BIG;
-        }
-
-        @SuppressWarnings("deprecation")
-        private Type(String name, SSTableFormat info)
-        {
-            //Since format comes right after generation
-            //we disallow formats with numeric names
-            // We have removed this check for compatibility with the embedded cassandra used for tests.
-            assert !CharMatcher.digit().matchesAllOf(name);
-
-            this.name = name;
-            this.info = info;
-        }
-
-        public static Type validate(String name)
-        {
-            for (Type valid : Type.values())
-            {
-                //This is used internally for old sstables
-                if (valid == LEGACY)
-                    continue;
-
-                if (valid.name.equalsIgnoreCase(name))
-                    return valid;
-            }
-
-            throw new IllegalArgumentException("No Type constant " + name);
-        }
-    }
-}
diff --git a/dao/src/test/java/org/apache/cassandra/io/util/FileUtils.java b/dao/src/test/java/org/apache/cassandra/io/util/FileUtils.java
deleted file mode 100644
index 2609a2c3d0..0000000000
--- a/dao/src/test/java/org/apache/cassandra/io/util/FileUtils.java
+++ /dev/null
@@ -1,760 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.apache.cassandra.io.util;
-
-import java.io.*;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.FileAttributeView;
-import java.nio.file.attribute.FileStoreAttributeView;
-import java.text.DecimalFormat;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.StreamSupport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.cassandra.concurrent.ScheduledExecutors;
-import org.apache.cassandra.io.FSError;
-import org.apache.cassandra.io.FSErrorHandler;
-import org.apache.cassandra.io.FSReadError;
-import org.apache.cassandra.io.FSWriteError;
-import org.apache.cassandra.io.sstable.CorruptSSTableException;
-import org.apache.cassandra.utils.JVMStabilityInspector;
-
-import static com.google.common.base.Throwables.throwIfUnchecked;
-import static org.apache.cassandra.utils.Throwables.maybeFail;
-import static org.apache.cassandra.utils.Throwables.merge;
-
-public final class FileUtils
-{
-    public static final Charset CHARSET = StandardCharsets.UTF_8;
-
-    private static final Logger logger = LoggerFactory.getLogger(FileUtils.class);
-    public static final long ONE_KB = 1024;
-    public static final long ONE_MB = 1024 * ONE_KB;
-    public static final long ONE_GB = 1024 * ONE_MB;
-    public static final long ONE_TB = 1024 * ONE_GB;
-
-    private static final DecimalFormat df = new DecimalFormat("#.##");
-    public static final boolean isCleanerAvailable = false;
-    private static final AtomicReference<Optional<FSErrorHandler>> fsErrorHandler = new AtomicReference<>(Optional.empty());
-
-    public static void createHardLink(String from, String to)
-    {
-        createHardLink(new File(from), new File(to));
-    }
-
-    public static void createHardLink(File from, File to)
-    {
-        if (to.exists())
-            throw new RuntimeException("Tried to create duplicate hard link to " + to);
-        if (!from.exists())
-            throw new RuntimeException("Tried to hard link to file that does not exist " + from);
-
-        try
-        {
-            Files.createLink(to.toPath(), from.toPath());
-        }
-        catch (IOException e)
-        {
-            throw new FSWriteError(e, to);
-        }
-    }
-
-    public static File createTempFile(String prefix, String suffix, File directory)
-    {
-        try
-        {
-            return File.createTempFile(prefix, suffix, directory);
-        }
-        catch (IOException e)
-        {
-            throw new FSWriteError(e, directory);
-        }
-    }
-
-    public static File createTempFile(String prefix, String suffix)
-    {
-        return createTempFile(prefix, suffix, new File(System.getProperty("java.io.tmpdir")));
-    }
-
-    public static Throwable deleteWithConfirm(String filePath, boolean expect, Throwable accumulate)
-    {
-        return deleteWithConfirm(new File(filePath), expect, accumulate);
-    }
-
-    public static Throwable deleteWithConfirm(File file, boolean expect, Throwable accumulate)
-    {
-        boolean exists = file.exists();
-        assert exists || !expect : "attempted to delete non-existing file " + file.getName();
-        try
-        {
-            if (exists)
-                Files.delete(file.toPath());
-        }
-        catch (Throwable t)
-        {
-            try
-            {
-                throw new FSWriteError(t, file);
-            }
-            catch (Throwable t2)
-            {
-                accumulate = merge(accumulate, t2);
-            }
-        }
-        return accumulate;
-    }
-
-    public static void deleteWithConfirm(String file)
-    {
-        deleteWithConfirm(new File(file));
-    }
-
-    public static void deleteWithConfirm(File file)
-    {
-        maybeFail(deleteWithConfirm(file, true, null));
-    }
-
-    public static void renameWithOutConfirm(String from, String to)
-    {
-        try
-        {
-            atomicMoveWithFallback(new File(from).toPath(), new File(to).toPath());
-        }
-        catch (IOException e)
-        {
-            if (logger.isTraceEnabled())
-                logger.trace("Could not move file "+from+" to "+to, e);
-        }
-    }
-
-    public static void renameWithConfirm(String from, String to)
-    {
-        renameWithConfirm(new File(from), new File(to));
-    }
-
-    public static void renameWithConfirm(File from, File to)
-    {
-        assert from.exists();
-        if (logger.isTraceEnabled())
-            logger.trace("Renaming {} to {}", from.getPath(), to.getPath());
-        // this is not FSWE because usually when we see it it's because we didn't close the file before renaming it,
-        // and Windows is picky about that.
-        try
-        {
-            atomicMoveWithFallback(from.toPath(), to.toPath());
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException(String.format("Failed to rename %s to %s", from.getPath(), to.getPath()), e);
-        }
-    }
-
-    /**
-     * Move a file atomically, if it fails, it falls back to a non-atomic operation
-     * @param from
-     * @param to
-     * @throws IOException
-     */
-    private static void atomicMoveWithFallback(Path from, Path to) throws IOException
-    {
-        try
-        {
-            Files.move(from, to, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
-        }
-        catch (AtomicMoveNotSupportedException e)
-        {
-            logger.trace("Could not do an atomic move", e);
-            Files.move(from, to, StandardCopyOption.REPLACE_EXISTING);
-        }
-
-    }
-    public static void truncate(String path, long size)
-    {
-        try(FileChannel channel = FileChannel.open(Paths.get(path), StandardOpenOption.READ, StandardOpenOption.WRITE))
-        {
-            channel.truncate(size);
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static void closeQuietly(Closeable c)
-    {
-        try
-        {
-            if (c != null)
-                c.close();
-        }
-        catch (Exception e)
-        {
-            logger.warn("Failed closing {}", c, e);
-        }
-    }
-
-    public static void closeQuietly(AutoCloseable c)
-    {
-        try
-        {
-            if (c != null)
-                c.close();
-        }
-        catch (Exception e)
-        {
-            logger.warn("Failed closing {}", c, e);
-        }
-    }
-
-    public static void close(Closeable... cs) throws IOException
-    {
-        close(Arrays.asList(cs));
-    }
-
-    public static void close(Iterable<? extends Closeable> cs) throws IOException
-    {
-        Throwable e = null;
-        for (Closeable c : cs)
-        {
-            try
-            {
-                if (c != null)
-                    c.close();
-            }
-            catch (Throwable ex)
-            {
-                if (e == null) e = ex;
-                else e.addSuppressed(ex);
-                logger.warn("Failed closing stream {}", c, ex);
-            }
-        }
-        maybeFail(e, IOException.class);
-    }
-
-    public static void closeQuietly(Iterable<? extends AutoCloseable> cs)
-    {
-        for (AutoCloseable c : cs)
-        {
-            try
-            {
-                if (c != null)
-                    c.close();
-            }
-            catch (Exception ex)
-            {
-                logger.warn("Failed closing {}", c, ex);
-            }
-        }
-    }
-
-    public static String getCanonicalPath(String filename)
-    {
-        try
-        {
-            return new File(filename).getCanonicalPath();
-        }
-        catch (IOException e)
-        {
-            throw new FSReadError(e, filename);
-        }
-    }
-
-    public static String getCanonicalPath(File file)
-    {
-        try
-        {
-            return file.getCanonicalPath();
-        }
-        catch (IOException e)
-        {
-            throw new FSReadError(e, file);
-        }
-    }
-
-    /** Return true if file is contained in folder */
-    public static boolean isContained(File folder, File file)
-    {
-        Path folderPath = Paths.get(getCanonicalPath(folder));
-        Path filePath = Paths.get(getCanonicalPath(file));
-
-        return filePath.startsWith(folderPath);
-    }
-
-    /** Convert absolute path into a path relative to the base path */
-    public static String getRelativePath(String basePath, String path)
-    {
-        try
-        {
-            return Paths.get(basePath).relativize(Paths.get(path)).toString();
-        }
-        catch(Exception ex)
-        {
-            String absDataPath = FileUtils.getCanonicalPath(basePath);
-            return Paths.get(absDataPath).relativize(Paths.get(path)).toString();
-        }
-    }
-
-    public static void clean(ByteBuffer buffer)
-    {
-        if (buffer == null)
-            return;
-    }
-
-    public static void createDirectory(String directory)
-    {
-        createDirectory(new File(directory));
-    }
-
-    public static void createDirectory(File directory)
-    {
-        if (!directory.exists())
-        {
-            if (!directory.mkdirs())
-                throw new FSWriteError(new IOException("Failed to mkdirs " + directory), directory);
-        }
-    }
-
-    public static boolean delete(String file)
-    {
-        File f = new File(file);
-        return f.delete();
-    }
-
-    public static void delete(File... files)
-    {
-        if (files == null)
-        {
-            // CASSANDRA-13389: some callers use Files.listFiles() which, on error, silently returns null
-            logger.debug("Received null list of files to delete");
-            return;
-        }
-
-        for ( File file : files )
-        {
-            file.delete();
-        }
-    }
-
-    public static void deleteAsync(final String file)
-    {
-        Runnable runnable = new Runnable()
-        {
-            public void run()
-            {
-                deleteWithConfirm(new File(file));
-            }
-        };
-        ScheduledExecutors.nonPeriodicTasks.execute(runnable);
-    }
-
-    public static void visitDirectory(Path dir, Predicate<? super File> filter, Consumer<? super File> consumer)
-    {
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir))
-        {
-            StreamSupport.stream(stream.spliterator(), false)
-                    .map(Path::toFile)
-                    // stream directories are weakly consistent so we always check if the file still exists
-                    .filter(f -> f.exists() && (filter == null || filter.test(f)))
-                    .forEach(consumer);
-        }
-        catch (IOException|DirectoryIteratorException ex)
-        {
-            logger.error("Failed to list files in {} with exception: {}", dir, ex.getMessage(), ex);
-        }
-    }
-
-    public static String stringifyFileSize(double value)
-    {
-        double d;
-        if ( value >= ONE_TB )
-        {
-            d = value / ONE_TB;
-            String val = df.format(d);
-            return val + " TiB";
-        }
-        else if ( value >= ONE_GB )
-        {
-            d = value / ONE_GB;
-            String val = df.format(d);
-            return val + " GiB";
-        }
-        else if ( value >= ONE_MB )
-        {
-            d = value / ONE_MB;
-            String val = df.format(d);
-            return val + " MiB";
-        }
-        else if ( value >= ONE_KB )
-        {
-            d = value / ONE_KB;
-            String val = df.format(d);
-            return val + " KiB";
-        }
-        else
-        {
-            String val = df.format(value);
-            return val + " bytes";
-        }
-    }
-
-    /**
-     * Deletes all files and subdirectories under "dir".
-     * @param dir Directory to be deleted
-     * @throws FSWriteError if any part of the tree cannot be deleted
-     */
-    public static void deleteRecursive(File dir)
-    {
-        if (dir.isDirectory())
-        {
-            String[] children = dir.list();
-            for (String child : children)
-                deleteRecursive(new File(dir, child));
-        }
-
-        // The directory is now empty so now it can be smoked
-        deleteWithConfirm(dir);
-    }
-
-    /**
-     * Schedules deletion of all file and subdirectories under "dir" on JVM shutdown.
-     * @param dir Directory to be deleted
-     */
-    public static void deleteRecursiveOnExit(File dir)
-    {
-        if (dir.isDirectory())
-        {
-            String[] children = dir.list();
-            for (String child : children)
-                deleteRecursiveOnExit(new File(dir, child));
-        }
-
-        logger.trace("Scheduling deferred deletion of file: {}", dir);
-        dir.deleteOnExit();
-    }
-
-    public static void handleCorruptSSTable(CorruptSSTableException e)
-    {
-        fsErrorHandler.get().ifPresent(handler -> handler.handleCorruptSSTable(e));
-    }
-
-    public static void handleFSError(FSError e)
-    {
-        fsErrorHandler.get().ifPresent(handler -> handler.handleFSError(e));
-    }
-
-    /**
-     * handleFSErrorAndPropagate will invoke the disk failure policy error handler,
-     * which may or may not stop the daemon or transports. However, if we don't exit,
-     * we still want to propagate the exception to the caller in case they have custom
-     * exception handling
-     *
-     * @param e A filesystem error
-     */
-    public static void handleFSErrorAndPropagate(FSError e)
-    {
-        JVMStabilityInspector.inspectThrowable(e);
-        throwIfUnchecked(e);
-        throw new RuntimeException(e);
-    }
-
-    /**
-     * Get the size of a directory in bytes
-     * @param folder The directory for which we need size.
-     * @return The size of the directory
-     */
-    public static long folderSize(File folder)
-    {
-        final long [] sizeArr = {0L};
-        try
-        {
-            Files.walkFileTree(folder.toPath(), new SimpleFileVisitor<Path>()
-            {
-                @Override
-                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-                {
-                    sizeArr[0] += attrs.size();
-                    return FileVisitResult.CONTINUE;
-                }
-            });
-        }
-        catch (IOException e)
-        {
-            logger.error("Error while getting {} folder size. {}", folder, e);
-        }
-        return sizeArr[0];
-    }
-
-    public static void copyTo(DataInput in, OutputStream out, int length) throws IOException
-    {
-        byte[] buffer = new byte[64 * 1024];
-        int copiedBytes = 0;
-
-        while (copiedBytes + buffer.length < length)
-        {
-            in.readFully(buffer);
-            out.write(buffer);
-            copiedBytes += buffer.length;
-        }
-
-        if (copiedBytes < length)
-        {
-            int left = length - copiedBytes;
-            in.readFully(buffer, 0, left);
-            out.write(buffer, 0, left);
-        }
-    }
-
-    public static boolean isSubDirectory(File parent, File child) throws IOException
-    {
-        parent = parent.getCanonicalFile();
-        child = child.getCanonicalFile();
-
-        File toCheck = child;
-        while (toCheck != null)
-        {
-            if (parent.equals(toCheck))
-                return true;
-            toCheck = toCheck.getParentFile();
-        }
-        return false;
-    }
-
-    public static void append(File file, String ... lines)
-    {
-        if (file.exists())
-            write(file, Arrays.asList(lines), StandardOpenOption.APPEND);
-        else
-            write(file, Arrays.asList(lines), StandardOpenOption.CREATE);
-    }
-
-    public static void appendAndSync(File file, String ... lines)
-    {
-        if (file.exists())
-            write(file, Arrays.asList(lines), StandardOpenOption.APPEND, StandardOpenOption.SYNC);
-        else
-            write(file, Arrays.asList(lines), StandardOpenOption.CREATE, StandardOpenOption.SYNC);
-    }
-
-    public static void replace(File file, String ... lines)
-    {
-        write(file, Arrays.asList(lines), StandardOpenOption.TRUNCATE_EXISTING);
-    }
-
-    public static void write(File file, List<String> lines, StandardOpenOption ... options)
-    {
-        try
-        {
-            Files.write(file.toPath(),
-                    lines,
-                    CHARSET,
-                    options);
-        }
-        catch (IOException ex)
-        {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    public static List<String> readLines(File file)
-    {
-        try
-        {
-            return Files.readAllLines(file.toPath(), CHARSET);
-        }
-        catch (IOException ex)
-        {
-            if (ex instanceof NoSuchFileException)
-                return Collections.emptyList();
-
-            throw new RuntimeException(ex);
-        }
-    }
-
-    public static void setFSErrorHandler(FSErrorHandler handler)
-    {
-        fsErrorHandler.getAndSet(Optional.ofNullable(handler));
-    }
-
-    /**
-     * Returns the size of the specified partition.
-     * <p>This method handles large file system by returning {@code Long.MAX_VALUE} if the  size overflow.
-     * See <a href='https://bugs.openjdk.java.net/browse/JDK-8179320'>JDK-8179320</a> for more information.</p>
-     *
-     * @param file the partition
-     * @return the size, in bytes, of the partition or {@code 0L} if the abstract pathname does not name a partition
-     */
-    public static long getTotalSpace(File file)
-    {
-        return handleLargeFileSystem(file.getTotalSpace());
-    }
-
-    /**
-     * Returns the number of unallocated bytes on the specified partition.
-     * <p>This method handles large file system by returning {@code Long.MAX_VALUE} if the  number of unallocated bytes
-     * overflow. See <a href='https://bugs.openjdk.java.net/browse/JDK-8179320'>JDK-8179320</a> for more information</p>
-     *
-     * @param file the partition
-     * @return the number of unallocated bytes on the partition or {@code 0L}
-     * if the abstract pathname does not name a partition.
-     */
-    public static long getFreeSpace(File file)
-    {
-        return handleLargeFileSystem(file.getFreeSpace());
-    }
-
-    /**
-     * Returns the number of available bytes on the specified partition.
-     * <p>This method handles large file system by returning {@code Long.MAX_VALUE} if the  number of available bytes
-     * overflow. See <a href='https://bugs.openjdk.java.net/browse/JDK-8179320'>JDK-8179320</a> for more information</p>
-     *
-     * @param file the partition
-     * @return the number of available bytes on the partition or {@code 0L}
-     * if the abstract pathname does not name a partition.
-     */
-    public static long getUsableSpace(File file)
-    {
-        return handleLargeFileSystem(file.getUsableSpace());
-    }
-
-    /**
-     * Returns the {@link FileStore} representing the file store where a file
-     * is located. This {@link FileStore} handles large file system by returning {@code Long.MAX_VALUE}
-     * from {@code FileStore#getTotalSpace()}, {@code FileStore#getUnallocatedSpace()} and {@code FileStore#getUsableSpace()}
-     * it the value is bigger than {@code Long.MAX_VALUE}. See <a href='https://bugs.openjdk.java.net/browse/JDK-8162520'>JDK-8162520</a>
-     * for more information.
-     *
-     * @param path the path to the file
-     * @return the file store where the file is stored
-     */
-    public static FileStore getFileStore(Path path) throws IOException
-    {
-        return new SafeFileStore(Files.getFileStore(path));
-    }
-
-    /**
-     * Handle large file system by returning {@code Long.MAX_VALUE} when the size overflows.
-     * @param size returned by the Java's FileStore methods
-     * @return the size or {@code Long.MAX_VALUE} if the size was bigger than {@code Long.MAX_VALUE}
-     */
-    private static long handleLargeFileSystem(long size)
-    {
-        return size < 0 ? Long.MAX_VALUE : size;
-    }
-
-    /**
-     * Private constructor as the class contains only static methods.
-     */
-    private FileUtils()
-    {
-    }
-
-    /**
-     * FileStore decorator used to safely handle large file system.
-     *
-     * <p>Java's FileStore methods (getTotalSpace/getUnallocatedSpace/getUsableSpace) are limited to reporting bytes as
-     * signed long (2^63-1), if the filesystem is any bigger, then the size overflows. {@code SafeFileStore} will
-     * return {@code Long.MAX_VALUE} if the size overflow.</p>
-     *
-     * @see https://bugs.openjdk.java.net/browse/JDK-8162520.
-     */
-    private static final class SafeFileStore extends FileStore
-    {
-        /**
-         * The decorated {@code FileStore}
-         */
-        private final FileStore fileStore;
-
-        public SafeFileStore(FileStore fileStore)
-        {
-            this.fileStore = fileStore;
-        }
-
-        @Override
-        public String name()
-        {
-            return fileStore.name();
-        }
-
-        @Override
-        public String type()
-        {
-            return fileStore.type();
-        }
-
-        @Override
-        public boolean isReadOnly()
-        {
-            return fileStore.isReadOnly();
-        }
-
-        @Override
-        public long getTotalSpace() throws IOException
-        {
-            return handleLargeFileSystem(fileStore.getTotalSpace());
-        }
-
-        @Override
-        public long getUsableSpace() throws IOException
-        {
-            return handleLargeFileSystem(fileStore.getUsableSpace());
-        }
-
-        @Override
-        public long getUnallocatedSpace() throws IOException
-        {
-            return handleLargeFileSystem(fileStore.getUnallocatedSpace());
-        }
-
-        @Override
-        public boolean supportsFileAttributeView(Class<? extends FileAttributeView> type)
-        {
-            return fileStore.supportsFileAttributeView(type);
-        }
-
-        @Override
-        public boolean supportsFileAttributeView(String name)
-        {
-            return fileStore.supportsFileAttributeView(name);
-        }
-
-        @Override
-        public <V extends FileStoreAttributeView> V getFileStoreAttributeView(Class<V> type)
-        {
-            return fileStore.getFileStoreAttributeView(type);
-        }
-
-        @Override
-        public Object getAttribute(String attribute) throws IOException
-        {
-            return fileStore.getAttribute(attribute);
-        }
-    }
-}
diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractNoSqlContainer.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractNoSqlContainer.java
new file mode 100644
index 0000000000..3f7c2c779a
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractNoSqlContainer.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.thingsboard.server.dao;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.junit.ClassRule;
+import org.junit.rules.ExternalResource;
+import org.testcontainers.containers.CassandraContainer;
+import org.testcontainers.containers.delegate.CassandraDatabaseDelegate;
+import org.testcontainers.delegate.DatabaseDelegate;
+import org.testcontainers.ext.ScriptUtils;
+
+import javax.script.ScriptException;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+@Slf4j
+public abstract class AbstractNoSqlContainer {
+
+    public static final List<String> INIT_SCRIPTS = List.of(
+            "cassandra/schema-keyspace.cql",
+            "cassandra/schema-ts.cql",
+            "cassandra/schema-ts-latest.cql"
+    );
+
+    @ClassRule(order = 0)
+    public static final CassandraContainer cassandra = (CassandraContainer) new CassandraContainer("cassandra:4.1") {
+        @Override
+        protected void containerIsStarted(InspectContainerResponse containerInfo) {
+            super.containerIsStarted(containerInfo);
+            DatabaseDelegate db = new CassandraDatabaseDelegate(this);
+            INIT_SCRIPTS.forEach(script -> runInitScriptIfRequired(db, script));
+        }
+
+        private void runInitScriptIfRequired(DatabaseDelegate db, String initScriptPath) {
+            logger().info("Init script [{}]", initScriptPath);
+            if (initScriptPath != null) {
+                try {
+                    URL resource = Thread.currentThread().getContextClassLoader().getResource(initScriptPath);
+                    if (resource == null) {
+                        logger().warn("Could not load classpath init script: {}", initScriptPath);
+                        throw new ScriptUtils.ScriptLoadException("Could not load classpath init script: " + initScriptPath + ". Resource not found.");
+                    }
+                    String cql = IOUtils.toString(resource, StandardCharsets.UTF_8);
+                    ScriptUtils.executeDatabaseScript(db, initScriptPath, cql);
+                } catch (IOException e) {
+                    logger().warn("Could not load classpath init script: {}", initScriptPath);
+                    throw new ScriptUtils.ScriptLoadException("Could not load classpath init script: " + initScriptPath, e);
+                } catch (ScriptException e) {
+                    logger().error("Error while executing init script: {}", initScriptPath, e);
+                    throw new ScriptUtils.UncategorizedScriptException("Error while executing init script: " + initScriptPath, e);
+                }
+            }
+        }
+    }
+            .withEnv("HEAP_NEWSIZE", "64M")
+            .withEnv("MAX_HEAP_SIZE", "512M")
+            .withEnv("CASSANDRA_CLUSTER_NAME", "ThingsBoard Cluster");
+
+    @ClassRule(order = 1)
+    public static ExternalResource resource = new ExternalResource() {
+        @Override
+        protected void before() throws Throwable {
+            cassandra.start();
+            String cassandraUrl = String.format("%s:%s", cassandra.getHost(), cassandra.getMappedPort(9042));
+            log.debug("Cassandra url [{}]", cassandraUrl);
+            System.setProperty("cassandra.url", cassandraUrl);
+        }
+
+        @Override
+        protected void after() {
+            cassandra.stop();
+            List.of("cassandra.url")
+                    .forEach(System.getProperties()::remove);
+        }
+    };
+
+}
diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java
new file mode 100644
index 0000000000..e9a6cb8641
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.ClassRule;
+import org.junit.rules.ExternalResource;
+import org.testcontainers.containers.GenericContainer;
+
+import java.util.List;
+
+@Slf4j
+public class AbstractRedisContainer {
+
+    @ClassRule(order = 0)
+    public static GenericContainer redis = new GenericContainer("redis:7.0")
+            .withExposedPorts(6379);
+
+    @ClassRule(order = 1)
+    public static ExternalResource resource = new ExternalResource() {
+        @Override
+        protected void before() throws Throwable {
+            redis.start();
+            System.setProperty("cache.type", "redis");
+            System.setProperty("redis.connection.type", "standalone");
+            System.setProperty("redis.standalone.host", redis.getHost());
+            System.setProperty("redis.standalone.port", String.valueOf(redis.getMappedPort(6379)));
+        }
+
+        @Override
+        protected void after() {
+            redis.stop();
+            List.of("cache.type", "redis.connection.type", "redis.standalone.host", "redis.standalone.port")
+                    .forEach(System.getProperties()::remove);
+        }
+    };
+
+}
diff --git a/dao/src/test/java/org/thingsboard/server/dao/CustomCassandraCQLUnit.java b/dao/src/test/java/org/thingsboard/server/dao/CustomCassandraCQLUnit.java
deleted file mode 100644
index 7bab5e1138..0000000000
--- a/dao/src/test/java/org/thingsboard/server/dao/CustomCassandraCQLUnit.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright © 2016-2023 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao;
-
-import com.datastax.oss.driver.api.core.CqlSession;
-import org.cassandraunit.BaseCassandraUnit;
-import org.cassandraunit.CQLDataLoader;
-import org.cassandraunit.dataset.CQLDataSet;
-import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
-
-import java.util.List;
-
-public class CustomCassandraCQLUnit extends BaseCassandraUnit {
-    protected List<CQLDataSet> dataSets;
-
-    public CqlSession session;
-
-    public CustomCassandraCQLUnit(List<CQLDataSet> dataSets) {
-        this.dataSets = dataSets;
-    }
-
-    public CustomCassandraCQLUnit(List<CQLDataSet> dataSets, int readTimeoutMillis) {
-        this.dataSets = dataSets;
-        this.readTimeoutMillis = readTimeoutMillis;
-    }
-
-    public CustomCassandraCQLUnit(List<CQLDataSet> dataSets, String configurationFileName) {
-        this(dataSets);
-        this.configurationFileName = configurationFileName;
-    }
-
-    public CustomCassandraCQLUnit(List<CQLDataSet> dataSets, String configurationFileName, int readTimeoutMillis) {
-        this(dataSets);
-        this.configurationFileName = configurationFileName;
-        this.readTimeoutMillis = readTimeoutMillis;
-    }
-
-    public CustomCassandraCQLUnit(List<CQLDataSet> dataSets, String configurationFileName, long startUpTimeoutMillis) {
-        super(startUpTimeoutMillis);
-        this.dataSets = dataSets;
-        this.configurationFileName = configurationFileName;
-    }
-
-    public CustomCassandraCQLUnit(List<CQLDataSet> dataSets, String configurationFileName, long startUpTimeoutMillis, int readTimeoutMillis) {
-        super(startUpTimeoutMillis);
-        this.dataSets = dataSets;
-        this.configurationFileName = configurationFileName;
-        this.readTimeoutMillis = readTimeoutMillis;
-    }
-
-    @Override
-    protected void load() {
-        session = EmbeddedCassandraServerHelper.getSession();
-        CQLDataLoader dataLoader = new CQLDataLoader(session);
-        dataSets.forEach(dataLoader::load);
-        session = dataLoader.getSession();
-        System.setSecurityManager(null);
-    }
-
-    @Override
-    protected void after() {
-        super.after();
-        try (CqlSession s = session) {
-            session = null;
-        }
-        System.setSecurityManager(null);
-    }
-
-    // Getters for those who do not like to directly access fields
-
-    public CqlSession getSession() {
-        return session;
-    }
-
-}
diff --git a/dao/src/test/java/org/thingsboard/server/dao/NoSqlDaoServiceTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/NoSqlDaoServiceTestSuite.java
index 1cc88f5734..9f82b8735a 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/NoSqlDaoServiceTestSuite.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/NoSqlDaoServiceTestSuite.java
@@ -15,28 +15,14 @@
  */
 package org.thingsboard.server.dao;
 
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
 import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters;
 import org.junit.runner.RunWith;
 
-import java.util.Arrays;
-
 @RunWith(ClasspathSuite.class)
 @ClassnameFilters({
         "org.thingsboard.server.dao.service.*.nosql.*ServiceNoSqlTest",
 })
-public class NoSqlDaoServiceTestSuite {
-
-    @ClassRule
-    public static CustomCassandraCQLUnit cassandraUnit =
-            new CustomCassandraCQLUnit(
-                    Arrays.asList(
-                            new ClassPathCQLDataSet("cassandra/schema-keyspace.cql", false, false),
-                            new ClassPathCQLDataSet("cassandra/schema-ts.cql", false, false),
-                            new ClassPathCQLDataSet("cassandra/schema-ts-latest.cql", false, false)
-                    ),
-                    "cassandra-test.yaml", 30000L);
+public class NoSqlDaoServiceTestSuite extends AbstractNoSqlContainer {
 
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/RedisSqlTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/RedisSqlTestSuite.java
index 2fa63f2387..61f77ee1b7 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/RedisSqlTestSuite.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/RedisSqlTestSuite.java
@@ -15,37 +15,15 @@
  */
 package org.thingsboard.server.dao;
 
-import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
 import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters;
 import org.junit.runner.RunWith;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.support.TestPropertySourceUtils;
-import org.testcontainers.containers.GenericContainer;
 
-@ContextConfiguration(initializers = RedisSqlTestSuite.class)
 @RunWith(ClasspathSuite.class)
 @ClassnameFilters(
         //All the same tests using redis instead of caffeine.
         "org.thingsboard.server.dao.service.*ServiceSqlTest"
 )
-public class RedisSqlTestSuite implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-
-    @ClassRule
-    public static GenericContainer redis = new GenericContainer("redis:4.0").withExposedPorts(6379);
-
-    @Override
-    public void initialize(ConfigurableApplicationContext applicationContext) {
-        TestPropertySourceUtils.addInlinedPropertiesToEnvironment(
-                applicationContext, "cache.type=redis");
-        TestPropertySourceUtils.addInlinedPropertiesToEnvironment(
-                applicationContext, "redis.connection.type=standalone");
-        TestPropertySourceUtils.addInlinedPropertiesToEnvironment(
-                applicationContext, "redis.standalone.host=localhost");
-        TestPropertySourceUtils.addInlinedPropertiesToEnvironment(
-                applicationContext, "redis.standalone.port=" + redis.getMappedPort(6379));
-    }
+public class RedisSqlTestSuite extends AbstractRedisContainer {
 
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java
index 1905a0b784..c839b8ed69 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java
@@ -19,6 +19,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.dao.exception.DataValidationException;
 
@@ -54,17 +55,21 @@ public abstract class BaseAdminSettingsServiceTest extends AbstractServiceTest {
         Assert.assertEquals(adminSettings.getJsonValue(), savedAdminSettings.getJsonValue());
     }
     
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveAdminSettingsWithEmptyKey() {
         AdminSettings adminSettings = adminSettingsService.findAdminSettingsByKey(SYSTEM_TENANT_ID, "mail");
         adminSettings.setKey(null);
-        adminSettingsService.saveAdminSettings(SYSTEM_TENANT_ID, adminSettings);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            adminSettingsService.saveAdminSettings(SYSTEM_TENANT_ID, adminSettings);
+        });
     }
     
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testChangeAdminSettingsKey() {
         AdminSettings adminSettings = adminSettingsService.findAdminSettingsByKey(SYSTEM_TENANT_ID, "mail");
         adminSettings.setKey("newKey");
-        adminSettingsService.saveAdminSettings(SYSTEM_TENANT_ID, adminSettings);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            adminSettingsService.saveAdminSettings(SYSTEM_TENANT_ID, adminSettings);
+        });
     }
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java
index 00eba295ae..688793d6c6 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java
@@ -58,7 +58,7 @@ public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest {
 
         alarm = Alarm.builder().tenantId(tenantId).originator(new AssetId(Uuids.timeBased()))
                 .type(TEST_ALARM)
-                .severity(AlarmSeverity.CRITICAL).status(AlarmStatus.ACTIVE_UNACK)
+                .severity(AlarmSeverity.CRITICAL)
                 .startTs(System.currentTimeMillis()).build();
         alarm = alarmService.createOrUpdateAlarm(alarm).getAlarm();
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java
index dca45f100e..b7f5135533 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java
@@ -20,20 +20,25 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmPropagationInfo;
 import org.thingsboard.server.common.data.alarm.AlarmQuery;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.id.AssetId;
-import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.SortOrder;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.query.AlarmData;
@@ -45,8 +50,9 @@ import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.EntityKeyType;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 import org.thingsboard.server.dao.alarm.AlarmOperationResult;
-import org.thingsboard.common.util.JacksonUtil;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -56,6 +62,11 @@ import java.util.concurrent.ExecutionException;
 public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
 
     public static final String TEST_ALARM = "TEST_ALARM";
+
+    private static final String TEST_TENANT_EMAIL = "testtenant@thingsboard.org";
+    private static final String TEST_TENANT_FIRST_NAME = "testtenantfirstname";
+    private static final String TEST_TENANT_LAST_NAME = "testtenantlastname";
+
     private TenantId tenantId;
 
     @Before
@@ -83,12 +94,12 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         Assert.assertTrue(relationService.saveRelationAsync(tenantId, relation).get());
 
         long ts = System.currentTimeMillis();
-        Alarm alarm = Alarm.builder().tenantId(tenantId).originator(childId)
+        AlarmApiCallResult result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .originator(childId)
                 .type(TEST_ALARM)
-                .severity(AlarmSeverity.CRITICAL).status(AlarmStatus.ACTIVE_UNACK)
-                .startTs(ts).build();
-
-        AlarmOperationResult result = alarmService.createOrUpdateAlarm(alarm);
+                .severity(AlarmSeverity.CRITICAL)
+                .startTs(ts).build());
         Alarm created = result.getAlarm();
 
         Assert.assertNotNull(created);
@@ -107,7 +118,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         Assert.assertEquals(0L, created.getAckTs());
         Assert.assertEquals(0L, created.getClearTs());
 
-        Alarm fetched = alarmService.findAlarmByIdAsync(tenantId, created.getId()).get();
+        Alarm fetched = alarmService.findAlarmInfoById(tenantId, created.getId());
         Assert.assertEquals(created, fetched);
     }
 
@@ -121,14 +132,13 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         Assert.assertTrue(relationService.saveRelationAsync(tenantId, relation).get());
 
         long ts = System.currentTimeMillis();
-        Alarm alarm = Alarm.builder().tenantId(tenantId).originator(childId)
+        AlarmApiCallResult result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .originator(childId)
                 .type(TEST_ALARM)
-                .propagate(false)
-                .severity(AlarmSeverity.CRITICAL).status(AlarmStatus.ACTIVE_UNACK)
-                .startTs(ts).build();
-
-        AlarmOperationResult result = alarmService.createOrUpdateAlarm(alarm);
-        Alarm created = result.getAlarm();
+                .severity(AlarmSeverity.CRITICAL)
+                .startTs(ts).build());
+        AlarmInfo created = result.getAlarm();
 
         // Check child relation
         PageData<AlarmInfo> alarms = alarmService.findAlarms(tenantId, AlarmQuery.builder()
@@ -139,7 +149,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
                 ).build()).get();
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, alarms.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
 
         // Check parent relation
         alarms = alarmService.findAlarms(tenantId, AlarmQuery.builder()
@@ -152,7 +162,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         Assert.assertEquals(0, alarms.getData().size());
 
         created.setPropagate(true);
-        result = alarmService.createOrUpdateAlarm(created);
+        result = alarmService.updateAlarm(AlarmUpdateRequest.fromAlarm(created));
         created = result.getAlarm();
 
         // Check child relation
@@ -164,7 +174,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
                 ).build()).get();
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, alarms.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
 
         // Check parent relation
         alarms = alarmService.findAlarms(tenantId, AlarmQuery.builder()
@@ -175,10 +185,10 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
                 ).build()).get();
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, alarms.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
 
-        alarmService.ackAlarm(tenantId, created.getId(), System.currentTimeMillis()).get();
-        created = alarmService.findAlarmByIdAsync(tenantId, created.getId()).get();
+        alarmService.acknowledgeAlarm(tenantId, created.getId(), System.currentTimeMillis());
+        created = alarmService.findAlarmInfoById(tenantId, created.getId());
 
         alarms = alarmService.findAlarms(tenantId, AlarmQuery.builder()
                 .affectedEntityId(childId)
@@ -188,7 +198,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
                 ).build()).get();
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, alarms.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
 
         // Check not existing relation
         alarms = alarmService.findAlarms(tenantId, AlarmQuery.builder()
@@ -200,8 +210,8 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(0, alarms.getData().size());
 
-        alarmService.clearAlarm(tenantId, created.getId(), null, System.currentTimeMillis()).get();
-        created = alarmService.findAlarmByIdAsync(tenantId, created.getId()).get();
+        alarmService.clearAlarm(tenantId, created.getId(), System.currentTimeMillis(), null);
+        created = alarmService.findAlarmInfoById(tenantId, created.getId());
 
         alarms = alarmService.findAlarms(tenantId, AlarmQuery.builder()
                 .affectedEntityId(childId)
@@ -211,7 +221,77 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
                 ).build()).get();
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
+    }
+
+    @Test
+    public void testFindAssignedAlarm() throws ExecutionException, InterruptedException {
+
+        AssetId parentId = new AssetId(Uuids.timeBased());
+        AssetId childId = new AssetId(Uuids.timeBased());
+
+        EntityRelation relation = new EntityRelation(parentId, childId, EntityRelation.CONTAINS_TYPE);
+
+        Assert.assertTrue(relationService.saveRelation(tenantId, relation));
+
+        long ts = System.currentTimeMillis();
+        AlarmApiCallResult result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .originator(childId)
+                .type(TEST_ALARM)
+                .severity(AlarmSeverity.CRITICAL)
+                .startTs(ts).build());
+
+        AlarmInfo created = result.getAlarm();
+
+        User tenantUser = new User();
+        tenantUser.setTenantId(tenantId);
+        tenantUser.setAuthority(Authority.TENANT_ADMIN);
+        tenantUser.setEmail(TEST_TENANT_EMAIL);
+        tenantUser.setFirstName(TEST_TENANT_FIRST_NAME);
+        tenantUser.setLastName(TEST_TENANT_LAST_NAME);
+        tenantUser = userService.saveUser(tenantUser);
+
+        Assert.assertNotNull(tenantUser);
+
+        AlarmApiCallResult assignmentResult = alarmService.assignAlarm(tenantId, created.getId(), tenantUser.getId(), ts);
+        created = assignmentResult.getAlarm();
+
+        PageData<AlarmInfo> alarms = alarmService.findAlarms(tenantId, AlarmQuery.builder()
+                .assigneeId(tenantUser.getId())
+                .fetchOriginator(true)
+                .pageLink(new TimePageLink(1, 0, "",
+                        new SortOrder("createdTime", SortOrder.Direction.DESC), 0L, System.currentTimeMillis())
+                ).build()).get();
+        Assert.assertNotNull(alarms.getData());
+        Assert.assertEquals(1, alarms.getData().size());
         Assert.assertEquals(created, alarms.getData().get(0));
+
+        AlarmDataPageLink pageLink = new AlarmDataPageLink();
+        pageLink.setPage(0);
+        pageLink.setPageSize(10);
+        pageLink.setAssigneeId(tenantUser.getId());
+
+        PageData<AlarmData> assignedAlarms = alarmService.findAlarmDataByQueryForEntities(tenantId, toQuery(pageLink), Collections.singletonList(created.getOriginator()));
+        Assert.assertNotNull(assignedAlarms.getData());
+        Assert.assertEquals(1, assignedAlarms.getData().size());
+        Assert.assertEquals(created, new AlarmInfo(assignedAlarms.getData().get(0)));
+
+        User tenantUser2 = new User();
+        tenantUser2.setTenantId(tenantId);
+        tenantUser2.setAuthority(Authority.TENANT_ADMIN);
+        tenantUser2.setEmail(2 + TEST_TENANT_EMAIL);
+        tenantUser2.setFirstName(TEST_TENANT_FIRST_NAME);
+        tenantUser2.setLastName(TEST_TENANT_LAST_NAME);
+        tenantUser2 = userService.saveUser(tenantUser2);
+
+        Assert.assertNotNull(tenantUser2);
+        pageLink.setAssigneeId(tenantUser2.getId());
+
+        PageData<AlarmData> assignedToNonExistingUserAlarms = alarmService.findAlarmDataByQueryForEntities(tenantId, toQuery(pageLink), Collections.singletonList(created.getOriginator()));
+        Assert.assertNotNull(assignedToNonExistingUserAlarms.getData());
+        Assert.assertTrue(assignedToNonExistingUserAlarms.getData().isEmpty());
+
     }
 
     @Test
@@ -235,23 +315,23 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         customerDevice = deviceService.saveDevice(customerDevice);
 
         long ts = System.currentTimeMillis();
-        Alarm tenantAlarm = Alarm.builder().tenantId(tenantId)
+        AlarmApiCallResult result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
                 .originator(tenantDevice.getId())
                 .type(TEST_ALARM)
-                .propagate(true)
-                .severity(AlarmSeverity.CRITICAL).status(AlarmStatus.ACTIVE_UNACK)
-                .startTs(ts).build();
-        AlarmOperationResult result = alarmService.createOrUpdateAlarm(tenantAlarm);
-        tenantAlarm = result.getAlarm();
+                .severity(AlarmSeverity.CRITICAL)
+                .propagation(AlarmPropagationInfo.builder().propagate(true).build())
+                .startTs(ts).build());
+        AlarmInfo tenantAlarm = result.getAlarm();
 
-        Alarm deviceAlarm = Alarm.builder().tenantId(tenantId)
+        result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
                 .originator(customerDevice.getId())
                 .type(TEST_ALARM)
-                .propagate(true)
-                .severity(AlarmSeverity.CRITICAL).status(AlarmStatus.ACTIVE_UNACK)
-                .startTs(ts).build();
-        result = alarmService.createOrUpdateAlarm(deviceAlarm);
-        deviceAlarm = result.getAlarm();
+                .severity(AlarmSeverity.CRITICAL)
+                .propagation(AlarmPropagationInfo.builder().propagate(true).build())
+                .startTs(ts).build());
+        AlarmInfo deviceAlarm = result.getAlarm();
 
         AlarmDataPageLink pageLink = new AlarmDataPageLink();
         pageLink.setPage(0);
@@ -269,7 +349,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
 
         PageData<AlarmData> customerAlarms = alarmService.findAlarmDataByQueryForEntities(tenantId, toQuery(pageLink), Collections.singletonList(customerDevice.getId()));
         Assert.assertEquals(1, customerAlarms.getData().size());
-        Assert.assertEquals(deviceAlarm, customerAlarms.getData().get(0));
+        Assert.assertEquals(deviceAlarm, new AlarmInfo(customerAlarms.getData().get(0)));
 
         PageData<AlarmInfo> alarms = alarmService.findAlarms(tenantId, AlarmQuery.builder()
                 .affectedEntityId(tenantDevice.getId())
@@ -279,7 +359,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
                 ).build()).get();
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(tenantAlarm, alarms.getData().get(0));
+        Assert.assertEquals(tenantAlarm, new AlarmInfo(alarms.getData().get(0)));
     }
 
     @Test
@@ -311,23 +391,21 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         relationService.saveRelation(tenantId, relation);
 
         long ts = System.currentTimeMillis();
-        Alarm tenantAlarm = Alarm.builder().tenantId(tenantId)
+        alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
                 .originator(tenantDevice.getId())
                 .type("Not Propagated")
-                .propagate(false)
-                .severity(AlarmSeverity.CRITICAL).status(AlarmStatus.ACTIVE_UNACK)
-                .startTs(ts).build();
-        AlarmOperationResult result = alarmService.createOrUpdateAlarm(tenantAlarm);
-        tenantAlarm = result.getAlarm();
+                .severity(AlarmSeverity.CRITICAL)
+                .startTs(ts).build());
 
-        Alarm customerAlarm = Alarm.builder().tenantId(tenantId)
+        AlarmApiCallResult result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
                 .originator(tenantDevice.getId())
                 .type("Propagated")
-                .propagate(true)
-                .severity(AlarmSeverity.CRITICAL).status(AlarmStatus.ACTIVE_UNACK)
-                .startTs(ts).build();
-        result = alarmService.createOrUpdateAlarm(customerAlarm);
-        customerAlarm = result.getAlarm();
+                .severity(AlarmSeverity.CRITICAL)
+                .propagation(AlarmPropagationInfo.builder().propagate(true).build())
+                .startTs(ts).build());
+        AlarmInfo customerAlarm = result.getAlarm();
 
         AlarmDataPageLink pageLink = new AlarmDataPageLink();
         pageLink.setPage(0);
@@ -343,7 +421,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         //TEST that propagated alarms are visible on the asset level.
         PageData<AlarmData> customerAlarms = alarmService.findAlarmDataByQueryForEntities(tenantId, toQuery(pageLink), Collections.singletonList(customerAsset.getId()));
         Assert.assertEquals(1, customerAlarms.getData().size());
-        Assert.assertEquals(customerAlarm, customerAlarms.getData().get(0));
+        Assert.assertEquals(customerAlarm, new AlarmInfo(customerAlarms.getData().get(0)));
     }
 
     @Test
@@ -361,24 +439,24 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         device = deviceService.saveDevice(device);
 
         long ts = System.currentTimeMillis();
-        Alarm tenantAlarm = Alarm.builder().tenantId(tenantId)
+
+        AlarmApiCallResult result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
                 .originator(device.getId())
                 .type("Propagated To Tenant")
-                .propagateToTenant(true)
-                .severity(AlarmSeverity.CRITICAL).status(AlarmStatus.ACTIVE_UNACK)
-                .startTs(ts).build();
-        AlarmOperationResult result = alarmService.createOrUpdateAlarm(tenantAlarm);
-        tenantAlarm = result.getAlarm();
+                .severity(AlarmSeverity.CRITICAL)
+                .propagation(AlarmPropagationInfo.builder().propagateToTenant(true).build())
+                .startTs(ts).build());
+        AlarmInfo tenantAlarm = result.getAlarm();
 
-        Alarm customerAlarm = Alarm.builder().tenantId(tenantId)
+        result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
                 .originator(device.getId())
                 .type("Propagated to Customer")
-                .propagate(false)
-                .propagateToOwner(true)
-                .severity(AlarmSeverity.CRITICAL).status(AlarmStatus.ACTIVE_UNACK)
-                .startTs(ts).build();
-        result = alarmService.createOrUpdateAlarm(customerAlarm);
-        customerAlarm = result.getAlarm();
+                .severity(AlarmSeverity.CRITICAL)
+                .propagation(AlarmPropagationInfo.builder().propagateToOwner(true).build())
+                .startTs(ts).build());
+        AlarmInfo customerAlarm = result.getAlarm();
 
         AlarmDataPageLink pageLink = new AlarmDataPageLink();
         pageLink.setPage(0);
@@ -389,24 +467,24 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         pageLink.setEndTs(System.currentTimeMillis());
         pageLink.setSearchPropagatedAlarms(true);
         pageLink.setSeverityList(Arrays.asList(AlarmSeverity.CRITICAL, AlarmSeverity.WARNING));
-        pageLink.setStatusList(Arrays.asList(AlarmSearchStatus.ACTIVE));
+        pageLink.setStatusList(Collections.singletonList(AlarmSearchStatus.ACTIVE));
 
         //TEST that propagated alarms are visible on the asset level.
         PageData<AlarmData> tenantAlarms = alarmService.findAlarmDataByQueryForEntities(tenantId, toQuery(pageLink), Collections.singletonList(tenantId));
         Assert.assertEquals(1, tenantAlarms.getData().size());
-        Assert.assertEquals(tenantAlarm, tenantAlarms.getData().get(0));
+        Assert.assertEquals(tenantAlarm, new AlarmInfo(tenantAlarms.getData().get(0)));
 
         //TEST that propagated alarms are visible on the asset level.
         PageData<AlarmData> customerAlarms = alarmService.findAlarmDataByQueryForEntities(tenantId, toQuery(pageLink), Collections.singletonList(customer.getId()));
         Assert.assertEquals(1, customerAlarms.getData().size());
-        Assert.assertEquals(customerAlarm, customerAlarms.getData().get(0));
+        Assert.assertEquals(customerAlarm, new AlarmInfo(customerAlarms.getData().get(0)));
     }
 
-    private AlarmDataQuery toQuery(AlarmDataPageLink pageLink){
+    private AlarmDataQuery toQuery(AlarmDataPageLink pageLink) {
         return toQuery(pageLink, Collections.emptyList());
     }
 
-    private AlarmDataQuery toQuery(AlarmDataPageLink pageLink, List<EntityKey> alarmFields){
+    private AlarmDataQuery toQuery(AlarmDataPageLink pageLink, List<EntityKey> alarmFields) {
         return new AlarmDataQuery(new DeviceTypeFilter(), pageLink, null, null, null, alarmFields);
     }
 
@@ -425,45 +503,41 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         customerDevice = deviceService.saveDevice(customerDevice);
 
         // no one alarms was created
-        Assert.assertNull(alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), null, null));
+        Assert.assertNull(alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), null, null, null));
 
-        Alarm alarm1 = Alarm.builder()
+        AlarmApiCallResult result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
                 .tenantId(tenantId)
                 .originator(customerDevice.getId())
                 .type(TEST_ALARM)
                 .severity(AlarmSeverity.MAJOR)
-                .status(AlarmStatus.ACTIVE_UNACK)
-                .startTs(System.currentTimeMillis())
-                .build();
-        alarm1 = alarmService.createOrUpdateAlarm(alarm1).getAlarm();
-        alarmService.clearAlarm(tenantId, alarm1.getId(), null, System.currentTimeMillis()).get();
+                .startTs(System.currentTimeMillis()).build());
+        AlarmInfo alarm1 = result.getAlarm();
+        alarmService.clearAlarm(tenantId, alarm1.getId(), System.currentTimeMillis(), null);
 
-        Alarm alarm2 = Alarm.builder()
+        result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
                 .tenantId(tenantId)
                 .originator(customerDevice.getId())
                 .type(TEST_ALARM)
                 .severity(AlarmSeverity.MINOR)
-                .status(AlarmStatus.ACTIVE_ACK)
-                .startTs(System.currentTimeMillis())
-                .build();
-        alarm2 = alarmService.createOrUpdateAlarm(alarm2).getAlarm();
-        alarmService.clearAlarm(tenantId, alarm2.getId(), null, System.currentTimeMillis()).get();
+                .startTs(System.currentTimeMillis()).build());
+        AlarmInfo alarm2 = result.getAlarm();
+        alarmService.acknowledgeAlarm(tenantId, alarm2.getId(), System.currentTimeMillis());
+        alarmService.clearAlarm(tenantId, alarm2.getId(), System.currentTimeMillis(), null);
 
-        Alarm alarm3 = Alarm.builder()
+        result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
                 .tenantId(tenantId)
                 .originator(customerDevice.getId())
                 .type(TEST_ALARM)
                 .severity(AlarmSeverity.CRITICAL)
-                .status(AlarmStatus.ACTIVE_ACK)
-                .startTs(System.currentTimeMillis())
-                .build();
-        alarm3 = alarmService.createOrUpdateAlarm(alarm3).getAlarm();
-
-        Assert.assertEquals(AlarmSeverity.MAJOR, alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), AlarmSearchStatus.UNACK, null));
-        Assert.assertEquals(AlarmSeverity.CRITICAL, alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), null, null));
-        Assert.assertEquals(AlarmSeverity.MAJOR, alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), null, AlarmStatus.CLEARED_UNACK));
-        Assert.assertEquals(AlarmSeverity.CRITICAL, alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), AlarmSearchStatus.ACTIVE, null));
-        Assert.assertEquals(AlarmSeverity.MINOR, alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), null, AlarmStatus.CLEARED_ACK));
+                .startTs(System.currentTimeMillis()).build());
+        AlarmInfo alarm3 = result.getAlarm();
+        alarmService.acknowledgeAlarm(tenantId, alarm3.getId(), System.currentTimeMillis());
+
+        Assert.assertEquals(AlarmSeverity.MAJOR, alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), AlarmSearchStatus.UNACK, null, null));
+        Assert.assertEquals(AlarmSeverity.CRITICAL, alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), null, null, null));
+        Assert.assertEquals(AlarmSeverity.MAJOR, alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), null, AlarmStatus.CLEARED_UNACK, null));
+        Assert.assertEquals(AlarmSeverity.CRITICAL, alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), AlarmSearchStatus.ACTIVE, null, null));
+        Assert.assertEquals(AlarmSeverity.MINOR, alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), null, AlarmStatus.CLEARED_ACK, null));
     }
 
     @Test
@@ -479,15 +553,13 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         Assert.assertTrue(relationService.saveRelationAsync(tenantId, relation2).get());
 
         long ts = System.currentTimeMillis();
-        Alarm alarm = Alarm.builder().tenantId(tenantId).originator(childId)
+        AlarmApiCallResult result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .originator(childId)
                 .type(TEST_ALARM)
-                .propagate(false)
                 .severity(AlarmSeverity.CRITICAL)
-                .status(AlarmStatus.ACTIVE_UNACK)
-                .startTs(ts).build();
-
-        AlarmOperationResult result = alarmService.createOrUpdateAlarm(alarm);
-        Alarm created = result.getAlarm();
+                .startTs(ts).build());
+        AlarmInfo created = result.getAlarm();
 
         AlarmDataPageLink pageLink = new AlarmDataPageLink();
         pageLink.setPage(0);
@@ -504,7 +576,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
 
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, alarms.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
 
         pageLink.setPage(0);
         pageLink.setPageSize(10);
@@ -519,17 +591,17 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, toQuery(pageLink), Collections.singletonList(childId));
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, new Alarm(alarms.getData().get(0)));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
 
         pageLink.setSearchPropagatedAlarms(true);
         alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, toQuery(pageLink), Collections.singletonList(childId));
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, new Alarm(alarms.getData().get(0)));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
 
         // Check child relation
         created.setPropagate(true);
-        result = alarmService.createOrUpdateAlarm(created);
+        result = alarmService.updateAlarm(AlarmUpdateRequest.fromAlarm(created));
         created = result.getAlarm();
 
         // Check child relation
@@ -546,7 +618,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, toQuery(pageLink), Collections.singletonList(childId));
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, alarms.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
 
         // Check parent relation
         pageLink.setPage(0);
@@ -562,37 +634,40 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, toQuery(pageLink), Collections.singletonList(parentId));
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, alarms.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
 
         PageData<AlarmInfo> alarmsInfoData = alarmService.findAlarms(tenantId, AlarmQuery.builder()
                 .affectedEntityId(childId)
+                .fetchOriginator(true)
                 .status(AlarmStatus.ACTIVE_UNACK).pageLink(
                         new TimePageLink(10, 0, "",
                                 new SortOrder("createdTime", SortOrder.Direction.DESC), 0L, System.currentTimeMillis())
                 ).build()).get();
         Assert.assertNotNull(alarmsInfoData.getData());
         Assert.assertEquals(1, alarmsInfoData.getData().size());
-        Assert.assertEquals(created, alarmsInfoData.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarmsInfoData.getData().get(0)));
 
         alarmsInfoData = alarmService.findAlarms(tenantId, AlarmQuery.builder()
                 .affectedEntityId(parentId)
+                .fetchOriginator(true)
                 .status(AlarmStatus.ACTIVE_UNACK).pageLink(
                         new TimePageLink(10, 0, "",
                                 new SortOrder("createdTime", SortOrder.Direction.DESC), 0L, System.currentTimeMillis())
                 ).build()).get();
         Assert.assertNotNull(alarmsInfoData.getData());
         Assert.assertEquals(1, alarmsInfoData.getData().size());
-        Assert.assertEquals(created, alarmsInfoData.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarmsInfoData.getData().get(0)));
 
         alarmsInfoData = alarmService.findAlarms(tenantId, AlarmQuery.builder()
                 .affectedEntityId(parentId2)
+                .fetchOriginator(true)
                 .status(AlarmStatus.ACTIVE_UNACK).pageLink(
                         new TimePageLink(10, 0, "",
                                 new SortOrder("createdTime", SortOrder.Direction.DESC), 0L, System.currentTimeMillis())
                 ).build()).get();
         Assert.assertNotNull(alarmsInfoData.getData());
         Assert.assertEquals(1, alarmsInfoData.getData().size());
-        Assert.assertEquals(created, alarmsInfoData.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarmsInfoData.getData().get(0)));
 
         pageLink.setPage(0);
         pageLink.setPageSize(10);
@@ -607,10 +682,9 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, toQuery(pageLink), Collections.singletonList(parentId));
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, alarms.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
 
-        alarmService.ackAlarm(tenantId, created.getId(), System.currentTimeMillis()).get();
-        created = alarmService.findAlarmByIdAsync(tenantId, created.getId()).get();
+        created = alarmService.acknowledgeAlarm(tenantId, created.getId(), System.currentTimeMillis()).getAlarm();
 
         pageLink.setPage(0);
         pageLink.setPageSize(10);
@@ -625,7 +699,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, toQuery(pageLink), Collections.singletonList(childId));
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, alarms.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
     }
 
     @Test
@@ -635,17 +709,17 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
 
         EntityRelation relation = new EntityRelation(parentId, childId, EntityRelation.CONTAINS_TYPE);
 
-        Assert.assertTrue(relationService.saveRelationAsync(tenantId, relation).get());
+        Assert.assertTrue(relationService.saveRelation(tenantId, relation));
 
         long ts = System.currentTimeMillis();
-        Alarm alarm = Alarm.builder().tenantId(tenantId).originator(childId)
+        AlarmApiCallResult result = alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .originator(childId)
                 .type(TEST_ALARM)
-                .propagate(true)
-                .severity(AlarmSeverity.CRITICAL).status(AlarmStatus.ACTIVE_UNACK)
-                .startTs(ts).build();
-
-        AlarmOperationResult result = alarmService.createOrUpdateAlarm(alarm);
-        Alarm created = result.getAlarm();
+                .severity(AlarmSeverity.CRITICAL)
+                .propagation(AlarmPropagationInfo.builder().propagate(true).build())
+                .startTs(ts).build());
+        AlarmInfo created = result.getAlarm();
 
         PageData<AlarmInfo> alarms = alarmService.findAlarms(tenantId, AlarmQuery.builder()
                 .affectedEntityId(childId)
@@ -655,7 +729,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
                 ).build()).get();
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, alarms.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
 
         // Check parent relation
         alarms = alarmService.findAlarms(tenantId, AlarmQuery.builder()
@@ -666,7 +740,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
                 ).build()).get();
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
-        Assert.assertEquals(created, alarms.getData().get(0));
+        Assert.assertEquals(created, new AlarmInfo(alarms.getData().get(0)));
 
         Assert.assertTrue("Alarm was not deleted when expected", alarmService.deleteAlarm(tenantId, created.getId()).isSuccessful());
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java
index ea0d9abedf..091b309269 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java
@@ -23,6 +23,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.asset.Asset;
@@ -150,22 +151,26 @@ public abstract class BaseAssetProfileServiceTest extends AbstractServiceTest {
         Assert.assertEquals(savedAssetProfile2.getId(), defaultAssetProfile.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveAssetProfileWithEmptyName() {
         AssetProfile assetProfile = new AssetProfile();
         assetProfile.setTenantId(tenantId);
-        assetProfileService.saveAssetProfile(assetProfile);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            assetProfileService.saveAssetProfile(assetProfile);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveAssetProfileWithSameName() {
         AssetProfile assetProfile = this.createAssetProfile(tenantId, "Asset Profile");
         assetProfileService.saveAssetProfile(assetProfile);
         AssetProfile assetProfile2 = this.createAssetProfile(tenantId, "Asset Profile");
-        assetProfileService.saveAssetProfile(assetProfile2);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            assetProfileService.saveAssetProfile(assetProfile2);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testDeleteAssetProfileWithExistingAsset() {
         AssetProfile assetProfile = this.createAssetProfile(tenantId, "Asset Profile");
         AssetProfile savedAssetProfile = assetProfileService.saveAssetProfile(assetProfile);
@@ -174,7 +179,9 @@ public abstract class BaseAssetProfileServiceTest extends AbstractServiceTest {
         asset.setName("Test asset");
         asset.setAssetProfileId(savedAssetProfile.getId());
         assetService.saveAsset(asset);
-        assetProfileService.deleteAssetProfile(tenantId, savedAssetProfile.getId());
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            assetProfileService.deleteAssetProfile(tenantId, savedAssetProfile.getId());
+        });
     }
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetServiceTest.java
index 9fe9752a85..108fcb70d9 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetServiceTest.java
@@ -20,6 +20,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.StringUtils;
@@ -83,63 +84,73 @@ public abstract class BaseAssetServiceTest extends AbstractServiceTest {
         assetService.deleteAsset(tenantId, savedAsset.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveAssetWithEmptyName() {
         Asset asset = new Asset();
         asset.setTenantId(tenantId);
         asset.setType("default");
-        assetService.saveAsset(asset);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            assetService.saveAsset(asset);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveAssetWithEmptyTenant() {
         Asset asset = new Asset();
         asset.setName("My asset");
         asset.setType("default");
-        assetService.saveAsset(asset);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            assetService.saveAsset(asset);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveAssetWithInvalidTenant() {
         Asset asset = new Asset();
         asset.setName("My asset");
         asset.setType("default");
         asset.setTenantId(TenantId.fromUUID(Uuids.timeBased()));
-        assetService.saveAsset(asset);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            assetService.saveAsset(asset);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testAssignAssetToNonExistentCustomer() {
         Asset asset = new Asset();
         asset.setName("My asset");
         asset.setType("default");
         asset.setTenantId(tenantId);
-        asset = assetService.saveAsset(asset);
+        Asset savedAsset = assetService.saveAsset(asset);
         try {
-            assetService.assignAssetToCustomer(tenantId, asset.getId(), new CustomerId(Uuids.timeBased()));
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                assetService.assignAssetToCustomer(tenantId, savedAsset.getId(), new CustomerId(Uuids.timeBased()));
+            });
         } finally {
-            assetService.deleteAsset(tenantId, asset.getId());
+            assetService.deleteAsset(tenantId, savedAsset.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testAssignAssetToCustomerFromDifferentTenant() {
         Asset asset = new Asset();
         asset.setName("My asset");
         asset.setType("default");
         asset.setTenantId(tenantId);
-        asset = assetService.saveAsset(asset);
+        Asset savedAsset = assetService.saveAsset(asset);
         Tenant tenant = new Tenant();
         tenant.setTitle("Test different tenant");
         tenant = tenantService.saveTenant(tenant);
         Customer customer = new Customer();
         customer.setTenantId(tenant.getId());
         customer.setTitle("Test different customer");
-        customer = customerService.saveCustomer(customer);
+        Customer savedCustomer = customerService.saveCustomer(customer);
         try {
-            assetService.assignAssetToCustomer(tenantId, asset.getId(), customer.getId());
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                assetService.assignAssetToCustomer(tenantId, savedAsset.getId(), savedCustomer.getId());
+            });
         } finally {
-            assetService.deleteAsset(tenantId, asset.getId());
+            assetService.deleteAsset(tenantId, savedAsset.getId());
             tenantService.deleteTenant(tenant.getId());
         }
     }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java
index 11d82ad963..18bf036495 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java
@@ -24,6 +24,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.StringUtils;
@@ -99,35 +100,43 @@ public abstract class BaseCustomerServiceTest extends AbstractServiceTest {
         customerService.deleteCustomer(tenantId, savedCustomer.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveCustomerWithEmptyTitle() {
         Customer customer = new Customer();
         customer.setTenantId(tenantId);
-        customerService.saveCustomer(customer);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            customerService.saveCustomer(customer);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveCustomerWithEmptyTenant() {
         Customer customer = new Customer();
         customer.setTitle("My customer");
-        customerService.saveCustomer(customer);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            customerService.saveCustomer(customer);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveCustomerWithInvalidTenant() {
         Customer customer = new Customer();
         customer.setTitle("My customer");
         customer.setTenantId(TenantId.fromUUID(Uuids.timeBased()));
-        customerService.saveCustomer(customer);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            customerService.saveCustomer(customer);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveCustomerWithInvalidEmail() {
         Customer customer = new Customer();
         customer.setTenantId(tenantId);
         customer.setTitle("My customer");
         customer.setEmail("invalid@mail");
-        customerService.saveCustomer(customer);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            customerService.saveCustomer(customer);
+        });
     }
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java
index 88d66e9586..4dc28a210a 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java
@@ -20,6 +20,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.DashboardInfo;
@@ -82,58 +83,68 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest {
         dashboardService.deleteDashboard(tenantId, savedDashboard.getId());
     }
     
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDashboardWithEmptyTitle() {
         Dashboard dashboard = new Dashboard();
         dashboard.setTenantId(tenantId);
-        dashboardService.saveDashboard(dashboard);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            dashboardService.saveDashboard(dashboard);
+        });
     }
     
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDashboardWithEmptyTenant() {
         Dashboard dashboard = new Dashboard();
         dashboard.setTitle("My dashboard");
-        dashboardService.saveDashboard(dashboard);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            dashboardService.saveDashboard(dashboard);
+        });
     }
     
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDashboardWithInvalidTenant() {
         Dashboard dashboard = new Dashboard();
         dashboard.setTitle("My dashboard");
         dashboard.setTenantId(TenantId.fromUUID(Uuids.timeBased()));
-        dashboardService.saveDashboard(dashboard);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            dashboardService.saveDashboard(dashboard);
+        });
     }
     
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testAssignDashboardToNonExistentCustomer() {
         Dashboard dashboard = new Dashboard();
         dashboard.setTitle("My dashboard");
         dashboard.setTenantId(tenantId);
-        dashboard = dashboardService.saveDashboard(dashboard);
+        Dashboard savedDashboard = dashboardService.saveDashboard(dashboard);
         try {
-            dashboardService.assignDashboardToCustomer(tenantId, dashboard.getId(), new CustomerId(Uuids.timeBased()));
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                dashboardService.assignDashboardToCustomer(tenantId, savedDashboard.getId(), new CustomerId(Uuids.timeBased()));
+            });
         } finally {
-            dashboardService.deleteDashboard(tenantId, dashboard.getId());
+            dashboardService.deleteDashboard(tenantId, savedDashboard.getId());
         }
     }
     
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testAssignDashboardToCustomerFromDifferentTenant() {
         Dashboard dashboard = new Dashboard();
         dashboard.setTitle("My dashboard");
         dashboard.setTenantId(tenantId);
-        dashboard = dashboardService.saveDashboard(dashboard);
+        Dashboard savedDashboard = dashboardService.saveDashboard(dashboard);
         Tenant tenant = new Tenant();
         tenant.setTitle("Test different tenant [dashboard]");
         tenant = tenantService.saveTenant(tenant);
         Customer customer = new Customer();
         customer.setTenantId(tenant.getId());
         customer.setTitle("Test different customer");
-        customer = customerService.saveCustomer(customer);
+        Customer savedCustomer = customerService.saveCustomer(customer);
         try {
-            dashboardService.assignDashboardToCustomer(tenantId, dashboard.getId(), customer.getId());
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                dashboardService.assignDashboardToCustomer(tenantId, savedDashboard.getId(), savedCustomer.getId());
+            });
         } finally {
-            dashboardService.deleteDashboard(tenantId, dashboard.getId());
+            dashboardService.deleteDashboard(tenantId, savedDashboard.getId());
             tenantService.deleteTenant(tenant.getId());
         }
     }
@@ -389,25 +400,27 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest {
         tenantService.deleteTenant(tenantId);
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testAssignDashboardToNonExistentEdge() {
         Dashboard dashboard = new Dashboard();
         dashboard.setTitle("My dashboard");
         dashboard.setTenantId(tenantId);
-        dashboard = dashboardService.saveDashboard(dashboard);
+        Dashboard savedDashboard = dashboardService.saveDashboard(dashboard);
         try {
-            dashboardService.assignDashboardToEdge(tenantId, dashboard.getId(), new EdgeId(Uuids.timeBased()));
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                dashboardService.assignDashboardToEdge(tenantId, savedDashboard.getId(), new EdgeId(Uuids.timeBased()));
+            });
         } finally {
-            dashboardService.deleteDashboard(tenantId, dashboard.getId());
+            dashboardService.deleteDashboard(tenantId, savedDashboard.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testAssignDashboardToEdgeFromDifferentTenant() {
         Dashboard dashboard = new Dashboard();
         dashboard.setTitle("My dashboard");
         dashboard.setTenantId(tenantId);
-        dashboard = dashboardService.saveDashboard(dashboard);
+        Dashboard savedDashboard = dashboardService.saveDashboard(dashboard);
         Tenant tenant = new Tenant();
         tenant.setTitle("Test different tenant [edge]");
         tenant = tenantService.saveTenant(tenant);
@@ -418,11 +431,13 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest {
         edge.setType("default");
         edge.setSecret(StringUtils.randomAlphanumeric(20));
         edge.setRoutingKey(StringUtils.randomAlphanumeric(20));
-        edge = edgeService.saveEdge(edge);
+        Edge savedEdge = edgeService.saveEdge(edge);
         try {
-            dashboardService.assignDashboardToEdge(tenantId, dashboard.getId(), edge.getId());
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                dashboardService.assignDashboardToEdge(tenantId, savedDashboard.getId(), savedEdge.getId());
+            });
         } finally {
-            dashboardService.deleteDashboard(tenantId, dashboard.getId());
+            dashboardService.deleteDashboard(tenantId, savedDashboard.getId());
             tenantService.deleteTenant(tenant.getId());
         }
     }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java
index 9415da99ea..7fc9f7b218 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java
@@ -43,8 +43,8 @@ import static org.mockito.Mockito.when;
 
 public abstract class BaseDeviceCredentialsCacheTest extends AbstractServiceTest {
 
-    private static final String CREDENTIALS_ID_1 = StringUtils.randomAlphanumeric(20);
-    private static final String CREDENTIALS_ID_2 = StringUtils.randomAlphanumeric(20);
+    private final String CREDENTIALS_ID_1 = StringUtils.randomAlphanumeric(20);
+    private final String CREDENTIALS_ID_2 = StringUtils.randomAlphanumeric(20);
 
     @Autowired
     private DeviceCredentialsService deviceCredentialsService;
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java
index a1d4543c58..f3e052b3e9 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java
@@ -20,6 +20,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.id.DeviceCredentialsId;
@@ -47,13 +48,15 @@ public abstract class BaseDeviceCredentialsServiceTest extends AbstractServiceTe
         tenantService.deleteTenant(tenantId);
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testCreateDeviceCredentials() {
         DeviceCredentials deviceCredentials = new DeviceCredentials();
-        deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDeviceCredentialsWithEmptyDevice() {
         Device device = new Device();
         device.setName("My device");
@@ -63,13 +66,15 @@ public abstract class BaseDeviceCredentialsServiceTest extends AbstractServiceTe
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(tenantId, device.getId());
         deviceCredentials.setDeviceId(null);
         try {
-            deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials);
+            });
         } finally {
             deviceService.deleteDevice(tenantId, device.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDeviceCredentialsWithEmptyCredentialsType() {
         Device device = new Device();
         device.setName("My device");
@@ -79,13 +84,15 @@ public abstract class BaseDeviceCredentialsServiceTest extends AbstractServiceTe
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(tenantId, device.getId());
         deviceCredentials.setCredentialsType(null);
         try {
-            deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials);
+            });
         } finally {
             deviceService.deleteDevice(tenantId, device.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDeviceCredentialsWithEmptyCredentialsId() {
         Device device = new Device();
         device.setName("My device");
@@ -95,13 +102,15 @@ public abstract class BaseDeviceCredentialsServiceTest extends AbstractServiceTe
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(tenantId, device.getId());
         deviceCredentials.setCredentialsId(null);
         try {
-            deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials);
+            });
         } finally {
             deviceService.deleteDevice(tenantId, device.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveNonExistentDeviceCredentials() {
         Device device = new Device();
         device.setName("My device");
@@ -115,13 +124,15 @@ public abstract class BaseDeviceCredentialsServiceTest extends AbstractServiceTe
         newDeviceCredentials.setCredentialsType(deviceCredentials.getCredentialsType());
         newDeviceCredentials.setCredentialsId(deviceCredentials.getCredentialsId());
         try {
-            deviceCredentialsService.updateDeviceCredentials(tenantId, newDeviceCredentials);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                deviceCredentialsService.updateDeviceCredentials(tenantId, newDeviceCredentials);
+            });
         } finally {
             deviceService.deleteDevice(tenantId, device.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDeviceCredentialsWithNonExistentDevice() {
         Device device = new Device();
         device.setName("My device");
@@ -131,7 +142,9 @@ public abstract class BaseDeviceCredentialsServiceTest extends AbstractServiceTe
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(tenantId, device.getId());
         deviceCredentials.setDeviceId(new DeviceId(Uuids.timeBased()));
         try {
-            deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials);
+            });
         } finally {
             deviceService.deleteDevice(tenantId, device.getId());
         }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java
index d669c24cd6..77a8a479f2 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java
@@ -24,6 +24,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -196,23 +197,27 @@ public abstract class BaseDeviceProfileServiceTest extends AbstractServiceTest {
         Assert.assertEquals(savedDeviceProfile2.getId(), defaultDeviceProfile.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDeviceProfileWithEmptyName() {
         DeviceProfile deviceProfile = new DeviceProfile();
         deviceProfile.setTenantId(tenantId);
-        deviceProfileService.saveDeviceProfile(deviceProfile);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            deviceProfileService.saveDeviceProfile(deviceProfile);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDeviceProfileWithSameName() {
         DeviceProfile deviceProfile = this.createDeviceProfile(tenantId, "Device Profile");
         deviceProfileService.saveDeviceProfile(deviceProfile);
         DeviceProfile deviceProfile2 = this.createDeviceProfile(tenantId, "Device Profile");
-        deviceProfileService.saveDeviceProfile(deviceProfile2);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            deviceProfileService.saveDeviceProfile(deviceProfile2);
+        });
     }
 
     @Ignore
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testChangeDeviceProfileTypeWithExistingDevices() {
         DeviceProfile deviceProfile = this.createDeviceProfile(tenantId, "Device Profile");
         DeviceProfile savedDeviceProfile = deviceProfileService.saveDeviceProfile(deviceProfile);
@@ -224,10 +229,12 @@ public abstract class BaseDeviceProfileServiceTest extends AbstractServiceTest {
         deviceService.saveDevice(device);
         //TODO: once we have more profile types, we should test that we can not change profile type in runtime and uncomment the @Ignore.
 //        savedDeviceProfile.setType(DeviceProfileType.LWM2M);
-        deviceProfileService.saveDeviceProfile(savedDeviceProfile);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            deviceProfileService.saveDeviceProfile(savedDeviceProfile);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testChangeDeviceProfileTransportTypeWithExistingDevices() {
         DeviceProfile deviceProfile = this.createDeviceProfile(tenantId, "Device Profile");
         DeviceProfile savedDeviceProfile = deviceProfileService.saveDeviceProfile(deviceProfile);
@@ -238,10 +245,12 @@ public abstract class BaseDeviceProfileServiceTest extends AbstractServiceTest {
         device.setDeviceProfileId(savedDeviceProfile.getId());
         deviceService.saveDevice(device);
         savedDeviceProfile.setTransportType(DeviceTransportType.MQTT);
-        deviceProfileService.saveDeviceProfile(savedDeviceProfile);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            deviceProfileService.saveDeviceProfile(savedDeviceProfile);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testDeleteDeviceProfileWithExistingDevice() {
         DeviceProfile deviceProfile = this.createDeviceProfile(tenantId, "Device Profile");
         DeviceProfile savedDeviceProfile = deviceProfileService.saveDeviceProfile(deviceProfile);
@@ -251,7 +260,9 @@ public abstract class BaseDeviceProfileServiceTest extends AbstractServiceTest {
         device.setType("default");
         device.setDeviceProfileId(savedDeviceProfile.getId());
         deviceService.saveDevice(device);
-        deviceProfileService.deleteDeviceProfile(tenantId, savedDeviceProfile.getId());
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            deviceProfileService.deleteDeviceProfile(tenantId, savedDeviceProfile.getId());
+        });
     }
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java
index ea2fa9546f..010f56235f 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java
@@ -21,6 +21,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.junit.rules.ExpectedException;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
@@ -91,7 +92,7 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest {
         deleteDevice(tenantId, device);
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDevicesWithMaxDeviceOutOfLimit() {
         TenantProfile defaultTenantProfile = tenantProfileService.findDefaultTenantProfile(tenantId);
         defaultTenantProfile.getProfileData().setConfiguration(DefaultTenantProfileConfiguration.builder().maxDevices(1).build());
@@ -102,7 +103,9 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest {
         this.saveDevice(tenantId, "My first device");
         Assert.assertEquals(1, deviceService.countByTenantId(tenantId));
 
-        this.saveDevice(tenantId, "My second device that out of maxDeviceCount limit");
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            this.saveDevice(tenantId, "My second device that out of maxDeviceCount limit");
+        });
     }
 
     @Test
@@ -246,63 +249,73 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest {
         deviceService.saveDevice(savedDevice);
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDeviceWithEmptyName() {
         Device device = new Device();
         device.setType("default");
         device.setTenantId(tenantId);
-        deviceService.saveDevice(device);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            deviceService.saveDevice(device);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDeviceWithEmptyTenant() {
         Device device = new Device();
         device.setName("My device");
         device.setType("default");
-        deviceService.saveDevice(device);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            deviceService.saveDevice(device);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDeviceWithInvalidTenant() {
         Device device = new Device();
         device.setName("My device");
         device.setType("default");
         device.setTenantId(TenantId.fromUUID(Uuids.timeBased()));
-        deviceService.saveDevice(device);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            deviceService.saveDevice(device);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testAssignDeviceToNonExistentCustomer() {
         Device device = new Device();
         device.setName("My device");
         device.setType("default");
         device.setTenantId(tenantId);
-        device = deviceService.saveDevice(device);
+        Device savedDevice = deviceService.saveDevice(device);
         try {
-            deviceService.assignDeviceToCustomer(tenantId, device.getId(), new CustomerId(Uuids.timeBased()));
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                deviceService.assignDeviceToCustomer(tenantId, savedDevice.getId(), new CustomerId(Uuids.timeBased()));
+            });
         } finally {
-            deviceService.deleteDevice(tenantId, device.getId());
+            deviceService.deleteDevice(tenantId, savedDevice.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testAssignDeviceToCustomerFromDifferentTenant() {
         Device device = new Device();
         device.setName("My device");
         device.setType("default");
         device.setTenantId(tenantId);
-        device = deviceService.saveDevice(device);
+        Device savedDevice = deviceService.saveDevice(device);
         Tenant tenant = new Tenant();
         tenant.setTitle("Test different tenant");
         tenant = tenantService.saveTenant(tenant);
         Customer customer = new Customer();
         customer.setTenantId(tenant.getId());
         customer.setTitle("Test different customer");
-        customer = customerService.saveCustomer(customer);
+        Customer savedCustomer = customerService.saveCustomer(customer);
         try {
-            deviceService.assignDeviceToCustomer(tenantId, device.getId(), customer.getId());
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                deviceService.assignDeviceToCustomer(tenantId, savedDevice.getId(), savedCustomer.getId());
+            });
         } finally {
-            deviceService.deleteDevice(tenantId, device.getId());
+            deviceService.deleteDevice(tenantId, savedDevice.getId());
             tenantService.deleteTenant(tenant.getId());
         }
     }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeServiceTest.java
index 5aced56afd..70d41f4681 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeServiceTest.java
@@ -21,6 +21,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.EntitySubtype;
@@ -86,57 +87,67 @@ public abstract class BaseEdgeServiceTest extends AbstractServiceTest {
         edgeService.deleteEdge(tenantId, savedEdge.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveEdgeWithEmptyName() {
         Edge edge = new Edge();
         edge.setType("default");
         edge.setTenantId(tenantId);
-        edgeService.saveEdge(edge);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            edgeService.saveEdge(edge);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveEdgeWithEmptyTenant() {
         Edge edge = new Edge();
         edge.setName("My edge");
         edge.setType("default");
-        edgeService.saveEdge(edge);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            edgeService.saveEdge(edge);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveEdgeWithInvalidTenant() {
         Edge edge = new Edge();
         edge.setName("My edge");
         edge.setType("default");
         edge.setTenantId(TenantId.fromUUID(Uuids.timeBased()));
-        edgeService.saveEdge(edge);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            edgeService.saveEdge(edge);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testAssignEdgeToNonExistentCustomer() {
         Edge edge = constructEdge("My edge", "default");
-        edge = edgeService.saveEdge(edge);
+        Edge savedEdge = edgeService.saveEdge(edge);
         try {
-            edgeService.assignEdgeToCustomer(tenantId, edge.getId(), new CustomerId(Uuids.timeBased()));
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                edgeService.assignEdgeToCustomer(tenantId, savedEdge.getId(), new CustomerId(Uuids.timeBased()));
+            });
         } finally {
-            edgeService.deleteEdge(tenantId, edge.getId());
+            edgeService.deleteEdge(tenantId, savedEdge.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testAssignEdgeToCustomerFromDifferentTenant() {
         Edge edge = constructEdge("My edge", "default");
-        edge = edgeService.saveEdge(edge);
+        Edge savedEdge = edgeService.saveEdge(edge);
         Tenant tenant = new Tenant();
         tenant.setTitle("Test different tenant");
         tenant = tenantService.saveTenant(tenant);
         Customer customer = new Customer();
         customer.setTenantId(tenant.getId());
         customer.setTitle("Test different customer");
-        customer = customerService.saveCustomer(customer);
+        Customer savedCustomer = customerService.saveCustomer(customer);
         try {
-            edgeService.assignEdgeToCustomer(tenantId, edge.getId(), customer.getId());
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                edgeService.assignEdgeToCustomer(tenantId, savedEdge.getId(), savedCustomer.getId());
+            });
         } finally {
-            edgeService.deleteEdge(tenantId, edge.getId());
+            edgeService.deleteEdge(tenantId, savedEdge.getId());
             tenantService.deleteTenant(tenant.getId());
         }
     }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
index 3ab182519c..510ca0f2db 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
@@ -19,6 +19,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.oauth2.MapperType;
@@ -51,12 +52,14 @@ public abstract class BaseOAuth2ConfigTemplateServiceTest extends AbstractServic
     }
 
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveDuplicateProviderId() {
         OAuth2ClientRegistrationTemplate first = validClientRegistrationTemplate("providerId");
         OAuth2ClientRegistrationTemplate second = validClientRegistrationTemplate("providerId");
         oAuth2ConfigTemplateService.saveClientRegistrationTemplate(first);
-        oAuth2ConfigTemplateService.saveClientRegistrationTemplate(second);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            oAuth2ConfigTemplateService.saveClientRegistrationTemplate(second);
+        });
     }
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
index 42ea18bdec..73dd08d53c 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
@@ -20,6 +20,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.oauth2.MapperType;
@@ -61,7 +62,7 @@ public abstract class BaseOAuth2ServiceTest extends AbstractServiceTest {
         Assert.assertTrue(oAuth2Service.findOAuth2Info().getOauth2ParamsInfos().isEmpty());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveHttpAndMixedDomainsTogether() {
         OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
@@ -77,10 +78,12 @@ public abstract class BaseOAuth2ServiceTest extends AbstractServiceTest {
                         ))
                         .build()
         ));
-        oAuth2Service.saveOAuth2Info(oAuth2Info);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            oAuth2Service.saveOAuth2Info(oAuth2Info);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveHttpsAndMixedDomainsTogether() {
         OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
@@ -96,7 +99,9 @@ public abstract class BaseOAuth2ServiceTest extends AbstractServiceTest {
                         ))
                         .build()
         ));
-        oAuth2Service.saveOAuth2Info(oAuth2Info);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            oAuth2Service.saveOAuth2Info(oAuth2Info);
+        });
     }
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java
index d4242fb1c4..af2f067c2e 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java
@@ -19,6 +19,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
@@ -139,7 +140,7 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queueService.deleteQueue(tenantId, foundQueue.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithEmptyName() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -149,10 +150,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setPackProcessingTimeout(2000);
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithInvalidName() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -163,10 +166,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setPackProcessingTimeout(2000);
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithEmptyTopic() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -176,10 +181,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setPackProcessingTimeout(2000);
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithInvalidTopic() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -190,10 +197,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setPackProcessingTimeout(2000);
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithEmptyPollInterval() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -203,10 +212,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setPackProcessingTimeout(2000);
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithEmptyPartitions() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -216,10 +227,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setPackProcessingTimeout(2000);
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithEmptyPackProcessingTimeout() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -229,10 +242,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setPartitions(1);
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithEmptySubmitStrategy() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -242,10 +257,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setPartitions(1);
         queue.setPackProcessingTimeout(2000);
         queue.setProcessingStrategy(createTestProcessingStrategy());
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithEmptyProcessingStrategy() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -255,10 +272,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setPartitions(1);
         queue.setPackProcessingTimeout(2000);
         queue.setSubmitStrategy(createTestSubmitStrategy());
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithEmptySubmitStrategyType() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -270,10 +289,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.getSubmitStrategy().setType(null);
         queue.setProcessingStrategy(createTestProcessingStrategy());
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithEmptySubmitStrategyBatchSize() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -286,10 +307,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.getSubmitStrategy().setType(SubmitStrategyType.BATCH);
         queue.getSubmitStrategy().setBatchSize(0);
         queue.setProcessingStrategy(createTestProcessingStrategy());
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithEmptyProcessingStrategyType() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -301,10 +324,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
         queue.getProcessingStrategy().setType(null);
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithNegativeProcessingStrategyRetries() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -316,10 +341,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
         queue.getProcessingStrategy().setRetries(-1);
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithNegativeProcessingStrategyFailurePercentage() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -331,10 +358,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
         queue.getProcessingStrategy().setFailurePercentage(-1);
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithNegativeProcessingStrategyPauseBetweenRetries() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -346,10 +375,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
         queue.getProcessingStrategy().setPauseBetweenRetries(-1);
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithProcessingStrategyPauseBetweenRetriesBiggerThenMaxPauseBetweenRetries() {
         Queue queue = new Queue();
         queue.setTenantId(tenantId);
@@ -361,10 +392,12 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
         queue.getProcessingStrategy().setPauseBetweenRetries(100);
-        queueService.saveQueue(queue);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueService.saveQueue(queue);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveQueueWithNotIsolatedTenant() {
         Tenant tenant = new Tenant();
         tenant.setTitle("Not isolated tenant");
@@ -381,7 +414,9 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queue.setSubmitStrategy(createTestSubmitStrategy());
         queue.setProcessingStrategy(createTestProcessingStrategy());
         try {
-            queueService.saveQueue(queue);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                queueService.saveQueue(queue);
+            });
         } finally {
             tenantService.deleteTenant(savedTenant.getId());
         }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java
index 82c50f2438..c920b86bd5 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java
@@ -22,6 +22,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -334,28 +335,34 @@ public abstract class BaseRelationServiceTest extends AbstractServiceTest {
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveRelationWithEmptyFrom() throws ExecutionException, InterruptedException {
         EntityRelation relation = new EntityRelation();
         relation.setTo(new AssetId(Uuids.timeBased()));
         relation.setType(EntityRelation.CONTAINS_TYPE);
-        Assert.assertTrue(saveRelation(relation));
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            Assert.assertTrue(saveRelation(relation));
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveRelationWithEmptyTo() throws ExecutionException, InterruptedException {
         EntityRelation relation = new EntityRelation();
         relation.setFrom(new AssetId(Uuids.timeBased()));
         relation.setType(EntityRelation.CONTAINS_TYPE);
-        Assert.assertTrue(saveRelation(relation));
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            Assert.assertTrue(saveRelation(relation));
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveRelationWithEmptyType() throws ExecutionException, InterruptedException {
         EntityRelation relation = new EntityRelation();
         relation.setFrom(new AssetId(Uuids.timeBased()));
         relation.setTo(new AssetId(Uuids.timeBased()));
-        Assert.assertTrue(saveRelation(relation));
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            Assert.assertTrue(saveRelation(relation));
+        });
     }
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java
index 18c6e110d5..16901119a6 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java
@@ -21,6 +21,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.edge.Edge;
@@ -86,19 +87,23 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest {
         ruleChainService.deleteRuleChainById(tenantId, savedRuleChain.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveRuleChainWithEmptyName() {
         RuleChain ruleChain = new RuleChain();
         ruleChain.setTenantId(tenantId);
-        ruleChainService.saveRuleChain(ruleChain);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            ruleChainService.saveRuleChain(ruleChain);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveRuleChainWithInvalidTenant() {
         RuleChain ruleChain = new RuleChain();
         ruleChain.setName("My RuleChain");
         ruleChain.setTenantId(TenantId.fromUUID(Uuids.timeBased()));
-        ruleChainService.saveRuleChain(ruleChain);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            ruleChainService.saveRuleChain(ruleChain);
+        });
     }
 
     @Test
@@ -321,14 +326,18 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest {
         ruleChainService.deleteRuleChainById(tenantId, savedRuleChainMetaData.getRuleChainId());
     }
 
-    @Test(expected = DataValidationException.class)
-    public void testUpdateRuleChainMetaDataWithCirclingRelation() throws Exception {
-        ruleChainService.saveRuleChainMetaData(tenantId, createRuleChainMetadataWithCirclingRelation());
+    @Test
+    public void testUpdateRuleChainMetaDataWithCirclingRelation() {
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            ruleChainService.saveRuleChainMetaData(tenantId, createRuleChainMetadataWithCirclingRelation());
+        });
     }
 
-    @Test(expected = DataValidationException.class)
-    public void testUpdateRuleChainMetaDataWithCirclingRelation2() throws Exception {
-        ruleChainService.saveRuleChainMetaData(tenantId, createRuleChainMetadataWithCirclingRelation2());
+    @Test
+    public void testUpdateRuleChainMetaDataWithCirclingRelation2() {
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            ruleChainService.saveRuleChainMetaData(tenantId, createRuleChainMetadataWithCirclingRelation2());
+        });
     }
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java
index a21a8e5845..926f680e40 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java
@@ -19,6 +19,7 @@ import com.fasterxml.jackson.databind.node.NullNode;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EntityInfo;
 import org.thingsboard.server.common.data.Tenant;
@@ -154,30 +155,36 @@ public abstract class BaseTenantProfileServiceTest extends AbstractServiceTest {
         Assert.assertEquals(savedTenantProfile2.getId(), defaultTenantProfile.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveTenantProfileWithEmptyName() {
         TenantProfile tenantProfile = new TenantProfile();
-        tenantProfileService.saveTenantProfile(TenantId.SYS_TENANT_ID, tenantProfile);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            tenantProfileService.saveTenantProfile(TenantId.SYS_TENANT_ID, tenantProfile);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveTenantProfileWithSameName() {
         TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile");
         tenantProfileService.saveTenantProfile(TenantId.SYS_TENANT_ID, tenantProfile);
         TenantProfile tenantProfile2 = this.createTenantProfile("Tenant Profile");
-        tenantProfileService.saveTenantProfile(TenantId.SYS_TENANT_ID, tenantProfile2);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            tenantProfileService.saveTenantProfile(TenantId.SYS_TENANT_ID, tenantProfile2);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveSameTenantProfileWithDifferentIsolatedTbRuleEngine() {
         TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile");
         TenantProfile savedTenantProfile = tenantProfileService.saveTenantProfile(TenantId.SYS_TENANT_ID, tenantProfile);
         savedTenantProfile.setIsolatedTbRuleEngine(true);
         addMainQueueConfig(savedTenantProfile);
-        tenantProfileService.saveTenantProfile(TenantId.SYS_TENANT_ID, savedTenantProfile);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            tenantProfileService.saveTenantProfile(TenantId.SYS_TENANT_ID, savedTenantProfile);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testDeleteTenantProfileWithExistingTenant() {
         TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile");
         TenantProfile savedTenantProfile = tenantProfileService.saveTenantProfile(TenantId.SYS_TENANT_ID, tenantProfile);
@@ -186,7 +193,9 @@ public abstract class BaseTenantProfileServiceTest extends AbstractServiceTest {
         tenant.setTenantProfileId(savedTenantProfile.getId());
         tenant = tenantService.saveTenant(tenant);
         try {
-            tenantProfileService.deleteTenantProfile(TenantId.SYS_TENANT_ID, savedTenantProfile.getId());
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                tenantProfileService.deleteTenantProfile(TenantId.SYS_TENANT_ID, savedTenantProfile.getId());
+            });
         } finally {
             tenantService.deleteTenant(tenant.getId());
         }
@@ -294,7 +303,7 @@ public abstract class BaseTenantProfileServiceTest extends AbstractServiceTest {
         return tenantProfile;
     }
 
-    private void addMainQueueConfig(TenantProfile tenantProfile) {
+    public static void addMainQueueConfig(TenantProfile tenantProfile) {
         TenantProfileQueueConfiguration mainQueueConfiguration = new TenantProfileQueueConfiguration();
         mainQueueConfiguration.setName(DataConstants.MAIN_QUEUE_NAME);
         mainQueueConfiguration.setTopic(DataConstants.MAIN_QUEUE_TOPIC);
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java
index 4e4fc44c56..3f8c33c5e7 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.dao.service;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.SpyBean;
@@ -52,8 +53,6 @@ import org.thingsboard.server.common.data.rpc.RpcStatus;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.common.data.security.Authority;
-import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
-import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.tenant.TenantDao;
@@ -121,18 +120,22 @@ public abstract class BaseTenantServiceTest extends AbstractServiceTest {
         tenantService.deleteTenant(savedTenant.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveTenantWithEmptyTitle() {
         Tenant tenant = new Tenant();
-        tenantService.saveTenant(tenant);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            tenantService.saveTenant(tenant);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveTenantWithInvalidEmail() {
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
         tenant.setEmail("invalid@mail");
-        tenantService.saveTenant(tenant);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            tenantService.saveTenant(tenant);
+        });
     }
 
     @Test
@@ -301,23 +304,6 @@ public abstract class BaseTenantServiceTest extends AbstractServiceTest {
 
     }
 
-    @Test(expected = DataValidationException.class)
-    public void testSaveTenantWithIsolatedProfileInMonolithSetup() {
-        TenantProfile tenantProfile = new TenantProfile();
-        tenantProfile.setName("Isolated Tenant Profile");
-        TenantProfileData profileData = new TenantProfileData();
-        profileData.setConfiguration(new DefaultTenantProfileConfiguration());
-        tenantProfile.setProfileData(profileData);
-        tenantProfile.setDefault(false);
-        tenantProfile.setIsolatedTbRuleEngine(true);
-        TenantProfile isolatedTenantProfile = tenantProfileService.saveTenantProfile(TenantId.SYS_TENANT_ID, tenantProfile);
-
-        Tenant tenant = new Tenant();
-        tenant.setTitle("Tenant");
-        tenant.setTenantProfileId(isolatedTenantProfile.getId());
-        tenantService.saveTenant(tenant);
-    }
-
     @Test
     public void testGettingTenantAddingItToCache() {
         Tenant tenant = new Tenant();
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java
index d7885a1cb2..49ececc8e4 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java
@@ -19,6 +19,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.StringUtils;
@@ -142,32 +143,40 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest {
         userService.deleteUser(tenantId, savedUser.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveUserWithSameEmail() {
         User tenantAdminUser = userService.findUserByEmail(tenantId, "tenant@thingsboard.org");
         tenantAdminUser.setEmail("sysadmin@thingsboard.org");
-        userService.saveUser(tenantAdminUser);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            userService.saveUser(tenantAdminUser);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveUserWithInvalidEmail() {
         User tenantAdminUser = userService.findUserByEmail(tenantId, "tenant@thingsboard.org");
         tenantAdminUser.setEmail("tenant_thingsboard.org");
-        userService.saveUser(tenantAdminUser);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            userService.saveUser(tenantAdminUser);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveUserWithEmptyEmail() {
         User tenantAdminUser = userService.findUserByEmail(tenantId, "tenant@thingsboard.org");
         tenantAdminUser.setEmail(null);
-        userService.saveUser(tenantAdminUser);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            userService.saveUser(tenantAdminUser);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveUserWithoutTenant() {
         User tenantAdminUser = userService.findUserByEmail(tenantId, "tenant@thingsboard.org");
         tenantAdminUser.setTenantId(null);
-        userService.saveUser(tenantAdminUser);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            userService.saveUser(tenantAdminUser);
+        });
     }
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java
index 404e6fe2e1..04cc1d8412 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java
@@ -22,6 +22,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.widget.WidgetType;
@@ -88,7 +89,7 @@ public abstract class BaseWidgetTypeServiceTest extends AbstractServiceTest {
         widgetsBundleService.deleteWidgetsBundle(tenantId, savedWidgetsBundle.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveWidgetTypeWithEmptyName() throws IOException {
         WidgetsBundle widgetsBundle = new WidgetsBundle();
         widgetsBundle.setTenantId(tenantId);
@@ -100,22 +101,26 @@ public abstract class BaseWidgetTypeServiceTest extends AbstractServiceTest {
         widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
         widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
         try {
-            widgetTypeService.saveWidgetType(widgetType);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                widgetTypeService.saveWidgetType(widgetType);
+            });
         } finally {
             widgetsBundleService.deleteWidgetsBundle(tenantId, savedWidgetsBundle.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveWidgetTypeWithEmptyBundleAlias() throws IOException {
         WidgetTypeDetails widgetType = new WidgetTypeDetails();
         widgetType.setTenantId(tenantId);
         widgetType.setName("Widget Type");
         widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
-        widgetTypeService.saveWidgetType(widgetType);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            widgetTypeService.saveWidgetType(widgetType);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveWidgetTypeWithEmptyDescriptor() throws IOException {
         WidgetsBundle widgetsBundle = new WidgetsBundle();
         widgetsBundle.setTenantId(tenantId);
@@ -128,13 +133,15 @@ public abstract class BaseWidgetTypeServiceTest extends AbstractServiceTest {
         widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
         widgetType.setDescriptor(new ObjectMapper().readValue("{}", JsonNode.class));
         try {
-            widgetTypeService.saveWidgetType(widgetType);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                widgetTypeService.saveWidgetType(widgetType);
+            });
         } finally {
             widgetsBundleService.deleteWidgetsBundle(tenantId, savedWidgetsBundle.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveWidgetTypeWithInvalidTenant() throws IOException {
         WidgetsBundle widgetsBundle = new WidgetsBundle();
         widgetsBundle.setTenantId(tenantId);
@@ -147,23 +154,27 @@ public abstract class BaseWidgetTypeServiceTest extends AbstractServiceTest {
         widgetType.setName("Widget Type");
         widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
         try {
-            widgetTypeService.saveWidgetType(widgetType);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                widgetTypeService.saveWidgetType(widgetType);
+            });
         } finally {
             widgetsBundleService.deleteWidgetsBundle(tenantId, savedWidgetsBundle.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveWidgetTypeWithInvalidBundleAlias() throws IOException {
         WidgetTypeDetails widgetType = new WidgetTypeDetails();
         widgetType.setTenantId(tenantId);
         widgetType.setBundleAlias("some_alias");
         widgetType.setName("Widget Type");
         widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
-        widgetTypeService.saveWidgetType(widgetType);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            widgetTypeService.saveWidgetType(widgetType);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testUpdateWidgetTypeTenant() throws IOException {
         WidgetsBundle widgetsBundle = new WidgetsBundle();
         widgetsBundle.setTenantId(tenantId);
@@ -178,13 +189,15 @@ public abstract class BaseWidgetTypeServiceTest extends AbstractServiceTest {
         WidgetTypeDetails savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
         savedWidgetType.setTenantId(TenantId.fromUUID(ModelConstants.NULL_UUID));
         try {
-            widgetTypeService.saveWidgetType(savedWidgetType);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                widgetTypeService.saveWidgetType(savedWidgetType);
+            });
         } finally {
             widgetsBundleService.deleteWidgetsBundle(tenantId, savedWidgetsBundle.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testUpdateWidgetTypeBundleAlias() throws IOException {
         WidgetsBundle widgetsBundle = new WidgetsBundle();
         widgetsBundle.setTenantId(tenantId);
@@ -199,13 +212,15 @@ public abstract class BaseWidgetTypeServiceTest extends AbstractServiceTest {
         WidgetTypeDetails savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
         savedWidgetType.setBundleAlias("some_alias");
         try {
-            widgetTypeService.saveWidgetType(savedWidgetType);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                widgetTypeService.saveWidgetType(savedWidgetType);
+            });
         } finally {
             widgetsBundleService.deleteWidgetsBundle(tenantId, savedWidgetsBundle.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testUpdateWidgetTypeAlias() throws IOException {
         WidgetsBundle widgetsBundle = new WidgetsBundle();
         widgetsBundle.setTenantId(tenantId);
@@ -220,7 +235,9 @@ public abstract class BaseWidgetTypeServiceTest extends AbstractServiceTest {
         WidgetTypeDetails savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
         savedWidgetType.setAlias("some_alias");
         try {
-            widgetTypeService.saveWidgetType(savedWidgetType);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                widgetTypeService.saveWidgetType(savedWidgetType);
+            });
         } finally {
             widgetsBundleService.deleteWidgetsBundle(tenantId, savedWidgetsBundle.getId());
         }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java
index ac86572cdb..c28f5face7 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java
@@ -20,6 +20,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
@@ -77,22 +78,26 @@ public abstract class BaseWidgetsBundleServiceTest extends AbstractServiceTest {
         widgetsBundleService.deleteWidgetsBundle(tenantId, savedWidgetsBundle.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveWidgetsBundleWithEmptyTitle() {
         WidgetsBundle widgetsBundle = new WidgetsBundle();
         widgetsBundle.setTenantId(tenantId);
-        widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveWidgetsBundleWithInvalidTenant() {
         WidgetsBundle widgetsBundle = new WidgetsBundle();
         widgetsBundle.setTitle("My widgets bundle");
         widgetsBundle.setTenantId(TenantId.fromUUID(Uuids.timeBased()));
-        widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testUpdateWidgetsBundleTenant() {
         WidgetsBundle widgetsBundle = new WidgetsBundle();
         widgetsBundle.setTitle("My widgets bundle");
@@ -100,13 +105,15 @@ public abstract class BaseWidgetsBundleServiceTest extends AbstractServiceTest {
         WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
         savedWidgetsBundle.setTenantId(TenantId.fromUUID(ModelConstants.NULL_UUID));
         try {
-            widgetsBundleService.saveWidgetsBundle(savedWidgetsBundle);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                widgetsBundleService.saveWidgetsBundle(savedWidgetsBundle);
+            });
         } finally {
             widgetsBundleService.deleteWidgetsBundle(tenantId, savedWidgetsBundle.getId());
         }
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testUpdateWidgetsBundleAlias() {
         WidgetsBundle widgetsBundle = new WidgetsBundle();
         widgetsBundle.setTitle("My widgets bundle");
@@ -114,7 +121,9 @@ public abstract class BaseWidgetsBundleServiceTest extends AbstractServiceTest {
         WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
         savedWidgetsBundle.setAlias("new_alias");
         try {
-            widgetsBundleService.saveWidgetsBundle(savedWidgetsBundle);
+            Assertions.assertThrows(DataValidationException.class, () -> {
+                widgetsBundleService.saveWidgetsBundle(savedWidgetsBundle);
+            });
         } finally {
             widgetsBundleService.deleteWidgetsBundle(tenantId, savedWidgetsBundle.getId());
         }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java
index 6e195b266c..40262ac2b8 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java
@@ -15,7 +15,8 @@
  */
 package org.thingsboard.server.dao.service;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.thingsboard.server.dao.exception.DataValidationException;
 
 public class DataValidatorTest {
@@ -26,38 +27,50 @@ public class DataValidatorTest {
         DataValidator.validateEmail(email);
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void validateInvalidEmail1() {
         String email = "test:1@mail.io";
-        DataValidator.validateEmail(email);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            DataValidator.validateEmail(email);
+        });
     }
-    @Test(expected = DataValidationException.class)
+    @Test
     public void validateInvalidEmail2() {
         String email = "test()1@mail.io";
-        DataValidator.validateEmail(email);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            DataValidator.validateEmail(email);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void validateInvalidEmail3() {
         String email = "test[]1@mail.io";
-        DataValidator.validateEmail(email);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            DataValidator.validateEmail(email);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void validateInvalidEmail4() {
         String email = "test\\1@mail.io";
-        DataValidator.validateEmail(email);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            DataValidator.validateEmail(email);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void validateInvalidEmail5() {
         String email = "test\"1@mail.io";
-        DataValidator.validateEmail(email);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            DataValidator.validateEmail(email);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void validateInvalidEmail6() {
         String email = "test<>1@mail.io";
-        DataValidator.validateEmail(email);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            DataValidator.validateEmail(email);
+        });
     }
-}
\ No newline at end of file
+}
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/NoXssValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/NoXssValidatorTest.java
index fa1caca815..f2618da6b8 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/NoXssValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/NoXssValidatorTest.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.dao.service;
 
 import com.fasterxml.jackson.databind.node.TextNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.thingsboard.common.util.JacksonUtil;
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDaoTest.java
index ef1d8fe737..ba3fe61f8a 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDaoTest.java
@@ -76,7 +76,6 @@ public class JpaAlarmCommentDaoTest extends AbstractJpaDaoTest {
         alarm.setPropagate(true);
         alarm.setStartTs(System.currentTimeMillis());
         alarm.setEndTs(System.currentTimeMillis());
-        alarm.setStatus(AlarmStatus.ACTIVE_UNACK);
         alarmDao.save(TenantId.fromUUID(tenantId), alarm);
     }
     private void saveAlarmComment(UUID id, UUID alarmId, UUID userId, AlarmCommentType type) {
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java
index 45af699f67..5fbc2fd627 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java
@@ -19,21 +19,31 @@ import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
 import org.thingsboard.server.common.data.id.AlarmId;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.dao.AbstractJpaDaoTest;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 import org.thingsboard.server.dao.alarm.AlarmDao;
 
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Created by Valerii Sosliuk on 5/21/2017.
@@ -48,28 +58,235 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
     @Test
     public void testFindLatestByOriginatorAndType() throws ExecutionException, InterruptedException, TimeoutException {
         log.info("Current system time in millis = {}", System.currentTimeMillis());
-        UUID tenantId = UUID.fromString("d4b68f40-3e96-11e7-a884-898080180d6b");
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
         UUID originator1Id = UUID.fromString("d4b68f41-3e96-11e7-a884-898080180d6b");
         UUID originator2Id = UUID.fromString("d4b68f42-3e96-11e7-a884-898080180d6b");
         UUID alarm1Id = UUID.fromString("d4b68f43-3e96-11e7-a884-898080180d6b");
         UUID alarm2Id = UUID.fromString("d4b68f44-3e96-11e7-a884-898080180d6b");
         UUID alarm3Id = UUID.fromString("d4b68f45-3e96-11e7-a884-898080180d6b");
-        int alarmCountBeforeSave = alarmDao.find(TenantId.fromUUID(tenantId)).size();
-        saveAlarm(alarm1Id, tenantId, originator1Id, "TEST_ALARM");
+        // The find method does not filter by tenant. It is just using the tenantId for rate limits if any.
+        var alarmsBeforeSave = alarmDao.find(tenantId).stream().filter(a -> a.getTenantId().equals(tenantId)).collect(Collectors.toList());
+        int alarmCountBeforeSave = alarmsBeforeSave.size();
+        saveAlarm(alarm1Id, tenantId.getId(), originator1Id, "TEST_ALARM");
         //The timestamp of the startTime should be different in order for test to always work
         Thread.sleep(1);
-        saveAlarm(alarm2Id, tenantId, originator1Id, "TEST_ALARM");
-        saveAlarm(alarm3Id, tenantId, originator2Id, "TEST_ALARM");
-        int alarmCountAfterSave = alarmDao.find(TenantId.fromUUID(tenantId)).size();
-        assertEquals(3, alarmCountAfterSave - alarmCountBeforeSave);
+        saveAlarm(alarm2Id, tenantId.getId(), originator1Id, "TEST_ALARM");
+        saveAlarm(alarm3Id, tenantId.getId(), originator2Id, "TEST_ALARM");
+        var alarmsAfterSave = alarmDao.find(tenantId).stream().filter(a -> a.getTenantId().equals(tenantId)).collect(Collectors.toList());
+        int alarmCountAfterSave = alarmsAfterSave.size();
+        int diff = alarmCountAfterSave - alarmCountBeforeSave;
+        if (diff != 3) {
+            System.out.println("test");
+        }
+        assertEquals(3, diff);
         ListenableFuture<Alarm> future = alarmDao
-                .findLatestByOriginatorAndTypeAsync(TenantId.fromUUID(tenantId), new DeviceId(originator1Id), "TEST_ALARM");
+                .findLatestByOriginatorAndTypeAsync(tenantId, new DeviceId(originator1Id), "TEST_ALARM");
         Alarm alarm = future.get(30, TimeUnit.SECONDS);
         assertNotNull(alarm);
         assertEquals(alarm2Id, alarm.getId().getId());
     }
 
-    private void saveAlarm(UUID id, UUID tenantId, UUID deviceId, String type) {
+    @Test
+    public void createOrUpdateActiveAlarm() {
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
+        DeviceId deviceId = new DeviceId(UUID.randomUUID());
+
+        AlarmCreateOrUpdateActiveRequest request = AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .originator(deviceId)
+                .type("ALARM_TYPE")
+                .severity(AlarmSeverity.MAJOR)
+                .build();
+        AlarmApiCallResult result = alarmDao.createOrUpdateActiveAlarm(request, true);
+        assertNotNull(result);
+        assertTrue(result.isSuccessful());
+        assertTrue(result.isCreated());
+        assertTrue(result.isModified());
+        assertNotNull(result.getAlarm());
+        UUID newAlarmId = result.getAlarm().getUuidId();
+        AlarmInfo afterSave = alarmDao.findAlarmInfoById(tenantId, newAlarmId);
+        assertEquals(afterSave, result.getAlarm());
+
+        request = AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .originator(deviceId)
+                .type("ALARM_TYPE")
+                .severity(AlarmSeverity.CRITICAL)
+                .build();
+        result = alarmDao.createOrUpdateActiveAlarm(request, true);
+        assertNotNull(result);
+        assertTrue(result.isSuccessful());
+        assertFalse(result.isCreated());
+        assertTrue(result.isModified());
+        assertNotNull(result.getAlarm());
+        assertEquals(newAlarmId, result.getAlarm().getUuidId());
+        afterSave = alarmDao.findAlarmInfoById(tenantId, newAlarmId);
+        assertEquals(afterSave, result.getAlarm());
+
+        alarmDao.clearAlarm(tenantId, result.getAlarm().getId(), System.currentTimeMillis(), result.getAlarm().getDetails());
+
+        request = AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .originator(deviceId)
+                .type("ALARM_TYPE")
+                .severity(AlarmSeverity.CRITICAL)
+                .build();
+        result = alarmDao.createOrUpdateActiveAlarm(request, true);
+        assertNotNull(result);
+        assertTrue(result.isSuccessful());
+        assertTrue(result.isCreated());
+        assertTrue(result.isModified());
+        assertNotNull(result.getAlarm());
+        assertNotEquals(newAlarmId, result.getAlarm().getUuidId());
+        afterSave = alarmDao.findAlarmInfoById(tenantId, result.getAlarm().getUuidId());
+        assertEquals(afterSave, result.getAlarm());
+
+        alarmDao.clearAlarm(tenantId, result.getAlarm().getId(), System.currentTimeMillis(), result.getAlarm().getDetails());
+
+        request = AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .originator(deviceId)
+                .type("ALARM_TYPE2")
+                .severity(AlarmSeverity.CRITICAL)
+                .build();
+        result = alarmDao.createOrUpdateActiveAlarm(request, true);
+        assertNotNull(result);
+        assertTrue(result.isSuccessful());
+        assertTrue(result.isCreated());
+        assertTrue(result.isModified());
+        assertNotNull(result.getAlarm());
+        assertNotEquals(newAlarmId, result.getAlarm().getUuidId());
+    }
+
+    @Test
+    public void testCantCreateAlarmIfCreateIsDisabled() {
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
+        DeviceId deviceId = new DeviceId(UUID.randomUUID());
+
+        AlarmCreateOrUpdateActiveRequest request = AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .originator(deviceId)
+                .type("ALARM_TYPE")
+                .severity(AlarmSeverity.MAJOR)
+                .build();
+        AlarmApiCallResult result = alarmDao.createOrUpdateActiveAlarm(request, false);
+        assertFalse(result.isSuccessful());
+    }
+
+    @Test
+    public void testAckAlarmProcedure() {
+        UUID tenantId = UUID.randomUUID();
+        UUID originator1Id = UUID.fromString("d4b68f41-3e96-11e7-a884-898080180d6b");
+        UUID alarm1Id = UUID.fromString("d4b68f43-3e96-11e7-a884-898080180d6b");
+        Alarm alarm = saveAlarm(alarm1Id, tenantId, originator1Id, "TEST_ALARM");
+        long ackTs = System.currentTimeMillis();
+        AlarmApiCallResult result = alarmDao.acknowledgeAlarm(alarm.getTenantId(), alarm.getId(), ackTs);
+        AlarmInfo afterSave = alarmDao.findAlarmInfoById(alarm.getTenantId(), alarm.getUuidId());
+        assertNotNull(result);
+        assertTrue(result.isSuccessful());
+        assertTrue(result.isModified());
+        assertNotNull(result.getAlarm());
+        assertEquals(afterSave, result.getAlarm());
+        assertEquals(ackTs, result.getAlarm().getAckTs());
+        assertTrue(result.getAlarm().isAcknowledged());
+        result = alarmDao.acknowledgeAlarm(alarm.getTenantId(), alarm.getId(), ackTs + 1);
+        assertNotNull(result);
+        assertNotNull(result.getAlarm());
+        assertEquals(afterSave, result.getAlarm());
+        assertTrue(result.isSuccessful());
+        assertFalse(result.isModified());
+        assertEquals(ackTs, result.getAlarm().getAckTs());
+        assertTrue(result.getAlarm().isAcknowledged());
+    }
+
+    @Test
+    public void testClearAlarmProcedure() {
+        UUID tenantId = UUID.randomUUID();
+        ;
+        UUID originator1Id = UUID.fromString("d4b68f41-3e96-11e7-a884-898080180d6b");
+        UUID alarm1Id = UUID.fromString("d4b68f43-3e96-11e7-a884-898080180d6b");
+        Alarm alarm = saveAlarm(alarm1Id, tenantId, originator1Id, "TEST_ALARM");
+        long clearTs = System.currentTimeMillis();
+        AlarmApiCallResult result = alarmDao.clearAlarm(alarm.getTenantId(), alarm.getId(), clearTs, null);
+        AlarmInfo afterSave = alarmDao.findAlarmInfoById(alarm.getTenantId(), alarm.getUuidId());
+        assertNotNull(result);
+        assertTrue(result.isSuccessful());
+        assertTrue(result.isCleared());
+        assertNotNull(result.getAlarm());
+        assertEquals(afterSave, result.getAlarm());
+        assertEquals(clearTs, result.getAlarm().getClearTs());
+        assertTrue(result.getAlarm().isCleared());
+        result = alarmDao.clearAlarm(alarm.getTenantId(), alarm.getId(), clearTs + 1, JacksonUtil.newObjectNode());
+        assertNotNull(result);
+        assertNotNull(result.getAlarm());
+        assertEquals(afterSave, result.getAlarm());
+        assertTrue(result.isSuccessful());
+        assertFalse(result.isCleared());
+        assertEquals(clearTs, result.getAlarm().getClearTs());
+        assertTrue(result.getAlarm().isCleared());
+    }
+
+    @Test
+    public void testAssignAlarmProcedure() {
+        UUID tenantId = UUID.randomUUID();
+        ;
+        UUID originator1Id = UUID.fromString("d4b68f41-3e96-11e7-a884-898080180d6b");
+        UUID alarmId = UUID.fromString("d4b68f43-3e96-11e7-a884-898080180d6b");
+        UserId userId1 = new UserId(UUID.fromString("d4b68f43-3e96-11e7-a884-898080180d7b"));
+        UserId userId2 = new UserId(UUID.fromString("d4b68f43-3e96-11e7-a884-898080180d8b"));
+        Alarm alarm = saveAlarm(alarmId, tenantId, originator1Id, "TEST_ALARM");
+        long assignTs = System.currentTimeMillis();
+        AlarmApiCallResult result = alarmDao.assignAlarm(alarm.getTenantId(), alarm.getId(), userId1, assignTs);
+        AlarmInfo afterSave = alarmDao.findAlarmInfoById(alarm.getTenantId(), alarm.getUuidId());
+        assertNotNull(result);
+        assertTrue(result.isSuccessful());
+        assertTrue(result.isModified());
+        assertNotNull(result.getAlarm());
+        assertEquals(afterSave, result.getAlarm());
+        assertEquals(assignTs, result.getAlarm().getAssignTs());
+        assertNotNull(result.getAlarm().getAssigneeId());
+        assertEquals(userId1, result.getAlarm().getAssigneeId());
+        result = alarmDao.assignAlarm(alarm.getTenantId(), alarm.getId(), userId1, assignTs + 1);
+        afterSave = alarmDao.findAlarmInfoById(alarm.getTenantId(), alarm.getUuidId());
+        assertNotNull(result);
+        assertNotNull(result.getAlarm());
+        assertEquals(afterSave, result.getAlarm());
+        assertTrue(result.isSuccessful());
+        assertFalse(result.isModified());
+        assertEquals(assignTs, result.getAlarm().getAssignTs());
+        assertNotNull(result.getAlarm().getAssigneeId());
+        assertEquals(userId1, result.getAlarm().getAssigneeId());
+        result = alarmDao.assignAlarm(alarm.getTenantId(), alarm.getId(), userId2, assignTs + 1);
+        afterSave = alarmDao.findAlarmInfoById(alarm.getTenantId(), alarm.getUuidId());
+        assertNotNull(result);
+        assertTrue(result.isSuccessful());
+        assertTrue(result.isModified());
+        assertNotNull(result.getAlarm());
+        assertEquals(afterSave, result.getAlarm());
+        assertEquals(assignTs + 1, result.getAlarm().getAssignTs());
+        assertNotNull(result.getAlarm().getAssigneeId());
+        assertEquals(userId2, result.getAlarm().getAssigneeId());
+
+        result = alarmDao.unassignAlarm(alarm.getTenantId(), alarm.getId(), assignTs + 1);
+        afterSave = alarmDao.findAlarmInfoById(alarm.getTenantId(), alarm.getUuidId());
+        assertNotNull(result);
+        assertTrue(result.isSuccessful());
+        assertTrue(result.isModified());
+        assertNotNull(result.getAlarm());
+        assertEquals(afterSave, result.getAlarm());
+        assertNull(result.getAlarm().getAssigneeId());
+
+        result = alarmDao.unassignAlarm(alarm.getTenantId(), alarm.getId(), assignTs + 1);
+        afterSave = alarmDao.findAlarmInfoById(alarm.getTenantId(), alarm.getUuidId());
+        assertNotNull(result);
+        assertTrue(result.isSuccessful());
+        assertFalse(result.isModified());
+        assertNotNull(result.getAlarm());
+        assertEquals(afterSave, result.getAlarm());
+        assertNull(result.getAlarm().getAssigneeId());
+    }
+
+    private Alarm saveAlarm(UUID id, UUID tenantId, UUID deviceId, String type) {
         Alarm alarm = new Alarm();
         alarm.setId(new AlarmId(id));
         alarm.setTenantId(TenantId.fromUUID(tenantId));
@@ -78,7 +295,10 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
         alarm.setPropagate(true);
         alarm.setStartTs(System.currentTimeMillis());
         alarm.setEndTs(System.currentTimeMillis());
-        alarm.setStatus(AlarmStatus.ACTIVE_UNACK);
-        alarmDao.save(TenantId.fromUUID(tenantId), alarm);
+        alarm.setAcknowledged(false);
+        alarm.setCleared(false);
+        alarm.setDetails(JacksonUtil.newObjectNode().put("a", UUID.randomUUID().toString()).set("b", JacksonUtil.newObjectNode().put("a", "[}/.`1321421!@@$$(%&&$")));
+        return alarmDao.save(TenantId.fromUUID(tenantId), alarm);
     }
+
 }
diff --git a/dao/src/test/resources/application-test.properties b/dao/src/test/resources/application-test.properties
index 15131011d8..a2a21abc11 100644
--- a/dao/src/test/resources/application-test.properties
+++ b/dao/src/test/resources/application-test.properties
@@ -7,10 +7,9 @@ updates.enabled=false
 audit-log.enabled=true
 audit-log.sink.type=none
 
-cache.type=caffeine
+#cache.type=caffeine # will be injected redis by RedisContainer or will be default (caffeine)
 cache.maximumPoolSize=16
 cache.attributes.enabled=true
-#cache.type=redis
 
 cache.specs.relations.timeToLiveInMinutes=1440
 cache.specs.relations.maxSize=100000
diff --git a/dao/src/test/resources/cassandra-test.properties b/dao/src/test/resources/cassandra-test.properties
index 5765153a6f..5876582ee6 100644
--- a/dao/src/test/resources/cassandra-test.properties
+++ b/dao/src/test/resources/cassandra-test.properties
@@ -2,7 +2,7 @@ cassandra.cluster_name=Thingsboard Cluster
 
 cassandra.keyspace_name=thingsboard
 
-cassandra.url=127.0.0.1:9142
+#cassandra.url=127.0.0.1:9142 # will be injected by NoSqlContainer
 
 cassandra.local_datacenter=datacenter1
 
diff --git a/dao/src/test/resources/logback.xml b/dao/src/test/resources/logback.xml
index f74ba574b5..61397ec6f1 100644
--- a/dao/src/test/resources/logback.xml
+++ b/dao/src/test/resources/logback.xml
@@ -8,9 +8,7 @@
     </appender>
 
     <logger name="org.thingsboard.server.dao" level="WARN"/>
-    <logger name="org.apache.cassandra" level="WARN"/>
-    <logger name="org.cassandraunit" level="WARN" />
-    <logger name="org.apache.cassandra" level="WARN" />
+    <logger name="org.testcontainers" level="INFO" />
 
     <root level="WARN">
         <appender-ref ref="console"/>
diff --git a/msa/black-box-tests/README.md b/msa/black-box-tests/README.md
index ae0e8b79a0..5b63ba712a 100644
--- a/msa/black-box-tests/README.md
+++ b/msa/black-box-tests/README.md
@@ -18,7 +18,7 @@ As result, in REPOSITORY column, next images should be present:
         thingsboard/tb-web-ui
         thingsboard/tb-js-executor
 
-- Run the black box tests in the [msa/black-box-tests](../black-box-tests) directory with Redis standalone:
+- Run the black box tests (without ui tests) in the [msa/black-box-tests](../black-box-tests) directory with Redis standalone:
 
         mvn clean install -DblackBoxTests.skip=false
 
@@ -34,11 +34,23 @@ As result, in REPOSITORY column, next images should be present:
 
         mvn clean install -DblackBoxTests.skip=false -DrunLocal=true
 
-- To run ui smoke tests in the [msa/black-box-tests](../black-box-tests) directory specifying suite name: 
+- To run only ui tests in the [msa/black-box-tests](../black-box-tests) directory: 
 
         mvn clean install -DblackBoxTests.skip=false -Dsuite=uiTests
 
-- To run all tests in the [msa/black-box-tests](../black-box-tests) directory specifying suite name:
+- To run only ui smoke rule chains tests in the [msa/black-box-tests](../black-box-tests) directory:
+
+        mvn clean install -DblackBoxTests.skip=false -Dsuite=smokesRuleChain
+
+- To run only ui smoke customers tests in the [msa/black-box-tests](../black-box-tests) directory:
+
+        mvn clean install -DblackBoxTests.skip=false -Dsuite=smokesCustomer
+
+- To run only ui smoke profiles tests in the [msa/black-box-tests](../black-box-tests) directory:
+
+        mvn clean install -DblackBoxTests.skip=false -Dsuite=smokesPrifiles
+
+- To run all tests (black-box and ui) in the [msa/black-box-tests](../black-box-tests) directory:
 
         mvn clean install -DblackBoxTests.skip=false -Dsuite=all 
 
diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml
index cd0dd07543..ae0b12ead7 100644
--- a/msa/black-box-tests/pom.xml
+++ b/msa/black-box-tests/pom.xml
@@ -212,8 +212,7 @@
                 <version>${allure-maven.version}</version>
                 <configuration>
                     <reportVersion>${allure-testng.version}</reportVersion>
-                    <allureDownloadUrl>https://repo.maven.apache.org/maven2/io/qameta/allure/allure-commandline/
-                        ${allure-testng.version}/allure-commandline-${allure-testng.version}.zip</allureDownloadUrl>
+                    <propertiesFilePath>src/test/resources/allure.properties</propertiesFilePath>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestListener.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestListener.java
index ea145a97bc..bbcf6f32a3 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestListener.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestListener.java
@@ -19,11 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.openqa.selenium.WebDriver;
 import org.testng.ITestListener;
 import org.testng.ITestResult;
-import org.testng.internal.ConstructorOrMethod;
-import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
-
-import static org.testng.internal.Utils.log;
-import static org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest.captureScreen;
 
 @Slf4j
 public class TestListener implements ITestListener {
@@ -41,13 +36,7 @@ public class TestListener implements ITestListener {
     @Override
     public void onTestSuccess(ITestResult result) {
         log.info("<<<=== Test completed successfully: " + result.getName());
-        ConstructorOrMethod consOrMethod = result.getMethod().getConstructorOrMethod();
-        DisableUIListeners disable = consOrMethod.getMethod().getDeclaringClass().getAnnotation(DisableUIListeners.class);
-        if (disable != null) {
-            return;
-        }
-        driver = ((AbstractDriverBaseTest) result.getInstance()).getDriver();
-        captureScreen(driver, "success");
+
     }
 
     /**
@@ -56,13 +45,6 @@ public class TestListener implements ITestListener {
     @Override
     public void onTestFailure(ITestResult result) {
         log.info("<<<=== Test failed: " + result.getName());
-        ConstructorOrMethod consOrMethod = result.getMethod().getConstructorOrMethod();
-        DisableUIListeners disable = consOrMethod.getMethod().getDeclaringClass().getAnnotation(DisableUIListeners.class);
-        if (disable != null) {
-            return;
-        }
-        driver = ((AbstractDriverBaseTest) result.getInstance()).getDriver();
-        captureScreen(driver, "failure");
     }
 
     /**
@@ -71,12 +53,5 @@ public class TestListener implements ITestListener {
     @Override
     public void onTestSkipped(ITestResult result) {
         log.info("<<<=== Test skipped: " + result.getName());
-        ConstructorOrMethod consOrMethod = result.getMethod().getConstructorOrMethod();
-        DisableUIListeners disable = consOrMethod.getMethod().getDeclaringClass().getAnnotation(DisableUIListeners.class);
-        if (disable != null) {
-            return;
-        }
-        driver = ((AbstractDriverBaseTest) result.getInstance()).getDriver();
-        captureScreen(driver, "skipped");
     }
 }
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java
index af3b25b924..29574a1942 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java
@@ -15,12 +15,10 @@
  */
 package org.thingsboard.server.msa.ui.base;
 
-import com.google.common.io.Files;
 import io.github.bonigarcia.wdm.WebDriverManager;
-import io.qameta.allure.Attachment;
-import lombok.SneakyThrows;
+import io.qameta.allure.Allure;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
+import org.openqa.selenium.By;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.OutputType;
@@ -34,7 +32,9 @@ import org.openqa.selenium.remote.LocalFileDetector;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -44,9 +44,11 @@ import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.msa.AbstractContainerTest;
 import org.thingsboard.server.msa.ContainerTestSuite;
 
-import java.io.File;
+import java.io.ByteArrayInputStream;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.time.Duration;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static org.thingsboard.server.msa.TestProperties.getBaseUiUrl;
@@ -65,9 +67,8 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
     private static final ContainerTestSuite instance = ContainerTestSuite.getInstance();
     private JavascriptExecutor js;
 
-    @SneakyThrows
-    @BeforeMethod
-    public void openBrowser() {
+    @BeforeClass
+    public void startUp() throws MalformedURLException {
         log.info("===>>> Setup driver");
         testRestClient.login(TENANT_EMAIL, TENANT_PASSWORD);
         ChromeOptions options = new ChromeOptions();
@@ -84,8 +85,18 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
         openLocalhost();
     }
 
+    @BeforeMethod
+    public void open() {
+        openHomePage();
+    }
+
     @AfterMethod
-    public void closeBrowser() {
+    public void addScreenshotToReport() {
+        captureScreen(driver, "After test page screenshot");
+    }
+
+    @AfterClass
+    public void teardown() {
         log.info("<<<=== Teardown");
         driver.quit();
     }
@@ -94,6 +105,10 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
         driver.get(getBaseUiUrl());
     }
 
+    public void openHomePage() {
+        driver.get(getBaseUiUrl() + "/home");
+    }
+
     public String getUrl() {
         return driver.getCurrentUrl();
     }
@@ -157,11 +172,10 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
         }
     }
 
-    @SneakyThrows
-    @Attachment(value = "Page screenshot", type = "image/png")
-    public static byte[] captureScreen(WebDriver driver, String dirPath) {
-        File screenshot = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE);
-        FileUtils.copyFile(screenshot, new File("./target/allure-results/screenshots/" + dirPath + "//" + screenshot.getName()));
-        return Files.toByteArray(screenshot);
+    public void captureScreen(WebDriver driver, String screenshotName) {
+        if (driver instanceof TakesScreenshot) {
+            Allure.addAttachment(screenshotName,
+                    new ByteArrayInputStream(((TakesScreenshot) driver).getScreenshotAs(OutputType.BYTES)));
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/LoginPageElements.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/LoginPageElements.java
index 6aeb20c87d..d87fd3c5bf 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/LoginPageElements.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/LoginPageElements.java
@@ -27,6 +27,7 @@ public class LoginPageElements extends AbstractBasePage {
     private static final String EMAIL_FIELD = "//input[@id='username-input']";
     private static final String PASSWORD_FIELD = "//input[@id='password-input']";
     private static final String SUBMIT_BTN = "//button[@type='submit']";
+    private static final String TITLE_LOGO = "//img[@class='tb-logo-title']";
 
     public WebElement emailField() {
         return waitUntilElementToBeClickable(EMAIL_FIELD);
@@ -40,4 +41,8 @@ public class LoginPageElements extends AbstractBasePage {
         return waitUntilElementToBeClickable(SUBMIT_BTN);
     }
 
+    public WebElement titleLogo() {
+        return waitUntilVisibilityOfElementLocated(TITLE_LOGO);
+    }
+
 }
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/LoginPageHelper.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/LoginPageHelper.java
index a746a78416..38a4a50207 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/LoginPageHelper.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/LoginPageHelper.java
@@ -16,6 +16,8 @@
 package org.thingsboard.server.msa.ui.pages;
 
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.ui.ExpectedCondition;
+import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.thingsboard.server.msa.ui.utils.Const;
 
 public class LoginPageHelper extends LoginPageElements {
@@ -27,5 +29,6 @@ public class LoginPageHelper extends LoginPageElements {
         emailField().sendKeys(Const.TENANT_EMAIL);
         passwordField().sendKeys(Const.TENANT_PASSWORD);
         submitBtn().click();
+        waitUntilUrlContainsText("/home");
     }
 }
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/OtherPageElements.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/OtherPageElements.java
index 3b18df801f..99e737dba1 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/OtherPageElements.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/OtherPageElements.java
@@ -42,7 +42,7 @@ public class OtherPageElements extends AbstractBasePage {
     private static final String MARKS_CHECKBOX = "//mat-row[contains (@class,'mat-selected')]//mat-checkbox[contains(@class, 'checked')]";
     private static final String SELECT_ALL_CHECKBOX = "//thead//mat-checkbox";
     private static final String ALL_ENTITY = "//mat-row[@class='mat-row cdk-row mat-row-select ng-star-inserted']";
-    private static final String EDIT_PENCIL_BTN = "//mat-icon[contains(text(),'edit')]/ancestor::button";
+    private static final String EDIT_PENCIL_BTN = "//tb-details-panel//mat-icon[contains(text(),'edit')]/ancestor::button";
     private static final String NAME_FIELD_EDIT_VIEW = "//input[@formcontrolname='name']";
     private static final String HEADER_NAME_VIEW = "//header//div[@class='tb-details-title']/span";
     private static final String DONE_BTN_EDIT_VIEW = "//mat-icon[contains(text(),'done')]/ancestor::button";
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/AssetProfileEditMenuTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/AssetProfileEditMenuTest.java
index 5be2c2d7a6..0d02bd9434 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/AssetProfileEditMenuTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/AssetProfileEditMenuTest.java
@@ -19,7 +19,7 @@ import io.qameta.allure.Description;
 import org.openqa.selenium.Keys;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -39,7 +39,7 @@ public class AssetProfileEditMenuTest extends AbstractDriverBaseTest {
     private ProfilesPageHelper profilesPage;
     private String name;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/CreateAssetProfileImportTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/CreateAssetProfileImportTest.java
index 3e8c3ddeb7..275eb866ce 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/CreateAssetProfileImportTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/CreateAssetProfileImportTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.assetProfileSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -40,7 +40,7 @@ public class CreateAssetProfileImportTest extends AbstractDriverBaseTest {
     private final String absolutePathToFileImportTxt = getClass().getClassLoader().getResource(IMPORT_TXT_FILE_NAME).getPath();
     private String name;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/CreateAssetProfileTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/CreateAssetProfileTest.java
index 5f06cd1f8d..cb7d70f33f 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/CreateAssetProfileTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/CreateAssetProfileTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.assetProfileSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -37,7 +37,7 @@ public class CreateAssetProfileTest extends AbstractDriverBaseTest {
     private ProfilesPageHelper profilesPage;
     private String name;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteAssetProfileTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteAssetProfileTest.java
index 2e9c7503a7..1525849df7 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteAssetProfileTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteAssetProfileTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.assetProfileSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -33,7 +33,7 @@ public class DeleteAssetProfileTest extends AbstractDriverBaseTest {
     private SideBarMenuViewHelper sideBarMenuView;
     private ProfilesPageHelper profilesPage;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteSeveralAssetProfilesTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteSeveralAssetProfilesTest.java
index e57d446d3d..40436c6ea0 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteSeveralAssetProfilesTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteSeveralAssetProfilesTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.assetProfileSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -32,7 +32,7 @@ public class DeleteSeveralAssetProfilesTest extends AbstractDriverBaseTest {
     private SideBarMenuViewHelper sideBarMenuView;
     private ProfilesPageHelper profilesPage;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/MakeAssetProfileDefaultTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/MakeAssetProfileDefaultTest.java
index f7d6052a68..761c390338 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/MakeAssetProfileDefaultTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/MakeAssetProfileDefaultTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.assetProfileSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -34,7 +34,7 @@ public class MakeAssetProfileDefaultTest extends AbstractDriverBaseTest {
     private ProfilesPageHelper profilesPage;
     private String name;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/SearchAssetProfileTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/SearchAssetProfileTest.java
index 902e20c104..16de1924e7 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/SearchAssetProfileTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/SearchAssetProfileTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.assetProfileSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -33,7 +33,7 @@ public class SearchAssetProfileTest extends AbstractDriverBaseTest {
     private ProfilesPageHelper profilesPage;
     private String name;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/SortByNameTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/SortByNameTest.java
index c8617f2c2f..6104e80e80 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/SortByNameTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/SortByNameTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.assetProfileSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -33,7 +33,7 @@ public class SortByNameTest extends AbstractDriverBaseTest {
     private ProfilesPageHelper profilesPage;
     private String name;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CreateCustomerTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CreateCustomerTest.java
index 4efb7ed861..b0659ac328 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CreateCustomerTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CreateCustomerTest.java
@@ -19,7 +19,7 @@ import io.qameta.allure.Description;
 import org.openqa.selenium.Keys;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.CustomerPageHelper;
@@ -37,7 +37,7 @@ public class CreateCustomerTest extends AbstractDriverBaseTest {
     private CustomerPageHelper customerPage;
     private String customerName;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CustomerEditMenuTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CustomerEditMenuTest.java
index c67ed9d2cd..c47ae92468 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CustomerEditMenuTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CustomerEditMenuTest.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.msa.ui.tests.customerSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
@@ -38,16 +39,18 @@ import static org.thingsboard.server.msa.ui.utils.EntityPrototypes.defaultCustom
 public class CustomerEditMenuTest extends AbstractDriverBaseTest {
 
     private SideBarMenuViewElements sideBarMenuView;
+    private LoginPageHelper loginPage;
     private CustomerPageHelper customerPage;
     private DashboardPageHelper dashboardPage;
     private String customerName;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
-        new LoginPageHelper(driver).authorizationTenant();
+        loginPage = new LoginPageHelper(driver);
         sideBarMenuView = new SideBarMenuViewElements(driver);
         customerPage = new CustomerPageHelper(driver);
         dashboardPage = new DashboardPageHelper(driver);
+        loginPage.authorizationTenant();
     }
 
     @AfterMethod
@@ -58,6 +61,13 @@ public class CustomerEditMenuTest extends AbstractDriverBaseTest {
         }
     }
 
+    @BeforeMethod
+    public void reLogin() {
+        if (getUrl().contains("/login")) {
+            loginPage.authorizationTenant();
+        }
+    }
+
     @Test(priority = 10, groups = "smoke")
     @Description
     public void changeTitle() {
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteCustomerTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteCustomerTest.java
index 4372799f33..3f535ce113 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteCustomerTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteCustomerTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.customerSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.CustomerPageHelper;
@@ -35,7 +35,7 @@ public class DeleteCustomerTest extends AbstractDriverBaseTest {
     private CustomerPageHelper customerPage;
     private RuleChainsPageHelper ruleChainsPage;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteSeveralCustomerTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteSeveralCustomerTest.java
index a32a9304b2..635505b64a 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteSeveralCustomerTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteSeveralCustomerTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.customerSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.CustomerPageHelper;
@@ -33,7 +33,7 @@ public class DeleteSeveralCustomerTest extends AbstractDriverBaseTest {
     private SideBarMenuViewElements sideBarMenuView;
     private CustomerPageHelper customerPage;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersAssetsTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersAssetsTest.java
index 90528f0d89..405a028a15 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersAssetsTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersAssetsTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.customerSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.CustomerPageHelper;
@@ -30,7 +30,7 @@ public class ManageCustomersAssetsTest extends AbstractDriverBaseTest {
     private CustomerPageHelper customerPage;
     private final String manage = "Assets";
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersDashboardsTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersDashboardsTest.java
index 27b5ecb1aa..f1f27c96cf 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersDashboardsTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersDashboardsTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.customerSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.CustomerPageHelper;
@@ -29,7 +29,7 @@ public class ManageCustomersDashboardsTest extends AbstractDriverBaseTest {
     private CustomerPageHelper customerPage;
     private final String manage = "Dashboards";
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersDevicesTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersDevicesTest.java
index f6f8ef15e4..fde5b87e52 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersDevicesTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersDevicesTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.customerSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.CustomerPageHelper;
@@ -29,7 +29,7 @@ public class ManageCustomersDevicesTest extends AbstractDriverBaseTest {
     private CustomerPageHelper customerPage;
     private final String manage = "Devices";
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersEdgesTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersEdgesTest.java
index d4b9ee769a..184f506584 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersEdgesTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersEdgesTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.customerSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.CustomerPageHelper;
@@ -30,7 +30,7 @@ public class ManageCustomersEdgesTest extends AbstractDriverBaseTest {
     private CustomerPageHelper customerPage;
     private final String iconText = "Edge instances";
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersUsersTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersUsersTest.java
index faa7cde0fb..9b8a7b8eef 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersUsersTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/ManageCustomersUsersTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.customerSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.CustomerPageHelper;
@@ -30,7 +30,7 @@ public class ManageCustomersUsersTest extends AbstractDriverBaseTest {
     private CustomerPageHelper customerPage;
     private final String iconText = "Customer Users";
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/SearchCustomerTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/SearchCustomerTest.java
index 8b5a5bf1d2..2ff2a6fef9 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/SearchCustomerTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/SearchCustomerTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.customerSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.CustomerPageHelper;
@@ -32,7 +32,7 @@ public class SearchCustomerTest extends AbstractDriverBaseTest {
     private SideBarMenuViewElements sideBarMenuView;
     private CustomerPageHelper customerPage;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/SortByNameTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/SortByNameTest.java
index a819a31d8c..296ab2c847 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/SortByNameTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/SortByNameTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.customerSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.CustomerPageHelper;
@@ -33,7 +33,7 @@ public class SortByNameTest extends AbstractDriverBaseTest {
     private CustomerPageHelper customerPage;
     private String customerName;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/CreateDeviceProfileImportTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/CreateDeviceProfileImportTest.java
index a75d24ea91..1c530d33ad 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/CreateDeviceProfileImportTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/CreateDeviceProfileImportTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.deviceProfileSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -40,7 +40,7 @@ public class CreateDeviceProfileImportTest extends AbstractDriverBaseTest {
     private final String absolutePathToFileImportTxt = getClass().getClassLoader().getResource(IMPORT_TXT_FILE_NAME).getPath();
     private String name;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/CreateDeviceProfileTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/CreateDeviceProfileTest.java
index 9fc7e3ae77..b983b7fe5f 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/CreateDeviceProfileTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/CreateDeviceProfileTest.java
@@ -19,7 +19,7 @@ import io.qameta.allure.Description;
 import org.openqa.selenium.Keys;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -39,7 +39,7 @@ public class CreateDeviceProfileTest extends AbstractDriverBaseTest {
     private ProfilesPageHelper profilesPage;
     private String name;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteDeviceProfileTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteDeviceProfileTest.java
index 04d85545d5..3dd6c2b28d 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteDeviceProfileTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteDeviceProfileTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.deviceProfileSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -33,7 +33,7 @@ public class DeleteDeviceProfileTest extends AbstractDriverBaseTest {
     private SideBarMenuViewHelper sideBarMenuView;
     private ProfilesPageHelper profilesPage;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteSeveralDeviceProfilesTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteSeveralDeviceProfilesTest.java
index 4e6d633da4..8459474c38 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteSeveralDeviceProfilesTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteSeveralDeviceProfilesTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.deviceProfileSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -32,7 +32,7 @@ public class DeleteSeveralDeviceProfilesTest extends AbstractDriverBaseTest {
     private SideBarMenuViewHelper sideBarMenuView;
     private ProfilesPageHelper profilesPage;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeviceProfileEditMenuTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeviceProfileEditMenuTest.java
index 1ebf5d1597..9d889f2e54 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeviceProfileEditMenuTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeviceProfileEditMenuTest.java
@@ -19,7 +19,7 @@ import io.qameta.allure.Description;
 import org.openqa.selenium.Keys;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -39,7 +39,7 @@ public class DeviceProfileEditMenuTest extends AbstractDriverBaseTest {
     private ProfilesPageHelper profilesPage;
     private String name;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/MakeDeviceProfileDefaultTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/MakeDeviceProfileDefaultTest.java
index b8c0c4ead9..9ef711eee4 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/MakeDeviceProfileDefaultTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/MakeDeviceProfileDefaultTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.deviceProfileSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -29,7 +29,7 @@ public class MakeDeviceProfileDefaultTest extends AbstractDriverBaseTest {
     private SideBarMenuViewHelper sideBarMenuView;
     private ProfilesPageHelper profilesPage;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/SearchDeviceProfileTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/SearchDeviceProfileTest.java
index dabdaeec29..bb6b82b3a9 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/SearchDeviceProfileTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/SearchDeviceProfileTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.deviceProfileSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -34,7 +34,7 @@ public class SearchDeviceProfileTest extends AbstractDriverBaseTest {
     private ProfilesPageHelper profilesPage;
     private String name;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/SortByNameTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/SortByNameTest.java
index 937145d37f..a6c1a7b0cf 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/SortByNameTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/SortByNameTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.deviceProfileSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -33,7 +33,7 @@ public class SortByNameTest extends AbstractDriverBaseTest {
     private ProfilesPageHelper profilesPage;
     private String name;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewHelper(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainImportTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainImportTest.java
index d30c7799dd..14d3a0a6cd 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainImportTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainImportTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -42,7 +42,7 @@ public class CreateRuleChainImportTest extends AbstractDriverBaseTest {
     private final String absolutePathToFileImportTxt = getClass().getClassLoader().getResource(IMPORT_TXT_FILE_NAME).getPath();
     private String ruleChainName;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java
index d250031b7e..4e1ec60f10 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -38,7 +38,7 @@ public class CreateRuleChainTest extends AbstractDriverBaseTest {
     private RuleChainsPageHelper ruleChainsPage;
     private String ruleChainName;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteRuleChainTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteRuleChainTest.java
index 8a1be66505..078a807185 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteRuleChainTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteRuleChainTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -34,7 +34,7 @@ public class DeleteRuleChainTest extends AbstractDriverBaseTest {
     private SideBarMenuViewElements sideBarMenuView;
     private RuleChainsPageHelper ruleChainsPage;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteSeveralRuleChainsTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteSeveralRuleChainsTest.java
index d631ed05d5..612efee64c 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteSeveralRuleChainsTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteSeveralRuleChainsTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -34,7 +34,7 @@ public class DeleteSeveralRuleChainsTest extends AbstractDriverBaseTest {
     private SideBarMenuViewElements sideBarMenuView;
     private RuleChainsPageHelper ruleChainsPage;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/MakeRuleChainRootTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/MakeRuleChainRootTest.java
index 99e9ff5d11..7ad3fad982 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/MakeRuleChainRootTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/MakeRuleChainRootTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -30,7 +30,7 @@ public class MakeRuleChainRootTest extends AbstractDriverBaseTest {
     private SideBarMenuViewElements sideBarMenuView;
     private RuleChainsPageHelper ruleChainsPage;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/OpenRuleChainTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/OpenRuleChainTest.java
index 6cf760451a..05c59b0d7d 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/OpenRuleChainTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/OpenRuleChainTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -37,7 +37,7 @@ public class OpenRuleChainTest extends AbstractDriverBaseTest {
     private OpenRuleChainPageHelper openRuleChainPage;
     private String ruleChainName;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/RuleChainEditMenuTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/RuleChainEditMenuTest.java
index f649fd7167..144ca0e836 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/RuleChainEditMenuTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/RuleChainEditMenuTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -39,7 +39,7 @@ public class RuleChainEditMenuTest extends AbstractDriverBaseTest {
     private RuleChainsPageHelper ruleChainsPage;
     private String ruleChainName;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SearchRuleChainTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SearchRuleChainTest.java
index ef7aafed25..29c5b21556 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SearchRuleChainTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SearchRuleChainTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke;
 
 import io.qameta.allure.Description;
 import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -32,7 +32,7 @@ public class SearchRuleChainTest extends AbstractDriverBaseTest {
     private SideBarMenuViewElements sideBarMenuView;
     private RuleChainsPageHelper ruleChainsPage;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByNameTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByNameTest.java
index 55c72ec6ad..84cd1028e8 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByNameTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByNameTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -34,7 +34,7 @@ public class SortByNameTest extends AbstractDriverBaseTest {
     private RuleChainsPageHelper ruleChainsPage;
     private String ruleChainName;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByTimeTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByTimeTest.java
index 80d290166c..4654654fb5 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByTimeTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByTimeTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.msa.ui.tests.ruleChainsSmoke;
 import io.qameta.allure.Description;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
@@ -34,7 +34,7 @@ public class SortByTimeTest extends AbstractDriverBaseTest {
     private RuleChainsPageHelper ruleChainsPage;
     private String ruleChainName;
 
-    @BeforeMethod
+    @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
         sideBarMenuView = new SideBarMenuViewElements(driver);
diff --git a/pom.xml b/pom.xml
index 7d6b59f10b..49f30df835 100755
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,6 @@
         <snmp4j.version>2.8.5</snmp4j.version>
         <!--         TEST SCOPE         -->
         <awaitility.version>4.1.0</awaitility.version>
-        <cassandra-unit.version>4.3.1.0</cassandra-unit.version>
         <dbunit.version>2.7.2</dbunit.version>
         <java-websocket.version>1.5.2</java-websocket.version>
         <jupiter.version>5.8.2</jupiter.version> <!-- keep the same version as spring-boot-starter-test depend on jupiter-->
@@ -147,8 +146,8 @@
         <aerogear-otp.version>1.0.0</aerogear-otp.version>
         <selenium.version>4.6.0</selenium.version>
         <webdrivermanager.version>5.2.0</webdrivermanager.version>
-        <allure-testng.version>2.19.0</allure-testng.version>
-        <allure-maven.version>2.8</allure-maven.version>
+        <allure-testng.version>2.21.0</allure-testng.version>
+        <allure-maven.version>2.12.0</allure-maven.version>
     </properties>
 
     <modules>
@@ -659,7 +658,7 @@
                     <version>${surefire.version}</version>
                     <configuration>
                         <argLine>
-                            --illegal-access=permit -Xss384k -XX:+UseStringDeduplication -XX:MaxGCPauseMillis=20
+                            --illegal-access=permit -XX:+UseStringDeduplication -XX:MaxGCPauseMillis=20
                         </argLine>
                     </configuration>
                 </plugin>
@@ -1603,26 +1602,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.cassandraunit</groupId>
-                <artifactId>cassandra-unit</artifactId>
-                <version>${cassandra-unit.version}</version>
-                <scope>test</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.hamcrest</groupId>
-                        <artifactId>hamcrest-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.hamcrest</groupId>
-                        <artifactId>hamcrest-library</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.apache.cassandra</groupId>
                 <artifactId>cassandra-all</artifactId>
@@ -1746,6 +1725,12 @@
                 <artifactId>bcpkix-jdk15on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>cassandra</artifactId>
+                <version>${testcontainers.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>postgresql</artifactId>
diff --git a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
index 058d9c08fd..c2c0a6d794 100644
--- a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
+++ b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
@@ -415,6 +415,14 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
         restTemplate.postForLocation(baseURL + "/api/alarm/{alarmId}/clear", null, alarmId.getId());
     }
 
+    public void assignAlarm(AlarmId alarmId, UserId userId) {
+        restTemplate.postForLocation(baseURL + "/api/alarm/{alarmId}/assign/{userId}", null, alarmId.getId(), userId.getId());
+    }
+
+    public void unassignAlarm(AlarmId alarmId) {
+        restTemplate.delete(baseURL + "/api/alarm/{alarmId}/assign", alarmId.getId());
+    }
+
     public PageData<AlarmInfo> getAlarms(EntityId entityId, AlarmSearchStatus searchStatus, AlarmStatus status, TimePageLink pageLink, Boolean fetchOriginator) {
         String urlSecondPart = "/api/alarm/{entityType}/{entityId}?fetchOriginator={fetchOriginator}";
         Map<String, String> params = new HashMap<>();
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineAlarmService.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineAlarmService.java
index 2620ecd069..e88411d73a 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineAlarmService.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineAlarmService.java
@@ -16,6 +16,7 @@
 package org.thingsboard.rule.engine.api;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
@@ -23,13 +24,17 @@ import org.thingsboard.server.common.data.alarm.AlarmQuery;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
 import org.thingsboard.server.common.data.id.AlarmId;
 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.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 import org.thingsboard.server.dao.alarm.AlarmOperationResult;
 
 import java.util.Collection;
@@ -39,29 +44,65 @@ import java.util.Collection;
  */
 public interface RuleEngineAlarmService {
 
-    Alarm createOrUpdateAlarm(Alarm alarm);
+    /*
+     *  New API, since 3.5.
+     */
 
-    Boolean deleteAlarm(TenantId tenantId, AlarmId alarmId);
+    /**
+     * Designed for atomic operations over active alarms.
+     * Only one active alarm may exist for the pair {originatorId, alarmType}
+     */
+    AlarmApiCallResult createAlarm(AlarmCreateOrUpdateActiveRequest request);
+    /**
+     * Designed to update existing alarm. Accepts only part of the alarm fields.
+     */
+    AlarmApiCallResult updateAlarm(AlarmUpdateRequest request);
+
+    AlarmApiCallResult acknowledgeAlarm(TenantId tenantId, AlarmId alarmId, long ackTs);
+
+    AlarmApiCallResult clearAlarm(TenantId tenantId, AlarmId alarmId, long clearTs, JsonNode details);
+
+    AlarmApiCallResult assignAlarm(TenantId tenantId, AlarmId alarmId, UserId assigneeId, long assignTs);
+
+    AlarmApiCallResult unassignAlarm(TenantId tenantId, AlarmId alarmId, long assignTs);
 
+    /*
+     *  Legacy API, before 3.5.
+     */
+    @Deprecated(since = "3.5", forRemoval = true)
+    Alarm createOrUpdateAlarm(Alarm alarm);
+
+    @Deprecated(since = "3.5", forRemoval = true)
     ListenableFuture<Boolean> ackAlarm(TenantId tenantId, AlarmId alarmId, long ackTs);
 
+    @Deprecated(since = "3.5", forRemoval = true)
     ListenableFuture<Boolean> clearAlarm(TenantId tenantId, AlarmId alarmId, JsonNode details, long clearTs);
 
+    @Deprecated(since = "3.5", forRemoval = true)
     ListenableFuture<AlarmOperationResult> clearAlarmForResult(TenantId tenantId, AlarmId alarmId, JsonNode details, long clearTs);
 
+    // Other API
+    Boolean deleteAlarm(TenantId tenantId, AlarmId alarmId);
+
     ListenableFuture<Alarm> findAlarmByIdAsync(TenantId tenantId, AlarmId alarmId);
 
     Alarm findAlarmById(TenantId tenantId, AlarmId alarmId);
 
+    Alarm findLatestActiveByOriginatorAndType(TenantId tenantId, EntityId originator, String type);
+
     ListenableFuture<Alarm> findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type);
 
-    ListenableFuture<AlarmInfo> findAlarmInfoByIdAsync(TenantId tenantId, AlarmId alarmId);
+    AlarmInfo findAlarmInfoById(TenantId tenantId, AlarmId alarmId);
+
+    default ListenableFuture<AlarmInfo> findAlarmInfoByIdAsync(TenantId tenantId, AlarmId alarmId) {
+        return Futures.immediateFuture(findAlarmInfoById(tenantId, alarmId));
+    }
 
     ListenableFuture<PageData<AlarmInfo>> findAlarms(TenantId tenantId, AlarmQuery query);
 
     ListenableFuture<PageData<AlarmInfo>> findCustomerAlarms(TenantId tenantId, CustomerId customerId, AlarmQuery query);
 
-    AlarmSeverity findHighestAlarmSeverity(TenantId tenantId, EntityId entityId, AlarmSearchStatus alarmSearchStatus, AlarmStatus alarmStatus);
+    AlarmSeverity findHighestAlarmSeverity(TenantId tenantId, EntityId entityId, AlarmSearchStatus alarmSearchStatus, AlarmStatus alarmStatus, String assigneeId);
 
     PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, AlarmDataQuery query, Collection<EntityId> orderedEntityIds);
 }
diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml
index 56621162f7..e85f0094b5 100644
--- a/rule-engine/rule-engine-components/pom.xml
+++ b/rule-engine/rule-engine-components/pom.xml
@@ -150,22 +150,6 @@
             <artifactId>mockserver-client-java</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.cassandraunit</groupId>
-            <artifactId>cassandra-unit</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-validator</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmResult.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmResult.java
index b5658a3451..3641d78b7c 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmResult.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmResult.java
@@ -17,7 +17,9 @@ package org.thingsboard.rule.engine.action;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import org.jetbrains.annotations.NotNull;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 
 @Data
 @AllArgsConstructor
@@ -34,4 +36,8 @@ public class TbAlarmResult {
         this.isCleared = isCleared;
         this.alarm = alarm;
     }
+
+    public static TbAlarmResult fromAlarmResult(AlarmApiCallResult result) {
+        return new TbAlarmResult(result.isCreated(), result.isModified(), result.isSeverityChanged(), result.isCleared(), result.getAlarm());
+    }
 }
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 f94b4c36e2..ee32ac1533 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
@@ -26,10 +26,10 @@ import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.Alarm;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 
 @Slf4j
 @RuleNode(
@@ -57,38 +57,29 @@ public class TbClearAlarmNode extends TbAbstractAlarmNode<TbClearAlarmNodeConfig
     @Override
     protected ListenableFuture<TbAlarmResult> processAlarm(TbContext ctx, TbMsg msg) {
         String alarmType = TbNodeUtils.processPattern(this.config.getAlarmType(), msg);
-        ListenableFuture<Alarm> alarmFuture;
+        Alarm alarm;
         if (msg.getOriginator().getEntityType().equals(EntityType.ALARM)) {
-            alarmFuture = ctx.getAlarmService().findAlarmByIdAsync(ctx.getTenantId(), new AlarmId(msg.getOriginator().getId()));
+            alarm = ctx.getAlarmService().findAlarmById(ctx.getTenantId(), new AlarmId(msg.getOriginator().getId()));
         } else {
-            alarmFuture = ctx.getAlarmService().findLatestByOriginatorAndType(ctx.getTenantId(), msg.getOriginator(), alarmType);
+            alarm = ctx.getAlarmService().findLatestActiveByOriginatorAndType(ctx.getTenantId(), msg.getOriginator(), alarmType);
         }
-        return Futures.transformAsync(alarmFuture, a -> {
-            if (a != null && !a.getStatus().isCleared()) {
-                return clearAlarm(ctx, msg, a);
-            }
-            return Futures.immediateFuture(new TbAlarmResult(false, false, false, null));
-        }, ctx.getDbCallbackExecutor());
+        if (alarm != null && !alarm.getStatus().isCleared()) {
+            return clearAlarm(ctx, msg, alarm);
+        }
+        return Futures.immediateFuture(new TbAlarmResult(false, false, false, null));
     }
 
     private ListenableFuture<TbAlarmResult> clearAlarm(TbContext ctx, TbMsg msg, Alarm alarm) {
         ctx.logJsEvalRequest();
         ListenableFuture<JsonNode> asyncDetails = buildAlarmDetails(ctx, msg, alarm.getDetails());
-        return Futures.transformAsync(asyncDetails, details -> {
+        return Futures.transform(asyncDetails, details -> {
             ctx.logJsEvalResponse();
-            ListenableFuture<Boolean> clearFuture = ctx.getAlarmService().clearAlarm(ctx.getTenantId(), alarm.getId(), details, System.currentTimeMillis());
-            return Futures.transformAsync(clearFuture, cleared -> {
-                ListenableFuture<Alarm> savedAlarmFuture = ctx.getAlarmService().findAlarmByIdAsync(ctx.getTenantId(), alarm.getId());
-                return Futures.transformAsync(savedAlarmFuture, savedAlarm -> {
-                    if (cleared && savedAlarm != null) {
-                        alarm.setDetails(savedAlarm.getDetails());
-                        alarm.setEndTs(savedAlarm.getEndTs());
-                        alarm.setClearTs(savedAlarm.getClearTs());
-                    }
-                    alarm.setStatus(alarm.getStatus().isAck() ? AlarmStatus.CLEARED_ACK : AlarmStatus.CLEARED_UNACK);
-                    return Futures.immediateFuture(new TbAlarmResult(false, false, true, alarm));
-                }, ctx.getDbCallbackExecutor());
-            }, ctx.getDbCallbackExecutor());
+            AlarmApiCallResult result = ctx.getAlarmService().clearAlarm(ctx.getTenantId(), alarm.getId(), System.currentTimeMillis(), details);
+            if (result.isSuccessful()) {
+                return new TbAlarmResult(false, false, result.isCleared(), result.getAlarm());
+            } else {
+                return new TbAlarmResult(false, false, false, alarm);
+            }
         }, ctx.getDbCallbackExecutor());
     }
 }
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 104acadda7..333926864d 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
@@ -17,13 +17,11 @@ package org.thingsboard.rule.engine.action;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Function;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.EnumUtils;
-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.TbNodeConfiguration;
@@ -31,10 +29,12 @@ import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 
 import java.io.IOException;
 import java.util.List;
@@ -57,16 +57,16 @@ import java.util.List;
 )
 public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConfiguration> {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static final ObjectMapper mapper = new ObjectMapper();
     private List<String> relationTypes;
     private AlarmSeverity notDynamicAlarmSeverity;
 
     @Override
     public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
         super.init(ctx, configuration);
-        if(!this.config.isDynamicSeverity()) {
+        if (!this.config.isDynamicSeverity()) {
             this.notDynamicAlarmSeverity = EnumUtils.getEnum(AlarmSeverity.class, this.config.getSeverity());
-            if(this.notDynamicAlarmSeverity == null) {
+            if (this.notDynamicAlarmSeverity == null) {
                 throw new TbNodeException("Incorrect Alarm Severity value: " + this.config.getSeverity());
             }
         }
@@ -98,15 +98,12 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
             }
         }
 
-        ListenableFuture<Alarm> latest = ctx.getAlarmService().findLatestByOriginatorAndType(ctx.getTenantId(), msg.getOriginator(), alarmType);
-        return Futures.transformAsync(latest, existingAlarm -> {
-            if (existingAlarm == null || existingAlarm.getStatus().isCleared()) {
-                return createNewAlarm(ctx, msg, msgAlarm);
-            } else {
-                return updateAlarm(ctx, msg, existingAlarm, msgAlarm);
-            }
-        }, ctx.getDbCallbackExecutor());
-
+        Alarm existingAlarm = ctx.getAlarmService().findLatestActiveByOriginatorAndType(ctx.getTenantId(), msg.getOriginator(), alarmType);
+        if (existingAlarm == null || existingAlarm.getStatus().isCleared()) {
+            return createNewAlarm(ctx, msg, msgAlarm);
+        } else {
+            return updateAlarm(ctx, msg, existingAlarm, msgAlarm);
+        }
     }
 
     private Alarm getAlarmFromMessage(TbContext ctx, TbMsg msg) throws IOException {
@@ -116,9 +113,6 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
         if (msgAlarm.getOriginator() == null) {
             msgAlarm.setOriginator(msg.getOriginator());
         }
-        if (msgAlarm.getStatus() == null) {
-            msgAlarm.setStatus(AlarmStatus.ACTIVE_UNACK);
-        }
         return msgAlarm;
     }
 
@@ -131,7 +125,7 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
         } else {
             asyncDetails = Futures.immediateFuture(null);
         }
-        ListenableFuture<Alarm> asyncAlarm =  Futures.transform(asyncDetails, details -> {
+        ListenableFuture<Alarm> asyncAlarm = Futures.transform(asyncDetails, details -> {
             if (buildDetails) {
                 ctx.logJsEvalResponse();
             }
@@ -146,9 +140,9 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
             }
             return newAlarm;
         }, MoreExecutors.directExecutor());
-        ListenableFuture<Alarm> asyncCreated = Futures.transform(asyncAlarm,
-                alarm -> ctx.getAlarmService().createOrUpdateAlarm(alarm), ctx.getDbCallbackExecutor());
-        return Futures.transform(asyncCreated, alarm -> new TbAlarmResult(true, false, false, alarm), MoreExecutors.directExecutor());
+        ListenableFuture<AlarmApiCallResult> asyncCreated = Futures.transform(asyncAlarm,
+                alarm -> ctx.getAlarmService().createAlarm(AlarmCreateOrUpdateActiveRequest.fromAlarm(alarm)), ctx.getDbCallbackExecutor());
+        return Futures.transform(asyncCreated, TbAlarmResult::fromAlarmResult, MoreExecutors.directExecutor());
     }
 
     private ListenableFuture<TbAlarmResult> updateAlarm(TbContext ctx, TbMsg msg, Alarm existingAlarm, Alarm msgAlarm) {
@@ -160,7 +154,7 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
         } else {
             asyncDetails = Futures.immediateFuture(null);
         }
-        ListenableFuture<Alarm> asyncUpdated = Futures.transform(asyncDetails, (Function<JsonNode, Alarm>) details -> {
+        ListenableFuture<AlarmApiCallResult> asyncUpdated = Futures.transform(asyncDetails, details -> {
             if (buildDetails) {
                 ctx.logJsEvalResponse();
             }
@@ -184,10 +178,9 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
                 existingAlarm.setDetails(details);
             }
             existingAlarm.setEndTs(System.currentTimeMillis());
-            return ctx.getAlarmService().createOrUpdateAlarm(existingAlarm);
+            return ctx.getAlarmService().updateAlarm(AlarmUpdateRequest.fromAlarm(existingAlarm));
         }, ctx.getDbCallbackExecutor());
-
-        return Futures.transform(asyncUpdated, a -> new TbAlarmResult(false, true, false, a), MoreExecutors.directExecutor());
+        return Futures.transform(asyncUpdated, TbAlarmResult::fromAlarmResult, MoreExecutors.directExecutor());
     }
 
     private Alarm buildAlarm(TbMsg msg, JsonNode details, TenantId tenantId) {
@@ -195,7 +188,8 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
         return Alarm.builder()
                 .tenantId(tenantId)
                 .originator(msg.getOriginator())
-                .status(AlarmStatus.ACTIVE_UNACK)
+                .cleared(false)
+                .acknowledged(false)
                 .severity(this.config.isDynamicSeverity() ? processAlarmSeverity(msg) : notDynamicAlarmSeverity)
                 .propagate(config.isPropagate())
                 .propagateToOwner(config.isPropagateToOwner())
@@ -210,7 +204,7 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
 
     private AlarmSeverity processAlarmSeverity(TbMsg msg) {
         AlarmSeverity severity = EnumUtils.getEnum(AlarmSeverity.class, TbNodeUtils.processPattern(this.config.getSeverity(), msg));
-        if(severity == null) {
+        if (severity == null) {
             throw new RuntimeException("Used incorrect pattern or Alarm Severity not included in message");
         }
         return severity;
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 05cc9e41b7..a97eab801b 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
@@ -137,7 +137,7 @@ public class TbMsgGeneratorNode implements TbNode {
         }
         lastScheduledTs = lastScheduledTs + delay;
         long curDelay = Math.max(0L, (lastScheduledTs - curTs));
-        TbMsg tickMsg = ctx.newMsg(null, TB_MSG_GENERATOR_NODE_MSG, ctx.getSelfId(), new TbMsgMetaData(), "");
+        TbMsg tickMsg = ctx.newMsg(config.getQueueName(), TB_MSG_GENERATOR_NODE_MSG, ctx.getSelfId(), new TbMsgMetaData(), "");
         nextTickId = tickMsg.getId();
         ctx.tellSelf(tickMsg, curDelay);
     }
@@ -145,14 +145,14 @@ public class TbMsgGeneratorNode implements TbNode {
     private ListenableFuture<TbMsg> generate(TbContext ctx, TbMsg msg) {
         log.trace("generate, config {}", config);
         if (prevMsg == null) {
-            prevMsg = ctx.newMsg(null, "", originatorId, msg.getCustomerId(), new TbMsgMetaData(), "{}");
+            prevMsg = ctx.newMsg(config.getQueueName(), "", originatorId, msg.getCustomerId(), new TbMsgMetaData(), "{}");
         }
         if (initialized.get()) {
             ctx.logJsEvalRequest();
             return Futures.transformAsync(scriptEngine.executeGenerateAsync(prevMsg), generated -> {
                 log.trace("generate process response, generated {}, config {}", generated, config);
                 ctx.logJsEvalResponse();
-                prevMsg = ctx.newMsg(null, generated.getType(), originatorId, msg.getCustomerId(), generated.getMetaData(), generated.getData());
+                prevMsg = ctx.newMsg(config.getQueueName(), generated.getType(), originatorId, msg.getCustomerId(), generated.getMetaData(), generated.getData());
                 return Futures.immediateFuture(prevMsg);
             }, MoreExecutors.directExecutor()); //usually it runs on js-executor-remote-callback thread pool
         }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java
index 027f4aa708..5f12603832 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java
@@ -36,6 +36,7 @@ public class TbMsgGeneratorNodeConfiguration implements NodeConfiguration<TbMsgG
     private ScriptLanguage scriptLang;
     private String jsScript;
     private String tbelScript;
+    private String queueName;
 
     @Override
     public TbMsgGeneratorNodeConfiguration defaultConfiguration() {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmState.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmState.java
index 8002ff331f..32f2aa3c13 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmState.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmState.java
@@ -17,12 +17,10 @@ package org.thingsboard.rule.engine.profile;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.util.concurrent.ListenableFuture;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.common.util.DonAsynchron;
 import org.thingsboard.rule.engine.action.TbAlarmResult;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.profile.state.PersistedAlarmRuleState;
@@ -30,16 +28,16 @@ import org.thingsboard.rule.engine.profile.state.PersistedAlarmState;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionKeyType;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionSpecType;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileAlarm;
 import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.QueueId;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
-import org.thingsboard.server.dao.alarm.AlarmOperationResult;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -127,16 +125,12 @@ class AlarmState {
                 for (AlarmRuleState state : createRulesSortedBySeverityDesc) {
                     stateUpdate = clearAlarmState(stateUpdate, state);
                 }
-                ListenableFuture<AlarmOperationResult> alarmClearOperationResult = ctx.getAlarmService().clearAlarmForResult(
-                        ctx.getTenantId(), currentAlarm.getId(), createDetails(clearState), System.currentTimeMillis()
+                AlarmApiCallResult result = ctx.getAlarmService().clearAlarm(
+                        ctx.getTenantId(), currentAlarm.getId(), System.currentTimeMillis(), createDetails(clearState)
                 );
-                DonAsynchron.withCallback(alarmClearOperationResult,
-                        result -> {
-                            pushMsg(ctx, msg, new TbAlarmResult(false, false, true, result.getAlarm()), clearState);
-                        },
-                        throwable -> {
-                            throw new RuntimeException(throwable);
-                        });
+                if (result.isCleared()) {
+                    pushMsg(ctx, msg, new TbAlarmResult(false, false, true, result.getAlarm()), clearState);
+                }
                 currentAlarm = null;
             } else if (AlarmEvalResult.FALSE.equals(evalResult)) {
                 stateUpdate = clearAlarmState(stateUpdate, clearState);
@@ -165,9 +159,9 @@ class AlarmState {
         return true;
     }
 
-    public void initCurrentAlarm(TbContext ctx) throws InterruptedException, ExecutionException {
+    public void initCurrentAlarm(TbContext ctx) {
         if (!initialFetchDone) {
-            Alarm alarm = ctx.getAlarmService().findLatestByOriginatorAndType(ctx.getTenantId(), originator, alarmDefinition.getAlarmType()).get();
+            Alarm alarm = ctx.getAlarmService().findLatestActiveByOriginatorAndType(ctx.getTenantId(), originator, alarmDefinition.getAlarmType());
             if (alarm != null && !alarm.getStatus().isCleared()) {
                 currentAlarm = alarm;
             }
@@ -241,21 +235,18 @@ class AlarmState {
             // Skip update if severity is decreased.
             if (severity.ordinal() <= oldSeverity.ordinal()) {
                 currentAlarm.setDetails(createDetails(ruleState));
-                if (!oldSeverity.equals(severity)) {
-                    currentAlarm.setSeverity(severity);
-                    currentAlarm = ctx.getAlarmService().createOrUpdateAlarm(currentAlarm);
-                    return new TbAlarmResult(false, false, true, false, currentAlarm);
-                } else {
-                    currentAlarm = ctx.getAlarmService().createOrUpdateAlarm(currentAlarm);
-                    return new TbAlarmResult(false, true, false, false, currentAlarm);
-                }
+                currentAlarm.setSeverity(severity);
+                AlarmApiCallResult result = ctx.getAlarmService().updateAlarm(AlarmUpdateRequest.fromAlarm(currentAlarm));
+                currentAlarm = result.getAlarm();
+                return TbAlarmResult.fromAlarmResult(result);
             } else {
                 return null;
             }
         } else {
             currentAlarm = new Alarm();
             currentAlarm.setType(alarmDefinition.getAlarmType());
-            currentAlarm.setStatus(AlarmStatus.ACTIVE_UNACK);
+            currentAlarm.setAcknowledged(false);
+            currentAlarm.setCleared(false);
             currentAlarm.setSeverity(severity);
             long startTs = dataSnapshot.getTs();
             if (startTs == 0L) {
@@ -272,9 +263,9 @@ class AlarmState {
             if (alarmDefinition.getPropagateRelationTypes() != null) {
                 currentAlarm.setPropagateRelationTypes(alarmDefinition.getPropagateRelationTypes());
             }
-            currentAlarm = ctx.getAlarmService().createOrUpdateAlarm(currentAlarm);
-            boolean updated = currentAlarm.getStartTs() != currentAlarm.getEndTs();
-            return new TbAlarmResult(!updated, updated, false, false, currentAlarm);
+            AlarmApiCallResult result = ctx.getAlarmService().createAlarm(AlarmCreateOrUpdateActiveRequest.fromAlarm(currentAlarm));
+            currentAlarm = result.getAlarm();
+            return TbAlarmResult.fromAlarmResult(result);
         }
     }
 
@@ -342,7 +333,7 @@ class AlarmState {
 
     public void processAckAlarm(Alarm alarm) {
         if (currentAlarm != null && currentAlarm.getId().equals(alarm.getId())) {
-            currentAlarm.setStatus(alarm.getStatus());
+            currentAlarm.setAcknowledged(alarm.isAcknowledged());
             currentAlarm.setAckTs(alarm.getAckTs());
         }
     }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java
index 0b6a1d6ed9..c3a72392e1 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java
@@ -28,7 +28,6 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.mockito.stubbing.Answer;
 import org.thingsboard.common.util.ListeningExecutor;
 import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
 import org.thingsboard.rule.engine.api.ScriptEngine;
@@ -36,6 +35,9 @@ 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.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
 import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -46,6 +48,7 @@ import org.thingsboard.server.common.data.script.ScriptLanguage;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 
 import javax.script.ScriptException;
 import java.io.IOException;
@@ -59,7 +62,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.anyLong;
 import static org.mockito.Mockito.atMost;
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.same;
 import static org.mockito.Mockito.times;
@@ -71,9 +73,6 @@ import static org.thingsboard.server.common.data.DataConstants.IS_EXISTING_ALARM
 import static org.thingsboard.server.common.data.DataConstants.IS_NEW_ALARM;
 import static org.thingsboard.server.common.data.alarm.AlarmSeverity.CRITICAL;
 import static org.thingsboard.server.common.data.alarm.AlarmSeverity.WARNING;
-import static org.thingsboard.server.common.data.alarm.AlarmStatus.ACTIVE_UNACK;
-import static org.thingsboard.server.common.data.alarm.AlarmStatus.CLEARED_ACK;
-import static org.thingsboard.server.common.data.alarm.AlarmStatus.CLEARED_UNACK;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TbAlarmNodeTest {
@@ -93,16 +92,16 @@ public class TbAlarmNodeTest {
     @Captor
     private ArgumentCaptor<Consumer<Throwable>> failureCaptor;
 
-    private RuleChainId ruleChainId = new RuleChainId(Uuids.timeBased());
-    private RuleNodeId ruleNodeId = new RuleNodeId(Uuids.timeBased());
+    private final RuleChainId ruleChainId = new RuleChainId(Uuids.timeBased());
+    private final RuleNodeId ruleNodeId = new RuleNodeId(Uuids.timeBased());
 
     private ListeningExecutor dbExecutor;
 
-    private EntityId originator = new DeviceId(Uuids.timeBased());
-    private EntityId alarmOriginator = new AlarmId(Uuids.timeBased());
-    private TenantId tenantId = TenantId.fromUUID(Uuids.timeBased());
-    private TbMsgMetaData metaData = new TbMsgMetaData();
-    private String rawJson = "{\"name\": \"Vit\", \"passed\": 5}";
+    private final EntityId originator = new DeviceId(Uuids.timeBased());
+    private final EntityId alarmOriginator = new AlarmId(Uuids.timeBased());
+    private final TenantId tenantId = TenantId.fromUUID(Uuids.timeBased());
+    private final TbMsgMetaData metaData = new TbMsgMetaData();
+    private final String rawJson = "{\"name\": \"Vit\", \"passed\": 5}";
 
     @Before
     public void before() {
@@ -128,11 +127,26 @@ public class TbAlarmNodeTest {
         initWithCreateAlarmScript();
         metaData.putValue("key", "value");
         TbMsg msg = TbMsg.newMsg("USER", originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
+        long ts = msg.getTs();
 
         when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(Futures.immediateFuture(null));
-        doAnswer((Answer<Alarm>) invocationOnMock -> (Alarm) (invocationOnMock.getArguments())[0]).when(alarmService).createOrUpdateAlarm(any(Alarm.class));
-        long ts = msg.getTs();
+        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(null);
+        Alarm expectedAlarm = Alarm.builder()
+                .startTs(ts)
+                .endTs(ts)
+                .tenantId(tenantId)
+                .originator(originator)
+                .severity(CRITICAL)
+                .propagate(true)
+                .type("SomeType")
+                .details(null)
+                .build();
+        when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
+                AlarmApiCallResult.builder()
+                        .created(true)
+                        .alarm(new AlarmInfo(expectedAlarm))
+                        .build());
+
         node.onMsg(ctx, msg);
 
         verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
@@ -153,18 +167,6 @@ public class TbAlarmNodeTest {
         assertNotSame(metaData, metadataCaptor.getValue());
 
         Alarm actualAlarm = new ObjectMapper().readValue(dataCaptor.getValue().getBytes(), Alarm.class);
-        Alarm expectedAlarm = Alarm.builder()
-                .startTs(ts)
-                .endTs(ts)
-                .tenantId(tenantId)
-                .originator(originator)
-                .status(ACTIVE_UNACK)
-                .severity(CRITICAL)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .build();
-
         assertEquals(expectedAlarm, actualAlarm);
     }
 
@@ -175,7 +177,7 @@ public class TbAlarmNodeTest {
         TbMsg msg = TbMsg.newMsg("USER", originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
 
         when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFailedFuture(new NotImplementedException("message")));
-        when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(Futures.immediateFuture(null));
+        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(null);
 
         node.onMsg(ctx, msg);
 
@@ -183,10 +185,10 @@ public class TbAlarmNodeTest {
 
         verify(ctx).createScriptEngine(ScriptLanguage.JS, "DETAILS");
         verify(ctx).getAlarmService();
-        verify(ctx, times(3)).getDbCallbackExecutor();
+        verify(ctx, times(2)).getDbCallbackExecutor();
         verify(ctx).logJsEvalRequest();
         verify(ctx).getTenantId();
-        verify(alarmService).findLatestByOriginatorAndType(tenantId, originator, "SomeType");
+        verify(alarmService).findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType");
 
         verifyNoMoreInteractions(ctx, alarmService);
     }
@@ -197,12 +199,27 @@ public class TbAlarmNodeTest {
         metaData.putValue("key", "value");
         TbMsg msg = TbMsg.newMsg("USER", originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
         long ts = msg.getTs();
-        Alarm clearedAlarm = Alarm.builder().status(CLEARED_ACK).build();
+        Alarm clearedAlarm = Alarm.builder().cleared(true).acknowledged(true).build();
 
         when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(Futures.immediateFuture(clearedAlarm));
+        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(clearedAlarm);
 
-        doAnswer((Answer<Alarm>) invocationOnMock -> (Alarm) (invocationOnMock.getArguments())[0]).when(alarmService).createOrUpdateAlarm(any(Alarm.class));
+        Alarm expectedAlarm = Alarm.builder()
+                .startTs(ts)
+                .endTs(ts)
+                .tenantId(tenantId)
+                .originator(originator)
+                .severity(CRITICAL)
+                .propagate(true)
+                .type("SomeType")
+                .details(null)
+                .build();
+        when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
+                AlarmApiCallResult.builder()
+                        .successful(true)
+                        .created(true)
+                        .alarm(new AlarmInfo(expectedAlarm))
+                        .build());
 
         node.onMsg(ctx, msg);
 
@@ -225,35 +242,36 @@ public class TbAlarmNodeTest {
 
 
         Alarm actualAlarm = new ObjectMapper().readValue(dataCaptor.getValue().getBytes(), Alarm.class);
-        Alarm expectedAlarm = Alarm.builder()
-                .startTs(ts)
-                .endTs(ts)
-                .tenantId(tenantId)
-                .originator(originator)
-                .status(ACTIVE_UNACK)
-                .severity(CRITICAL)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .build();
-
         assertEquals(expectedAlarm, actualAlarm);
     }
 
     @Test
-    public void alarmCanBeUpdated() throws ScriptException, IOException {
+    public void alarmCanBeUpdated() throws IOException {
         initWithCreateAlarmScript();
         metaData.putValue("key", "value");
         TbMsg msg = TbMsg.newMsg("USER", originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
 
         long oldEndDate = System.currentTimeMillis();
-        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).status(ACTIVE_UNACK).severity(WARNING).endTs(oldEndDate).build();
+        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).severity(WARNING).endTs(oldEndDate).build();
 
         when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(Futures.immediateFuture(activeAlarm));
-
-        doAnswer((Answer<Alarm>) invocationOnMock -> (Alarm) (invocationOnMock.getArguments())[0]).when(alarmService).createOrUpdateAlarm(activeAlarm);
+        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(activeAlarm);
 
+        Alarm expectedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(originator)
+                .severity(CRITICAL)
+                .propagate(true)
+                .type("SomeType")
+                .details(null)
+                .endTs(activeAlarm.getEndTs())
+                .build();
+        when(alarmService.updateAlarm(any(AlarmUpdateRequest.class))).thenReturn(
+                AlarmApiCallResult.builder()
+                        .successful(true)
+                        .modified(true)
+                        .alarm(new AlarmInfo(expectedAlarm))
+                        .build());
         node.onMsg(ctx, msg);
 
         verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
@@ -274,18 +292,7 @@ public class TbAlarmNodeTest {
         assertNotSame(metaData, metadataCaptor.getValue());
 
         Alarm actualAlarm = new ObjectMapper().readValue(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertTrue(activeAlarm.getEndTs() > oldEndDate);
-        Alarm expectedAlarm = Alarm.builder()
-                .tenantId(tenantId)
-                .originator(originator)
-                .status(ACTIVE_UNACK)
-                .severity(CRITICAL)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .endTs(activeAlarm.getEndTs())
-                .build();
-
+        assertTrue(activeAlarm.getEndTs() >= oldEndDate);
         assertEquals(expectedAlarm, actualAlarm);
     }
 
@@ -293,17 +300,30 @@ public class TbAlarmNodeTest {
     public void alarmCanBeCleared() throws ScriptException, IOException {
         initWithClearAlarmScript();
         metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg( "USER", originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
+        TbMsg msg = TbMsg.newMsg("USER", originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
 
         long oldEndDate = System.currentTimeMillis();
-        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).status(ACTIVE_UNACK).severity(WARNING).endTs(oldEndDate).build();
+        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).severity(WARNING).endTs(oldEndDate).build();
+
+        Alarm expectedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(originator)
+                .cleared(true)
+                .severity(WARNING)
+                .propagate(false)
+                .type("SomeType")
+                .details(null)
+                .endTs(oldEndDate)
+                .build();
 
         when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(Futures.immediateFuture(activeAlarm));
-        when(alarmService.clearAlarm(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()), nullable(JsonNode.class), anyLong()))
-                .thenReturn(Futures.immediateFuture( false));
-        when(alarmService.findAlarmByIdAsync(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()))).thenReturn(Futures.immediateFuture(activeAlarm));
-//        doAnswer((Answer<Alarm>) invocationOnMock -> (Alarm) (invocationOnMock.getArguments())[0]).when(alarmService).createOrUpdateAlarm(activeAlarm);
+        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(activeAlarm);
+        when(alarmService.clearAlarm(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()), anyLong(), nullable(JsonNode.class)))
+                .thenReturn(AlarmApiCallResult.builder()
+                        .successful(true)
+                        .cleared(true)
+                        .alarm(new AlarmInfo(expectedAlarm))
+                        .build());
 
         node.onMsg(ctx, msg);
 
@@ -325,17 +345,6 @@ public class TbAlarmNodeTest {
         assertNotSame(metaData, metadataCaptor.getValue());
 
         Alarm actualAlarm = new ObjectMapper().readValue(dataCaptor.getValue().getBytes(), Alarm.class);
-        Alarm expectedAlarm = Alarm.builder()
-                .tenantId(tenantId)
-                .originator(originator)
-                .status(CLEARED_UNACK)
-                .severity(WARNING)
-                .propagate(false)
-                .type("SomeType")
-                .details(null)
-                .endTs(oldEndDate)
-                .build();
-
         assertEquals(expectedAlarm, actualAlarm);
     }
 
@@ -343,17 +352,33 @@ public class TbAlarmNodeTest {
     public void alarmCanBeClearedWithAlarmOriginator() throws ScriptException, IOException {
         initWithClearAlarmScript();
         metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg( "USER", alarmOriginator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
+        TbMsg msg = TbMsg.newMsg("USER", alarmOriginator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
 
         long oldEndDate = System.currentTimeMillis();
         AlarmId id = new AlarmId(alarmOriginator.getId());
-        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).status(ACTIVE_UNACK).severity(WARNING).endTs(oldEndDate).build();
+        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).severity(WARNING).endTs(oldEndDate).build();
         activeAlarm.setId(id);
 
+        Alarm expectedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(originator)
+                .cleared(true)
+                .severity(WARNING)
+                .propagate(false)
+                .type("SomeType")
+                .details(null)
+                .endTs(oldEndDate)
+                .build();
+        expectedAlarm.setId(id);
+
         when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findAlarmByIdAsync(tenantId, id)).thenReturn(Futures.immediateFuture(activeAlarm));
-        when(alarmService.clearAlarm(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()), nullable(JsonNode.class), anyLong())).thenReturn(Futures.immediateFuture(true));
-//        doAnswer((Answer<Alarm>) invocationOnMock -> (Alarm) (invocationOnMock.getArguments())[0]).when(alarmService).createOrUpdateAlarm(activeAlarm);
+        when(alarmService.findAlarmById(tenantId, id)).thenReturn(activeAlarm);
+        when(alarmService.clearAlarm(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()), anyLong(), nullable(JsonNode.class)))
+                .thenReturn(AlarmApiCallResult.builder()
+                        .successful(true)
+                        .cleared(true)
+                        .alarm(new AlarmInfo(expectedAlarm))
+                        .build());
 
         node.onMsg(ctx, msg);
 
@@ -375,18 +400,6 @@ public class TbAlarmNodeTest {
         assertNotSame(metaData, metadataCaptor.getValue());
 
         Alarm actualAlarm = new ObjectMapper().readValue(dataCaptor.getValue().getBytes(), Alarm.class);
-        Alarm expectedAlarm = Alarm.builder()
-                .tenantId(tenantId)
-                .originator(originator)
-                .status(CLEARED_UNACK)
-                .severity(WARNING)
-                .propagate(false)
-                .type("SomeType")
-                .details(null)
-                .endTs(oldEndDate)
-                .build();
-        expectedAlarm.setId(id);
-
         assertEquals(expectedAlarm, actualAlarm);
     }
 
@@ -415,9 +428,25 @@ public class TbAlarmNodeTest {
         metaData.putValue("key", "value");
         TbMsg msg = TbMsg.newMsg("USER", originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
         long ts = msg.getTs();
+        Alarm expectedAlarm = Alarm.builder()
+                .startTs(ts)
+                .endTs(ts)
+                .tenantId(tenantId)
+                .originator(originator)
+                .severity(WARNING)
+                .propagate(true)
+                .type("SomeType")
+                .details(null)
+                .build();
+
         when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(Futures.immediateFuture(null));
-        doAnswer((Answer<Alarm>) invocationOnMock -> (Alarm) (invocationOnMock.getArguments())[0]).when(alarmService).createOrUpdateAlarm(any(Alarm.class));
+        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(null);
+        when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
+                AlarmApiCallResult.builder()
+                        .successful(true)
+                        .created(true)
+                        .alarm(new AlarmInfo(expectedAlarm))
+                        .build());
 
         node.onMsg(ctx, msg);
 
@@ -439,18 +468,6 @@ public class TbAlarmNodeTest {
         assertNotSame(metaData, metadataCaptor.getValue());
 
         Alarm actualAlarm = new ObjectMapper().readValue(dataCaptor.getValue().getBytes(), Alarm.class);
-        Alarm expectedAlarm = Alarm.builder()
-                .startTs(ts)
-                .endTs(ts)
-                .tenantId(tenantId)
-                .originator(originator)
-                .status(ACTIVE_UNACK)
-                .severity(WARNING)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .build();
-
         assertEquals(expectedAlarm, actualAlarm);
     }
 
@@ -478,10 +495,25 @@ public class TbAlarmNodeTest {
         metaData.putValue("alarmSeverity", "WARNING");
         TbMsg msg = TbMsg.newMsg("USER", originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
         long ts = msg.getTs();
+        Alarm expectedAlarm = Alarm.builder()
+                .startTs(ts)
+                .endTs(ts)
+                .tenantId(tenantId)
+                .originator(originator)
+                .severity(WARNING)
+                .propagate(true)
+                .type("SomeType")
+                .details(null)
+                .build();
 
         when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(Futures.immediateFuture(null));
-        doAnswer((Answer<Alarm>) invocationOnMock -> (Alarm) (invocationOnMock.getArguments())[0]).when(alarmService).createOrUpdateAlarm(any(Alarm.class));
+        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(null);
+        when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
+                AlarmApiCallResult.builder()
+                        .successful(true)
+                        .created(true)
+                        .alarm(new AlarmInfo(expectedAlarm))
+                        .build());
 
         node.onMsg(ctx, msg);
 
@@ -502,23 +534,11 @@ public class TbAlarmNodeTest {
         assertNotSame(metaData, metadataCaptor.getValue());
 
         Alarm actualAlarm = new ObjectMapper().readValue(dataCaptor.getValue().getBytes(), Alarm.class);
-        Alarm expectedAlarm = Alarm.builder()
-                .startTs(ts)
-                .endTs(ts)
-                .tenantId(tenantId)
-                .originator(originator)
-                .status(ACTIVE_UNACK)
-                .severity(WARNING)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .build();
-
         assertEquals(expectedAlarm, actualAlarm);
     }
 
     @Test
-    public void testCreateAlarmsWithPropagationToTenantWithDynamicTypes() throws Exception{
+    public void testCreateAlarmsWithPropagationToTenantWithDynamicTypes() throws Exception {
         for (int i = 0; i < 10; i++) {
             var config = new TbCreateAlarmNodeConfiguration();
             config.setPropagateToTenant(true);
@@ -541,11 +561,26 @@ public class TbAlarmNodeTest {
 
             metaData.putValue("key", "value");
             TbMsg msg = TbMsg.newMsg("USER", originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
+            long ts = msg.getTs();
+            Alarm expectedAlarm = Alarm.builder()
+                    .startTs(ts)
+                    .endTs(ts)
+                    .tenantId(tenantId)
+                    .originator(originator)
+                    .severity(CRITICAL)
+                    .propagateToTenant(true)
+                    .type("SomeType" + i)
+                    .details(null)
+                    .build();
 
             when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-            when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType" + i)).thenReturn(Futures.immediateFuture(null));
-            doAnswer((Answer<Alarm>) invocationOnMock -> (Alarm) (invocationOnMock.getArguments())[0]).when(alarmService).createOrUpdateAlarm(any(Alarm.class));
-            long ts = msg.getTs();
+            when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType" + i)).thenReturn(null);
+            when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
+                    AlarmApiCallResult.builder()
+                            .successful(true)
+                            .created(true)
+                            .alarm(new AlarmInfo(expectedAlarm))
+                            .build());
             node.onMsg(ctx, msg);
 
             verify(ctx, atMost(10)).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
@@ -566,18 +601,6 @@ public class TbAlarmNodeTest {
             assertNotSame(metaData, metadataCaptor.getValue());
 
             Alarm actualAlarm = new ObjectMapper().readValue(dataCaptor.getValue().getBytes(), Alarm.class);
-            Alarm expectedAlarm = Alarm.builder()
-                    .startTs(ts)
-                    .endTs(ts)
-                    .tenantId(tenantId)
-                    .originator(originator)
-                    .status(ACTIVE_UNACK)
-                    .severity(CRITICAL)
-                    .propagateToTenant(true)
-                    .type("SomeType" + i)
-                    .details(null)
-                    .build();
-
             assertEquals(expectedAlarm, actualAlarm);
         }
     }
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 3d8652a7a0..bd761a084c 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
@@ -18,6 +18,7 @@ package org.thingsboard.rule.engine.metadata;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
@@ -70,14 +71,18 @@ public class TbGetTelemetryNodeTest {
         }
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void givenAggregationWhiteSpace_whenParseAggregation_thenException() {
-        node.parseAggregationConfig(" ");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            node.parseAggregationConfig(" ");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void givenAggregationIncorrect_whenParseAggregation_thenException() {
-        node.parseAggregationConfig("TOP");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            node.parseAggregationConfig("TOP");
+        });
     }
 
 }
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 fd10e1212e..f64661bc5b 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
@@ -25,6 +25,8 @@ import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilter;
@@ -42,6 +44,7 @@ import org.thingsboard.server.common.data.query.FilterPredicateValue;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.session.SessionMsgType;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.device.DeviceService;
 
@@ -77,11 +80,15 @@ public class DeviceStateTest {
         when(ctx.getAttributesService()).thenReturn(attributesService);
 
         RuleEngineAlarmService alarmService = mock(RuleEngineAlarmService.class);
-        when(alarmService.findLatestByOriginatorAndType(any(), any(), any())).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.createOrUpdateAlarm(any())).thenAnswer(invocationOnMock -> {
-            Alarm alarm = invocationOnMock.getArgument(0);
-            alarm.setId(new AlarmId(UUID.randomUUID()));
-            return alarm;
+        when(alarmService.findLatestActiveByOriginatorAndType(any(), any(), any())).thenReturn(null);
+        when(alarmService.createAlarm(any())).thenAnswer(invocationOnMock -> {
+            AlarmCreateOrUpdateActiveRequest request = invocationOnMock.getArgument(0);
+            return AlarmApiCallResult.builder()
+                    .successful(true)
+                    .created(true)
+                    .modified(true)
+                    .alarm(new AlarmInfo(new Alarm(new AlarmId(UUID.randomUUID()))))
+                    .build();
         });
         when(ctx.getAlarmService()).thenReturn(alarmService);
 
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 5d9abc130e..fb3085f3f7 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
@@ -21,7 +21,6 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.AdditionalAnswers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -34,6 +33,8 @@ import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilter;
@@ -46,6 +47,7 @@ import org.thingsboard.server.common.data.device.profile.DeviceProfileAlarm;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.device.profile.DurationAlarmConditionSpec;
 import org.thingsboard.server.common.data.device.profile.RepeatingAlarmConditionSpec;
+import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -62,6 +64,7 @@ import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.session.SessionMsgType;
+import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.model.sql.AttributeKvCompositeKey;
@@ -79,8 +82,10 @@ import java.util.TreeMap;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TbDeviceProfileNodeTest {
@@ -187,8 +192,8 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm")).thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any())).thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm")).thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
 
         TbMsg theMsg = TbMsg.newMsg("ALARM", deviceId, new TbMsgMetaData(), "");
         Mockito.when(ctx.newMsg(Mockito.any(), Mockito.anyString(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.anyString())).thenReturn(theMsg);
@@ -205,6 +210,8 @@ public class TbDeviceProfileNodeTest {
         TbMsg theMsg2 = TbMsg.newMsg("ALARM", deviceId, new TbMsgMetaData(), "2");
         Mockito.when(ctx.newMsg(Mockito.any(), Mockito.anyString(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.anyString())).thenReturn(theMsg2);
 
+        registerCreateAlarmMock(alarmService.updateAlarm(any()), false);
+
 
         TbMsg msg2 = TbMsg.newMsg(SessionMsgType.POST_TELEMETRY_REQUEST.name(), deviceId, new TbMsgMetaData(),
                 TbMsgDataType.JSON, mapper.writeValueAsString(data), null, null);
@@ -274,9 +281,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "alarmEnabledAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any())).thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "alarmEnabledAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
                 .thenReturn(attrListListenableFuture);
@@ -357,9 +364,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "alarmEnabledAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any())).thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "alarmEnabledAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
@@ -430,9 +437,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any())).thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
                 .thenReturn(listListenableFutureWithLess);
@@ -524,9 +531,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any())).thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
                 .thenReturn(listListenableFuture);
@@ -642,9 +649,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any())).thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), Mockito.anyString(), Mockito.anyString()))
                 .thenReturn(optionalDurationAttribute);
@@ -757,9 +764,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any())).thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
                 .thenReturn(listListenableFuture);
@@ -867,9 +874,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any())).thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), Mockito.anyString(), Mockito.anyString()))
                 .thenReturn(optionalDurationAttribute);
@@ -969,9 +976,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any())).thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
                 .thenReturn(listListenableFuture);
@@ -1067,9 +1074,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any())).thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
                 .thenReturn(listListenableFuture);
@@ -1149,9 +1156,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any())).thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
                 .thenReturn(listListenableFutureActiveSchedule);
@@ -1246,8 +1253,8 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
+                .thenReturn(null);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
                 .thenReturn(listListenableFutureInactiveSchedule);
@@ -1319,9 +1326,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "lessTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any())).thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "lessTemperatureAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
                 .thenReturn(listListenableFutureWithLess);
@@ -1394,10 +1401,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "lessTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any()))
-                .thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "lessTemperatureAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
                 .thenReturn(listListenableFutureWithLess);
@@ -1474,10 +1480,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "lessTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any()))
-                .thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "lessTemperatureAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(ctx.getDeviceService().findDeviceById(tenantId, deviceId))
                 .thenReturn(device);
@@ -1485,7 +1490,7 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(listListenableFutureWithLess);
         Mockito.when(attributesService.find(eq(tenantId), eq(customerId), Mockito.anyString(), Mockito.anyString()))
                 .thenReturn(emptyOptionalFuture);
-        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), eq(DataConstants.SERVER_SCOPE),  Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), eq(DataConstants.SERVER_SCOPE), Mockito.anyString()))
                 .thenReturn(optionalListenableFutureWithLess);
 
         TbMsg theMsg = TbMsg.newMsg("ALARM", deviceId, new TbMsgMetaData(), "");
@@ -1560,10 +1565,9 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(cache.get(tenantId, deviceId)).thenReturn(deviceProfile);
         Mockito.when(timeseriesService.findLatest(tenantId, deviceId, Collections.singleton("temperature")))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(alarmService.findLatestByOriginatorAndType(tenantId, deviceId, "greaterTemperatureAlarm"))
-                .thenReturn(Futures.immediateFuture(null));
-        Mockito.when(alarmService.createOrUpdateAlarm(Mockito.any()))
-                .thenAnswer(AdditionalAnswers.returnsFirstArg());
+        Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "greaterTemperatureAlarm"))
+                .thenReturn(null);
+        registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(ctx.getDeviceService().findDeviceById(tenantId, deviceId))
                 .thenReturn(device);
@@ -1571,7 +1575,7 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(listListenableFutureWithLess);
         Mockito.when(attributesService.find(eq(tenantId), eq(customerId), Mockito.anyString(), Mockito.anyString()))
                 .thenReturn(emptyOptionalFuture);
-        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), eq(DataConstants.SERVER_SCOPE),  Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), eq(DataConstants.SERVER_SCOPE), Mockito.anyString()))
                 .thenReturn(optionalListenableFutureWithLess);
 
         TbMsg theMsg = TbMsg.newMsg("ALARM", deviceId, new TbMsgMetaData(), "");
@@ -1601,4 +1605,18 @@ public class TbDeviceProfileNodeTest {
         node.init(ctx, nodeConfiguration);
     }
 
+    private void registerCreateAlarmMock(AlarmApiCallResult a, boolean created) {
+        when(a).thenAnswer(invocationOnMock -> {
+//            AlarmCreateOrUpdateActiveRequest request = invocationOnMock.getArgument(0);
+            AlarmInfo alarm = new AlarmInfo(new Alarm(new AlarmId(UUID.randomUUID())));
+            alarm.setSeverity(AlarmSeverity.CRITICAL);
+            return AlarmApiCallResult.builder()
+                    .successful(true)
+                    .created(created)
+                    .modified(true)
+                    .alarm(alarm)
+                    .build();
+        });
+    }
+
 }
diff --git a/ui-ngx/angular.json b/ui-ngx/angular.json
index a875eed727..cc13556d4b 100644
--- a/ui-ngx/angular.json
+++ b/ui-ngx/angular.json
@@ -140,7 +140,8 @@
               "ace",
               "ace-builds",
               "diff-match-patch",
-              "tv4"
+              "tv4",
+              "@messageformat/parser"
             ]
           },
           "configurations": {
diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index 0591bc9dc6..a8abb6fbeb 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -32,10 +32,11 @@
     "@flowjs/ngx-flow": "~0.6.0",
     "@geoman-io/leaflet-geoman-free": "^2.13.0",
     "@juggle/resize-observer": "^3.3.1",
-    "@mat-datetimepicker/core": "~11.0.2",
+    "@mat-datetimepicker/core": "~11.0.3",
     "@material-ui/core": "4.12.3",
     "@material-ui/icons": "4.11.2",
     "@material-ui/pickers": "3.3.10",
+    "@messageformat/core": "^3.0.1",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
     "@ngrx/store-devtools": "^15.3.0",
@@ -67,9 +68,8 @@
     "leaflet.markercluster": "^1.5.3",
     "libphonenumber-js": "^1.10.4",
     "marked": "^4.0.17",
-    "messageformat": "^2.3.0",
-    "moment": "^2.29.1",
-    "moment-timezone": "^0.5.40",
+    "moment": "^2.29.4",
+    "moment-timezone": "^0.5.41",
     "ngx-clipboard": "^15.1.0",
     "ngx-color-picker": "^13.0.0",
     "ngx-daterangepicker-material": "^6.0.4",
@@ -78,7 +78,7 @@
     "ngx-hm-carousel": "^3.0.0",
     "ngx-markdown": "^15.1.1",
     "ngx-sharebuttons": "^11.0.0",
-    "ngx-translate-messageformat-compiler": "^5.1.0",
+    "ngx-translate-messageformat-compiler": "^6.2.0",
     "objectpath": "^2.0.0",
     "prettier": "^2.8.3",
     "prop-types": "^15.8.1",
@@ -131,7 +131,6 @@
     "@types/leaflet.markercluster": "^1.5.1",
     "@types/lodash": "^4.14.177",
     "@types/marked": "^4.0.3",
-    "@types/moment-timezone": "^0.5.30",
     "@types/mousetrap": "^1.6.0",
     "@types/node": "~15.14.9",
     "@types/raphael": "^2.3.2",
@@ -169,4 +168,4 @@
     "ace-builds": "1.4.13",
     "@date-io/core": "1.3.7"
   }
-}
\ No newline at end of file
+}
diff --git a/ui-ngx/src/app/core/api/widget-api.models.ts b/ui-ngx/src/app/core/api/widget-api.models.ts
index 45ac09120e..c6e00ab882 100644
--- a/ui-ngx/src/app/core/api/widget-api.models.ts
+++ b/ui-ngx/src/app/core/api/widget-api.models.ts
@@ -56,6 +56,7 @@ import { AlarmDataService } from '@core/api/alarm-data.service';
 import { IDashboardController } from '@home/components/dashboard-page/dashboard-page.models';
 import { PopoverPlacement } from '@shared/components/popover.models';
 import { PersistentRpc } from '@shared/models/rpc.models';
+import { EventEmitter } from '@angular/core';
 
 export interface TimewindowFunctions {
   onUpdateTimewindow: (startTimeMs: number, endTimeMs: number, interval?: number) => void;
@@ -338,6 +339,8 @@ export interface IWidgetSubscription {
                             pageLink: EntityDataPageLink,
                             keyFilters: KeyFilter[]): Observable<any>;
 
+  paginatedDataSubscriptionUpdated: EventEmitter<void>;
+
   subscribeForAlarms(pageLink: AlarmDataPageLink,
                      keyFilters: KeyFilter[]): void;
 
diff --git a/ui-ngx/src/app/core/api/widget-subscription.ts b/ui-ngx/src/app/core/api/widget-subscription.ts
index 5d3eae16e3..9d07c751a5 100644
--- a/ui-ngx/src/app/core/api/widget-subscription.ts
+++ b/ui-ngx/src/app/core/api/widget-subscription.ts
@@ -80,6 +80,7 @@ import {
 import { distinct, filter, map, switchMap, takeUntil } from 'rxjs/operators';
 import { AlarmDataListener } from '@core/api/alarm-data.service';
 import { RpcStatus } from '@shared/models/rpc.models';
+import { EventEmitter } from '@angular/core';
 
 const moment = moment_;
 
@@ -214,6 +215,8 @@ export class WidgetSubscription implements IWidgetSubscription {
     distinct()
   );
 
+  paginatedDataSubscriptionUpdated = new EventEmitter<void>();
+
   constructor(subscriptionContext: WidgetSubscriptionContext, public options: WidgetSubscriptionOptions) {
     const subscriptionSubject = new ReplaySubject<IWidgetSubscription>();
     this.init$ = subscriptionSubject.asObservable();
@@ -939,6 +942,13 @@ export class WidgetSubscription implements IWidgetSubscription {
     }
   }
 
+  stopSubscription(datasourceIndex: number) {
+    const entityDataListener = this.entityDataListeners[datasourceIndex];
+    if (entityDataListener) {
+      this.ctx.entityDataService.stopSubscription(entityDataListener);
+    }
+  }
+
   subscribeForPaginatedData(datasourceIndex: number,
                             pageLink: EntityDataPageLink,
                             keyFilters: KeyFilter[]): Observable<any> {
@@ -1193,6 +1203,10 @@ export class WidgetSubscription implements IWidgetSubscription {
   }
 
   private updatePaginatedDataSubscriptions() {
+    for (let datasourceIndex = 0; datasourceIndex < this.entityDataListeners.length; datasourceIndex++) {
+      this.stopSubscription(datasourceIndex);
+    }
+    this.paginatedDataSubscriptionUpdated.emit();
     for (let datasourceIndex = 0; datasourceIndex < this.entityDataListeners.length; datasourceIndex++) {
       const entityDataListener = this.entityDataListeners[datasourceIndex];
       if (entityDataListener) {
diff --git a/ui-ngx/src/app/core/http/alarm-comment.service.ts b/ui-ngx/src/app/core/http/alarm-comment.service.ts
new file mode 100644
index 0000000000..ffb8fc4528
--- /dev/null
+++ b/ui-ngx/src/app/core/http/alarm-comment.service.ts
@@ -0,0 +1,46 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { Injectable } from '@angular/core';
+import { defaultHttpOptionsFromConfig, RequestConfig } from './http-utils';
+import { Observable } from 'rxjs';
+import { HttpClient } from '@angular/common/http';
+import { PageLink } from '@shared/models/page/page-link';
+import { PageData } from '@shared/models/page/page-data';
+import { AlarmComment, AlarmCommentInfo } from '@shared/models/alarm.models';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AlarmCommentService {
+
+  constructor(
+    private http: HttpClient
+  ) { }
+
+  public saveAlarmComment(alarmId: string, alarmComment: AlarmComment, config?: RequestConfig): Observable<AlarmComment> {
+    return this.http.post<AlarmComment>(`/api/alarm/${alarmId}/comment`, alarmComment, defaultHttpOptionsFromConfig(config));
+  }
+
+  public getAlarmComments(alarmId: string, pageLink: PageLink, config?: RequestConfig): Observable<PageData<AlarmCommentInfo>> {
+    return this.http.get<PageData<AlarmComment>>(`/api/alarm/${alarmId}/comment${pageLink.toQuery()}`, defaultHttpOptionsFromConfig(config));
+  }
+
+  public deleteAlarmComments(alarmId: string, commentId: string, config?: RequestConfig): Observable<void> {
+    return this.http.delete<void>(`/api/alarm/${alarmId}/comment/${commentId}`, defaultHttpOptionsFromConfig(config));
+  }
+
+}
diff --git a/ui-ngx/src/app/core/http/alarm.service.ts b/ui-ngx/src/app/core/http/alarm.service.ts
index 802045b684..076f590199 100644
--- a/ui-ngx/src/app/core/http/alarm.service.ts
+++ b/ui-ngx/src/app/core/http/alarm.service.ts
@@ -60,6 +60,14 @@ export class AlarmService {
     return this.http.post<void>(`/api/alarm/${alarmId}/clear`, null, defaultHttpOptionsFromConfig(config));
   }
 
+  public assignAlarm(alarmId: string, assigneeId: string, config?: RequestConfig): Observable<void> {
+    return this.http.post<void>(`/api/alarm/${alarmId}/assign/${assigneeId}`, null, defaultHttpOptionsFromConfig(config));
+  }
+
+  public unassignAlarm(alarmId: string, config?: RequestConfig): Observable<void> {
+    return this.http.delete<void>(`/api/alarm/${alarmId}/assign`, defaultHttpOptionsFromConfig(config));
+  }
+
   public deleteAlarm(alarmId: string, config?: RequestConfig): Observable<void> {
     return this.http.delete<void>(`/api/alarm/${alarmId}`, defaultHttpOptionsFromConfig(config));
   }
diff --git a/ui-ngx/src/app/core/http/user.service.ts b/ui-ngx/src/app/core/http/user.service.ts
index 0a7d2054e4..9a6b70ce29 100644
--- a/ui-ngx/src/app/core/http/user.service.ts
+++ b/ui-ngx/src/app/core/http/user.service.ts
@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 import { defaultHttpOptionsFromConfig, RequestConfig } from './http-utils';
-import { User } from '@shared/models/user.model';
+import { User, UserEmailInfo } from '@shared/models/user.model';
 import { Observable } from 'rxjs';
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { PageLink } from '@shared/models/page/page-link';
@@ -84,4 +84,8 @@ export class UserService {
     return this.http.post<User>(url, null, defaultHttpOptionsFromConfig(config));
   }
 
+  public findUsersByQuery(pageLink: PageLink, config?: RequestConfig) : Observable<PageData<UserEmailInfo>> {
+    return this.http.get<PageData<UserEmailInfo>>(`/api/users/info${pageLink.toQuery()}`, defaultHttpOptionsFromConfig(config));
+  }
+
 }
diff --git a/ui-ngx/src/app/core/services/dynamic-component-factory.service.ts b/ui-ngx/src/app/core/services/dynamic-component-factory.service.ts
index b4afeae6c3..84134f04a9 100644
--- a/ui-ngx/src/app/core/services/dynamic-component-factory.service.ts
+++ b/ui-ngx/src/app/core/services/dynamic-component-factory.service.ts
@@ -59,10 +59,11 @@ export class DynamicComponentFactoryService {
                      template: string,
                      modules?: Type<any>[],
                      preserveWhitespaces?: boolean,
-                     compileAttempt = 1): Observable<ComponentFactory<T>> {
+                     compileAttempt = 1,
+                     styles?: string[]): Observable<ComponentFactory<T>> {
     return from(import('@angular/compiler')).pipe(
       mergeMap(() => {
-        const comp = this.createDynamicComponent(componentType, template, preserveWhitespaces);
+        const comp = this.createDynamicComponent(componentType, template, preserveWhitespaces, styles);
         let moduleImports: Type<any>[] = [CommonModule];
         if (modules) {
           moduleImports = [...moduleImports, ...modules];
@@ -91,7 +92,7 @@ export class DynamicComponentFactoryService {
           catchError((error) => {
             if (compileAttempt === 1) {
               ɵresetCompiledComponents();
-              return this.createDynamicComponentFactory(componentType, template, modules, preserveWhitespaces, ++compileAttempt);
+              return this.createDynamicComponentFactory(componentType, template, modules, preserveWhitespaces, ++compileAttempt, styles);
             } else {
               throw error;
             }
@@ -110,11 +111,12 @@ export class DynamicComponentFactoryService {
     }
   }
 
-  private createDynamicComponent<T>(componentType: Type<T>, template: string, preserveWhitespaces?: boolean): Type<T> {
+  private createDynamicComponent<T>(componentType: Type<T>, template: string, preserveWhitespaces?: boolean, styles?: string[]): Type<T> {
     // noinspection AngularMissingOrInvalidDeclarationInModule
     return Component({
       template,
-      preserveWhitespaces
+      preserveWhitespaces,
+      styles
     })(componentType);
   }
 
diff --git a/ui-ngx/src/app/core/services/utils.service.ts b/ui-ngx/src/app/core/services/utils.service.ts
index ce6cf32dbd..ea4c85eb64 100644
--- a/ui-ngx/src/app/core/services/utils.service.ts
+++ b/ui-ngx/src/app/core/services/utils.service.ts
@@ -25,7 +25,7 @@ import {
   createLabelFromDatasource,
   deepClone,
   deleteNullProperties,
-  guid,
+  guid, hashCode,
   isDefined,
   isDefinedAndNotNull,
   isString,
@@ -405,6 +405,13 @@ export class UtilsService {
     });
   }
 
+  public stringToHslColor(str: string, saturationPercentage: number, lightnessPercentage: number): string {
+    if (str && str.length) {
+      let hue = hashCode(str) % 360;
+      return `hsl(${hue}, ${saturationPercentage}%, ${lightnessPercentage}%)`;
+    }
+  }
+
   public currentPerfTime(): number {
     return this.window.performance && this.window.performance.now ?
       this.window.performance.now() : Date.now();
diff --git a/ui-ngx/src/app/core/translate/translate-default-compiler.ts b/ui-ngx/src/app/core/translate/translate-default-compiler.ts
index 8bc590fb2a..739621eaca 100644
--- a/ui-ngx/src/app/core/translate/translate-default-compiler.ts
+++ b/ui-ngx/src/app/core/translate/translate-default-compiler.ts
@@ -20,7 +20,7 @@ import {
   TranslateMessageFormatCompiler
 } from 'ngx-translate-messageformat-compiler';
 import { Inject, Injectable, Optional } from '@angular/core';
-import messageFormatParser from 'messageformat-parser';
+import { parse } from '@messageformat/parser';
 
 @Injectable({ providedIn: 'root' })
 export class TranslateDefaultCompiler extends TranslateMessageFormatCompiler {
@@ -44,7 +44,12 @@ export class TranslateDefaultCompiler extends TranslateMessageFormatCompiler {
   private defaultCompile(src: any, lang: string): any {
     if (typeof src !== 'object') {
       if (this.checkIsPlural(src)) {
-        return super.compile(src, lang);
+        try {
+          return super.compile(src, lang.replace('_', '-'));
+        } catch (e) {
+          console.warn('Failed compile translate:', src, e);
+          return src;
+        }
       } else {
         return src;
       }
@@ -60,7 +65,7 @@ export class TranslateDefaultCompiler extends TranslateMessageFormatCompiler {
   private checkIsPlural(src: string): boolean {
     let tokens: any[];
     try {
-      tokens = messageFormatParser.parse(src.replace(/\{\{/g, '{').replace(/\}\}/g, '}'),
+      tokens = parse(src.replace(/\{\{/g, '{').replace(/\}\}/g, '}'),
         {cardinal: [], ordinal: []});
     } catch (e) {
       console.warn(`Failed to parse source: ${src}`);
diff --git a/ui-ngx/src/app/core/utils.ts b/ui-ngx/src/app/core/utils.ts
index 992ddec310..4018fd491f 100644
--- a/ui-ngx/src/app/core/utils.ts
+++ b/ui-ngx/src/app/core/utils.ts
@@ -304,7 +304,7 @@ export function deepClone<T>(target: T, ignoreFields?: string[]): T {
     (target as any[]).forEach((v) => { cp.push(v); });
     return cp.map((n: any) => deepClone<any>(n)) as any;
   }
-  if (typeof target === 'object' && Object.keys(target).length) {
+  if (typeof target === 'object') {
     const cp = {...(target as { [key: string]: any })} as { [key: string]: any };
     Object.keys(cp).forEach(k => {
       if (!ignoreFields || ignoreFields.indexOf(k) === -1) {
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee-panel.component.html b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee-panel.component.html
new file mode 100644
index 0000000000..f6ba02e7a0
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee-panel.component.html
@@ -0,0 +1,52 @@
+<!--
+
+    Copyright © 2016-2023 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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 appearance="outline" [formGroup]="selectUserFormGroup" class="mat-block search-users">
+  <input matInput type="text" placeholder="{{ 'user.search' | translate }}"
+         #userInput
+         formControlName="user"
+         (focusin)="onFocus()"
+         [matAutocomplete]="userAutocomplete">
+  <mat-icon matSuffix>search</mat-icon>
+  <mat-autocomplete class="tb-assignee-autocomplete"
+                    #userAutocomplete="matAutocomplete"
+                    [displayWith]="displayUserFn"
+                    (optionSelected)="selected($event)"
+                    panelWidth="260px">
+    <mat-option [fxHide]="!assigneeId" [value]="null">
+      <mat-icon class="unassigned-icon">account_circle</mat-icon>
+      <span translate>alarm.unassigned</span>
+    </mat-option>
+    <mat-option *ngFor="let user of filteredUsers | async" [value]="user"
+                [fxHide]="assigneeId === user.id.id">
+      <span class="user-avatar" [innerHTML]="getUserInitials(user)"
+            [style.background-color]="getAvatarBgColor(user)">
+      </span>
+      <div class="user-display-name" fxLayout="column" fxLayoutGap="2px">
+        <span *ngIf="user.firstName || user.lastName"
+              [innerHTML]="getFullName(user) | highlight:searchText"></span>
+        <span [innerHTML]="user.email | highlight:searchText"></span>
+      </div>
+    </mat-option>
+    <mat-option *ngIf="!(filteredUsers | async)?.length" [value]="null">
+      <span style="white-space: normal">
+          {{ translate.get('user.no-users-matching', {entity: searchText}) | async }}
+      </span>
+    </mat-option>
+  </mat-autocomplete>
+</mat-form-field>
+
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee-panel.component.scss b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee-panel.component.scss
new file mode 100644
index 0000000000..a10848cc70
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee-panel.component.scss
@@ -0,0 +1,89 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+:host {
+  width: 100%;
+  overflow: auto;
+  background: #fff;
+  box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3), 0px 2px 6px 2px rgba(0, 0, 0, 0.15);
+  border-radius: 4px;
+}
+
+::ng-deep  {
+  mat-form-field.search-users {
+    padding: 8px;
+    height: 340px;
+    font-size: 14px;
+    background-color: #fff;
+  }
+
+  .mat-form-field-appearance-outline .mdc-notched-outline__trailing{
+    color: rgba(0, 0, 0, 0.12) !important;
+  }
+
+  .tb-assignee-autocomplete {
+    &.tb-assignee-autocomplete.mat-mdc-autocomplete-panel {
+      position: relative;
+      left: -8px;
+      margin-top: 8px;
+      box-shadow: none !important;
+    }
+    .mat-mdc-option {
+      font-size: 14px;
+      border: none;
+      height: 52px !important;
+      .unassigned-icon {
+        color: rgba(0, 0, 0, 0.38);
+        font-size: 28px;
+        width: 28px;
+        height: 28px;
+        margin-right: 8px;
+      }
+      .user-avatar {
+        display: inline-flex;
+        justify-content: center;
+        align-items: center;
+        margin-right: 8px;
+        border-radius: 50%;
+        background-color: #5cb445;
+        width: 28px;
+        height: 28px;
+        min-width: 28px;
+        min-height: 28px;
+        color: #fff;
+        font-size: 13px;
+        font-weight: 700
+      }
+      .user-display-name {
+        max-width: 180px;
+        overflow: hidden;
+        span {
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+        span + span {
+          color: rgba(0, 0, 0, 0.38);
+        }
+      }
+      .mdc-list-item__primary-text {
+        display: flex;
+        justify-content: start;
+        align-items: center;
+        line-height: normal;
+      }
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee-panel.component.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee-panel.component.ts
new file mode 100644
index 0000000000..bd50beef31
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee-panel.component.ts
@@ -0,0 +1,227 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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,
+  Component,
+  ElementRef,
+  Inject,
+  InjectionToken, OnDestroy,
+  OnInit,
+  ViewChild
+} from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { Observable, of, Subject } from 'rxjs';
+import {
+  catchError,
+  debounceTime,
+  distinctUntilChanged,
+  map,
+  share,
+  switchMap,
+  takeUntil,
+} from 'rxjs/operators';
+import { User, UserEmailInfo } from '@shared/models/user.model';
+import { TranslateService } from '@ngx-translate/core';
+import { UserService } from '@core/http/user.service';
+import { PageLink } from '@shared/models/page/page-link';
+import { Direction } from '@shared/models/page/sort-order';
+import { emptyPageData } from '@shared/models/page/page-data';
+import { AlarmService } from '@core/http/alarm.service';
+import { OverlayRef } from '@angular/cdk/overlay';
+import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { UtilsService } from '@core/services/utils.service';
+
+export const ALARM_ASSIGNEE_PANEL_DATA = new InjectionToken<any>('AlarmAssigneePanelData');
+
+export interface AlarmAssigneePanelData {
+  alarmId: string;
+  assigneeId: string;
+}
+
+@Component({
+  selector: 'tb-alarm-assignee-panel',
+  templateUrl: './alarm-assignee-panel.component.html',
+  styleUrls: ['./alarm-assignee-panel.component.scss']
+})
+export class AlarmAssigneePanelComponent implements  OnInit, AfterViewInit, OnDestroy {
+
+  private dirty = false;
+
+  alarmId: string;
+
+  assigneeId?: string;
+
+  selectUserFormGroup: FormGroup;
+
+  @ViewChild('userInput', {static: true}) userInput: ElementRef;
+
+  filteredUsers: Observable<Array<UserEmailInfo>>;
+
+  searchText = '';
+
+  private destroy$ = new Subject<void>();
+
+  constructor(@Inject(ALARM_ASSIGNEE_PANEL_DATA) public data: AlarmAssigneePanelData,
+              public overlayRef: OverlayRef,
+              public translate: TranslateService,
+              private userService: UserService,
+              private alarmService: AlarmService,
+              private fb: FormBuilder,
+              private utilsService: UtilsService) {
+    this.alarmId = data.alarmId;
+    this.assigneeId = data.assigneeId;
+    this.selectUserFormGroup = this.fb.group({
+      user: [null]
+    });
+  }
+
+  ngOnInit() {
+    this.filteredUsers = this.selectUserFormGroup.get('user').valueChanges
+      .pipe(
+        debounceTime(150),
+        map(value => {
+          return value ? (typeof value === 'string' ? value : '') : ''
+        }),
+        distinctUntilChanged(),
+        switchMap(name => this.fetchUsers(name)),
+        share(),
+        takeUntil(this.destroy$)
+    );
+  }
+
+  ngAfterViewInit() {
+    setTimeout(() => {
+      this.userInput.nativeElement.focus();
+    }, 0)
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
+  displayUserFn(user?: User): string | undefined {
+    return user ? user.email : undefined;
+  }
+
+  selected(event: MatAutocompleteSelectedEvent): void {
+    this.clear();
+    const user: User  = event.option.value;
+    if (user) {
+      this.assign(user);
+    } else {
+      this.unassign();
+    }
+  }
+
+  assign(user: User): void {
+    this.alarmService.assignAlarm(this.alarmId, user.id.id, {ignoreLoading: true}).subscribe(
+      () => this.overlayRef.dispose());
+  }
+
+  unassign(): void {
+    this.alarmService.unassignAlarm(this.alarmId, {ignoreLoading: true}).subscribe(
+      () => this.overlayRef.dispose());
+  }
+
+  fetchUsers(searchText?: string): Observable<Array<UserEmailInfo>> {
+    this.searchText = searchText;
+    const pageLink = new PageLink(50, 0, searchText, {
+      property: 'email',
+      direction: Direction.ASC
+    });
+    return this.userService.findUsersByQuery(pageLink, {ignoreLoading: true})
+      .pipe(
+      catchError(() => of(emptyPageData<UserEmailInfo>())),
+      map(pageData => {
+        return pageData.data;
+      })
+    );
+  }
+
+  onFocus(): void {
+    if (!this.dirty) {
+      this.selectUserFormGroup.get('user').updateValueAndValidity({onlySelf: true});
+      this.dirty = true;
+    }
+  }
+
+  clear() {
+    this.selectUserFormGroup.get('user').patchValue('', {emitEvent: true});
+    setTimeout(() => {
+      this.userInput.nativeElement.blur();
+      this.userInput.nativeElement.focus();
+    }, 0);
+  }
+
+  getUserDisplayName(entity: User) {
+    let displayName = '';
+    if ((entity.firstName && entity.firstName.length > 0) ||
+      (entity.lastName && entity.lastName.length > 0)) {
+      if (entity.firstName) {
+        displayName += entity.firstName;
+      }
+      if (entity.lastName) {
+        if (displayName.length > 0) {
+          displayName += ' ';
+        }
+        displayName += entity.lastName;
+      }
+    } else {
+      displayName = entity.email;
+    }
+    return displayName;
+  }
+
+  getUserInitials(entity: User): string {
+    let initials = '';
+    if (entity.firstName && entity.firstName.length ||
+      entity.lastName && entity.lastName.length) {
+      if (entity.firstName) {
+        initials += entity.firstName.charAt(0);
+      }
+      if (entity.lastName) {
+        initials += entity.lastName.charAt(0);
+      }
+    } else {
+      initials += entity.email.charAt(0);
+    }
+    return initials.toUpperCase();
+  }
+
+  getFullName(entity: User): string {
+    let fullName = '';
+    if ((entity.firstName && entity.firstName.length > 0) ||
+      (entity.lastName && entity.lastName.length > 0)) {
+      if (entity.firstName) {
+        fullName += entity.firstName;
+      }
+      if (entity.lastName) {
+        if (fullName.length > 0) {
+          fullName += ' ';
+        }
+        fullName += entity.lastName;
+      }
+    }
+    return fullName;
+  }
+
+  getAvatarBgColor(entity: User) {
+    return this.utilsService.stringToHslColor(this.getUserDisplayName(entity), 40, 60);
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.html b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.html
new file mode 100644
index 0000000000..52066ff3ac
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.html
@@ -0,0 +1,43 @@
+<!--
+
+    Copyright © 2016-2023 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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-assignee" fxLayout="row" fxLayoutAlign="start center"
+     (click)="openAlarmAssigneePanel($event, alarm)">
+  <span *ngIf="alarm?.assigneeId" class="assigned-container">
+    <span class="user-avatar" [style.backgroundColor]="getAvatarBgColor(alarm.assignee)">
+      {{ getUserInitials(alarm.assignee) }}
+    </span>
+    <span [matTooltip]="getUserDisplayName(alarm.assignee)"
+          matTooltipPosition="above"
+          style="text-overflow: ellipsis">
+      {{ getUserDisplayName(alarm.assignee) }}
+    </span>
+  </span>
+  <span *ngIf="!alarm?.assigneeId" class="unassigned-container" fxLayout="row" fxLayoutAlign="start center">
+    <mat-icon class="material-icons unassigned-icon">account_circle</mat-icon>
+    <span translate>alarm.unassigned</span>
+  </span>
+  <button fxFlexAlign="flex-end"
+          mat-icon-button
+          matTooltip="{{ 'alarm.assign' | translate }}"
+          matTooltipPosition="above">
+    <mat-icon>
+      keyboard_arrow_down
+    </mat-icon>
+  </button>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss
new file mode 100644
index 0000000000..935ac2f32d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss
@@ -0,0 +1,49 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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-assignee {
+    cursor: pointer;
+    max-width: 273px;
+
+    .assigned-container {
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+
+      .user-avatar {
+        display: inline-flex;
+        justify-content: center;
+        align-items: center;
+        border-radius: 50%;
+        width: 28px;
+        height: 28px;
+        min-width: 28px;
+        min-height: 28px;
+        color: white;
+        font-size: 13px;
+        font-weight: 700;
+      }
+    }
+    .material-icons.unassigned-icon {
+      width: 28px;
+      height: 28px;
+      font-size: 28px;
+      color: rgba(0, 0, 0, 0.38);
+      overflow: visible;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.ts
new file mode 100644
index 0000000000..5d7f29d55b
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.ts
@@ -0,0 +1,141 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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, Injector, Input, Output, StaticProvider, ViewContainerRef
+} from '@angular/core';
+import { UtilsService } from '@core/services/utils.service';
+import { AlarmAssignee, AlarmInfo } from '@shared/models/alarm.models';
+import {
+  ALARM_ASSIGNEE_PANEL_DATA, AlarmAssigneePanelComponent,
+  AlarmAssigneePanelData
+} from '@home/components/alarm/alarm-assignee-panel.component';
+import { ConnectedPosition, Overlay, OverlayConfig, OverlayRef } from '@angular/cdk/overlay';
+import { ComponentPortal } from '@angular/cdk/portal';
+
+@Component({
+  selector: 'tb-alarm-assignee',
+  templateUrl: './alarm-assignee.component.html',
+  styleUrls: ['./alarm-assignee.component.scss']
+})
+export class AlarmAssigneeComponent {
+  @Input()
+  alarm: AlarmInfo;
+
+  @Output()
+  alarmReassigned = new EventEmitter<boolean>();
+
+  constructor(private utilsService: UtilsService,
+              private overlay: Overlay,
+              private viewContainerRef: ViewContainerRef) {
+  }
+
+  getUserDisplayName(entity: AlarmAssignee) {
+    let displayName = '';
+    if ((entity.firstName && entity.firstName.length > 0) ||
+      (entity.lastName && entity.lastName.length > 0)) {
+      if (entity.firstName) {
+        displayName += entity.firstName;
+      }
+      if (entity.lastName) {
+        if (displayName.length > 0) {
+          displayName += ' ';
+        }
+        displayName += entity.lastName;
+      }
+    } else {
+      displayName = entity.email;
+    }
+    return displayName;
+  }
+
+  getUserInitials(entity: AlarmAssignee): string {
+    let initials = '';
+    if (entity.firstName && entity.firstName.length ||
+      entity.lastName && entity.lastName.length) {
+      if (entity.firstName) {
+        initials += entity.firstName.charAt(0);
+      }
+      if (entity.lastName) {
+        initials += entity.lastName.charAt(0);
+      }
+    } else {
+      initials += entity.email.charAt(0);
+    }
+    return initials.toUpperCase();
+  }
+
+  getFullName(entity: AlarmAssignee): string {
+    let fullName = '';
+    if ((entity.firstName && entity.firstName.length > 0) ||
+      (entity.lastName && entity.lastName.length > 0)) {
+      if (entity.firstName) {
+        fullName += entity.firstName;
+      }
+      if (entity.lastName) {
+        if (fullName.length > 0) {
+          fullName += ' ';
+        }
+        fullName += entity.lastName;
+      }
+    }
+    return fullName;
+  }
+
+  getAvatarBgColor(entity: AlarmAssignee) {
+    return this.utilsService.stringToHslColor(this.getUserDisplayName(entity), 40, 60);
+  }
+
+  openAlarmAssigneePanel($event: Event, alarm: AlarmInfo) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    const target = $event.target || $event.srcElement || $event.currentTarget;
+    const config = new OverlayConfig();
+    config.backdropClass = 'cdk-overlay-transparent-backdrop';
+    config.hasBackdrop = true;
+    const connectedPosition: ConnectedPosition = {
+      originX: 'end',
+      originY: 'bottom',
+      overlayX: 'end',
+      overlayY: 'top'
+    };
+    config.positionStrategy = this.overlay.position().flexibleConnectedTo(target as HTMLElement)
+      .withPositions([connectedPosition]);
+    config.minWidth = '260px';
+    const overlayRef = this.overlay.create(config);
+    overlayRef.backdropClick().subscribe(() => {
+      overlayRef.dispose();
+    });
+    const providers: StaticProvider[] = [
+      {
+        provide: ALARM_ASSIGNEE_PANEL_DATA,
+        useValue: {
+          alarmId: alarm.id.id,
+          assigneeId: alarm.assigneeId?.id
+        } as AlarmAssigneePanelData
+      },
+      {
+        provide: OverlayRef,
+        useValue: overlayRef
+      }
+    ];
+    const injector = Injector.create({parent: this.viewContainerRef.injector, providers});
+    overlayRef.attach(new ComponentPortal(AlarmAssigneePanelComponent,
+      this.viewContainerRef, injector)).onDestroy(() => this.alarmReassigned.emit(true));
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-comment-dialog.component.html b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment-dialog.component.html
new file mode 100644
index 0000000000..94f8f47eb1
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment-dialog.component.html
@@ -0,0 +1,44 @@
+<!--
+
+    Copyright © 2016-2023 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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 style="min-width: 600px;">
+  <mat-toolbar color="primary">
+    <h2>{{ 'alarm.comments' | translate }}</h2>
+    <span fxFlex></span>
+    <button mat-icon-button
+            (click)="close()"
+            type="button">
+      <mat-icon class="material-icons">close</mat-icon>
+    </button>
+  </mat-toolbar>
+  <mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
+  </mat-progress-bar>
+  <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
+  <div mat-dialog-content style="padding: 0">
+    <tb-alarm-comment #alarmCommentComponent [alarmId]="alarmId"
+                      [commentsHeaderEnabled]="commentsHeaderEnabled">
+    </tb-alarm-comment>
+  </div>
+  <div mat-dialog-actions fxLayout="row" fxLayoutAlign="end">
+    <button mat-raised-button color="primary"
+            type="button"
+            [disabled]="(isLoading$ | async)"
+            (click)="close()" cdkFocusInitial>
+      {{ 'action.close' | translate }}
+    </button>
+  </div>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-comment-dialog.component.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment-dialog.component.ts
new file mode 100644
index 0000000000..026ebae8c0
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment-dialog.component.ts
@@ -0,0 +1,54 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, Inject } from '@angular/core';
+import { DialogComponent } from '@shared/components/dialog.component';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { Router } from '@angular/router';
+import { AlarmInfo } from '@shared/models/alarm.models';
+
+export interface AlarmCommentDialogData {
+  alarmId?: string;
+  alarm?: AlarmInfo;
+  commentsHeaderEnabled: boolean;
+}
+
+@Component({
+  selector: 'tb-alarm-comment-dialog',
+  templateUrl: './alarm-comment-dialog.component.html',
+  styleUrls: []
+})
+export class AlarmCommentDialogComponent extends DialogComponent<AlarmCommentDialogComponent, void> {
+
+  alarmId: string;
+
+  commentsHeaderEnabled: boolean = false;
+
+  constructor(protected store: Store<AppState>,
+              protected router: Router,
+              @Inject(MAT_DIALOG_DATA) public data: AlarmCommentDialogData,
+              public dialogRef: MatDialogRef<AlarmCommentDialogComponent, void>) {
+    super(store, router, dialogRef);
+    this.commentsHeaderEnabled = this.data.commentsHeaderEnabled
+    this.alarmId = this.data.alarmId;
+  }
+
+  close(): void {
+    this.dialogRef.close();
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.html b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.html
new file mode 100644
index 0000000000..91b4871d86
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.html
@@ -0,0 +1,162 @@
+<!--
+
+    Copyright © 2016-2023 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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]="alarmCommentFormGroup" class="tb-alarm-comments" fxLayout="column">
+  <div class="tb-alarm-comments-header" fxLayout="row" fxLayoutAlign="space-between baseline">
+    <span *ngIf="commentsHeaderEnabled" class="tb-alarm-comments-header-title">
+      {{ 'alarm-comment.comments' | translate }}
+    </span>
+    <div style="margin-left: auto">
+      <button mat-icon-button
+              type="button"
+              (click)="changeSortDirection()"
+              matTooltip="{{ 'alarm-comment.sort-direction' | translate }}"
+              matTooltipPosition="above">
+        <mat-icon class="material-icons">{{ getSortDirectionIcon() }}</mat-icon>
+      </button>
+      <button mat-icon-button
+              type="button"
+              (click)="loadAlarmComments()"
+              matTooltip="{{ 'alarm-comment.refresh' | translate }}"
+              matTooltipPosition="above">
+        <mat-icon class="material-icons">refresh</mat-icon>
+      </button>
+    </div>
+  </div>
+  <div fxLayout="column" fxLayoutGap="32px">
+    <ng-container *ngIf="isDirectionDescending()">
+      <ng-container *ngTemplateOutlet="commentInput"></ng-container>
+    </ng-container>
+    <div fxFlex *ngFor="let displayDataElement of displayData; index as i">
+      <div style="margin-left: 38px"
+           *ngIf="displayDataElement.isSystemComment; else userComment">
+        <span class="tb-alarm-comments-system-text"
+              style="margin-right: 8px">
+          {{ displayDataElement.commentText }}
+        </span>
+        <span class="tb-alarm-comments-time">
+          {{ displayDataElement.createdDateAgo }}
+        </span>
+      </div>
+      <ng-template #userComment>
+        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px"
+             *ngIf="!displayDataElement.edit; else commentEditing"
+             (mouseenter)="onCommentMouseEnter(displayDataElement.commentId, i)"
+             (mouseleave)="onCommentMouseLeave(i)">
+          <div fxLayout="row" fxLayoutAlign="center center" fxFlexAlign="start"
+               class="tb-alarm-comments-user-avatar"
+               [style.background-color]="displayDataElement.avatarBgColor">
+            {{ getUserInitials(displayDataElement.displayName) }}
+          </div>
+          <div fxFlex fxLayout="column" fxLayoutGap="5px">
+            <div fxLayout="row" fxLayoutGap="8px" fxLayoutAlign="start center">
+              <span class="tb-alarm-comments-user-name">{{ displayDataElement.displayName }}</span>
+              <span class="tb-alarm-comments-time" *ngIf="displayDataElement.isEdited">
+                edited {{ displayDataElement.editedDateAgo }}
+              </span>
+              <span class="tb-alarm-comments-time" *ngIf="!displayDataElement.isEdited">
+                {{ displayDataElement.createdDateAgo }}
+              </span>
+            </div>
+            <span class="tb-alarm-comments-text">{{ displayDataElement.commentText }}</span>
+          </div>
+          <div fxLayout="row" class="tb-alarm-comments-action-buttons"
+               [ngClass]="{ 'show-buttons': displayDataElement.showActions }">
+            <button mat-icon-button
+                    type="button"
+                    (click)="editComment(displayDataElement.commentId)">
+              <mat-icon class="material-icons">edit</mat-icon>
+            </button>
+            <button mat-icon-button
+                    type="button"
+                    (click)="deleteComment(displayDataElement.commentId)">
+              <mat-icon class="material-icons">delete</mat-icon>
+            </button>
+          </div>
+        </div>
+        <ng-template #commentEditing>
+          <div fxLayoutAlign="row center" fxLayoutGap="8px">
+            <div fxLayout="row" fxLayoutAlign="center center"
+                 class="tb-alarm-comments-user-avatar"
+                 [style.background-color]="displayDataElement.avatarBgColor">
+              {{ getUserInitials(displayDataElement.displayName) }}
+            </div>
+            <mat-form-field fxFlex appearance="fill" class="mat-block">
+              <textarea matInput
+                        type="text"
+                        placeholder="{{ 'alarm-comment.add' | translate }}"
+                        cdkTextareaAutosize
+                        cdkAutosizeMinRows="1"
+                        cols="1"
+                        formControlName="alarmCommentEdit"
+                        (keyup.enter)="saveEditedComment(displayDataElement.commentId)"
+                        (keydown.enter)="$event.preventDefault()">
+              </textarea>
+              <div matSuffix fxLayout="row">
+                <button mat-icon-button
+                        (click)="cancelEdit(displayDataElement.commentId)"
+                        type="button">
+                  <mat-icon class="material-icons red-button">close</mat-icon>
+                </button>
+                <button mat-icon-button
+                        type="button"
+                        (click)="saveEditedComment(displayDataElement.commentId)">
+                  <mat-icon class="material-icons green-button">check</mat-icon>
+                </button>
+              </div>
+            </mat-form-field>
+          </div>
+        </ng-template>
+      </ng-template>
+    </div>
+    <ng-container *ngIf="isDirectionAscending()">
+      <ng-container *ngTemplateOutlet="commentInput"></ng-container>
+    </ng-container>
+  </div>
+  <ng-template #commentInput>
+    <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px" fxFlex>
+      <div fxLayout="row" fxLayoutAlign="center center"
+           class="tb-alarm-comments-user-avatar"
+           *ngIf="userDisplayName$ | async; let userDisplayName"
+           [style.background-color]="getCurrentUserBgColor(userDisplayName)">
+        {{ getUserInitials(userDisplayName) }}
+      </div>
+      <mat-form-field appearance="fill" fxFlex class="mat-block">
+          <textarea matInput
+                    type="text"
+                    placeholder="{{ 'alarm-comment.add' | translate }}"
+                    cdkTextareaAutosize
+                    cdkAutosizeMinRows="1"
+                    cols="1"
+                    formControlName="alarmComment"
+                    (keyup.enter)="saveComment()"
+                    (keydown.enter)="$event.preventDefault()">
+          </textarea>
+        <button mat-icon-button
+                type="button"
+                matSuffix
+                *ngIf="getAlarmCommentFormControl().value"
+                (click)="saveComment()">
+          <mat-icon color="primary">
+            send
+          </mat-icon>
+        </button>
+      </mat-form-field>
+    </div>
+  </ng-template>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.scss b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.scss
new file mode 100644
index 0000000000..3cd97767a2
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.scss
@@ -0,0 +1,107 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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-alarm-comments {
+    padding: 16px 24px 24px 24px;
+    background-color: #fafafa;
+    max-width: 600px;
+
+    &-header {
+      background-color: #fafafa;
+      position: sticky;
+      top: -25px;
+      z-index: 1;
+      margin-bottom: 10px;
+
+      &-title {
+        color: rgba(0, 0, 0, 0.76);
+        letter-spacing: 0.25px;
+        font-weight: 500;
+      }
+
+      .mat-icon {
+        color: rgba(0, 0, 0, 0.38);
+      }
+    }
+
+    &-user-avatar {
+      width: 28px;
+      min-width: 28px;
+      height: 28px;
+      min-height: 28px;
+      border-radius: 50%;
+      font-weight: 700;
+      color: #FFFFFF;
+      font-size: 13px;
+    }
+
+    &-user-name {
+      font-size: 16px;
+      color: rgba(0, 0, 0, 0.76);
+      font-weight: 500;
+      letter-spacing: 0.25px;
+    }
+
+    &-time {
+      font-size: 14px;
+      font-weight: 400;
+      color: rgba(0, 0, 0, 0.38);
+      letter-spacing: 0.2px
+    }
+
+    &-system-text {
+      color: rgba(0, 0, 0, 0.38);
+      font-weight: 500;
+      letter-spacing: 0.25px;
+    }
+
+    &-text {
+      white-space: pre-line;
+      word-break: break-word;
+      color: rgba(0, 0, 0, 0.54);
+      letter-spacing: 0.15px;
+    }
+
+    &-action-buttons {
+      visibility: hidden;
+      .mat-icon {
+        color: rgba(0, 0, 0, 0.38);
+      }
+    }
+
+    .show-buttons {
+      visibility: visible;
+    }
+
+    .green-button {
+      color: #00695C;
+    }
+
+    .red-button {
+      color: #D12730;
+    }
+
+    .mat-form-field {
+      font-size: 16px;
+      letter-spacing: 0.15px;
+      color: rgba(0, 0, 0, 0.76);
+    }
+
+    textarea {
+      letter-spacing: 0.15px;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.ts
new file mode 100644
index 0000000000..6e32979a14
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.ts
@@ -0,0 +1,295 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, Input, OnInit } from '@angular/core';
+import { select, Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { TranslateService } from '@ngx-translate/core';
+import { AlarmCommentService } from '@core/http/alarm-comment.service';
+import { AbstractControl, FormBuilder, FormGroup } from '@angular/forms';
+import { DialogService } from '@core/services/dialog.service';
+import { AuthUser, User } from '@shared/models/user.model';
+import { getCurrentAuthUser, selectUserDetails } from '@core/auth/auth.selectors';
+import { Direction, SortOrder } from '@shared/models/page/sort-order';
+import { MAX_SAFE_PAGE_SIZE, PageLink } from '@shared/models/page/page-link';
+import { DateAgoPipe } from '@shared/pipe/date-ago.pipe';
+import { map } from 'rxjs/operators';
+import { AlarmComment, AlarmCommentInfo, AlarmCommentType } from '@shared/models/alarm.models';
+import { UtilsService } from '@core/services/utils.service';
+import { EntityType } from '@shared/models/entity-type.models';
+
+interface AlarmCommentsDisplayData {
+  commentId?: string,
+  displayName?: string,
+  createdDateAgo?: string,
+  edit?: boolean,
+  isEdited?: boolean,
+  editedDateAgo?: string,
+  showActions?: boolean,
+  commentText?: string,
+  isSystemComment?: boolean,
+  avatarBgColor?: string
+}
+
+@Component({
+  selector: 'tb-alarm-comment',
+  templateUrl: './alarm-comment.component.html',
+  styleUrls: ['./alarm-comment.component.scss']
+})
+export class AlarmCommentComponent implements OnInit {
+  @Input()
+  alarmId: string;
+
+  @Input()
+  commentsHeaderEnabled: boolean = true;
+
+  authUser: AuthUser;
+
+  alarmCommentFormGroup: FormGroup;
+
+  alarmComments: Array<AlarmComment>;
+
+  displayData: Array<AlarmCommentsDisplayData> = new Array<AlarmCommentsDisplayData>();
+
+  alarmCommentSortOrder: SortOrder = {
+    property: 'createdTime',
+    direction: Direction.DESC
+  };
+
+  editMode: boolean = false;
+
+  userDisplayName$ = this.store.pipe(
+    select(selectUserDetails),
+    map((user) => this.getUserDisplayName(user))
+  );
+
+  currentUserDisplayName: string;
+  currentUserAvatarColor: string;
+
+  constructor(protected store: Store<AppState>,
+              private translate: TranslateService,
+              private alarmCommentService: AlarmCommentService,
+              public fb: FormBuilder,
+              private dialogService: DialogService,
+              public dateAgoPipe: DateAgoPipe,
+              private utilsService: UtilsService) {
+
+    this.authUser = getCurrentAuthUser(store);
+
+    this.alarmCommentFormGroup = this.fb.group(
+      {
+        alarmCommentEdit: [''],
+        alarmComment: ['']
+      }
+    );
+  }
+
+  ngOnInit() {
+    this.loadAlarmComments();
+    this.currentUserAvatarColor = this.utilsService.stringToHslColor(this.currentUserDisplayName,
+      60, 40);
+  }
+
+  loadAlarmComments(): void {
+    this.alarmCommentService.getAlarmComments(this.alarmId, new PageLink(MAX_SAFE_PAGE_SIZE, 0, null,
+      this.alarmCommentSortOrder), {ignoreLoading: true}).subscribe(
+      (pagedData) => {
+        this.alarmComments = pagedData.data;
+        this.displayData.length = 0;
+        for (let alarmComment of pagedData.data) {
+          let displayDataElement: AlarmCommentsDisplayData = {};
+          displayDataElement.createdDateAgo = this.dateAgoPipe.transform(alarmComment.createdTime);
+          displayDataElement.commentText = alarmComment.comment.text;
+          displayDataElement.isSystemComment = alarmComment.type === AlarmCommentType.SYSTEM;
+          if (alarmComment.type === AlarmCommentType.OTHER) {
+            displayDataElement.commentId = alarmComment.id.id;
+            displayDataElement.displayName = this.getUserDisplayName(alarmComment);
+            displayDataElement.edit = false;
+            displayDataElement.isEdited = alarmComment.comment.edited;
+            displayDataElement.editedDateAgo = this.dateAgoPipe.transform(alarmComment.comment.editedOn).toLowerCase();
+            displayDataElement.showActions = false;
+            displayDataElement.isSystemComment = false;
+            displayDataElement.avatarBgColor = this.utilsService.stringToHslColor(displayDataElement.displayName,
+              40, 60);
+          }
+          this.displayData.push(displayDataElement);
+        }
+      }
+    )
+  }
+
+  changeSortDirection() {
+    let currentDirection = this.alarmCommentSortOrder.direction;
+    this.alarmCommentSortOrder.direction = currentDirection === Direction.DESC ? Direction.ASC : Direction.DESC;
+    this.loadAlarmComments();
+  }
+
+  saveComment(): void {
+    const commentInputValue: string = this.getAlarmCommentFormControl().value;
+    if (commentInputValue) {
+      const comment: AlarmComment = {
+        alarmId: {
+          id: this.alarmId,
+          entityType: EntityType.ALARM
+        },
+        type: AlarmCommentType.OTHER,
+        comment: {
+          text: commentInputValue
+        }
+      }
+      this.doSave(comment);
+      this.clearCommentInput();
+    }
+  }
+
+  saveEditedComment(commentId: string): void {
+    const commentEditInputValue: string = this.getAlarmCommentEditFormControl().value;
+    if (commentEditInputValue) {
+      const editedComment: AlarmComment = this.getAlarmCommentById(commentId);
+      editedComment.comment.text = commentEditInputValue;
+      this.doSave(editedComment);
+      this.clearCommentEditInput();
+      this.editMode = false;
+      this.getAlarmCommentFormControl().enable({emitEvent: false});
+    }
+  }
+
+  private doSave(comment: AlarmComment): void {
+    this.alarmCommentService.saveAlarmComment(this.alarmId, comment, {ignoreLoading: true}).subscribe(
+      () => {
+        this.loadAlarmComments();
+      }
+    )
+  }
+
+  editComment(commentId: string): void {
+    const commentDisplayData = this.getDataElementByCommentId(commentId);
+    commentDisplayData.edit = true;
+    this.editMode = true;
+    this.getAlarmCommentEditFormControl().patchValue(commentDisplayData.commentText);
+    this.getAlarmCommentFormControl().disable({emitEvent: false});
+  }
+
+  cancelEdit(commentId: string): void {
+    const commentDisplayData = this.getDataElementByCommentId(commentId);
+    commentDisplayData.edit = false;
+    this.editMode = false;
+    this.getAlarmCommentFormControl().enable({emitEvent: false});
+  }
+
+  deleteComment(commentId: string): void {
+    const alarmCommentInfo: AlarmComment = this.getAlarmCommentById(commentId);
+    const commentText: string = alarmCommentInfo.comment.text;
+    this.dialogService.confirm(
+      this.translate.instant('alarm-comment.delete-alarm-comment'),
+      commentText,
+      this.translate.instant('action.cancel'),
+      this.translate.instant('action.delete')).subscribe(
+      (result) => {
+        if (result) {
+          this.alarmCommentService.deleteAlarmComments(this.alarmId, commentId, {ignoreLoading: true})
+            .subscribe(() => {
+                this.loadAlarmComments();
+              }
+          )
+        }
+      }
+    )
+  }
+
+  getSortDirectionIcon() {
+    return this.alarmCommentSortOrder.direction === Direction.DESC ? 'arrow_downward' : 'arrow_upward'
+  }
+
+  isDirectionAscending() {
+    return this.alarmCommentSortOrder.direction === Direction.ASC;
+  }
+
+  isDirectionDescending() {
+    return this.alarmCommentSortOrder.direction === Direction.DESC;
+  }
+
+  onCommentMouseEnter(commentId: string, displayDataIndex: number): void {
+    if (!this.editMode) {
+      const alarmUserId = this.getAlarmCommentById(commentId).userId.id;
+      if (this.authUser.userId === alarmUserId) {
+        this.displayData[displayDataIndex].showActions = true;
+      }
+    }
+  }
+
+  onCommentMouseLeave(displayDataIndex: number): void {
+    this.displayData[displayDataIndex].showActions = false;
+  }
+
+  getUserInitials(userName: string): string {
+    let initials = '';
+    const userNameSplit = userName.split(' ');
+    initials += userNameSplit[0].charAt(0).toUpperCase();
+    if (userNameSplit.length > 1) {
+      initials += userNameSplit[userNameSplit.length - 1].charAt(0).toUpperCase();
+    }
+    return initials;
+  }
+
+  getCurrentUserBgColor(userDisplayName: string) {
+    return this.utilsService.stringToHslColor(userDisplayName, 40, 60);
+  }
+
+  private getUserDisplayName(alarmCommentInfo: AlarmCommentInfo | User): string {
+    let name = '';
+    if ((alarmCommentInfo.firstName && alarmCommentInfo.firstName.length > 0) ||
+      (alarmCommentInfo.lastName && alarmCommentInfo.lastName.length > 0)) {
+      if (alarmCommentInfo.firstName) {
+        name += alarmCommentInfo.firstName;
+      }
+      if (alarmCommentInfo.lastName) {
+        if (name.length > 0) {
+          name += ' ';
+        }
+        name += alarmCommentInfo.lastName;
+      }
+    } else {
+      name = alarmCommentInfo.email;
+    }
+    return name;
+  }
+
+  getAlarmCommentFormControl(): AbstractControl {
+    return this.alarmCommentFormGroup.get('alarmComment');
+  }
+
+  getAlarmCommentEditFormControl(): AbstractControl {
+    return this.alarmCommentFormGroup.get('alarmCommentEdit');
+  }
+
+  private clearCommentInput(): void {
+    this.getAlarmCommentFormControl().patchValue('');
+  }
+
+  private clearCommentEditInput(): void {
+    this.getAlarmCommentEditFormControl().patchValue('');
+  }
+
+  private getAlarmCommentById(id: string): AlarmComment {
+    return this.alarmComments.find(comment => comment.id.id === id);
+  }
+
+  private getDataElementByCommentId(commentId: string): AlarmCommentsDisplayData {
+    return this.displayData.find(commentDisplayData => commentDisplayData.commentId === commentId);
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.html b/ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.html
index 3bdb10db57..e2af9dcf24 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.html
@@ -28,41 +28,17 @@
   <mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
   </mat-progress-bar>
   <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
-  <div mat-dialog-content>
-    <fieldset [disabled]="isLoading$ | async">
+  <div mat-dialog-content style="padding: 24px 0 0 0">
+    <fieldset [disabled]="isLoading$ | async" style="padding: 0 24px">
       <div fxLayout="row" fxLayoutGap="6px">
-        <mat-form-field class="mat-block">
-          <mat-label translate>alarm.created-time</mat-label>
-          <input matInput formControlName="createdTime" readonly>
-        </mat-form-field>
         <mat-form-field fxFlex class="mat-block">
           <mat-label translate>alarm.originator</mat-label>
           <input matInput formControlName="originatorName" readonly>
         </mat-form-field>
-      </div>
-      <div fxLayout="row" fxLayoutGap="6px" *ngIf="alarmFormGroup.get('startTime').value ||
-                                 alarmFormGroup.get('endTime').value">
-        <mat-form-field *ngIf="alarmFormGroup.get('startTime').value" fxFlex class="mat-block">
-          <mat-label translate>alarm.start-time</mat-label>
-          <input matInput formControlName="startTime" readonly>
-        </mat-form-field>
-        <mat-form-field *ngIf="alarmFormGroup.get('endTime').value" fxFlex class="mat-block">
-          <mat-label translate>alarm.end-time</mat-label>
-          <input matInput formControlName="endTime" readonly>
-        </mat-form-field>
-        <span fxFlex *ngIf="!alarmFormGroup.get('startTime').value || !alarmFormGroup.get('endTime').value"></span>
-      </div>
-      <div fxLayout="row" fxLayoutGap="6px" *ngIf="alarmFormGroup.get('ackTime').value ||
-                                 alarmFormGroup.get('clearTime').value">
-        <mat-form-field *ngIf="alarmFormGroup.get('ackTime').value" fxFlex class="mat-block">
-          <mat-label translate>alarm.ack-time</mat-label>
-          <input matInput formControlName="ackTime" readonly>
-        </mat-form-field>
-        <mat-form-field *ngIf="alarmFormGroup.get('clearTime').value" fxFlex class="mat-block">
-          <mat-label translate>alarm.clear-time</mat-label>
-          <input matInput formControlName="clearTime" readonly>
+        <mat-form-field fxFlex class="mat-block">
+          <mat-label translate>alarm.created-time</mat-label>
+          <input matInput formControlName="createdTime" readonly>
         </mat-form-field>
-        <span fxFlex *ngIf="!alarmFormGroup.get('ackTime').value || !alarmFormGroup.get('clearTime').value"></span>
       </div>
       <div fxLayout="row" fxLayoutGap="6px">
         <mat-form-field fxFlex class="mat-block">
@@ -74,18 +50,60 @@
           <input matInput formControlName="alarmSeverity" readonly
                  [ngStyle]="{fontWeight: 'bold', color: alarmSeverityColorsMap.get((alarm$ | async)?.severity)}">
         </mat-form-field>
+      </div>
+      <div fxLayout="row" fxLayoutGap="6px">
         <mat-form-field fxFlex class="mat-block">
           <mat-label translate>alarm.status</mat-label>
           <input matInput formControlName="alarmStatus" readonly>
         </mat-form-field>
+        <tb-alarm-assignee fxFlex style="padding-top: 9px"
+                           [alarm]="alarm$ | async"
+                           (alarmReassigned)="onReassign()">
+        </tb-alarm-assignee>
       </div>
-      <tb-json-object-edit
-          *ngIf="displayDetails"
-          formControlName="alarmDetails"
-          readonly
-          label="{{ 'alarm.details' | translate }}">
-      </tb-json-object-edit>
+      <mat-expansion-panel class="tb-alarm-details">
+        <mat-expansion-panel-header  fxLayout="row wrap">
+          <mat-panel-title>
+          </mat-panel-title>
+          <mat-panel-description fxLayoutAlign="end center" fxHide.xs translate>
+            alarm.advanced-info
+          </mat-panel-description>
+        </mat-expansion-panel-header>
+        <ng-template matExpansionPanelContent>
+          <div fxLayout="row" fxLayoutGap="6px" *ngIf="alarmFormGroup.get('startTime').value ||
+                                 alarmFormGroup.get('endTime').value">
+            <mat-form-field *ngIf="alarmFormGroup.get('startTime').value" fxFlex class="mat-block">
+              <mat-label translate>alarm.start-time</mat-label>
+              <input matInput formControlName="startTime" readonly>
+            </mat-form-field>
+            <mat-form-field *ngIf="alarmFormGroup.get('endTime').value" fxFlex class="mat-block">
+              <mat-label translate>alarm.end-time</mat-label>
+              <input matInput formControlName="endTime" readonly>
+            </mat-form-field>
+            <span fxFlex *ngIf="!alarmFormGroup.get('startTime').value || !alarmFormGroup.get('endTime').value"></span>
+          </div>
+          <div fxLayout="row" fxLayoutGap="6px" *ngIf="alarmFormGroup.get('ackTime').value ||
+                                 alarmFormGroup.get('clearTime').value">
+            <mat-form-field *ngIf="alarmFormGroup.get('ackTime').value" fxFlex class="mat-block">
+              <mat-label translate>alarm.ack-time</mat-label>
+              <input matInput formControlName="ackTime" readonly>
+            </mat-form-field>
+            <mat-form-field *ngIf="alarmFormGroup.get('clearTime').value" fxFlex class="mat-block">
+              <mat-label translate>alarm.clear-time</mat-label>
+              <input matInput formControlName="clearTime" readonly>
+            </mat-form-field>
+            <span fxFlex *ngIf="!alarmFormGroup.get('ackTime').value || !alarmFormGroup.get('clearTime').value"></span>
+          </div>
+          <tb-json-object-edit
+            *ngIf="displayDetails"
+            formControlName="alarmDetails"
+            readonly
+            label="{{ 'alarm.details' | translate }}">
+          </tb-json-object-edit>
+        </ng-template>
+      </mat-expansion-panel>
     </fieldset>
+    <tb-alarm-comment #alarmCommentComponent [alarmId]="alarmId"></tb-alarm-comment>
   </div>
   <div mat-dialog-actions fxLayout="row">
     <button mat-button color="primary"
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.scss b/ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.scss
new file mode 100644
index 0000000000..76148a1dd5
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.scss
@@ -0,0 +1,61 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 {
+  .assignee-field {
+    .mat-form-field-label-wrapper {
+      overflow: visible;
+      left: -36px;
+    }
+    .user-avatar {
+      min-width: 28px;
+      min-height: 28px;
+      margin-right: 8px;
+      border-radius: 50%;
+      font-weight: 700;
+      color: #fff;
+      font-size: 13px;
+      line-height: normal;
+    }
+  }
+  .mat-expansion-panel {
+    &.tb-alarm-details {
+      box-shadow: none;
+      margin-bottom: 2px;
+      &.mat-expanded {
+        margin-bottom: 24px;
+      }
+      .mat-expansion-panel-header {
+        padding: 0;
+        height: 24px;
+        &:hover {
+          background: none !important;
+        }
+        .mat-expansion-indicator {
+          padding: 2px;
+        }
+      }
+      .mat-expansion-panel-header-description {
+        align-items: center;
+      }
+      .mat-expansion-panel-body {
+        padding: 0;
+      }
+    }
+    .mat-expansion-panel-content {
+      font: inherit;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.ts
index 04a3674587..c229ad3612 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
@@ -33,6 +33,7 @@ import { AlarmService } from '@core/http/alarm.service';
 import { tap } from 'rxjs/operators';
 import { DatePipe } from '@angular/common';
 import { TranslateService } from '@ngx-translate/core';
+import { AlarmCommentComponent } from '@home/components/alarm/alarm-comment.component';
 
 export interface AlarmDetailsDialogData {
   alarmId?: string;
@@ -45,7 +46,7 @@ export interface AlarmDetailsDialogData {
 @Component({
   selector: 'tb-alarm-details-dialog',
   templateUrl: './alarm-details-dialog.component.html',
-  styleUrls: []
+  styleUrls: ['./alarm-details-dialog.component.scss']
 })
 export class AlarmDetailsDialogComponent extends DialogComponent<AlarmDetailsDialogComponent, boolean> implements OnInit {
 
@@ -66,6 +67,8 @@ export class AlarmDetailsDialogComponent extends DialogComponent<AlarmDetailsDia
 
   alarmUpdated = false;
 
+  @ViewChild('alarmCommentComponent', { static: true }) alarmCommentComponent: AlarmCommentComponent;
+
   constructor(protected store: Store<AppState>,
               protected router: Router,
               private datePipe: DatePipe,
@@ -100,12 +103,14 @@ export class AlarmDetailsDialogComponent extends DialogComponent<AlarmDetailsDia
       this.loadAlarm();
     } else {
       this.alarmId = this.data.alarm?.id?.id;
-      this.loadAlarmSubject.next(this.data.alarm);
+      setTimeout(() => {
+        this.loadAlarmSubject.next(this.data.alarm);
+      }, 0);
     }
   }
 
   loadAlarm() {
-    this.alarmService.getAlarmInfo(this.alarmId).subscribe(
+    this.alarmService.getAlarmInfo(this.alarmId, {ignoreLoading: true}).subscribe(
       alarm => this.loadAlarmSubject.next(alarm)
     );
   }
@@ -152,6 +157,7 @@ export class AlarmDetailsDialogComponent extends DialogComponent<AlarmDetailsDia
         () => {
           this.alarmUpdated = true;
           this.loadAlarm();
+          this.alarmCommentComponent.loadAlarmComments();
         }
       );
     }
@@ -163,9 +169,15 @@ export class AlarmDetailsDialogComponent extends DialogComponent<AlarmDetailsDia
         () => {
           this.alarmUpdated = true;
           this.loadAlarm();
+          this.alarmCommentComponent.loadAlarmComments();
         }
       );
     }
   }
 
+  onReassign(): void {
+    this.alarmUpdated = true;
+    this.loadAlarm()
+    this.alarmCommentComponent.loadAlarmComments();
+  }
 }
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts
index ecac2bbaa5..2c1080ee91 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts
@@ -15,6 +15,7 @@
 ///
 
 import {
+  CellActionDescriptorType,
   DateEntityTableColumn,
   EntityTableColumn,
   EntityTableConfig
@@ -48,6 +49,15 @@ import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { getCurrentAuthUser } from '@core/auth/auth.selectors';
 import { Authority } from '@shared/models/authority.enum';
+import { ChangeDetectorRef, Injector, StaticProvider, ViewContainerRef } from '@angular/core';
+import { ConnectedPosition, Overlay, OverlayConfig, OverlayRef } from '@angular/cdk/overlay';
+import {
+  ALARM_ASSIGNEE_PANEL_DATA, AlarmAssigneePanelComponent,
+  AlarmAssigneePanelData
+} from '@home/components/alarm/alarm-assignee-panel.component';
+import { ComponentPortal } from '@angular/cdk/portal';
+import { isDefinedAndNotNull } from '@core/utils';
+import { UtilsService } from '@core/services/utils.service';
 
 export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink> {
 
@@ -62,7 +72,11 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
               private dialog: MatDialog,
               public entityId: EntityId = null,
               private defaultSearchStatus: AlarmSearchStatus = AlarmSearchStatus.ANY,
-              private store: Store<AppState>) {
+              private store: Store<AppState>,
+              private viewContainerRef: ViewContainerRef,
+              private overlay: Overlay,
+              private cd: ChangeDetectorRef,
+              private utilsService: UtilsService) {
     super();
     this.loadDataOnInit = false;
     this.tableTitle = '';
@@ -97,10 +111,35 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
     this.columns.push(
       new EntityTableColumn<AlarmInfo>('severity', 'alarm.severity', '25%',
         (entity) => this.translate.instant(alarmSeverityTranslations.get(entity.severity)),
-          entity => ({
-            fontWeight: 'bold',
-            color: alarmSeverityColors.get(entity.severity)
-          })));
+        entity => ({
+          fontWeight: 'bold',
+          color: alarmSeverityColors.get(entity.severity)
+        })));
+    this.columns.push(
+      new EntityTableColumn<AlarmInfo>('assignee', 'alarm.assignee', '200px',
+        (entity) => {
+          return this.getAssigneeTemplate(entity)
+        },
+        (entity) => {
+          return {
+            display: 'flex',
+            justifyContent: 'start',
+            alignItems: 'center',
+            height: 'inherit'
+          }
+        },
+        false,
+        () => ({}),
+        (entity) => undefined,
+        false,
+        {
+          icon: 'keyboard_arrow_down',
+          type: CellActionDescriptorType.DEFAULT,
+          isEnabled: (entity) => true,
+          name: this.translate.instant('alarm.assign'),
+          onAction: ($event, entity) => this.openAlarmAssigneePanel($event, entity)
+        })
+    )
     this.columns.push(
       new EntityTableColumn<AlarmInfo>('status', 'alarm.status', '25%',
         (entity) => this.translate.instant(alarmStatusTranslations.get(entity.status))));
@@ -116,7 +155,7 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
   }
 
   fetchAlarms(pageLink: TimePageLink): Observable<PageData<AlarmInfo>> {
-    const query = new AlarmQuery(this.entityId, pageLink, this.searchStatus, null, true);
+    const query = new AlarmQuery(this.entityId, pageLink, this.searchStatus, null, true, null);
     return this.alarmService.getAlarms(query);
   }
 
@@ -142,4 +181,100 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
       }
     );
   }
+
+  getAssigneeTemplate(entity: AlarmInfo): string {
+    return `
+      <span class="assignee-cell">
+      ${isDefinedAndNotNull(entity.assigneeId) ?
+        `<span class="assigned-container">
+          <span class="user-avatar" style="background-color: ${this.getAvatarBgColor(entity)}">
+            ${this.getUserInitials(entity)}
+          </span>
+          <span class="user-display-name">${this.getUserDisplayName(entity)}</span>
+        </span>`
+        :
+        `<mat-icon class="material-icons unassigned-icon">account_circle</mat-icon>
+        <span>${this.translate.instant('alarm.unassigned')}</span>`
+      }
+      </span>`
+  }
+
+  getUserDisplayName(entity: AlarmInfo) {
+    let displayName = '';
+    if ((entity.assignee.firstName && entity.assignee.firstName.length > 0) ||
+      (entity.assignee.lastName && entity.assignee.lastName.length > 0)) {
+      if (entity.assignee.firstName) {
+        displayName += entity.assignee.firstName;
+      }
+      if (entity.assignee.lastName) {
+        if (displayName.length > 0) {
+          displayName += ' ';
+        }
+        displayName += entity.assignee.lastName;
+      }
+    } else {
+      displayName = entity.assignee.email;
+    }
+    return displayName;
+  }
+
+  getUserInitials(entity: AlarmInfo): string {
+    let initials = '';
+    if (entity.assignee.firstName && entity.assignee.firstName.length ||
+      entity.assignee.lastName && entity.assignee.lastName.length) {
+      if (entity.assignee.firstName) {
+        initials += entity.assignee.firstName.charAt(0);
+      }
+      if (entity.assignee.lastName) {
+        initials += entity.assignee.lastName.charAt(0);
+      }
+    } else {
+      initials += entity.assignee.email.charAt(0);
+    }
+    return initials.toUpperCase();
+  }
+
+  getAvatarBgColor(entity: AlarmInfo) {
+    return this.utilsService.stringToHslColor(this.getUserDisplayName(entity), 40, 60);
+  }
+
+  openAlarmAssigneePanel($event: Event, entity: AlarmInfo) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    const target = $event.target || $event.srcElement || $event.currentTarget;
+    const config = new OverlayConfig();
+    config.backdropClass = 'cdk-overlay-transparent-backdrop';
+    config.hasBackdrop = true;
+    const connectedPosition: ConnectedPosition = {
+      originX: 'end',
+      originY: 'bottom',
+      overlayX: 'end',
+      overlayY: 'top'
+    };
+    config.positionStrategy = this.overlay.position().flexibleConnectedTo(target as HTMLElement)
+      .withPositions([connectedPosition]);
+    config.minWidth = '260px';
+    const overlayRef = this.overlay.create(config);
+    overlayRef.backdropClick().subscribe(() => {
+      overlayRef.dispose();
+    });
+    const providers: StaticProvider[] = [
+      {
+        provide: ALARM_ASSIGNEE_PANEL_DATA,
+        useValue: {
+          alarmId: entity.id.id,
+          assigneeId: entity.assigneeId?.id
+        } as AlarmAssigneePanelData
+      },
+      {
+        provide: OverlayRef,
+        useValue: overlayRef
+      }
+    ];
+    const injector = Injector.create({parent: this.viewContainerRef.injector, providers});
+    overlayRef.attach(new ComponentPortal(AlarmAssigneePanelComponent,
+      this.viewContainerRef, injector)).onDestroy(() => this.updateData());
+  }
+
 }
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-table.component.scss b/ui-ngx/src/app/modules/home/components/alarm/alarm-table.component.scss
index b80526aee8..a7a408b419 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-table.component.scss
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-table.component.scss
@@ -17,6 +17,39 @@
   tb-entities-table {
     .mat-drawer-container {
       background-color: white;
+      .assignee-cell {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        .assigned-container {
+          max-width: 180px;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          .user-avatar {
+            display: inline-flex;
+            justify-content: center;
+            align-items: center;
+            margin-right: 8px;
+            border-radius: 50%;
+            width: 28px;
+            height: 28px;
+            min-width: 28px;
+            min-height: 28px;
+            color: white;
+            font-size: 13px;
+            font-weight: 700;
+          }
+        }
+        .material-icons.unassigned-icon {
+          width: 28px;
+          height: 28px;
+          font-size: 28px;
+          margin-right: 8px;
+          color: rgba(0, 0, 0, 0.38);
+          overflow: visible;
+        }
+      }
     }
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-table.component.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-table.component.ts
index 0d53eaaf42..5885c38db0 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-table.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, Input, OnInit, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { DatePipe } from '@angular/common';
 import { MatDialog } from '@angular/material/dialog';
@@ -26,6 +26,8 @@ import { AlarmSearchStatus } from '@shared/models/alarm.models';
 import { AlarmService } from '@app/core/http/alarm.service';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
+import { Overlay } from '@angular/cdk/overlay';
+import { UtilsService } from '@core/services/utils.service';
 
 @Component({
   selector: 'tb-alarm-table',
@@ -71,7 +73,11 @@ export class AlarmTableComponent implements OnInit {
               private translate: TranslateService,
               private datePipe: DatePipe,
               private dialog: MatDialog,
-              private store: Store<AppState>) {
+              private store: Store<AppState>,
+              private overlay: Overlay,
+              private viewContainerRef: ViewContainerRef,
+              private cd: ChangeDetectorRef,
+              private utilsService: UtilsService) {
   }
 
   ngOnInit() {
@@ -84,7 +90,11 @@ export class AlarmTableComponent implements OnInit {
       this.dialog,
       this.entityIdValue,
       AlarmSearchStatus.ANY,
-      this.store
+      this.store,
+      this.viewContainerRef,
+      this.overlay,
+      this.cd,
+      this.utilsService
     );
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
index ed434bc944..0150597b50 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
@@ -492,7 +492,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
       const cssParser = new cssjs();
       cssParser.testMode = false;
       this.dashboardPageClass  = 'tb-dashboard-page-css-' + guid();
-      cssParser.cssPreviewNamespace = this.dashboardPageClass;
+      cssParser.cssPreviewNamespace = 'tb-default .' + this.dashboardPageClass;
       cssParser.createStyleElement(this.dashboardPageClass, cssString);
     }
   }
diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/states/default-state-controller.component.scss b/ui-ngx/src/app/modules/home/components/dashboard-page/states/default-state-controller.component.scss
index c1460924cf..99125799e9 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/states/default-state-controller.component.scss
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/states/default-state-controller.component.scss
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 :host {
+  pointer-events: all;
   width: min-content; //for Safari
 }
 
diff --git a/ui-ngx/src/app/modules/home/components/home-components.module.ts b/ui-ngx/src/app/modules/home/components/home-components.module.ts
index 99d30c70cd..917f608f94 100644
--- a/ui-ngx/src/app/modules/home/components/home-components.module.ts
+++ b/ui-ngx/src/app/modules/home/components/home-components.module.ts
@@ -175,6 +175,7 @@ import { AssetProfileDialogComponent } from '@home/components/profile/asset-prof
 import { AssetProfileAutocompleteComponent } from '@home/components/profile/asset-profile-autocomplete.component';
 import { MODULES_MAP } from '@shared/models/constants';
 import { modulesMap } from '@modules/common/modules-map';
+import { AlarmAssigneePanelComponent } from '@home/components/alarm/alarm-assignee-panel.component';
 
 @NgModule({
   declarations:
@@ -197,6 +198,7 @@ import { modulesMap } from '@modules/common/modules-map';
       RelationFiltersComponent,
       AlarmTableHeaderComponent,
       AlarmTableComponent,
+      AlarmAssigneePanelComponent,
       AttributeTableComponent,
       AddAttributeDialogComponent,
       EditAttributeValuePanelComponent,
@@ -344,6 +346,7 @@ import { modulesMap } from '@modules/common/modules-map';
     RelationTableComponent,
     RelationFiltersComponent,
     AlarmTableComponent,
+    AlarmAssigneePanelComponent,
     AttributeTableComponent,
     AliasesEntitySelectComponent,
     AliasesEntityAutocompleteComponent,
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.html b/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.html
index 18018742be..1ef7892ecb 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.html
@@ -15,7 +15,32 @@
     limitations under the License.
 
 -->
-<form [formGroup]="mqttDeviceProfileTransportConfigurationFormGroup" style="padding-bottom: 16px;">
+<form [formGroup]="mqttDeviceProfileTransportConfigurationFormGroup" style="padding-top: 8px;">
+  <mat-checkbox formControlName="sparkplug">
+    {{ 'device-profile.mqtt-device-topic-filters-spark-plug' | translate }}
+  </mat-checkbox>
+  <div *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplug').value"
+       class="tb-hint" innerHTML="{{ 'device-profile.mqtt-device-topic-filters-spark-plug-hint' | translate }}"></div>
+  <mat-form-field floatLabel="always" class="mat-block" style="padding-top: 8px;"
+                  *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplug').value">
+    <mat-label translate>device-profile.mqtt-device-topic-filters-spark-plug-attribute-metric-names</mat-label>
+    <mat-chip-list #attrMetricNamesChipList formControlName="sparkplugAttributesMetricNames">
+      <mat-chip
+        *ngFor="let name of mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplugAttributesMetricNames').value;"
+        (removed)="removeAttributeMetricName(name)">
+        {{name}}
+        <mat-icon matChipRemove>close</mat-icon>
+      </mat-chip>
+      <input matInput type="text" placeholder="{{'device-profile.mqtt-device-topic-filters-spark-plug-attribute-metric-names' | translate}}"
+             [matChipInputFor]="attrMetricNamesChipList"
+             [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+             matChipInputAddOnBlur
+             (matChipInputTokenEnd)="addAttributeMetricName($event)">
+    </mat-chip-list>
+    <mat-hint innerHTML="{{ 'device-profile.mqtt-device-topic-filters-spark-plug-attribute-metric-names-hint' | translate }}"></mat-hint>
+  </mat-form-field>
+</form>
+<form [formGroup]="mqttDeviceProfileTransportConfigurationFormGroup" style="padding-bottom: 16px;" *ngIf="!mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplug').value">
   <fieldset class="fields-group">
     <legend class="group-title" translate>device-profile.mqtt-device-topic-filters</legend>
     <div fxLayoutGap="8px" fxLayout="column">
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.ts
index a60f4ec5c4..cf931a7fed 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device/mqtt-device-profile-transport-configuration.component.ts
@@ -41,6 +41,8 @@ import {
 import { isDefinedAndNotNull } from '@core/utils';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
+import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes';
+import { MatChipInputEvent } from '@angular/material/chips';
 
 @Component({
   selector: 'tb-mqtt-device-profile-transport-configuration',
@@ -77,6 +79,8 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
 
   private propagateChange = (v: any) => { };
 
+  separatorKeysCodes = [ENTER, COMMA, SEMICOLON];
+
   constructor(private store: Store<AppState>,
               private fb: UntypedFormBuilder) {
   }
@@ -92,6 +96,8 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
     this.mqttDeviceProfileTransportConfigurationFormGroup = this.fb.group({
         deviceAttributesTopic: [null, [Validators.required, this.validationMQTTTopic()]],
         deviceTelemetryTopic: [null, [Validators.required, this.validationMQTTTopic()]],
+        sparkplug: [false],
+        sparkplugAttributesMetricNames: [null],
         sendAckOnValidationException: [false, Validators.required],
         transportPayloadTypeConfiguration: this.fb.group({
           transportPayloadType: [TransportPayloadType.JSON, Validators.required],
@@ -102,7 +108,7 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
           enableCompatibilityWithJsonPayloadFormat: [false, Validators.required],
           useJsonPayloadFormatForDefaultDownlinkTopics: [false, Validators.required]
         })
-      }, {validator: this.uniqueDeviceTopicValidator}
+      }, {validators: this.uniqueDeviceTopicValidator}
     );
     this.mqttDeviceProfileTransportConfigurationFormGroup.get('transportPayloadTypeConfiguration.transportPayloadType').valueChanges.pipe(
       takeUntil(this.destroy$)
@@ -117,6 +123,17 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
           .patchValue(false, {emitEvent: false});
       }
     });
+    this.mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplug').valueChanges.pipe(
+      takeUntil(this.destroy$)
+    ).subscribe((value) => {
+      if (value) {
+        this.mqttDeviceProfileTransportConfigurationFormGroup.disable({emitEvent: false});
+        this.mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplug').enable({emitEvent: false});
+        this.mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplugAttributesMetricNames').enable({emitEvent: false});
+      } else {
+        this.mqttDeviceProfileTransportConfigurationFormGroup.enable({emitEvent: false});
+      }
+    });
     this.mqttDeviceProfileTransportConfigurationFormGroup.valueChanges.pipe(
       takeUntil(this.destroy$)
     ).subscribe(() => {
@@ -135,6 +152,7 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
       this.mqttDeviceProfileTransportConfigurationFormGroup.disable({emitEvent: false});
     } else {
       this.mqttDeviceProfileTransportConfigurationFormGroup.enable({emitEvent: false});
+      this.mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplug').updateValueAndValidity({onlySelf: true});
     }
   }
 
@@ -151,13 +169,44 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
     if (isDefinedAndNotNull(value)) {
       this.mqttDeviceProfileTransportConfigurationFormGroup.patchValue(value, {emitEvent: false});
       this.updateTransportPayloadBasedControls(value.transportPayloadTypeConfiguration?.transportPayloadType);
+      if (!this.disabled) {
+        this.mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplug').updateValueAndValidity({onlySelf: true});
+      }
+    }
+  }
+
+  removeAttributeMetricName(name: string): void {
+    const names: string[] = this.mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplugAttributesMetricNames').value;
+    const index = names.indexOf(name);
+    if (index >= 0) {
+      names.splice(index, 1);
+      this.mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplugAttributesMetricNames').setValue(names);
+    }
+  }
+
+  addAttributeMetricName(event: MatChipInputEvent): void {
+    const input = event.input;
+    let value = event.value;
+    if ((value || '').trim()) {
+      value = value.trim();
+      let names: string[] = this.mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplugAttributesMetricNames').value;
+      if (!names || names.indexOf(value) === -1) {
+        if (!names) {
+          names = [];
+        }
+        names.push(value);
+        this.mqttDeviceProfileTransportConfigurationFormGroup.get('sparkplugAttributesMetricNames').setValue(names, {emitEvent: true});
+      }
+    }
+    if (input) {
+      input.value = '';
     }
   }
 
   private updateModel() {
     let configuration: DeviceProfileTransportConfiguration = null;
     if (this.mqttDeviceProfileTransportConfigurationFormGroup.valid) {
-      configuration = this.mqttDeviceProfileTransportConfigurationFormGroup.value;
+      configuration = this.mqttDeviceProfileTransportConfigurationFormGroup.getRawValue();
       configuration.type = DeviceTransportType.MQTT;
     }
     this.propagateChange(configuration);
diff --git a/ui-ngx/src/app/modules/home/components/shared-home-components.module.ts b/ui-ngx/src/app/modules/home/components/shared-home-components.module.ts
index 508e3de95d..865e7cf224 100644
--- a/ui-ngx/src/app/modules/home/components/shared-home-components.module.ts
+++ b/ui-ngx/src/app/modules/home/components/shared-home-components.module.ts
@@ -19,6 +19,9 @@ import { CommonModule } from '@angular/common';
 import { SharedModule } from '@app/shared/shared.module';
 import { AlarmDetailsDialogComponent } from '@home/components/alarm/alarm-details-dialog.component';
 import { SHARED_HOME_COMPONENTS_MODULE_TOKEN } from '@home/components/tokens';
+import { AlarmCommentComponent } from '@home/components/alarm/alarm-comment.component';
+import { AlarmCommentDialogComponent } from '@home/components/alarm/alarm-comment-dialog.component';
+import { AlarmAssigneeComponent } from '@home/components/alarm/alarm-assignee.component';
 
 @NgModule({
   providers: [
@@ -26,14 +29,20 @@ import { SHARED_HOME_COMPONENTS_MODULE_TOKEN } from '@home/components/tokens';
   ],
   declarations:
     [
-      AlarmDetailsDialogComponent
+      AlarmDetailsDialogComponent,
+      AlarmCommentComponent,
+      AlarmCommentDialogComponent,
+      AlarmAssigneeComponent
     ],
   imports: [
     CommonModule,
     SharedModule
   ],
   exports: [
-    AlarmDetailsDialogComponent
+    AlarmDetailsDialogComponent,
+    AlarmCommentComponent,
+    AlarmCommentDialogComponent,
+    AlarmAssigneeComponent
   ]
 })
 export class SharedHomeComponentsModule { }
diff --git a/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html b/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html
index a3fee96758..bd714d9e33 100644
--- a/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html
+++ b/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html
@@ -62,7 +62,7 @@
                   </mat-option>
                 </mat-select>
               </mat-form-field>
-              <div fxFlex fxLayout="column" fxLayoutGap="8px">
+              <div fxFlex fxLayout="column">
                 <mat-checkbox *ngIf="entityTypeFormGroup.get('entityType').value === entityTypes.DEVICE" formControlName="saveCredentials">
                   {{ 'version-control.export-credentials' | translate }}
                 </mat-checkbox>
diff --git a/ui-ngx/src/app/modules/home/components/vc/entity-types-version-load.component.html b/ui-ngx/src/app/modules/home/components/vc/entity-types-version-load.component.html
index 52b80799b5..ec1d7707b1 100644
--- a/ui-ngx/src/app/modules/home/components/vc/entity-types-version-load.component.html
+++ b/ui-ngx/src/app/modules/home/components/vc/entity-types-version-load.component.html
@@ -52,7 +52,7 @@
               [allowedEntityTypes]="allowedEntityTypes(entityTypeFormGroup)">
             </tb-entity-type-select>
             <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px" fxLayoutGap.xs="8px" formGroupName="config">
-              <div fxFlex fxLayout="column" fxLayoutGap="8px">
+              <div fxFlex fxLayout="column">
                 <mat-checkbox #removeOtherEntitiesCheckbox
                               formControlName="removeOtherEntities"
                               (click)="onRemoveOtherEntities(removeOtherEntitiesCheckbox, entityTypeFormGroup, $event)">
@@ -62,7 +62,7 @@
                   {{ 'version-control.find-existing-entity-by-name' | translate }}
                 </mat-checkbox>
               </div>
-              <div fxFlex fxLayout="column" fxLayoutGap="8px">
+              <div fxFlex fxLayout="column">
                 <mat-checkbox *ngIf="entityTypeFormGroup.get('entityType').value === entityTypes.DEVICE" formControlName="loadCredentials">
                   {{ 'version-control.load-credentials' | translate }}
                 </mat-checkbox>
diff --git a/ui-ngx/src/app/modules/home/components/vc/entity-types-version.component.scss b/ui-ngx/src/app/modules/home/components/vc/entity-types-version.component.scss
index e707ae4dbf..09630919fd 100644
--- a/ui-ngx/src/app/modules/home/components/vc/entity-types-version.component.scss
+++ b/ui-ngx/src/app/modules/home/components/vc/entity-types-version.component.scss
@@ -64,5 +64,12 @@
       height: 0;
       visibility: hidden;
     }
+    .entity-type-config-content {
+      .mat-mdc-checkbox {
+        label {
+          white-space: nowrap;
+        }
+      }
+    }
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.html
index 65ec9393fc..f91caf9baa 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.html
@@ -82,8 +82,35 @@
             {{ column.title }}
           </mat-header-cell>
           <mat-cell *matCellDef="let alarm; let row = index"
-                    [innerHTML]="cellContent(alarm, column, row)"
                     [ngStyle]="cellStyle(alarm, column, row)">
+            <span [innerHTML]="cellContent(alarm, column, row)"></span>
+            <ng-container *ngIf="column.entityKey.key === 'assignee'">
+              <span class="assignee-cell" fxLayout="row" fxLayoutAlign="start center">
+                <span *ngIf="alarm.assigneeId" class="assigned-container">
+                  <span class="user-avatar" [style.backgroundColor]="getAvatarBgColor(alarm)">
+                    {{ getUserInitials(alarm) }}
+                  </span>
+                  <span [matTooltip]="getUserDisplayName(alarm)"
+                        matTooltipPosition="above"
+                        style="text-overflow: ellipsis">
+                    {{ getUserDisplayName(alarm) }}
+                  </span>
+                </span>
+                <span *ngIf="!alarm.assigneeId" class="unassigned-container" fxLayout="row" fxLayoutAlign="start center">
+                  <mat-icon class="material-icons unassigned-icon">account_circle</mat-icon>
+                  <span translate>alarm.unassigned</span>
+                </span>
+                <button *ngIf="allowAssign"
+                        mat-icon-button [disabled]="isLoading$ | async"
+                        matTooltip="{{ 'alarm.assign' | translate }}"
+                        matTooltipPosition="above"
+                        (click)="openAlarmAssigneePanel($event, alarm)">
+                  <mat-icon>
+                    keyboard_arrow_down
+                  </mat-icon>
+                </button>
+              </span>
+            </ng-container>
           </mat-cell>
         </ng-container>
         <ng-container matColumnDef="actions" [stickyEnd]="enableStickyAction">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.scss
index cb4a293072..2a77861e21 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.scss
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-:host {
+:host::ng-deep {
   width: 100%;
   height: 100%;
   display: block;
@@ -26,6 +26,42 @@
         &.invisible {
           visibility: hidden;
         }
+        .mat-mdc-cell {
+          .assignee-cell {
+            .assigned-container {
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              .user-avatar {
+                display: inline-flex;
+                justify-content: center;
+                align-items: center;
+                margin-right: 8px;
+                border-radius: 50%;
+                width: 28px;
+                height: 28px;
+                min-width: 28px;
+                min-height: 28px;
+                color: white;
+                font-size: 13px;
+                font-weight: 700;
+              }
+            }
+            .unassigned-container {
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              .material-icons.unassigned-icon {
+                width: 28px;
+                height: 28px;
+                font-size: 28px;
+                margin-right: 8px;
+                color: rgba(0, 0, 0, 0.38);
+                overflow: visible;
+              }
+            }
+          }
+        }
       }
     }
     span.no-data-found {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts
index 35392e4f9e..5b233ba2d1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts
@@ -93,7 +93,7 @@ import {
 } from '@home/components/widget/lib/display-columns-panel.component';
 import {
   AlarmDataInfo,
-  alarmFields,
+  alarmFields, AlarmInfo,
   AlarmSearchStatus,
   alarmSeverityColors,
   alarmSeverityTranslations,
@@ -127,6 +127,14 @@ import { entityFields } from '@shared/models/entity.models';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { ResizeObserver } from '@juggle/resize-observer';
 import { hidePageSizePixelValue } from '@shared/models/constants';
+import {
+  ALARM_ASSIGNEE_PANEL_DATA, AlarmAssigneePanelComponent,
+  AlarmAssigneePanelData
+} from '@home/components/alarm/alarm-assignee-panel.component';
+import {
+  AlarmCommentDialogComponent,
+  AlarmCommentDialogData
+} from '@home/components/alarm/alarm-comment-dialog.component';
 
 interface AlarmsTableWidgetSettings extends TableWidgetSettings {
   alarmsTitle: string;
@@ -135,15 +143,18 @@ interface AlarmsTableWidgetSettings extends TableWidgetSettings {
   enableSelection: boolean;
   enableStatusFilter?: boolean;
   enableFilter: boolean;
+  displayComments: boolean;
   displayDetails: boolean;
   allowAcknowledgment: boolean;
   allowClear: boolean;
+  allowAssign: boolean;
 }
 
 interface AlarmWidgetActionDescriptor extends TableCellButtonActionDescriptor {
   details?: boolean;
   acknowledge?: boolean;
   clear?: boolean;
+  comments?: boolean;
 }
 
 @Component({
@@ -186,9 +197,11 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
 
   private alarmsTitlePattern: string;
 
+  private displayComments = false;
   private displayDetails = true;
   public allowAcknowledgment = true;
   private allowClear = true;
+  public allowAssign = true;
 
   private defaultPageSize = 10;
   private defaultSortOrder = '-' + alarmFields.createdTime.value;
@@ -322,9 +335,11 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
   private initializeConfig() {
     this.ctx.widgetActions = [this.searchAction, this.alarmFilterAction, this.columnDisplayAction];
 
+    this.displayComments = isDefined(this.settings.displayComments) ? this.settings.displayComments : false;
     this.displayDetails = isDefined(this.settings.displayDetails) ? this.settings.displayDetails : true;
     this.allowAcknowledgment = isDefined(this.settings.allowAcknowledgment) ? this.settings.allowAcknowledgment : true;
     this.allowClear = isDefined(this.settings.allowClear) ? this.settings.allowClear : true;
+    this.allowAssign = isDefined(this.settings.allowAssign) ? this.settings.allowAssign : true;
 
     if (this.settings.alarmsTitle && this.settings.alarmsTitle.length) {
       this.alarmsTitlePattern = this.utils.customTranslation(this.settings.alarmsTitle, this.settings.alarmsTitle);
@@ -418,6 +433,9 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
           if (alarmField && alarmField.time) {
             keySettings.columnWidth = '120px';
           }
+          if (alarmField && alarmField.keyName  === alarmFields.assignee.keyName) {
+            keySettings.columnWidth = '120px'
+          }
         }
         this.stylesInfo[dataKey.def] = getCellStyleInfo(keySettings, 'value, alarm, ctx');
         this.contentsInfo[dataKey.def] = getCellContentInfo(keySettings, 'value, alarm, ctx');
@@ -446,6 +464,16 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
     this.sortOrderProperty = sortColumn ? sortColumn.def : null;
 
     const actionCellDescriptors: AlarmWidgetActionDescriptor[] = [];
+    if (this.displayComments) {
+      actionCellDescriptors.push(
+        {
+          displayName: this.translate.instant('alarm-comment.comments'),
+          icon: 'comment',
+          comments: true
+        } as AlarmWidgetActionDescriptor
+      );
+    }
+
     if (this.displayDetails) {
       actionCellDescriptors.push(
         {
@@ -791,6 +819,8 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
       this.ackAlarm($event, alarm);
     } else if (actionDescriptor.clear) {
       this.clearAlarm($event, alarm);
+    } else if (actionDescriptor.comments) {
+      this.openAlarmComments($event, alarm);
     } else {
       if ($event) {
         $event.stopPropagation();
@@ -954,6 +984,24 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
     }
   }
 
+  private openAlarmComments($event: Event, alarm: AlarmDataInfo) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    if (alarm && alarm.id && alarm.id.id !== NULL_UUID) {
+      this.dialog.open<AlarmCommentDialogComponent, AlarmCommentDialogData, void>
+      (AlarmCommentDialogComponent,
+        {
+          disableClose: true,
+          panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
+          data: {
+            alarmId: alarm.id.id,
+            commentsHeaderEnabled: false
+          }
+        }).afterClosed()
+    }
+  }
+
   private defaultContent(key: EntityColumn, contentInfo: CellContentInfo, value: any): any {
     if (isDefined(value)) {
       const alarmField = alarmFields[key.name];
@@ -966,7 +1014,10 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
           return alarmStatusTranslations.get(value) ? this.translate.instant(alarmStatusTranslations.get(value)) : value;
         } else if (alarmField.value === alarmFields.originatorType.value) {
           return this.translate.instant(entityTypeTranslations.get(value).type);
-        } else {
+        } else if (alarmField.value === alarmFields.assignee.value) {
+          return '';
+        }
+        else {
           return value;
         }
       }
@@ -1013,6 +1064,84 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
     this.cellStyleCache.length = 0;
     this.rowStyleCache.length = 0;
   }
+
+  getUserDisplayName(entity: AlarmInfo) {
+    let displayName = '';
+    if ((entity.assignee.firstName && entity.assignee.firstName.length > 0) ||
+      (entity.assignee.lastName && entity.assignee.lastName.length > 0)) {
+      if (entity.assignee.firstName) {
+        displayName += entity.assignee.firstName;
+      }
+      if (entity.assignee.lastName) {
+        if (displayName.length > 0) {
+          displayName += ' ';
+        }
+        displayName += entity.assignee.lastName;
+      }
+    } else {
+      displayName = entity.assignee.email;
+    }
+    return displayName;
+  }
+
+  getUserInitials(entity: AlarmInfo): string {
+    let initials = '';
+    if (entity.assignee.firstName && entity.assignee.firstName.length ||
+      entity.assignee.lastName && entity.assignee.lastName.length) {
+      if (entity.assignee.firstName) {
+        initials += entity.assignee.firstName.charAt(0);
+      }
+      if (entity.assignee.lastName) {
+        initials += entity.assignee.lastName.charAt(0);
+      }
+    } else {
+      initials += entity.assignee.email.charAt(0);
+    }
+    return initials.toUpperCase();
+  }
+
+  getAvatarBgColor(entity: AlarmInfo) {
+    return this.utils.stringToHslColor(this.getUserDisplayName(entity), 40, 60);
+  }
+
+  openAlarmAssigneePanel($event: Event, entity: AlarmInfo) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    const target = $event.target || $event.srcElement || $event.currentTarget;
+    const config = new OverlayConfig();
+    config.backdropClass = 'cdk-overlay-transparent-backdrop';
+    config.hasBackdrop = true;
+    const connectedPosition: ConnectedPosition = {
+      originX: 'end',
+      originY: 'bottom',
+      overlayX: 'end',
+      overlayY: 'top'
+    };
+    config.positionStrategy = this.overlay.position().flexibleConnectedTo(target as HTMLElement)
+      .withPositions([connectedPosition]);
+    config.minWidth = '260px';
+    const overlayRef = this.overlay.create(config);
+    overlayRef.backdropClick().subscribe(() => {
+      overlayRef.dispose();
+    });
+    const providers: StaticProvider[] = [
+      {
+        provide: ALARM_ASSIGNEE_PANEL_DATA,
+        useValue: {
+          alarmId: entity.id.id,
+          assigneeId: entity.assigneeId?.id
+        } as AlarmAssigneePanelData
+      },
+      {
+        provide: OverlayRef,
+        useValue: overlayRef
+      }
+    ];
+    const injector = Injector.create({parent: this.viewContainerRef.injector, providers});
+    overlayRef.attach(new ComponentPortal(AlarmAssigneePanelComponent,
+      this.viewContainerRef, injector));
+  }
 }
 
 class AlarmsDatasource implements DataSource<AlarmDataInfo> {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts
index c0e5aa4212..aae7d2c37a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts
@@ -341,6 +341,7 @@ export class TbFlot {
 
   private init($element: JQuery<any>, subscription: IWidgetSubscription) {
     this.$element = $element;
+    this.$element.css('letter-spacing', 'normal');
     this.subscription = subscription;
     this.comparisonEnabled = this.subscription ? this.subscription.comparisonEnabled : this.settings.comparisonEnabled;
     if (this.comparisonEnabled) {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
index e2dfff11ea..a78dd27431 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
@@ -520,6 +520,13 @@ export default abstract class LeafletMap {
         this.createdControlButtonTooltip();
     }
 
+    resetState() {
+      if (this.options.initDragMode) {
+        this.initDragModeIgnoreUpdateBoundsSet = false;
+        this.ignoreUpdateBounds = false;
+      }
+    }
+
     private createdControlButtonTooltip() {
       import('tooltipster').then(() => {
         if ($.tooltipster) {
@@ -841,7 +848,7 @@ export default abstract class LeafletMap {
         this.fitBounds(bounds);
       }
     }
-    if (this.options.initDragMode && !this.initDragModeIgnoreUpdateBoundsSet) {
+    if (this.options.initDragMode && !this.initDragModeIgnoreUpdateBoundsSet && bounds.isValid()) {
       this.initDragModeIgnoreUpdateBoundsSet = true;
       this.ignoreUpdateBounds = true;
     }
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 143c106baa..f69c4dcc76 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
@@ -83,6 +83,9 @@ export class MapWidgetController implements MapWidgetInterface {
           dynamic: true
         };
         this.map.setLoading(true);
+        this.ctx.defaultSubscription.paginatedDataSubscriptionUpdated.subscribe(() => {
+          this.map.resetState();
+        });
         this.ctx.defaultSubscription.subscribeAllForPaginatedData(this.pageLink, null);
     }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/markdown-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/markdown-widget.component.html
index d182c26dbe..1c3df367c4 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/markdown-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/markdown-widget.component.html
@@ -16,4 +16,7 @@
 
 -->
 <tb-markdown [data]="markdownText" [additionalCompileModules]="[ homeComponentsModule ]"
+             [additionalStyles]="additionalStyles"
+             [containerClass]="markdownClass"
+             [applyDefaultMarkdownStyle]="applyDefaultMarkdownStyle"
              [context]="{ ctx: ctx }" lineNumbers fallbackToPlainMarkdown (click)="markdownClick($event)"></tb-markdown>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/markdown-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/markdown-widget.component.ts
index c71affe5c1..98c196f393 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/markdown-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/markdown-widget.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { ChangeDetectorRef, Component, HostBinding, Inject, Input, OnInit, Type } from '@angular/core';
+import { ChangeDetectorRef, Component, Inject, Input, OnInit, Type } from '@angular/core';
 import { PageComponent } from '@shared/components/page.component';
 import { WidgetContext } from '@home/models/widget-component.models';
 import { Store } from '@ngrx/store';
@@ -25,7 +25,8 @@ import {
   createLabelFromPattern,
   flatDataWithoutOverride,
   formattedDataFormDatasourceData,
-  hashCode, isDefinedAndNotNull,
+  hashCode,
+  isDefinedAndNotNull,
   isNotEmptyStr,
   parseFunction,
   safeExecute
@@ -39,13 +40,14 @@ interface MarkdownWidgetSettings {
   markdownTextPattern: string;
   useMarkdownTextFunction: boolean;
   markdownTextFunction: string;
+  applyDefaultMarkdownStyle: boolean;
   markdownCss: string;
 }
 
 type MarkdownTextFunction = (data: FormattedData[], ctx: WidgetContext) => string;
 
 @Component({
-  selector: 'tb-markdown-widget ',
+  selector: 'tb-markdown-widget',
   templateUrl: './markdown-widget.component.html'
 })
 export class MarkdownWidgetComponent extends PageComponent implements OnInit {
@@ -53,7 +55,6 @@ export class MarkdownWidgetComponent extends PageComponent implements OnInit {
   settings: MarkdownWidgetSettings;
   markdownTextFunction: MarkdownTextFunction;
 
-  @HostBinding('class')
   markdownClass: string;
 
   @Input()
@@ -61,6 +62,9 @@ export class MarkdownWidgetComponent extends PageComponent implements OnInit {
 
   markdownText: string;
 
+  additionalStyles: string[];
+
+  applyDefaultMarkdownStyle = true;
 
   constructor(protected store: Store<AppState>,
               private utils: UtilsService,
@@ -74,14 +78,18 @@ export class MarkdownWidgetComponent extends PageComponent implements OnInit {
     this.settings = this.ctx.settings;
     this.markdownTextFunction = this.settings.useMarkdownTextFunction ?
       parseFunction(this.settings.markdownTextFunction, ['data', 'ctx']) : null;
-    this.markdownClass = 'markdown-widget';
-    const cssString = this.settings.markdownCss;
+    let cssString = this.settings.markdownCss;
     if (isNotEmptyStr(cssString)) {
       const cssParser = new cssjs();
-      cssParser.testMode = false;
-      this.markdownClass += '-' + hashCode(cssString);
+      this.markdownClass = 'markdown-widget-' + hashCode(cssString);
       cssParser.cssPreviewNamespace = this.markdownClass;
-      cssParser.createStyleElement(this.markdownClass, cssString);
+      cssParser.testMode = false;
+      cssString = cssParser.applyNamespacing(cssString);
+      cssString = cssParser.getCSSForEditor(cssString);
+      this.additionalStyles = [cssString];
+    }
+    if (isDefinedAndNotNull(this.settings.applyDefaultMarkdownStyle)) {
+      this.applyDefaultMarkdownStyle = this.settings.applyDefaultMarkdownStyle;
     }
     const pageSize = isDefinedAndNotNull(this.ctx.widgetConfig.pageSize) &&
                       this.ctx.widgetConfig.pageSize > 0 ? this.ctx.widgetConfig.pageSize : 16384;
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 07dc221e6f..d0dd324e52 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
@@ -66,13 +66,17 @@
 
 :host ::ng-deep {
   .tb-multiple-input {
-    .mat-mdc-slide-toggle .mdc-form-field > label {
-      display: flex;
-      align-items: center;
-
-      .mat-icon {
-        margin-left: 8px;
-        margin-right: 8px;
+    .mat-mdc-slide-toggle .mdc-form-field {
+      width: 100%;
+      & > label {
+        display: flex;
+        align-items: center;
+        width: 100%;
+        margin: 0;
+        .mat-icon {
+          margin-left: 8px;
+          margin-right: 8px;
+        }
       }
     }
   }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/alarm/alarms-table-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/alarm/alarms-table-widget-settings.component.html
index f2ce2642bd..8820225e6c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/alarm/alarms-table-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/alarm/alarms-table-widget-settings.component.html
@@ -58,6 +58,9 @@
       </mat-select>
     </mat-form-field>
     <section fxLayout="column" fxLayoutGap="8px">
+      <mat-slide-toggle formControlName="displayComments">
+        {{ 'widgets.table.display-alarm-comments' | translate }}
+      </mat-slide-toggle>
       <mat-slide-toggle fxFlex formControlName="displayDetails">
         {{ 'widgets.table.display-alarm-details' | translate }}
       </mat-slide-toggle>
@@ -67,6 +70,9 @@
       <mat-slide-toggle formControlName="allowClear">
         {{ 'widgets.table.allow-alarms-clear' | translate }}
       </mat-slide-toggle>
+      <mat-slide-toggle formControlName="allowAssign">
+        {{ 'widgets.table.allow-alarms-assign' | translate }}
+      </mat-slide-toggle>
       <section fxLayout="column" fxLayout.gt-xs="row" fxLayoutGap="8px" fxLayoutAlign.gt-xs="start center">
         <mat-slide-toggle fxFlex formControlName="displayPagination">
           {{ 'widgets.table.display-pagination' | translate }}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/alarm/alarms-table-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/alarm/alarms-table-widget-settings.component.ts
index 953bde001c..655f915a4d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/alarm/alarms-table-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/alarm/alarms-table-widget-settings.component.ts
@@ -51,6 +51,7 @@ export class AlarmsTableWidgetSettingsComponent extends WidgetSettingsComponent
       displayDetails: true,
       allowAcknowledgment: true,
       allowClear: true,
+      allowAssign: true,
       displayPagination: true,
       defaultPageSize: 10,
       defaultSortOrder: '-createdTime',
@@ -72,6 +73,8 @@ export class AlarmsTableWidgetSettingsComponent extends WidgetSettingsComponent
       displayDetails: [settings.displayDetails, []],
       allowAcknowledgment: [settings.allowAcknowledgment, []],
       allowClear: [settings.allowClear, []],
+      allowAssign: [settings.allowAssign, []],
+      displayComments: [settings.displayComments, []],
       displayPagination: [settings.displayPagination, []],
       defaultPageSize: [settings.defaultPageSize, [Validators.min(1)]],
       defaultSortOrder: [settings.defaultSortOrder, []],
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/markdown-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/markdown-widget-settings.component.html
index 97dcf167f2..cf5415afe0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/markdown-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/markdown-widget-settings.component.html
@@ -31,6 +31,9 @@
                       label="{{ 'widgets.markdown.markdown-text-pattern' | translate }}"
                       helpId="widget/editor/widget_js_markdown_pattern">
   </tb-markdown-editor>
+  <mat-slide-toggle class="mat-slide" formControlName="applyDefaultMarkdownStyle">
+    {{ 'widgets.markdown.apply-default-markdown-style' | translate }}
+  </mat-slide-toggle>
   <tb-css formControlName="markdownCss"
           label="{{ 'widgets.markdown.markdown-css' | translate }}">
   </tb-css>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/markdown-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/markdown-widget-settings.component.ts
index 0c24a38361..9aac7efb20 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/markdown-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/markdown-widget-settings.component.ts
@@ -43,6 +43,7 @@ export class MarkdownWidgetSettingsComponent extends WidgetSettingsComponent {
       useMarkdownTextFunction: false,
       markdownTextPattern: '# Markdown/HTML card \\n - **Current entity**: **${entityName}**. \\n - **Current value**: **${Random}**.',
       markdownTextFunction: 'return \'# Some title\\\\n - Entity name: \' + data[0][\'entityName\'];',
+      applyDefaultMarkdownStyle: true,
       markdownCss: ''
     };
   }
@@ -52,6 +53,7 @@ export class MarkdownWidgetSettingsComponent extends WidgetSettingsComponent {
       useMarkdownTextFunction: [settings.useMarkdownTextFunction, []],
       markdownTextPattern: [settings.markdownTextPattern, []],
       markdownTextFunction: [settings.markdownTextFunction, []],
+      applyDefaultMarkdownStyle: [settings.applyDefaultMarkdownStyle, []],
       markdownCss: [settings.markdownCss, []]
     });
   }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts
index 3ef074c91a..68e89ef8d0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts
@@ -457,6 +457,7 @@ export function constructTableCssString(widgetConfig: WidgetConfig): string {
     '}\n' +
     '.mat-mdc-table .mat-mdc-cell {\n' +
     'color: ' + mdDark + ';\n' +
+    'background-color: rgba(0, 0, 0, 0);\n' +
     '}\n' +
     '.mat-mdc-table .mat-mdc-cell button.mat-mdc-icon-button mat-icon {\n' +
     'color: ' + mdDarkSecondary + ';\n' +
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-container.component.scss b/ui-ngx/src/app/modules/home/components/widget/widget-container.component.scss
index b2b14dcc3e..4c7264ce29 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-container.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-container.component.scss
@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-:host {
-
-}
 
 tb-widget.tb-widget {
   position: relative;
@@ -92,10 +89,20 @@ div.tb-widget {
         min-height: 20px;
         font-size: 20px;
         line-height: 20px;
+        svg {
+          width: 20px;
+          height: 20px;
+        }
       }
     }
   }
 
+  .tb-widget-title, .tb-widget-actions {
+    .mat-icon {
+      vertical-align: bottom;
+    }
+  }
+
   .tb-widget-content {
     &.tb-no-interaction {
       pointer-events: none;
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-container.component.ts b/ui-ngx/src/app/modules/home/components/widget/widget-container.component.ts
index dd558f2386..bf7042d233 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-container.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-container.component.ts
@@ -17,18 +17,25 @@
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
-  Component, ElementRef,
-  EventEmitter, HostBinding, Inject,
-  Input, OnDestroy,
+  Component,
+  ElementRef,
+  EventEmitter,
+  HostBinding,
+  Inject,
+  Input,
+  OnDestroy,
   OnInit,
-  Output, Renderer2, ViewChild
+  Output,
+  Renderer2,
+  ViewChild,
+  ViewEncapsulation
 } from '@angular/core';
 import { PageComponent } from '@shared/components/page.component';
 import { DashboardWidget, DashboardWidgets } from '@home/models/dashboard-component.models';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { SafeStyle } from '@angular/platform-browser';
-import { guid, hashCode, isNotEmptyStr } from '@core/utils';
+import { guid, isNotEmptyStr } from '@core/utils';
 import cssjs from '@core/css/css';
 import { DOCUMENT } from '@angular/common';
 import { GridsterItemComponent } from 'angular-gridster2';
@@ -52,6 +59,7 @@ export class WidgetComponentAction {
   selector: 'tb-widget-container',
   templateUrl: './widget-container.component.html',
   styleUrls: ['./widget-container.component.scss'],
+  encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class WidgetContainerComponent extends PageComponent implements OnInit, OnDestroy {
diff --git a/ui-ngx/src/app/modules/home/menu/menu-toggle.component.scss b/ui-ngx/src/app/modules/home/menu/menu-toggle.component.scss
index 1a19de8b06..85c5dfa42e 100644
--- a/ui-ngx/src/app/modules/home/menu/menu-toggle.component.scss
+++ b/ui-ngx/src/app/modules/home/menu/menu-toggle.component.scss
@@ -18,6 +18,7 @@
     .tb-toggle-icon {
       display: inline-block;
       width: 15px;
+      min-width: 15px;
       margin: auto 0 auto auto;
       background-size: 100% auto;
       transition: transform .3s ease-in-out;
diff --git a/ui-ngx/src/app/modules/home/menu/side-menu.component.scss b/ui-ngx/src/app/modules/home/menu/side-menu.component.scss
index e0b8b24110..54cbf11c53 100644
--- a/ui-ngx/src/app/modules/home/menu/side-menu.component.scss
+++ b/ui-ngx/src/app/modules/home/menu/side-menu.component.scss
@@ -53,12 +53,19 @@
     mat-icon {
       margin-right: 8px;
       margin-left: 0;
+      min-width: 1.125rem;
+      min-height: 1.125rem;
     }
     span.mdc-button__label {
       width: 100%;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
+      display: inline-flex;
+      & > span {
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
       .tb-toggle-icon {
         padding-top: 12px;
         padding-bottom: 12px;
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 6d8b710b85..09949a29b3 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
@@ -89,6 +89,7 @@ import { TbPopoverComponent } from '@shared/components/popover.component';
 import { EntityId } from '@shared/models/id/entity-id';
 import { AlarmQuery, AlarmSearchStatus, AlarmStatus} from '@app/shared/models/alarm.models';
 import { MillisecondsToTimeStringPipe, TelemetrySubscriber } from '@app/shared/public-api';
+import { UserId } from '@shared/models/id/user-id';
 
 export interface IWidgetAction {
   name: string;
@@ -415,8 +416,8 @@ export class WidgetContext {
     return new TimePageLink(pageSize, page, textSearch, sortOrder, startTime, endTime);
   }
 
-  alarmQuery(entityId: EntityId, pageLink: TimePageLink, searchStatus: AlarmSearchStatus, status: AlarmStatus, fetchOriginator: boolean) {
-    return new AlarmQuery(entityId, pageLink, searchStatus, status, fetchOriginator);
+  alarmQuery(entityId: EntityId, pageLink: TimePageLink, searchStatus: AlarmSearchStatus, status: AlarmStatus, fetchOriginator: boolean, assigneeId: UserId) {
+    return new AlarmQuery(entityId, pageLink, searchStatus, status, fetchOriginator, assigneeId);
   }
 }
 
diff --git a/ui-ngx/src/app/modules/login/pages/login/create-password.component.html b/ui-ngx/src/app/modules/login/pages/login/create-password.component.html
index 981d83d5be..813b63d3f0 100644
--- a/ui-ngx/src/app/modules/login/pages/login/create-password.component.html
+++ b/ui-ngx/src/app/modules/login/pages/login/create-password.component.html
@@ -16,7 +16,7 @@
 
 -->
 <div class="tb-create-password-content mat-app-background tb-dark" fxLayout="row" fxLayoutAlign="center center" style="width: 100%;">
-  <mat-card appearance="outlined" fxFlex="initial" class="tb-create-password-card">
+  <mat-card appearance="raised" fxFlex="initial" class="tb-create-password-card">
     <mat-card-header>
       <mat-card-title class="layout-padding">
         <span translate class="mat-headline-5">login.create-password</span>
@@ -47,7 +47,7 @@
               <button mat-raised-button color="accent" type="submit" [disabled]="(isLoading$ | async)">
                 {{ 'login.create-password' | translate }}
               </button>
-              <button mat-raised-button color="primary" type="button" [disabled]="(isLoading$ | async)"
+              <button mat-button type="button" [disabled]="(isLoading$ | async)"
                       routerLink="/login">
                 {{ 'action.cancel' | translate }}
               </button>
diff --git a/ui-ngx/src/app/modules/login/pages/login/login.component.html b/ui-ngx/src/app/modules/login/pages/login/login.component.html
index 3d04afffe9..f5797ae574 100644
--- a/ui-ngx/src/app/modules/login/pages/login/login.component.html
+++ b/ui-ngx/src/app/modules/login/pages/login/login.component.html
@@ -16,10 +16,10 @@
 
 -->
 <div class="tb-login-content mat-app-background tb-dark" fxFlex fxLayoutAlign="center center">
-  <mat-card appearance="outlined" style="max-height: 80vh; overflow-y: auto;">
+  <mat-card appearance="raised" style="max-height: 80vh; overflow-y: auto;">
     <mat-card-content>
       <form class="tb-login-form" [formGroup]="loginFormGroup" (ngSubmit)="login()">
-        <fieldset [disabled]="isLoading$ | async" fxLayout="column">
+        <fieldset fxLayout="column">
           <div fxLayout="column" fxLayoutAlign="start center" style="padding: 15px 0;">
             <tb-logo class="login-logo"></tb-logo>
           </div>
diff --git a/ui-ngx/src/app/modules/login/pages/login/reset-password-request.component.html b/ui-ngx/src/app/modules/login/pages/login/reset-password-request.component.html
index 59841908ed..53357903c8 100644
--- a/ui-ngx/src/app/modules/login/pages/login/reset-password-request.component.html
+++ b/ui-ngx/src/app/modules/login/pages/login/reset-password-request.component.html
@@ -17,7 +17,7 @@
 -->
 <div class="tb-request-password-reset-content mat-app-background tb-dark" fxLayout="row" fxLayoutAlign="center center"
      style="width: 100%;">
-  <mat-card appearance="outlined" fxFlex="initial" class="tb-request-password-reset-card">
+  <mat-card appearance="raised" fxFlex="initial" class="tb-request-password-reset-card">
     <mat-card-header>
       <mat-card-title class="layout-padding">
         <span translate class="mat-headline-5">login.request-password-reset</span>
@@ -44,7 +44,7 @@
               <button mat-raised-button color="accent" type="submit" [disabled]="(isLoading$ | async) || this.clicked">
                 {{ 'login.request-password-reset' | translate }}
               </button>
-              <button mat-raised-button color="primary" type="button" [disabled]="(isLoading$ | async)"
+              <button mat-button type="button" [disabled]="(isLoading$ | async)"
                       routerLink="/login">
                 {{ 'action.cancel' | translate }}
               </button>
diff --git a/ui-ngx/src/app/modules/login/pages/login/reset-password.component.html b/ui-ngx/src/app/modules/login/pages/login/reset-password.component.html
index 66f885af2d..bb45938716 100644
--- a/ui-ngx/src/app/modules/login/pages/login/reset-password.component.html
+++ b/ui-ngx/src/app/modules/login/pages/login/reset-password.component.html
@@ -16,7 +16,7 @@
 
 -->
 <div class="tb-reset-password-content mat-app-background tb-dark" fxLayout="row" fxLayoutAlign="center center" style="width: 100%;">
-  <mat-card appearance="outlined" fxFlex="initial" class="tb-reset-password-card">
+  <mat-card appearance="raised" fxFlex="initial" class="tb-reset-password-card">
     <mat-card-header>
       <mat-card-title class="layout-padding tb-card-title">
         <span translate class="mat-headline-5 tb-card-title">login.password-reset</span>
@@ -50,7 +50,7 @@
               <button mat-raised-button color="accent" type="submit" [disabled]="(isLoading$ | async)">
                 {{ 'login.reset-password' | translate }}
               </button>
-              <button mat-raised-button color="primary" type="button" [disabled]="(isLoading$ | async)"
+              <button mat-button type="button" [disabled]="(isLoading$ | async)"
                       routerLink="/login">
                 {{ 'action.cancel' | translate }}
               </button>
diff --git a/ui-ngx/src/app/modules/login/pages/login/two-factor-auth-login.component.html b/ui-ngx/src/app/modules/login/pages/login/two-factor-auth-login.component.html
index c49ab90ec9..56565588cd 100644
--- a/ui-ngx/src/app/modules/login/pages/login/two-factor-auth-login.component.html
+++ b/ui-ngx/src/app/modules/login/pages/login/two-factor-auth-login.component.html
@@ -17,7 +17,7 @@
 -->
 <div class="tb-two-factor-auth-login-content mat-app-background tb-dark" fxLayout="row" fxLayoutAlign="center center"
      style="width: 100%;">
-  <mat-card appearance="outlined" fxFlex="initial" class="tb-two-factor-auth-login-card" >
+  <mat-card appearance="raised" fxFlex="initial" class="tb-two-factor-auth-login-card" >
     <mat-card-header>
       <mat-card-title class="mat-headline-5" fxLayout="row" fxLayoutAlign="start center">
         <button mat-icon-button type="button" (click)="cancelLogin()">
diff --git a/ui-ngx/src/app/shared/components/entity/entity-type-list.component.html b/ui-ngx/src/app/shared/components/entity/entity-type-list.component.html
index 9590bf19ec..7a20291a0a 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-type-list.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-type-list.component.html
@@ -15,7 +15,7 @@
     limitations under the License.
 
 -->
-<mat-form-field [formGroup]="entityTypeListFormGroup" class="mat-block" subscriptSizing="{{ subscriptSizing }}">
+<mat-form-field [formGroup]="entityTypeListFormGroup" class="mat-block tb-chip-list" subscriptSizing="{{ subscriptSizing }}">
   <mat-chip-grid #chipList formControlName="entityTypeList">
     <mat-chip-row
       *ngFor="let entityType of entityTypeList"
diff --git a/ui-ngx/src/app/shared/components/help-popup.component.html b/ui-ngx/src/app/shared/components/help-popup.component.html
index a2ca50d564..1a9fe5541a 100644
--- a/ui-ngx/src/app/shared/components/help-popup.component.html
+++ b/ui-ngx/src/app/shared/components/help-popup.component.html
@@ -36,7 +36,7 @@
     <button mat-button
             color="primary"
             class="tb-help-popup-text-button"
-            [ngClass]="{'mat-stroked-button': popoverVisible && popoverReady}">
+            [ngClass]="{'mat-mdc-outlined-button mdc-button--outlined': popoverVisible && popoverReady}">
       <span>
         <ng-container *ngIf="triggerSafeHtml">
           <span [style]="triggerStyle" [innerHTML]="triggerSafeHtml"></span>
diff --git a/ui-ngx/src/app/shared/components/help-popup.component.scss b/ui-ngx/src/app/shared/components/help-popup.component.scss
index e8bdb8e0b2..2ec26a3c0f 100644
--- a/ui-ngx/src/app/shared/components/help-popup.component.scss
+++ b/ui-ngx/src/app/shared/components/help-popup.component.scss
@@ -47,6 +47,7 @@
   padding: 0 2px 0 8px;
   line-height: 28px;
   height: auto;
+  transition: border 0s;
   &.mat-mdc-outlined-button {
     padding: 0 1px 0 7px;
     line-height: 26px;
diff --git a/ui-ngx/src/app/shared/components/markdown.component.scss b/ui-ngx/src/app/shared/components/markdown.component.scss
new file mode 100644
index 0000000000..757a26c587
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/markdown.component.scss
@@ -0,0 +1,406 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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-markdown-view {
+    display: block;
+
+    $headings: h1, h2, h3, h4, h5, h6;
+
+    h1 {
+      font-size: 32px;
+      padding-right: 60px;
+    }
+
+    @each $heading in $headings {
+      #{$heading} {
+        color: #0F161D;
+        line-height: normal;
+        font-weight: 500;
+        border-bottom: none;
+        margin: 0;
+      }
+      & > #{$heading} {
+        padding: 30px 32px 10px;
+      }
+    }
+
+    p {
+      font-size: 16px;
+      font-weight: 400;
+      line-height: 1.25em;
+      margin: 0;
+    }
+
+    p + p {
+      margin-top: 10px;
+    }
+
+    p, div {
+      color: rgba(15, 22, 29, 0.8);
+      line-height: 1.5em;
+    }
+
+    & > p, & > div {
+      padding-right: 32px;
+      padding-left: 32px;
+    }
+
+    ul {
+      padding-left: 62px;
+      padding-right: 32px;
+      color: rgba(15, 22, 29, 0.8);
+      margin-top: 16px;
+      margin-bottom: 16px;
+    }
+
+    ul {
+      @each $heading in $headings {
+        & + #{$heading} {
+          padding-top: 14px;
+        }
+      }
+    }
+
+    li {
+      padding-bottom: .75em;
+      line-height: 1.5em;
+
+      ul {
+        margin-bottom: 0;
+      }
+
+      p {
+        padding-left: 0;
+      }
+    }
+
+    a {
+      font-weight: 500;
+      color: #2a7dec;
+      text-decoration: none;
+      border: none;
+
+      &:hover {
+        color: #2a7dec;
+        text-decoration: underline;
+        border: none;
+      }
+    }
+
+    & > table {
+      margin-left: 32px;
+      width: calc(100% - 64px);
+      border: 1px solid rgba(42, 125, 236, .2);
+      border-radius: 4px;
+      border-collapse: unset;
+      border-spacing: 0;
+      margin-top: 30px;
+      margin-bottom: 30px;
+      overflow: hidden;
+      table-layout: fixed;
+
+      &.auto {
+        table-layout: auto;
+      }
+
+      & > thead {
+        background-color: #f9fbff;
+        color: rgba(33, 37, 41, .6);
+
+        & > tr {
+          & > th {
+            border-bottom: 1px solid rgba(42, 125, 236, .2);
+            font-size: 16px;
+            padding: 12px 16px;
+            text-align: left;
+            margin: 0;
+            @media screen and (max-width: 400px) {
+              font-size: 12px;
+              padding: 12px 4px;
+              code:not([class*=language-]) {
+                font-size: 12px;
+              }
+            }
+          }
+        }
+      }
+
+      & > tbody {
+        & > tr:not(:last-child) {
+          & > td {
+            border-bottom: 1px solid rgba(42, 125, 236, .2);
+          }
+        }
+
+        & > tr {
+          & > td {
+            font-size: 16px;
+            padding: 12px 16px;
+            text-align: left;
+            margin: 0;
+            color: rgba(15, 22, 29, 0.8);
+            @media screen and (max-width: 400px) {
+              font-size: 12px;
+              padding: 12px 4px;
+              code:not([class*=language-]) {
+                font-size: 12px;
+              }
+            }
+          }
+        }
+      }
+
+      th, td {
+        font-size: .85em;
+        padding: 8px;
+        margin: 0;
+        text-align: left;
+      }
+
+      td[align=center], th[align=center] {
+        text-align: center;
+      }
+
+      td[align=right], th[align=right] {
+        text-align: right;
+      }
+
+      tr td div {
+        padding-left: 0;
+        padding-right: 0;
+      }
+    }
+
+
+    div.divider {
+      padding-top: 32px;
+      border-bottom: 1px solid rgba(15, 22, 29, 0.1);
+    }
+
+    ul + div.divider {
+      padding-top: 16px;
+    }
+
+    img {
+      max-width: 100%;
+    }
+
+    button.tb-button {
+      cursor: pointer;
+      display: inline-block;
+      border-radius: 4px;
+      border: none;
+      padding: 10px 20px;
+      line-height: 24px;
+      color: #fff;
+      background-color: #305680;
+      box-shadow: 0 1px 5px rgba(0, 0, 0, 0.12), 0 2px 2px rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
+      text-decoration: none;
+      font-size: 16px;
+      font-weight: 500;
+      transition: background-color .4s cubic-bezier(.25, .8, .25, 1);
+
+      &:hover {
+        background-color: #264363;
+        color: #fff;
+        text-decoration: none;
+      }
+    }
+
+    #video {
+      width: 100%;
+      margin: 0;
+      position: relative;
+
+      #video_wrapper {
+        position: relative;
+        width: 100%;
+        padding-bottom: 56.25%;
+        padding-left: 0;
+        padding-right: 0;
+
+        iframe {
+          position: absolute;
+          top: 0;
+          left: 0;
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+
+    @media screen and (min-width: 750px) {
+      #video {
+        width: 100%;
+        display: block;
+      }
+    }
+
+    @media screen and (min-width: 1025px) {
+      #video {
+        width: 50%;
+        position: relative;
+      }
+    }
+
+    code:not([class*=language-]) {
+      color: #eb5757;
+      font-family: monospace;
+      font-size: 16px;
+    }
+
+    div.code-wrapper {
+      position: relative;
+
+      button.clipboard-btn {
+        pointer-events: none;
+        outline: none;
+        position: absolute;
+        width: 206px;
+        height: 42px;
+        top: 0;
+        right: 32px;
+        background: 0 0;
+        border: none;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+
+        &.multiline {
+          right: 44px;
+        }
+
+        p {
+          padding: 8px;
+          top: 1px;
+          transition: .2s;
+          color: #2a7dec;
+          background: rgba(255, 255, 255, .85);
+          backdrop-filter: blur(4px);
+          opacity: 0;
+          font-weight: 500;
+          right: 32px;
+          position: absolute;
+        }
+
+        div {
+          background-color: #fff;
+          position: absolute;
+          width: 38px;
+          height: 38px;
+          top: 3px;
+          right: 3px;
+          padding: 10px;
+
+          img {
+            position: initial;
+            width: 18px;
+            height: 18px;
+            filter: invert(51%) sepia(6%) saturate(172%) hue-rotate(177deg) brightness(94%) contrast(92%);
+          }
+        }
+      }
+
+      &:hover {
+        cursor: pointer;
+
+        pre[class*="language-"] {
+          border: solid 1px #2a7dec;
+        }
+
+        button.clipboard-btn {
+          p {
+            opacity: 1;
+          }
+
+          div {
+            img {
+              filter: invert(49%) sepia(97%) saturate(3730%) hue-rotate(200deg) brightness(95%) contrast(95%);
+            }
+          }
+        }
+      }
+    }
+
+    th, td {
+      div.code-wrapper {
+        display: inline-block;
+        width: 100%;
+
+        button.clipboard-btn {
+          top: -10px;
+          right: 0;
+          padding: 0 3px;
+        }
+      }
+    }
+
+    pre[class*="language-"] {
+      font-size: 16px;
+      border: 1px solid rgba(42, 125, 236, .2);
+      border-radius: 4px;
+      background: 0 0;
+      padding: 8px 16px;
+      color: #212529;
+
+      .token.atrule, .token.attr-value, .token.keyword {
+        color: #2a7dec;
+      }
+
+      .token.selector, .token.attr-name, .token.string, .token.char, .token.builtin, .token.inserted {
+        color: #eb5757;
+      }
+
+      .token.punctuation {
+        color: #212529;
+      }
+
+      &.line-numbers {
+        padding-left: 66px;
+
+        & > code {
+          span.line-numbers-rows {
+            top: -12px;
+            bottom: -12px;
+            left: -66px;
+            width: 50px;
+            border: none;
+            padding: 8px 12px 8px 18px;
+            text-align: right;
+            background: #f9fbff;
+
+            & > span:before {
+              color: rgba(33, 37, 41, .6);
+              padding-right: 0;
+            }
+          }
+        }
+
+        &.no-line-numbers {
+          padding-left: 16px;
+
+          & > code {
+            span.line-numbers-rows {
+              display: none;
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/ui-ngx/src/app/shared/components/markdown.component.ts b/ui-ngx/src/app/shared/components/markdown.component.ts
index 95c0ccd23b..4ed77b66d2 100644
--- a/ui-ngx/src/app/shared/components/markdown.component.ts
+++ b/ui-ngx/src/app/shared/components/markdown.component.ts
@@ -18,14 +18,18 @@ import {
   ChangeDetectorRef,
   Component,
   ComponentFactory,
-  ComponentRef, ElementRef,
+  ComponentRef,
+  ElementRef,
   EventEmitter,
   Inject,
   Injector,
-  Input, OnChanges,
+  Input,
+  OnChanges,
   Output,
+  Renderer2,
   SimpleChanges,
-  Type, ViewChild,
+  Type,
+  ViewChild,
   ViewContainerRef
 } from '@angular/core';
 import { HelpService } from '@core/services/help.service';
@@ -33,12 +37,15 @@ import { MarkdownService, PrismPlugin } from 'ngx-markdown';
 import { DynamicComponentFactoryService } from '@core/services/dynamic-component-factory.service';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { SHARED_MODULE_TOKEN } from '@shared/components/tokens';
-import { isDefinedAndNotNull } from '@core/utils';
+import { deepClone, guid, isDefinedAndNotNull } from '@core/utils';
 import { Observable, of, ReplaySubject } from 'rxjs';
 
+let defaultMarkdownStyle;
+
 @Component({
   selector: 'tb-markdown',
-  templateUrl: './markdown.component.html'
+  templateUrl: './markdown.component.html',
+  styleUrls: ['./markdown.component.scss']
 })
 export class TbMarkdownComponent implements OnChanges {
 
@@ -53,8 +60,14 @@ export class TbMarkdownComponent implements OnChanges {
 
   @Input() markdownClass: string | undefined;
 
+  @Input() containerClass: string | undefined;
+
   @Input() style: { [klass: string]: any } = {};
 
+  @Input() applyDefaultMarkdownStyle = true;
+
+  @Input() additionalStyles: string[];
+
   @Input()
   get lineNumbers(): boolean { return this.lineNumbersValue; }
   set lineNumbers(value: boolean) { this.lineNumbersValue = coerceBooleanProperty(value); }
@@ -79,7 +92,8 @@ export class TbMarkdownComponent implements OnChanges {
               private cd: ChangeDetectorRef,
               public markdownService: MarkdownService,
               @Inject(SHARED_MODULE_TOKEN) private sharedModule: Type<any>,
-              private dynamicComponentFactoryService: DynamicComponentFactoryService) {}
+              private dynamicComponentFactoryService: DynamicComponentFactoryService,
+              private renderer: Renderer2) {}
 
   ngOnChanges(changes: SimpleChanges): void {
     if (isDefinedAndNotNull(this.data)) {
@@ -89,12 +103,25 @@ export class TbMarkdownComponent implements OnChanges {
 
   private render(markdown: string) {
     const compiled = this.markdownService.parse(markdown, { decodeHtml: false });
-    let template = this.sanitizeCurlyBraces(compiled);
     let markdownClass = 'tb-markdown-view';
     if (this.markdownClass) {
       markdownClass += ` ${this.markdownClass}`;
     }
-    template = `<div [ngStyle]="style" class="${markdownClass}">${template}</div>`;
+    let template = `<div [ngStyle]="style" class="${markdownClass}">${compiled}</div>`;
+    if (this.containerClass) {
+      template = `<div class="${this.containerClass}" style="width: 100%; height: 100%;">${template}</div>`;
+    }
+    const element: HTMLDivElement = this.renderer.createElement('div');
+    element.innerHTML = template;
+    this.handlePlugins(element);
+    this.markdownService.highlight(element);
+    const preElements = element.querySelectorAll('pre');
+    const matches = Array.from(template.matchAll(/<pre[\S\s]+?(?=<\/pre>)<\/pre>/g));
+    for (let i = 0; i < preElements.length; i++) {
+      const preHtml = preElements.item(i).outerHTML.replace('ngnonbindable=""', 'ngNonBindable');
+      template = template.replace(matches[i][0], preHtml);
+    }
+    template = this.sanitizeCurlyBraces(template);
     this.markdownContainer.clear();
     const parent = this;
     let readyObservable: Observable<void>;
@@ -102,6 +129,17 @@ export class TbMarkdownComponent implements OnChanges {
     if (this.additionalCompileModules) {
       compileModules = compileModules.concat(this.additionalCompileModules);
     }
+    let styles: string[] = [];
+    if (this.applyDefaultMarkdownStyle) {
+      if (!defaultMarkdownStyle) {
+        defaultMarkdownStyle = deepClone(TbMarkdownComponent['ɵcmp'].styles)[0].replace(/\[_nghost\-%COMP%\]/g, '')
+          .replace(/\[_ngcontent\-%COMP%\]/g, '');
+      }
+      styles.push(defaultMarkdownStyle);
+    }
+    if (this.additionalStyles) {
+      styles = styles.concat(this.additionalStyles);
+    }
     this.dynamicComponentFactoryService.createDynamicComponentFactory(
       class TbMarkdownInstance {
         ngOnDestroy(): void {
@@ -110,7 +148,7 @@ export class TbMarkdownComponent implements OnChanges {
       },
       template,
       compileModules,
-      true
+      true, 1, styles
     ).subscribe((factory) => {
       this.tbMarkdownInstanceComponentFactory = factory;
       const injector: Injector = Injector.create({providers: [], parent: this.markdownContainer.injector});
@@ -123,20 +161,18 @@ export class TbMarkdownComponent implements OnChanges {
           }
         }
         this.tbMarkdownInstanceComponentRef.instance.style = this.style;
-        this.handlePlugins(this.tbMarkdownInstanceComponentRef.location.nativeElement);
-        this.markdownService.highlight(this.tbMarkdownInstanceComponentRef.location.nativeElement);
         readyObservable = this.handleImages(this.tbMarkdownInstanceComponentRef.location.nativeElement);
         this.cd.detectChanges();
         this.error = null;
       } catch (error) {
-        readyObservable = this.handleError(compiled, error);
+        readyObservable = this.handleError(template, error, styles);
       }
       readyObservable.subscribe(() => {
         this.ready.emit();
       });
     },
     (error) => {
-      readyObservable = this.handleError(compiled, error);
+      readyObservable = this.handleError(template, error, styles);
       this.cd.detectChanges();
       readyObservable.subscribe(() => {
         this.ready.emit();
@@ -144,14 +180,24 @@ export class TbMarkdownComponent implements OnChanges {
     });
   }
 
-  private handleError(template: string, error): Observable<void> {
+  private handleError(template: string, error, styles?: string[]): Observable<void> {
     this.error = (error ? error + '' : 'Failed to render markdown!').replace(/\n/g, '<br>');
     this.markdownContainer.clear();
     if (this.fallbackToPlainMarkdownValue) {
       const element = this.fallbackElement.nativeElement;
+      let styleElement;
+      if (styles?.length) {
+        const markdownClass = 'tb-markdown-view-' + guid();
+        let innerStyle = styles.join('\n');
+        innerStyle = innerStyle.replace(/\.tb-markdown-view/g, '.' + markdownClass);
+        template = template.replace(/tb-markdown-view/g, markdownClass);
+        styleElement = this.renderer.createElement('style');
+        styleElement.innerHTML = innerStyle;
+      }
       element.innerHTML = template;
-      this.handlePlugins(element);
-      this.markdownService.highlight(element);
+      if (styleElement) {
+        this.renderer.appendChild(element, styleElement);
+      }
       return this.handleImages(element);
     } else {
       return of(null);
diff --git a/ui-ngx/src/app/shared/models/alarm.models.ts b/ui-ngx/src/app/shared/models/alarm.models.ts
index ed962b2fc1..5f0f7f37ef 100644
--- a/ui-ngx/src/app/shared/models/alarm.models.ts
+++ b/ui-ngx/src/app/shared/models/alarm.models.ts
@@ -23,6 +23,8 @@ import { NULL_UUID } from '@shared/models/id/has-uuid';
 import { EntityType } from '@shared/models/entity-type.models';
 import { CustomerId } from '@shared/models/id/customer-id';
 import { TableCellButtonActionDescriptor } from '@home/components/widget/lib/table-widget.models';
+import { AlarmCommentId } from '@shared/models/id/alarm-comment-id';
+import { UserId } from '@shared/models/id/user-id';
 
 export enum AlarmSeverity {
   CRITICAL = 'CRITICAL',
@@ -89,6 +91,7 @@ export const alarmSeverityColors = new Map<AlarmSeverity, string>(
 export interface Alarm extends BaseData<AlarmId> {
   tenantId: TenantId;
   customerId: CustomerId;
+  assigneeId: UserId;
   type: string;
   originator: EntityId;
   severity: AlarmSeverity;
@@ -97,12 +100,43 @@ export interface Alarm extends BaseData<AlarmId> {
   endTs: number;
   ackTs: number;
   clearTs: number;
+  assignTs: number;
   propagate: boolean;
   details?: any;
 }
 
+export enum AlarmCommentType {
+  SYSTEM = 'SYSTEM',
+  OTHER = 'OTHER'
+}
+
+export interface AlarmComment extends BaseData<AlarmCommentId> {
+  alarmId: AlarmId;
+  userId?: UserId;
+  type: AlarmCommentType;
+  comment: {
+    text: string;
+    edited?: boolean;
+    editedOn?: number;
+  }
+}
+
+export interface AlarmCommentInfo extends AlarmComment {
+  firstName?: string;
+  lastName?: string;
+  email?: string;
+}
+
 export interface AlarmInfo extends Alarm {
   originatorName: string;
+  originatorLabel: string;
+  assignee: AlarmAssignee;
+}
+
+export interface AlarmAssignee {
+  firstName: string;
+  lastName: string;
+  email: string;
 }
 
 export interface AlarmDataInfo extends AlarmInfo {
@@ -115,12 +149,20 @@ export const simulatedAlarm: AlarmInfo = {
   id: new AlarmId(NULL_UUID),
   tenantId: new TenantId(NULL_UUID),
   customerId: new CustomerId(NULL_UUID),
+  assigneeId: new UserId(NULL_UUID),
   createdTime: new Date().getTime(),
   startTs: new Date().getTime(),
   endTs: 0,
   ackTs: 0,
   clearTs: 0,
+  assignTs: 0,
   originatorName: 'Simulated',
+  originatorLabel: 'Simulated',
+  assignee: {
+    firstName: "",
+    lastName: "",
+    email: "test@example.com",
+  },
   originator: {
     entityType: EntityType.DEVICE,
     id: '1'
@@ -172,11 +214,22 @@ export const alarmFields: {[fieldName: string]: AlarmField} = {
     name: 'alarm.clear-time',
     time: true
   },
+  assignTime: {
+    keyName: 'assignTime',
+    value: 'assignTs',
+    name: 'alarm.assign-time',
+    time: true
+  },
   originator: {
     keyName: 'originator',
     value: 'originatorName',
     name: 'alarm.originator'
   },
+  originatorLabel: {
+    keyName: 'originatorLabel',
+    value: 'originatorLabel',
+    name: 'alarm.originator-label'
+  },
   originatorType: {
     keyName: 'originatorType',
     value: 'originator.entityType',
@@ -196,6 +249,11 @@ export const alarmFields: {[fieldName: string]: AlarmField} = {
     keyName: 'status',
     value: 'status',
     name: 'alarm.status'
+  },
+  assignee: {
+    keyName: 'assignee',
+    value: 'assignee',
+    name: 'alarm.assignee'
   }
 };
 
@@ -206,15 +264,17 @@ export class AlarmQuery {
   searchStatus: AlarmSearchStatus;
   status: AlarmStatus;
   fetchOriginator: boolean;
+  assigneeId?: UserId;
 
   constructor(entityId: EntityId, pageLink: TimePageLink,
               searchStatus: AlarmSearchStatus, status: AlarmStatus,
-              fetchOriginator: boolean) {
+              fetchOriginator: boolean, assigneeId?: UserId) {
     this.affectedEntityId = entityId;
     this.pageLink = pageLink;
     this.searchStatus = searchStatus;
     this.status = status;
     this.fetchOriginator = fetchOriginator;
+    this.assigneeId = assigneeId;
   }
 
   public toQuery(): string {
@@ -228,6 +288,9 @@ export class AlarmQuery {
     if (typeof this.fetchOriginator !== 'undefined' && this.fetchOriginator !== null) {
       query += `&fetchOriginator=${this.fetchOriginator}`;
     }
+    if (typeof this.assigneeId !== 'undefined' && this.assigneeId !== null) {
+      query += `&assigneeId=${this.assigneeId.id}`;
+    }
     return query;
   }
 
diff --git a/ui-ngx/src/app/shared/models/audit-log.models.ts b/ui-ngx/src/app/shared/models/audit-log.models.ts
index 096e13a47c..8f4e26171e 100644
--- a/ui-ngx/src/app/shared/models/audit-log.models.ts
+++ b/ui-ngx/src/app/shared/models/audit-log.models.ts
@@ -47,6 +47,8 @@ export enum ActionType {
   RELATIONS_DELETED = 'RELATIONS_DELETED',
   ALARM_ACK = 'ALARM_ACK',
   ALARM_CLEAR = 'ALARM_CLEAR',
+  ALARM_ASSIGN = 'ALARM_ASSIGN',
+  ALARM_UNASSIGN = 'ALARM_UNASSIGN',
   ADDED_COMMENT = 'ADDED_COMMENT',
   UPDATED_COMMENT = 'UPDATED_COMMENT',
   DELETED_COMMENT = 'DELETED_COMMENT',
@@ -88,6 +90,8 @@ export const actionTypeTranslations = new Map<ActionType, string>(
     [ActionType.RELATIONS_DELETED, 'audit-log.type-relations-delete'],
     [ActionType.ALARM_ACK, 'audit-log.type-alarm-ack'],
     [ActionType.ALARM_CLEAR, 'audit-log.type-alarm-clear'],
+    [ActionType.ALARM_ASSIGN, 'audit-log.type-alarm-assign'],
+    [ActionType.ALARM_UNASSIGN, 'audit-log.type-alarm-unassign'],
     [ActionType.ADDED_COMMENT, 'audit-log.type-added-comment'],
     [ActionType.UPDATED_COMMENT, 'audit-log.type-updated-comment'],
     [ActionType.DELETED_COMMENT, 'audit-log.type-deleted-comment'],
diff --git a/ui-ngx/src/app/shared/models/device.models.ts b/ui-ngx/src/app/shared/models/device.models.ts
index e36aa99117..df7ba701c7 100644
--- a/ui-ngx/src/app/shared/models/device.models.ts
+++ b/ui-ngx/src/app/shared/models/device.models.ts
@@ -242,6 +242,7 @@ export interface DefaultDeviceProfileTransportConfiguration {
 export interface MqttDeviceProfileTransportConfiguration {
   deviceTelemetryTopic?: string;
   deviceAttributesTopic?: string;
+  sparkplug?: boolean;
   sendAckOnValidationException?: boolean;
   transportPayloadTypeConfiguration?: {
     transportPayloadType?: TransportPayloadType;
@@ -359,6 +360,7 @@ export function createDeviceProfileTransportConfiguration(type: DeviceTransportT
         const mqttTransportConfiguration: MqttDeviceProfileTransportConfiguration = {
           deviceTelemetryTopic: 'v1/devices/me/telemetry',
           deviceAttributesTopic: 'v1/devices/me/attributes',
+          sparkplug: false,
           sendAckOnValidationException: false,
           transportPayloadTypeConfiguration: {
             transportPayloadType: TransportPayloadType.JSON,
diff --git a/ui-ngx/src/app/shared/models/id/alarm-comment-id.ts b/ui-ngx/src/app/shared/models/id/alarm-comment-id.ts
new file mode 100644
index 0000000000..c161e3095c
--- /dev/null
+++ b/ui-ngx/src/app/shared/models/id/alarm-comment-id.ts
@@ -0,0 +1,24 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { HasUUID } from '@shared/models/id/has-uuid';
+
+export class AlarmCommentId implements HasUUID {
+  id: string;
+  constructor(id: string) {
+    this.id = id;
+  }
+}
diff --git a/ui-ngx/src/app/shared/models/time/time.models.ts b/ui-ngx/src/app/shared/models/time/time.models.ts
index 6c04aef946..06cf0ffd5f 100644
--- a/ui-ngx/src/app/shared/models/time/time.models.ts
+++ b/ui-ngx/src/app/shared/models/time/time.models.ts
@@ -237,7 +237,7 @@ export function initModelFromDefaultTimewindow(value: Timewindow, quickIntervalO
     model.hideAggInterval = value.hideAggInterval;
     model.hideTimezone = value.hideTimezone;
     model.selectedTab = getTimewindowType(value);
-    if (model.selectedTab === TimewindowType.REALTIME) {
+    if (isDefined(value.realtime)) {
       if (isDefined(value.realtime.interval)) {
         model.realtime.interval = value.realtime.interval;
       }
@@ -250,12 +250,14 @@ export function initModelFromDefaultTimewindow(value: Timewindow, quickIntervalO
       } else {
         model.realtime.realtimeType = value.realtime.realtimeType;
       }
-      if (model.realtime.realtimeType === RealtimeWindowType.INTERVAL) {
+      if (isDefined(value.realtime.quickInterval)) {
         model.realtime.quickInterval = value.realtime.quickInterval;
-      } else {
+      }
+      if (isDefined(value.realtime.timewindowMs)) {
         model.realtime.timewindowMs = value.realtime.timewindowMs;
       }
-    } else {
+    }
+    if (isDefined(value.history)) {
       if (isDefined(value.history.interval)) {
         model.history.interval = value.history.interval;
       }
@@ -270,13 +272,19 @@ export function initModelFromDefaultTimewindow(value: Timewindow, quickIntervalO
       } else {
         model.history.historyType = value.history.historyType;
       }
-      if (model.history.historyType === HistoryWindowType.LAST_INTERVAL) {
+      if (isDefined(value.history.timewindowMs)) {
         model.history.timewindowMs = value.history.timewindowMs;
-      } else if (model.history.historyType === HistoryWindowType.INTERVAL) {
+      }
+      if (isDefined(value.history.quickInterval)) {
         model.history.quickInterval = value.history.quickInterval;
-      } else {
-        model.history.fixedTimewindow.startTimeMs = value.history.fixedTimewindow.startTimeMs;
-        model.history.fixedTimewindow.endTimeMs = value.history.fixedTimewindow.endTimeMs;
+      }
+      if (isDefined(value.history.fixedTimewindow)) {
+        if (isDefined(value.history.fixedTimewindow.startTimeMs)) {
+          model.history.fixedTimewindow.startTimeMs = value.history.fixedTimewindow.startTimeMs;
+        }
+        if (isDefined(value.history.fixedTimewindow.endTimeMs)) {
+          model.history.fixedTimewindow.endTimeMs = value.history.fixedTimewindow.endTimeMs;
+        }
       }
     }
     if (value.aggregation) {
diff --git a/ui-ngx/src/app/shared/models/user.model.ts b/ui-ngx/src/app/shared/models/user.model.ts
index 73fe32f1c9..2080a155c9 100644
--- a/ui-ngx/src/app/shared/models/user.model.ts
+++ b/ui-ngx/src/app/shared/models/user.model.ts
@@ -54,3 +54,10 @@ export interface AuthUser {
   isPublic: boolean;
   authority: Authority;
 }
+
+export interface UserEmailInfo {
+  id: UserId;
+  email: string;
+  firstName: string;
+  lastName: string;
+}
diff --git a/ui-ngx/src/app/shared/pipe/date-ago.pipe.ts b/ui-ngx/src/app/shared/pipe/date-ago.pipe.ts
new file mode 100644
index 0000000000..c0f4b5c026
--- /dev/null
+++ b/ui-ngx/src/app/shared/pipe/date-ago.pipe.ts
@@ -0,0 +1,58 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT 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 { Inject, Pipe, PipeTransform } from '@angular/core';
+import { DAY, HOUR, MINUTE, SECOND, WEEK, YEAR } from '@shared/models/time/time.models';
+import { TranslateService } from '@ngx-translate/core';
+
+const intervals = {
+  years: YEAR,
+  months: DAY * 30,
+  weeks: WEEK,
+  days: DAY,
+  hr: HOUR,
+  min: MINUTE,
+  sec: SECOND
+};
+
+@Pipe({
+  name: 'dateAgo'
+})
+export class DateAgoPipe implements PipeTransform {
+
+  constructor(@Inject(TranslateService) private translate: TranslateService) {
+
+  }
+
+  transform(value: number): string {
+    if (value) {
+      const ms = Math.floor((+new Date() - +new Date(value)));
+      if (ms < 29 * SECOND) { // less than 30 seconds ago will show as 'Just now'
+        return this.translate.instant('timewindow.just-now');
+      }
+      let counter;
+      // tslint:disable-next-line:forin
+      for (const i in intervals) {
+        counter = Math.floor(ms / intervals[i]);
+        if (counter > 0) {
+          return this.translate.instant(`timewindow.${i}`, {[i]: counter});
+        }
+      }
+    }
+    return '';
+  }
+
+}
diff --git a/ui-ngx/src/app/shared/shared.module.ts b/ui-ngx/src/app/shared/shared.module.ts
index ea30938e8e..950532adab 100644
--- a/ui-ngx/src/app/shared/shared.module.ts
+++ b/ui-ngx/src/app/shared/shared.module.ts
@@ -168,6 +168,7 @@ import { PhoneInputComponent } from '@shared/components/phone-input.component';
 import { CustomDateAdapter } from '@shared/adapter/custom-datatime-adapter';
 import { CustomPaginatorIntl } from '@shared/services/custom-paginator-intl';
 import { TbScriptLangComponent } from '@shared/components/script-lang.component';
+import { DateAgoPipe } from '@shared/pipe/date-ago.pipe';
 
 export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService) {
   return markedOptionsService;
@@ -183,6 +184,7 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
     TbJsonPipe,
     FileSizePipe,
     SafePipe,
+    DateAgoPipe,
     {
       provide: FlowInjectionToken,
       useValue: Flow
@@ -306,7 +308,8 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
     ProtobufContentComponent,
     BranchAutocompleteComponent,
     PhoneInputComponent,
-    TbScriptLangComponent
+    TbScriptLangComponent,
+    DateAgoPipe
   ],
   imports: [
     CommonModule,
@@ -510,7 +513,8 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
     ProtobufContentComponent,
     BranchAutocompleteComponent,
     PhoneInputComponent,
-    TbScriptLangComponent
+    TbScriptLangComponent,
+    DateAgoPipe
   ]
 })
 export class SharedModule { }
diff --git a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
index 3d6f2c163c..d8996c1316 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
@@ -453,17 +453,17 @@
         "acknowledge": "Reconèixer",
         "clear": "Normalitzar",
         "search": "Buscar alarmes",
-        "selected-alarms": "{ count, plural, 1 {1 alarma} other {# alarmas} } seleccionades",
+        "selected-alarms": "{ count, plural, =1 {1 alarma} other {# alarmas} } seleccionades",
         "no-data": "Sense dades que mostrar",
         "polling-interval": "Cicle de refresc d'alarmes (seg)",
         "polling-interval-required": "Es requereix un cicle de refresc vàlid.",
         "min-polling-interval-message": "El cicle ha de ser almenys d'1 segon.",
-        "aknowledge-alarms-title": "Reconèixer { count, plural, 1 {1 alarma} other {# alarmas} }",
-        "aknowledge-alarms-text": "Aquestes segur de reconèixer { count, plural, 1 {1 alarma} other {# alarmas} }?",
+        "aknowledge-alarms-title": "Reconèixer { count, plural, =1 {1 alarma} other {# alarmas} }",
+        "aknowledge-alarms-text": "Aquestes segur de reconèixer { count, plural, =1 {1 alarma} other {# alarmas} }?",
         "aknowledge-alarm-title": "Reconèixer Alarma",
         "aknowledge-alarm-text": "Estàs segur de reconèixer Alarma?",
-        "clear-alarms-title": "Normalitzar { count, plural, 1 {1 alarma} other {# alarmas} }",
-        "clear-alarms-text": "Netejar { count, plural, 1 {1 alarma} other {# alarmas} }?",
+        "clear-alarms-title": "Normalitzar { count, plural, =1 {1 alarma} other {# alarmas} }",
+        "clear-alarms-text": "Netejar { count, plural, =1 {1 alarma} other {# alarmas} }?",
         "clear-alarm-title": "Netejar Alarma",
         "clear-alarm-text": "Netejar Alarma?",
         "alarm-status-filter": "Filtre d'estats d'Alarmes",
@@ -582,15 +582,15 @@
         "add-asset-text": "Afegir nou actiu",
         "asset-details": "Detalls d'actiu",
         "assign-assets": "Assignar activus",
-        "assign-assets-text": "Assignar { count, plural, 1 {1 activo} other {# activos} } a client",
+        "assign-assets-text": "Assignar { count, plural, =1 {1 activo} other {# activos} } a client",
         "delete-assets": "Esborrar actius",
         "unassign-assets": "Cancel·lar assignació d'actiu",
-        "unassign-assets-action-title": "Cancel·lar assignació de { count, plural, 1 {1 activo} other {# activos} } del client",
+        "unassign-assets-action-title": "Cancel·lar assignació de { count, plural, =1 {1 activo} other {# activos} } del client",
         "assign-new-asset": "Assignar nou actiu",
         "delete-asset-title": "Eliminar l'actiu '{{assetName}}'?",
         "delete-asset-text": "Atenció, després de la confirmació l'actiu i les seves dades seran esborrades i irrecuperables.",
-        "delete-assets-title": "Eliminar els actius { count, plural, 1 {1 activo} other {# activos} }?",
-        "delete-assets-action-title": "Esborrar { count, plural, 1 {1 activo} other {# activos} }",
+        "delete-assets-title": "Eliminar els actius { count, plural, =1 {1 activo} other {# activos} }?",
+        "delete-assets-action-title": "Esborrar { count, plural, =1 {1 activo} other {# activos} }",
         "delete-assets-text": "Atenció, després de la confirmació tots els actius seleccionats i les seves dades seran esborrades i irrecuperables.",
         "make-public-asset-title": "Fer l'actiu '{{assetName}}' públic?",
         "make-public-asset-text": "Després de la confirmació, l'actiu i les seves dades és faran públics i accessibles per uns altres.",
@@ -599,7 +599,7 @@
         "unassign-asset-title": "Cancel·lar l'assignació de l'actiu '{{assetName}}'?",
         "unassign-asset-text": "Després de la confirmació, l'actiu serà desassignat i no serà accessible pel client.",
         "unassign-asset": "Cancel·lar assignació d'actiu",
-        "unassign-assets-title": "Cancel·lar les assignacions { count, plural, 1 {1 activo} other {# activos} }?",
+        "unassign-assets-title": "Cancel·lar les assignacions { count, plural, =1 {1 activo} other {# activos} }?",
         "unassign-assets-text": "Després de la confirmació tots els actius seleccionats seran desassignats i no seran accessibles pel client.",
         "copyId": "Copiar ID d'actiu",
         "idCopiedMessage": "L'ID ha estat copiat al porta-retalls",
@@ -608,13 +608,13 @@
         "asset-required": "Cal nom d'actiu",
         "name-starts-with": "El nom de l'actiu que comenci amb",
         "help-text": "Utilitzeu «%» segons la necessitat: «%asset.name.contains%», «%asset.name.ends», «asset.starts.with».",
-        "selected-assets": "{ count, plural, 1 {1 activo} other {# activos} } seleccionats",
+        "selected-assets": "{ count, plural, =1 {1 activo} other {# activos} } seleccionats",
         "search": "Buscar actius",
         "select-group-to-add": "Seleccionar grup objectiu per a afegir actius seleccionats",
         "select-group-to-move": "Seleccionar grup objectiu per a moure actius seleccionats",
-        "remove-assets-from-group": "Està segur que desitja eliminar { count, plural, 1 {1 asset} other {# assets} } del grup '{{entityGroup}}'?",
+        "remove-assets-from-group": "Està segur que desitja eliminar { count, plural, =1 {1 asset} other {# assets} } del grup '{{entityGroup}}'?",
         "group": "Grup d'actius",
-        "list-of-groups": "{ count, plural, 1 {One asset group} other {List of # asset groups} }",
+        "list-of-groups": "{ count, plural, =1 {One asset group} other {List of # asset groups} }",
         "group-name-starts-with": "Grups d'actius els noms dels quals comencen amb '{{prefix}}'",
         "import": "Importar actius",
         "asset-file": "Arxiu de l'actiu",
@@ -623,10 +623,10 @@
         "unassign-asset-from-edge": "Anul·lar actiu de vora",
         "unassign-asset-from-edge-title": "Està segur que desitja desassignar l'actiu '{{assetName}}'?",
         "unassign-asset-from-edge-text": "Després de la confirmació, l'actiu no serà assignat i la vora no podrà accedir a ell",
-        "unassign-assets-from-edge-title": "Està segur que desitja desassignar {count, plural, 1 {1 activo} other {# activos} }?",
+        "unassign-assets-from-edge-title": "Està segur que desitja desassignar {count, plural, =1 {1 activo} other {# activos} }?",
         "unassign-assets-from-edge-text": "Després de la confirmació, tots els actius seleccionats quedaran sense assignar i la vora no podrà accedir a ells.",
         "assign-asset-to-edge-text": "Si us plau, seleccioni els actius per a assignar a la vora",
-        "unassign-assets-from-edge-action-title": "Anul·lar assignació {count, plural, 1 {1 activo} other {# activos} } des de la vora"
+        "unassign-assets-from-edge-action-title": "Anul·lar assignació {count, plural, =1 {1 activo} other {# activos} } des de la vora"
     },
     "attribute": {
         "attributes": "Atributs",
@@ -644,7 +644,7 @@
         "key-required": "Clau de l'atribut requerida.",
         "value": "Valor",
         "value-required": "Cal valor de l'atribut.",
-        "delete-attributes-title": "Eliminar { count, plural, 1 {1 atributo} other {# atributos} }?",
+        "delete-attributes-title": "Eliminar { count, plural, =1 {1 atributo} other {# atributos} }?",
         "delete-attributes-text": "Atenció, després de la confirmació l'atribut serà eliminat, i la informació relacionada serà irrecuperable.",
         "delete-attributes": "Esborrar atribut",
         "enter-attribute-value": "Ingressar valor de l'atribut",
@@ -654,8 +654,8 @@
         "prev-widget": "Widget anterior",
         "add-to-dashboard": "Afegir al Panell",
         "add-widget-to-dashboard": "Afegir widget al Panell",
-        "selected-attributes": "{ count, plural, 1 {1 atributo} other {# atributos} } seleccionats",
-        "selected-telemetry": "{ count, plural, 1 {1 telemetría} other {# telemetrías} } seleccionades",
+        "selected-attributes": "{ count, plural, =1 {1 atributo} other {# atributos} } seleccionats",
+        "selected-telemetry": "{ count, plural, =1 {1 telemetría} other {# telemetrías} } seleccionades",
         "no-attributes-text": "No és va trobar cap atribut",
         "no-telemetry-text": "No és va trobar cap telemetria"
     },
@@ -815,11 +815,11 @@
         "management": "Gestió de convertidors de dades",
         "add-converter-text": "Afegir nou convertidor de dades",
         "no-converters-text": "Convertidors de dades no trobats",
-        "selected-converters": "{ count, plural, 1 {1 data converter} other {# data converters} } seleccionats",
+        "selected-converters": "{ count, plural, =1 {1 data converter} other {# data converters} } seleccionats",
         "delete-converter-title": "Està segur que desitja eliminar el convertidor de dades '{{converterName}}'?",
         "delete-converter-text": "Anar amb compte, després de la confirmació, el convertidor de dades i totes les dades relacionades és tornaran irrecuperables.",
-        "delete-converters-title": "Està segur que desitja eliminar { count, plural, 1 {1 data converter} other {# data converters} }?",
-        "delete-converters-action-title": "Eliminar { count, plural, 1 {1 data converter} other {# data converters} }",
+        "delete-converters-title": "Està segur que desitja eliminar { count, plural, =1 {1 data converter} other {# data converters} }?",
+        "delete-converters-action-title": "Eliminar { count, plural, =1 {1 data converter} other {# data converters} }",
         "delete-converters-text": "Anar amb compte, després de la confirmació s'eliminaran tots els convertidors de dades seleccionades i totes les dades relacionades és tornaran irrecuperables.",
         "events": "Esdeveniments",
         "add": "Afegeix convertidor de dades",
@@ -904,8 +904,8 @@
         "customer-details": "Detalls del client",
         "delete-customer-title": "Eliminar el client '{{customerTitle}}'?",
         "delete-customer-text": "Atenció, després de la confirmació el client serà eliminat i tota la informació relacionada serà irrecuperable.",
-        "delete-customers-title": "Eliminar { count, plural, 1 {1 cliente} other {# clientes} }?",
-        "delete-customers-action-title": "Esborrar { count, plural, 1 {1 cliente} other {# clientes} }",
+        "delete-customers-title": "Eliminar { count, plural, =1 {1 cliente} other {# clientes} }?",
+        "delete-customers-action-title": "Esborrar { count, plural, =1 {1 cliente} other {# clientes} }",
         "delete-customers-text": "Atenció, després de la confirmació tots els clients seleccionats seran eliminats i la informació relacionada serà irrecuperable.",
         "manage-user-groups": "Gestionar grups d'usuaris",
         "manage-asset-groups": "Gestionar grups d'actius",
@@ -928,13 +928,13 @@
         "select-customer": "Seleccionar Client",
         "no-customers-matching": "No s'han trobat clients que coincideixin amb '{{entity}}' .",
         "customer-required": "Cal client",
-        "selected-customers": "{ count, plural, 1 {1 cliente} other {# clientes} } seleccionats",
+        "selected-customers": "{ count, plural, =1 {1 cliente} other {# clientes} } seleccionats",
         "search": "Buscar clients",
         "select-group-to-add": "Seleccionar el grup objectiu per afegir clients seleccionats",
         "select-group-to-move": "Seleccionar el grup abkectiu per moure clients seleccionats",
-        "remove-customers-from-group": "Esteu segur que voleu eliminar { count, plural, 1 {1 customer} other {# customers} } del grup '{{entityGroup}}'?",
+        "remove-customers-from-group": "Esteu segur que voleu eliminar { count, plural, =1 {1 customer} other {# customers} } del grup '{{entityGroup}}'?",
         "group": "Grup clients",
-        "list-of-groups": "{ count, plural, 1 {One customer group} other {List of # customer groups} }",
+        "list-of-groups": "{ count, plural, =1 {One customer group} other {List of # customer groups} }",
         "group-name-starts-with": "Grups de clients els quals començen amb '{{prefix}}'",
         "select-default-customer": "Seleccionar un client per defecte",
         "default-customer": "Client per defecte",
@@ -1016,20 +1016,20 @@
         "add-dashboard-text": "Afegir nou panell",
         "assign-dashboards": "Assignar panells",
         "assign-new-dashboard": "Assignar nou panell",
-        "assign-dashboards-text": "Assignar { count, plural, 1 {1 panel} other {# paneles} } al client",
-        "unassign-dashboards-action-text": "Desassignar { count, plural, 1 {1 panel} other {# paneles} } als clients",
+        "assign-dashboards-text": "Assignar { count, plural, =1 {1 panel} other {# paneles} } al client",
+        "unassign-dashboards-action-text": "Desassignar { count, plural, =1 {1 panel} other {# paneles} } als clients",
         "delete-dashboards": "Eliminar panells",
         "unassign-dashboards": "Desassignar panells",
-        "unassign-dashboards-action-title": "Desassignar { count, plural, 1 {1 paneles} other {# paneles} } del client",
+        "unassign-dashboards-action-title": "Desassignar { count, plural, =1 {1 paneles} other {# paneles} } del client",
         "delete-dashboard-title": "Eliminar el panell '{{dashboardTitle}}'?",
         "delete-dashboard-text": "Atenció, el panell seleccionat serà eliminat i la informació relacionada serà irrecuperable.",
-        "delete-dashboards-title": "Eliminar { count, plural, 1 {1 panel} other {# paneles} }?",
-        "delete-dashboards-action-title": "Eliminar { count, plural, 1 {1 panel} other {# paneles} }",
+        "delete-dashboards-title": "Eliminar { count, plural, =1 {1 panel} other {# paneles} }?",
+        "delete-dashboards-action-title": "Eliminar { count, plural, =1 {1 panel} other {# paneles} }",
         "delete-dashboards-text": "Atenció, els panells seleccionats seran eliminats i la informació relacionada serà irrecuperable.",
         "unassign-dashboard-title": "Desassignar  el panell '{{dashboardTitle}}'?",
         "unassign-dashboard-text": "Després de la confirmació, el panell serà desassignat i no podrà ser accessible pel client.",
         "unassign-dashboard": "Desassignar panell",
-        "unassign-dashboards-title": "Desassignar  { count, plural, 1 {1 panel} other {# paneles} }?",
+        "unassign-dashboards-title": "Desassignar  { count, plural, =1 {1 panel} other {# paneles} }?",
         "unassign-dashboards-text": "Atenció, després de la confirmació els panells seleccionats seran desassignats i no podran ser accessibles pel client.",
         "public-dashboard-title": "El panell ara és públic",
         "public-dashboard-text": "El teu panell <b>{{dashboardTitle}}</b> ara és públic i podrà ser accedit des de: <a href='{{publicLink}}' target='_blank'>aquí</a>:",
@@ -1131,7 +1131,7 @@
         "manage-states": "Administrar estats de panells",
         "states": "Estats de panells",
         "search-states": "Buscar estats de panells",
-        "selected-states": "{ count, plural, 1 {1 estado panel} other {# estat paneles} } seleccionats",
+        "selected-states": "{ count, plural, =1 {1 estado panel} other {# estat paneles} } seleccionats",
         "edit-state": "Editar estat panell",
         "delete-state": "Esborrar estat panell",
         "add-state": "Afegir estat panell",
@@ -1149,18 +1149,18 @@
         "hide-details": "Ocultar detalls",
         "select-state": "Seleccionar estat destí (target state)",
         "state-controller": "Controlador d'estats",
-        "selected-dashboards": "{ count, plural, 1 {1 panel} other {# paneles} } seleccionats",
+        "selected-dashboards": "{ count, plural, =1 {1 panel} other {# paneles} } seleccionats",
         "search": "Buscar panells",
         "home-dashboard": "Tauler d'inici",
         "home-dashboard-hide-toolbar": "Amaga la barra d'eines del tauler d'inici",
         "select-group-to-add": "Seleccioneu el grup de destinació per a afegir els panells seleccionats",
         "select-group-to-move": "Seleccioneu el grup de destinació per a moure els panells seleccionats",
-        "remove-dashboards-from-group": "Esteu segur que voleu eliminar { count, plural, 1 {1 dashboard} other {# dashboards} } del grup '{{entityGroup}}'?",
+        "remove-dashboards-from-group": "Esteu segur que voleu eliminar { count, plural, =1 {1 dashboard} other {# dashboards} } del grup '{{entityGroup}}'?",
         "group": "Grup de penells",
-        "list-of-groups": "{ count, plural, 1 {One dashboard group} other {List of # dashboard groups} }",
+        "list-of-groups": "{ count, plural, =1 {One dashboard group} other {List of # dashboard groups} }",
         "group-name-starts-with": "Grups de tauler amb noms que comencen per '{{prefix}}'",
         "unassign-dashboard-from-edge-text": "Després de la confirmació, el tauler no serà assignat i la vora no podrà accedir a ell",
-        "unassign-dashboards-from-edge-title": "Esteu segur que voleu desassignar { count, plural, 1 {1 dashboard} other {# dashboards} }?",
+        "unassign-dashboards-from-edge-title": "Esteu segur que voleu desassignar { count, plural, =1 {1 dashboard} other {# dashboards} }?",
         "unassign-dashboards-from-edge-text": "Després de la confirmació, és anul·larà l'assignació de tots els panells seleccionats i no seran accessibles per de vora",
         "assign-dashboard-to-edge": "Assignar panell(és) a la vora",
         "assign-dashboard-to-edge-text": "Si us plau selecciona els panells per assignar a la vora",
@@ -1183,7 +1183,7 @@
         "timeseries-required": "Sèries del temps del dispositiu requerit.",
         "timeseries-or-attributes-required": "Sèries del temps/*Atributs requerits.",
         "alarm-fields-timeseries-or-attributes-required": "Es requereixen camps d'alarma o sèries del temps/atributs.",
-        "maximum-timeseries-or-attributes": "Màxim { count, plural, 1 {1 timeseries/atributo és permès.} other {# timeseries/atributos són permitidos} }",
+        "maximum-timeseries-or-attributes": "Màxim { count, plural, =1 {1 timeseries/atributo és permès.} other {# timeseries/atributos són permitidos} }",
         "alarm-fields-required": "Cal camps d'alarma",
         "function-types": "Tipus de funcions",
         "function-types-required": "Cal tipus de funcions.",
@@ -1199,7 +1199,7 @@
         "timeseries-key": "Clau de sèries de temps",
         "timeseries-key-functions": "Funcions de sèries de temps",
         "timeseries-key-function": "Funció de sèrie de temps",
-        "maximum-function-types": "Màxim { count, plural, 1 {1 tipo de función está permitida.} other {# tipos de funciones están permitidos} }",
+        "maximum-function-types": "Màxim { count, plural, =1 {1 tipo de función está permitida.} other {# tipos de funciones están permitidos} }",
         "time-description": "Hora del valor actual",
         "value-description": "El valor actual",
         "prev-value-description": "resultat de la crida anterior de la funció",
@@ -1263,11 +1263,11 @@
         "manage-credentials": "Gestionar credencials",
         "delete": "Eliminar dispositiu",
         "assign-devices": "Assignar dispositiu",
-        "assign-devices-text": "Assignar { count, plural, 1 {1 dispositivo} other {# dispositivos} } al client",
+        "assign-devices-text": "Assignar { count, plural, =1 {1 dispositivo} other {# dispositivos} } al client",
         "delete-devices": "Eliminar dispositiu",
         "unassign-from-customer": "Desassignar el client",
         "unassign-devices": "Desassignar dispositius",
-        "unassign-devices-action-title": "Desassignar { count, plural, 1 {1 dispositivo} other {# dispositivos} } del client",
+        "unassign-devices-action-title": "Desassignar { count, plural, =1 {1 dispositivo} other {# dispositivos} } del client",
         "unassign-device-from-edge-title": "Està segur que vol desassignar el dispositiu '{{deviceName}}'?",
         "unassign-device-from-edge-text": "Després de la confirmació, el dispositiu no serà assignat i la vora no podrà accedir a ell",
         "unassign-devices-from-edge": "Desassigna els dispositius de la vora",
@@ -1279,13 +1279,13 @@
         "view-credentials": "Veure credencials",
         "delete-device-title": "Eliminar el dispositiu '{{deviceName}}'?",
         "delete-device-text": "Atenció, després de la confirmació els dispositius seran eliminats i la informació relacionada serà irrecuperable.",
-        "delete-devices-title": "Eliminar { count, plural, 1 {1 dispositivo} other {# dispositivos} }?",
-        "delete-devices-action-title": "Eliminar { count, plural, 1 {1 dispositivo} other {# dispositivos} }",
+        "delete-devices-title": "Eliminar { count, plural, =1 {1 dispositivo} other {# dispositivos} }?",
+        "delete-devices-action-title": "Eliminar { count, plural, =1 {1 dispositivo} other {# dispositivos} }",
         "delete-devices-text": "Atenció, després de la confirmació els dispositius seleccionats seran eliminats i la informació relacionada serà irrecuperable.",
         "unassign-device-title": "Desassignar  el dispositiu '{{deviceName}}'?",
         "unassign-device-text": "Després de la confirmació, el dispositiu serà desasignado i no podrà ser accessible pel client.",
         "unassign-device": "Desassignar dispositiu",
-        "unassign-devices-title": "Desassignar  { count, plural, 1 {1 dispositivo} other {# dispositivos} }?",
+        "unassign-devices-title": "Desassignar  { count, plural, =1 {1 dispositivo} other {# dispositivos} }?",
         "unassign-devices-text": "Després de la confirmació, els dispositius seleccionats seran desasignados i no podran ser accedits pel client.",
         "device-credentials": "Credencials del dispositiu",
         "loading-device-credentials": "S'estan carregant les credencials del dispositiu..",
@@ -1363,13 +1363,13 @@
         "public": "Públic",
         "device-public": "El dispositiu és públic",
         "select-device": "Seleccionar dispositiu",
-        "selected-devices": "{ count, plural, 1 {1 dispositivo} other {# dispositivos} } seleccionats",
+        "selected-devices": "{ count, plural, =1 {1 dispositivo} other {# dispositivos} } seleccionats",
         "search": "Buscar dispositius",
         "select-group-to-add": "Seleccionar grup objetiu per afegir dispositius seleccionats",
         "select-group-to-move": "Seleccionar grup objetiu per moure dispositius seleccionats",
-        "remove-devices-from-group": "Està segur de que desitja eliminar { count, plural, 1 {1 device} other {# devices} } del grup '{{entityGroup}}'?",
+        "remove-devices-from-group": "Està segur de que desitja eliminar { count, plural, =1 {1 device} other {# devices} } del grup '{{entityGroup}}'?",
         "group": "Grup de dispositius",
-        "list-of-groups": "{ count, plural, 1 {One device group} other {List of # device groups} }",
+        "list-of-groups": "{ count, plural, =1 {One device group} other {List of # device groups} }",
         "group-name-starts-with": "Grup de dispositius els quals comencen amb '{{prefix}}'",
         "import": "Importar dispositiu",
         "device-file": "Arxiu de dispositiu",
@@ -1384,7 +1384,7 @@
             "customer-to-assign-device": "Client al que assignar el dispositiu",
             "add-credentials": "Afegir credencial"
         },
-        "unassign-devices-from-edge-title": "Està segur de que desitja desassignar {count, plural, 1 {1 dispositivo} other {# dispositivos} }?",
+        "unassign-devices-from-edge-title": "Està segur de que desitja desassignar {count, plural, =1 {1 dispositivo} other {# dispositivos} }?",
         "unassign-devices-from-edge-text": "Després de la confirmació, tots els dispositius seleccionats quedaran sense assignar i la vora no podrà accedir a ells."
     },
     "device-profile": {
@@ -1396,7 +1396,7 @@
         "device-profile-details": "Detalls de perfil de dispositiu",
         "no-device-profiles-text": "No s'han trobat perfils",
         "search": "Buscar perfils",
-        "selected-device-profiles": "{ count, plural, 1 {1 perfil} other {# perfiles} } seleccionats",
+        "selected-device-profiles": "{ count, plural, =1 {1 perfil} other {# perfiles} } seleccionats",
         "no-device-profiles-matching": "No existeix perfil que coincideixi amb '{{entity}}'.",
         "device-profile-required": "Cal perfil de dispositiu",
         "idCopiedMessage": "S'ha copiat el ID de perfil al porta-retalls",
@@ -1434,7 +1434,7 @@
         "select-queue-hint": "Selecciona des de el desplegable o afegir un nom personalitzat.",
         "delete-device-profile-title": "Eliminar el perfil '{{deviceProfileName}}'?",
         "delete-device-profile-text": "Atenció, després de la confirmació el perfil i totes les vostres dades seran esborrades i irrecuperables.",
-        "delete-device-profiles-title": "EEliminar { count, plural, 1 {1 perfil} other {# perfiles} }?",
+        "delete-device-profiles-title": "EEliminar { count, plural, =1 {1 perfil} other {# perfiles} }?",
         "delete-device-profiles-text": "Atenció, després de la confirmació els perfils seleccionats i totes les vostres dades seran esborrades i irrecuperables.",
         "set-default-device-profile-title": "Establir el perfil '{{deviceProfileName}}' com perfil per defecte?",
         "set-default-device-profile-text": "Després de la confirmació, el perfil serà marcat com a defecte i serà utilitzat per tots els nous dispositius que no tinguin perfil especificat.",
@@ -1556,8 +1556,8 @@
         "condition-repeating-value-range": "El Nº de esdeveniments ha d'estar en un rang de 1 to 2147483647.",
         "condition-repeating-value-pattern": "Nº de esdeveniments ha de ser un número enter.",
         "condition-repeating-value-required": "Cal Nº de esdeveniments.",
-        "condition-repeat-times": "Repetició { count, plural, 1 {1 vez} other {# veces} }",
-        "condition-repeat-times-dynamic": "Repeats \"{ attribute }\" ({ count, plural, 1 {1 time} other {# times} })",
+        "condition-repeat-times": "Repetició { count, plural, =1 {1 vez} other {# veces} }",
+        "condition-repeat-times-dynamic": "Repeats \"{ attribute }\" ({ count, plural, =1 {1 time} other {# times} })",
         "schedule-type": "Tipus d'horari",
         "schedule-type-required": "Cal tipus d'horari.",
         "schedule": "Horari",
@@ -1799,7 +1799,7 @@
         "delete": "Eliminar vora",
         "delete-edge-title": "Està segur de que desitja eliminar la vora '{{edgeName}}'?",
         "delete-edge-text": "Aneu amb compte, després de la confirmació, la vora i totes les dades relacionades seran irrecuperables",
-        "delete-edges-title": "Està segur de que desitja edge {count, plural, 1 {1 borde} other {# bordes} }?",
+        "delete-edges-title": "Està segur de que desitja edge {count, plural, =1 {1 borde} other {# bordes} }?",
         "delete-edges-text": "Aneu amb compte, després de la confirmació s'eliminaran totes les vores seleccionades i totes les dades relacionades seran irrecuperables",
         "name": "Nom",
         "name-starts-with": "El nom de la vora comença per",
@@ -1834,7 +1834,7 @@
         "unassign-from-customer": "Anul·lar assignació del client",
         "unassign-edge-title": "Està segur de que desitja desassignar la vora '{{edgeName}}'?",
         "unassign-edge-text": "Després de la confirmació, la vora quedará sense assignar i el client no podrà accedir a ell",
-        "unassign-edges-title": "Està segur de que desitja anul·lar l'assignació de {count, plural, 1 {1 borde} other {# bordes} }?",
+        "unassign-edges-title": "Està segur de que desitja anul·lar l'assignació de {count, plural, =1 {1 borde} other {# bordes} }?",
         "unassign-edges-text": "Després de la confirmació de totes les vores seleccionades, s'anul·larà l'assignació i el client no podrà accedir a ells.",
         "make-public": "Fer públic la vora",
         "make-public-edge-title": "Estás segur de que quieres fer públic el edge '{{edgeName}}'?",
@@ -1867,7 +1867,7 @@
         "rulechain-templates": "Plantilles, de cadena de regles",
         "rulechains": "Cadenes de regla de vora",
         "search": "Vores de cerca",
-        "selected-edges": "{count, plural, 1 {1 borde} other {# bordes} } seleccionades",
+        "selected-edges": "{count, plural, =1 {1 borde} other {# bordes} } seleccionades",
         "any-edge": "Qualsevol vora",
         "no-edge-types-matching": "No s'han trobar tipus de aristas que coincideixin amb '{{entitySubtype}}'.",
         "edge-type-list-empty": "No s'ha seleccionat cap tipus de vora.",
@@ -1892,9 +1892,9 @@
         "manage-edge-scheduler-events": "Administrar esdeveniments del programador de vora",
         "select-group-to-add": "Selecciona el grup de destí per afegir les vores seleccionades",
         "select-group-to-move": "Selecciona el grup de destí per moure les vores seleccionades",
-        "remove-edges-from-group": "Està segur de que desitja eliminar {count, plural, 1 {1 borde} other {# bordes} } del grup '{entityGroup}'?",
+        "remove-edges-from-group": "Està segur de que desitja eliminar {count, plural, =1 {1 borde} other {# bordes} } del grup '{entityGroup}'?",
         "group": "Grup de vores",
-        "list-of-groups": "{count, plural, 1 {Un grupo de bodre} other {Lista de # grupos de bordes} }",
+        "list-of-groups": "{count, plural, =1 {Un grupo de bodre} other {Lista de # grupos de bordes} }",
         "group-name-starts-with": "Grups de vora els quals comencen amb '{{prefix}}'",
         "unassign-entity-group-from-edge-title": "Està segur de que desitja anul·lar l'assignació del grup d'entitat '{{entityGroupName}}'?",
         "unassign-entity-group-from-edge-text": "Després de la confirmació, s'anul·larà l'assignació del grup d'entitats i no es podrà accedir a ell des de la vora.",
@@ -2014,74 +2014,74 @@
         "type-required": "Cal tipus d'entitat.",
         "type-device": "Dispositiu",
         "type-devices": "Dispositius",
-        "list-of-devices": "{ count, plural, 1 {Un dispositivo} other {Lista de # Dispositivos} }",
+        "list-of-devices": "{ count, plural, =1 {Un dispositivo} other {Lista de # Dispositivos} }",
         "device-name-starts-with": "Dispositius els quals comencen per '{{prefix}}'",
         "type-device-profile": "Perfil de dispositiu",
         "type-device-profiles": "Perfils de dispositiu",
-        "list-of-device-profiles": "{ count, plural, 1 {un perfil} other {Lista de # perfiles} }",
+        "list-of-device-profiles": "{ count, plural, =1 {un perfil} other {Lista de # perfiles} }",
         "device-profile-name-starts-with": "Perfils els quals comenci per '{{prefix}}'",
         "type-asset": "Actiu",
         "type-assets": "Actius",
-        "list-of-assets": "{ count, plural, 1 {Un activo} other {Lista de # activos} }",
+        "list-of-assets": "{ count, plural, =1 {Un activo} other {Lista de # activos} }",
         "asset-name-starts-with": "Actius els quals comencen per '{{prefix}}'",
         "type-entity-view": "Vista Entitat",
         "type-entity-views": "Vistes Entitats",
-        "list-of-entity-views": "{ count, plural, 1 {Una vista de entidad} other {Lista de # Vistas de Entitats} }",
+        "list-of-entity-views": "{ count, plural, =1 {Una vista de entidad} other {Lista de # Vistas de Entitats} }",
         "entity-view-name-starts-with": "Vistes de Entitats els quals comencen per '{{prefix}}'",
         "type-rule": "Regla",
         "type-rules": "Regles",
-        "list-of-rules": "{ count, plural, 1 {Una regla} other {Lista de # regles} }",
+        "list-of-rules": "{ count, plural, =1 {Una regla} other {Lista de # regles} }",
         "rule-name-starts-with": "Regles les quals comencen per '{{prefix}}'",
         "type-plugin": "Plugin",
         "type-plugins": "Plugins",
-        "list-of-plugins": "{ count, plural, 1 {Un plugin} other {Lista de # plugins} }",
+        "list-of-plugins": "{ count, plural, =1 {Un plugin} other {Lista de # plugins} }",
         "plugin-name-starts-with": "Plugins els quals comencen per '{{prefix}}'",
         "type-tenant": "Propietari",
         "type-tenants": "Propietaris",
-        "list-of-tenants": "{ count, plural, 1 {Un propietario} other {Lista de # propietarios} }",
+        "list-of-tenants": "{ count, plural, =1 {Un propietario} other {Lista de # propietarios} }",
         "tenant-name-starts-with": "Propietaris els quals comencen per '{{prefix}}'",
         "type-tenant-profile": "Perfil de Propietari",
         "type-tenant-profiles": "Perfils de propietari",
-        "list-of-tenant-profiles": "{ count, plural, 1 {Un perfil de propietario} other {Lista de # perfils de propietario} }",
+        "list-of-tenant-profiles": "{ count, plural, =1 {Un perfil de propietario} other {Lista de # perfils de propietario} }",
         "tenant-profile-name-starts-with": "Pefils de propietari els quals comencen per '{{prefix}}'",
         "type-customer": "Client",
         "type-customers": "Clients",
-        "list-of-customers": "{ count, plural, 1 {Un cliente} other {Lista de # clientes} }",
+        "list-of-customers": "{ count, plural, =1 {Un cliente} other {Lista de # clientes} }",
         "customer-name-starts-with": "Clients els quals comencen per '{{prefix}}'",
         "type-user": "Usuari",
         "type-users": "Usuaris",
-        "list-of-users": "{ count, plural, 1 {Un usuario} other {Lista de # usuaris} }",
+        "list-of-users": "{ count, plural, =1 {Un usuario} other {Lista de # usuaris} }",
         "user-name-starts-with": "Usuaris els quals comencen per '{{prefix}}'",
         "type-dashboard": "Panell",
         "type-dashboards": "Panells",
-        "list-of-dashboards": "{ count, plural, 1 {Un panel} other {Lista de # paneles} }",
+        "list-of-dashboards": "{ count, plural, =1 {Un panel} other {Lista de # paneles} }",
         "dashboard-name-starts-with": "Panells els quals comencen per '{{prefix}}'",
         "type-alarm": "Alarma",
         "type-alarms": "Alarmes",
-        "list-of-alarms": "{ count, plural, 1 {Una alarma} other {Lista de # alarmas} }",
+        "list-of-alarms": "{ count, plural, =1 {Una alarma} other {Lista de # alarmas} }",
         "alarm-name-starts-with": "Alarmes les quals comencen amb '{{prefix}}'",
         "type-rulechain": "Cadena de regles",
         "type-rulechains": "Cadenes de regles",
-        "list-of-rulechains": "{ count, plural, 1 {Una cadena de regles} other {Lista de # cadenes de regles} }",
+        "list-of-rulechains": "{ count, plural, =1 {Una cadena de regles} other {Lista de # cadenes de regles} }",
         "rulechain-name-starts-with": "Cadenes de regles les quals comencen amb '{{prefix}}'",
         "type-scheduler-event": "Planificador d'esdeveniment",
         "type-scheduler-events": "Planificador d'esdeveniment",
-        "list-of-scheduler-events": "{ count, plural, 1 {One scheduler event} other {List of # scheduler events} }",
+        "list-of-scheduler-events": "{ count, plural, =1 {One scheduler event} other {List of # scheduler events} }",
         "scheduler-event-name-starts-with": "Planificador d'esdeveniment els quals comencen amb '{{prefix}}'",
         "type-blob-entity": "Entitat blob",
         "type-blob-entities": "Entitats blob",
-        "list-of-blob-entities": "{ count, plural, 1 {One blob entity} other {List of # blob entities} }",
+        "list-of-blob-entities": "{ count, plural, =1 {One blob entity} other {List of # blob entities} }",
         "blob-entity-name-starts-with": "Entitats blob els quals comencen amb '{{prefix}}'",
         "type-rulenode": "Node de regles",
         "type-rulenodes": "Nodes de regles",
-        "list-of-rulenodes": "{ count, plural, 1 {Un nodo de regles} other {Lista de # nodes de regles} }",
+        "list-of-rulenodes": "{ count, plural, =1 {Un nodo de regles} other {Lista de # nodes de regles} }",
         "rulenode-name-starts-with": "Nodes de regles els quals comencen amb '{{prefix}}'",
         "type-current-customer": "Client Actual",
         "type-current-tenant": "Propietari Actual",
         "type-current-user": "Usuari Actual",
         "type-current-user-owner": "Usuari Propietari Actual",
         "search": "Buscar entitats",
-        "selected-entities": "{ count, plural, 1 {1 entitat} other {# entitats} } seleccionades",
+        "selected-entities": "{ count, plural, =1 {1 entitat} other {# entitats} } seleccionades",
         "entity-name": "Nom d'entitat",
         "entity-label": "Etiqueta d'entitat",
         "details": "Detalls d'entitat",
@@ -2092,20 +2092,20 @@
         "type-entity-group": "Grup d'entitats",
         "type-converter": "Convertidor de dades",
         "type-converters": "Convertidors de dades",
-        "list-of-converters": "{ count, plural, 1 {One data converter} other {List of # data converters} }",
+        "list-of-converters": "{ count, plural, =1 {One data converter} other {List of # data converters} }",
         "converter-name-starts-with": "Convertidors de dades els quals comencen amb '{{prefix}}'",
         "type-integration": "Integració",
         "type-integrations": "Integracions",
-        "list-of-integrations": "{ count, plural, 1 {One integration} other {List of # integrations} }",
+        "list-of-integrations": "{ count, plural, =1 {One integration} other {List of # integrations} }",
         "integration-name-starts-with": "Integracions les quals comencen amb '{{prefix}}'",
         "type-role": "Rol",
         "type-roles": "Rols",
-        "list-of-roles": "{ count, plural, 1 {One role} other {List of # roles} }",
+        "list-of-roles": "{ count, plural, =1 {One role} other {List of # roles} }",
         "role-name-starts-with": "Rols els noms dels quals comencen per '{{prefix}}'",
         "type-group-permission": "Permís de grup",
         "type-edge": "Vora",
         "type-edges": "Vores",
-        "list-of-edges": "{count, plural, 1 {Un borde} other {Lista de # bordes} }",
+        "list-of-edges": "{count, plural, =1 {Un borde} other {Lista de # bordes} }",
         "edge-name-starts-with": "Vores les quals comencen amb '{{prefijo}}'",
         "type-tb-resource": "Recurs",
         "type-ota-package": "Paquet OTA"
@@ -2138,12 +2138,12 @@
         "add-entity-group-text": "Afegir nou grup d'entitats",
         "no-entity-groups-text": "Grups d'entitats no trobats",
         "entity-group-details": "Detalls del grup d'entitats",
-        "selected-entity-groups": "{ count, plural, 1 {1 entity group} other {# entity groups} } seleccionat",
+        "selected-entity-groups": "{ count, plural, =1 {1 entity group} other {# entity groups} } seleccionat",
         "delete-entity-groups": "Eliminar grups d'entitats",
         "delete-entity-group-title": "Està segur de que desitja eliminar el grup d'entitats '{{entityGroupName}}'?",
         "delete-entity-group-text": "Aneu amb compte, després de la confirmació, el grup d'entitats i totes les dades relacionades seran irrecuperables.",
-        "delete-entity-groups-title": "Està segur de que desitja eliminar { count, plural, 1 {1 entity group} other {# entity groups} }?",
-        "delete-entity-groups-action-title": "Eliminar { count, plural, 1 {1 entity group} other {# entity groups} }",
+        "delete-entity-groups-title": "Està segur de que desitja eliminar { count, plural, =1 {1 entity group} other {# entity groups} }?",
+        "delete-entity-groups-action-title": "Eliminar { count, plural, =1 {1 entity group} other {# entity groups} }",
         "delete-entity-groups-text": "Aneu amb compte, després de la confirmació s'eliminaran tots els grups d'entitats seleccionats i totes les dades relacionades seran irrecuperables.",
         "device-groups": "Grups de dispositius",
         "asset-groups": "Grups d'actius",
@@ -2203,7 +2203,7 @@
         "select-target-owner": "Seleccioneu el propietari objectiu",
         "no-owners-matching": "No hi ha cap propietari que coincideixi '{{owner}}' els van trobar.",
         "target-owner-required": "Cal propietari objectiu.",
-        "confirm-change-owner-title": "Esteu segur que voleu canviar de propietari per { count, plural, 1 {1 selected entity} other {# selected entities} }?",
+        "confirm-change-owner-title": "Esteu segur que voleu canviar de propietari per { count, plural, =1 {1 selected entity} other {# selected entities} }?",
         "confirm-change-owner-text": "Aneu amb compte, després de la confirmació, totes les entitats seleccionades s'eliminaran del propietari actual i es col·locaran al grup 'Tots' del propietari objectiu..",
         "add-to-group": "Afegir al grup",
         "move-to-group": "Moure al grup",
@@ -2314,18 +2314,18 @@
         "add-entity-view-text": "Afegir nova vista d'entitat",
         "delete": "Esborrar vista d'entitat",
         "assign-entity-views": "Assignar vistes d'entitat",
-        "assign-entity-views-text": "Assignar { count, plural, 1 {1 vista de entidad} other {# vistas de entidad} } a client",
+        "assign-entity-views-text": "Assignar { count, plural, =1 {1 vista de entidad} other {# vistas de entidad} } a client",
         "delete-entity-views": "Esborrar vistes d'entitat",
         "make-public": "Fer pública la vista d'entitat",
         "make-private": "Fer que la vista d'entitat sigui privada",
         "unassign-from-customer": "Anul·lar assignació a client",
         "unassign-entity-views": "Anul·lar assignació de vistes d'entitat",
-        "unassign-entity-views-action-title": "Anul·lar assignació { count, plural, 1 {1 vista de entidad} other {# vistas de entidad} } al client",
+        "unassign-entity-views-action-title": "Anul·lar assignació { count, plural, =1 {1 vista de entidad} other {# vistas de entidad} } al client",
         "assign-new-entity-view": "Assignar nova vista d'entitat",
         "delete-entity-view-title": "Esteu segur que voleu esborrar la vista entitat '{{entityViewName}}'?",
         "delete-entity-view-text": "Compte! Després de la confirmació, la vista de l'entitat i totes les dades relacionades seran irrecuperables.",
-        "delete-entity-views-title": "Esteu segur que voleu esborrar les vistes d'entitat { count, plural, 1 {1 entityView} other {# entityViews} }?",
-        "delete-entity-views-action-title": "Esborrar { count, plural, 1 {1 vista de entidad} other {# vistas de entidad} }",
+        "delete-entity-views-title": "Esteu segur que voleu esborrar les vistes d'entitat { count, plural, =1 {1 entityView} other {# entityViews} }?",
+        "delete-entity-views-action-title": "Esborrar { count, plural, =1 {1 vista de entidad} other {# vistas de entidad} }",
         "delete-entity-views-text": "Compte! Després de la confirmació, totes les vistes d'entitats seleccionades s'eliminaran i totes les dades relacionades seran irrecuperables.",
         "make-public-entity-view-title": "Està segur de que desitja que la vista d'entitat '{{entityViewName}}' sigui pública?",
         "make-public-entity-view-text": "Després de la confirmació, la vista de l'entitat i totes les dades seran públiques i accessibles per altres.",
@@ -2334,7 +2334,7 @@
         "unassign-entity-view-title": "Esteu segur que voleu anul·lar l'assignació de la vista d'entitat '{{entityViewName}}'?",
         "unassign-entity-view-text": "Després de la confirmació, la vista de l'entitat quedarà sense assignar i el client no hi podrà accedir.",
         "unassign-entity-view": "Anul·lar assignació de la vista d'entitat",
-        "unassign-entity-views-title": "Esteu segur que voleu anul·lar l'assignació de { count, plural, 1 {1 vista de entidad} other {# vistas de entidad} }?",
+        "unassign-entity-views-title": "Esteu segur que voleu anul·lar l'assignació de { count, plural, =1 {1 vista de entidad} other {# vistas de entidad} }?",
         "unassign-entity-views-text": "Després de la confirmació, totes les vistes d'entitats seleccionades quedaran sense assignar i el client no podrà accedir-hi.",
         "entity-view-type": "Tipus de vista d'entitat",
         "entity-view-type-required": "Cal tipus de vista d'entitat.",
@@ -2376,21 +2376,21 @@
         "attributes-propagation-hint": "La vista d'entitat copiarà automàticament els atributs especificats de l'entitat de destí cada vegada que guardi o actualitzi esta vista d'entitat. Per razones de rendimiento, els atributs d'entitat objetiu no es propagan a la vista d'entitat en cada cambio d'atribut. Puede habilitar la propagación automàtica configurando el node de la regla \"copiar a la vista\" en la seva cadena de regles i vincular els missatges \"Atributs de la publicación\" i \"Atributs actualizados\" al nou node de la regla.",
         "timeseries-data": "Dades de series temporals",
         "timeseries-data-hint": "Configura les claus de les dades de les series temporals de l'entitat de destí que seran accessibles per la vista de l'entitat. Les dades d'aquesta sèrie temporal són de només lectura.",
-        "selected-entity-views": "{ count, plural, 1 {1 vista de entidad} other {# vistas de entidad} } seleccionades",
+        "selected-entity-views": "{ count, plural, =1 {1 vista de entidad} other {# vistas de entidad} } seleccionades",
         "search": "Buscar vistes d'entitat",
         "select-group-to-add": "Seleccioneu el grup objectiu per afegir visualitzacions d'entitat seleccionades",
         "select-group-to-move": "Seleccioneu el grup objectiu per moure les vistes d'entitat seleccionades",
-        "remove-entity-views-from-group": "Esteu segur que voleu eliminar-lo { count, plural, 1 {1 entity view} other {# entity views} } del grup '{{entityGroup}}'?",
+        "remove-entity-views-from-group": "Esteu segur que voleu eliminar-lo { count, plural, =1 {1 entity view} other {# entity views} } del grup '{{entityGroup}}'?",
         "group": "Grup de vistes d'entitat",
-        "list-of-groups": "{ count, plural, 1 {One entity view group} other {List of # entity view groups} }",
+        "list-of-groups": "{ count, plural, =1 {One entity view group} other {List of # entity view groups} }",
         "group-name-starts-with": "Grups de visualització d'entitats els noms dels quals comencen per '{{prefix}}'",
         "assign-entity-view-to-edge": "Assignar vista (es) d'entitat a vora",
         "assign-entity-view-to-edge-text": "Selecciona les vistes d'entitat per assignar a la vora",
         "unassign-entity-view-from-edge-title": "Està segur de que desitja anul·lar l'assignació de la vista d'entitat '{{entityViewName}}'?",
         "unassign-entity-view-from-edge-text": "Després de la confirmació, la vista d'entitat quedará sense assignar i la vora no podrà accedir a ella",
-        "unassign-entity-views-from-edge-action-title": "Anul·lar assignació {count, plural, 1 {1 vista de entidad} other {# vistas de entidad} } del vora",
+        "unassign-entity-views-from-edge-action-title": "Anul·lar assignació {count, plural, =1 {1 vista de entidad} other {# vistas de entidad} } del vora",
         "unassign-entity-view-from-edge": "Anul·lar assignació de vista d'entitat",
-        "unassign-entity-views-from-edge-title": "Està segur de que desitja desassignar {count, plural, 1 {1 vista de entidad} other {# vistas de entidad} }?",
+        "unassign-entity-views-from-edge-title": "Està segur de que desitja desassignar {count, plural, =1 {1 vista de entidad} other {# vistas de entidad} }?",
         "unassign-entity-views-from-edge-text": "Després de la confirmació, totes les vistas d'entitat seleccionades no seran assignades i la vora no podrà accedir a ellas"
     },
     "event": {
@@ -2443,7 +2443,7 @@
     },
     "extension": {
         "extensions": "Extensions",
-        "selected-extensions": "{ count, plural, 1 {1 extensión} other {# extensiones} } seleccionades",
+        "selected-extensions": "{ count, plural, =1 {1 extensión} other {# extensiones} } seleccionades",
         "type": "Tipus",
         "key": "Clau",
         "value": "Valor",
@@ -2458,7 +2458,7 @@
         "view": "Mostra l'extensió",
         "delete-extension-title": "Eliminar la extensió '{{extensionId}}'?",
         "delete-extension-text": "Atenció, després de la confirmació, l'extensió i els seus dades seran esborrades i irrecuperables.",
-        "delete-extensions-title": "Eliminar les extensions { count, plural, 1 {1 extensión} other {# extensiones} }?",
+        "delete-extensions-title": "Eliminar les extensions { count, plural, =1 {1 extensión} other {# extensiones} }?",
         "delete-extensions-text": "Atenció, després de la confirmació totes les extensions seleccionades i els seus dades seran esborrats i irrecuperables.",
         "converters": "Convertidors",
         "converter-id": "Id convertidor",
@@ -2783,8 +2783,8 @@
     "grid": {
         "delete-item-title": "Vols eliminar aquest item?",
         "delete-item-text": "Atenció, després de la confirmació l'item serà eliminat i la informació relacionada serà irrecuperable.",
-        "delete-items-title": "Vols eliminar { count, plural, 1 {1 item} other {# items} }?",
-        "delete-items-action-title": "Eliminar { count, plural, 1 {1 item} other {# items} }",
+        "delete-items-title": "Vols eliminar { count, plural, =1 {1 item} other {# items} }?",
+        "delete-items-action-title": "Eliminar { count, plural, =1 {1 item} other {# items} }",
         "delete-items-text": "Atenció, després de la confirmació els items seleccionats seran eliminats i la informació relacionada serà irrecuperable.",
         "add-item-text": "Afegir nou item",
         "no-items-text": "Cap item trobat",
@@ -2893,11 +2893,11 @@
         "management": "Gestió d'integracions",
         "add-integration-text": "Afegir nova integració",
         "no-integrations-text": "Integracions no trobades",
-        "selected-integrations": "{ count, plural, 1 {1 integration} other {# integrations} } seleccionades",
+        "selected-integrations": "{ count, plural, =1 {1 integration} other {# integrations} } seleccionades",
         "delete-integration-title": "Està segur de que desitja eliminar la integració '{{integrationName}}'?",
         "delete-integration-text": "Aneu amb compte, després de la confirmació, la integració i totes les dades relacionades seran irrecuperables.",
-        "delete-integrations-title": "Està segur de que desitja eliminar { count, plural, 1 {1 integration} other {# integrations} }?",
-        "delete-integrations-action-title": "Eliminar { count, plural, 1 {1 integration} other {# integrations} }",
+        "delete-integrations-title": "Està segur de que desitja eliminar { count, plural, =1 {1 integration} other {# integrations} }?",
+        "delete-integrations-action-title": "Eliminar { count, plural, =1 {1 integration} other {# integrations} }",
         "delete-integrations-text": "Aneu amb compte, després de la confirmació s'eliminaran totes les integracions seleccionades i totes les dades relacionades seran irrecuperables.",
         "events": "Esdeveniments",
         "enabled": "Habilitat",
@@ -3331,7 +3331,7 @@
         "verify-your-identity": "Verificar identitat",
         "select-way-to-verify": "Seleccioneu el mode de verificació",
         "resend-code": "Reenviar codi",
-        "resend-code-wait": "Reenviar codi a { time, plural, 1 {1 segundo} other {# segundos} }",
+        "resend-code-wait": "Reenviar codi a { time, plural, =1 {1 segundo} other {# segundos} }",
         "try-another-way": "Altres modes de verificació",
         "totp-auth-description": "Si us plau, introduïu el codi de seguretat de la vostra aplicació d'autenticació.",
         "totp-auth-placeholder": "Codi",
@@ -3383,8 +3383,8 @@
         "checksum-hint": "Si la suma de comprovació està buida, es generarà automàticament",
         "checksum-algorithm": "Algorisme de suma de control",
         "checksum-copied-message": "La suma de comprovació del paquet s'ha copiat al porta-retalls",
-        "change-firmware": "El canvi del firmware pot provocar l'actualització { count, plural, 1 {1 device} other {# devices} }.",
-        "change-software": "El canvi del programari pot provocar l'actualització { count, plural, 1 {1 device} other {# devices} }.",
+        "change-firmware": "El canvi del firmware pot provocar l'actualització { count, plural, =1 {1 device} other {# devices} }.",
+        "change-software": "El canvi del programari pot provocar l'actualització { count, plural, =1 {1 device} other {# devices} }.",
         "chose-compatible-device-profile": "El paquet penjat només estarà disponible per als dispositius amb el perfil escollit.",
         "chose-firmware-distributed-device": "Trieu el firmware que es distribuirà als dispositius",
         "chose-software-distributed-device": "Trieu el programari que es distribuirà als dispositius",
@@ -3397,7 +3397,7 @@
         "delete-ota-update-text": "Aneu amb compte, després de la confirmació, l'actualització OTA serà irrecuperable.",
         "delete-ota-update-title": "Confirmes que vols suprimir l'actualització de l'OTA '{{title}}'?",
         "delete-ota-updates-text": "Aneu amb compte, després de la confirmació, totes les actualitzacions OTA seleccionades s'eliminaran.",
-        "delete-ota-updates-title": "Esteu segur que voleu suprimir { count, plural, 1 {1 OTA update} other {# OTA updates} }?",
+        "delete-ota-updates-title": "Esteu segur que voleu suprimir { count, plural, =1 {1 OTA update} other {# OTA updates} }?",
         "description": "Descripció",
         "direct-url": "URL directe",
         "direct-url-copied-message": "L'URL directe del paquet s'ha copiat al porta-retalls",
@@ -3419,7 +3419,7 @@
         "package-type": "Tipus de paquet",
         "packages-repository": "Repositori de paquets",
         "search": "Cerca paquets",
-        "selected-package": "{ count, plural, 1 {1 package} other {# packages} } seleccionat",
+        "selected-package": "{ count, plural, =1 {1 package} other {# packages} } seleccionat",
         "title": "Títol",
         "title-required": "Cal títol.",
         "title-max-length": "El títol ha de ser inferior a 256",
@@ -3511,17 +3511,17 @@
         },
         "password-requirement": {
             "at-least": "Al menys:",
-            "character": "{ count, plural, 1 {1 caracter} other {# caracteres} }",
-            "digit": "{ count, plural, 1 {1 dígito} other {# dígitos} }",
+            "character": "{ count, plural, =1 {1 caracter} other {# caracteres} }",
+            "digit": "{ count, plural, =1 {1 dígito} other {# dígitos} }",
             "incorrect-password-try-again": "Contrasenya incorrecta. Prova una altra vegada",
-            "lowercase-letter": "{ count, plural, 1 {1 minúscula} other {# mínusculas} }",
+            "lowercase-letter": "{ count, plural, =1 {1 minúscula} other {# mínusculas} }",
             "new-passwords-not-match": "Les contrasenyes no coincideixen",
             "password-should-not-contain-spaces": "La contrasenya no pot contenir espais",
             "password-not-meet-requirements": "La contrasenya no reuneix els requisits necessaris",
             "password-requirements": "Requisits de contrasenya",
             "password-should-difference": "La nova contrasenya ha de ser diferent de l'actual",
-            "special-character": "{ count, plural, 1 {1 caracter especial} other {# caracteres especiales} }",
-            "uppercase-letter": "{ count, plural, 1 {1 mayúscula} other {# mayúsculas} }"
+            "special-character": "{ count, plural, =1 {1 caracter especial} other {# caracteres especiales} }",
+            "uppercase-letter": "{ count, plural, =1 {1 mayúscula} other {# mayúsculas} }"
         }
     },
     "relation": {
@@ -3537,7 +3537,7 @@
         },
         "from-relations": "Relacions salientes (outbound)",
         "to-relations": "Relacions entrantes (inbound)",
-        "selected-relations": "{ count, plural, 1 {1 relación} other {# relaciones} } seleccionades",
+        "selected-relations": "{ count, plural, =1 {1 relación} other {# relaciones} } seleccionades",
         "type": "Tipus",
         "to-entity-type": "Cap a tipus d'entitat",
         "to-entity-name": "Cap a nom d'entitat",
@@ -3555,11 +3555,11 @@
         "view": "Veure relació",
         "delete-to-relation-title": "Vols eliminar la relació amb l'entitat '{{entityName}}'?",
         "delete-to-relation-text": "Atenció, després de la confirmació l'entitat '{{entityName}}' no estarà relacionada amb l'entitat actual.",
-        "delete-to-relations-title": "Vols eliminar  { count, plural, 1 {1 relación} other {# relaciones} }?",
+        "delete-to-relations-title": "Vols eliminar  { count, plural, =1 {1 relación} other {# relaciones} }?",
         "delete-to-relations-text": "Atenció, després de la confirmació totes les relacions seleccionades s'eliminaran i les seves entitats corresponents no estaran relacionades amb l'entitat actual.",
         "delete-from-relation-title": "Vols eliminar la relació amb l'entitat '{{entityName}}'?",
         "delete-from-relation-text": "Atenció, després de la confirmació l'entitat actual no estarà relacionada amb l'entitat '{{entityName}}'.",
-        "delete-from-relations-title": "Vols eliminar  { count, plural, 1 {1 relación} other {# relaciones} }?",
+        "delete-from-relations-title": "Vols eliminar  { count, plural, =1 {1 relación} other {# relaciones} }?",
         "delete-from-relations-text": "Atenció, després de la confirmació totes les relacions seleccionades s'eliminaran i les seves entitats corresponents no estaran relacionades amb les entitats corresponents.",
         "remove-relation-filter": "Treure filtre de relació",
         "add-relation-filter": "Afegir filtre de relació",
@@ -3575,9 +3575,9 @@
         "delete": "Suprimeix el recurs",
         "delete-resource-text": "Aneu amb compte, després de la confirmació el recurs es tornarà irrecuperable.",
         "delete-resource-title": "Esteu segur que voleu suprimir el recurs '{{resourceTitle}}'?",
-        "delete-resources-action-title": "Suprimeix { count, plural, 1 {1 resource} other {# resources} }",
+        "delete-resources-action-title": "Suprimeix { count, plural, =1 {1 resource} other {# resources} }",
         "delete-resources-text": "Tingueu en compte que els recursos seleccionats, encara que s'utilitzin en perfils de dispositius, se suprimiran.",
-        "delete-resources-title": "Esteu segur que voleu suprimir { count, plural, 1 {1 resource} other {# resources} }?",
+        "delete-resources-title": "Esteu segur que voleu suprimir { count, plural, =1 {1 resource} other {# resources} }?",
         "download": "Descarrega el recurs",
         "drop-file": "Deixeu anar un fitxer de recursos o feu clic per seleccionar un fitxer per carregar.",
         "drop-resource-file-or": "Arrossegar i deixar anar un fitxer o",
@@ -3592,7 +3592,7 @@
         "resource-type": "Tipus de recurs",
         "resources-library": "Biblioteca de recursos",
         "search": "Cerca recursos",
-        "selected-resources": "{ count, plural, 1 {1 resource} other {# resources} } seleccionat",
+        "selected-resources": "{ count, plural, =1 {1 resource} other {# resources} } seleccionat",
         "system": "Sistema",
         "title": "Títol",
         "title-required": "Cal títol.",
@@ -3613,8 +3613,8 @@
         "set-root-rulechain-text": "Després de la confirmació, la cadena de regles es tornarà arrel i manejarà tots els missatges de transport entrants.",
         "delete-rulechain-title": "Vols eliminar la cadena de regles '{{ruleChainName}}'?",
         "delete-rulechain-text": "Atenció, després de la confirmació la cadena de regles i totes les dades seran irrecuperables.",
-        "delete-rulechains-title": "Està segur que vols eliminar { count, plural, 1 {1 cadena de regles} other {# cadenes de regles} }?",
-        "delete-rulechains-action-title": "Eliminar { count, plural, 1 {1 cadena de regles} other {# cadenes de regles} }",
+        "delete-rulechains-title": "Està segur que vols eliminar { count, plural, =1 {1 cadena de regles} other {# cadenes de regles} }?",
+        "delete-rulechains-action-title": "Eliminar { count, plural, =1 {1 cadena de regles} other {# cadenes de regles} }",
         "delete-rulechains-text": "Atenció, després de la confirmació totes les cadena de regles seleccionades i totes les dades seran irrecuperables.",
         "add-rulechain-text": "Afegir nova cadena de regles",
         "no-rulechains-text": "Cadenes de regles no trobades",
@@ -3636,13 +3636,13 @@
         "management": "Gestió de regles",
         "debug-mode": "Manera de Depuració",
         "search": "Buscar cadenes de regles",
-        "selected-rulechains": "{ count, plural, 1 {1 cadena de regles} other {# cadenes de regles} } seleccionades",
+        "selected-rulechains": "{ count, plural, =1 {1 cadena de regles} other {# cadenes de regles} } seleccionades",
         "open-rulechain": "Obrir cadena de regles",
         "edge-template-root": "Arrel de plantilla",
         "assign-to-edge": "Assignar a Edge",
         "edge-rulechain": "Cadena de regla de vora",
         "unassign-rulechain-from-edge-text": "Després de la confirmació, la cadena de regles quedará sense assignar i la vora no podrà accedir a ella",
-        "unassign-rulechains-from-edge-title": "Esteu segur que voleu anul·lar l'assignació { count, plural, 1 {1 rulechain} other {# rulechains} }?",
+        "unassign-rulechains-from-edge-title": "Esteu segur que voleu anul·lar l'assignació { count, plural, =1 {1 rulechain} other {# rulechains} }?",
         "unassign-rulechains-from-edge-text": "Després de la confirmació, totes les cadenes de regles seleccionades quedaran sense assignar i la vora no podrà accedir a ellas",
         "assign-rulechain-to-edge-title": "Assignar cadena (s) de regles a vora",
         "assign-rulechain-to-edge-text": "Selecciona les cadenes de regles per assignar a la vora",
@@ -3662,7 +3662,7 @@
         "assign-rulechains": "Assignar cadenes de regles",
         "delete-rulechains": "Eliminar cadenes de regles",
         "unassign-rulechain": "Anul·lar assignació de cadena de regles",
-        "unassign-rulechains-from-edge-action-title": "Anul·lar assignació {count, plural, 1 {1 cadena de regles} other {# cadenes de regles} } des vores",
+        "unassign-rulechains-from-edge-action-title": "Anul·lar assignació {count, plural, =1 {1 cadena de regles} other {# cadenes de regles} } des vores",
         "assign-new-rulechain": "Assignar nova cadena de regles"
     },
     "rulenode": {
@@ -3745,7 +3745,7 @@
         "add": "Afegeix un rol",
         "view": "Mostra el rol",
         "search": "Cerca rols",
-        "selected-roles": "{ count, plural, 1 {1 role} other {# roles} } seleccionat",
+        "selected-roles": "{ count, plural, =1 {1 role} other {# roles} } seleccionat",
         "no-roles-text": "No s'han trobat rols",
         "role-details": "Detalls del rol",
         "add-role-text": "Afegeix un paper nou",
@@ -3753,8 +3753,8 @@
         "delete-roles": "Suprimir rols",
         "delete-role-title": "Esteu segur que voleu suprimir la funció '{{roleName}}'?",
         "delete-role-text": "Aneu amb compte, després de la confirmació, la funció i totes les dades relacionades es tornaran irrecuperables.",
-        "delete-roles-title": "Esteu segur que voleu suprimir { count, plural, 1 {1 role} other {# roles} }?",
-        "delete-roles-action-title": "Suprimeix { count, plural, 1 {1 role} other {# roles} }",
+        "delete-roles-title": "Esteu segur que voleu suprimir { count, plural, =1 {1 role} other {# roles} }?",
+        "delete-roles-action-title": "Suprimeix { count, plural, =1 {1 role} other {# roles} }",
         "delete-roles-text": "Aneu amb compte, després de la confirmació, tots els rols seleccionats s'eliminaran i totes les dades relacionades seran irrecuperables.",
         "role-type": "Tipus de rol",
         "role-type-required": "Cal tipus de rol.",
@@ -3793,11 +3793,11 @@
         "user-group-owner": "Propietari del grup d'usuaris",
         "edit": "Edita els permisos",
         "delete": "Suprimeix els permisos",
-        "selected-group-permissions": "{ count, plural, 1 {1 group permission} other {# group permissions} } seleccionat",
+        "selected-group-permissions": "{ count, plural, =1 {1 group permission} other {# group permissions} } seleccionat",
         "delete-group-permission-title": "Esteu segur que voleu suprimir el permís del grup '{{roleName}}'?",
         "delete-group-permission-text": "Aneu amb compte, després de la confirmació, el permís del grup i totes les dades relacionades es tornaran irrecuperables.",
         "delete-group-permission": "Suprimeix el permís de grup",
-        "delete-group-permissions-title": "Esteu segur que voleu suprimir { count, plural, 1 {1 group permission} other {# group permission} }?",
+        "delete-group-permissions-title": "Esteu segur que voleu suprimir { count, plural, =1 {1 group permission} other {# group permission} }?",
         "delete-group-permissions-text": "Aneu amb compte, després de la confirmació s'eliminaran tots els permisos de grup seleccionats i els usuaris corresponents perdran l'accés als recursos especificats.",
         "delete-group-permissions": "Suprimeix els permisos del grup",
         "add-group-permission": "Afegeix permís de grup",
@@ -3908,10 +3908,10 @@
         "view-scheduler-event": "Mostra l'esdeveniment del programador",
         "delete-scheduler-event": "Eliminar planificador d'esdeveniment",
         "no-scheduler-events": "Planificador d'esdeveniment no trobat",
-        "selected-scheduler-events": "{ count, plural, 1 {1 planificador de esdeveniments} other {# planificadors de esdeveniments} } seleccionat",
+        "selected-scheduler-events": "{ count, plural, =1 {1 planificador de esdeveniments} other {# planificadors de esdeveniments} } seleccionat",
         "delete-scheduler-event-title": "Està segur que desitja eliminar el planificador d'esdeveniments '{{schedulerEventName}}'?",
         "delete-scheduler-event-text": "Anar amb compte, després de la confirmació, el planificador d'esdeveniments i totes les dades relacionades és tornaran irrecuperables.",
-        "delete-scheduler-events-title": "Està segur que desitja eliminar { count, plural, 1 {1 planificador de esdeveniments} other {# planificadors de esdeveniments} }?",
+        "delete-scheduler-events-title": "Està segur que desitja eliminar { count, plural, =1 {1 planificador de esdeveniments} other {# planificadors de esdeveniments} }?",
         "delete-scheduler-events-text": "Anar amb compte, després de la confirmació s'eliminaran totes els planificadors d'esdeveniments seleccionats i totes les dades relacionades és tornaran irrecuperables.",
         "create": "Crear planificador d'esdeveniment",
         "edit": "Editar planificador d'esdeveniment",
@@ -3992,9 +3992,9 @@
         "seconds": "Segons",
         "time-interval-required": "Cal un interval de temps",
         "time-unit-required": "Es requereix una unitat de temps",
-        "every-hour": "cada { count, plural, 1 {hour} other {# hours} }",
-        "every-minute": "cada { count, plural, 1 {minute} other {# minutes} }",
-        "every-second": "cada { count, plural, 1 {second} other {# seconds} }",
+        "every-hour": "cada { count, plural, =1 {hour} other {# hours} }",
+        "every-minute": "cada { count, plural, =1 {minute} other {# minutes} }",
+        "every-second": "cada { count, plural, =1 {second} other {# seconds} }",
         "invalid-time": "Hora no vàlida",
         "assigned_customer": "Client assignat"
     },
@@ -4039,12 +4039,12 @@
         "name": "Nom",
         "type": "Tipus",
         "created_customer": "Creat pel client",
-        "selected-blob-entities": "{ count, plural, 1 {1 file} other {# files} } seleccionat",
+        "selected-blob-entities": "{ count, plural, =1 {1 file} other {# files} } seleccionat",
         "download-blob-entity": "Descarregar arxiu",
         "delete-blob-entity": "Eliminar arxiu",
         "delete-blob-entity-title": "Està segur de que desitja eliminar l'arxiu '{{blobEntityName}}'?",
         "delete-blob-entity-text": "Aneu amb compte, després de la confirmació, l'arxiu de dades es tornara irrecuperable.",
-        "delete-blob-entities-title": "Esteu segur que voleu suprimir { count, plural, 1 {1 file} other {# files} }?",
+        "delete-blob-entities-title": "Esteu segur que voleu suprimir { count, plural, =1 {1 file} other {# files} }?",
         "delete-blob-entities-text": "Aneu amb compte, després de la confirmació, tots els fitxers seleccionats s'eliminaran i totes les dades relacionades es tornaran irrecuperables.",
         "assigned_customer": "Client assignat"
     },
@@ -4084,9 +4084,9 @@
         "submit-strategy-type-required": "Cal estratègia d'enviament!",
         "processing-strategy-type-required": "Cal estratègia de processament!",
         "queues": "Cues",
-        "selected-queues": "{ count, plural, 1 {1 cola} other {# colas} } seleccionades",
+        "selected-queues": "{ count, plural, =1 {1 cola} other {# colas} } seleccionades",
         "delete-queue-title": "Estàs segur d'esborrar la cua '{{queueName}}'?",
-        "delete-queues-title": "Estàs segur d'esborrar { count, plural, 1 {1 cola} other {# colas} }?",
+        "delete-queues-title": "Estàs segur d'esborrar { count, plural, =1 {1 cola} other {# colas} }?",
         "delete-queue-text": "Atenció, després de la confirmació la cua i totes les seves dades relacionades seran irrecuperables.",
         "delete-queues-text": "Atenció, després de la confirmació totes les cues s'esborraran i no seran accessibles.",
         "search": "Buscar cua",
@@ -4150,8 +4150,8 @@
         "title-max-length": "El títol ha de ser inferior a 256",
         "delete-tenant-title": "Vols eliminar el propietari '{{tenantTitle}}'?",
         "delete-tenant-text": "Atenció, després de la confirmació el propietari serà eliminat i la informació relacionada serà irrecuperable.",
-        "delete-tenants-title": "Vols eliminar { count, plural, 1 {1 propietario} other {# propietarios} }?",
-        "delete-tenants-action-title": "Eliminar { count, plural, 1 {1 propietario} other {# propietarios} }",
+        "delete-tenants-title": "Vols eliminar { count, plural, =1 {1 propietario} other {# propietarios} }?",
+        "delete-tenants-action-title": "Eliminar { count, plural, =1 {1 propietario} other {# propietarios} }",
         "delete-tenants-text": "Atenció, després de la confirmació els propietaris seleccionats seran eliminats i la informació relacionada serà irrecuperable.",
         "title": "Títol",
         "title-required": "Cal títol.",
@@ -4163,7 +4163,7 @@
         "select-tenant": "Seleccionar propietari",
         "no-tenants-matching": "No hi ha propietaris que coincideixin amb '{{entity}}' .",
         "tenant-required": "Propietari",
-        "selected-tenants": "{ count, plural, 1 {1 propietario} other {# propietarios} } seleccionats",
+        "selected-tenants": "{ count, plural, =1 {1 propietario} other {# propietarios} } seleccionats",
         "search": "Buscar propietaris",
         "allow-white-labeling": "Permet l'etiqueta blanca",
         "allow-customer-white-labeling": "Permet l'etiqueta blanca del client",
@@ -4181,7 +4181,7 @@
         "no-tenant-profiles-text": "No s'han trobar perfils de propietari",
         "name-max-length": "El nom ha de ser inferior a 256",
         "search": "Buscar perfils de propietari",
-        "selected-tenant-profiles": "{ count, plural, 1 {1 perfil de propietario} other {# perfils de propietario} } seleccionats",
+        "selected-tenant-profiles": "{ count, plural, =1 {1 perfil de propietario} other {# perfils de propietario} } seleccionats",
         "no-tenant-profiles-matching": "No s'han trobat perfils del propietari que coincideixin amb '{{entity}}'.",
         "tenant-profile-required": "Cal perfil de propietari",
         "idCopiedMessage": "El ID de perfil de propietari s'ha copiat al porta-retalls",
@@ -4196,7 +4196,7 @@
         "default": "Defecte",
         "delete-tenant-profile-title": "Eliminar el perfil propietari '{{tenantProfileName}}'?",
         "delete-tenant-profile-text": "Atenció, després de la confirmació, el perfil de propietari serà borrat i la seva informació relacionada serà irrecuperable.",
-        "delete-tenant-profiles-title": "Eliminar { count, plural, 1 {1 perfil propietario} other {# perfils propietarios} }?",
+        "delete-tenant-profiles-title": "Eliminar { count, plural, =1 {1 perfil propietario} other {# perfils propietarios} }?",
         "delete-tenant-profiles-text": "Atenció, després de la confirmació, els perfils seleccionats s'eliminaran i la seva informació relacionada serà irrecuperable.",
         "set-default-tenant-profile-title": "Vols fer el perfil propietari '{{tenantProfileName}}' per defecte?",
         "set-default-tenant-profile-text": "Després de la confirmació, el perfil propietari serà marcat per defecte i serà utilitzat pels nous perfils propietaris que no tinguin perfil específic.",
@@ -4303,10 +4303,10 @@
         "ws-limit-updates-per-session": "Límit de tarifa per a les actualitzacions de WS per sessió"
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, 1 {1 segundo} other {# segons} }",
-        "minutes-interval": "{ minutes, plural, 1 {1 minuto} other {# minutos} }",
-        "hours-interval": "{ hours, plural, 1 {1 hora} other {# horas} }",
-        "days-interval": "{ days, plural, 1 {1 día} other {# dies} }",
+        "seconds-interval": "{ seconds, plural, =1 {1 segundo} other {# segons} }",
+        "minutes-interval": "{ minutes, plural, =1 {1 minuto} other {# minutos} }",
+        "hours-interval": "{ hours, plural, =1 {1 hora} other {# horas} }",
+        "days-interval": "{ days, plural, =1 {1 día} other {# dies} }",
         "days": "Dies",
         "hours": "Hores",
         "minutes": "Minuts",
@@ -4341,10 +4341,10 @@
         "days": "Dies"
     },
     "timewindow": {
-        "days": "{ days, plural, 1 { día } other {# dies } }",
-        "hours": "{ hours, plural, 0 { horas } 1 {1 hora } other {# horas } }",
-        "minutes": "{ minutes, plural, 0 { minutos } 1 {1 minuto } other {# minutos } }",
-        "seconds": "{ seconds, plural, 0 { segons } 1 {1 segundo } other {# segons } }",
+        "days": "{ days, plural, =1 { día } other {# dies } }",
+        "hours": "{ hours, plural, =0 { horas } =1 {1 hora } other {# horas } }",
+        "minutes": "{ minutes, plural, =0 { minutos } =1 {1 minuto } other {# minutos } }",
+        "seconds": "{ seconds, plural, =0 { segons } =1 {1 segundo } other {# segons } }",
         "realtime": "Temps-real",
         "history": "Històric",
         "last-prefix": "últim(s)",
@@ -4374,8 +4374,8 @@
         "delete-users": "Eliminar usuaris",
         "delete-user-title": "Eliminar l'usuari '{{userEmail}}'?",
         "delete-user-text": "Atenció, després de la confirmació l'usuari seleccionar serà eliminat i la informació relacionada serà irrecuperable.",
-        "delete-users-title": "Eliminar { count, plural, 1 {1 usuario} other {# usuaris} }?",
-        "delete-users-action-title": "Esborrar { count, plural, 1 {1 usuario} other {# usuaris} }",
+        "delete-users-title": "Eliminar { count, plural, =1 {1 usuario} other {# usuaris} }?",
+        "delete-users-action-title": "Esborrar { count, plural, =1 {1 usuario} other {# usuaris} }",
         "delete-users-text": "Atenció, després de la confirmació dels usuaris seleccionats seran eliminats i la informació relacionada serà irrecuperable.",
         "activation-email-sent-message": "Correu d'activació enviat amb èxit!",
         "resend-activation": "Reenviar activació",
@@ -4397,16 +4397,16 @@
         "activation-link-text": "Per activar l'usuari, utilitza el següent enllaç: <a href='{{activationLink}}' target='_blank'>Activar Usuari</a> :",
         "copy-activation-link": "Copiar enllaç d'activació",
         "activation-link-copied-message": "L'enllaç d'activació s'ha copiat al porta-retalls",
-        "selected-users": "{ count, plural, 1 {1 usuario} other {# usuaris} } seleccionats",
+        "selected-users": "{ count, plural, =1 {1 usuario} other {# usuaris} } seleccionats",
         "search": "Buscar usuaris",
         "details": "Detalls",
         "login-as-tenant-admin": "Iniciar sessió com a Administrador Propietari",
         "login-as-customer-user": "Iniciar sessió com a Usuari Client",
         "select-group-to-add": "Seleccioneu el grup objectiu per afegir usuaris seleccionats",
         "select-group-to-move": "Seleccioneu el grup objectiu per moure els usuaris seleccionats",
-        "remove-users-from-group": "Esteu segur que voleu eliminar-lo { count, plural, 1 {1 user} other {# users} } del grup '{{entityGroup}}'?",
+        "remove-users-from-group": "Esteu segur que voleu eliminar-lo { count, plural, =1 {1 user} other {# users} } del grup '{{entityGroup}}'?",
         "group": "Grup d'usuaris",
-        "list-of-groups": "{ count, plural, 1 {One user group} other {List of # user groups} }",
+        "list-of-groups": "{ count, plural, =1 {One user group} other {List of # user groups} }",
         "group-name-starts-with": "Grups d'usuaris els noms dels quals comencen per '{{prefix}}'",
         "disable-account": "Deshabilitar compte d'usuari",
         "enable-account": "Habilitar compte d'usuari",
@@ -4469,7 +4469,7 @@
         "previous-difference": "Anterior diferència",
         "next-difference": "Següent diferència",
         "current": "Actual",
-        "differences": "{ count, plural, 1 {1 diferencia} other {# diferencias} }",
+        "differences": "{ count, plural, =1 {1 diferencia} other {# diferencias} }",
         "create-entities-version": "Crear versió d'entitats",
         "default-sync-strategy": "Estratègia de sincronització per defecte",
         "sync-strategy-merge": "Fusionar (Merge)",
@@ -4482,7 +4482,7 @@
         "no-entities-to-restore-prompt": "Si us plau, especifica les entitats a restaurar",
         "add-entity-type": "Afegir tipus d'entitat",
         "remove-all": "Borrar tot",
-        "version-create-result": "{ added, plural, 0 {Ninguna entidad} 1 {1 entidad} other {# entidades} } afegides.<br/>{ modified, plural, 0 {Ninguna entidad} 1 {1 entidad} other {# entidades} } modificades.<br/>{ removed, plural, 0 {Ninguna entidad} 1 {1 entidad} other {# entidades} } esborrades.",
+        "version-create-result": "{ added, plural, =0 {Ninguna entidad} =1 {1 entidad} other {# entidades} } afegides.<br/>{ modified, plural, =0 {Ninguna entidad} =1 {1 entidad} other {# entidades} } modificades.<br/>{ removed, plural, =0 {Ninguna entidad} =1 {1 entidad} other {# entidades} } esborrades.",
         "remove-other-entities": "Esborrar altres entitats",
         "find-existing-entity-by-name": "Buscar entitat existent per nom",
         "restore-entities-from-version": "Restaurar entitats des de la versió '{{versionName}}'",
@@ -4641,8 +4641,8 @@
         "widgets-bundle-details": "Detalls del paquet de Widgets",
         "delete-widgets-bundle-title": "Eliminar el paquet de widgets '{{widgetsBundleTitle}}'?",
         "delete-widgets-bundle-text": "Atenció, després de la confirmació tots els paquets seleccionats seran eliminats i la seva informació relacionada serà irrecuperable.",
-        "delete-widgets-bundles-title": "Eliminar { count, plural, 1 {1 paquet de widgets} other {# paquetes de widgets} }?",
-        "delete-widgets-bundles-action-title": "Eliminar { count, plural, 1 {1 paquet de widgets} other {# paquetes de widgets} }",
+        "delete-widgets-bundles-title": "Eliminar { count, plural, =1 {1 paquet de widgets} other {# paquetes de widgets} }?",
+        "delete-widgets-bundles-action-title": "Eliminar { count, plural, =1 {1 paquet de widgets} other {# paquetes de widgets} }",
         "delete-widgets-bundles-text": "Atenció, després de la confirmació tots els paquets seleccionats seran eliminats i la informació relacionada serà irrecuperable.",
         "no-widgets-bundles-matching": "Cap paquet '{{widgetsBundle}}' trobat.",
         "widgets-bundle-required": "Cal paquet de widget.",
@@ -4654,7 +4654,7 @@
         "widgets-bundle-file": "Arxiu de paquet de widgets",
         "invalid-widgets-bundle-file-error": "Impossible importar paquet de widgets: Estructura de dades invàlida.",
         "search": "Buscar paquet de widgets",
-        "selected-widgets-bundles": "{ count, plural, 1 {1 paquet de widgets} other {# paquetes de widgets} } seleccionats",
+        "selected-widgets-bundles": "{ count, plural, =1 {1 paquet de widgets} other {# paquetes de widgets} } seleccionats",
         "open-widgets-bundle": "Obrir paquet de widgets",
         "loading-widgets-bundles": "S'estan carregant paquets de widgets..."
     },
@@ -4688,7 +4688,7 @@
         "legend": "Llegenda",
         "display-legend": "Mostrar llegenda",
         "datasources": "Set de dades",
-        "maximum-datasources": "Un màxim de { count, plural, 1 {1 set de dades és permès.} other {# set de dades són permitidos} }",
+        "maximum-datasources": "Un màxim de { count, plural, =1 {1 set de dades és permès.} other {# set de dades són permitidos} }",
         "datasource-type": "Tipus",
         "datasource-parameters": "Paràmetres",
         "remove-datasource": "Eliminar set de dades",
diff --git a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
index a194bf3a7b..3588c5ca80 100644
--- a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
+++ b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
@@ -286,17 +286,17 @@
         "acknowledge": "Přijmout",
         "clear": "Vyřešit",
         "search": "Vyhledat alarmy",
-        "selected-alarms": "Vybráno { count, plural, 1 {1 alarmů} other {# alarmů} }",
+        "selected-alarms": "Vybráno { count, plural, =1 {1 alarmů} other {# alarmů} }",
         "no-data": "Nejsou zde žádná data",
         "polling-interval": "Interval frekvence příjmu alarmů (vteřin)",
         "polling-interval-required": "Interval frekvence příjmu alarmů je povinný.",
         "min-polling-interval-message": "Minimální povolený interval frekvence příjmu alarmů je 1 vteřina.",
-        "aknowledge-alarms-title": "Přijmout { count, plural, 1 {1 alarm} other {# alarmů} }",
-        "aknowledge-alarms-text": "Jste si jisti že chcete přijmout { count, plural, 1 {1 alarm} other {# alarmů} }?",
+        "aknowledge-alarms-title": "Přijmout { count, plural, =1 {1 alarm} other {# alarmů} }",
+        "aknowledge-alarms-text": "Jste si jisti že chcete přijmout { count, plural, =1 {1 alarm} other {# alarmů} }?",
         "aknowledge-alarm-title": "Přijmout alarm",
         "aknowledge-alarm-text": "Jste si jisti, že chcete přijmout alarm?",
-        "clear-alarms-title": "Odstranit { count, plural, 1 {1 alarm} other {# alarmů} }",
-        "clear-alarms-text": "Jste si jisti, že chcete odstranit { count, plural, 1 {1 alarm} other {# alarmů} }?",
+        "clear-alarms-title": "Odstranit { count, plural, =1 {1 alarm} other {# alarmů} }",
+        "clear-alarms-text": "Jste si jisti, že chcete odstranit { count, plural, =1 {1 alarm} other {# alarmů} }?",
         "clear-alarm-title": "Odstranit alarm",
         "clear-alarm-text": "Jste si jisti, že chcete alarm odstranit?",
         "alarm-status-filter": "Filtr stavu alarmu",
@@ -400,17 +400,17 @@
         "add-asset-text": "Přidat nové aktivum",
         "asset-details": "Detail aktiva",
         "assign-assets": "Přiřadit aktiva",
-        "assign-assets-text": "Přiřadit { count, plural, 1 {1 aktivum} other {# aktiva} } zákazníkovi",
+        "assign-assets-text": "Přiřadit { count, plural, =1 {1 aktivum} other {# aktiva} } zákazníkovi",
         "assign-asset-to-edge-title": "Přiřadit aktivum(a) k edge",
         "assign-asset-to-edge-text":"Zvolte prosím aktiva, která mají být přiřazena k edge",
         "delete-assets": "Smazat aktiva",
         "unassign-assets": "Odebrat aktiva",
-        "unassign-assets-action-title": "Odebrat { count, plural, 1 {1 aktivum} other {# aktiva} } zákazníkovi",
+        "unassign-assets-action-title": "Odebrat { count, plural, =1 {1 aktivum} other {# aktiva} } zákazníkovi",
         "assign-new-asset": "Přiřadit nové aktivum",
         "delete-asset-title": "Jste si jisti, že chcete smazat aktivum '{{assetName}}'?",
         "delete-asset-text": "Buďte opatrní, protože po potvrzení nebude možné aktivum ani žádná související data obnovit.",
-        "delete-assets-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 aktivum} other {# aktiva} }?",
-        "delete-assets-action-title": "Smazat { count, plural, 1 {1 aktivum} other {# aktiva} }",
+        "delete-assets-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 aktivum} other {# aktiva} }?",
+        "delete-assets-action-title": "Smazat { count, plural, =1 {1 aktivum} other {# aktiva} }",
         "delete-assets-text": "Buďte opatrní, protože po potvrzení budou všechna vybraná aktiva odstraněna a žádná související data nebude možné obnovit.",
         "make-public-asset-title": "Jste si jisti, že chcete aktivum '{{assetName}}' zveřejnit?",
         "make-public-asset-text": "Po potvrzení se aktivum a všechna související data stanou veřejnými a dostupnými pro ostatní.",
@@ -419,7 +419,7 @@
         "unassign-asset-title": "Jste si jisti, že chcete odebrat aktivum '{{assetName}}'?",
         "unassign-asset-text": "Po potvrzení bude aktivum odebráno a nebude pro zákazníka dostupné.",
         "unassign-asset": "Odebrat aktivum",
-        "unassign-assets-title": "Jste si jisti, že chcete odebrat { count, plural, 1 {1 aktivum} other {# aktiva} }?",
+        "unassign-assets-title": "Jste si jisti, že chcete odebrat { count, plural, =1 {1 aktivum} other {# aktiva} }?",
         "unassign-assets-text": "Po potvrzení budou všechna vybraná aktiva odebrána a nebudou pro zákazníka dostupná.",
         "unassign-assets-from-edge": "Odebrat aktiva edge",
         "copyId": "Kopírovat Id aktiva",
@@ -437,9 +437,9 @@
         "unassign-asset-from-edge": "Odebrat aktiva",
         "unassign-asset-from-edge-title": "Jste si jisti, že chcete odebrat aktivum '{{assetName}}'?",
         "unassign-asset-from-edge-text": "Po potvrzení bude aktivum odebráno a nebude pro edge dostupné.",
-        "unassign-assets-from-edge-title": "Jste si jisti, že chcete odebrat { count, plural, 1 {1 aktivum} other {# aktiva} }?",
+        "unassign-assets-from-edge-title": "Jste si jisti, že chcete odebrat { count, plural, =1 {1 aktivum} other {# aktiva} }?",
         "unassign-assets-from-edge-text": "Po potvrzení budou všechna aktiva odebrána a nebudou pro edge dostupná.",
-        "selected-assets": "Vybráno { count, plural, 1 {1 aktiv} other {# aktiv} }"
+        "selected-assets": "Vybráno { count, plural, =1 {1 aktiv} other {# aktiv} }"
     },
     "attribute": {
         "attributes": "Atributy",
@@ -455,7 +455,7 @@
         "key-required": "atribut klíč je povinný.",
         "value": "Hodnota",
         "value-required": "Atribut hodnota je povinný.",
-        "delete-attributes-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 atribut} other {# atributů} }?",
+        "delete-attributes-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 atribut} other {# atributů} }?",
         "delete-attributes-text": "Buďte opatrní, protože po potvrzení budou všechny vybrané atributy odstraněny.",
         "delete-attributes": "Smazat atributy",
         "enter-attribute-value": "Zadejte hodnotu atributu",
@@ -465,8 +465,8 @@
         "prev-widget": "Předchozí widget",
         "add-to-dashboard": "Přidat na dashboard",
         "add-widget-to-dashboard": "Přidat widget na dashboard",
-        "selected-attributes": "Vybráno { count, plural, 1 {1 atributů} other {# atributů} }",
-        "selected-telemetry": "Vybráno { count, plural, 1 {1 jednotek telemetrie} other {# jednotek telemetrie} }",
+        "selected-attributes": "Vybráno { count, plural, =1 {1 atributů} other {# atributů} }",
+        "selected-telemetry": "Vybráno { count, plural, =1 {1 jednotek telemetrie} other {# jednotek telemetrie} }",
         "no-attributes-text": "Žádné atributy nebyly nalezeny",
         "no-telemetry-text": "Žádná telemetrie nebyla nalezena"
     },
@@ -639,8 +639,8 @@
         "customer-details": "Detail zákazníka",
         "delete-customer-title": "Jste si jisti, že chcete smazat zákazníka '{{customerTitle}}'?",
         "delete-customer-text": "Buďte opatrní, protože po potvrzení nebude možné zákazníka ani žádná související data obnovit.",
-        "delete-customers-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 zákazníka} other {# zákazníků} }?",
-        "delete-customers-action-title": "Smazat { count, plural, 1 {1 zákazníka} other {# zákazníků} }",
+        "delete-customers-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 zákazníka} other {# zákazníků} }?",
+        "delete-customers-action-title": "Smazat { count, plural, =1 {1 zákazníka} other {# zákazníků} }",
         "delete-customers-text": "Buďte opatrní, protože po potvrzení budou všichni vybraní zákazníci odstraněni a žádná související data nebude možné obnovit.",
         "manage-users": "Spravovat uživatele",
         "manage-assets": "Spravovat aktiva",
@@ -660,7 +660,7 @@
         "default-customer": "Defaultní zákazník",
         "default-customer-required": "Aby bylo možné ladit dashboard na úrovni tenanta, je nutné zadat defaultního zákazníka.",
         "search": "Vyhledat zákazníky",
-        "selected-customers": "Vybráno { count, plural, 1 {1 zákazníků} other {# zákazníků} }",
+        "selected-customers": "Vybráno { count, plural, =1 {1 zákazníků} other {# zákazníků} }",
         "edges": "Edge instance zákazníka",
         "manage-edges": "Spravovat edge"
     },
@@ -708,20 +708,20 @@
         "add-dashboard-text": "Přidat nový dashboard",
         "assign-dashboards": "Přiřadit dashboardy",
         "assign-new-dashboard": "Přiřadit nový dashboard",
-        "assign-dashboards-text": "Přiřadit { count, plural, 1 {1 dashboard} other {# dashboardů} } zákazníkům",
-        "unassign-dashboards-action-text": "Odebrat { count, plural, 1 {1 dashboard} other {# dashboardů} } zákazníkům",
+        "assign-dashboards-text": "Přiřadit { count, plural, =1 {1 dashboard} other {# dashboardů} } zákazníkům",
+        "unassign-dashboards-action-text": "Odebrat { count, plural, =1 {1 dashboard} other {# dashboardů} } zákazníkům",
         "delete-dashboards": "Smazat dashboardy",
         "unassign-dashboards": "Odebrat dashboardy",
-        "unassign-dashboards-action-title": "Odebrat { count, plural, 1 {1 dashboard} other {# dashboardů} } zákazníkovi",
+        "unassign-dashboards-action-title": "Odebrat { count, plural, =1 {1 dashboard} other {# dashboardů} } zákazníkovi",
         "delete-dashboard-title": "Jste si jisti, že chcete odstranit dashboard '{{dashboardTitle}}'?",
         "delete-dashboard-text": "Buďte opatrní, protože po potvrzení nebude možné dashboard ani žádná související data obnovit.",
-        "delete-dashboards-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 dashboard} other {# dashboardů} }?",
-        "delete-dashboards-action-title": "Smazat { count, plural, 1 {1 dashboard} other {# dashboardů} }",
+        "delete-dashboards-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 dashboard} other {# dashboardů} }?",
+        "delete-dashboards-action-title": "Smazat { count, plural, =1 {1 dashboard} other {# dashboardů} }",
         "delete-dashboards-text": "Buďte opatrní, protože po potvrzení budou všechny vybrané dashboardy smazány a žádná související data nebude možné obnovit.",
         "unassign-dashboard-title": "Jste si jistí, že chcete odebrat dashboard '{{dashboardTitle}}'?",
         "unassign-dashboard-text": "Po potvrzení bude dashboard odebrán a nebude pro zákazníka dostupný.",
         "unassign-dashboard": "Odebrat dashboard",
-        "unassign-dashboards-title": "Jste si jisti, že chcete odebrat { count, plural, 1 {1 dashboard} other {# dashboardů} }?",
+        "unassign-dashboards-title": "Jste si jisti, že chcete odebrat { count, plural, =1 {1 dashboard} other {# dashboardů} }?",
         "unassign-dashboards-text": "Po potvrzení budou všechny vybrané dashboardy odebrány a nebudou pro zákazníka dostupné.",
         "public-dashboard-title": "Dashboard je nyní veřejný",
         "public-dashboard-text": "Váš dashboard <b>{{dashboardTitle}}</b> je nyní veřejný a dostupný prostřednictvím následujícího veřejného <a href='{{publicLink}}' target='_blank'>odkazu</a>:",
@@ -813,7 +813,7 @@
         "manage-states": "Spravovat stavy dashboardu",
         "states": "Stavy dashboardu",
         "search-states": "Vyhledat stavy dashboardu",
-        "selected-states": "Vybráno { count, plural, 1 {1 stavů dashboardu} other {# stavů dashboardu} }",
+        "selected-states": "Vybráno { count, plural, =1 {1 stavů dashboardu} other {# stavů dashboardu} }",
         "edit-state": "Editovat stav dashboardu",
         "delete-state": "Smazat stav dashboardu",
         "add-state": "Přidat stav dashboardu",
@@ -832,11 +832,11 @@
         "select-state": "Vybrat cílový stav",
         "state-controller": "Kontrolér stavu",
         "search": "Vyhledat dashboardy",
-        "selected-dashboards": "Vybráno { count, plural, 1 {1 dashboardů} other {# dashboardů} }",
+        "selected-dashboards": "Vybráno { count, plural, =1 {1 dashboardů} other {# dashboardů} }",
         "home-dashboard": " Výchozí dashboard",
         "home-dashboard-hide-toolbar": "Skrýt nástrojovou lištu na výhochozím dashboardu",
         "unassign-dashboard-from-edge-text": "Po potvrzení bude dashboard odebrán a nebude pro edge dostupný.",
-        "unassign-dashboards-from-edge-title": "Jste si jisti, že chcete odebrat { count, plural, 1 {1 dashboard} other {# dashboardů} }?",
+        "unassign-dashboards-from-edge-title": "Jste si jisti, že chcete odebrat { count, plural, =1 {1 dashboard} other {# dashboardů} }?",
         "unassign-dashboards-from-edge-text": "Po potvrzení budou všechny vybrané dashboardy odebrány a nebudou pro edge dostupné.",
         "assign-dashboard-to-edge": "Přiřadit dashboard(y) k edge",
         "assign-dashboard-to-edge-text": "Zvolte prosím dashboardy, které mají být přiřazeny k edge"
@@ -858,11 +858,11 @@
         "timeseries-required": "Časové řady entity jsou povinné.",
         "timeseries-or-attributes-required": "Časové řady / atributy entity jsou povinné.",
         "alarm-fields-timeseries-or-attributes-required": "Pole alarmu nebo časové řady / atributy jsou povinné.",
-        "maximum-timeseries-or-attributes": "Maximálně { count, plural, 1 {1 časová řada/atribut je povolena.} other {# časových řad/atributů je povoleno} }",
+        "maximum-timeseries-or-attributes": "Maximálně { count, plural, =1 {1 časová řada/atribut je povolena.} other {# časových řad/atributů je povoleno} }",
         "alarm-fields-required": "Pole alarmu jsou povinná.",
         "function-types": "Typy funkcí",
         "function-types-required": "Typy funkcí jsou povinné.",
-        "maximum-function-types": "Maximálně { count, plural, 1 {1 typ funkce je povolen.} other {# typů funkce je povoleno} }",
+        "maximum-function-types": "Maximálně { count, plural, =1 {1 typ funkce je povolen.} other {# typů funkce je povoleno} }",
         "time-description": "Časová značka aktuální hodnoty;",
         "value-description": "Aktuální hodnota;",
         "prev-value-description": "Výsledek předchozího volání funkce;",
@@ -925,11 +925,11 @@
         "manage-credentials": "Spravovat přístupové údaje",
         "delete": "Smazat zařízení",
         "assign-devices": "Přiřadit zařízení",
-        "assign-devices-text": "Přiřadit { count, plural, 1 {1 zařízení} other {# zařízení} } zákazníkovi",
+        "assign-devices-text": "Přiřadit { count, plural, =1 {1 zařízení} other {# zařízení} } zákazníkovi",
         "delete-devices": "Smazat zařízení",
         "unassign-from-customer": "Odebrat zákazníkovi",
         "unassign-devices": "Odebrat zařízení",
-        "unassign-devices-action-title": "Odebrat { count, plural, 1 {1 zařízení} other {# zařízení} } zákazníkovi",
+        "unassign-devices-action-title": "Odebrat { count, plural, =1 {1 zařízení} other {# zařízení} } zákazníkovi",
         "unassign-device-from-edge-title": "Jste si jisti, že chcete odebrat zařízení '{{deviceName}}'?",
         "unassign-device-from-edge-text": "Po potvrzení bude zařízení odebráno a nebude pro edge dostupné.",
         "unassign-devices-from-edge": "Odebrat zařízení edge",
@@ -941,13 +941,13 @@
         "view-credentials": "Zobrazit přístupové údaje",
         "delete-device-title": "Jste si jisti, že chcete smazat zařízení '{{deviceName}}'?",
         "delete-device-text": "Buďte opatrní, protože po potvrzení nebude možné zařízení ani žádná související data obnovit.",
-        "delete-devices-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 zařízení} other {# zařízení} }?",
-        "delete-devices-action-title": "Smazat { count, plural, 1 {1 zařízení} other {# zařízení} }",
+        "delete-devices-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 zařízení} other {# zařízení} }?",
+        "delete-devices-action-title": "Smazat { count, plural, =1 {1 zařízení} other {# zařízení} }",
         "delete-devices-text": "Buďte opatrní, protože po potvrzení budou vybraná zařízení odstraněna a žádná související data nebude možné obnovit.",
         "unassign-device-title": "Jste si jisti, že chcete odebrat zařízení '{{deviceName}}'?",
         "unassign-device-text": "Po potvrzení bude zařízení odebráno a nebude pro zákazníka dostupné.",
         "unassign-device": "Odebrat zařízení",
-        "unassign-devices-title": "Jste si jisti, že chcete odebrat { count, plural, 1 {1 zařízení} other {# zařízení} }?",
+        "unassign-devices-title": "Jste si jisti, že chcete odebrat { count, plural, =1 {1 zařízení} other {# zařízení} }?",
         "unassign-devices-text": "Po potvrzení budou všechna vybraná zařízení odebrána a nebudou pro zákazníka dostupná.",
         "device-credentials": "Přístupové údaje zařízení",
         "loading-device-credentials": "Nahrávám přístupové údaje zařízení...",
@@ -1014,7 +1014,7 @@
         "import": "Importovat zařízení",
         "device-file": "Soubor zařízení",
         "search": "Vyhledat zařízení",
-        "selected-devices": "Vybráno { count, plural, 1 {1 zařízení} other {# zařízení} }",
+        "selected-devices": "Vybráno { count, plural, =1 {1 zařízení} other {# zařízení} }",
         "device-configuration": "Konfigurace zařízení",
         "transport-configuration": "Konfigurace přenosu",
         "wizard": {
@@ -1026,7 +1026,7 @@
             "customer-to-assign-device": "Přiřadit zařízení zákazníkovi",
             "add-credentials": "Přidat přístupový údaj"
         },
-        "unassign-devices-from-edge-title": "Jste se jisti, že chcete odebrat { count, plural, 1 {1 zařízení} other {# zařízení} }?",
+        "unassign-devices-from-edge-title": "Jste se jisti, že chcete odebrat { count, plural, =1 {1 zařízení} other {# zařízení} }?",
         "unassign-devices-from-edge-text": "Po potvrzení budou všechna vybraná zařízení odebrána a nebudou pro edge dostupná."
     },
     "device-profile": {
@@ -1038,7 +1038,7 @@
         "device-profile-details": "Detail profilu zařízení",
         "no-device-profiles-text": "Žádné profily zařízení nebyly nalezeny",
         "search": "Vyhledat profily zařízení",
-        "selected-device-profiles": "Vybráno { count, plural, 1 {1 profil zařízení} other {# profilů zařízení} }",
+        "selected-device-profiles": "Vybráno { count, plural, =1 {1 profil zařízení} other {# profilů zařízení} }",
         "no-device-profiles-matching": "Žádný profil zařízení odpovídající '{{entity}}' nebyl nalezen.",
         "device-profile-required": "Profil zařízení je povinný",
         "idCopiedMessage": "Id profilu zařízení bylo zkopírováno do schránky",
@@ -1075,7 +1075,7 @@
         "select-queue-hint": "Vyberte z rozbalovacího seznamu nebo přidejte vlastní název.",
         "delete-device-profile-title": "Jste si jisti, že chcete smazat profil zařízení '{{deviceProfileName}}'?",
         "delete-device-profile-text": "Buďte opatrní, protože po potvrzení nebude možné profil zařízení ani žádná související data obnovit.",
-        "delete-device-profiles-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 profil zařízení} other {# profilů zařízení} }?",
+        "delete-device-profiles-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 profil zařízení} other {# profilů zařízení} }?",
         "delete-device-profiles-text": "Buďte opatrní, protože po potvrzení budou všechny vybrané profily zařízení odstraněny a žádná související data nebude možné obnovit.",
         "set-default-device-profile-title": "Jste si jisti, že chcete profil zařízení '{{deviceProfileName}}' učinit defaultním?",
         "set-default-device-profile-text": "Po potvrzení bude profil zařízení označen jako defaultní a bude použit pro nová zařízení bez specifikovaného profilu.",
@@ -1186,8 +1186,8 @@
         "condition-repeating-value-range": "Počet událostí musí být v rozsahu od 1 do 2147483647.",
         "condition-repeating-value-pattern": "Počet událostí musí být celé číslo.",
         "condition-repeating-value-required": "Počet událostí je povinný.",
-        "condition-repeat-times": "Opakování { count, plural, 1 {1 krát} other {# krát} }",
-        "condition-repeat-times-dynamic": "Opakování \"{ attribute }\" ({ count, plural, 1 {1 krát} other {# krát} })",
+        "condition-repeat-times": "Opakování { count, plural, =1 {1 krát} other {# krát} }",
+        "condition-repeat-times-dynamic": "Opakování \"{ attribute }\" ({ count, plural, =1 {1 krát} other {# krát} })",
         "schedule-type": "Typ plánovače",
         "schedule-type-required": "Typ plánovače je povinný.",
         "schedule": "Časový plán",
@@ -1385,7 +1385,7 @@
       "delete": "Odstranit edge",
       "delete-edge-title": "Jste si jisti, že chcete odstranit edge '{{edgeName}}'?",
       "delete-edge-text": "Buďte opatrní, protože po potvrzení odstranění nebude možné edge ani žádná související data obnovit.",
-      "delete-edges-title": "Jste si jisti, že chcete odstranit { count, plural, 1 {1 edge} other {# edge} }?",
+      "delete-edges-title": "Jste si jisti, že chcete odstranit { count, plural, =1 {1 edge} other {# edge} }?",
       "delete-edges-text": "Buďte opatrní, protože po potvrzení odstranění budou všechny vybrané edge odstraněny a žádná související data nebude možné obnovit.",
       "name": "Název",
       "name-starts-with": "Název edge začíná",
@@ -1412,7 +1412,7 @@
       "unassign-from-customer": "Odebrat zákazníkovi",
       "unassign-edge-title": "Jste si jisti, že chcete odebrat edge '{{edgeName}}'?",
       "unassign-edge-text": "Po potvrzení bude edge odebrána a nebude pro zákazníka dostupná.",
-      "unassign-edges-title": "Jste si jisti, že chcete odebrat { count, plural, 1 {1 edge} other {# edge} }?",
+      "unassign-edges-title": "Jste si jisti, že chcete odebrat { count, plural, =1 {1 edge} other {# edge} }?",
       "unassign-edges-text": "Po potvrzení budou všechny vybrané edge odebrány a nebudou pro zákazníka dostupné.",
       "make-public": "Zveřejnit edge",
       "make-public-edge-title": "Jste si jisti, že chcete edge '{{edgeName}}' zveřejnit?",
@@ -1445,7 +1445,7 @@
       "rulechain-templates": "Šablony řetězů pravidel",
       "rulechains": "Řetězy pravidel",
       "search": "Vyhledat edge",
-      "selected-edges": "{ count, plural, 1 {1 edge} other {# edge} } vybráno",
+      "selected-edges": "{ count, plural, =1 {1 edge} other {# edge} } vybráno",
       "any-edge": "Všechny edge",
       "no-edge-types-matching": "Žádné edge odpovídající '{{entitySubtype}}' nebyly nalezeny.",
       "edge-type-list-empty": "Nebyly zvoleny žádné edge.",
@@ -1545,66 +1545,66 @@
         "type-required": "Typ entity je povinný.",
         "type-device": "Zařízení",
         "type-devices": "Zařízení",
-        "list-of-devices": "{ count, plural, 1 {Jedno zařízení} other {Seznam # zařízení} }",
+        "list-of-devices": "{ count, plural, =1 {Jedno zařízení} other {Seznam # zařízení} }",
         "device-name-starts-with": "Zařízení, jejichž název začíná '{{prefix}}'",
         "type-device-profile": "Profil zařízení",
         "type-device-profiles": "Profily zařízení",
-        "list-of-device-profiles": "{ count, plural, 1 {Jeden profil zařízení} other {Seznam # profilů zařízení} }",
+        "list-of-device-profiles": "{ count, plural, =1 {Jeden profil zařízení} other {Seznam # profilů zařízení} }",
         "device-profile-name-starts-with": "Profily zařízení, jejichž název začíná '{{prefix}}'",
         "type-asset": "Aktivum",
         "type-assets": "Aktiva",
-        "list-of-assets": "{ count, plural, 1 {Jedno aktivum} other {Seznam # aktiv} }",
+        "list-of-assets": "{ count, plural, =1 {Jedno aktivum} other {Seznam # aktiv} }",
         "asset-name-starts-with": "Aktiva, jejichž název začíná '{{prefix}}'",
         "type-entity-view": "Entitní pohled",
         "type-entity-views": "Entitní pohledy",
-        "list-of-entity-views": "{ count, plural, 1 {Jeden entitní pohled} other {Seznam # entitních pohledů} }",
+        "list-of-entity-views": "{ count, plural, =1 {Jeden entitní pohled} other {Seznam # entitních pohledů} }",
         "entity-view-name-starts-with": "Entitní pohledy, jejichž název začíná '{{prefix}}'",
         "type-rule": "Pravidlo",
         "type-rules": "Pravidla",
-        "list-of-rules": "{ count, plural, 1 {Jedno pravidlo} other {Seznam # pravidel} }",
+        "list-of-rules": "{ count, plural, =1 {Jedno pravidlo} other {Seznam # pravidel} }",
         "rule-name-starts-with": "Pravidla, jejichž název začíná '{{prefix}}'",
         "type-plugin": "Zásuvný modul",
         "type-plugins": "Zásuvné moduly",
-        "list-of-plugins": "{ count, plural, 1 {Jeden zásuvný modul} other {Seznam # zásuvných modulů} }",
+        "list-of-plugins": "{ count, plural, =1 {Jeden zásuvný modul} other {Seznam # zásuvných modulů} }",
         "plugin-name-starts-with": "Zásuvné moduly, jejichž název začíná '{{prefix}}'",
         "type-tenant": "Tenant",
         "type-tenants": "Tenanti",
-        "list-of-tenants": "{ count, plural, 1 {Jeden tenant} other {Seznam # tenantů} }",
+        "list-of-tenants": "{ count, plural, =1 {Jeden tenant} other {Seznam # tenantů} }",
         "tenant-name-starts-with": "Tenanti, jejichž název začíná '{{prefix}}'",
         "type-tenant-profile": "Profil tenanta",
         "type-tenant-profiles": "Profily tenantů",
-        "list-of-tenant-profiles": "{ count, plural, 1 {Jeden profil tenanta} other {Seznam # profilů tenantů} }",
+        "list-of-tenant-profiles": "{ count, plural, =1 {Jeden profil tenanta} other {Seznam # profilů tenantů} }",
         "tenant-profile-name-starts-with": "Profily tenantů, jejichž název začíná '{{prefix}}'",
         "type-customer": "Zákazník",
         "type-customers": "Zákazníci",
-        "list-of-customers": "{ count, plural, 1 {Jeden zákazník} other {Seznam # zákazníků} }",
+        "list-of-customers": "{ count, plural, =1 {Jeden zákazník} other {Seznam # zákazníků} }",
         "customer-name-starts-with": "Zákazníci, jejichž název začíná '{{prefix}}'",
         "type-user": "Uživatel",
         "type-users": "Uživatelé",
-        "list-of-users": "{ count, plural, 1 {Jeden uživatel} other {Seznam # uživatelů} }",
+        "list-of-users": "{ count, plural, =1 {Jeden uživatel} other {Seznam # uživatelů} }",
         "user-name-starts-with": "Uživatelé, jejichž název začíná '{{prefix}}'",
         "type-dashboard": "Dashboard",
         "type-dashboards": "Dashboardy",
-        "list-of-dashboards": "{ count, plural, 1 {Jeden dashboard} other {Seznam # dashboardů} }",
+        "list-of-dashboards": "{ count, plural, =1 {Jeden dashboard} other {Seznam # dashboardů} }",
         "dashboard-name-starts-with": "Dashboardy, jejichž název začíná '{{prefix}}'",
         "type-alarm": "Alarm",
         "type-alarms": "Alarmy",
-        "list-of-alarms": "{ count, plural, 1 {Jeden alarm} other {Seznam # alarmů} }",
+        "list-of-alarms": "{ count, plural, =1 {Jeden alarm} other {Seznam # alarmů} }",
         "alarm-name-starts-with": "Alarmy, jejichž název začíná '{{prefix}}'",
         "type-rulechain": "Řetěz pravidel",
         "type-rulechains": "Řetězy pravidel",
-        "list-of-rulechains": "{ count, plural, 1 {Jeden řetěz pravidel} other {Seznam # řetězů pravidel} }",
+        "list-of-rulechains": "{ count, plural, =1 {Jeden řetěz pravidel} other {Seznam # řetězů pravidel} }",
         "rulechain-name-starts-with": "Řetězy pravidel, jejichž název začíná '{{prefix}}'",
         "type-rulenode": "Uzel pravidla",
         "type-rulenodes": "Uzly pravidel",
-        "list-of-rulenodes": "{ count, plural, 1 {Jeden uzel pravidla} other {Seznam # uzlů pravidel} }",
+        "list-of-rulenodes": "{ count, plural, =1 {Jeden uzel pravidla} other {Seznam # uzlů pravidel} }",
         "rulenode-name-starts-with": "Uzly pravidel, jejichž název začíná '{{prefix}}'",
         "type-current-customer": "Stávající zákazník",
         "type-current-tenant": "Stávající tenant",
         "type-current-user": "Stávající uživatel",
         "type-current-user-owner": "Vlastník stávajícího uživatele",
         "search": "Vyhledat entity",
-        "selected-entities": "{ count, plural, 1 {1 entita} other {# entit} } zvoleno",
+        "selected-entities": "{ count, plural, =1 {1 entita} other {# entit} } zvoleno",
         "entity-name": "Název entity",
         "entity-label": "Označení entity",
         "details": "Detail entity",
@@ -1614,7 +1614,7 @@
         "type-api-usage-state": "Stav využití API",
         "type-edge": "Edge",
         "type-edges": "Edge",
-        "list-of-edges": "{ count, plural, 1 {Jedna edge} other {Seznam # edge} }",
+        "list-of-edges": "{ count, plural, =1 {Jedna edge} other {Seznam # edge} }",
         "edge-name-starts-with": "Edge, jejichž název začíná '{{prefix}}'",
         "type-tb-resource": "Zdroj",
         "type-ota-package": "OTA balíček"
@@ -1677,21 +1677,21 @@
         "add-entity-view-text": "Přidat nový entitní pohled",
         "delete": "Smazat entitní pohled",
         "assign-entity-views": "Přiřadit entitní pohledy",
-        "assign-entity-views-text": "Přiřadit { count, plural, 1 {1 entitní pohled} other {# entitních pohledů} } zákazníkovi",
+        "assign-entity-views-text": "Přiřadit { count, plural, =1 {1 entitní pohled} other {# entitních pohledů} } zákazníkovi",
         "delete-entity-views": "Smazat entitní pohledy",
         "unassign-from-customer": "Odebrat zákazníkovi",
         "unassign-entity-views": "Odebrat entitní pohledy",
-        "unassign-entity-views-action-title": "Odebrat { count, plural, 1 {1 entitní pohled} other {# entitních pohledů} } zákazníkovi",
+        "unassign-entity-views-action-title": "Odebrat { count, plural, =1 {1 entitní pohled} other {# entitních pohledů} } zákazníkovi",
         "assign-new-entity-view": "Přiřadit nový entitní pohled",
         "delete-entity-view-title": "Jste si jisti, že chcete smazat entitní pohled '{{entityViewName}}'?",
         "delete-entity-view-text": "Buďte opatrní, protože po potvrzení nebude možné entitní pohled ani žádná související data obnovit.",
-        "delete-entity-views-title": "Jste si jisti, že chcete odstranit entitní pohled { count, plural, 1 {1 entitní pohled} other {# entitních pohledů} }?",
-        "delete-entity-views-action-title": "Smazat { count, plural, 1 {1 entitní pohled} other {# entitních pohledů} }",
+        "delete-entity-views-title": "Jste si jisti, že chcete odstranit entitní pohled { count, plural, =1 {1 entitní pohled} other {# entitních pohledů} }?",
+        "delete-entity-views-action-title": "Smazat { count, plural, =1 {1 entitní pohled} other {# entitních pohledů} }",
         "delete-entity-views-text": "Buďte opatrní, protože po potvrzení budou všechny vybrané entitní pohledy smazány a žádná související data nebude možné obnovit.",
         "unassign-entity-view-title": "Jste si jisti, že chcete odebrat entitní pohled '{{entityViewName}}'?",
         "unassign-entity-view-text": "Po potvrzení bude entitní pohled odebrán a nebude pro zákazníka dostupný.",
         "unassign-entity-view": "Odebrat entitní pohled",
-        "unassign-entity-views-title": "Jste si jisti, že chcete odebrat { count, plural, 1 {1 entitní pohled} other {# entitních pohledů} }?",
+        "unassign-entity-views-title": "Jste si jisti, že chcete odebrat { count, plural, =1 {1 entitní pohled} other {# entitních pohledů} }?",
         "unassign-entity-views-text": "Po potvrzení budou všechny vybrané entitní pohledy odebrány a nebudou pro zákazníka dostupné.",
         "entity-view-type": "Typ entitního pohledu",
         "entity-view-type-required": "Typ entitního pohledu je povinný.",
@@ -1741,9 +1741,9 @@
         "assign-entity-view-to-edge-text":"Zvolte prosím entitní pohledy, které mají být přiřazeny k edge",
         "unassign-entity-view-from-edge-title": "Jste si jisti, že chcete odebrat entitní pohled '{{entityViewName}}'?",
         "unassign-entity-view-from-edge-text": "Po potvrzení bude entitní pohled odebrán a nebude pro edge dostupný.",
-        "unassign-entity-views-from-edge-action-title": "Odebrat { count, plural, 1 {1 entitní pohled} other {# entitních pohledů} } from edge",
+        "unassign-entity-views-from-edge-action-title": "Odebrat { count, plural, =1 {1 entitní pohled} other {# entitních pohledů} } from edge",
         "unassign-entity-view-from-edge": "Odebrat entitní pohled",
-        "unassign-entity-views-from-edge-title": "Jste si jisti, že chcete odebrat { count, plural, 1 {1 entitní pohled} other {# entitních pohledů} }?",
+        "unassign-entity-views-from-edge-title": "Jste si jisti, že chcete odebrat { count, plural, =1 {1 entitní pohled} other {# entitních pohledů} }?",
         "unassign-entity-views-from-edge-text": "Po potvrzení budou všechny vybrané entitní pohledy odebrány a nebudou pro edge dostupné."
     },
     "event": {
@@ -1784,7 +1784,7 @@
     },
     "extension": {
         "extensions": "Rozšíření",
-        "selected-extensions": "Vybráno { count, plural, 1 {1 rozšíření} other {# rozšíření} }",
+        "selected-extensions": "Vybráno { count, plural, =1 {1 rozšíření} other {# rozšíření} }",
         "type": "Typ",
         "key": "Klíč",
         "value": "Hodnota",
@@ -1798,7 +1798,7 @@
         "edit": "Editovat rozšíření",
         "delete-extension-title": "Jste si jisti, že chcete smazat rozšíření '{{extensionId}}'?",
         "delete-extension-text": "Buďte opatrní, protože po potvrzení nebude možné rozšíření ani související data obnovit.",
-        "delete-extensions-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 rozšíření} other {# rozšíření} }?",
+        "delete-extensions-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 rozšíření} other {# rozšíření} }?",
         "delete-extensions-text": "Buďte opatrní, protože po potvrzení budou všechna vybraná rozšíření odstraněna.",
         "converters": "Převodník",
         "converter-id": "Id převodníku",
@@ -2115,8 +2115,8 @@
     "grid": {
         "delete-item-title": "Jste si jisti, že chcete smazat tuto položku?",
         "delete-item-text": "Buďte opatrní, protože po potvrzení nebude možné tuto položku ani žádná související data obnovit.",
-        "delete-items-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 položku} other {# položek} }?",
-        "delete-items-action-title": "Smazat { count, plural, 1 {1 položku} other {# položek} }",
+        "delete-items-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 položku} other {# položek} }?",
+        "delete-items-action-title": "Smazat { count, plural, =1 {1 položku} other {# položek} }",
         "delete-items-text": "Buďte opatrní, protože po potvrzení budou všechny vybrané položky odstraněny a žádná související data nebude možné obnovit.",
         "add-item-text": "Přidat novou položku",
         "no-items-text": "Žádné položky nebyly nalezeny",
@@ -2256,8 +2256,8 @@
       "checksum-hint": "Jestliže je checksum prádzná, bude automaticky vygenerována",
       "checksum-algorithm": "Checksum algoritmus",
       "checksum-copied-message": "Checksum balíčku byla zkopírována do schránky",
-      "change-firmware": "Změna firmware může způsobit aktualizaci { count, plural, 1 {1 zařízení} other {# zařízení} }.",
-      "change-software": "Změna software může způsobit aktualizaci { count, plural, 1 {1 zařízení} other {# zařízení} }.",
+      "change-firmware": "Změna firmware může způsobit aktualizaci { count, plural, =1 {1 zařízení} other {# zařízení} }.",
+      "change-software": "Změna software může způsobit aktualizaci { count, plural, =1 {1 zařízení} other {# zařízení} }.",
       "chose-compatible-device-profile": "Nahraný balíček bude dostupný pouze pro zařízení s vybraným profilem.",
       "chose-firmware-distributed-device": "Vyberte firmware, který bude distribuován do zařízení",
       "chose-software-distributed-device": "Vyberte software, který bude distribuován do zařízení",
@@ -2270,7 +2270,7 @@
       "delete-ota-update-text": "Buďte opatrní, protože po potvrzení nebude možné OTA aktualizaci obnovit.",
       "delete-ota-update-title": "Jste si jisti, že chcete odstranit OTA aktualizaci '{{title}}'?",
       "delete-ota-updates-text": "Buďte opatrní, protože po potvrzení budou všechny vybrané OTA aktualizace odstraněny.",
-      "delete-ota-updates-title": "Jste si jisti, že chcete odstranit { count, plural, 1 {1 OTA aktualizaci} other {# OTA aktualizací} }?",
+      "delete-ota-updates-title": "Jste si jisti, že chcete odstranit { count, plural, =1 {1 OTA aktualizaci} other {# OTA aktualizací} }?",
       "description": "Popis",
       "direct-url": "Přímá URL",
       "direct-url-copied-message": "Přímá URL balíčku bylo zkopírována do schránky",
@@ -2292,7 +2292,7 @@
       "package-type": "Typ balíčku",
       "packages-repository": "Repozitář balíčku",
       "search": "Vyhledat balíčky",
-      "selected-package": "Vybráno { count, plural, 1 {1 balíčků} other {# balíčků} }",
+      "selected-package": "Vybráno { count, plural, =1 {1 balíčků} other {# balíčků} }",
       "title": "Název",
       "title-required": "Název je povinný.",
       "types": {
@@ -2328,7 +2328,7 @@
         },
         "from-relations": "Odchozí vztahy",
         "to-relations": "Příchozí vztahy",
-        "selected-relations": "Vybráno { count, plural, 1 {1 vztahů} other {# vztahů} }",
+        "selected-relations": "Vybráno { count, plural, =1 {1 vztahů} other {# vztahů} }",
         "type": "Typ",
         "to-entity-type": "K typ entity",
         "to-entity-name": "K název entity",
@@ -2344,11 +2344,11 @@
         "edit": "Editovat vztah",
         "delete-to-relation-title": "Jste si jisti, že chcete smazat vztah k entitě '{{entityName}}'?",
         "delete-to-relation-text": "Buďte opatrní, protože po potvrzení bude vtah entity '{{entityName}}' k aktuální entitě zrušen.",
-        "delete-to-relations-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 vztah} other {# vztahů} }?",
+        "delete-to-relations-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 vztah} other {# vztahů} }?",
         "delete-to-relations-text": "Buďte opatrní, protože po potvrzení budou všechny vybrané vztahy odstraněny a vztah odpovídajících entit k aktuální entitě bude zrušen.",
         "delete-from-relation-title": "Jste si jisti, že chcete smazat vztah z entity '{{entityName}}'?",
         "delete-from-relation-text": "Buďte opatrní, protože po potvrzení bude zrušen vztah aktuální entity k entitě '{{entityName}}'.",
-        "delete-from-relations-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 vztah} other {# vztahů} }?",
+        "delete-from-relations-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 vztah} other {# vztahů} }?",
         "delete-from-relations-text": "Buďte opatrní, protože po potvrzení budou všechny vybrané vztahy odstraněny a bude zrušen vztah aktuální entity k odpovídajícím entitám.",
         "remove-relation-filter": "Odebrat filtr vztahů",
         "add-relation-filter": "Přidat filtr vztahu",
@@ -2364,9 +2364,9 @@
       "delete": "Odstranit zdroj",
       "delete-resource-text": "Buďte opatrní, protože po potvrzení nebude možné zdroj obnovit.",
       "delete-resource-title": "Jste si jisti, že chcete odstranit zdroj '{{resourceTitle}}'?",
-      "delete-resources-action-title": "Odstranit { count, plural, 1 {1 zdroj} other {# zdrojů} }",
+      "delete-resources-action-title": "Odstranit { count, plural, =1 {1 zdroj} other {# zdrojů} }",
       "delete-resources-text": "Vezměte prosím na vědomí, že vybrané zdroje, i když jsou použity v profilech zařízení, budou odstraněny.",
-      "delete-resources-title": "Jste si jisti, že chcete odstranit { count, plural, 1 {1 zdroj} other {# zdrojů} }?",
+      "delete-resources-title": "Jste si jisti, že chcete odstranit { count, plural, =1 {1 zdroj} other {# zdrojů} }?",
       "download": "Stáhnout zdroj",
       "drop-file": "Přesuňte sem soubor zdroje nebo klikněte pro výběr souboru pro nahrání.",
       "empty": "Zdroj je prázdný",
@@ -2380,7 +2380,7 @@
       "resource-type": "Typ zdroje",
       "resources-library": "Knihovna zdrojů",
       "search": "Vyhledat zdroje",
-      "selected-resources": "Vybrán { count, plural, 1 {1 zdroj} other {# zdrojů} }",
+      "selected-resources": "Vybrán { count, plural, =1 {1 zdroj} other {# zdrojů} }",
       "system": "Systém",
       "title": "Název",
       "title-required": "Název je povinný."
@@ -2399,8 +2399,8 @@
         "set-root-rulechain-text": "Po potvrzení se stane řetěz pravidel základním a bude zajišťovat zpracování všech příchozích transportních zpráv.",
         "delete-rulechain-title": "Jste si jisti, že chcete smazat řetěz pravidel '{{ruleChainName}}'?",
         "delete-rulechain-text": "Buďte opatrní, protože po potvrzení nebude možné řetěz pravidel ani žádná související data obnovit.",
-        "delete-rulechains-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 řetěz pravidel} other {# řetězů pravidel} }?",
-        "delete-rulechains-action-title": "Smazat { count, plural, 1 {1 řetěz pravidel} other {# řetězy pravidel} }",
+        "delete-rulechains-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 řetěz pravidel} other {# řetězů pravidel} }?",
+        "delete-rulechains-action-title": "Smazat { count, plural, =1 {1 řetěz pravidel} other {# řetězy pravidel} }",
         "delete-rulechains-text": "Buďte opatrní, protože po potvrzení budou všechny vybrané řetězy pravidel odstraněny a žádná související data nebude možné obnovit.",
         "add-rulechain-text": "Přidat nový řetěz pravidel",
         "no-rulechains-text": "Žádné řetězy pravidel nebyly nalezeny",
@@ -2422,14 +2422,14 @@
         "management": "Správa pravidel",
         "debug-mode": "Režim ladění",
         "search": "Vyhledat řetězy pravidel",
-        "selected-rulechains": "Vybráno { count, plural, 1 {1 řetězů pravidel} other {# řetězů pravidel} }",
+        "selected-rulechains": "Vybráno { count, plural, =1 {1 řetězů pravidel} other {# řetězů pravidel} }",
         "open-rulechain": "Otevřít řetěz pravidel",
         "assign-new-rulechain": "Přiřadit nový řetěz pravidel",
         "edge-template-root": "Hlavní šablona",
         "assign-to-edge": "Přiřadit k edge",
         "edge-rulechain": "Řetěz pravidel edge",
         "unassign-rulechain-from-edge-text": "Po potvrzení bude řetěz pravidel odebrán a nebude pro edge dostupný.",
-        "unassign-rulechains-from-edge-title": "Jste si jisti, že chcete odebrat { count, plural, 1 {1 řetěz pravidel} other {# řetězů pravidel} }?",
+        "unassign-rulechains-from-edge-title": "Jste si jisti, že chcete odebrat { count, plural, =1 {1 řetěz pravidel} other {# řetězů pravidel} }?",
         "unassign-rulechains-from-edge-text": "Po potvrzení budou všechny vybrané řetězy pravidelodebrány a nedbuou pro edge dostupné.",
         "assign-rulechain-to-edge-title": "Přiřadit řetěz(y) pravidel k edge",
         "assign-rulechain-to-edge-text": "Vyberte prosím řetězy pravidel, které mají být přiřazeny k edge",
@@ -2535,8 +2535,8 @@
         "tenant-details": "Detail tenanta",
         "delete-tenant-title": "Jste si jisti, že chcete smazat tenanta '{{tenantTitle}}'?",
         "delete-tenant-text": "Buďte opatrní, protože po potvrzení nebude možné tenanta ani žádná související data obnovit.",
-        "delete-tenants-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 tenanta} other {# tenantů} }?",
-        "delete-tenants-action-title": "Smazat { count, plural, 1 {1 tenanta} other {# tenantů} }",
+        "delete-tenants-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 tenanta} other {# tenantů} }?",
+        "delete-tenants-action-title": "Smazat { count, plural, =1 {1 tenanta} other {# tenantů} }",
         "delete-tenants-text": "Buďte opatrní, protože po potvrzení budou všichni vybraní tenanti odstraněni a žádná související data nebude možné obnovit.",
         "title": "Název",
         "title-required": "Název je povinný.",
@@ -2549,7 +2549,7 @@
         "no-tenants-matching": "Žádní tenanti odpovídající '{{entity}}' nebyli nalezeni.",
         "tenant-required": "Tenant je povinný",
         "search": "Vyhledat tenanty",
-        "selected-tenants": "Vybráno { count, plural, 1 {1 tenantů} other {# tenantů} }",
+        "selected-tenants": "Vybráno { count, plural, =1 {1 tenantů} other {# tenantů} }",
         "isolated-tb-rule-engine": "Zpracování v izolovaném kontejneru ThingsBoard Rule Engine",
         "isolated-tb-rule-engine-details": "Vyžaduje samostatnou mikroslužbu(y) pro každého izolovaného tenanta"
     },
@@ -2561,7 +2561,7 @@
         "tenant-profile-details": "Detail profilu tenanta",
         "no-tenant-profiles-text": "Nebyly nalezeny žádné profily tenantů",
         "search": "Vyhledat profily tenantů",
-        "selected-tenant-profiles": "Vybráno { count, plural, 1 {1 profilů tenantů} other {# profilů tenantů} }",
+        "selected-tenant-profiles": "Vybráno { count, plural, =1 {1 profilů tenantů} other {# profilů tenantů} }",
         "no-tenant-profiles-matching": "Žádné profily tenantů odpovídající '{{entity}}' nebyly nalezeny.",
         "tenant-profile-required": "Profil tenanta je povinný",
         "idCopiedMessage": "Id profilu tenanta bylo zkopírováno do schránky",
@@ -2576,7 +2576,7 @@
         "default": "Defaultní",
         "delete-tenant-profile-title": "Jste si jisti, že chcete smazat profil tenanta '{{tenantProfileName}}'?",
         "delete-tenant-profile-text": "Buďte opatrní, protože po potvrzení nebude možné profil tenanta ani žádná související data obnovit.",
-        "delete-tenant-profiles-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 profil tenanta} other {# profilů tenanta} }?",
+        "delete-tenant-profiles-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 profil tenanta} other {# profilů tenanta} }?",
         "delete-tenant-profiles-text": "Buďte opatrní, protože po potvrzení budou všechny vybrané profily tenantů odstraněny a žádná související data nebude možné obnovit.",
         "set-default-tenant-profile-title": "Jste si jisti, že chcete učinit profil tenanta '{{tenantProfileName}}' defaultním?",
         "set-default-tenant-profile-text": "Po potvrzení bude profil tenanta označen jako defaultní a bude použit pro nové tenanty bez specifikovaného profilu.",
@@ -2656,10 +2656,10 @@
         "max-created-alarms-range": "Maximální počet vytvořených alarmů nemůže být záporný"
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, 1 {1 vteřina} other {# vteřin} }",
-        "minutes-interval": "{ minutes, plural, 1 {1 minuta} other {# minut} }",
-        "hours-interval": "{ hours, plural, 1 {1 hodina} other {# hodin} }",
-        "days-interval": "{ days, plural, 1 {1 den} other {# dnů} }",
+        "seconds-interval": "{ seconds, plural, =1 {1 vteřina} other {# vteřin} }",
+        "minutes-interval": "{ minutes, plural, =1 {1 minuta} other {# minut} }",
+        "hours-interval": "{ hours, plural, =1 {1 hodina} other {# hodin} }",
+        "days-interval": "{ days, plural, =1 {1 den} other {# dnů} }",
         "days": "Dny",
         "hours": "Hodiny",
         "minutes": "Minuty",
@@ -2693,10 +2693,10 @@
         "days": "Dny"
     },
     "timewindow": {
-        "days": "{ days, plural, 1 { den } other {# dnů } }",
-        "hours": "{ hours, plural, 0 { hodina } 1 {1 hodina } other {# hodin } }",
-        "minutes": "{ minutes, plural, 0 { minuta } 1 {1 minuta } other {# minut } }",
-        "seconds": "{ seconds, plural, 0 { vteřina } 1 {1 vteřina } other {# vteřin } }",
+        "days": "{ days, plural, =1 { den } other {# dnů } }",
+        "hours": "{ hours, plural, =0 { hodina } =1 {1 hodina } other {# hodin } }",
+        "minutes": "{ minutes, plural, =0 { minuta } =1 {1 minuta } other {# minut } }",
+        "seconds": "{ seconds, plural, =0 { vteřina } =1 {1 vteřina } other {# vteřin } }",
         "realtime": "V reálném čase",
         "history": "Historie",
         "last-prefix": "poslední",
@@ -2724,8 +2724,8 @@
         "user-details": "Detail uživatele",
         "delete-user-title": "Jste si jisti, že chcete smazat uživatele '{{userEmail}}'?",
         "delete-user-text": "Buďte opatrní, protože po potvrzení nebude možné uživatele ani žádná související data obnovit.",
-        "delete-users-title": "Jste si jisti, že chcete smazat { count, plural, 1 {1 uživatele} other {# uživatele} }?",
-        "delete-users-action-title": "Smazat { count, plural, 1 {1 uživatele} other {# uživatele} }",
+        "delete-users-title": "Jste si jisti, že chcete smazat { count, plural, =1 {1 uživatele} other {# uživatele} }?",
+        "delete-users-action-title": "Smazat { count, plural, =1 {1 uživatele} other {# uživatele} }",
         "delete-users-text": "Buďte opatrní, protože po potvrzení budou všichni vybraní uživatelé odstraněni a žádná související data nebude možné obnovit.",
         "activation-email-sent-message": "Aktivační email byl úspěšně odeslán!",
         "resend-activation": "Znovu poslat aktivační email",
@@ -2751,7 +2751,7 @@
         "login-as-tenant-admin": "Přihlásit se jako administrátor tenanta",
         "login-as-customer-user": "Přihlásit se jako uživatel zákazníka",
         "search": "Vyhledat uživatele",
-        "selected-users": "Vybráno { count, plural, 1 {1 uživatelů} other {# uživatelů} }",
+        "selected-users": "Vybráno { count, plural, =1 {1 uživatelů} other {# uživatelů} }",
         "disable-account": "Zakázat uživatelský účet",
         "enable-account": "Povolit uživatelský účet",
         "enable-account-message": "Uživatelský účet byl úspěšně povolen!",
@@ -2892,8 +2892,8 @@
         "widgets-bundle-details": "Detail kategorie widgetů",
         "delete-widgets-bundle-title": "Jste si jisti, že chcete smazat kategorii widgetů '{{widgetsBundleTitle}}'?",
         "delete-widgets-bundle-text": "Buďte opatrní, po potvrzení nebude možné kategorii widgetů ani žádná související data obnovit.",
-        "delete-widgets-bundles-title": "Jste si jisti, že chcete odstranit { count, plural, 1 {1 kategorii widgetů} other {# kategorií widgetů} }?",
-        "delete-widgets-bundles-action-title": "Smazat { count, plural, 1 {1 kategorii widgetů} other {# kategorií widgetů} }",
+        "delete-widgets-bundles-title": "Jste si jisti, že chcete odstranit { count, plural, =1 {1 kategorii widgetů} other {# kategorií widgetů} }?",
+        "delete-widgets-bundles-action-title": "Smazat { count, plural, =1 {1 kategorii widgetů} other {# kategorií widgetů} }",
         "delete-widgets-bundles-text": "Buďte opatrní, po potvrzení budou všechny vybrané kategorie widgetů odstraněny a žádná související data nebude možné obnovit.",
         "no-widgets-bundles-matching": "Žádné kategorie widgetů odpovídající '{{widgetsBundle}}' nebyly nalezeny.",
         "widgets-bundle-required": "Kategorie widgetů je povinná.",
@@ -2905,7 +2905,7 @@
         "widgets-bundle-file": "Soubor kategorie widgetů",
         "invalid-widgets-bundle-file-error": "Kategorii widgetů nebylo možné importovat: Neplatná datová struktura kategorie widgetů.",
         "search": "Vyhledat kategorie widgetů",
-        "selected-widgets-bundles": "Vybráno { count, plural, 1 {1 kategorií widgetů} other {# kategorií widgetů} }",
+        "selected-widgets-bundles": "Vybráno { count, plural, =1 {1 kategorií widgetů} other {# kategorií widgetů} }",
         "open-widgets-bundle": "Otevřít kategorii widgetů",
         "loading-widgets-bundles": "Nahrávám kategorie widgetů..."
     },
@@ -2935,7 +2935,7 @@
         "display-timewindow": "Zobrazit časové okno",
         "display-legend": "Zobrazit legendu",
         "datasources": "Datové zdroje",
-        "maximum-datasources": "Maximum { count, plural, 1 {1 datový zdroj je povolen.} other {# datových zdrojů je povoleno} }",
+        "maximum-datasources": "Maximum { count, plural, =1 {1 datový zdroj je povolen.} other {# datových zdrojů je povoleno} }",
         "datasource-type": "Typ",
         "datasource-parameters": "Parametry",
         "remove-datasource": "Odebrat datový zdroj",
diff --git a/ui-ngx/src/assets/locale/locale.constant-da_DK.json b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
index 6200b26ce7..85b6ce8031 100644
--- a/ui-ngx/src/assets/locale/locale.constant-da_DK.json
+++ b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
@@ -3165,10 +3165,10 @@
     "max-sms-range": "Maks. antal sendte SMS'er kan ikke være negativt"
   },
   "timeinterval": {
-    "seconds-interval": "{ seconds, plural, 1 {1 sekund} other {# sekunder} }",
-    "minutes-interval": "{ minutes, plural, 1 {1 minut} other {# minutter} }",
-    "hours-interval": "{ hours, plural, 1 {1 time} other {# timer} }",
-    "days-interval": "{ days, plural, 1 {1 dag} other {# dage} }",
+    "seconds-interval": "{ seconds, plural, =1 {1 sekund} other {# sekunder} }",
+    "minutes-interval": "{ minutes, plural, =1 {1 minut} other {# minutter} }",
+    "hours-interval": "{ hours, plural, =1 {1 time} other {# timer} }",
+    "days-interval": "{ days, plural, =1 {1 dag} other {# dage} }",
     "days": "Dage",
     "hours": "Timer",
     "minutes": "Minutter",
@@ -3202,10 +3202,10 @@
     "days": "Dage"
   },
   "timewindow": {
-    "days": "{ days, plural, 1 { dag } other {# dage } }",
-    "hours": "{ hours, plural, 0 { time } 1 {1 time } other {# timer } }",
-    "minutes": "{ minutes, plural, 0 { minut } 1 {1 minut } other {# minutter } }",
-    "seconds": "{ seconds, plural, 0 { sekund } 1 {1 sekund } other {# sekunder } }",
+    "days": "{ days, plural, =1 { dag } other {# dage } }",
+    "hours": "{ hours, plural, =0 { time } =1 {1 time } other {# timer } }",
+    "minutes": "{ minutes, plural, =0 { minut } =1 {1 minut } other {# minutter } }",
+    "seconds": "{ seconds, plural, =0 { sekund } =1 {1 sekund } other {# sekunder } }",
     "realtime": "Realtid",
     "history": "Historie",
     "last-prefix": "sidst",
diff --git a/ui-ngx/src/assets/locale/locale.constant-de_DE.json b/ui-ngx/src/assets/locale/locale.constant-de_DE.json
index d60ed055ad..e42342b78a 100644
--- a/ui-ngx/src/assets/locale/locale.constant-de_DE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-de_DE.json
@@ -184,17 +184,17 @@
     "acknowledge": "Bestätigen",
     "clear": "Löschen",
     "search": "Alarme suchen",
-    "selected-alarms": "{ count, plural, 1 {1 Alarm} other {# Alarme} } ausgewählt",
+    "selected-alarms": "{ count, plural, =1 {1 Alarm} other {# Alarme} } ausgewählt",
     "no-data": "Keine Daten zum Anzeigen",
     "polling-interval": "Alarmabfrageintervall (sec)",
     "polling-interval-required": "Alarmabfrageintervall ist erforderlich.",
     "min-polling-interval-message": "Mindestens 1 sec Abrufintervall ist zulässig.",
-    "aknowledge-alarms-title": "{ count, plural, 1 {1 Alarm} other {# Alarme} } bestätigen",
-    "aknowledge-alarms-text": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Alarm} other {# Alarme} } bestätigen möchten?",
+    "aknowledge-alarms-title": "{ count, plural, =1 {1 Alarm} other {# Alarme} } bestätigen",
+    "aknowledge-alarms-text": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Alarm} other {# Alarme} } bestätigen möchten?",
     "aknowledge-alarm-title": "Alarm bestätigen",
     "aknowledge-alarm-text": "Möchten Sie den Alarm wirklich bestätigen?",
-    "clear-alarms-title": "{ count, plural, 1 {1 Alarm} other {# Alarme} } löschen",
-    "clear-alarms-text": "Möchten Sie wirklich { count, plural, 1 {1 Alarm} other {# Alarme} } löschen?",
+    "clear-alarms-title": "{ count, plural, =1 {1 Alarm} other {# Alarme} } löschen",
+    "clear-alarms-text": "Möchten Sie wirklich { count, plural, =1 {1 Alarm} other {# Alarme} } löschen?",
     "clear-alarm-title": "Alarm löschen",
     "clear-alarm-text": "Möchten Sie den Alarm wirklich löschen?",
     "alarm-status-filter": "Alarm Status Filter"
@@ -285,15 +285,15 @@
     "add-asset-text": "Neues Objekt hinzufügen",
     "asset-details": "Objektdetails",
     "assign-assets": "Objekte zuordnen",
-    "assign-assets-text": "Kunden { count, plural, 1 {1 Objekt} other {# Objekte} } zuordnen",
+    "assign-assets-text": "Kunden { count, plural, =1 {1 Objekt} other {# Objekte} } zuordnen",
     "delete-assets": "Objekte löschen",
     "unassign-assets": "Objektzuordnungen aufheben",
-    "unassign-assets-action-title": "Kunden { count, plural, 1 {1 Objektzuordnung} other {# Objektzuordnungen} } aufheben",
+    "unassign-assets-action-title": "Kunden { count, plural, =1 {1 Objektzuordnung} other {# Objektzuordnungen} } aufheben",
     "assign-new-asset": "Neues Objekt zuordnen",
     "delete-asset-title": "Sind Sie sicher, dass Sie das Objekt '{{assetName}}' löschen möchten?",
     "delete-asset-text": "Vorsicht, nach Bestätigung wird das Objekt und alle zugehörigen Daten nicht wiederherstellbar gelöscht.",
-    "delete-assets-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Objekt} other {# Objekte} } löschen möchten?",
-    "delete-assets-action-title": "{ count, plural, 1 {1 Objekt} other {# Objekte} } löschen",
+    "delete-assets-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Objekt} other {# Objekte} } löschen möchten?",
+    "delete-assets-action-title": "{ count, plural, =1 {1 Objekt} other {# Objekte} } löschen",
     "delete-assets-text": "Vorsicht, nach Bestätigung werden die ausgewählten Objekte und alle zugehörigen Daten nicht wiederherstellbar gelöscht",
     "make-public-asset-title": "Sind Sie sicher, dass Sie das Objekt '{{assetName}}' öffentlich machen möchten?",
     "make-public-asset-text": "Nach Bestätigung wird das Objekt und alle zugehörigen Daten anderen zugänglich gemacht.",
@@ -302,7 +302,7 @@
     "unassign-asset-title": "Sind Sie sicher, dass Sie die Zuordnung für das Objekt '{{assetName}}' aufheben möchten?",
     "unassign-asset-text": "Nach Bestätigung wird die Zuordnung des Objekts aufgehoben und es ist für den Kunden nicht mehr zugänglich.",
     "unassign-asset": "Zuordnung des Objekts aufheben",
-    "unassign-assets-title": "Möchten Sie die Zuordnung von { count, plural, 1 {1 Objekt} other {# Objekte} } aufheben?",
+    "unassign-assets-title": "Möchten Sie die Zuordnung von { count, plural, =1 {1 Objekt} other {# Objekte} } aufheben?",
     "unassign-assets-text": "Nach Bestätigung wird die Zuordnung der ausgewählten Objekte aufgehoben und sie sind für den Kunden nicht mehr zugänglich.",
     "copyId": "Objekt-ID kopieren",
     "idCopiedMessage": "Objekt-ID wurde in die Zwischenablage kopiert",
@@ -316,7 +316,7 @@
     "unassign-asset-from-edge": "Objekte von Rand entfernen",
     "unassign-asset-from-edge-title": "Sind Sie sicher, dass Sie die Zuordnung für das Objekt '{{assetName}}' aufheben möchten?",
     "unassign-asset-from-edge-text": "Nach Bestätigung wird die Zuordnung des Objekts aufgehoben und es ist für den Kunden nicht mehr zugänglich.",
-    "unassign-assets-from-edge-action-title": "Rand { count, plural, 1 {1 Objektzuordnung} other {# Objektzuordnungen} } aufheben",
+    "unassign-assets-from-edge-action-title": "Rand { count, plural, =1 {1 Objektzuordnung} other {# Objektzuordnungen} } aufheben",
     "unassign-assets-from-edge-title": "Sind Sie sicher, dass Sie die Zuordnung für das Objekt '{{assetName}}' wirklich aufheben möchten?",
     "unassign-assets-from-edge-text": "Nach der Bestätigung werden alle ausgewählten Objekte nicht zugewiesen und sind für den Rand nicht zugänglich."
   },
@@ -334,7 +334,7 @@
     "key-required": "Eigenschaftsschlüssel ist erforderlich.",
     "value": "Wert",
     "value-required": "Eigenschaftswert ist erforderlich.",
-    "delete-attributes-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Eigenschaft} other {# Eigenschaften} } löschen möchten?",
+    "delete-attributes-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Eigenschaft} other {# Eigenschaften} } löschen möchten?",
     "delete-attributes-text": "Seien Sie vorsichtig, nach der Bestätigung werden alle ausgewählten Eigenschaften entfernt.",
     "delete-attributes": "Eigenschaften löschen",
     "enter-attribute-value": "Geben Sie den Eigenschaftswert ein",
@@ -344,8 +344,8 @@
     "prev-widget": "Vorheriges Widget",
     "add-to-dashboard": "Zum Dashboard hinzufügen",
     "add-widget-to-dashboard": "Widget zum Dashboard hinzufügen",
-    "selected-attributes": "{ count, plural, 1 {1 Eigenschaft} other {# Eigenschaften} } ausgewählt",
-    "selected-telemetry": "{ count, plural, 1 {1 Telemetrieeinheit } other {# Telemetrieeinheiten} } ausgewählt"
+    "selected-attributes": "{ count, plural, =1 {1 Eigenschaft} other {# Eigenschaften} } ausgewählt",
+    "selected-telemetry": "{ count, plural, =1 {1 Telemetrieeinheit } other {# Telemetrieeinheiten} } ausgewählt"
   },
   "audit-log": {
     "audit": "Audit",
@@ -449,8 +449,8 @@
     "customer-details": "Kundendetails",
     "delete-customer-title": "Sind Sie sicher, dass der Kunde '{{customerTitle}}' gelöscht werden soll?",
     "delete-customer-text": "Vorsicht, nach Bestätigung wird der Kunde und alle zugehörigen Daten nicht wiederherstellbar gelöscht.",
-    "delete-customers-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Kunde} other {# Kunden} } löschen möchten?",
-    "delete-customers-action-title": "{ count, plural, 1 {1 Kunde} other {# Kunden} } löschen",
+    "delete-customers-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Kunde} other {# Kunden} } löschen möchten?",
+    "delete-customers-action-title": "{ count, plural, =1 {1 Kunde} other {# Kunden} } löschen",
     "delete-customers-text": "Seien Sie vorsichtig, nach der Bestätigung werden alle ausgewählten Kunden und alle zugehörigen Daten nicht wiederherstellbar gelöscht.",
     "manage-users": "User verwalten",
     "manage-assets": "Objekte verwalten",
@@ -510,20 +510,20 @@
     "add-dashboard-text": "Neues Dashboard hinzufügen",
     "assign-dashboards": "Dashboards zuweisen",
     "assign-new-dashboard": "Neues Dashboard zuweisen",
-    "assign-dashboards-text": "Zuordnen { count, plural, 1 {1 Dashboard} other {# Dashboards} } zu Kunden",
-    "unassign-dashboards-action-text": "Zuordnung { count, plural, 1 {1 Dashboard} other {# Dashboards} } vom Kunden aufheben",
+    "assign-dashboards-text": "Zuordnen { count, plural, =1 {1 Dashboard} other {# Dashboards} } zu Kunden",
+    "unassign-dashboards-action-text": "Zuordnung { count, plural, =1 {1 Dashboard} other {# Dashboards} } vom Kunden aufheben",
     "delete-dashboards": "Dashboards löschen",
     "unassign-dashboards": "Zuordnung von Dashboards aufheben",
-    "unassign-dashboards-action-title": "Zuordnung { count, plural, 1 {1 Dashboard} other {# Dashboards} } vom Kunden aufheben",
+    "unassign-dashboards-action-title": "Zuordnung { count, plural, =1 {1 Dashboard} other {# Dashboards} } vom Kunden aufheben",
     "delete-dashboard-title": "Sind Sie sicher, dass Sie das Dashboard '{{dashboardTitle}}' löschen möchten?",
     "delete-dashboard-text": "Vorsicht, nach Bestätigung werden das Dashboard und alle zugehörigen Daten nicht mehr wiederhergestellt.",
-    "delete-dashboards-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Dashboard} other {# Dashboards} } löschen möchten?",
-    "delete-dashboards-action-title": "Löschen { count, plural, 1 {1 Dashboard} other {# Dashboards} }",
+    "delete-dashboards-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Dashboard} other {# Dashboards} } löschen möchten?",
+    "delete-dashboards-action-title": "Löschen { count, plural, =1 {1 Dashboard} other {# Dashboards} }",
     "delete-dashboards-text": "Vorsicht, nach Bestätigung werden alle ausgewählten Dashboards entfernt und alle zugehörigen Daten nicht mehr wiederhergestellt.",
     "unassign-dashboard-title": "Sind Sie sicher, dass Sie die Zuordnung zum Dashboard '{{dashboardTitle}}' aufheben möchten?",
     "unassign-dashboard-text": "Nach der Bestätigung wird die Zuordnung des Dashboards aufgehoben und es ist für den Kunden nicht mehr zugänglich.",
     "unassign-dashboard": "Zuordnung zum Kunden aufheben",
-    "unassign-dashboards-title": "Sind Sie sicher, dass Sie die Zuordug aufheben möchten { count, plural, 1 {1 Dashboard} other {# Dashboards} }?",
+    "unassign-dashboards-title": "Sind Sie sicher, dass Sie die Zuordug aufheben möchten { count, plural, =1 {1 Dashboard} other {# Dashboards} }?",
     "unassign-dashboards-text": "Nach der Bestätigung wird die Zuordnung aller ausgewählten Dashboards aufgehoben und sie sind für den Kunden nicht mehr zugänglich.",
     "public-dashboard-title": "Dashboard wurde veröffentlicht",
     "public-dashboard-text": "Ihr Dashboard <b>{{dashboardTitle}}</b> ist jetzt öffentlich und über nächste Öffentlichkeit zugänglich <a href='{{publicLink}}' target='_blank'>link</a>:",
@@ -600,7 +600,7 @@
     "manage-states": "Dashboard-Status verwalten",
     "states": "Dashboard-Status",
     "search-states": "Dashboard-Status suchen",
-    "selected-states": "{ count, plural, 1 {1 dashboard state} other {# dashboard states} } ausgewählt",
+    "selected-states": "{ count, plural, =1 {1 dashboard state} other {# dashboard states} } ausgewählt",
     "edit-state": "Dashboard-Status bearbeiten",
     "delete-state": "Dashboard-Status löschen",
     "add-state": "Dashboard-Status hinzufügen",
@@ -637,11 +637,11 @@
     "alarm": "Alarmfelder",
     "timeseries-required": "Entity-Zeitreihen sind erforderlich.",
     "timeseries-or-attributes-required": "Entity-Zeitreihen/Eigenschaften sind erforderlich.",
-    "maximum-timeseries-or-attributes": "Maximum { count, plural, 1 {1 Zeitreihe/Eigenschaft ist erlaubt} other {# Zeitreihen/Eigenschaften sind erlaubt} }.",
+    "maximum-timeseries-or-attributes": "Maximum { count, plural, =1 {1 Zeitreihe/Eigenschaft ist erlaubt} other {# Zeitreihen/Eigenschaften sind erlaubt} }.",
     "alarm-fields-required": "Alarmfelder sind erforderlich.",
     "function-types": "Funktionsarten",
     "function-types-required": "Funktionstypen sind erforderlich.",
-    "maximum-function-types": "Maximal { count, plural, 1 {1 Funktionstyp ist erlaubt} other {# Funktionstypen sind erlaubt} }.",
+    "maximum-function-types": "Maximal { count, plural, =1 {1 Funktionstyp ist erlaubt} other {# Funktionstypen sind erlaubt} }.",
     "time-description": "Zeitstempel des aktuellen Wertes;",
     "value-description": "Der aktuelle Wert;",
     "prev-value-description": "Ergebnis des vorherigen Funktionsaufrufs;",
@@ -698,11 +698,11 @@
     "manage-credentials": "Zugangsdaten verwalten",
     "delete": "Gerät löschen",
     "assign-devices": "Gerät zuordnen",
-    "assign-devices-text": "{ count, plural, 1 {1 Gerät} other {# Geräte} } dem Kunden zuordnen",
+    "assign-devices-text": "{ count, plural, =1 {1 Gerät} other {# Geräte} } dem Kunden zuordnen",
     "delete-devices": "Geräte löschen",
     "unassign-from-customer": "Zuordnung zum Kunden aufheben",
     "unassign-devices": "Nicht zugeordnete Geräte",
-    "unassign-devices-action-title": "Zuordnung von { count, plural, 1 {1 Gerät} other {# Geräte} } zum Kunden aufheben",
+    "unassign-devices-action-title": "Zuordnung von { count, plural, =1 {1 Gerät} other {# Geräte} } zum Kunden aufheben",
     "assign-new-device": "Neues Gerät zuordnen",
     "make-public-device-title": "Sind Sie sicher, dass Sie das Gerät  '{{deviceName}}' öffentlich machen möchten?",
     "make-public-device-text": "Nach der Bestätigung werden das Gerät und dessen Daten öffentlich und für andere zugänglich.",
@@ -711,13 +711,13 @@
     "view-credentials": "Zugangsdaten anzeigen",
     "delete-device-title": "Möchten Sie das Gerät '{{deviceName}}' wirklich löschen?",
     "delete-device-text": "Vorsicht, nach Bestätigung werden das Gerät und alle zugehörigen Daten nicht mehr wiederhergestellt.",
-    "delete-devices-title": "Sind Sie sicher, dass Sie löschen möchten { count, plural, 1 {1 Gerät} other {# Geräte} }?",
-    "delete-devices-action-title": "Löschen { count, plural, 1 {1 Gerät} other {# Geräte} }",
+    "delete-devices-title": "Sind Sie sicher, dass Sie löschen möchten { count, plural, =1 {1 Gerät} other {# Geräte} }?",
+    "delete-devices-action-title": "Löschen { count, plural, =1 {1 Gerät} other {# Geräte} }",
     "delete-devices-text": "Vorsicht, nach Bestätigung werden alle ausgewählten Geräte entfernt und alle zugehörigen Daten werden nicht mehr wiederhergestellt.",
     "unassign-device-title": "Sind Sie sicher, dass Sie die Zuordnung zum Gerät '{{deviceName}}' wirklich aufheben möchten?",
     "unassign-device-text": "Nach der Bestätigung ist das Gerät nicht zugeordnet und für den Kunden nicht zugänglich.",
     "unassign-device": "Nicht zugeordnete Geräte",
-    "unassign-devices-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Gerät} other {# Geräte} } nicht mehr zuordnen möchten?",
+    "unassign-devices-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Gerät} other {# Geräte} } nicht mehr zuordnen möchten?",
     "unassign-devices-text": "Nach der Bestätigung werden alle ausgewählten Geräte nicht zugewiesen und sind für den Kunden nicht zugänglich.",
     "device-credentials": "Geräte Zugangsdaten",
     "credentials-type": "Art der Zugangsdaten",
@@ -753,7 +753,7 @@
     "assign-device-to-edge-text":"Bitte wählen Sie die Geräte aus, die Sie dem Rand zuordnen möchten",
     "unassign-device-from-edge-title": "Sind Sie sicher, dass Sie die Zuordnung zum Gerät '{{deviceName}}' wirklich aufheben möchten?",
     "unassign-device-from-edge-text": "Nach der Bestätigung ist das Gerät nicht zugeordnet und für den Kunden nicht zugänglich.",
-    "unassign-devices-from-edge-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Gerät} other {# Geräte} } nicht mehr zuordnen möchten?",
+    "unassign-devices-from-edge-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Gerät} other {# Geräte} } nicht mehr zuordnen möchten?",
     "unassign-devices-from-edge-text": "Nach der Bestätigung werden alle ausgewählten Geräte nicht zugewiesen und sind für den Rand nicht zugänglich."
   },
   "dialog": {
@@ -772,7 +772,7 @@
     "delete": "Rand löschen",
     "delete-edge-title": "Möchten Sie des Rands wirklich löschen '{{edgeName}}'?",
     "delete-edge-text": "Seien Sie vorsichtig, nach der Bestätigung werden der Rand und alle zugehörigen Daten nicht wiederhergestellt.",
-    "delete-edges-title": "Sind Sie sicher, dass Sie die Rand löschen möchten { count, plural, 1 {1 Rand} other {# Rand} }?",
+    "delete-edges-title": "Sind Sie sicher, dass Sie die Rand löschen möchten { count, plural, =1 {1 Rand} other {# Rand} }?",
     "delete-edges-text": "Vorsicht, nach Bestätigung werden alle ausgewählten Rand entfernt und alle zugehörigen Daten werden nicht wiederhergestellt.",
     "name": "Name",
     "name-starts-with": "Der Kantenname beginnt mit",
@@ -799,7 +799,7 @@
     "unassign-from-customer": "Kunden Zuordnung aufgehoben",
     "unassign-edge-title": "Sind Sie sicher, dass Sie die Zuordnung zum Rand '{{edgeName}}' wirklich aufheben möchten?",
     "unassign-edge-text": "Nach der Bestätigung ist der Rand nicht zugeordnet und für den Kunden nicht zugänglich.",
-    "unassign-edges-title": "Sind Sie sicher, dass Sie die Zuordnung aufheben möchten { count, plural, 1 {1 Rand} other {# Rand} }?",
+    "unassign-edges-title": "Sind Sie sicher, dass Sie die Zuordnung aufheben möchten { count, plural, =1 {1 Rand} other {# Rand} }?",
     "unassign-edges-text": "Nach der Bestätigung werden alle ausgewählten Kanten nicht zugewiesen und sind für den Kunden nicht zugänglich.",
     "make-public": "Rand öffentlich machen",
     "make-public-edge-title": "Sind Sie sicher, dass Sie der Rand '{{edgeName}}' öffentlich machen möchten?",
@@ -832,7 +832,7 @@
     "rulechain-templates": "Regelkettenvorlagen",
     "rulechains": "Rand Regelketten",
     "search": "Kanten durchsuchen",
-    "selected-edges": "{count, plural, 1 {1 Rand} other {# Rand} } ausgewählt",
+    "selected-edges": "{count, plural, =1 {1 Rand} other {# Rand} } ausgewählt",
     "any-edge": "Beliebige Kante",
     "no-edge-types-matching": "Es wurden keine Kantentypen gefunden, die mit '{{entitySubtype}}' übereinstimmen.",
     "edge-type-list-empty": "Keine Kantentypen ausgewählt.",
@@ -930,59 +930,59 @@
     "type-required": "Typ der Entität ist erforderlich.",
     "type-device": "Gerät",
     "type-devices": "Geräte",
-    "list-of-devices": "{ count, plural, 1 {Ein Gerät} other {Liste von # Geräten} }",
+    "list-of-devices": "{ count, plural, =1 {Ein Gerät} other {Liste von # Geräten} }",
     "device-name-starts-with": "Geräte beginnend mit '{{prefix}}'",
     "type-asset": "Objekt",
     "type-assets": "Objekte",
-    "list-of-assets": "{ count, plural, 1 {Ein Objekt} other {Liste von # Objekten} }",
+    "list-of-assets": "{ count, plural, =1 {Ein Objekt} other {Liste von # Objekten} }",
     "asset-name-starts-with": "Objekte beginnend mit '{{prefix}}'",
     "type-entity-view": "Entitätsansicht",
     "type-entity-views": "Entitätsansichten",
-    "list-of-entity-views": "{ count, plural, 1 {Eine Entitätsansicht} other {Liste von # Entitätsansichten} }",
+    "list-of-entity-views": "{ count, plural, =1 {Eine Entitätsansicht} other {Liste von # Entitätsansichten} }",
     "entity-view-name-starts-with": "Entitätsansichten beginnend mit'{{prefix}}'",
     "type-rule": "Regel",
     "type-rules": "Regeln",
-    "list-of-rules": "{ count, plural, 1 {Eine Regel} other {Liste von # Regeln} }",
+    "list-of-rules": "{ count, plural, =1 {Eine Regel} other {Liste von # Regeln} }",
     "rule-name-starts-with": "Regeln beginnend mit '{{prefix}}'",
     "type-plugin": "Plugin",
     "type-plugins": "Plugins",
-    "list-of-plugins": "{ count, plural, 1 {Ein Plugin} other {Liste von # Plugins} }",
+    "list-of-plugins": "{ count, plural, =1 {Ein Plugin} other {Liste von # Plugins} }",
     "plugin-name-starts-with": "Plugins beginnend mit '{{prefix}}'",
     "type-tenant": "Mandant",
     "type-tenants": "Mandanten",
-    "list-of-tenants": "{ count, plural, 1 {Ein Mandant} other {Liste von # Mandanten} }",
+    "list-of-tenants": "{ count, plural, =1 {Ein Mandant} other {Liste von # Mandanten} }",
     "tenant-name-starts-with": "Mandanten beginnend mit '{{prefix}}'",
     "type-customer": "Kunde",
     "type-customers": "Kunden",
-    "list-of-customers": "{ count, plural, 1 {Ein Kunde} other {Liste von # Kunden} }",
+    "list-of-customers": "{ count, plural, =1 {Ein Kunde} other {Liste von # Kunden} }",
     "customer-name-starts-with": "Kunden beginnend mit '{{prefix}}'",
     "type-user": "Benutzer",
     "type-users": "Benutzer",
-    "list-of-users": "{ count, plural, 1 {Ein Benutzer} other {Liste von # Benutzern} }",
+    "list-of-users": "{ count, plural, =1 {Ein Benutzer} other {Liste von # Benutzern} }",
     "user-name-starts-with": "Benutzer beginnend mit '{{prefix}}'",
     "type-dashboard": "Dashboard",
     "type-dashboards": "Dashboards",
-    "list-of-dashboards": "{ count, plural, 1 {Ein Dashboard} other {Liste von # Dashboards} }",
+    "list-of-dashboards": "{ count, plural, =1 {Ein Dashboard} other {Liste von # Dashboards} }",
     "dashboard-name-starts-with": "Dashboards beginnend mit '{{prefix}}'",
     "type-alarm": "Alarm",
     "type-alarms": "Alarme",
-    "list-of-alarms": "{ count, plural, 1 {Ein Alarm} other {Liste von # Alarmen} }",
+    "list-of-alarms": "{ count, plural, =1 {Ein Alarm} other {Liste von # Alarmen} }",
     "alarm-name-starts-with": "Alarme, beginnend mit '{{prefix}}'",
     "type-rulechain": "Regelkette",
     "type-rulechains": "Regelketten",
-    "list-of-rulechains": "{ count, plural, 1 {Eine Regelkette} other {Liste von # Regelketten} }",
+    "list-of-rulechains": "{ count, plural, =1 {Eine Regelkette} other {Liste von # Regelketten} }",
     "rulechain-name-starts-with": "Regelketten beginnend mit '{{prefix}}'",
     "type-rulenode": "Regelknoten",
     "type-rulenodes": "Regelknoten",
-    "list-of-rulenodes": "{ count, plural, 1 {Ein Regelknoten} other {Liste von # Regelknoten} }",
+    "list-of-rulenodes": "{ count, plural, =1 {Ein Regelknoten} other {Liste von # Regelknoten} }",
     "rulenode-name-starts-with": "Regelknoten beginnend mit '{{prefix}}'",
     "type-edge": "Randtyp",
     "type-edges": "Randtyp",
-    "list-of-edges": "{ count, plural, 1 {1 Rand} other {# Rand} }",
+    "list-of-edges": "{ count, plural, =1 {1 Rand} other {# Rand} }",
     "edge-name-starts-with": "Rand beginnend mit '{{prefix}}'",
     "type-current-customer": "Aktueller Kunde",
     "search": "Entitäten suchen",
-    "selected-entities": "{ count, plural, 1 {Entität} other {# Entitäten} } ausgewählt",
+    "selected-entities": "{ count, plural, =1 {Entität} other {# Entitäten} } ausgewählt",
     "entity-name": "Entitätsname",
     "details": "Entitätsdetails",
     "no-entities-prompt": "Keine Entitäten gefunden",
@@ -1026,21 +1026,21 @@
     "add-entity-view-text": "Neue Entitätsansicht hinzufügen",
     "delete": "Entitätsansicht löschen",
     "assign-entity-views": "Entitätsansicht zuordnen",
-    "assign-entity-views-text": "Dem Kunden { count, plural, 1 {1 Entitätsansicht} other {# Entitätsansichten} } zuordnen",
+    "assign-entity-views-text": "Dem Kunden { count, plural, =1 {1 Entitätsansicht} other {# Entitätsansichten} } zuordnen",
     "delete-entity-views": "Entitätsansichten löschen",
     "unassign-from-customer": "Zuordnung zum Kunden aufheben",
     "unassign-entity-views": "Zuordnung der Entitätsansichten aufheben",
-    "unassign-entity-views-action-title": "Die Zuordnung { count, plural, 1 {1 Entitätsansicht} other {# Entitätsansichten} } zum Kunden aufheben",
+    "unassign-entity-views-action-title": "Die Zuordnung { count, plural, =1 {1 Entitätsansicht} other {# Entitätsansichten} } zum Kunden aufheben",
     "assign-new-entity-view": "Neue Entitätsansicht zuordnen",
     "delete-entity-view-title": "Möchten Sie die Entitätsansicht wirklich löschen '{{entityViewName}}'?",
     "delete-entity-view-text": "Seien Sie vorsichtig, nach der Bestätigung werden die Entitätsansicht und alle zugehörigen Daten nicht wiederhergestellt.",
-    "delete-entity-views-title": "Sind Sie sicher, dass Sie die Entitätsansichten löschen möchten { count, plural, 1 {1 Entitätsansicht} other {# Entitätsansichten} }?",
-    "delete-entity-views-action-title": "Löschen { count, plural, 1 {1 Entitätsansicht} other {# Entitätsansichten} }",
+    "delete-entity-views-title": "Sind Sie sicher, dass Sie die Entitätsansichten löschen möchten { count, plural, =1 {1 Entitätsansicht} other {# Entitätsansichten} }?",
+    "delete-entity-views-action-title": "Löschen { count, plural, =1 {1 Entitätsansicht} other {# Entitätsansichten} }",
     "delete-entity-views-text": "Vorsicht, nach Bestätigung werden alle ausgewählten Entitätsansichten entfernt und alle zugehörigen Daten werden nicht wiederhergestellt.",
     "unassign-entity-view-title": "Möchten Sie die Zuordnung der Entitätsansicht '{{entityViewName}}' wirklich aufheben?",
     "unassign-entity-view-text": "Nach der Bestätigung wird die Zuordnung der Entitätsansicht aufgehoben und ist für den Kunden nicht mehr zugänglich.",
     "unassign-entity-view": "Zuordnung der Entitätsansicht aufheben",
-    "unassign-entity-views-title": "Sind Sie sicher, dass Sie die Zuordnung aufheben möchten { count, plural, 1 {1 Entitätsansicht} other {# Entitätsansichten} }?",
+    "unassign-entity-views-title": "Sind Sie sicher, dass Sie die Zuordnung aufheben möchten { count, plural, =1 {1 Entitätsansicht} other {# Entitätsansichten} }?",
     "unassign-entity-views-text": "Nach der Bestätigung werden die Zuordnungen der ausgewählten Entitätsansichten aufgehoben und sind für den Kunden nicht mehr zugänglich.",
     "entity-view-type": "Entitätsansichtstyp",
     "entity-view-type-required": "Entitätsansichtstyp ist erforderlich.",
@@ -1056,9 +1056,9 @@
     "assign-entity-view-to-edge-text":"Bitte wählen Sie die Entitätsansicht aus, die dem Rand zugeordnet werden sollen",
     "unassign-entity-view-from-edge-title": "Sind Sie sicher, dass Sie die Zuordnung für Entitätsansicht '{{entityViewName}}' aufheben möchten?",
     "unassign-entity-view-from-edge-text": "Nach Bestätigung wird die Zuordnung des Entitätsansichts aufgehoben und es ist für den Kunden nicht mehr zugänglich.",
-    "unassign-entity-views-from-edge-action-title": "Rand { count, plural, 1 {1 Entitätsansicht} other {# Entitätsansichte} } aufheben",
+    "unassign-entity-views-from-edge-action-title": "Rand { count, plural, =1 {1 Entitätsansicht} other {# Entitätsansichte} } aufheben",
     "unassign-entity-view-from-edge": "Entitätsansichtzuordnung aufheben",
-    "unassign-entity-views-from-edge-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Entitätsansicht} other {# Entitätsansichte} } nicht mehr zuordnen möchten?",
+    "unassign-entity-views-from-edge-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Entitätsansicht} other {# Entitätsansichte} } nicht mehr zuordnen möchten?",
     "unassign-entity-views-from-edge-text": "Nach der Bestätigung werden alle ausgewählten Entitätsansicht nicht zugewiesen und sind für den Rand nicht zugänglich.",
     "description": "Beschreibung",
     "events": "Ereignisse",
@@ -1121,7 +1121,7 @@
   },
   "extension": {
     "extensions": "Erweiterungen",
-    "selected-extensions": "{ count, plural, 1 {Erweiterung} other {# extensions} } ausgewählt",
+    "selected-extensions": "{ count, plural, =1 {Erweiterung} other {# extensions} } ausgewählt",
     "type": "Typ",
     "key": "Schlüssel",
     "value": "Wert",
@@ -1135,7 +1135,7 @@
     "edit": "Erweiterung bearbeiten",
     "delete-extension-title": "Möchten Sie die Erweiterung '{{extensionId}}' wirklich löschen?",
     "delete-extension-text": "Vorsicht, nach Bestätigung werden die Erweiterung und alle zugehörigen Daten nicht wiederhergestellt.",
-    "delete-extensions-title": "Möchten Sie wirklich löschen? { count, plural, 1 {1 extension} other {# extensions} }?",
+    "delete-extensions-title": "Möchten Sie wirklich löschen? { count, plural, =1 {1 extension} other {# extensions} }?",
     "delete-extensions-text": "Vorsicht, nach der Bestätigung werden alle ausgewählten Erweiterungen entfernt.",
     "converters": "Konverter",
     "converter-id": "Konverter-ID",
@@ -1288,8 +1288,8 @@
   "grid": {
     "delete-item-title": "Möchten Sie dieses Element wirklich löschen?",
     "delete-item-text": "Vorsicht, nach Bestätigung wird das Element und alle zugehörigen Daten nicht wiederhergestellt.",
-    "delete-items-title": "Sind Sie sicher, dass Sie löschen möchten { count, plural, 1 {Symbol} other {Symbole} }?",
-    "delete-items-action-title": "Löschen { count, plural, 1 {Symbol} other {# Symbole} }",
+    "delete-items-title": "Sind Sie sicher, dass Sie löschen möchten { count, plural, =1 {Symbol} other {Symbole} }?",
+    "delete-items-action-title": "Löschen { count, plural, =1 {Symbol} other {# Symbole} }",
     "delete-items-text": "Vorsicht, nach Bestätigung werden alle ausgewählten Elemente entfernt und alle zugehörigen Daten nicht wiederhergestellt.",
     "add-item-text": "Neues Element hinzufügen",
     "no-items-text": "Keine Elemente gefunden",
@@ -1393,7 +1393,7 @@
     },
     "from-relations": "Ausgehende Verbindungen",
     "to-relations": "Eingehende Verbindungen",
-    "selected-relations": "{ count, plural, 1 {1 Beziehung} other {# Beziehungen} } ausgewählt",
+    "selected-relations": "{ count, plural, =1 {1 Beziehung} other {# Beziehungen} } ausgewählt",
     "type": "Typ",
     "to-entity-type": "Zum Entitätstyp",
     "to-entity-name": "Zum Entitätsnamen",
@@ -1409,11 +1409,11 @@
     "edit": "Beziehung bearbeiten",
     "delete-to-relation-title": "Möchten Sie die Beziehung zur Einheit'{{entityName}}' wirklich löschen?",
     "delete-to-relation-text": "Vorsicht, nach Bestätigung ist die Entität '{{entityName}}' nicht mehr mit der aktuellen Entität verbunden.",
-    "delete-to-relations-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Beziehung} other {# Beziehungen} } wirklich löschen?",
+    "delete-to-relations-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Beziehung} other {# Beziehungen} } wirklich löschen?",
     "delete-to-relations-text": "Vorsicht, nach Bestätigung werden alle ausgewählten Beziehungen entfernt und die entsprechenden Entitäten sind nicht mehr mit der aktuellen Entität verbunden.",
     "delete-from-relation-title": "Sind Sie sicher, dass Sie die Verbindung aus der Entität '{{entityName}}' löschen möchten?",
     "delete-from-relation-text": "Vorsicht, nach Bestätigung wird die aktuelle Entität '{{entityName}}' von der Entität unabhängig sein.",
-    "delete-from-relations-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Beziehung} other {# Beziehungen} } löschen möchten?",
+    "delete-from-relations-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Beziehung} other {# Beziehungen} } löschen möchten?",
     "delete-from-relations-text": "Vorsicht, nach Bestätigung werden alle ausgewählten Beziehungen entfernt und die aktuellen Entität wird nicht mehr mit den entsprechenden Entitäten verknüpft sein.",
     "remove-relation-filter": "Beziehungsfilter entfernen",
     "add-relation-filter": "Beziehungsfilter hinzufügen",
@@ -1436,8 +1436,8 @@
     "set-root-rulechain-text": "Nach der Bestätigung wird die Regelkette zur Wurzel und bearbeitet alle eingehenden Transportnachrichten.",
     "delete-rulechain-title": "Sind Sie sicher, dass Sie die Regelkette '{{ruleChainName}}' löschen möchten?",
     "delete-rulechain-text": "Vorsichtig, nach Bestätigung werden die Regelkette und alle zugehörigen Daten gelöscht.",
-    "delete-rulechains-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Regelkette} other {# Regelketten} } löschen möchten?",
-    "delete-rulechains-action-title": "{ count, plural, 1 {1 Regelkette} other {# Regelketten} } löschen",
+    "delete-rulechains-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Regelkette} other {# Regelketten} } löschen möchten?",
+    "delete-rulechains-action-title": "{ count, plural, =1 {1 Regelkette} other {# Regelketten} } löschen",
     "delete-rulechains-text": "Vorsichtig, nach Bestätigung werden alle ausgewählten Regelketten entfernt und alle zugehörigen Daten werden gelöscht.",
     "add-rulechain-text": "Neue Regelkette hinzufügen",
     "no-rulechains-text": "Keine Regelkette gefunden",
@@ -1465,7 +1465,7 @@
     "unassign-rulechains": "Nicht zugeordnete Regelketten",
     "unassign-rulechain-title": "Möchten Sie die Zuordnung die Regelkette '{{ruleChainTitle}}' wirklich aufheben?",
     "unassign-rulechain-from-edge-text": "Nach der Bestätigung wird die Zuordnung aller ausgewählten Regelkette aufgehoben und sie sind für den Rand nicht mehr zugänglich.",
-    "unassign-rulechains-from-edge-action-title": "Zuordnung { count, plural, 1 {1 Regelkette} other {# Regelketten} } vom Rand aufheben",
+    "unassign-rulechains-from-edge-action-title": "Zuordnung { count, plural, =1 {1 Regelkette} other {# Regelketten} } vom Rand aufheben",
     "unassign-rulechains-from-edge-text": "Nach der Bestätigung wird die Zuordnung aller ausgewählten Regelketten aufgehoben und sie sind für den Rand nicht mehr zugänglich.",
     "assign-rulechain-to-edge-title": "Regelkette(n) dem Rand zuordnen",
     "assign-rulechain-to-edge-text": "Bitte wählen Sie die Regelketten aus, die Sie dem Rand zuordnen möchten",
@@ -1481,7 +1481,7 @@
     "unset-auto-assign-to-edge-text": "Nach der Bestätigung wird die Kantenregelkette bei der Erstellung nicht mehr automatisch den Kanten zugewiesen.",
     "edge-template-root": "Vorlagenstamm",
     "search": "Suchen Sie nach Regelketten",
-    "selected-rulechains": "{count, plural, 1 {1 Regelkette} other {# Regelketten} } ausgewählt",
+    "selected-rulechains": "{count, plural, =1 {1 Regelkette} other {# Regelketten} } ausgewählt",
     "open-rulechain": "Regelkette öffnen",
     "assign-to-edge": "Rand zuweisen",
     "edge-rulechain": "Kantenregelkette"
@@ -1562,8 +1562,8 @@
     "tenant-details": "Mandantendetails",
     "delete-tenant-title": "Möchten Sie den Mandanten '{{tenantTitle}}' wirklich löschen?",
     "delete-tenant-text": "Vorsicht, nach Bestätigung werden der Mandant und alle zugehörigen Daten gelöscht.",
-    "delete-tenants-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Mandant} other {# Mandanten} } löschen möchten?",
-    "delete-tenants-action-title": "{ count, plural, 1 {1 Mandant} other {# Mandanten} } löschen",
+    "delete-tenants-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Mandant} other {# Mandanten} } löschen möchten?",
+    "delete-tenants-action-title": "{ count, plural, =1 {1 Mandant} other {# Mandanten} } löschen",
     "delete-tenants-text": "Vorsicht, nach Bestätigung werden alle ausgewählten Mandanten entfernt und alle zugehörigen Daten werden gelöscht.",
     "title": "Titel",
     "title-required": "Titel ist erforderlich.",
@@ -1577,10 +1577,10 @@
     "tenant-required": "Mandant ist erforderlich"
   },
   "timeinterval": {
-    "seconds-interval": "{ seconds, plural, 1 {1 Sekunde} other {# Sekunden} }",
-    "minutes-interval": "{ minutes, plural, 1 {1 Minute} other {# Minuten} }",
-    "hours-interval": "{ hours, plural, 1 {1 Stunde} other {# Stunden} }",
-    "days-interval": "{ days, plural, 1 {1 Tag} other {# Tage} }",
+    "seconds-interval": "{ seconds, plural, =1 {1 Sekunde} other {# Sekunden} }",
+    "minutes-interval": "{ minutes, plural, =1 {1 Minute} other {# Minuten} }",
+    "hours-interval": "{ hours, plural, =1 {1 Stunde} other {# Stunden} }",
+    "days-interval": "{ days, plural, =1 {1 Tag} other {# Tage} }",
     "days": "Tage",
     "hours": "Stunden",
     "minutes": "Minuten",
@@ -1588,10 +1588,10 @@
     "advanced": "Erweitert"
   },
   "timewindow": {
-    "days": "{ days, plural, 1 { Tag } other {# Tage } }",
-    "hours": "{ hours, plural, 0 { Stunde } 1 {1 Stunde } other {# Stunden } }",
-    "minutes": "{ minutes, plural, 0 { Minute } 1 {1 Minute } other {# Minuten } }",
-    "seconds": "{ seconds, plural, 0 { Sekunde } 1 {1 Sekunde } other {# Sekunden } }",
+    "days": "{ days, plural, =1 { Tag } other {# Tage } }",
+    "hours": "{ hours, plural, =0 { Stunde } =1 {1 Stunde } other {# Stunden } }",
+    "minutes": "{ minutes, plural, =0 { Minute } =1 {1 Minute } other {# Minuten } }",
+    "seconds": "{ seconds, plural, =0 { Sekunde } =1 {1 Sekunde } other {# Sekunden } }",
     "realtime": "Echtzeit",
     "history": "Historie",
     "last-prefix": "letzte",
@@ -1617,8 +1617,8 @@
     "user-details": "Benutzer-Details",
     "delete-user-title": "Möchten Sie den Benutzer '{{userEmail}}' wirklich löschen?",
     "delete-user-text": "Vorsicht, nach Bestätigung werden der Benutzer und alle zugehörigen Daten gelöscht.",
-    "delete-users-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Benutzer} other {# Benutzer} } löschen möchten??",
-    "delete-users-action-title": "{ count, plural, 1 {1 Benutzer} other {# Benutzer} } löschen",
+    "delete-users-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Benutzer} other {# Benutzer} } löschen möchten??",
+    "delete-users-action-title": "{ count, plural, =1 {1 Benutzer} other {# Benutzer} } löschen",
     "delete-users-text": "Vorsicht, nach Bestätigung werden alle ausgewählten Benutzer entfernt und alle zugehörigen Daten werden gelöscht.",
     "activation-email-sent-message": "Aktivierungs E-Mail wurde erfolgreich gesendet!",
     "resend-activation": "Aktivierung erneut senden",
@@ -1741,8 +1741,8 @@
     "widgets-bundle-details": "Widget-Paket-Details",
     "delete-widgets-bundle-title": "Möchten Sie das Widget-Paket '{{widgetsBundleTitle}}' wirklich löschen? ",
     "delete-widgets-bundle-text": "Seien Sie vorsichtig, nach der Bestätigung werden das Widget-Paket und alle zugehörigen Daten gelöscht.",
-    "delete-widgets-bundles-title": "Sind Sie sicher, dass Sie { count, plural, 1 {1 Widget-Paket} other {# Widget-Pakete} } löschen möchten?",
-    "delete-widgets-bundles-action-title": "{ count, plural, 1 {1 Widgets-Paket} other {# Widget-Pakete} } löschen",
+    "delete-widgets-bundles-title": "Sind Sie sicher, dass Sie { count, plural, =1 {1 Widget-Paket} other {# Widget-Pakete} } löschen möchten?",
+    "delete-widgets-bundles-action-title": "{ count, plural, =1 {1 Widgets-Paket} other {# Widget-Pakete} } löschen",
     "delete-widgets-bundles-text": "Vorsicht, nach Bestätigung werden alle ausgewählten Widget-Pakete entfernt und alle zugehörigen Daten werden gelöscht.",
     "no-widgets-bundles-matching": "Keine passenden Widget-Pakete '{{widgetsBundle}}' gefunden.",
     "widgets-bundle-required": "Widget-Paket ist erforderlich.",
@@ -1780,7 +1780,7 @@
     "display-timewindow": "Zeitfenster anzeigen",
     "display-legend": "Legende anzeigen",
     "datasources": "Datenquellen",
-    "maximum-datasources": "Maximal { count, plural, 1 {1 Datenquelle ist erlaubt} other {# Datenquellen sind erlaubt} }.",
+    "maximum-datasources": "Maximal { count, plural, =1 {1 Datenquelle ist erlaubt} other {# Datenquellen sind erlaubt} }.",
     "datasource-type": "Typ",
     "datasource-parameters": "Parameter",
     "remove-datasource": "Datenquelle entfernen",
diff --git a/ui-ngx/src/assets/locale/locale.constant-el_GR.json b/ui-ngx/src/assets/locale/locale.constant-el_GR.json
index b66e02ba26..53944625ae 100644
--- a/ui-ngx/src/assets/locale/locale.constant-el_GR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-el_GR.json
@@ -149,17 +149,17 @@
     "acknowledge": "Επιβεβαίωση",
     "clear": "Εκκαθάριση",
     "search": "Αναζήτηση alarm",
-    "selected-alarms": "{ count, plural, 1 {1 alarm} other {# alarms} } επιλέχθηκαν",
+    "selected-alarms": "{ count, plural, =1 {1 alarm} other {# alarms} } επιλέχθηκαν",
     "no-data": "Δεν υπάρχουν δεδομένα για εμφάνιση",
     "polling-interval": "Διάστημα δειγματοληψίας alarm(sec)",
     "polling-interval-required": "Απαιτείται ορισμός διαστήματος δειγματοληψίας alarm.",
     "min-polling-interval-message": "Η ελάχιστη επιτρεπόμενη τιμή διαστήματος δειγματοληψίας alarm είναι 1 sec.",
-    "aknowledge-alarms-title": "Επιβεβαίωση { count, plural, 1 {1 alarm} other {# alarms} }",
-    "aknowledge-alarms-text": "Είστε σίγουρος ότι θέλετε να επιβεβαιώσετε { count, plural, 1 {1 alarm} other {# alarms} };",
+    "aknowledge-alarms-title": "Επιβεβαίωση { count, plural, =1 {1 alarm} other {# alarms} }",
+    "aknowledge-alarms-text": "Είστε σίγουρος ότι θέλετε να επιβεβαιώσετε { count, plural, =1 {1 alarm} other {# alarms} };",
     "aknowledge-alarm-title": "Επιβεβαίωση Alarm",
     "aknowledge-alarm-text": "Είστε σίγουρος ότι θέλετε να επιβεβαιώσετε το Alarm?",
-    "clear-alarms-title": "Εκκαθάριση { count, plural, 1 {1 alarm} other {# alarms} }",
-    "clear-alarms-text": "Είστε σίγουρος ότι θέλετε να εκκαθαρίσετε { count, plural, 1 {1 alarm} other {# alarms} }?",
+    "clear-alarms-title": "Εκκαθάριση { count, plural, =1 {1 alarm} other {# alarms} }",
+    "clear-alarms-text": "Είστε σίγουρος ότι θέλετε να εκκαθαρίσετε { count, plural, =1 {1 alarm} other {# alarms} }?",
     "clear-alarm-title": "Εκκαθάριση Alarm",
     "clear-alarm-text": "Είστε σίγουρος ότι θέλετε να εκκαθαρίσετε το Alarm?",
     "alarm-status-filter": "Φίλτρο κατάστασης Alarm"
@@ -251,15 +251,15 @@
     "add-asset-text": "Προσθήκη νέου Asset",
     "asset-details": "Λεπτομέρειες Asset",
     "assign-assets": "Ανάθεση Assets",
-    "assign-assets-text": "Ανάθεση { count, plural, 1 {1 asset} other {# assets} } σε πελάτη",
+    "assign-assets-text": "Ανάθεση { count, plural, =1 {1 asset} other {# assets} } σε πελάτη",
     "delete-assets": "Διαγραφή Assets",
     "unassign-assets": "Αποσύνδεση Assets",
-    "unassign-assets-action-title": "Αποσύνδεση { count, plural, 1 {1 asset} other {# assets} } από πελάτη",
+    "unassign-assets-action-title": "Αποσύνδεση { count, plural, =1 {1 asset} other {# assets} } από πελάτη",
     "assign-new-asset": "Ανάθεση νέου Asset",
     "delete-asset-title": "Είστε βέβαιοι ότι θέλετε να διαγράψετε το Asset '{{assetName}}'?",
     "delete-asset-text": "Προσοχή!, Μετά την επιβεβαίωση, το Asset και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-assets-title": "Είστε βέβαιοι ότι θέλετε να διαγράψετε { count, plural, 1 {1 asset} other {# assets} };",
-    "delete-assets-action-title": "Διαγραφή { count, plural, 1 {1 asset} other {# assets} }",
+    "delete-assets-title": "Είστε βέβαιοι ότι θέλετε να διαγράψετε { count, plural, =1 {1 asset} other {# assets} };",
+    "delete-assets-action-title": "Διαγραφή { count, plural, =1 {1 asset} other {# assets} }",
     "delete-assets-text": "Προσοχή! Μετά την επιβεβαίωση, όλα τα επιλεγμένα Asset και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "make-public-asset-title": "Είστε βέβαιοι ότι θέλετε να κάνετε το Asset '{{assetName}}' δημόσιο;",
     "make-public-asset-text": "Μετά την επιβεβαίωση, το Asset και όλα τα στοιχεία του θα είναι προσβάσιμα από άλλους.",
@@ -268,7 +268,7 @@
     "unassign-asset-title": "Είστε βέβαιοι ότι θέλετε να αποσυνδέσετε το Asset '{{assetName}}';",
     "unassign-asset-text": "Μετά την επιβεβαίωση, το Asset θα αποσυνδεθεί και δεν θα είναι προσβάσιμο από τον πελάτη.",
     "unassign-asset": "Αποσύνδεση Asset",
-    "unassign-assets-title": "Είστε βέβαιοι ότι θέλετε να αποσυνδέσετε { count, plural, 1 {1 asset} other {# assets} };",
+    "unassign-assets-title": "Είστε βέβαιοι ότι θέλετε να αποσυνδέσετε { count, plural, =1 {1 asset} other {# assets} };",
     "unassign-assets-text": "Μετά την επιβεβαίωση, όλα τα επιλεγμένα Asset θα αποσυνδεθούν και δεν θα είναι προσβάσιμα από τον πελάτη.",
     "copyId": "Αντιγραφή Asset Id",
     "idCopiedMessage": "Το Asset Id αντιγράφηκε στο πρόχειρο",
@@ -276,13 +276,13 @@
     "no-assets-matching": "Δεν βρέθηκαν Asset που να ταιριάζουν με '{{entity}}'.",
     "asset-required": "Απαιτείται Asset",
     "name-starts-with": "Όνομα Asset που ξεκινάει με",
-    "selected-assets": "{ count, plural, 1 {1 asset} other {# assets} } επιλέχθηκαν",
+    "selected-assets": "{ count, plural, =1 {1 asset} other {# assets} } επιλέχθηκαν",
     "search": "Αναζήτηση Asset",
     "select-group-to-add": "Επιλέξτε ομάδα στόχο για να προσθέσετε επιλεγμένα Asset",
     "select-group-to-move": "Επιλέξτε ομάδα στόχο για να μετακινήσετε επιλεγμένα assets",
-    "remove-assets-from-group": "Είστε βέβαιοι ότι θέλετε να καταργήσετε { count, plural, 1 {1 asset} other {# assets} } από την ομάδα '{entityGroup}';",
+    "remove-assets-from-group": "Είστε βέβαιοι ότι θέλετε να καταργήσετε { count, plural, =1 {1 asset} other {# assets} } από την ομάδα '{entityGroup}';",
     "group": "Ομάδα Asset",
-    "list-of-groups": "{ count, plural, 1 {One asset group} other {List of # asset groups} }",
+    "list-of-groups": "{ count, plural, =1 {One asset group} other {List of # asset groups} }",
     "group-name-starts-with": "Ομάδες Asset των οποίων τα ονόματα ξεκινούν με '{{prefix}}'",
     "import": "Εισαγωγή Asset",
     "asset-file": "Αρχείο Asset"
@@ -302,7 +302,7 @@
     "key-required": "Απαιτείται μεταβλητή χαρακτηριστικού.",
     "value": "Τιμή",
     "value-required": "Απαιτείται ορισμός τιμής χαρακτηριστικού.",
-    "delete-attributes-title": "Είστε βέβαιοι ότι θέλετε να διαγράψετε { count, plural, 1 {1 attribute} other {# attributes} };",
+    "delete-attributes-title": "Είστε βέβαιοι ότι θέλετε να διαγράψετε { count, plural, =1 {1 attribute} other {# attributes} };",
     "delete-attributes-text": "Προσοχή! Μετά την επιβεβαίωση θα αφαιρεθούν όλα τα επιλεγμένα χαρακτηριστικά.",
     "delete-attributes": "Διαγραφή χαρακτηριστικών",
     "enter-attribute-value": "Καταχωρίστε την τιμή του χαρακτηριστικού",
@@ -312,8 +312,8 @@
     "prev-widget": "Προηγούμενο widget",
     "add-to-dashboard": "Προσθήκη σε dashboard",
     "add-widget-to-dashboard": "Προσθήκη widget στο dashboard",
-    "selected-attributes": "{ count, plural, 1 {1 attribute} other {# attributes} } επιλέχθηκαν",
-    "selected-telemetry": "{ count, plural, 1 {1 telemetry unit} other {# telemetry units} } επιλέχθηκαν"
+    "selected-attributes": "{ count, plural, =1 {1 attribute} other {# attributes} } επιλέχθηκαν",
+    "selected-telemetry": "{ count, plural, =1 {1 telemetry unit} other {# telemetry units} } επιλέχθηκαν"
   },
   "audit-log": {
     "audit": "Καταγραφή",
@@ -392,11 +392,11 @@
     "management": "Διαχείριση μετατροπέων δεδομένων",
     "add-converter-text": "Προσθήκη νέου μετατροπέα δεδομένων",
     "no-converters-text": "Δεν βρέθηκαν μετατροπείς δεδομένων",
-    "selected-converters": "{ count, plural, 1 {1 data converter} other {# data converters} } επιλέχθηκαν",
+    "selected-converters": "{ count, plural, =1 {1 data converter} other {# data converters} } επιλέχθηκαν",
     "delete-converter-title": "Είστε βέβαιοι ότι θέλετε να διαγράψετε τον μετατροπέα δεδομένων '{{converterName}}'?",
     "delete-converter-text": "Προσέξτε, μετά την επιβεβαίωση, ο μετατροπέας δεδομένων και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-converters-title": "Είστε βέβαιοι ότι θέλετε να διαγράψετε { count, plural, 1 {1 data converter} other {# data converters} };",
-    "delete-converters-action-title": "Διαγραφή { count, plural, 1 {1 data converter} other {# data converters} }",
+    "delete-converters-title": "Είστε βέβαιοι ότι θέλετε να διαγράψετε { count, plural, =1 {1 data converter} other {# data converters} };",
+    "delete-converters-action-title": "Διαγραφή { count, plural, =1 {1 data converter} other {# data converters} }",
     "delete-converters-text": "Προσοχή! Μετά την επιβεβαίωση, όλοι οι επιλεγμένοι μετατροπείς δεδομένων και όλα τα σχετικά δεδομένα θα καταστούν μη ανακτήσιμα.",
     "events": "Γεγονότα",
     "add": "Προσθήκη μετατροπέα δεδομένων",
@@ -477,8 +477,8 @@
     "customer-details": "Λεπτομέρειες πελάτη",
     "delete-customer-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε τον πελάτη '{{customerTitle}}'?",
     "delete-customer-text": "Προσέξτε, μετά την επιβεβαίωση, ο πελάτης και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-customers-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, 1 {1 customer} other {# customers} }?",
-    "delete-customers-action-title": "Διαγραφή { count, plural, 1 {1 customer} other {# customers} }",
+    "delete-customers-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, =1 {1 customer} other {# customers} }?",
+    "delete-customers-action-title": "Διαγραφή { count, plural, =1 {1 customer} other {# customers} }",
     "delete-customers-text": "Προσέξτε, μετά την επιβεβαίωση, οι πελάτες και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "manage-user-groups": "Διαχείρηση ομαδών χρηστών",
     "manage-asset-groups": "Διαχείρηση ομαδών οντοτήτων",
@@ -499,13 +499,13 @@
     "select-customer": "Επιλέξτε πελάτη",
     "no-customers-matching": "Δεν βρέθηκαν πελάτες που να αντιστοιχούν σε '{{entity}}'.",
     "customer-required": "Απαιτείται πελάτης",
-    "selected-customers": "{ count, plural, 1 {1 customer} other {# customers} } επιλέχθηκαν",
+    "selected-customers": "{ count, plural, =1 {1 customer} other {# customers} } επιλέχθηκαν",
     "search": "Αναζήτηση πελατών",
     "select-group-to-add": "Επιλέξτε ομάδα για να προσθέσετε τους επιλεγμένους πελάτες",
     "select-group-to-move": "Επιλέξτε ομάδα για να μετακινήσετε τους επιλεγμένους πελάτες",
-    "remove-customers-from-group": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε { count, plural, 1 {1 customer} other {# customers} } από την ομάδα '{entityGroup}'?",
+    "remove-customers-from-group": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε { count, plural, =1 {1 customer} other {# customers} } από την ομάδα '{entityGroup}'?",
     "group": "Ομάδα πελατών",
-    "list-of-groups": "{ count, plural, 1 {One customer group} other {List of # customer groups} }",
+    "list-of-groups": "{ count, plural, =1 {One customer group} other {List of # customer groups} }",
     "group-name-starts-with": "Πελάτες των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "select-default-customer": "Επιλογή προεπιλεγμένου πελάτη",
     "default-customer": "Προεπιλεγμένος πελάτης",
@@ -573,20 +573,20 @@
     "add-dashboard-text": "Προσθέστε νέο dashboard",
     "assign-dashboards": "Αναθέστε dashboards",
     "assign-new-dashboard": "Ανάθεση νέου dashboard",
-    "assign-dashboards-text": "Ανάθεση { count, plural, 1 {1 dashboard} other {# dashboards} } σε πελάτες",
-    "unassign-dashboards-action-text": "Μη ανατεθειμένο/α { count, plural, 1 {1 dashboard} other {# dashboards} } από πελάτες",
+    "assign-dashboards-text": "Ανάθεση { count, plural, =1 {1 dashboard} other {# dashboards} } σε πελάτες",
+    "unassign-dashboards-action-text": "Μη ανατεθειμένο/α { count, plural, =1 {1 dashboard} other {# dashboards} } από πελάτες",
     "delete-dashboards": "Διαγραφή dashboards",
     "unassign-dashboards": "Αφαίρεση dashboards",
-    "unassign-dashboards-action-title": "Αφαίρεση { count, plural, 1 {1 dashboard} other {# dashboards} } από πελάτη",
+    "unassign-dashboards-action-title": "Αφαίρεση { count, plural, =1 {1 dashboard} other {# dashboards} } από πελάτη",
     "delete-dashboard-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε το dashboard '{{dashboardTitle}}'?",
     "delete-dashboard-text": "Προσοχή, μετά την επιβεβαίωση, το dashboard και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-dashboards-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, 1 {1 dashboard} other {# dashboards} }?",
-    "delete-dashboards-action-title": "Διααγραφή { count, plural, 1 {1 dashboard} other {# dashboards} }",
+    "delete-dashboards-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, =1 {1 dashboard} other {# dashboards} }?",
+    "delete-dashboards-action-title": "Διααγραφή { count, plural, =1 {1 dashboard} other {# dashboards} }",
     "delete-dashboards-text": "Προσοχή, μετά την επιβεβαίωση, όλα τα επιλεγμένα dashboards και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "unassign-dashboard-title": "Είστε σίγουρου ότι θέλετε να αφαιρέσετε το dashboard '{{dashboardTitle}}'?",
     "unassign-dashboard-text": "Μετά την επιβεβαίωση το dashboard θα αφαιρεθεί και δεν θα είναι διαθέσιμο στον πελάτη.",
     "unassign-dashboard": "Αφαίρεση dashboard",
-    "unassign-dashboards-title": "Είστε σίγουρου ότι θέλετε να αφαιρέσετε { count, plural, 1 {1 dashboard} other {# dashboards} }?",
+    "unassign-dashboards-title": "Είστε σίγουρου ότι θέλετε να αφαιρέσετε { count, plural, =1 {1 dashboard} other {# dashboards} }?",
     "unassign-dashboards-text": "Μετά την επιβεβαίωση όλα τα επιλεγμένα dashboards θα αφαιρεθούν και δεν θα είναι διαθέσιμα στον πελάτη.",
     "public-dashboard-title": "Το dashboard είναι δημόσιο",
     "public-dashboard-text": "Το dashboard <b>{{dashboardTitle}}</b> είναι δημόσιο και διαθέσιμο μέσω του παρακάτω <a href='{{publicLink}}' target='_blank'>συνδέσμου</a>:",
@@ -671,7 +671,7 @@
     "manage-states": "Διαχείρηση κατάστασης dashboard",
     "states": "Κατάσταση dashboard",
     "search-states": "Αναζήτηση σε κατάσταση dashboard",
-    "selected-states": "{ count, plural, 1 {1 dashboard state} other {# dashboard states} } επιλεγμένα",
+    "selected-states": "{ count, plural, =1 {1 dashboard state} other {# dashboard states} } επιλεγμένα",
     "edit-state": "Επεξεργασία κατάστασης dashboard",
     "delete-state": "Διαγραφή κατάστασης dashboard",
     "add-state": "Προσθήκη κατάστασης dashboard",
@@ -688,13 +688,13 @@
     "hide-details": "Απόκρυψη λεπτομερειών",
     "select-state": "Επιλογή κατάστασης",
     "state-controller": "Έλεγχος κατάστασης",
-    "selected-dashboards": "{ count, plural, 1 {1 dashboard} other {# dashboards} } επιλεγμένα",
+    "selected-dashboards": "{ count, plural, =1 {1 dashboard} other {# dashboards} } επιλεγμένα",
     "search": "Αναζήτηση dashboards",
     "select-group-to-add": "Επιλογή ομάδας για να προστεθεί στα επιλεγμένα dashboards",
     "select-group-to-move": "Επιλογή ομάδας για να μετακινηθεί στα επιλεγμένα dashboards",
-    "remove-dashboards-from-group": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε { count, plural, 1 {1 dashboard} other {# dashboards} } from group '{entityGroup}'?",
+    "remove-dashboards-from-group": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε { count, plural, =1 {1 dashboard} other {# dashboards} } from group '{entityGroup}'?",
     "group": "Ομάδα dashboards",
-    "list-of-groups": "{ count, plural, 1 {One dashboard group} other {List of # dashboard groups} }",
+    "list-of-groups": "{ count, plural, =1 {One dashboard group} other {List of # dashboard groups} }",
     "group-name-starts-with": "Ομάδες dashboard των οποίων το όνομα αρχίζει από '{{prefix}}'"
   },
   "datakey": {
@@ -712,11 +712,11 @@
     "alarm": "Πεδία alarm",
     "timeseries-required": "Απαιτείται χρονική σειρά οντοτήτων.",
     "timeseries-or-attributes-required": "Απαιτείται χρονική σειρά/ιδιώτητες οντοτήτων.",
-    "maximum-timeseries-or-attributes": "Μέγιστο { count, plural, 1 {1 timeseries/attribute is allowed.} other {# timeseries/attributes are allowed} }",
+    "maximum-timeseries-or-attributes": "Μέγιστο { count, plural, =1 {1 timeseries/attribute is allowed.} other {# timeseries/attributes are allowed} }",
     "alarm-fields-required": "Απαιτούνται πεδία alarm.",
     "function-types": "Τύποι λειτουργιών",
     "function-types-required": "Απαιτούνται τύποι λειτουργιών.",
-    "maximum-function-types": "Μέγιστο { count, plural, 1 {1 function type is allowed.} other {# function types are allowed} }",
+    "maximum-function-types": "Μέγιστο { count, plural, =1 {1 function type is allowed.} other {# function types are allowed} }",
     "time-description": "χρονικό σημείο της συγκεκριμένης τιμής",
     "value-description": "η συγκεκριμένη τιμή",
     "prev-value-description": "αποτέλεσμα της προηγούμενης λειτουργίας",
@@ -774,11 +774,11 @@
     "manage-credentials": "Διαχείρηση διαπιστευτηρίων",
     "delete": "Διαγραφή συσκευής",
     "assign-devices": "Ανάθεση συσκευών",
-    "assign-devices-text": "Ανάθεση { count, plural, 1 {1 device} other {# devices} } σε πελάτη",
+    "assign-devices-text": "Ανάθεση { count, plural, =1 {1 device} other {# devices} } σε πελάτη",
     "delete-devices": "Διαγραφή συσκευών",
     "unassign-from-customer": "Αφαίρεση από πελάτη",
     "unassign-devices": "Αφαίρεση συσκευών",
-    "unassign-devices-action-title": "Αφαίρεση { count, plural, 1 {1 device} other {# devices} } από πελάτη",
+    "unassign-devices-action-title": "Αφαίρεση { count, plural, =1 {1 device} other {# devices} } από πελάτη",
     "assign-new-device": "Ανάθεση νέων συσκευών",
     "make-public-device-title": "Είστε σίγουροι ότι θέλετε να κάνετε τη συσκευή '{{deviceName}}' δημόσια;",
     "make-public-device-text": "Μετά από την επιβεβαίωσή σας η συσκευή και όλα τα δεδομένα της θα είναι δημόσια και διαθέσιμα σε τρίτους.",
@@ -787,13 +787,13 @@
     "view-credentials": "Προβολή διαπιστευτηρίων",
     "delete-device-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε την συσκευή '{{deviceName}}';",
     "delete-device-text": "Προσοχή, μετά την επιβεβαίωση, η συσκευή και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-devices-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, 1 {1 device} other {# devices} };",
-    "delete-devices-action-title": "Διαγραφή { count, plural, 1 {1 device} other {# devices} }",
+    "delete-devices-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, =1 {1 device} other {# devices} };",
+    "delete-devices-action-title": "Διαγραφή { count, plural, =1 {1 device} other {# devices} }",
     "delete-devices-text": "Προσοχή, μετά την επιβεβαίωση, όλες οι επιλεγμένες συσκευές θα αφαιρεθούν και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "unassign-device-title": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε την συσκευή '{{deviceName}}'?",
     "unassign-device-text": "Μετά την επιβεβαίωση, η συσκευή θα αφαιρεθεί και δεν θα είναι προσβάσιμες από τον πελάτη.",
     "unassign-device": "Αφαίρεση συσκευής",
-    "unassign-devices-title": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε { count, plural, 1 {1 device} other {# devices} }?",
+    "unassign-devices-title": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε { count, plural, =1 {1 device} other {# devices} }?",
     "unassign-devices-text": "Μετά την επιβεβαίωση, όλες οι επιλεγμένες συσκευές θα καταργηθούν και δεν θα είναι προσβάσιμες από τον πελάτη.",
     "device-credentials": "Πιστοποιητικά συσκευής",
     "credentials-type": "Τύπος διαπιστευτηρίων",
@@ -827,13 +827,13 @@
     "public": "Δημόσιο",
     "device-public": "Η συσκευή είναι δημόσια",
     "select-device": "Επιλογή συσκευής",
-    "selected-devices": "{ count, plural, 1 {1 device} other {# devices} } επιλέχθηκαν",
+    "selected-devices": "{ count, plural, =1 {1 device} other {# devices} } επιλέχθηκαν",
     "search": "Αναζήτηση συσκευών",
     "select-group-to-add": "Επιλέξτε την ομάδα στην οποία θα προστεθουν οι επιλεγμένες συσκευές",
     "select-group-to-move": "Επιλέξτε την ομάδα στην οποία θα μετακινηθούν οι επιλεγμένες συσκευές",
-    "remove-devices-from-group": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε { count, plural, 1 {1 device} other {# devices} } from group '{entityGroup}'?",
+    "remove-devices-from-group": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε { count, plural, =1 {1 device} other {# devices} } from group '{entityGroup}'?",
     "group": "Ομάδα Συσκευών",
-    "list-of-groups": "{ count, plural, 1 {One device group} other {List of # device groups} }",
+    "list-of-groups": "{ count, plural, =1 {One device group} other {List of # device groups} }",
     "group-name-starts-with": "Ομάδες συσκευών των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "import": "Εισαγωγή συσκευής",
     "device-file": "Αρχείο συσκευής"
@@ -892,63 +892,63 @@
     "type-required": "Απαιτείται τύπος οντότητας.",
     "type-device": "Συσκευή",
     "type-devices": "Συσκευές",
-    "list-of-devices": "{ count, plural, 1 {One device} other {List of # devices} }",
+    "list-of-devices": "{ count, plural, =1 {One device} other {List of # devices} }",
     "device-name-starts-with": "Συσκευές των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-asset": "Asset",
     "type-assets": "Assets",
-    "list-of-assets": "{ count, plural, 1 {One asset} other {List of # assets} }",
+    "list-of-assets": "{ count, plural, =1 {One asset} other {List of # assets} }",
     "asset-name-starts-with": "Assets των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-entity-view": "Προβολή οντότητας",
     "type-entity-views": "Προβολές οντότητας",
-    "list-of-entity-views": "{ count, plural, 1 {One entity view} other {List of # entity views} }",
+    "list-of-entity-views": "{ count, plural, =1 {One entity view} other {List of # entity views} }",
     "entity-view-name-starts-with": "Προβολές οντότητας των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-rule": "Κανόνας",
     "type-rules": "Κανόνες",
-    "list-of-rules": "{ count, plural, 1 {One rule} other {List of # rules} }",
+    "list-of-rules": "{ count, plural, =1 {One rule} other {List of # rules} }",
     "rule-name-starts-with": "Κανόνες των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-plugin": "Πρόσθετο",
     "type-plugins": "Προσθετα",
-    "list-of-plugins": "{ count, plural, 1 {One plugin} other {List of # plugins} }",
+    "list-of-plugins": "{ count, plural, =1 {One plugin} other {List of # plugins} }",
     "plugin-name-starts-with": "Πρόσθετα των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-tenant": "Μισθωτής",
     "type-tenants": "Μισθωτές",
-    "list-of-tenants": "{ count, plural, 1 {One tenant} other {List of # tenants} }",
+    "list-of-tenants": "{ count, plural, =1 {One tenant} other {List of # tenants} }",
     "tenant-name-starts-with": "Μισθωτές των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-customer": "Πελάτης",
     "type-customers": "Πελάτες",
-    "list-of-customers": "{ count, plural, 1 {One customer} other {List of # customers} }",
+    "list-of-customers": "{ count, plural, =1 {One customer} other {List of # customers} }",
     "customer-name-starts-with": "Πελάτες των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-user": "Χρήστης",
     "type-users": "Χρήστες",
-    "list-of-users": "{ count, plural, 1 {One user} other {List of # users} }",
+    "list-of-users": "{ count, plural, =1 {One user} other {List of # users} }",
     "user-name-starts-with": "Χρήστες των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-dashboard": "Dashboard",
     "type-dashboards": "Dashboards",
-    "list-of-dashboards": "{ count, plural, 1 {One dashboard} other {List of # dashboards} }",
+    "list-of-dashboards": "{ count, plural, =1 {One dashboard} other {List of # dashboards} }",
     "dashboard-name-starts-with": "Dashboards των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-alarm": "Alarm",
     "type-alarms": "Alarms",
-    "list-of-alarms": "{ count, plural, 1 {One alarms} other {List of # alarms} }",
+    "list-of-alarms": "{ count, plural, =1 {One alarms} other {List of # alarms} }",
     "alarm-name-starts-with": "Alarms των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-rulechain": "Αλυσίδα Κανόνων",
     "type-rulechains": "Αλυσίδες Κανόνων",
-    "list-of-rulechains": "{ count, plural, 1 {One rule chain} other {List of # rule chains} }",
+    "list-of-rulechains": "{ count, plural, =1 {One rule chain} other {List of # rule chains} }",
     "rulechain-name-starts-with": "Αλυσίδες Κανόνων των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-scheduler-event": "Προγραμματιστής",
     "type-scheduler-events": "Προγραμματιστής",
-    "list-of-scheduler-events": "{ count, plural, 1 {One scheduler event} other {List of # scheduler events} }",
+    "list-of-scheduler-events": "{ count, plural, =1 {One scheduler event} other {List of # scheduler events} }",
     "scheduler-event-name-starts-with": "Προγραμματιστές γεγονότων των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-blob-entity": "Ογκώδη οντότητα",
     "type-blob-entities": "Ογκώδεις οντότητες",
-    "list-of-blob-entities": "{ count, plural, 1 {One blob entity} other {List of # blob entities} }",
+    "list-of-blob-entities": "{ count, plural, =1 {One blob entity} other {List of # blob entities} }",
     "blob-entity-name-starts-with": "Ογκώδεις οντότητες των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-rulenode": "Κόμβος κανόνα",
     "type-rulenodes": "Κόμβοι κανόνων",
-    "list-of-rulenodes": "{ count, plural, 1 {One rule node} other {List of # rule nodes} }",
+    "list-of-rulenodes": "{ count, plural, =1 {One rule node} other {List of # rule nodes} }",
     "rulenode-name-starts-with": "Κόμβοι κανόνων των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-current-customer": "Τρέχον Πελάτης",
     "search": "Αναζήτηση Οντότητες",
-    "selected-entities": "{ count, plural, 1 {1 entity} other {# entities} } επιλεγμένα",
+    "selected-entities": "{ count, plural, =1 {1 entity} other {# entities} } επιλεγμένα",
     "entity-name": "Όνομα οντότητας",
     "details": "Λεπτομέρειες οντότητας",
     "no-entities-prompt": "Δεν βρέθηκαν οντότητες",
@@ -957,15 +957,15 @@
     "type-entity-group": "Ομάδα Οντότητας",
     "type-converter": "Μετατροπέας Δεδομένων",
     "type-converters": "Μετατροπείς Δεδομένων",
-    "list-of-converters": "{ count, plural, 1 {One data converter} other {List of # data converters} }",
+    "list-of-converters": "{ count, plural, =1 {One data converter} other {List of # data converters} }",
     "converter-name-starts-with": "Μετατροπείς δεδομένων των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-integration": "Ενσωμάτωση",
     "type-integrations": "Ενσωματώσεις",
-    "list-of-integrations": "{ count, plural, 1 {One integration} other {List of # integrations} }",
+    "list-of-integrations": "{ count, plural, =1 {One integration} other {List of # integrations} }",
     "integration-name-starts-with": "Ενσωματώσεις των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-role": "Ρόλος",
     "type-roles": "Ρόλοι",
-    "list-of-roles": "{ count, plural, 1 {One role} other {List of # roles} }",
+    "list-of-roles": "{ count, plural, =1 {One role} other {List of # roles} }",
     "role-name-starts-with": "Ρόλοι των οποίων το όνομα αρχίζει από '{{prefix}}'",
     "type-group-permission": "Άδεια Ομάδας"
   },
@@ -997,8 +997,8 @@
     "delete-entity-groups": "Διαγραφή ομαδών οντοτήτων",
     "delete-entity-group-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε την ομάδα οντοτήτων '{{entityGroupName}}'?",
     "delete-entity-group-text": "Προσοχή, μετά την επιβεβαίωση, η ομάδα οντοτήτων και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-entity-groups-title": "Είστε σίγουροι ότι θέλετε να διαγραφούν { count, plural, 1 {1 entity group} other {# entity groups} }?",
-    "delete-entity-groups-action-title": "Διαγραφή { count, plural, 1 {1 entity group} other {# entity groups} }",
+    "delete-entity-groups-title": "Είστε σίγουροι ότι θέλετε να διαγραφούν { count, plural, =1 {1 entity group} other {# entity groups} }?",
+    "delete-entity-groups-action-title": "Διαγραφή { count, plural, =1 {1 entity group} other {# entity groups} }",
     "delete-entity-groups-text": "Προσοχή, αφού ολοκληρωθεί η επιβεβαίωση, όλες οι επιλεγμένες ομάδες οντοτήτων θα αφαιρεθούν και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "device-groups": "Ομάδες Συσκευών",
     "asset-groups": "Ομάδες Asset",
@@ -1054,7 +1054,7 @@
     "select-target-owner": "Επιλογή ιδιοκτήτη",
     "no-owners-matching": "Δεν βρέθηκε ιδιοκτήτης που να αντιστοιχεί σε '{{owner}}'.",
     "target-owner-required": "Απαιτείται επιλεγμένος ιδιοκτήτης.",
-    "confirm-change-owner-title": "Είστε σίγουροι ότι θέλετε να αλλάξετε ιδιοκτήτη για { count, plural, 1 {1 selected entity} other {# selected entities} }?",
+    "confirm-change-owner-title": "Είστε σίγουροι ότι θέλετε να αλλάξετε ιδιοκτήτη για { count, plural, =1 {1 selected entity} other {# selected entities} }?",
     "confirm-change-owner-text": "Προσοχή, μετά την επιβεβαίωση, όλες οι επιλεγμένες οντότητες θα αφαιρεθούν από τον τρέχοντα ιδιοκτήτη και θα τοποθετηθούν στην ομάδα 'Όλα' του επιλεγμένου ιδιοκτήτη.",
     "add-to-group": "Προσθήκη σε ομάδα",
     "move-to-group": "Μετακίνηση σε ομάδα",
@@ -1156,18 +1156,18 @@
     "add-entity-view-text": "Προσθήκη νέας προβολής οντότητας",
     "delete": "Διαγραφή προβολής οντότητας",
     "assign-entity-views": "Ανάθεση προβολών οντότητας",
-    "assign-entity-views-text": "Ανάθεση { count, plural, 1 {1 entityView} other {# entityViews} } σε πελάτη",
+    "assign-entity-views-text": "Ανάθεση { count, plural, =1 {1 entityView} other {# entityViews} } σε πελάτη",
     "delete-entity-views": "Διαγραφή προβολών οντότητας",
     "make-public": "Δημοσιοποίηση προβολής οντότητας",
     "make-private": "Ιδιωτικοποίηση προβολής οντότητας",
     "unassign-from-customer": "Αφαίρεση από πελάτη",
     "unassign-entity-views": "Αφαίρεση προβολών οντότητας",
-    "unassign-entity-views-action-title": "Αφαίρεση { count, plural, 1 {1 entityView} other {# entityViews} } από πελάτη",
+    "unassign-entity-views-action-title": "Αφαίρεση { count, plural, =1 {1 entityView} other {# entityViews} } από πελάτη",
     "assign-new-entity-view": "Ανάθεση νέας προβολής οντότητας",
     "delete-entity-view-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε την προβολή οντότητας '{{entityViewName}}'?",
     "delete-entity-view-text": "Προσοχή, μετά την επιβεβαίωση, η προβολή της οντότητας και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-entity-views-title": "Είστε σίγουροι ότι θέλετε να προβάλετε την οντότητα { count, plural, 1 {1 entityView} other {# entityViews} };",
-    "delete-entity-views-action-title": "Διαγραφή { count, plural, 1 {1 entityView} other {# entityViews} }",
+    "delete-entity-views-title": "Είστε σίγουροι ότι θέλετε να προβάλετε την οντότητα { count, plural, =1 {1 entityView} other {# entityViews} };",
+    "delete-entity-views-action-title": "Διαγραφή { count, plural, =1 {1 entityView} other {# entityViews} }",
     "delete-entity-views-text": "Προσοχή, μετά την επιβεβαίωση, όλες οι επιλεγμένες προβολές της οντότητας και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "make-public-entity-view-title": "Είστε σίγουροι ότι θέλετε να κάνετε την προβολή οντότητας '{{entityViewName}}' δημόσια?",
     "make-public-entity-view-text": "Μετά την επιβεβαίωση, η προβολή της οντότητας και όλα τα δεδομένα της θα δημοσιοποιηθούν και θα είναι προσβάσιμα από τρίτους.",
@@ -1176,7 +1176,7 @@
     "unassign-entity-view-title": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε την προβολη οντότητας '{{entityViewName}}';",
     "unassign-entity-view-text": "Μετά την επιβεβαίωση, η προβολή της οντότητας θα καταργηθεί και δεν θα είναι προσβάσιμη από τον πελάτη.",
     "unassign-entity-view": "Αφαίρεση προβολής οντότητας",
-    "unassign-entity-views-title": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε { count, plural, 1 {1 entityView} other {# entityViews} };",
+    "unassign-entity-views-title": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε { count, plural, =1 {1 entityView} other {# entityViews} };",
     "unassign-entity-views-text": "Μετά την επιβεβαίωση, όλες οι επιλεγμένες προβολές οντοτήτων θα αφαιρεθούν και δεν θα είναι προσβάσιμες από τον πελάτη.",
     "entity-view-type": "Τύπος Προβολής Οντότητας",
     "entity-view-type-required": "Απαιτείται τύπος προβολής οντότητας.",
@@ -1215,13 +1215,13 @@
     "attributes-propagation-hint": "Η προβολή οντοτήτων θα αντιγράφει αυτόματα καθορισμένα χαρακτηριστικά από την στοχευμένη οντότητα κάθε φορά που αποθηκεύετε ή ενημερώνετε αυτήν την προβολή οντότητας. Για λόγους απόδοσης, τα χαρακτηριστικά της στοχευμένης οντότητας δεν μεταδίδονται στην προβολή οντότητας με κάθε αλλαγή χαρακτηριστικών. Μπορείτε να ενεργοποιήσετε την αυτόματη διάδοση ρυθμίζοντας τον κόμβο \"αντιγραφή για προβολή \" στην αλυσίδα κανόνων σας και συνδέοντας τα μηνύματα \"Χαρακτηριστικά Post \" και \"Ενημερωμένα Χαρακτηριστικά \" στον νέο κόμβο.",
     "timeseries-data": "Δεδομένα χρονικής σειράς",
     "timeseries-data-hint": "Ρυθμίστε τα δεδομένα της χρονικής σειράς της στοχευμένης οντότητας που θα είναι διαθέσιμα στην προβολή οντοτητας. Αυτά τα δεδομένα χρονικής σειράς είναι μόνο για ανάγνωση.",
-    "selected-entity-views": "{ count, plural, 1 {1 entity view} other {# entity views} } επιλεγμένα",
+    "selected-entity-views": "{ count, plural, =1 {1 entity view} other {# entity views} } επιλεγμένα",
     "search": "Αναζήτηση προβολών οντότητας",
     "select-group-to-add": "Επιλογή ομάδας για προσθήκη των επιλεγμένων προβολών οντότητας",
     "select-group-to-move": "Επιλογή ομάδας για μετακίνηση των επιλεγμένων προβολών οντότητας",
-    "remove-entity-views-from-group": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε { count, plural, 1 {1 entity view} other {# entity views} } from group '{entityGroup}'?",
+    "remove-entity-views-from-group": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε { count, plural, =1 {1 entity view} other {# entity views} } from group '{entityGroup}'?",
     "group": "Ομάδα προβολών οντότητας",
-    "list-of-groups": "{ count, plural, 1 {One entity view group} other {List of # entity view groups} }",
+    "list-of-groups": "{ count, plural, =1 {One entity view group} other {List of # entity view groups} }",
     "group-name-starts-with": "Ομάδες προβολής οντότητας των οποίων το όνομα αρχίζει από '{{prefix}}'"
   },
   "event": {
@@ -1262,7 +1262,7 @@
   },
   "extension": {
     "extensions": "Επεκτάσεις",
-    "selected-extensions": "{ count, plural, 1 {1 extension} other {# extensions} } επιλέχθηκαν",
+    "selected-extensions": "{ count, plural, =1 {1 extension} other {# extensions} } επιλέχθηκαν",
     "type": "Τύπος",
     "key": "Κλειδί",
     "value": "Τιμή",
@@ -1277,7 +1277,7 @@
     "view": "Προβολή επέκτασης",
     "delete-extension-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε την επέκταση '{{extensionId}}';",
     "delete-extension-text": "Προσοχή, μετά την επιβεβαίωση, η επέκταση και όλα τα σχετικά δεδομένα θα διαγραφούν μόνιμα.",
-    "delete-extensions-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, 1 {1 extension} other {# extensions} }?",
+    "delete-extensions-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, =1 {1 extension} other {# extensions} }?",
     "delete-extensions-text": "Προσέξτε, μετά την επιβεβαίωση θα αφαιρεθούν όλες οι επιλεγμένες επεκτάσεις.",
     "converters": "Μετατροπείς",
     "converter-id": "ID Μετατροπέα",
@@ -1430,8 +1430,8 @@
   "grid": {
     "delete-item-title": "Είστε σίγουροι ότι θέλετε να διαγραφεί αυτό το αντικείμενο?",
     "delete-item-text": "Προσοχή, μετά την επιβεβαίωση, αυτό το στοιχείο και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-items-title": "Είστε βέβαιοι ότι θέλετε να διαγράψετε { count, plural, 1 {1 item} other {# items} }?",
-    "delete-items-action-title": "Διαγραφή { count, plural, 1 {1 item} other {# items} }",
+    "delete-items-title": "Είστε βέβαιοι ότι θέλετε να διαγράψετε { count, plural, =1 {1 item} other {# items} }?",
+    "delete-items-action-title": "Διαγραφή { count, plural, =1 {1 item} other {# items} }",
     "delete-items-text": "Προσοχή, μετά την επιβεβαίωση, όλα τα επιλεγμένα στοιχεία θα καταργηθούν και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "add-item-text": "Προσθήκη νέου αντικειμένου",
     "no-items-text": "Δεν βρέθηκαν αντικείμενα",
@@ -1498,11 +1498,11 @@
     "management": "Διαχείριση Ενσωματώσεων",
     "add-integration-text": "Προσθήκη νέας ενσωμάτωσης",
     "no-integrations-text": "Δεν βρέθηκαν ενσωματώσεις",
-    "selected-integrations": "{ count, plural, 1 {1 integration} other {# integrations} } επιλέχθηκαν",
+    "selected-integrations": "{ count, plural, =1 {1 integration} other {# integrations} } επιλέχθηκαν",
     "delete-integration-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε την ενσωμάτωση '{{integrationName}}';",
     "delete-integration-text": "Προσοχή, μετά την επιβεβαίωση, η ενσωμάτωση και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-integrations-title": "Είστε σίγουροι ότι θέλετε { count, plural, 1 {1 integration} other {# integrations} };",
-    "delete-integrations-action-title": "Διαγραφή { count, plural, 1 {1 integration} other {# integrations} }",
+    "delete-integrations-title": "Είστε σίγουροι ότι θέλετε { count, plural, =1 {1 integration} other {# integrations} };",
+    "delete-integrations-action-title": "Διαγραφή { count, plural, =1 {1 integration} other {# integrations} }",
     "delete-integrations-text": "Προσοχή, αφού ολοκληρωθεί η επιβεβαίωση, όλες οι επιλεγμένες ενσωματώσεις θα αφαιρεθούν και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "events": "Γεγονότα",
     "add": "Προσθήκη Ενσωμάτωσης",
@@ -1758,7 +1758,7 @@
     },
     "from-relations": "Εξωτερικές σχέσεις",
     "to-relations": "Εσωτερικές σχέσεις",
-    "selected-relations": "{ count, plural, 1 {1 relation} other {# relations} } επιλέχθηκαν",
+    "selected-relations": "{ count, plural, =1 {1 relation} other {# relations} } επιλέχθηκαν",
     "type": "Τύπος",
     "to-entity-type": "Στον τύπο οντότητας",
     "to-entity-name": "Στο όνομα οντότητας",
@@ -1774,11 +1774,11 @@
     "edit": "Επεξεργασία σχέσης",
     "delete-to-relation-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε τη σχέση με την οντότητα '{{entityName}}'?",
     "delete-to-relation-text": "Προσοχή, μετά την επιβεβαίωση η οντότητα '{{entityName}}' δεν θα σχετίζεται με την τρέχουσα οντότητα.",
-    "delete-to-relations-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, 1 {1 relation} other {# relations} };",
+    "delete-to-relations-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, =1 {1 relation} other {# relations} };",
     "delete-to-relations-text": "Προσοχή, μετά την επιβεβαίωση όλες οι επιλεγμένες σχέσεις θα αφαιρεθούν και οι αντίστοιχες οντότητες δεν θα σχετίζονται με την τρέχουσα οντότητα.",
     "delete-from-relation-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε σχέση από την οντότητα '{{entityName}}';",
     "delete-from-relation-text": "Προσοχή, μετά την επιβεβαίωση η τρέχουσα οντότητα δεν θα σχετίζεται με την οντότητα '{{entityName}}'.",
-    "delete-from-relations-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, 1 {1 relation} other {# relations} };",
+    "delete-from-relations-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, =1 {1 relation} other {# relations} };",
     "delete-from-relations-text": "Προσοχή, μετά την επιβεβαίωση όλες οι επιλεγμένες σχέσεις θα αφαιρεθούν και η τρέχουσα οντότητα δεν θα σχετίζεται με τις αντίστοιχες οντότητες.",
     "remove-relation-filter": "Αφαίρεση φίλτρου σχέσης",
     "add-relation-filter": "Προσθήκη φίλτρου σχέσης",
@@ -1801,8 +1801,8 @@
     "set-root-rulechain-text": "Μετά την επιβεβαίωση, η Αλυσίδα Κανόνων θα γίνει ριζική και θα χειριστεί όλα τα εισερχόμενα μηνύματα μεταφοράς.",
     "delete-rulechain-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε την Αλυσίδα Κανόνων '{{ruleChainName}}';",
     "delete-rulechain-text": "Προσοχή, μετά την επιβεβαίωση η Αλυσίδα Κανόνων θα αφαιρεθεί και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-rulechains-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, 1 {1 rule chain} other {# rule chains} };",
-    "delete-rulechains-action-title": "Διαγραφή { count, plural, 1 {1 rule chain} other {# rule chains} }",
+    "delete-rulechains-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, =1 {1 rule chain} other {# rule chains} };",
+    "delete-rulechains-action-title": "Διαγραφή { count, plural, =1 {1 rule chain} other {# rule chains} }",
     "delete-rulechains-text": "Προσοχή, μετά την επιβεβαίωση όλες οι επιλεγμένες αλυσίδες κανόνων θα καταργηθούν και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "add-rulechain-text": "Προσθήκη νέας Αλυσίδας Κανόνων",
     "no-rulechains-text": "Δεν βρέθηκαν Αλυσίδες Κανόνων",
@@ -1906,8 +1906,8 @@
     "delete-roles": "Διαγραφή ρόλων",
     "delete-role-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε το ρόλο '{{roleName}}';",
     "delete-role-text": "Προσοχή, μετά την επιβεβαίωση ο ρόλος και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-roles-title": "Είστε σίγουροι ότι θέλετε να παίξετε { count, plural, 1 {1 role} other {# roles} };",
-    "delete-roles-action-title": "Διαγραφή { count, plural, 1 {1 role} other {# roles} }",
+    "delete-roles-title": "Είστε σίγουροι ότι θέλετε να παίξετε { count, plural, =1 {1 role} other {# roles} };",
+    "delete-roles-action-title": "Διαγραφή { count, plural, =1 {1 role} other {# roles} }",
     "delete-roles-text": "Προσοχή, μετά την επιβεβαίωση όλοι οι επιλεγμένοι ρόλοι θα καταργηθούν και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "role-type": "΄Τύπος ρόλου",
     "role-type-required": "Απαιτείται τύπος ρόλου.",
@@ -1943,11 +1943,11 @@
     "user-group-owner": "Κάτοχος χρήστη ομάδας",
     "edit": "Επεξεργασία Αδειών",
     "delete": "Διαγραφή αδειών",
-    "selected-group-permissions": "{ count, plural, 1 {1 group permission} other {# group permissions} } επιλέχθηκαν",
+    "selected-group-permissions": "{ count, plural, =1 {1 group permission} other {# group permissions} } επιλέχθηκαν",
     "delete-group-permission-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε την άδεια ομάδας '{{roleName}}';",
     "delete-group-permission-text": "Προσοχή, μετά την επιβεβαίωση η άδεια ομάδας και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "delete-group-permission": "Διαγραφή άδειας ομάδας",
-    "delete-group-permissions-title": "Έίστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, 1 {1 group permission} other {# group permission} };",
+    "delete-group-permissions-title": "Έίστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, =1 {1 group permission} other {# group permission} };",
     "delete-group-permissions-text": "Προσοχή, μετά την επιβεβαίωση όλες οι επιλεγμένες άδειες ομάδας θα καταργηθούν και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "delete-group-permissions": "Διαγραφή αδειών ομάδας",
     "add-group-permission": "Προσθήκη ομαδικής άδειας",
@@ -2044,10 +2044,10 @@
     "view-scheduler-event": "Προβολή προγραμματισμένου γεγονότος",
     "delete-scheduler-event": "Διαγραφή προγραμματισμένου γεγονότος",
     "no-scheduler-events": "Δεν βρέθηκαν προγραμματισμένα γεγονότα",
-    "selected-scheduler-events": "{ count, plural, 1 {1 scheduler event} other {# scheduler events} } επιλέχθηκαν",
+    "selected-scheduler-events": "{ count, plural, =1 {1 scheduler event} other {# scheduler events} } επιλέχθηκαν",
     "delete-scheduler-event-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε το προγραμματισμένο γεγονός '{{schedulerEventName}}';",
     "delete-scheduler-event-text": "Προσοχή, μετά την επιβεβαίωση το προγραμματισμένο γεγονός και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-scheduler-events-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, 1 {1 scheduler event} other {# scheduler events} };",
+    "delete-scheduler-events-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, =1 {1 scheduler event} other {# scheduler events} };",
     "delete-scheduler-events-text": "Προσοχή, μετά την επιβεβαίωση όλα τα επιλεγμένα προγραμματισμένα γεγονότα θα καταργηθούν και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "create": "Δημιουργία προγραμματισμένου γεγονότος",
     "edit": "Επεξεργασία προγραμματισμένου γεγονότος",
@@ -2189,8 +2189,8 @@
     "tenant-details": "Λεπτομέρειες Μισθωτή",
     "delete-tenant-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε τον Μισθωτή '{{tenantTitle}}';",
     "delete-tenant-text": "Προσοχή, μετά την επιβεβαίωση ο Μισθωτής και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-tenants-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, 1 {1 tenant} other {# tenants} };",
-    "delete-tenants-action-title": "Διαγραφή { count, plural, 1 {1 tenant} other {# tenants} }",
+    "delete-tenants-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, =1 {1 tenant} other {# tenants} };",
+    "delete-tenants-action-title": "Διαγραφή { count, plural, =1 {1 tenant} other {# tenants} }",
     "delete-tenants-text": "Προσοχή, μετά την επιβεβαίωση όλοι οι επιλεγμένοι Μισθωτές θα αφαιρεθούν και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "title": "Τίτλος",
     "title-required": "Απαιτείται Τίτλος.",
@@ -2202,16 +2202,16 @@
     "select-tenant": "Επιλογή Μισθωτή",
     "no-tenants-matching": "Δεν βρέθηκαν Μισθωτές που να ταιριάζουν '{{entity}}'.",
     "tenant-required": "Απαιτείται Μισθωτής",
-    "selected-tenants": "{ count, plural, 1 {1 tenant} other {# tenants} } επιλέχθηκαν",
+    "selected-tenants": "{ count, plural, =1 {1 tenant} other {# tenants} } επιλέχθηκαν",
     "search": "Αναζήτηση Μισθωτών",
     "allow-white-labeling": "Επιτρέπεται Προσαρμογή Εμφάνισης",
     "allow-customer-white-labeling": "Επιτρέπεται Προσαρμογή Εμφάνισης Πελάτη"
   },
   "timeinterval": {
-    "seconds-interval": "{ seconds, plural, 1 {1 second} other {# seconds} }",
-    "minutes-interval": "{ minutes, plural, 1 {1 minute} other {# minutes} }",
-    "hours-interval": "{ hours, plural, 1 {1 hour} other {# hours} }",
-    "days-interval": "{ days, plural, 1 {1 day} other {# days} }",
+    "seconds-interval": "{ seconds, plural, =1 {1 second} other {# seconds} }",
+    "minutes-interval": "{ minutes, plural, =1 {1 minute} other {# minutes} }",
+    "hours-interval": "{ hours, plural, =1 {1 hour} other {# hours} }",
+    "days-interval": "{ days, plural, =1 {1 day} other {# days} }",
     "days": "Ημέρες",
     "hours": "Ώρες",
     "minutes": "Λεπτά",
@@ -2219,10 +2219,10 @@
     "advanced": "Προηγμένος"
   },
   "timewindow": {
-    "days": "{ days, plural, 1 { day } other {# days } }",
-    "hours": "{ hours, plural, 0 { hour } 1 {1 hour } other {# hours } }",
-    "minutes": "{ minutes, plural, 0 { minute } 1 {1 minute } other {# minutes } }",
-    "seconds": "{ seconds, plural, 0 { second } 1 {1 second } other {# seconds } }",
+    "days": "{ days, plural, =1 { day } other {# days } }",
+    "hours": "{ hours, plural, =0 { hour } =1 {1 hour } other {# hours } }",
+    "minutes": "{ minutes, plural, =0 { minute } =1 {1 minute } other {# minutes } }",
+    "seconds": "{ seconds, plural, =0 { second } =1 {1 second } other {# seconds } }",
     "realtime": "Πραγματικός Χρόνος",
     "history": "Ιστορικό",
     "last-prefix": "Τελευταίος",
@@ -2250,8 +2250,8 @@
     "delete-users": "Διαγραφή Χρηστών",
     "delete-user-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε το Χρήστη '{{userEmail}}'?",
     "delete-user-text": "Προσοχή, μετά την επιβεβαίωση ο Χρήστης και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-users-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, 1 {1 user} other {# users} };",
-    "delete-users-action-title": "Διαγραφή { count, plural, 1 {1 user} other {# users} }",
+    "delete-users-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, =1 {1 user} other {# users} };",
+    "delete-users-action-title": "Διαγραφή { count, plural, =1 {1 user} other {# users} }",
     "delete-users-text": "Προσοχή, μετά την επιβεβαίωση όλοι οι επιλεγμένοι Χρήστες θα αφαιρεθούν και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "activation-email-sent-message": "Το email ενεργοποίησης στάλθηκε με επιτυχία!",
     "resend-activation": "Επανάληψη ενεργοποίησης",
@@ -2273,16 +2273,16 @@
     "activation-link-text": "΄Προκειμένου να ενεργοποιήσετε το Χρήστη, χρησιμοποιήστε το εξής <a href='{{activationLink}}' target='_blank'>activation link</a> :",
     "copy-activation-link": "Αντιγραφή συνδέσμου ενεργοποίησης",
     "activation-link-copied-message": "Ο σύνδεσμος ενεργοποίησης χρήστη έχει αντιγραφεί στο πρόχειρο",
-    "selected-users": "{ count, plural, 1 {1 user} other {# users} } επιλέχθηκαν",
+    "selected-users": "{ count, plural, =1 {1 user} other {# users} } επιλέχθηκαν",
     "search": "Αναζήτηση Χρηστών",
     "details": "Λεπτομέρειες",
     "login-as-tenant-admin": "Συνδεθείτε ως Διαχειριστής Μισθωτή",
     "login-as-customer-user": "Συνδεθείτε ως Χρήστης του Πελάτη",
     "select-group-to-add": "Επιλέξτε την ομάδα προορισμού για να προσθέσετε επιλεγμένους Χρήστες",
     "select-group-to-move": "Επιλέξτε την ομάδα προορισμού για να μετακινήσετε επιλεγμένους χρήστες",
-    "remove-users-from-group": "Είστε σίγουροι ότι θέλετε να καταργήσετε { count, plural, 1 {1 user} other {# users} } από την ομάδα '{entityGroup}';",
+    "remove-users-from-group": "Είστε σίγουροι ότι θέλετε να καταργήσετε { count, plural, =1 {1 user} other {# users} } από την ομάδα '{entityGroup}';",
     "group": "Ομάδα από Χρήστες",
-    "list-of-groups": "{ count, plural, 1 {One user group} other {List of # user groups} }",
+    "list-of-groups": "{ count, plural, =1 {One user group} other {List of # user groups} }",
     "group-name-starts-with": "Ομάδες Χρηστών των οποίων τα ονόματα ξεκινούν με'{{prefix}}'"
   },
   "value": {
@@ -2381,8 +2381,8 @@
     "widgets-bundle-details": "Λεπτομέρειες δέσμης Widgets",
     "delete-widgets-bundle-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε τη δέσμη Widgets '{{widgetsBundleTitle}}';",
     "delete-widgets-bundle-text": "Προσοχή, μετά την επιβεβαίωση η δέσμη Widget και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "delete-widgets-bundles-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, 1 {1 widgets bundle} other {# widgets bundles} };",
-    "delete-widgets-bundles-action-title": "Διαγραφή { count, plural, 1 {1 widgets bundle} other {# widgets bundles} }",
+    "delete-widgets-bundles-title": "Είστε σίγουροι ότι θέλετε να διαγράψετε { count, plural, =1 {1 widgets bundle} other {# widgets bundles} };",
+    "delete-widgets-bundles-action-title": "Διαγραφή { count, plural, =1 {1 widgets bundle} other {# widgets bundles} }",
     "delete-widgets-bundles-text": "Προσοχή, μετά την επιβεβαίωση όλες οι επιλεγμένες δέσμες Widget και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
     "no-widgets-bundles-matching": "Δεν βρέθηκαν δέσμες Widgets που να ταιριάζουν'{{widgetsBundle}}'.",
     "widgets-bundle-required": "Απαιτείται δέσμη Widgets.",
@@ -2420,7 +2420,7 @@
     "display-timewindow": "Απεικόνιση timewindow",
     "display-legend": "Απεικόνιση λεζάντας",
     "datasources": "Πηγές δεδομένων",
-    "maximum-datasources": "Το μέγιστο { count, plural, 1 {1 datasource is allowed.} other {# datasources are allowed} }",
+    "maximum-datasources": "Το μέγιστο { count, plural, =1 {1 datasource is allowed.} other {# datasources are allowed} }",
     "datasource-type": "Τύπος",
     "datasource-parameters": "Παράμετροι",
     "remove-datasource": "Κατάργηση της πηγής δεδομένων",
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 949ebd4d23..7f0b1badeb 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -435,9 +435,19 @@
         "originator": "Originator",
         "originator-type": "Originator type",
         "details": "Details",
+        "originator-label": "Originator label",
+        "assign": "Assign",
+        "assignments": "Assignments",
+        "assignee": "Assignee",
+        "assignee-id": "Assignee id",
+        "assignee-first-name": "Assignee first name",
+        "assignee-last-name": "Assignee last name",
+        "assignee-email": "Assignee email",
+        "unassigned": "Unassigned",
         "status": "Status",
         "alarm-details": "Alarm details",
         "start-time": "Start time",
+        "assign-time": "Assign time",
         "end-time": "End time",
         "ack-time": "Acknowledged time",
         "clear-time": "Cleared time",
@@ -451,17 +461,17 @@
         "acknowledge": "Acknowledge",
         "clear": "Clear",
         "search": "Search alarms",
-        "selected-alarms": "{ count, plural, 1 {1 alarm} other {# alarms} } selected",
+        "selected-alarms": "{ count, plural, =1 {1 alarm} other {# alarms} } selected",
         "no-data": "No data to display",
         "polling-interval": "Alarms polling interval (sec)",
         "polling-interval-required": "Alarms polling interval is required.",
         "min-polling-interval-message": "At least 1 sec polling interval is allowed.",
-        "aknowledge-alarms-title": "Acknowledge { count, plural, 1 {1 alarm} other {# alarms} }",
-        "aknowledge-alarms-text": "Are you sure you want to acknowledge { count, plural, 1 {1 alarm} other {# alarms} }?",
+        "aknowledge-alarms-title": "Acknowledge { count, plural, =1 {1 alarm} other {# alarms} }",
+        "aknowledge-alarms-text": "Are you sure you want to acknowledge { count, plural, =1 {1 alarm} other {# alarms} }?",
         "aknowledge-alarm-title": "Acknowledge Alarm",
         "aknowledge-alarm-text": "Are you sure you want to acknowledge Alarm?",
-        "clear-alarms-title": "Clear { count, plural, 1 {1 alarm} other {# alarms} }",
-        "clear-alarms-text": "Are you sure you want to clear { count, plural, 1 {1 alarm} other {# alarms} }?",
+        "clear-alarms-title": "Clear { count, plural, =1 {1 alarm} other {# alarms} }",
+        "clear-alarms-text": "Are you sure you want to clear { count, plural, =1 {1 alarm} other {# alarms} }?",
         "clear-alarm-title": "Clear Alarm",
         "clear-alarm-text": "Are you sure you want to clear Alarm?",
         "alarm-status-filter": "Alarm Status Filter",
@@ -474,7 +484,17 @@
         "fetch-size-error-min": "Minimum value is 10.",
         "alarm-type-list": "Alarm type list",
         "any-type": "Any type",
-        "search-propagated-alarms": "Search propagated alarms"
+        "search-propagated-alarms": "Search propagated alarms",
+        "comments": "Alarm comments",
+        "advanced-info": "Advanced info"
+    },
+    "alarm-comment": {
+        "add": "Add a comment...",
+        "alarm-comment": "Alarm comment",
+        "comments": "Comments",
+        "delete-alarm-comment": "Do you want to delete this comment?",
+        "refresh": "Refresh",
+        "sort-direction": "Sort direction"
     },
     "alias": {
         "add": "Add alias",
@@ -568,17 +588,17 @@
         "add-asset-text": "Add new asset",
         "asset-details": "Asset details",
         "assign-assets": "Assign assets",
-        "assign-assets-text": "Assign { count, plural, 1 {1 asset} other {# assets} } to customer",
+        "assign-assets-text": "Assign { count, plural, =1 {1 asset} other {# assets} } to customer",
         "assign-asset-to-edge-title": "Assign Asset(s) To Edge",
         "assign-asset-to-edge-text":"Please select the assets to assign to the edge",
         "delete-assets": "Delete assets",
         "unassign-assets": "Unassign assets",
-        "unassign-assets-action-title": "Unassign { count, plural, 1 {1 asset} other {# assets} } from customer",
+        "unassign-assets-action-title": "Unassign { count, plural, =1 {1 asset} other {# assets} } from customer",
         "assign-new-asset": "Assign new asset",
         "delete-asset-title": "Are you sure you want to delete the asset '{{assetName}}'?",
         "delete-asset-text": "Be careful, after the confirmation the asset and all related data will become unrecoverable.",
-        "delete-assets-title": "Are you sure you want to delete { count, plural, 1 {1 asset} other {# assets} }?",
-        "delete-assets-action-title": "Delete { count, plural, 1 {1 asset} other {# assets} }",
+        "delete-assets-title": "Are you sure you want to delete { count, plural, =1 {1 asset} other {# assets} }?",
+        "delete-assets-action-title": "Delete { count, plural, =1 {1 asset} other {# assets} }",
         "delete-assets-text": "Be careful, after the confirmation all selected assets will be removed and all related data will become unrecoverable.",
         "make-public-asset-title": "Are you sure you want to make the asset '{{assetName}}' public?",
         "make-public-asset-text": "After the confirmation the asset and all its data will be made public and accessible by others.",
@@ -587,7 +607,7 @@
         "unassign-asset-title": "Are you sure you want to unassign the asset '{{assetName}}'?",
         "unassign-asset-text": "After the confirmation the asset will be unassigned and won't be accessible by the customer.",
         "unassign-asset": "Unassign asset",
-        "unassign-assets-title": "Are you sure you want to unassign { count, plural, 1 {1 asset} other {# assets} }?",
+        "unassign-assets-title": "Are you sure you want to unassign { count, plural, =1 {1 asset} other {# assets} }?",
         "unassign-assets-text": "After the confirmation all selected assets will be unassigned and won't be accessible by the customer.",
         "unassign-assets-from-edge": "Unassign assets from edge",
         "copyId": "Copy asset Id",
@@ -605,9 +625,9 @@
         "unassign-asset-from-edge": "Unassign asset",
         "unassign-asset-from-edge-title": "Are you sure you want to unassign the asset '{{assetName}}'?",
         "unassign-asset-from-edge-text": "After the confirmation the asset will be unassigned and won't be accessible by the edge.",
-        "unassign-assets-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 asset} other {# assets} }?",
+        "unassign-assets-from-edge-title": "Are you sure you want to unassign { count, plural, =1 {1 asset} other {# assets} }?",
         "unassign-assets-from-edge-text": "After the confirmation all selected assets will be unassigned and won't be accessible by the edge.",
-        "selected-assets": "{ count, plural, 1 {1 asset} other {# assets} } selected"
+        "selected-assets": "{ count, plural, =1 {1 asset} other {# assets} } selected"
     },
     "attribute": {
         "attributes": "Attributes",
@@ -624,7 +644,7 @@
         "key-required": "Attribute key is required.",
         "value": "Value",
         "value-required": "Attribute value is required.",
-        "delete-attributes-title": "Are you sure you want to delete { count, plural, 1 {1 attribute} other {# attributes} }?",
+        "delete-attributes-title": "Are you sure you want to delete { count, plural, =1 {1 attribute} other {# attributes} }?",
         "delete-attributes-text": "Be careful, after the confirmation all selected attributes will be removed.",
         "delete-attributes": "Delete attributes",
         "enter-attribute-value": "Enter attribute value",
@@ -634,8 +654,8 @@
         "prev-widget": "Previous widget",
         "add-to-dashboard": "Add to dashboard",
         "add-widget-to-dashboard": "Add widget to dashboard",
-        "selected-attributes": "{ count, plural, 1 {1 attribute} other {# attributes} } selected",
-        "selected-telemetry": "{ count, plural, 1 {1 telemetry unit} other {# telemetry units} } selected",
+        "selected-attributes": "{ count, plural, =1 {1 attribute} other {# attributes} } selected",
+        "selected-telemetry": "{ count, plural, =1 {1 telemetry unit} other {# telemetry units} } selected",
         "no-attributes-text": "No attributes found",
         "no-telemetry-text": "No telemetry found"
     },
@@ -728,6 +748,8 @@
         "type-relations-delete": "All relation deleted",
         "type-alarm-ack": "Acknowledged",
         "type-alarm-clear": "Cleared",
+        "type-alarm-assign": "Assigned",
+        "type-alarm-unassign": "Unassigned",
         "type-added-comment": "Added comment",
         "type-updated-comment": "Updated comment",
         "type-deleted-comment": "Deleted comment",
@@ -815,8 +837,8 @@
         "customer-details": "Customer details",
         "delete-customer-title": "Are you sure you want to delete the customer '{{customerTitle}}'?",
         "delete-customer-text": "Be careful, after the confirmation the customer and all related data will become unrecoverable.",
-        "delete-customers-title": "Are you sure you want to delete { count, plural, 1 {1 customer} other {# customers} }?",
-        "delete-customers-action-title": "Delete { count, plural, 1 {1 customer} other {# customers} }",
+        "delete-customers-title": "Are you sure you want to delete { count, plural, =1 {1 customer} other {# customers} }?",
+        "delete-customers-action-title": "Delete { count, plural, =1 {1 customer} other {# customers} }",
         "delete-customers-text": "Be careful, after the confirmation all selected customers will be removed and all related data will become unrecoverable.",
         "manage-users": "Manage users",
         "manage-assets": "Manage assets",
@@ -837,7 +859,7 @@
         "default-customer": "Default customer",
         "default-customer-required": "Default customer is required in order to debug dashboard on Tenant level",
         "search": "Search customers",
-        "selected-customers": "{ count, plural, 1 {1 customer} other {# customers} } selected",
+        "selected-customers": "{ count, plural, =1 {1 customer} other {# customers} } selected",
         "edges": "Customer edge instances",
         "manage-edges": "Manage edges"
     },
@@ -889,20 +911,20 @@
         "add-dashboard-text": "Add new dashboard",
         "assign-dashboards": "Assign dashboards",
         "assign-new-dashboard": "Assign new dashboard",
-        "assign-dashboards-text": "Assign { count, plural, 1 {1 dashboard} other {# dashboards} } to customers",
-        "unassign-dashboards-action-text": "Unassign { count, plural, 1 {1 dashboard} other {# dashboards} } from customers",
+        "assign-dashboards-text": "Assign { count, plural, =1 {1 dashboard} other {# dashboards} } to customers",
+        "unassign-dashboards-action-text": "Unassign { count, plural, =1 {1 dashboard} other {# dashboards} } from customers",
         "delete-dashboards": "Delete dashboards",
         "unassign-dashboards": "Unassign dashboards",
-        "unassign-dashboards-action-title": "Unassign { count, plural, 1 {1 dashboard} other {# dashboards} } from customer",
+        "unassign-dashboards-action-title": "Unassign { count, plural, =1 {1 dashboard} other {# dashboards} } from customer",
         "delete-dashboard-title": "Are you sure you want to delete the dashboard '{{dashboardTitle}}'?",
         "delete-dashboard-text": "Be careful, after the confirmation the dashboard and all related data will become unrecoverable.",
-        "delete-dashboards-title": "Are you sure you want to delete { count, plural, 1 {1 dashboard} other {# dashboards} }?",
-        "delete-dashboards-action-title": "Delete { count, plural, 1 {1 dashboard} other {# dashboards} }",
+        "delete-dashboards-title": "Are you sure you want to delete { count, plural, =1 {1 dashboard} other {# dashboards} }?",
+        "delete-dashboards-action-title": "Delete { count, plural, =1 {1 dashboard} other {# dashboards} }",
         "delete-dashboards-text": "Be careful, after the confirmation all selected dashboards will be removed and all related data will become unrecoverable.",
         "unassign-dashboard-title": "Are you sure you want to unassign the dashboard '{{dashboardTitle}}'?",
         "unassign-dashboard-text": "After the confirmation the dashboard will be unassigned and won't be accessible by the customer.",
         "unassign-dashboard": "Unassign dashboard",
-        "unassign-dashboards-title": "Are you sure you want to unassign { count, plural, 1 {1 dashboard} other {# dashboards} }?",
+        "unassign-dashboards-title": "Are you sure you want to unassign { count, plural, =1 {1 dashboard} other {# dashboards} }?",
         "unassign-dashboards-text": "After the confirmation all selected dashboards will be unassigned and won't be accessible by the customer.",
         "public-dashboard-title": "Dashboard is now public",
         "public-dashboard-text": "Your dashboard <b>{{dashboardTitle}}</b> is now public and accessible via next public <a href='{{publicLink}}' target='_blank'>link</a>:",
@@ -998,7 +1020,7 @@
         "manage-states": "Manage dashboard states",
         "states": "Dashboard states",
         "search-states": "Search dashboard states",
-        "selected-states": "{ count, plural, 1 {1 dashboard state} other {# dashboard states} } selected",
+        "selected-states": "{ count, plural, =1 {1 dashboard state} other {# dashboard states} } selected",
         "edit-state": "Edit dashboard state",
         "delete-state": "Delete dashboard state",
         "add-state": "Add dashboard state",
@@ -1017,11 +1039,11 @@
         "select-state": "Select target state",
         "state-controller": "State controller",
         "search": "Search dashboards",
-        "selected-dashboards": "{ count, plural, 1 {1 dashboard} other {# dashboards} } selected",
+        "selected-dashboards": "{ count, plural, =1 {1 dashboard} other {# dashboards} } selected",
         "home-dashboard": "Home dashboard",
         "home-dashboard-hide-toolbar": "Hide home dashboard toolbar",
         "unassign-dashboard-from-edge-text": "After the confirmation the dashboard will be unassigned and won't be accessible by the edge.",
-        "unassign-dashboards-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 dashboard} other {# dashboards} }?",
+        "unassign-dashboards-from-edge-title": "Are you sure you want to unassign { count, plural, =1 {1 dashboard} other {# dashboards} }?",
         "unassign-dashboards-from-edge-text": "After the confirmation all selected dashboards will be unassigned and won't be accessible by the edge.",
         "assign-dashboard-to-edge": "Assign Dashboard(s) To Edge",
         "assign-dashboard-to-edge-text": "Please select the dashboards to assign to the edge",
@@ -1044,7 +1066,7 @@
         "timeseries-required": "Entity timeseries are required.",
         "timeseries-or-attributes-required": "Entity timeseries/attributes are required.",
         "alarm-fields-timeseries-or-attributes-required": "Alarm fields or entity timeseries/attributes are required.",
-        "maximum-timeseries-or-attributes": "Maximum { count, plural, 1 {1 timeseries/attribute is allowed.} other {# timeseries/attributes are allowed} }",
+        "maximum-timeseries-or-attributes": "Maximum { count, plural, =1 {1 timeseries/attribute is allowed.} other {# timeseries/attributes are allowed} }",
         "alarm-fields-required": "Alarm fields are required.",
         "function-types": "Function types",
         "function-type": "Function type",
@@ -1061,7 +1083,7 @@
         "timeseries-key": "Timeseries data key",
         "timeseries-key-functions": "Timeseries key functions",
         "timeseries-key-function": "Timeseries key function",
-        "maximum-function-types": "Maximum { count, plural, 1 {1 function type is allowed.} other {# function types are allowed} }",
+        "maximum-function-types": "Maximum { count, plural, =1 {1 function type is allowed.} other {# function types are allowed} }",
         "time-description": "timestamp of the current value;",
         "value-description": "the current value;",
         "prev-value-description": "result of the previous function call;",
@@ -1140,11 +1162,11 @@
         "manage-credentials": "Manage credentials",
         "delete": "Delete device",
         "assign-devices": "Assign devices",
-        "assign-devices-text": "Assign { count, plural, 1 {1 device} other {# devices} } to customer",
+        "assign-devices-text": "Assign { count, plural, =1 {1 device} other {# devices} } to customer",
         "delete-devices": "Delete devices",
         "unassign-from-customer": "Unassign from customer",
         "unassign-devices": "Unassign devices",
-        "unassign-devices-action-title": "Unassign { count, plural, 1 {1 device} other {# devices} } from customer",
+        "unassign-devices-action-title": "Unassign { count, plural, =1 {1 device} other {# devices} } from customer",
         "unassign-device-from-edge-title": "Are you sure you want to unassign the device '{{deviceName}}'?",
         "unassign-device-from-edge-text": "After the confirmation the device will be unassigned and won't be accessible by the edge.",
         "unassign-devices-from-edge": "Unassign devices from edge",
@@ -1156,13 +1178,13 @@
         "view-credentials": "View credentials",
         "delete-device-title": "Are you sure you want to delete the device '{{deviceName}}'?",
         "delete-device-text": "Be careful, after the confirmation the device and all related data will become unrecoverable.",
-        "delete-devices-title": "Are you sure you want to delete { count, plural, 1 {1 device} other {# devices} }?",
-        "delete-devices-action-title": "Delete { count, plural, 1 {1 device} other {# devices} }",
+        "delete-devices-title": "Are you sure you want to delete { count, plural, =1 {1 device} other {# devices} }?",
+        "delete-devices-action-title": "Delete { count, plural, =1 {1 device} other {# devices} }",
         "delete-devices-text": "Be careful, after the confirmation all selected devices will be removed and all related data will become unrecoverable.",
         "unassign-device-title": "Are you sure you want to unassign the device '{{deviceName}}'?",
         "unassign-device-text": "After the confirmation the device will be unassigned and won't be accessible by the customer.",
         "unassign-device": "Unassign device",
-        "unassign-devices-title": "Are you sure you want to unassign { count, plural, 1 {1 device} other {# devices} }?",
+        "unassign-devices-title": "Are you sure you want to unassign { count, plural, =1 {1 device} other {# devices} }?",
         "unassign-devices-text": "After the confirmation all selected devices will be unassigned and won't be accessible by the customer.",
         "device-credentials": "Device Credentials",
         "loading-device-credentials": "Loading device credentials...",
@@ -1243,7 +1265,7 @@
         "import": "Import device",
         "device-file": "Device file",
         "search": "Search devices",
-        "selected-devices": "{ count, plural, 1 {1 device} other {# devices} } selected",
+        "selected-devices": "{ count, plural, =1 {1 device} other {# devices} } selected",
         "device-configuration": "Device configuration",
         "transport-configuration": "Transport configuration",
         "wizard": {
@@ -1255,7 +1277,7 @@
             "customer-to-assign-device": "Customer to assign the device",
             "add-credentials": "Add credentials"
         },
-        "unassign-devices-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 device} other {# devices} }?",
+        "unassign-devices-from-edge-title": "Are you sure you want to unassign { count, plural, =1 {1 device} other {# devices} }?",
         "unassign-devices-from-edge-text": "After the confirmation all selected devices will be unassigned and won't be accessible by the edge."
     },
     "asset-profile": {
@@ -1267,7 +1289,7 @@
         "asset-profile-details": "Asset profile details",
         "no-asset-profiles-text": "No asset profiles found",
         "search": "Search asset profiles",
-        "selected-asset-profiles": "{ count, plural, 1 {1 asset profile} other {# asset profiles} } selected",
+        "selected-asset-profiles": "{ count, plural, =1 {1 asset profile} other {# asset profiles} } selected",
         "no-asset-profiles-matching": "No asset profile matching '{{entity}}' were found.",
         "asset-profile-required": "Asset profile is required",
         "idCopiedMessage": "Asset profile Id has been copied to clipboard",
@@ -1290,7 +1312,7 @@
         "select-queue-hint": "Select from a drop-down list.",
         "delete-asset-profile-title": "Are you sure you want to delete the asset profile '{{assetProfileName}}'?",
         "delete-asset-profile-text": "Be careful, after the confirmation the asset profile and all related data will become unrecoverable.",
-        "delete-asset-profiles-title": "Are you sure you want to delete { count, plural, 1 {1 asset profile} other {# asset profiles} }?",
+        "delete-asset-profiles-title": "Are you sure you want to delete { count, plural, =1 {1 asset profile} other {# asset profiles} }?",
         "delete-asset-profiles-text": "Be careful, after the confirmation all selected asset profiles will be removed and all related data will become unrecoverable.",
         "set-default-asset-profile-title": "Are you sure you want to make the asset profile '{{assetProfileName}}' default?",
         "set-default-asset-profile-text": "After the confirmation the asset profile will be marked as default and will be used for new assets with no profile specified.",
@@ -1312,7 +1334,7 @@
         "device-profile-details": "Device profile details",
         "no-device-profiles-text": "No device profiles found",
         "search": "Search device profiles",
-        "selected-device-profiles": "{ count, plural, 1 {1 device profile} other {# device profiles} } selected",
+        "selected-device-profiles": "{ count, plural, =1 {1 device profile} other {# device profiles} } selected",
         "no-device-profiles-matching": "No device profile matching '{{entity}}' were found.",
         "device-profile-required": "Device profile is required",
         "idCopiedMessage": "Device profile Id has been copied to clipboard",
@@ -1352,7 +1374,7 @@
         "select-queue-hint": "Select from a drop-down list.",
         "delete-device-profile-title": "Are you sure you want to delete the device profile '{{deviceProfileName}}'?",
         "delete-device-profile-text": "Be careful, after the confirmation the device profile and all related data including associated OTA updates will become unrecoverable.",
-        "delete-device-profiles-title": "Are you sure you want to delete { count, plural, 1 {1 device profile} other {# device profiles} }?",
+        "delete-device-profiles-title": "Are you sure you want to delete { count, plural, =1 {1 device profile} other {# device profiles} }?",
         "delete-device-profiles-text": "Be careful, after the confirmation all selected device profiles will be removed and all related data including associated OTA updates will become unrecoverable.",
         "set-default-device-profile-title": "Are you sure you want to make the device profile '{{deviceProfileName}}' default?",
         "set-default-device-profile-text": "After the confirmation the device profile will be marked as default and will be used for new devices with no profile specified.",
@@ -1360,6 +1382,10 @@
         "create-new-device-profile": "Create a new one!",
         "mqtt-device-topic-filters": "MQTT device topic filters",
         "mqtt-device-topic-filters-unique": "MQTT device topic filters need to be unique.",
+        "mqtt-device-topic-filters-spark-plug": "MQTT device topic filters SparkPlug.",
+        "mqtt-device-topic-filters-spark-plug-hint": "Default - telemetry. Example: namespace/group_id/message_type/edge_node_id/[device_id].",
+        "mqtt-device-topic-filters-spark-plug-attribute-metric-names": "SparkPlug attributes metric names",
+        "mqtt-device-topic-filters-spark-plug-attribute-metric-names-hint": "Names of SparkPlug metrics that will be stored as device attributes. All other metrics will be stored as device telemetry",
         "mqtt-device-payload-type": "MQTT device payload",
         "mqtt-device-payload-type-json": "JSON",
         "mqtt-device-payload-type-proto": "Protobuf",
@@ -1473,8 +1499,8 @@
         "condition-repeating-value-range": "Count of events should be in a range from 1 to 2147483647.",
         "condition-repeating-value-pattern": "Count of events should be integers.",
         "condition-repeating-value-required": "Count of events is required.",
-        "condition-repeat-times": "Repeats { count, plural, 1 {1 time} other {# times} }",
-        "condition-repeat-times-dynamic": "Repeats \"{ attribute }\" ({ count, plural, 1 {1 time} other {# times} })",
+        "condition-repeat-times": "Repeats { count, plural, =1 {1 time} other {# times} }",
+        "condition-repeat-times-dynamic": "Repeats \"{ attribute }\" ({ count, plural, =1 {1 time} other {# times} })",
         "schedule-type": "Scheduler type",
         "schedule-type-required": "Scheduler type is required.",
         "schedule": "Schedule",
@@ -1716,7 +1742,7 @@
         "delete": "Delete edge",
         "delete-edge-title": "Are you sure you want to delete the edge '{{edgeName}}'?",
         "delete-edge-text": "Be careful, after the confirmation the edge and all related data will become unrecoverable.",
-        "delete-edges-title": "Are you sure you want to edge { count, plural, 1 {1 edge} other {# edges} }?",
+        "delete-edges-title": "Are you sure you want to edge { count, plural, =1 {1 edge} other {# edges} }?",
         "delete-edges-text": "Be careful, after the confirmation all selected edges will be removed and all related data will become unrecoverable.",
         "name": "Name",
         "name-starts-with": "Edge name starts with",
@@ -1743,7 +1769,7 @@
         "unassign-from-customer": "Unassign from customer",
         "unassign-edge-title": "Are you sure you want to unassign the edge '{{edgeName}}'?",
         "unassign-edge-text": "After the confirmation the edge will be unassigned and won't be accessible by the customer.",
-        "unassign-edges-title": "Are you sure you want to unassign { count, plural, 1 {1 edge} other {# edges} }?",
+        "unassign-edges-title": "Are you sure you want to unassign { count, plural, =1 {1 edge} other {# edges} }?",
         "unassign-edges-text": "After the confirmation all selected edges will be unassigned and won't be accessible by the customer.",
         "make-public": "Make edge public",
         "make-public-edge-title": "Are you sure you want to make the edge '{{edgeName}}' public?",
@@ -1777,7 +1803,7 @@
         "rulechain-templates": "Rule chain templates",
         "rulechains": "Rule chains",
         "search": "Search edges",
-        "selected-edges": "{ count, plural, 1 {1 edge} other {# edges} } selected",
+        "selected-edges": "{ count, plural, =1 {1 edge} other {# edges} } selected",
         "any-edge": "Any edge",
         "no-edge-types-matching": "No edge types matching '{{entitySubtype}}' were found.",
         "edge-type-list-empty": "No edge types selected.",
@@ -1878,63 +1904,63 @@
         "type-required": "Entity type is required.",
         "type-device": "Device",
         "type-devices": "Devices",
-        "list-of-devices": "{ count, plural, 1 {One device} other {List of # devices} }",
+        "list-of-devices": "{ count, plural, =1 {One device} other {List of # devices} }",
         "device-name-starts-with": "Devices whose names start with '{{prefix}}'",
         "type-device-profile": "Device profile",
         "type-device-profiles": "Device profiles",
-        "list-of-device-profiles": "{ count, plural, 1 {One device profile} other {List of # device profiles} }",
+        "list-of-device-profiles": "{ count, plural, =1 {One device profile} other {List of # device profiles} }",
         "device-profile-name-starts-with": "Device profiles whose names start with '{{prefix}}'",
         "type-asset-profile": "Asset profile",
         "type-asset-profiles": "Asset profiles",
-        "list-of-asset-profiles": "{ count, plural, 1 {One asset profile} other {List of # asset profiles} }",
+        "list-of-asset-profiles": "{ count, plural, =1 {One asset profile} other {List of # asset profiles} }",
         "asset-profile-name-starts-with": "Asset profiles whose names start with '{{prefix}}'",
         "type-asset": "Asset",
         "type-assets": "Assets",
-        "list-of-assets": "{ count, plural, 1 {One asset} other {List of # assets} }",
+        "list-of-assets": "{ count, plural, =1 {One asset} other {List of # assets} }",
         "asset-name-starts-with": "Assets whose names start with '{{prefix}}'",
         "type-entity-view": "Entity View",
         "type-entity-views": "Entity Views",
-        "list-of-entity-views": "{ count, plural, 1 {One entity view} other {List of # entity views} }",
+        "list-of-entity-views": "{ count, plural, =1 {One entity view} other {List of # entity views} }",
         "entity-view-name-starts-with": "Entity Views whose names start with '{{prefix}}'",
         "type-rule": "Rule",
         "type-rules": "Rules",
-        "list-of-rules": "{ count, plural, 1 {One rule} other {List of # rules} }",
+        "list-of-rules": "{ count, plural, =1 {One rule} other {List of # rules} }",
         "rule-name-starts-with": "Rules whose names start with '{{prefix}}'",
         "type-plugin": "Plugin",
         "type-plugins": "Plugins",
-        "list-of-plugins": "{ count, plural, 1 {One plugin} other {List of # plugins} }",
+        "list-of-plugins": "{ count, plural, =1 {One plugin} other {List of # plugins} }",
         "plugin-name-starts-with": "Plugins whose names start with '{{prefix}}'",
         "type-tenant": "Tenant",
         "type-tenants": "Tenants",
-        "list-of-tenants": "{ count, plural, 1 {One tenant} other {List of # tenants} }",
+        "list-of-tenants": "{ count, plural, =1 {One tenant} other {List of # tenants} }",
         "tenant-name-starts-with": "Tenants whose names start with '{{prefix}}'",
         "type-tenant-profile": "Tenant profile",
         "type-tenant-profiles": "Tenant profiles",
-        "list-of-tenant-profiles": "{ count, plural, 1 {One tenant profile} other {List of # tenant profiles} }",
+        "list-of-tenant-profiles": "{ count, plural, =1 {One tenant profile} other {List of # tenant profiles} }",
         "tenant-profile-name-starts-with": "Tenant profiles whose names start with '{{prefix}}'",
         "type-customer": "Customer",
         "type-customers": "Customers",
-        "list-of-customers": "{ count, plural, 1 {One customer} other {List of # customers} }",
+        "list-of-customers": "{ count, plural, =1 {One customer} other {List of # customers} }",
         "customer-name-starts-with": "Customers whose names start with '{{prefix}}'",
         "type-user": "User",
         "type-users": "Users",
-        "list-of-users": "{ count, plural, 1 {One user} other {List of # users} }",
+        "list-of-users": "{ count, plural, =1 {One user} other {List of # users} }",
         "user-name-starts-with": "Users whose names start with '{{prefix}}'",
         "type-dashboard": "Dashboard",
         "type-dashboards": "Dashboards",
-        "list-of-dashboards": "{ count, plural, 1 {One dashboard} other {List of # dashboards} }",
+        "list-of-dashboards": "{ count, plural, =1 {One dashboard} other {List of # dashboards} }",
         "dashboard-name-starts-with": "Dashboards whose names start with '{{prefix}}'",
         "type-alarm": "Alarm",
         "type-alarms": "Alarms",
-        "list-of-alarms": "{ count, plural, 1 {One alarms} other {List of # alarms} }",
+        "list-of-alarms": "{ count, plural, =1 {One alarms} other {List of # alarms} }",
         "alarm-name-starts-with": "Alarms whose names start with '{{prefix}}'",
         "type-rulechain": "Rule chain",
         "type-rulechains": "Rule chains",
-        "list-of-rulechains": "{ count, plural, 1 {One rule chain} other {List of # rule chains} }",
+        "list-of-rulechains": "{ count, plural, =1 {One rule chain} other {List of # rule chains} }",
         "rulechain-name-starts-with": "Rule chains whose names start with '{{prefix}}'",
         "type-rulenode": "Rule node",
         "type-rulenodes": "Rule nodes",
-        "list-of-rulenodes": "{ count, plural, 1 {One rule node} other {List of # rule nodes} }",
+        "list-of-rulenodes": "{ count, plural, =1 {One rule node} other {List of # rule nodes} }",
         "rulenode-name-starts-with": "Rule nodes whose names start with '{{prefix}}'",
         "type-current-customer": "Current Customer",
         "type-current-tenant": "Current Tenant",
@@ -1942,9 +1968,9 @@
         "type-current-user-owner": "Current User Owner",
         "type-widgets-bundle": "Widgets bundle",
         "type-widgets-bundles": "Widgets bundles",
-        "list-of-widgets-bundles": "{ count, plural, 1 {One widgets bundle} other {List of # widget bundles} }",
+        "list-of-widgets-bundles": "{ count, plural, =1 {One widgets bundle} other {List of # widget bundles} }",
         "search": "Search entities",
-        "selected-entities": "{ count, plural, 1 {1 entity} other {# entities} } selected",
+        "selected-entities": "{ count, plural, =1 {1 entity} other {# entities} } selected",
         "entity-name": "Entity name",
         "entity-label": "Entity label",
         "details": "Entity details",
@@ -1954,7 +1980,7 @@
         "type-api-usage-state": "Api Usage State",
         "type-edge": "Edge",
         "type-edges": "Edges",
-        "list-of-edges": "{ count, plural, 1 {One edge} other {List of # edges} }",
+        "list-of-edges": "{ count, plural, =1 {One edge} other {List of # edges} }",
         "edge-name-starts-with": "Edges whose names start with '{{prefix}}'",
         "type-tb-resource": "Resource",
         "type-ota-package": "OTA package"
@@ -2017,21 +2043,21 @@
         "add-entity-view-text": "Add new entity view",
         "delete": "Delete entity view",
         "assign-entity-views": "Assign entity views",
-        "assign-entity-views-text": "Assign { count, plural, 1 {1 entity view} other {# entity views} } to customer",
+        "assign-entity-views-text": "Assign { count, plural, =1 {1 entity view} other {# entity views} } to customer",
         "delete-entity-views": "Delete entity views",
         "unassign-from-customer": "Unassign from customer",
         "unassign-entity-views": "Unassign entity views",
-        "unassign-entity-views-action-title": "Unassign { count, plural, 1 {1 entity view} other {# entity views} } from customer",
+        "unassign-entity-views-action-title": "Unassign { count, plural, =1 {1 entity view} other {# entity views} } from customer",
         "assign-new-entity-view": "Assign new entity view",
         "delete-entity-view-title": "Are you sure you want to delete the entity view '{{entityViewName}}'?",
         "delete-entity-view-text": "Be careful, after the confirmation the entity view and all related data will become unrecoverable.",
-        "delete-entity-views-title": "Are you sure you want to delete { count, plural, 1 {1 entity view} other {# entity views} }?",
-        "delete-entity-views-action-title": "Delete { count, plural, 1 {1 entity view} other {# entity views} }",
+        "delete-entity-views-title": "Are you sure you want to delete { count, plural, =1 {1 entity view} other {# entity views} }?",
+        "delete-entity-views-action-title": "Delete { count, plural, =1 {1 entity view} other {# entity views} }",
         "delete-entity-views-text": "Be careful, after the confirmation all selected entity views will be removed and all related data will become unrecoverable.",
         "unassign-entity-view-title": "Are you sure you want to unassign the entity view '{{entityViewName}}'?",
         "unassign-entity-view-text": "After the confirmation the entity view will be unassigned and won't be accessible by the customer.",
         "unassign-entity-view": "Unassign entity view",
-        "unassign-entity-views-title": "Are you sure you want to unassign { count, plural, 1 {1 entity view} other {# entity views} }?",
+        "unassign-entity-views-title": "Are you sure you want to unassign { count, plural, =1 {1 entity view} other {# entity views} }?",
         "unassign-entity-views-text": "After the confirmation all selected entity views will be unassigned and won't be accessible by the customer.",
         "entity-view-type": "Entity View type",
         "entity-view-type-required": "Entity View type is required.",
@@ -2076,7 +2102,7 @@
         "timeseries-data": "Timeseries data",
         "timeseries-data-hint": "Configure timeseries data keys of the target entity that will be accessible to the entity view. This timeseries data is read-only.",
         "search": "Search entity views",
-        "selected-entity-views": "{ count, plural, 1 {1 entity view} other {# entity views} } selected",
+        "selected-entity-views": "{ count, plural, =1 {1 entity view} other {# entity views} } selected",
         "make-public-entity-view-title": "Are you sure you want to make the entity view '{{entityViewName}}' public?",
         "make-public-entity-view-text": "After the confirmation the entity view and all its data will be made public and accessible by others.",
         "make-private-entity-view-title": "Are you sure you want to make the entity view '{{entityViewName}}' private?",
@@ -2085,9 +2111,9 @@
         "assign-entity-view-to-edge-text":"Please select the entity views to assign to the edge",
         "unassign-entity-view-from-edge-title": "Are you sure you want to unassign the entity view '{{entityViewName}}'?",
         "unassign-entity-view-from-edge-text": "After the confirmation the entity view will be unassigned and won't be accessible by the edge.",
-        "unassign-entity-views-from-edge-action-title": "Unassign { count, plural, 1 {1 entity view} other {# entity views} } from edge",
+        "unassign-entity-views-from-edge-action-title": "Unassign { count, plural, =1 {1 entity view} other {# entity views} } from edge",
         "unassign-entity-view-from-edge": "Unassign entity view",
-        "unassign-entity-views-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 entity view} other {# entity views} }?",
+        "unassign-entity-views-from-edge-title": "Are you sure you want to unassign { count, plural, =1 {1 entity view} other {# entity views} }?",
         "unassign-entity-views-from-edge-text": "After the confirmation all selected entity views will be unassigned and won't be accessible by the edge."
     },
     "event": {
@@ -2137,7 +2163,7 @@
     },
     "extension": {
         "extensions": "Extensions",
-        "selected-extensions": "{ count, plural, 1 {1 extension} other {# extensions} } selected",
+        "selected-extensions": "{ count, plural, =1 {1 extension} other {# extensions} } selected",
         "type": "Type",
         "key": "Key",
         "value": "Value",
@@ -2151,7 +2177,7 @@
         "edit": "Edit extension",
         "delete-extension-title": "Are you sure you want to delete the extension '{{extensionId}}'?",
         "delete-extension-text": "Be careful, after the confirmation the extension and all related data will become unrecoverable.",
-        "delete-extensions-title": "Are you sure you want to delete { count, plural, 1 {1 extension} other {# extensions} }?",
+        "delete-extensions-title": "Are you sure you want to delete { count, plural, =1 {1 extension} other {# extensions} }?",
         "delete-extensions-text": "Be careful, after the confirmation all selected extensions will be removed.",
         "converters": "Converters",
         "converter-id": "Converter id",
@@ -2471,8 +2497,8 @@
     "grid": {
         "delete-item-title": "Are you sure you want to delete this item?",
         "delete-item-text": "Be careful, after the confirmation this item and all related data will become unrecoverable.",
-        "delete-items-title": "Are you sure you want to delete { count, plural, 1 {1 item} other {# items} }?",
-        "delete-items-action-title": "Delete { count, plural, 1 {1 item} other {# items} }",
+        "delete-items-title": "Are you sure you want to delete { count, plural, =1 {1 item} other {# items} }?",
+        "delete-items-action-title": "Delete { count, plural, =1 {1 item} other {# items} }",
         "delete-items-text": "Be careful, after the confirmation all selected items will be removed and all related data will become unrecoverable.",
         "add-item-text": "Add new item",
         "no-items-text": "No items found",
@@ -2656,7 +2682,7 @@
         "verify-your-identity": "Verify your identity",
         "select-way-to-verify": "Select a way to verify",
         "resend-code": "Resend code",
-        "resend-code-wait": "Resend code in { time, plural, 1 {1 second} other {# seconds} }",
+        "resend-code-wait": "Resend code in { time, plural, =1 {1 second} other {# seconds} }",
         "try-another-way": "Try another way",
         "totp-auth-description": "Please enter the security code from your authenticator app.",
         "totp-auth-placeholder": "Code",
@@ -2684,8 +2710,8 @@
       "checksum-hint": "If checksum is empty, it will be generated automatically",
       "checksum-algorithm": "Checksum algorithm",
       "checksum-copied-message": "Package checksum has been copied to clipboard",
-      "change-firmware": "Change of the firmware may cause update of { count, plural, 1 {1 device} other {# devices} }.",
-      "change-software": "Change of the software may cause update of { count, plural, 1 {1 device} other {# devices} }.",
+      "change-firmware": "Change of the firmware may cause update of { count, plural, =1 {1 device} other {# devices} }.",
+      "change-software": "Change of the software may cause update of { count, plural, =1 {1 device} other {# devices} }.",
       "chose-compatible-device-profile": "The uploaded package will be available only for devices with the chosen profile.",
       "chose-firmware-distributed-device": "Choose firmware that will be distributed to the devices",
       "chose-software-distributed-device": "Choose software that will be distributed to the devices",
@@ -2698,7 +2724,7 @@
       "delete-ota-update-text": "Be careful, after the confirmation the OTA update will become unrecoverable.",
       "delete-ota-update-title": "Are you sure you want to delete the OTA update '{{title}}'?",
       "delete-ota-updates-text": "Be careful, after the confirmation all selected OTA updates will be removed.",
-      "delete-ota-updates-title": "Are you sure you want to delete { count, plural, 1 {1 OTA update} other {# OTA updates} }?",
+      "delete-ota-updates-title": "Are you sure you want to delete { count, plural, =1 {1 OTA update} other {# OTA updates} }?",
       "description": "Description",
       "direct-url": "Direct URL",
       "direct-url-copied-message": "Package direct URL has been copied to clipboard",
@@ -2721,7 +2747,7 @@
       "package-type": "Package type",
       "packages-repository": "Packages repository",
       "search": "Search packages",
-      "selected-package": "{ count, plural, 1 {1 package} other {# packages} } selected",
+      "selected-package": "{ count, plural, =1 {1 package} other {# packages} } selected",
       "title": "Title",
       "title-required": "Title is required.",
       "title-max-length": "Title should be less than 256",
@@ -2816,17 +2842,17 @@
         },
         "password-requirement": {
             "at-least": "At least:",
-            "character": "{ count, plural, 1 {1 character} other {# characters} }",
-            "digit": "{ count, plural, 1 {1 digit} other {# digits} }",
+            "character": "{ count, plural, =1 {1 character} other {# characters} }",
+            "digit": "{ count, plural, =1 {1 digit} other {# digits} }",
             "incorrect-password-try-again": "Incorrect password. Try again",
-            "lowercase-letter": "{ count, plural, 1 {1 lowercase letter} other {# lowercase letters} }",
+            "lowercase-letter": "{ count, plural, =1 {1 lowercase letter} other {# lowercase letters} }",
             "new-passwords-not-match": "New password didn't match",
             "password-should-not-contain-spaces": "Your password should not contain spaces",
             "password-not-meet-requirements": "Password didn't meet requirements",
             "password-requirements": "Password requirements",
             "password-should-difference": "New password should be different from current",
-            "special-character": "{ count, plural, 1 {1 special character} other {# special characters} }",
-            "uppercase-letter": "{ count, plural, 1 {1 uppercase letter} other {# uppercase letters} }"
+            "special-character": "{ count, plural, =1 {1 special character} other {# special characters} }",
+            "uppercase-letter": "{ count, plural, =1 {1 uppercase letter} other {# uppercase letters} }"
         }
     },
     "relation": {
@@ -2842,7 +2868,7 @@
         },
         "from-relations": "Outbound relations",
         "to-relations": "Inbound relations",
-        "selected-relations": "{ count, plural, 1 {1 relation} other {# relations} } selected",
+        "selected-relations": "{ count, plural, =1 {1 relation} other {# relations} } selected",
         "type": "Type",
         "to-entity-type": "To entity type",
         "to-entity-name": "To entity name",
@@ -2859,11 +2885,11 @@
         "edit": "Edit relation",
         "delete-to-relation-title": "Are you sure you want to delete relation to the entity '{{entityName}}'?",
         "delete-to-relation-text": "Be careful, after the confirmation the entity '{{entityName}}' will be unrelated from the current entity.",
-        "delete-to-relations-title": "Are you sure you want to delete { count, plural, 1 {1 relation} other {# relations} }?",
+        "delete-to-relations-title": "Are you sure you want to delete { count, plural, =1 {1 relation} other {# relations} }?",
         "delete-to-relations-text": "Be careful, after the confirmation all selected relations will be removed and corresponding entities will be unrelated from the current entity.",
         "delete-from-relation-title": "Are you sure you want to delete relation from the entity '{{entityName}}'?",
         "delete-from-relation-text": "Be careful, after the confirmation current entity will be unrelated from the entity '{{entityName}}'.",
-        "delete-from-relations-title": "Are you sure you want to delete { count, plural, 1 {1 relation} other {# relations} }?",
+        "delete-from-relations-title": "Are you sure you want to delete { count, plural, =1 {1 relation} other {# relations} }?",
         "delete-from-relations-text": "Be careful, after the confirmation all selected relations will be removed and current entity will be unrelated from the corresponding entities.",
         "remove-relation-filter": "Remove relation filter",
         "add-relation-filter": "Add relation filter",
@@ -2879,9 +2905,9 @@
         "delete": "Delete resource",
         "delete-resource-text": "Be careful, after the confirmation the resource will become unrecoverable.",
         "delete-resource-title": "Are you sure you want to delete the resource '{{resourceTitle}}'?",
-        "delete-resources-action-title": "Delete { count, plural, 1 {1 resource} other {# resources} }",
+        "delete-resources-action-title": "Delete { count, plural, =1 {1 resource} other {# resources} }",
         "delete-resources-text": "Please note that the selected resources, even if they are used in device profiles, will be deleted.",
-        "delete-resources-title": "Are you sure you want to delete { count, plural, 1 {1 resource} other {# resources} }?",
+        "delete-resources-title": "Are you sure you want to delete { count, plural, =1 {1 resource} other {# resources} }?",
         "download": "Download resource",
         "drop-file": "Drop a resource file or click to select a file to upload.",
         "drop-resource-file-or": "Drag and drop a resource file or",
@@ -2896,7 +2922,7 @@
         "resource-type": "Resource type",
         "resources-library": "Resources library",
         "search": "Search resources",
-        "selected-resources": "{ count, plural, 1 {1 resource} other {# resources} } selected",
+        "selected-resources": "{ count, plural, =1 {1 resource} other {# resources} } selected",
         "system": "System",
         "title": "Title",
         "title-required": "Title is required.",
@@ -2917,8 +2943,8 @@
         "set-root-rulechain-text": "After the confirmation the rule chain will become root and will handle all incoming transport messages.",
         "delete-rulechain-title": "Are you sure you want to delete the rule chain '{{ruleChainName}}'?",
         "delete-rulechain-text": "Be careful, after the confirmation the rule chain and all related data will become unrecoverable.",
-        "delete-rulechains-title": "Are you sure you want to delete { count, plural, 1 {1 rule chain} other {# rule chains} }?",
-        "delete-rulechains-action-title": "Delete { count, plural, 1 {1 rule chain} other {# rule chains} }",
+        "delete-rulechains-title": "Are you sure you want to delete { count, plural, =1 {1 rule chain} other {# rule chains} }?",
+        "delete-rulechains-action-title": "Delete { count, plural, =1 {1 rule chain} other {# rule chains} }",
         "delete-rulechains-text": "Be careful, after the confirmation all selected rule chains will be removed and all related data will become unrecoverable.",
         "add-rulechain-text": "Add new rule chain",
         "no-rulechains-text": "No rule chains found",
@@ -2940,14 +2966,14 @@
         "management": "Rules management",
         "debug-mode": "Debug mode",
         "search": "Search rule chains",
-        "selected-rulechains": "{ count, plural, 1 {1 rule chain} other {# rule chains} } selected",
+        "selected-rulechains": "{ count, plural, =1 {1 rule chain} other {# rule chains} } selected",
         "open-rulechain": "Open rule chain",
         "assign-new-rulechain": "Assign new rulechain",
         "edge-template-root": "Template Root",
         "assign-to-edge": "Assign to Edge",
         "edge-rulechain": "Edge rule chain",
         "unassign-rulechain-from-edge-text": "After the confirmation the rulechain will be unassigned and won't be accessible by the edge.",
-        "unassign-rulechains-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 rulechain} other {# rulechains} }?",
+        "unassign-rulechains-from-edge-title": "Are you sure you want to unassign { count, plural, =1 {1 rulechain} other {# rulechains} }?",
         "unassign-rulechains-from-edge-text": "After the confirmation all selected rulechains will be unassigned and won't be accessible by the edge.",
         "assign-rulechain-to-edge-title": "Assign Rule Chain(s) To Edge",
         "assign-rulechain-to-edge-text": "Please select the rulechains to assign to the edge",
@@ -3072,9 +3098,9 @@
         "submit-strategy-type-required": "Submit strategy type is required!",
         "processing-strategy-type-required": "Processing strategy type is required!",
         "queues": "Queues",
-        "selected-queues": "{ count, plural, 1 {1 queue} other {# queues} } selected",
+        "selected-queues": "{ count, plural, =1 {1 queue} other {# queues} } selected",
         "delete-queue-title": "Are you sure you want to delete the queue '{{queueName}}'?",
-        "delete-queues-title": "Are you sure you want to delete { count, plural, 1 {1 queue} other {# queues} }?",
+        "delete-queues-title": "Are you sure you want to delete { count, plural, =1 {1 queue} other {# queues} }?",
         "delete-queue-text": "Be careful, after the confirmation the queue and all related data will become unrecoverable.",
         "delete-queues-text": "After the confirmation all selected queues will be deleted and won't be accessible.",
         "search": "Search queue",
@@ -3158,8 +3184,8 @@
         "title-max-length": "Title should be less than 256",
         "delete-tenant-title": "Are you sure you want to delete the tenant '{{tenantTitle}}'?",
         "delete-tenant-text": "Be careful, after the confirmation the tenant and all related data will become unrecoverable.",
-        "delete-tenants-title": "Are you sure you want to delete { count, plural, 1 {1 tenant} other {# tenants} }?",
-        "delete-tenants-action-title": "Delete { count, plural, 1 {1 tenant} other {# tenants} }",
+        "delete-tenants-title": "Are you sure you want to delete { count, plural, =1 {1 tenant} other {# tenants} }?",
+        "delete-tenants-action-title": "Delete { count, plural, =1 {1 tenant} other {# tenants} }",
         "delete-tenants-text": "Be careful, after the confirmation all selected tenants will be removed and all related data will become unrecoverable.",
         "title": "Title",
         "title-required": "Title is required.",
@@ -3172,7 +3198,7 @@
         "no-tenants-matching": "No tenants matching '{{entity}}' were found.",
         "tenant-required": "Tenant is required",
         "search": "Search tenants",
-        "selected-tenants": "{ count, plural, 1 {1 tenant} other {# tenants} } selected",
+        "selected-tenants": "{ count, plural, =1 {1 tenant} other {# tenants} } selected",
         "isolated-tb-rule-engine": "Processing in isolated ThingsBoard Rule Engine container",
         "isolated-tb-rule-engine-details": "Requires separate microservice(s) per isolated Tenant"
     },
@@ -3185,7 +3211,7 @@
         "no-tenant-profiles-text": "No tenant profiles found",
         "name-max-length": "Name should be less than 256",
         "search": "Search tenant profiles",
-        "selected-tenant-profiles": "{ count, plural, 1 {1 tenant profile} other {# tenant profiles} } selected",
+        "selected-tenant-profiles": "{ count, plural, =1 {1 tenant profile} other {# tenant profiles} } selected",
         "no-tenant-profiles-matching": "No tenant profile matching '{{entity}}' were found.",
         "tenant-profile-required": "Tenant profile is required",
         "idCopiedMessage": "Tenant profile Id has been copied to clipboard",
@@ -3200,7 +3226,7 @@
         "default": "Default",
         "delete-tenant-profile-title": "Are you sure you want to delete the tenant profile '{{tenantProfileName}}'?",
         "delete-tenant-profile-text": "Be careful, after the confirmation the tenant profile and all related data will become unrecoverable.",
-        "delete-tenant-profiles-title": "Are you sure you want to delete { count, plural, 1 {1 tenant profile} other {# tenant profiles} }?",
+        "delete-tenant-profiles-title": "Are you sure you want to delete { count, plural, =1 {1 tenant profile} other {# tenant profiles} }?",
         "delete-tenant-profiles-text": "Be careful, after the confirmation all selected tenant profiles will be removed and all related data will become unrecoverable.",
         "set-default-tenant-profile-title": "Are you sure you want to make the tenant profile '{{tenantProfileName}}' default?",
         "set-default-tenant-profile-text": "After the confirmation the tenant profile will be marked as default and will be used for new tenants with no profile specified.",
@@ -3345,10 +3371,10 @@
         }
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, 1 {1 second} other {# seconds} }",
-        "minutes-interval": "{ minutes, plural, 1 {1 minute} other {# minutes} }",
-        "hours-interval": "{ hours, plural, 1 {1 hour} other {# hours} }",
-        "days-interval": "{ days, plural, 1 {1 day} other {# days} }",
+        "seconds-interval": "{ seconds, plural, =1 {1 second} other {# seconds} }",
+        "minutes-interval": "{ minutes, plural, =1 {1 minute} other {# minutes} }",
+        "hours-interval": "{ hours, plural, =1 {1 hour} other {# hours} }",
+        "days-interval": "{ days, plural, =1 {1 day} other {# days} }",
         "days": "Days",
         "hours": "Hours",
         "minutes": "Minutes",
@@ -3383,13 +3409,19 @@
         "days": "Days"
     },
     "timewindow": {
-        "days": "{ days, plural, 1 { day } other {# days } }",
-        "hours": "{ hours, plural, 0 { hour } 1 {1 hour } other {# hours } }",
-        "minutes": "{ minutes, plural, 0 { minute } 1 {1 minute } other {# minutes } }",
-        "seconds": "{ seconds, plural, 0 { second } 1 {1 second } other {# seconds } }",
+        "years": "{ years, plural, =1 { year } other {# years } }",
+        "months": "{ months, plural, =1 { month } other {# months } }",
+        "weeks": "{ weeks, plural, =1 { week } other {# weeks } }",
+        "days": "{ days, plural, =1 { day } other {# days } }",
+        "hours": "{ hours, plural, =0 { hour } =1 {1 hour } other {# hours } }",
+        "hr": "{{ hr }} hr",
+        "minutes": "{ minutes, plural, =0 { minute } =1 {1 minute } other {# minutes } }",
+        "min": "{{ min }} min",
+        "seconds": "{ seconds, plural, =0 { second } =1 {1 second } other {# seconds } }",
+        "sec": "{{ sec }} sec",
         "short": {
-            "days": "{ days, plural, 1 {1 day } other {# days } }",
-            "hours": "{ hours, plural, 1 {1 hour } other {# hours } }",
+            "days": "{ days, plural, =1 {1 day } other {# days } }",
+            "hours": "{ hours, plural, =1 {1 hour } other {# hours } }",
             "minutes": "{{minutes}} min ",
             "seconds": "{{seconds}} sec "
         },
@@ -3402,7 +3434,8 @@
         "last": "Last",
         "time-period": "Time period",
         "hide": "Hide",
-        "interval": "Interval"
+        "interval": "Interval",
+        "just-now": "Just now"
     },
     "user": {
         "user": "User",
@@ -3420,8 +3453,8 @@
         "user-details": "User details",
         "delete-user-title": "Are you sure you want to delete the user '{{userEmail}}'?",
         "delete-user-text": "Be careful, after the confirmation the user and all related data will become unrecoverable.",
-        "delete-users-title": "Are you sure you want to delete { count, plural, 1 {1 user} other {# users} }?",
-        "delete-users-action-title": "Delete { count, plural, 1 {1 user} other {# users} }",
+        "delete-users-title": "Are you sure you want to delete { count, plural, =1 {1 user} other {# users} }?",
+        "delete-users-action-title": "Delete { count, plural, =1 {1 user} other {# users} }",
         "delete-users-text": "Be careful, after the confirmation all selected users will be removed and all related data will become unrecoverable.",
         "activation-email-sent-message": "Activation email was successfully sent!",
         "resend-activation": "Resend activation",
@@ -3447,7 +3480,7 @@
         "login-as-tenant-admin": "Login as Tenant Admin",
         "login-as-customer-user": "Login as Customer User",
         "search": "Search users",
-        "selected-users": "{ count, plural, 1 {1 user} other {# users} } selected",
+        "selected-users": "{ count, plural, =1 {1 user} other {# users} } selected",
         "disable-account": "Disable User Account",
         "enable-account": "Enable User Account",
         "enable-account-message": "User account was successfully enabled!",
@@ -3513,7 +3546,7 @@
         "previous-difference": "Previous Difference",
         "next-difference": "Next Difference",
         "current": "Current",
-        "differences": "{ count, plural, 1 {1 difference} other {# differences} }",
+        "differences": "{ count, plural, =1 {1 difference} other {# differences} }",
         "create-entities-version": "Create entities version",
         "default-sync-strategy": "Default sync strategy",
         "sync-strategy-merge": "Merge",
@@ -3526,7 +3559,7 @@
         "no-entities-to-restore-prompt": "Please specify entities to restore",
         "add-entity-type": "Add entity type",
         "remove-all": "Remove all",
-        "version-create-result": "{ added, plural, 0 {No entities} 1 {1 entity} other {# entities} } added.<br/>{ modified, plural, 0 {No entities} 1 {1 entity} other {# entities} } modified.<br/>{ removed, plural, 0 {No entities} 1 {1 entity} other {# entities} } removed.",
+        "version-create-result": "{ added, plural, =0 {No entities} =1 {1 entity} other {# entities} } added.<br/>{ modified, plural, =0 {No entities} =1 {1 entity} other {# entities} } modified.<br/>{ removed, plural, =0 {No entities} =1 {1 entity} other {# entities} } removed.",
         "remove-other-entities": "Remove other entities",
         "find-existing-entity-by-name": "Find existing entity by name",
         "restore-entities-from-version": "Restore entities from version '{{versionName}}'",
@@ -3684,8 +3717,8 @@
         "widgets-bundle-details": "Widgets bundle details",
         "delete-widgets-bundle-title": "Are you sure you want to delete the widgets bundle '{{widgetsBundleTitle}}'?",
         "delete-widgets-bundle-text": "Be careful, after the confirmation the widgets bundle and all related data will become unrecoverable.",
-        "delete-widgets-bundles-title": "Are you sure you want to delete { count, plural, 1 {1 widgets bundle} other {# widgets bundles} }?",
-        "delete-widgets-bundles-action-title": "Delete { count, plural, 1 {1 widgets bundle} other {# widgets bundles} }",
+        "delete-widgets-bundles-title": "Are you sure you want to delete { count, plural, =1 {1 widgets bundle} other {# widgets bundles} }?",
+        "delete-widgets-bundles-action-title": "Delete { count, plural, =1 {1 widgets bundle} other {# widgets bundles} }",
         "delete-widgets-bundles-text": "Be careful, after the confirmation all selected widgets bundles will be removed and all related data will become unrecoverable.",
         "no-widgets-bundles-matching": "No widgets bundles matching '{{widgetsBundle}}' were found.",
         "widgets-bundle-required": "Widgets bundle is required.",
@@ -3697,7 +3730,7 @@
         "widgets-bundle-file": "Widgets bundle file",
         "invalid-widgets-bundle-file-error": "Unable to import widgets bundle: Invalid widgets bundle data structure.",
         "search": "Search widget bundles",
-        "selected-widgets-bundles": "{ count, plural, 1 {1 widgets bundle} other {# widgets bundles} } selected",
+        "selected-widgets-bundles": "{ count, plural, =1 {1 widgets bundle} other {# widgets bundles} } selected",
         "open-widgets-bundle": "Open widgets bundle",
         "loading-widgets-bundles": "Loading widgets bundles..."
     },
@@ -3731,7 +3764,7 @@
         "legend": "Legend",
         "display-legend": "Display legend",
         "datasources": "Datasources",
-        "maximum-datasources": "Maximum { count, plural, 1 {1 datasource is allowed.} other {# datasources are allowed} }",
+        "maximum-datasources": "Maximum { count, plural, =1 {1 datasource is allowed.} other {# datasources are allowed} }",
         "timeseries-key-error": "At least one timeseries data key should be specified",
         "datasource-type": "Type",
         "datasource-parameters": "Parameters",
@@ -4678,6 +4711,7 @@
             "use-markdown-text-function": "Use markdown/HTML value function",
             "markdown-text-function": "Markdown/HTML value function",
             "markdown-text-pattern": "Markdown/HTML pattern (markdown or HTML with variables, for ex. '${entityName} or ${keyName} - some text.')",
+            "apply-default-markdown-style": "Apply default markdown style",
             "markdown-css": "Markdown/HTML CSS"
         },
         "simple-card": {
@@ -4733,7 +4767,9 @@
             "enable-alarm-filter": "Enable alarm filter",
             "display-alarm-details": "Display alarm details",
             "allow-alarms-ack": "Allow alarms acknowledgment",
-            "allow-alarms-clear": "Allow alarms clear"
+            "allow-alarms-clear": "Allow alarms clear",
+            "display-alarm-comments": "Display alarm comments",
+            "allow-alarms-assign": "Allow alarms assignment"
         },
         "value-source": {
             "value-source": "Value source",
@@ -4798,28 +4834,28 @@
     "language": {
         "language": "Language",
         "locales": {
+            "ca_ES": "Catalan",
+            "cs_CZ": "Česky",
+            "da_DK": "Dansk",
             "de_DE": "Deutsch",
-            "fr_FR": "Français",
-            "zh_CN": "简体中文",
-            "zh_TW": "繁體中文",
+            "el_GR": "Ελληνικά",
             "en_US": "English",
-            "it_IT": "Italiano",
-            "ko_KR": "한국어",
-            "ru_RU": "Русский",
             "es_ES": "Español",
-            "ca_ES": "Catalan",
-            "ja_JP": "日本語",
-            "tr_TR": "Türkçe",
             "fa_IR": "فارسي",
-            "uk_UA": "Українська",
-            "cs_CZ": "Česky",
-            "el_GR": "Ελληνικά",
-            "ro_RO": "Română",
-            "lv_LV": "Latviešu",
+            "fr_FR": "Français",
+            "it_IT": "Italiano",
+            "ja_JP": "日本語",
             "ka_GE": "ქართული",
+            "ko_KR": "한국어",
+            "lv_LV": "Latviešu",
             "pt_BR": "Português do Brasil",
+            "ro_RO": "Română",
+            "ru_RU": "Русский",
             "sl_SI": "Slovenščina",
-            "da_DK": "Dansk"
+            "tr_TR": "Türkçe",
+            "uk_UA": "Українська",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文"
         }
     }
 }
diff --git a/ui-ngx/src/assets/locale/locale.constant-es_ES.json b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
index 68305d1352..637b3e2755 100644
--- a/ui-ngx/src/assets/locale/locale.constant-es_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
@@ -427,17 +427,17 @@
         "acknowledge": "Reconocer",
         "clear": "Normalizar",
         "search": "Buscar alarmas",
-        "selected-alarms": "{ count, plural, 1 {1 alarma} other {# alarmas} } seleccionadas",
+        "selected-alarms": "{ count, plural, =1 {1 alarma} other {# alarmas} } seleccionadas",
         "no-data": "Sin datos que mostrar",
         "polling-interval": "Ciclo de refresco de alarmas (seg)",
         "polling-interval-required": "Se requiere un ciclo de refresco válido.",
         "min-polling-interval-message": "El ciclo debe ser por lo menos de 1 segundo.",
-        "aknowledge-alarms-title": "Reconocer { count, plural, 1 {1 alarma} other {# alarmas} }",
-        "aknowledge-alarms-text": "Estas seguro de reconocer { count, plural, 1 {1 alarma} other {# alarmas} }?",
+        "aknowledge-alarms-title": "Reconocer { count, plural, =1 {1 alarma} other {# alarmas} }",
+        "aknowledge-alarms-text": "Estas seguro de reconocer { count, plural, =1 {1 alarma} other {# alarmas} }?",
         "aknowledge-alarm-title": "Recononcer Alarma",
         "aknowledge-alarm-text": "Estas seguro de reconocer Alarma?",
-        "clear-alarms-title": "Normalizar { count, plural, 1 {1 alarma} other {# alarmas} }",
-        "clear-alarms-text": "Limpiar { count, plural, 1 {1 alarma} other {# alarmas} }?",
+        "clear-alarms-title": "Normalizar { count, plural, =1 {1 alarma} other {# alarmas} }",
+        "clear-alarms-text": "Limpiar { count, plural, =1 {1 alarma} other {# alarmas} }?",
         "clear-alarm-title": "Limpiar Alarma",
         "clear-alarm-text": "Limpiar Alarma?",
         "alarm-status-filter": "Filtro de estados de Alarmas",
@@ -544,17 +544,17 @@
         "add-asset-text": "Añadir nuevo activo",
         "asset-details": "Detalles de activo",
         "assign-assets": "Asignar activos",
-        "assign-assets-text": "Asignar { count, plural, 1 {1 activo} other {# activos} } a cliente",
+        "assign-assets-text": "Asignar { count, plural, =1 {1 activo} other {# activos} } a cliente",
         "assign-asset-to-edge-title": "Asignar activo(s) al borde",
         "assign-asset-to-edge-text": "Por favor, selecciona lo activos a asignar al borde",
         "delete-assets": "Borrar activos",
         "unassign-assets": "Cancelar asignación de activo",
-        "unassign-assets-action-title": "Cancelar asignación de { count, plural, 1 {1 activo} other {# activos} } del cliente",
+        "unassign-assets-action-title": "Cancelar asignación de { count, plural, =1 {1 activo} other {# activos} } del cliente",
         "assign-new-asset": "Asignar nuevo activo",
         "delete-asset-title": "Eliminar el activo '{{assetName}}'?",
         "delete-asset-text": "Atención, tras la confirmación el activo y sus datos serán borrados e irrecuperables.",
-        "delete-assets-title": "Eliminar los activos { count, plural, 1 {1 activo} other {# activos} }?",
-        "delete-assets-action-title": "Borrar { count, plural, 1 {1 activo} other {# activos} }",
+        "delete-assets-title": "Eliminar los activos { count, plural, =1 {1 activo} other {# activos} }?",
+        "delete-assets-action-title": "Borrar { count, plural, =1 {1 activo} other {# activos} }",
         "delete-assets-text": "Atención, tras la confirmación todos los activos seleccionados y sus datos serán borrados e irrecuperables.",
         "make-public-asset-title": "Hacer el activo '{{assetName}}' público?",
         "make-public-asset-text": "Tras la confirmación, el activo y sus datos se harán públicos y accesibles por otros.",
@@ -563,7 +563,7 @@
         "unassign-asset-title": "Cancelar la asignación del activo '{{assetName}}'?",
         "unassign-asset-text": "Tras la confirmación, el activo será desasignado y no será accesible por el cliente.",
         "unassign-asset": "Cancelar asignación de activo",
-        "unassign-assets-title": "Cancelar las asignaciones { count, plural, 1 {1 activo} other {# activos} }?",
+        "unassign-assets-title": "Cancelar las asignaciones { count, plural, =1 {1 activo} other {# activos} }?",
         "unassign-assets-text": "Tras la confirmación todos los activos seleccionados serán desasignados y no serán accesibles por el cliente.",
         "unassign-assets-from-edge": "Anular activos de borde",
         "copyId": "Copiar ID de activo",
@@ -581,9 +581,9 @@
         "unassign-asset-from-edge": "Anular activo de bodre",
         "unassign-asset-from-edge-title": "¿Está seguro de que desea desasignar el activo '{{assetName}}'?",
         "unassign-asset-from-edge-text": "Después de la confirmación, el activo no será asignado y el borde no podrá acceder a él",
-        "unassign-assets-from-edge-title": "¿Está seguro de que desea desasignar {count, plural, 1 {1 activo} other {# activos} }?",
+        "unassign-assets-from-edge-title": "¿Está seguro de que desea desasignar {count, plural, =1 {1 activo} other {# activos} }?",
         "unassign-assets-from-edge-text": "Después de la confirmación, todos los activos seleccionados quedarán sin asignar y el borde no podrá acceder a ellos.",
-        "selected-assets": "{ count, plural, 1 {1 activo} other {# activos} } seleccionados"
+        "selected-assets": "{ count, plural, =1 {1 activo} other {# activos} } seleccionados"
     },
     "attribute": {
         "attributes": "Atributos",
@@ -600,7 +600,7 @@
         "key-required": "Clave del atributo requerida.",
         "value": "Valor",
         "value-required": "Valor del atributo requerido.",
-        "delete-attributes-title": "¿Eliminar { count, plural, 1 {1 atributo} other {# atributos} }?",
+        "delete-attributes-title": "¿Eliminar { count, plural, =1 {1 atributo} other {# atributos} }?",
         "delete-attributes-text": "Atención, tras la confirmación el atributo será eliminado, y la información relacionada será irrecuperable.",
         "delete-attributes": "Borrar atributo",
         "enter-attribute-value": "Ingresar valor del atributo",
@@ -610,8 +610,8 @@
         "prev-widget": "Widget anterior",
         "add-to-dashboard": "Agregar al Panel",
         "add-widget-to-dashboard": "Agregar widget al Panel",
-        "selected-attributes": "{ count, plural, 1 {1 atributo} other {# atributos} } seleccionados",
-        "selected-telemetry": "{ count, plural, 1 {1 telemetría} other {# telemetrías} } seleccionadas",
+        "selected-attributes": "{ count, plural, =1 {1 atributo} other {# atributos} } seleccionados",
+        "selected-telemetry": "{ count, plural, =1 {1 telemetría} other {# telemetrías} } seleccionadas",
         "no-attributes-text": "No se encontró ningún atributo",
         "no-telemetry-text": "No se encontró ninguna telemetría"
     },
@@ -788,8 +788,8 @@
         "customer-details": "Detalles del cliente",
         "delete-customer-title": "¿Eliminar el cliente '{{customerTitle}}'?",
         "delete-customer-text": "Atención, tras la confirmación el cliente será eliminado y toda la información relacionada será irrecuperable.",
-        "delete-customers-title": "¿Eliminar { count, plural, 1 {1 cliente} other {# clientes} }?",
-        "delete-customers-action-title": "Borrar { count, plural, 1 {1 cliente} other {# clientes} }",
+        "delete-customers-title": "¿Eliminar { count, plural, =1 {1 cliente} other {# clientes} }?",
+        "delete-customers-action-title": "Borrar { count, plural, =1 {1 cliente} other {# clientes} }",
         "delete-customers-text": "Atención, tras la confirmación todos los clientes seleccionados serán eliminados y su información relacionada será irrecuperable.",
         "manage-users": "Gestionar usuarios",
         "manage-assets": "Gestionar activos",
@@ -810,7 +810,7 @@
         "default-customer": "Cliente por defecto",
         "default-customer-required": "Se requiere cliente por defecto para realizar debu a nivel de propietario",
         "search": "Buscar clientes",
-        "selected-customers": "{ count, plural, 1 {1 cliente} other {# clientes} } seleccionados",
+        "selected-customers": "{ count, plural, =1 {1 cliente} other {# clientes} } seleccionados",
         "edges": "Instancias de borde del cliente",
         "manage-edges": "Administrar Bordes"
     },
@@ -862,20 +862,20 @@
         "add-dashboard-text": "Agregar nuevo panel",
         "assign-dashboards": "Asignar paneles",
         "assign-new-dashboard": "Asignar nuevo panel",
-        "assign-dashboards-text": "Asignar { count, plural, 1 {1 panel} other {# paneles} } al cliente",
-        "unassign-dashboards-action-text": "Desasignar { count, plural, 1 {1 panel} other {# paneles} } a los clientes",
+        "assign-dashboards-text": "Asignar { count, plural, =1 {1 panel} other {# paneles} } al cliente",
+        "unassign-dashboards-action-text": "Desasignar { count, plural, =1 {1 panel} other {# paneles} } a los clientes",
         "delete-dashboards": "Eliminar paneles",
         "unassign-dashboards": "Desasignar paneles",
-        "unassign-dashboards-action-title": "Desasignar { count, plural, 1 {1 paneles} other {# paneles} } del cliente",
+        "unassign-dashboards-action-title": "Desasignar { count, plural, =1 {1 paneles} other {# paneles} } del cliente",
         "delete-dashboard-title": "¿Eliminar el panel '{{dashboardTitle}}'?",
         "delete-dashboard-text": "Atención, el panel seleccionado será eliminado y la información relacionada sera irrecuperable.",
-        "delete-dashboards-title": "¿Eliminar { count, plural, 1 {1 panel} other {# paneles} }?",
-        "delete-dashboards-action-title": "Eliminar { count, plural, 1 {1 panel} other {# paneles} }",
+        "delete-dashboards-title": "¿Eliminar { count, plural, =1 {1 panel} other {# paneles} }?",
+        "delete-dashboards-action-title": "Eliminar { count, plural, =1 {1 panel} other {# paneles} }",
         "delete-dashboards-text": "Atención, los paneles seleccionados serán eliminados y la información relacionada será irrecuperable.",
         "unassign-dashboard-title": "¿Desasignar el panel '{{dashboardTitle}}'?",
         "unassign-dashboard-text": "Tras la confirmación, el panel será desasignado y no podrá ser accesible por el cliente.",
         "unassign-dashboard": "Desasignar panel",
-        "unassign-dashboards-title": "¿Desasignar { count, plural, 1 {1 panel} other {# paneles} }?",
+        "unassign-dashboards-title": "¿Desasignar { count, plural, =1 {1 panel} other {# paneles} }?",
         "unassign-dashboards-text": "Atención, tras la confirmación los paneles seleccionados serán desasignados y no podrán ser accesibles por el cliente.",
         "public-dashboard-title": "El panel ahora es público",
         "public-dashboard-text": "Tu panel <b>{{dashboardTitle}}</b> es ahora público y podrá ser accedido desde: <a href='{{publicLink}}' target='_blank'>aquí</a>:",
@@ -971,7 +971,7 @@
         "manage-states": "Administrar estados de paneles",
         "states": "Estados de paneles",
         "search-states": "Buscar estados de paneles",
-        "selected-states": "{ count, plural, 1 {1 estado panel} other {# estado paneles} } seleccionados",
+        "selected-states": "{ count, plural, =1 {1 estado panel} other {# estado paneles} } seleccionados",
         "edit-state": "Editar estado panel",
         "delete-state": "Borrar estado panel",
         "add-state": "Añadir estado panel",
@@ -990,11 +990,11 @@
         "select-state": "Seleccionar estado destino (target state)",
         "state-controller": "Controlador de estados",
         "search": "Buscar paneles",
-        "selected-dashboards": "{count, plural, 1 {1 panel} other {# paneles} } seleccionados",
+        "selected-dashboards": "{count, plural, =1 {1 panel} other {# paneles} } seleccionados",
         "home-dashboard": "Panel principal",
         "home-dashboard-hide-toolbar": "Ocultar barra de herramientas en panel principal",
         "unassign-dashboard-from-edge-text": "Después de la confirmación, el tablero no será asignado y el borde no podrá acceder a él",
-        "unassign-dashboards-from-edge-title": "Estas seguro de desasignar  { count, plural, 1 {1 panel} other {# paneles} }?",
+        "unassign-dashboards-from-edge-title": "Estas seguro de desasignar  { count, plural, =1 {1 panel} other {# paneles} }?",
         "unassign-dashboards-from-edge-text": "Después de la confirmación, se anulará la asignación de todos los paneles seleccionados y no serán accesibles por de borde",
         "assign-dashboard-to-edge": "Asignar panel(es) al borde",
         "assign-dashboard-to-edge-text": "Por favor selecciona los paneles para asignar al borde",
@@ -1017,7 +1017,7 @@
         "timeseries-required": "Series de tiempo del dispositivo requerido.",
         "timeseries-or-attributes-required": "Series de tiempo/Atributos requeridos.",
         "alarm-fields-timeseries-or-attributes-required": "Se requieren campos de alarma o series de tiempo/atributos.",
-        "maximum-timeseries-or-attributes": "Máximo { count, plural, 1 {1 timeseries/atributo es permitido.} other {# timeseries/atributos son permitidos} }",
+        "maximum-timeseries-or-attributes": "Máximo { count, plural, =1 {1 timeseries/atributo es permitido.} other {# timeseries/atributos son permitidos} }",
         "alarm-fields-required": "Campos de alarma requeridos.",
         "function-types": "Tipos de funciones",
         "function-type": "Tipos de función",
@@ -1034,7 +1034,7 @@
         "timeseries-key": "Clave de series de tiempo",
         "timeseries-key-functions": "Funciones de series de tiempo",
         "timeseries-key-function": "Función de serie de tiempo",
-        "maximum-function-types": "Máximo { count, plural, 1 {1 tipo de función está permitida.} other {# tipos de funciones están permitidos} }",
+        "maximum-function-types": "Máximo { count, plural, =1 {1 tipo de función está permitida.} other {# tipos de funciones están permitidos} }",
         "time-description": "hora del valor actual",
         "value-description": "el valor actual",
         "prev-value-description": "resultado de la llamada anterior de la función",
@@ -1098,11 +1098,11 @@
         "manage-credentials": "Gestionar credenciales",
         "delete": "Eliminar dispositivo",
         "assign-devices": "Asignar dispositivo",
-        "assign-devices-text": "Asignar { count, plural, 1 {1 dispositivo} other {# dispositivos} } al cliente",
+        "assign-devices-text": "Asignar { count, plural, =1 {1 dispositivo} other {# dispositivos} } al cliente",
         "delete-devices": "Eliminar dispositivo",
         "unassign-from-customer": "Desasignar del cliente",
         "unassign-devices": "Desasignar dispositivos",
-        "unassign-devices-action-title": "Desasignar { count, plural, 1 {1 dispositivo} other {# dispositivos} } del cliente",
+        "unassign-devices-action-title": "Desasignar { count, plural, =1 {1 dispositivo} other {# dispositivos} } del cliente",
         "unassign-device-from-edge-title": "¿Está seguro de que desea desasignar el dispositivo '{{deviceName}}'?",
         "unassign-device-from-edge-text": "Después de la confirmación, el dispositivo no será asignado y el borde no podrá acceder a él",
         "unassign-devices-from-edge": "Desasignar dispositivos del Borde",
@@ -1114,13 +1114,13 @@
         "view-credentials": "Ver credenciales",
         "delete-device-title": "¿Eliminar el dispositivo '{{deviceName}}'?",
         "delete-device-text": "Atención, tras la confirmación los dispositivos serán eliminados y la información relacionada será irrecuperable.",
-        "delete-devices-title": "¿Eliminar { count, plural, 1 {1 dispositivo} other {# dispositivos} }?",
-        "delete-devices-action-title": "Eliminar { count, plural, 1 {1 dispositivo} other {# dispositivos} }",
+        "delete-devices-title": "¿Eliminar { count, plural, =1 {1 dispositivo} other {# dispositivos} }?",
+        "delete-devices-action-title": "Eliminar { count, plural, =1 {1 dispositivo} other {# dispositivos} }",
         "delete-devices-text": "Atención, tras la confirmación los dispositivos seleccionados serán eliminados y la información relacionada será irrecuperable.",
         "unassign-device-title": "¿Desasignar el dispositivo '{{deviceName}}'?",
         "unassign-device-text": "Tras la confirmación, el dispositivo será desasignado y no podrá ser accesible por el cliente.",
         "unassign-device": "Desasignar dispositivo",
-        "unassign-devices-title": "¿Desasignar { count, plural, 1 {1 dispositivo} other {# dispositivos} }?",
+        "unassign-devices-title": "¿Desasignar { count, plural, =1 {1 dispositivo} other {# dispositivos} }?",
         "unassign-devices-text": "Tras la confirmación, los dispositivos seleccionados serán desasignados y no podrán ser accedidos por el cliente.",
         "device-credentials": "Credenciales del dispositivo",
         "loading-device-credentials": "Cargando credenciales del dispositivo...",
@@ -1201,7 +1201,7 @@
         "import": "Importar dispositivo",
         "device-file": "Archivo de dispositivo",
         "search": "Buscar dispositivos",
-        "selected-devices": "{ count, plural, 1 {1 dispositivo} other {# dispositivos} } seleccionados",
+        "selected-devices": "{ count, plural, =1 {1 dispositivo} other {# dispositivos} } seleccionados",
         "device-configuration": "Configuración del dispositivo",
         "transport-configuration": "Configuración del transporte",
         "wizard": {
@@ -1213,7 +1213,7 @@
             "customer-to-assign-device": "Cliente al que asignar el dispositivo",
             "add-credentials": "Añadir credencial"
         },
-        "unassign-devices-from-edge-title": "¿Está seguro de que desea desasignar {count, plural, 1 {1 dispositivo} other {# dispositivos} }?",
+        "unassign-devices-from-edge-title": "¿Está seguro de que desea desasignar {count, plural, =1 {1 dispositivo} other {# dispositivos} }?",
         "unassign-devices-from-edge-text": "Después de la confirmación, todos los dispositivos seleccionados quedarán sin asignar y el borde no podrá acceder a ellos."
     },
     "device-profile": {
@@ -1225,7 +1225,7 @@
         "device-profile-details": "Detalles de perfil de dispositivo",
         "no-device-profiles-text": "No se encontraron perfiles",
         "search": "Buscar perfiles",
-        "selected-device-profiles": "{ count, plural, 1 {1 perfil} other {# perfiles} } seleccionados",
+        "selected-device-profiles": "{ count, plural, =1 {1 perfil} other {# perfiles} } seleccionados",
         "no-device-profiles-matching": "No existe perfil que conincida con '{{entity}}'.",
         "device-profile-required": "Se requiere perfil de dispositivo",
         "idCopiedMessage": "Se ha copiado el ID de perfil al portapapeles",
@@ -1263,7 +1263,7 @@
         "select-queue-hint": "Selecciona desde el desplegable o añade un nombre personalizado.",
         "delete-device-profile-title": "Eliminar el perfil '{{deviceProfileName}}'?",
         "delete-device-profile-text": "Atención, tras la confirmación el perfil y todos sus datos serán borrados e irrecuperables.",
-        "delete-device-profiles-title": "EEliminar { count, plural, 1 {1 perfil} other {# perfiles} }?",
+        "delete-device-profiles-title": "EEliminar { count, plural, =1 {1 perfil} other {# perfiles} }?",
         "delete-device-profiles-text": "Atención, tras la confirmación los perfiles seleccionados y todos sus datos serán borrados e irrecuperables.",
         "set-default-device-profile-title": "Establecer el perfil '{{deviceProfileName}}' como perfil por defecto?",
         "set-default-device-profile-text": "Tras la confirmación, el perfil será marcado como por defecto y será usado por todos los nuevos dispositivos que no tengan perfil especificado.",
@@ -1384,8 +1384,8 @@
         "condition-repeating-value-range": "El Nº de eventos debe estar en un rango de 1 to 2147483647.",
         "condition-repeating-value-pattern": "Nº de eventos debe ser un número entero.",
         "condition-repeating-value-required": "Se requiere Nº de eventos.",
-        "condition-repeat-times": "Repetición { count, plural, 1 {1 vez} other {# veces} }",
-        "condition-repeat-times-dynamic": "Repetición \"{ atributo }\" ({ count, plural, 1 {1 vez} other {# veces} })",
+        "condition-repeat-times": "Repetición { count, plural, =1 {1 vez} other {# veces} }",
+        "condition-repeat-times-dynamic": "Repetición \"{ atributo }\" ({ count, plural, =1 {1 vez} other {# veces} })",
         "schedule-type": "Tipo de horario",
         "schedule-type-required": "Tipo de horario requerido.",
         "schedule": "Horario",
@@ -1627,7 +1627,7 @@
         "delete": "Eliminar borde",
         "delete-edge-title": "¿Está seguro de que desea eliminar el borde '{{edgeName}}'?",
         "delete-edge-text": "Tenga cuidado, después de la confirmación, el borde y todos los datos relacionados serán irrecuperables",
-        "delete-edges-title": "¿Está seguro de que desea edge {count, plural, 1 {1 borde} other {# bordes} }?",
+        "delete-edges-title": "¿Está seguro de que desea edge {count, plural, =1 {1 borde} other {# bordes} }?",
         "delete-edges-text": "Tenga cuidado, después de la confirmación se eliminarán todos los bordes seleccionados y todos los datos relacionados se volverán irrecuperables",
         "name": "Nombre",
         "name-starts-with": "Nombre de Borde comienza con",
@@ -1654,7 +1654,7 @@
         "unassign-from-customer": "Anular asignación del cliente",
         "unassign-edge-title": "¿Está seguro de que desea desasignar el borde '{{edgeName}}'?",
         "unassign-edge-text": "Después de la confirmación, el borde quedará sin asignar y el cliente no podrá acceder a él",
-        "unassign-edges-title": "¿Está seguro de que desea anular la asignación de {count, plural, 1 {1 borde} other {# bordes} }?",
+        "unassign-edges-title": "¿Está seguro de que desea anular la asignación de {count, plural, =1 {1 borde} other {# bordes} }?",
         "unassign-edges-text": "Después de la confirmación de todos los bordes seleccionados, se anulará la asignación y el cliente no podrá acceder a ellos.",
         "make-public": "Hacer público el borde",
         "make-public-edge-title": "¿Estás seguro de que quieres hacer público el edge '{{edgeName}}'?",
@@ -1687,7 +1687,7 @@
         "rulechain-templates": "Plantillas, de cadena de reglas",
         "rulechains": "Cadenas de regla de borde",
         "search": "Bordes de búsqueda",
-        "selected-edges": "{count, plural, 1 {1 borde} other {# bordes} } seleccionadas",
+        "selected-edges": "{count, plural, =1 {1 borde} other {# bordes} } seleccionadas",
         "any-edge": "Cualquier bordee",
         "no-edge-types-matching": "No se encontraron tipos de aristas que coincidan con '{{entitySubtype}}'.",
         "edge-type-list-empty": "No se seleccionó ningún tipo de borde.",
@@ -1787,59 +1787,59 @@
         "type-required": "Tipo de entidad requerido.",
         "type-device": "Dispositivo",
         "type-devices": "Dispositivos",
-        "list-of-devices": "{ count, plural, 1 {Un dispositivo} other {Lista de # Dispositivos} }",
+        "list-of-devices": "{ count, plural, =1 {Un dispositivo} other {Lista de # Dispositivos} }",
         "device-name-starts-with": "Dispositivos cuyos nombres comiencen por '{{prefix}}'",
         "type-device-profile": "Perfil de dispositivo",
         "type-device-profiles": "Perfiles de dispositivo",
-        "list-of-device-profiles": "{ count, plural, 1 {un perfil} other {Lista de # perfiles} }",
+        "list-of-device-profiles": "{ count, plural, =1 {un perfil} other {Lista de # perfiles} }",
         "device-profile-name-starts-with": "Perfiles cuyo nombre empiece por '{{prefix}}'",
         "type-asset": "Activo",
         "type-assets": "Activos",
-        "list-of-assets": "{ count, plural, 1 {Un activo} other {Lista de # activos} }",
+        "list-of-assets": "{ count, plural, =1 {Un activo} other {Lista de # activos} }",
         "asset-name-starts-with": "Activos cuyos nombres comiencen por '{{prefix}}'",
         "type-entity-view": "Vista Entidad",
         "type-entity-views": "Vistas Entidades",
-        "list-of-entity-views": "{ count, plural, 1 {Una vista de entidad} other {Lista de # Vistas de Entidades} }",
+        "list-of-entity-views": "{ count, plural, =1 {Una vista de entidad} other {Lista de # Vistas de Entidades} }",
         "entity-view-name-starts-with": "Vistas de Entidades cuyo nombre comiencen por '{{prefix}}'",
         "type-rule": "Regla",
         "type-rules": "Reglas",
-        "list-of-rules": "{ count, plural, 1 {Una regla} other {Lista de # reglas} }",
+        "list-of-rules": "{ count, plural, =1 {Una regla} other {Lista de # reglas} }",
         "rule-name-starts-with": "Reglas cuyos nombres comiencen por '{{prefix}}'",
         "type-plugin": "Plugin",
         "type-plugins": "Plugins",
-        "list-of-plugins": "{ count, plural, 1 {Un plugin} other {Lista de # plugins} }",
+        "list-of-plugins": "{ count, plural, =1 {Un plugin} other {Lista de # plugins} }",
         "plugin-name-starts-with": "Plugins cuyos nombres comiencen por '{{prefix}}'",
         "type-tenant": "Propietario",
         "type-tenants": "Propietarios",
-        "list-of-tenants": "{ count, plural, 1 {Un propietario} other {Lista de # propietarios} }",
+        "list-of-tenants": "{ count, plural, =1 {Un propietario} other {Lista de # propietarios} }",
         "tenant-name-starts-with": "Propietarios cuyo nombre comience por '{{prefix}}'",
         "type-tenant-profile": "Perfil de Propietario",
         "type-tenant-profiles": "Perfiles de propietario",
-        "list-of-tenant-profiles": "{ count, plural, 1 {Un perfil de propietario} other {Lista de # perfiles de propietario} }",
+        "list-of-tenant-profiles": "{ count, plural, =1 {Un perfil de propietario} other {Lista de # perfiles de propietario} }",
         "tenant-profile-name-starts-with": "Pefiles de propietario cuyo nombre empiece por '{{prefix}}'",
         "type-customer": "Cliente",
         "type-customers": "Clientes",
-        "list-of-customers": "{ count, plural, 1 {Un cliente} other {Lista de # clientes} }",
+        "list-of-customers": "{ count, plural, =1 {Un cliente} other {Lista de # clientes} }",
         "customer-name-starts-with": "Clientes cuyos nombres comiencen por '{{prefix}}'",
         "type-user": "Usuario",
         "type-users": "Usuarios",
-        "list-of-users": "{ count, plural, 1 {Un usuario} other {Lista de # usuarios} }",
+        "list-of-users": "{ count, plural, =1 {Un usuario} other {Lista de # usuarios} }",
         "user-name-starts-with": "Usuarios cuyos nombres comiencen por '{{prefix}}'",
         "type-dashboard": "Panel",
         "type-dashboards": "Paneles",
-        "list-of-dashboards": "{ count, plural, 1 {Un panel} other {Lista de # paneles} }",
+        "list-of-dashboards": "{ count, plural, =1 {Un panel} other {Lista de # paneles} }",
         "dashboard-name-starts-with": "Paneles cuyos nombres comiencen por '{{prefix}}'",
         "type-alarm": "Alarma",
         "type-alarms": "Alarmas",
-        "list-of-alarms": "{ count, plural, 1 {Una alarma} other {Lista de # alarmas} }",
+        "list-of-alarms": "{ count, plural, =1 {Una alarma} other {Lista de # alarmas} }",
         "alarm-name-starts-with": "Alarmas cuyos nombres comienzan con '{{prefix}}'",
         "type-rulechain": "Cadena de reglas",
         "type-rulechains": "Cadenas de reglas",
-        "list-of-rulechains": "{ count, plural, 1 {Una cadena de reglas} other {Lista de # cadenas de reglas} }",
+        "list-of-rulechains": "{ count, plural, =1 {Una cadena de reglas} other {Lista de # cadenas de reglas} }",
         "rulechain-name-starts-with": "Cadenas de reglas cuyos nombres comienzan con '{{prefix}}'",
         "type-rulenode": "Nodo de reglas",
         "type-rulenodes": "Nodos de reglas",
-        "list-of-rulenodes": "{ count, plural, 1 {Un nodo de reglas} other {Lista de # nodos de reglas} }",
+        "list-of-rulenodes": "{ count, plural, =1 {Un nodo de reglas} other {Lista de # nodos de reglas} }",
         "rulenode-name-starts-with": "Nodos de reglas cuyos nombres comienzan con '{{prefix}}'",
         "type-current-customer": "Cliente Actual",
         "type-current-tenant": "Propietario Actual",
@@ -1847,9 +1847,9 @@
         "type-current-user-owner": "Usuario Propietario Actual",
         "type-widgets-bundle": "Paquete de widgets",
         "type-widgets-bundles": "Paquetes de widgets",
-        "list-of-widgets-bundles": "{ count, plural, 1 {Un paquete de widget} other {Lista de # paquetes de widgets} }",
+        "list-of-widgets-bundles": "{ count, plural, =1 {Un paquete de widget} other {Lista de # paquetes de widgets} }",
         "search": "Buscar entidades",
-        "selected-entities": "{ count, plural, 1 {1 entidad} other {# entidades} } seleccionadas",
+        "selected-entities": "{ count, plural, =1 {1 entidad} other {# entidades} } seleccionadas",
         "entity-label": "Etiqueta de entidad",
         "entity-name": "Nombre de entidad",
         "details": "Detalles de entidad",
@@ -1859,7 +1859,7 @@
         "type-api-usage-state": "Estado de uso de la API",
         "type-edge": "Borde",
         "type-edges": "Bordes",
-        "list-of-edges": "{count, plural, 1 {Un borde} other {Lista de # bordes} }",
+        "list-of-edges": "{count, plural, =1 {Un borde} other {Lista de # bordes} }",
         "edge-name-starts-with": "Bordes cuyos nombres comienzan con '{{prefijo}}'",
         "type-tb-resource": "Recurso",
         "type-ota-package": "Paquete OTA"
@@ -1922,21 +1922,21 @@
         "add-entity-view-text": "Añadir nueva vista de entidad",
         "delete": "Borrar vista de entidad",
         "assign-entity-views": "Asignar vistas de entidad",
-        "assign-entity-views-text": "Asignar { count, plural, 1 {1 vista de entidad} other {# vistas de entidad} } a cliente",
+        "assign-entity-views-text": "Asignar { count, plural, =1 {1 vista de entidad} other {# vistas de entidad} } a cliente",
         "delete-entity-views": "Borrar vistas de entidad",
         "unassign-from-customer": "Anular asignación a cliente",
         "unassign-entity-views": "Anular asignación de vistas de entidad",
-        "unassign-entity-views-action-title": "Anular asignación { count, plural, 1 {1 vista de entidad} other {# vistas de entidad} } al cliente",
+        "unassign-entity-views-action-title": "Anular asignación { count, plural, =1 {1 vista de entidad} other {# vistas de entidad} } al cliente",
         "assign-new-entity-view": "Asignar nueva vista de entidad",
         "delete-entity-view-title": "¿Está seguro que quiere borrar la vista de entidad '{{entityViewName}}'?",
         "delete-entity-view-text": "¡Cuidado! Tras la confirmación, la vista de la entidad y todos los datos relacionados serán irrecuperables.",
-        "delete-entity-views-title": "¿Está seguro que quiere borrar las vistas de entidad { count, plural, 1 {1 entityView} other {# entityViews} }?",
-        "delete-entity-views-action-title": "Borrar { count, plural, 1 {1 vista de entidad} other {# vistas de entidad} }",
+        "delete-entity-views-title": "¿Está seguro que quiere borrar las vistas de entidad { count, plural, =1 {1 entityView} other {# entityViews} }?",
+        "delete-entity-views-action-title": "Borrar { count, plural, =1 {1 vista de entidad} other {# vistas de entidad} }",
         "delete-entity-views-text": "¡Cuidado! Tras la confirmación, todas las vistas de entidades seleccionadas se eliminarán y todos los datos relacionados serán irrecuperables.",
         "unassign-entity-view-title": "¿Está seguro que quiere anular la asignación de la vista de entidad '{{entityViewName}}'?",
         "unassign-entity-view-text": "Tras la confirmación, la vista de la entidad quedará sin asignar y el cliente no podrá acceder a ella.",
         "unassign-entity-view": "Anular asignación de la vista de entidad",
-        "unassign-entity-views-title": "¿Está seguro que quiere anular la asignación de { count, plural, 1 {1 vista de entidad} other {# vistas de entidad} }?",
+        "unassign-entity-views-title": "¿Está seguro que quiere anular la asignación de { count, plural, =1 {1 vista de entidad} other {# vistas de entidad} }?",
         "unassign-entity-views-text": "Tras la confirmación, todas las vistas de entidades seleccionadas quedarán sin asignar y el cliente no podrá acceder a ellas.",
         "entity-view-type": "Tipo de vista de entidad",
         "entity-view-type-required": "Tipo de vista de entidad es requerido.",
@@ -1981,7 +1981,7 @@
         "timeseries-data": "Datos de series temporales",
         "timeseries-data-hint": "Configure las claves de los datos de las series temporales de la entidad de destino que serán accesibles para la vista de la entidad. Los datos de esta serie temporal son de solo lectura.",
         "search": "Buscar vistas de entidad",
-        "selected-entity-views": "{ count, plural, 1 {1 vista de entidad} other {# vistas de entidad} } seleccionadas",
+        "selected-entity-views": "{ count, plural, =1 {1 vista de entidad} other {# vistas de entidad} } seleccionadas",
         "make-public-entity-view-title": "¿Está seguro de que desea que la vista de entidad '{{entityViewName}}' sea pública?",
         "make-public-entity-view-text": "Tras la confirmación, la vista de la entidad y todos sus datos se harán públicos y accesibles para otros.",
         "make-private-entity-view-title": "¿Está seguro de que desea que la vista de entidad '{{entityViewName}}' sea privada?",
@@ -1990,9 +1990,9 @@
         "assign-entity-view-to-edge-text": "Seleccione las vistas de entidad para asignar al borde",
         "unassign-entity-view-from-edge-title": "¿Está seguro de que desea anular la asignación de la vista de entidad '{{entityViewName}}'?",
         "unassign-entity-view-from-edge-text": "Después de la confirmación, la vista de entidad quedará sin asignar y el borde no podrá acceder a ella",
-        "unassign-entity-views-from-edge-action-title": "Anular asignación {count, plural, 1 {1 vista de entidad} other {# vistas de entidad} } del borde",
+        "unassign-entity-views-from-edge-action-title": "Anular asignación {count, plural, =1 {1 vista de entidad} other {# vistas de entidad} } del borde",
         "unassign-entity-view-from-edge": "Anular asignación de vista de entidad",
-        "unassign-entity-views-from-edge-title": "¿Está seguro de que desea desasignar {count, plural, 1 {1 vista de entidad} other {# vistas de entidad} }?",
+        "unassign-entity-views-from-edge-title": "¿Está seguro de que desea desasignar {count, plural, =1 {1 vista de entidad} other {# vistas de entidad} }?",
         "unassign-entity-views-from-edge-text": "Después de la confirmación, todas las vistas de entidad seleccionadas no serán asignadas y el borde no podrá acceder a ellas"
     },
     "event": {
@@ -2037,7 +2037,7 @@
     },
     "extension": {
         "extensions": "Extensiones",
-        "selected-extensions": "{ count, plural, 1 {1 extensión} other {# extensiones} } seleccionadas",
+        "selected-extensions": "{ count, plural, =1 {1 extensión} other {# extensiones} } seleccionadas",
         "type": "Tipo",
         "key": "Clave",
         "value": "Valor",
@@ -2051,7 +2051,7 @@
         "edit": "Editar Extensión",
         "delete-extension-title": "Eliminar la extensión '{{extensionId}}'?",
         "delete-extension-text": "Atención, tras la confirmación la extensión y sus datos serán borrados e irrecuperables.",
-        "delete-extensions-title": "Eliminar las extensiones { count, plural, 1 {1 extensión} other {# extensiones} }?",
+        "delete-extensions-title": "Eliminar las extensiones { count, plural, =1 {1 extensión} other {# extensiones} }?",
         "delete-extensions-text": "Atención, tras la confirmación todas las extensiones seleccionadas y sus datos serán borrados e irrecuperables.",
         "converters": "Convertidores",
         "converter-id": "Id de convertidor",
@@ -2371,8 +2371,8 @@
     "grid": {
         "delete-item-title": "¿Quieres eliminar este item?",
         "delete-item-text": "Atención, tras la confirmación el item será eliminado y la información relacionada será irrecuperable.",
-        "delete-items-title": "¿Quieres eliminar { count, plural, 1 {1 item} other {# items} }?",
-        "delete-items-action-title": "Eliminar { count, plural, 1 {1 item} other {# items} }",
+        "delete-items-title": "¿Quieres eliminar { count, plural, =1 {1 item} other {# items} }?",
+        "delete-items-action-title": "Eliminar { count, plural, =1 {1 item} other {# items} }",
         "delete-items-text": "Atención, tras la confirmación los items seleccionados serán eliminados y la información relacionada será irrecuperable.",
         "add-item-text": "Agregar nuevo item",
         "no-items-text": "Ningún item encontrado",
@@ -2539,7 +2539,7 @@
         "verify-your-identity": "Verificar identidad",
         "select-way-to-verify": "Selecciona el modo de verificación",
         "resend-code": "Reenviar código",
-        "resend-code-wait": "Reenviar código en { time, plural, 1 {1 segundo} other {# segundos} }",
+        "resend-code-wait": "Reenviar código en { time, plural, =1 {1 segundo} other {# segundos} }",
         "try-another-way": "Otros modos de verificación",
         "totp-auth-description": "Por favor, introduce el código de seguridad de tu aplicación de autenticación.",
         "totp-auth-placeholder": "Código",
@@ -2567,8 +2567,8 @@
       "checksum-hint": "Si el checksum está vacío, se generará automáticamente",
       "checksum-algorithm": "Algoritmo checksum",
       "checksum-copied-message": "El checksum del paquete se ha copiado al portapapeles",
-      "change-firmware": "El cambio del firmware provocará la actualización de { count, plural, 1 {1 dispositivo} other {# dispositivos} }.",
-      "change-software": "El cambio del software provocará la actualización de { count, plural, 1 {1 dispositivo} other {# dispositivos} }.",
+      "change-firmware": "El cambio del firmware provocará la actualización de { count, plural, =1 {1 dispositivo} other {# dispositivos} }.",
+      "change-software": "El cambio del software provocará la actualización de { count, plural, =1 {1 dispositivo} other {# dispositivos} }.",
       "chose-compatible-device-profile": "El paquete subido, sólamente estará disponible para los dispositivos con el perfil seleccionado.",
       "chose-firmware-distributed-device": "Elige el firmware que se distribuirá a los dispositivos",
       "chose-software-distributed-device": "Elige el software que se distribuirá a los dispositivos",
@@ -2581,7 +2581,7 @@
       "delete-ota-update-text": "Atención, tras la confirmación la actualización OTA será irrecuperable.",
       "delete-ota-update-title": "Estás seguro de borrar la actualización OTA '{{title}}'?",
       "delete-ota-updates-text": "Atención, tras la confirmación todas las actualizaciones OTA seleccionadas se borrarán.",
-      "delete-ota-updates-title": "Estás seguro de borrar { count, plural, 1 {1 Actualización OTA} other {# Actualizaciones OTA} }?",
+      "delete-ota-updates-title": "Estás seguro de borrar { count, plural, =1 {1 Actualización OTA} other {# Actualizaciones OTA} }?",
       "description": "Descripción",
       "direct-url": "URL Directa",
       "direct-url-copied-message": "La URL directa del paquete se ha copiado al portapapeles",
@@ -2604,7 +2604,7 @@
       "package-type": "Tipo de paquete",
       "packages-repository": "Repositorio de paquetes",
       "search": "Buscar paquetes",
-      "selected-package": "{ count, plural, 1 {1 paquete} other {# paquetes} } selected",
+      "selected-package": "{ count, plural, =1 {1 paquete} other {# paquetes} } selected",
       "title": "Título",
       "title-required": "Título requerido.",
       "title-max-length": "El título debe ser menor de 256",
@@ -2696,17 +2696,17 @@
         },
         "password-requirement": {
             "at-least": "Al menos:",
-            "character": "{ count, plural, 1 {1 caracter} other {# caracteres} }",
-            "digit": "{ count, plural, 1 {1 dígito} other {# dígitos} }",
+            "character": "{ count, plural, =1 {1 caracter} other {# caracteres} }",
+            "digit": "{ count, plural, =1 {1 dígito} other {# dígitos} }",
             "incorrect-password-try-again": "Contraseña incorrecta. Prueba otra vez",
-            "lowercase-letter": "{ count, plural, 1 {1 minúscula} other {# mínusculas} }",
+            "lowercase-letter": "{ count, plural, =1 {1 minúscula} other {# mínusculas} }",
             "new-passwords-not-match": "Las contraseñas no coinciden",
             "password-should-not-contain-spaces": "La contraseña no puede contener espacios",
             "password-not-meet-requirements": "La contraseña no reune los requisitos necesarios",
             "password-requirements": "Requisitos de contraseña",
             "password-should-difference": "La nueva contraseña debe ser diferente a la actual",
-            "special-character": "{ count, plural, 1 {1 caracter especial} other {# caracteres especiales} }",
-            "uppercase-letter": "{ count, plural, 1 {1 mayúscula} other {# mayúsculas} }"
+            "special-character": "{ count, plural, =1 {1 caracter especial} other {# caracteres especiales} }",
+            "uppercase-letter": "{ count, plural, =1 {1 mayúscula} other {# mayúsculas} }"
         }
     },
     "relation": {
@@ -2722,7 +2722,7 @@
         },
         "from-relations": "Relaciones salientes (outbound)",
         "to-relations": "Relaciones entrantes (inbound)",
-        "selected-relations": "{ count, plural, 1 {1 relación} other {# relaciones} } seleccionadas",
+        "selected-relations": "{ count, plural, =1 {1 relación} other {# relaciones} } seleccionadas",
         "type": "Tipo",
         "to-entity-type": "Hacia tipo de entidad",
         "to-entity-name": "Hacia nombre de entidad",
@@ -2739,11 +2739,11 @@
         "edit": "Editar relación",
         "delete-to-relation-title": "¿Quieres eliminar la relación con la entidad '{{entityName}}'?",
         "delete-to-relation-text": "Atención, tras la confirmación la entidad '{{entityName}}' no estará relacionada con la entidad actual.",
-        "delete-to-relations-title": "¿Quieres eliminar  { count, plural, 1 {1 relación} other {# relaciones} }?",
+        "delete-to-relations-title": "¿Quieres eliminar  { count, plural, =1 {1 relación} other {# relaciones} }?",
         "delete-to-relations-text": "Atención, tras la confirmación todas las relaciones seleccionadas se eliminarán y sus entidades correspondientes no estarán relacionadas con la entidad actual.",
         "delete-from-relation-title": "¿Quieres eliminar la relación con la entidad '{{entityName}}'?",
         "delete-from-relation-text": "Atención, tras la confirmación la entidad actual no estará relacionada con la entidad '{{entityName}}'.",
-        "delete-from-relations-title": "¿Quieres eliminar  { count, plural, 1 {1 relación} other {# relaciones} }?",
+        "delete-from-relations-title": "¿Quieres eliminar  { count, plural, =1 {1 relación} other {# relaciones} }?",
         "delete-from-relations-text": "Atención, tras la confirmación todas las relaciones seleccionadas se eliminarán y sus entidades correspondientes no estarán relacionadas con sus entidades correspondientes.",
         "remove-relation-filter": "Quitar filtro de relación",
         "add-relation-filter": "Añadir filtro de relación",
@@ -2759,9 +2759,9 @@
         "delete": "Borrar recurso",
         "delete-resource-text": "Atención, tras la confirmación el recurso será irrecuperable.",
         "delete-resource-title": "Estás seguro de borrar el recurso '{{resourceTitle}}'?",
-        "delete-resources-action-title": "Borrar { count, plural, 1 {1 recurso} other {# recursos} }",
+        "delete-resources-action-title": "Borrar { count, plural, =1 {1 recurso} other {# recursos} }",
         "delete-resources-text": "Los recursos serán borrados, incluso si están siendo usados en los perfiles de dispositivo.",
-        "delete-resources-title": "Estás seguro de borrar { count, plural, 1 {1 recurso} other {# recursos} }?",
+        "delete-resources-title": "Estás seguro de borrar { count, plural, =1 {1 recurso} other {# recursos} }?",
         "download": "Descargar recurso",
         "drop-file": "Arrastra un fichero o haz click para seleccionar un fichero a subir.",
         "drop-resource-file-or": "Arrastrar y soltar un fichero o",
@@ -2776,7 +2776,7 @@
         "resource-type": "Tipo de recurso",
         "resources-library": "Librería de recursos",
         "search": "Buscar recursos",
-        "selected-resources": "{ count, plural, 1 {1 recurso} other {# recursos} } seleccionados",
+        "selected-resources": "{ count, plural, =1 {1 recurso} other {# recursos} } seleccionados",
         "system": "Sistema",
         "title": "Título",
         "title-required": "Título requerido.",
@@ -2797,8 +2797,8 @@
         "set-root-rulechain-text": "Tras la confirmación, la cadena de reglas se volverá raíz y manejará todos los mensajes de transporte entrantes.",
         "delete-rulechain-title": "¿Quieres eliminar la cadena de reglas '{{ruleChainName}}'?",
         "delete-rulechain-text": "Atención, tras la confirmación la cadena de reglas y todos los datos serán irrecuperables.",
-        "delete-rulechains-title": "¿Está seguro que quieres eliminar { count, plural, 1 {1 cadena de reglas} other {# cadenas de reglas} }?",
-        "delete-rulechains-action-title": "Eliminar { count, plural, 1 {1 cadena de reglas} other {# cadenas de reglas} }",
+        "delete-rulechains-title": "¿Está seguro que quieres eliminar { count, plural, =1 {1 cadena de reglas} other {# cadenas de reglas} }?",
+        "delete-rulechains-action-title": "Eliminar { count, plural, =1 {1 cadena de reglas} other {# cadenas de reglas} }",
         "delete-rulechains-text": "Atención, tras la confirmación todas las cadena de reglas seleccionadas y todos sus datos serán irrecuperables.",
         "add-rulechain-text": "Añadir nueva cadena de reglas",
         "no-rulechains-text": "Cadenas de reglas no encontradas",
@@ -2820,14 +2820,14 @@
         "management": "Gestión de reglas",
         "debug-mode": "Modo Debug",
         "search": "Buscar cadenas de reglas",
-        "selected-rulechains": "{ count, plural, 1 {1 cadena de reglas} other {# cadenas de reglas} } seleccionadas",
+        "selected-rulechains": "{ count, plural, =1 {1 cadena de reglas} other {# cadenas de reglas} } seleccionadas",
         "open-rulechain": "Abrir cadena de reglas",
         "assign-new-rulechain": "Asignar nueva cadena de reglas",
         "edge-template-root": "Raíz de plantilla",
         "assign-to-edge": "Asignar a Edge",
         "edge-rulechain": "Cadena de reglas de borde",
         "unassign-rulechain-from-edge-text": "Después de la confirmación, la cadena de reglas quedará sin asignar y el borde no podrá acceder a ella",
-        "unassign-rulechains-from-edge-title": "Estás seguro de desasignar { count, plural, 1 {1 cadena de reglas} other {# cadenas de reglas} }?",
+        "unassign-rulechains-from-edge-title": "Estás seguro de desasignar { count, plural, =1 {1 cadena de reglas} other {# cadenas de reglas} }?",
         "unassign-rulechains-from-edge-text": "Después de la confirmación, todas las cadenas de reglas seleccionadas quedarán sin asignar y el borde no podrá acceder a ellas",
         "assign-rulechain-to-edge-title": "Asignar cadena (s) de reglas a borde",
         "assign-rulechain-to-edge-text": "Seleccione las cadenas de reglas para asignar al borde",
@@ -2948,9 +2948,9 @@
         "submit-strategy-type-required": "Estrategia de envío requerida!",
         "processing-strategy-type-required": "Estrategia de procesamiento requerida!",
         "queues": "Colas",
-        "selected-queues": "{ count, plural, 1 {1 cola} other {# colas} } seleccionadas",
+        "selected-queues": "{ count, plural, =1 {1 cola} other {# colas} } seleccionadas",
         "delete-queue-title": "Estás seguro de borrar la cola '{{queueName}}'?",
-        "delete-queues-title": "Estás seguro de borrar { count, plural, 1 {1 cola} other {# colas} }?",
+        "delete-queues-title": "Estás seguro de borrar { count, plural, =1 {1 cola} other {# colas} }?",
         "delete-queue-text": "Atención, tras la confirmacion la cola y todos sus datos relacionados serán irrecuperables.",
         "delete-queues-text": "Atención, tras la confirmación todas las colas se borrarán y no serán accesibles.",
         "search": "Buscar cola",
@@ -3014,8 +3014,8 @@
         "title-max-length": "Título debe ser menor de 256",
         "delete-tenant-title": "¿Quieres eliminar el propietario '{{tenantTitle}}'?",
         "delete-tenant-text": "Atención, tras la confirmación el propietario será eliminado y la información relacionada será irrecuperable.",
-        "delete-tenants-title": "¿Quieres eliminar { count, plural, 1 {1 propietario} other {# propietarios} }?",
-        "delete-tenants-action-title": "Eliminar { count, plural, 1 {1 propietario} other {# propietarios} }",
+        "delete-tenants-title": "¿Quieres eliminar { count, plural, =1 {1 propietario} other {# propietarios} }?",
+        "delete-tenants-action-title": "Eliminar { count, plural, =1 {1 propietario} other {# propietarios} }",
         "delete-tenants-text": "Atención, tras la confirmación los propietarios seleccionados serán eliminados y la información relacionada será irrecuperable.",
         "title": "Título",
         "title-required": "Título requerido.",
@@ -3028,7 +3028,7 @@
         "no-tenants-matching": "No hay propietarios que coincidan con '{{entity}}' .",
         "tenant-required": "Propietario requerido",
         "search": "Buscar propietarios",
-        "selected-tenants": "{ count, plural, 1 {1 propietario} other {# propietarios} } seleccionados",
+        "selected-tenants": "{ count, plural, =1 {1 propietario} other {# propietarios} } seleccionados",
         "isolated-tb-rule-engine": "Procesando en contenedor Motor de Reglas aislado",
         "isolated-tb-rule-engine-details": "Requiere microservicios separados por propietario aislado"
     },
@@ -3041,7 +3041,7 @@
         "no-tenant-profiles-text": "No se encontraron perfiles de propietario",
         "name-max-length": "El nombre debe ser menor de 256",
         "search": "Buscar perfiles de propietario",
-        "selected-tenant-profiles": "{ count, plural, 1 {1 perfil de propietario} other {# perfiles de propietario} } seleccionados",
+        "selected-tenant-profiles": "{ count, plural, =1 {1 perfil de propietario} other {# perfiles de propietario} } seleccionados",
         "no-tenant-profiles-matching": "No se han encontrado perfiles de propietario que coincidan con '{{entity}}'.",
         "tenant-profile-required": "Se requiere perfil de propietario",
         "idCopiedMessage": "El ID de perfil de propietario se ha copiado al portapapeles",
@@ -3056,7 +3056,7 @@
         "default": "Defecto",
         "delete-tenant-profile-title": "Eliminar el perfil propietario '{{tenantProfileName}}'?",
         "delete-tenant-profile-text": "Atención, tras la confirmación, el perfil de propietario será borrado y su información relacionada será irrecuperable.",
-        "delete-tenant-profiles-title": "Eliminar { count, plural, 1 {1 perfil propietario} other {# perfiles propietarios} }?",
+        "delete-tenant-profiles-title": "Eliminar { count, plural, =1 {1 perfil propietario} other {# perfiles propietarios} }?",
         "delete-tenant-profiles-text": "Atención, tras la confirmación, los perfiles seleccionados se eliminarán y su información relacionada será irrecuperable.",
         "set-default-tenant-profile-title": "Quieres hacer el perfil propietario '{{tenantProfileName}}' por defecto?",
         "set-default-tenant-profile-text": "Tras la confirmación, el perfil propietario será marcado por defecto y será usado por los nuevos perfiles propietarios que no tengan perfil específico.",
@@ -3156,10 +3156,10 @@
         "ws-limit-updates-per-session": "Rate limit for WS updates per session"
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, 1 {1 segundo} other {# segundos} }",
-        "minutes-interval": "{ minutes, plural, 1 {1 minuto} other {# minutos} }",
-        "hours-interval": "{ hours, plural, 1 {1 hora} other {# horas} }",
-        "days-interval": "{ days, plural, 1 {1 día} other {# días} }",
+        "seconds-interval": "{ seconds, plural, =1 {1 segundo} other {# segundos} }",
+        "minutes-interval": "{ minutes, plural, =1 {1 minuto} other {# minutos} }",
+        "hours-interval": "{ hours, plural, =1 {1 hora} other {# horas} }",
+        "days-interval": "{ days, plural, =1 {1 día} other {# días} }",
         "days": "Días",
         "hours": "Horas",
         "minutes": "Minutos",
@@ -3194,10 +3194,10 @@
         "days": "Días"
     },
     "timewindow": {
-        "days": "{ days, plural, 1 { día } other {# días } }",
-        "hours": "{ hours, plural, 0 { horas } 1 {1 hora } other {# horas } }",
-        "minutes": "{ minutes, plural, 0 { minutos } 1 {1 minuto } other {# minutos } }",
-        "seconds": "{ seconds, plural, 0 { segundos } 1 {1 segundo } other {# segundos } }",
+        "days": "{ days, plural, =1 { día } other {# días } }",
+        "hours": "{ hours, plural, =0 { horas } =1 {1 hora } other {# horas } }",
+        "minutes": "{ minutes, plural, =0 { minutos } =1 {1 minuto } other {# minutos } }",
+        "seconds": "{ seconds, plural, =0 { segundos } =1 {1 segundo } other {# segundos } }",
         "realtime": "Tiempo-real",
         "history": "Histórico",
         "last-prefix": "último(s)",
@@ -3225,8 +3225,8 @@
         "user-details": "Detalles del usuario",
         "delete-user-title": "¿Eliminar el usuario '{{userEmail}}'?",
         "delete-user-text": "Atención, tras la confirmación el usuario seleccionado será eliminado y la información relacionada será irrecuperable.",
-        "delete-users-title": "¿Eliminar { count, plural, 1 {1 usuario} other {# usuarios} }?",
-        "delete-users-action-title": "Borrar { count, plural, 1 {1 usuario} other {# usuarios} }",
+        "delete-users-title": "¿Eliminar { count, plural, =1 {1 usuario} other {# usuarios} }?",
+        "delete-users-action-title": "Borrar { count, plural, =1 {1 usuario} other {# usuarios} }",
         "delete-users-text": "Atención, tras la confirmación los usuarios seleccionados serán eliminados y la información relacionada será irrecuperable.",
         "activation-email-sent-message": "Mail de activación enviado con éxito!",
         "resend-activation": "Reenviar activación",
@@ -3252,7 +3252,7 @@
         "login-as-tenant-admin": "Iniciar sesión como Administrador Propietario",
         "login-as-customer-user": "Iniciar sesión como Usuario Cliente",
         "search": "Buscar usuarios",
-        "selected-users": "{ count, plural, 1 {1 usuario} other {# usuarios} } seleccionados",
+        "selected-users": "{ count, plural, =1 {1 usuario} other {# usuarios} } seleccionados",
         "disable-account": "Deshabilitar cuenta de usuario",
         "enable-account": "Habilitar cuenta de usuario",
         "enable-account-message": "¡La cuenta de usuario se ha habilitado correctamente!",
@@ -3314,7 +3314,7 @@
         "previous-difference": "Anterior diferencia",
         "next-difference": "Siguiente diferencia",
         "current": "Actual",
-        "differences": "{ count, plural, 1 {1 diferencia} other {# diferencias} }",
+        "differences": "{ count, plural, =1 {1 diferencia} other {# diferencias} }",
         "create-entities-version": "Crear versión de entidades",
         "default-sync-strategy": "Estrategia de sincronización por defecto",
         "sync-strategy-merge": "Combinar (Merge)",
@@ -3327,7 +3327,7 @@
         "no-entities-to-restore-prompt": "Por favor, especifica las entidades a restaurar",
         "add-entity-type": "Añadir tipo de entidad",
         "remove-all": "Borrar todo",
-        "version-create-result": "{ added, plural, 0 {Ninguna entidad} 1 {1 entidad} other {# entidades} } añadidas.<br/>{ modified, plural, 0 {Ninguna entidad} 1 {1 entidad} other {# entidades} } modificadas.<br/>{ removed, plural, 0 {Ninguna entidad} 1 {1 entidad} other {# entidades} } borradas.",
+        "version-create-result": "{ added, plural, =0 {Ninguna entidad} =1 {1 entidad} other {# entidades} } añadidas.<br/>{ modified, plural, =0 {Ninguna entidad} =1 {1 entidad} other {# entidades} } modificadas.<br/>{ removed, plural, =0 {Ninguna entidad} =1 {1 entidad} other {# entidades} } borradas.",
         "remove-other-entities": "Borrar otras entidades",
         "find-existing-entity-by-name": "Buscar entidad existente por nombre",
         "restore-entities-from-version": "Restaurar entidades desde la versión '{{versionName}}'",
@@ -3482,8 +3482,8 @@
         "widgets-bundle-details": "Detalles del paquete de Widgets",
         "delete-widgets-bundle-title": "¿Eliminar el paquete de widgets '{{widgetsBundleTitle}}'?",
         "delete-widgets-bundle-text": "Atención, tras la confirmación todos los paquetes seleccionados serán eliminados y su información relacionada será irrecuperable.",
-        "delete-widgets-bundles-title": "¿Eliminar { count, plural, 1 {1 paquete de widgets} other {# paquetes de widgets} }?",
-        "delete-widgets-bundles-action-title": "Eliminar { count, plural, 1 {1 paquete de widgets} other {# paquetes de widgets} }",
+        "delete-widgets-bundles-title": "¿Eliminar { count, plural, =1 {1 paquete de widgets} other {# paquetes de widgets} }?",
+        "delete-widgets-bundles-action-title": "Eliminar { count, plural, =1 {1 paquete de widgets} other {# paquetes de widgets} }",
         "delete-widgets-bundles-text": "Atención, tras la confirmación todos los paquetes seleccionados serán eliminados y la información relacionada será irrecuperable.",
         "no-widgets-bundles-matching": "Ningún paquete '{{widgetsBundle}}' encontrado.",
         "widgets-bundle-required": "Paquete de widget requerido.",
@@ -3495,7 +3495,7 @@
         "widgets-bundle-file": "Archivo de paquete de widgets",
         "invalid-widgets-bundle-file-error": "Imposible importar paquete de widgets: Estructura de datos inválida.",
         "search": "Buscar paquete de widgets",
-        "selected-widgets-bundles": "{ count, plural, 1 {1 paquete de widgets} other {# paquetes de widgets} } seleccionados",
+        "selected-widgets-bundles": "{ count, plural, =1 {1 paquete de widgets} other {# paquetes de widgets} } seleccionados",
         "open-widgets-bundle": "Abrir paquete de widgets",
         "loading-widgets-bundles": "Cargando paquete de widgets..."
     },
@@ -3528,7 +3528,7 @@
         "legend": "Leyenda",
         "display-legend": "Mostrar leyenda",
         "datasources": "Set de datos",
-        "maximum-datasources": "Un máximo de { count, plural, 1 {1 set de datos es permitido.} other {# set de datos son permitidos} }",
+        "maximum-datasources": "Un máximo de { count, plural, =1 {1 set de datos es permitido.} other {# set de datos son permitidos} }",
         "datasource-type": "Tipo",
         "datasource-parameters": "Parámetros",
         "remove-datasource": "Eliminar set de datos",
diff --git a/ui-ngx/src/assets/locale/locale.constant-fa_IR.json b/ui-ngx/src/assets/locale/locale.constant-fa_IR.json
index b0eef3fa2c..1f0285e53b 100644
--- a/ui-ngx/src/assets/locale/locale.constant-fa_IR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-fa_IR.json
@@ -127,17 +127,17 @@
         "acknowledge": "تصديق",
         "clear": "پاک کردن",
         "search": "جستجوي هشدارها",
-        "selected-alarms": "اننخاب شده { count, plural, 1 {1 هشدار} other {# هشدارها} }",
+        "selected-alarms": "اننخاب شده { count, plural, =1 {1 هشدار} other {# هشدارها} }",
         "no-data": "هيچ داده اي براي نمايش نيست",
         "polling-interval": "هشدار دهنده فاصله نمونه برداري (sec)",
         "polling-interval-required": ".هشدار دهنده فاصله نمونه برداري مورد نياز است",
         "min-polling-interval-message": ".حداقل فاصله مجاز نمونه برداري، 1 ثانيه است",
-        "aknowledge-alarms-title": "{ count, plural, 1 {1 هشدار} other {# هشدارها} } تصديق",
-        "aknowledge-alarms-text": "اطمينان داريد؟ { count, plural, 1 {1 هشدار} other {# هشدارها} } آيا شما از تصديق",
+        "aknowledge-alarms-title": "{ count, plural, =1 {1 هشدار} other {# هشدارها} } تصديق",
+        "aknowledge-alarms-text": "اطمينان داريد؟ { count, plural, =1 {1 هشدار} other {# هشدارها} } آيا شما از تصديق",
         "aknowledge-alarm-title": "تصديق هشدار",
         "aknowledge-alarm-text": "آيا شما از تصديق هشدار اطمينان داريد؟",
-        "clear-alarms-title": "{ count, plural, 1 {1 هشدار} other {# هشدارها} } پاک کردن",
-        "clear-alarms-text": "اطمينان داريد؟ { count, plural, 1 {1 هشدار} other {# هشدارها} } آيا شما از پاک کردن",
+        "clear-alarms-title": "{ count, plural, =1 {1 هشدار} other {# هشدارها} } پاک کردن",
+        "clear-alarms-text": "اطمينان داريد؟ { count, plural, =1 {1 هشدار} other {# هشدارها} } آيا شما از پاک کردن",
         "clear-alarm-title": "پاک کردن هشدار",
         "clear-alarm-text": "آيا شما از پاک کردن هشدار اطمينان داريد؟",
         "alarm-status-filter": "فيلتر وضعيت هشدار"
@@ -223,15 +223,15 @@
         "add-asset-text": "افزودن دارايي جديد",
         "asset-details": "جزئيات دارايي",
         "assign-assets": "تخصيص دارايي ها",
-        "assign-assets-text": "به مشتري { count, plural, 1 {1 دارايي} other {# دارايي} } تخصيص",
+        "assign-assets-text": "به مشتري { count, plural, =1 {1 دارايي} other {# دارايي} } تخصيص",
         "delete-assets": "حذف دارايي ها",
         "unassign-assets": "لغو تخصيص دارايي ها",
-        "unassign-assets-action-title": "از مشتري { count, plural, 1 {1 دارايي} other {# دارايي} } لغو تخصيص",
+        "unassign-assets-action-title": "از مشتري { count, plural, =1 {1 دارايي} other {# دارايي} } لغو تخصيص",
         "assign-new-asset": "تخصيص دارايي جديد",
         "delete-asset-title": "مطمئنيد؟ '{{assetName}}' آيا از حذف دارايي",
         "delete-asset-text": ".مراقب باشيد، پس از تأييد، دارايي و تمام داده هاي مربوطه غير قابل بازيابي مي شوند",
-        "delete-assets-title": "مطمئنيد؟ { count, plural, 1 {1 دارايي} other {# دارايي} } آيا از حذف",
-        "delete-assets-action-title": "{ count, plural, 1 {1 دارايي} other {# دارايي} } حذف",
+        "delete-assets-title": "مطمئنيد؟ { count, plural, =1 {1 دارايي} other {# دارايي} } آيا از حذف",
+        "delete-assets-action-title": "{ count, plural, =1 {1 دارايي} other {# دارايي} } حذف",
         "delete-assets-text": ".مراقب باشيد، پس از تأييد، تمام دارايي هاي انتخاب شده حذف، و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
         "make-public-asset-title": "مطمئنيد؟ '{{assetName}}' آيا از عمومي سازي",
         "make-public-asset-text": ".پس از تأييد، دارايي و تمامي داده هايش عمومي و قابل دسترسي براي ديگران مي شود",
@@ -240,7 +240,7 @@
         "unassign-asset-title": "مطمئنيد؟ '{{assetName}}' آيا از لغو تخصيص دارايي",
         "unassign-asset-text": ".پس از تأييد، دارايي، لغو تخصيص و خارج از دسترس مشتري مي شود",
         "unassign-asset": "لغو تخصيص دارايي",
-        "unassign-assets-title": "مطمئنيد؟ { count, plural, 1 {1 دارايي} other {# دارايي} } آيا از لغو تخصيص",
+        "unassign-assets-title": "مطمئنيد؟ { count, plural, =1 {1 دارايي} other {# دارايي} } آيا از لغو تخصيص",
         "unassign-assets-text": ".پس از تأييد، تمام دارايي هاي انتخاب شده، لغو تخصيص و خارج از دسترس مشتري مي شوند",
         "copyId": "دارايي ID رونوشت از",
         "idCopiedMessage": "دارايي در حافظه موقت رونوشت شد ID",
@@ -264,7 +264,7 @@
         "key-required": ".کليد ويژگي مورد نياز است",
         "value": "مقدار",
         "value-required": ".مقدار ويژگي مورد نياز است",
-        "delete-attributes-title": "مطمئنيد؟ { count, plural, 1 {1 ويژگي} other {# ويژگي} } آيا از حذف",
+        "delete-attributes-title": "مطمئنيد؟ { count, plural, =1 {1 ويژگي} other {# ويژگي} } آيا از حذف",
         "delete-attributes-text": ".مراقب باشيد، پس از تأييد، تمام ويژگي هاي انتخاب شده حذف مي گردند",
         "delete-attributes": "حذف ويژگي ها",
         "enter-attribute-value": "وارد کردن مقدار ويژگي",
@@ -274,8 +274,8 @@
         "prev-widget": "ويجت قبل",
         "add-to-dashboard": "افزودن به داشبورد",
         "add-widget-to-dashboard": "افزودن ويجت به داشبورد",
-        "selected-attributes": "انتخاب شدند { count, plural, 1 {1 ويژگي} other {# ويژگي} }",
-        "selected-telemetry": "انتخاب شد { count, plural, 1 {1 واحد سنجش} other {# واحد سنجش} }"
+        "selected-attributes": "انتخاب شدند { count, plural, =1 {1 ويژگي} other {# ويژگي} }",
+        "selected-telemetry": "انتخاب شد { count, plural, =1 {1 واحد سنجش} other {# واحد سنجش} }"
     },
     "audit-log": {
         "audit": "بازبيني",
@@ -371,8 +371,8 @@
         "customer-details": "جزئيات اطلاعات مشتري",
         "delete-customer-title": "مطمئنيد؟ '{{customerTitle}}' از حذف مشتري",
         "delete-customer-text": ".مراقب باشيد، پس از تأييد، مشتري و تمامي داده هاي مربوطه، غير قابل بازيابي مي شوند",
-        "delete-customers-title": "مطمئنيد؟ { count, plural, 1 {1 مشتري} other {# مشتري} } از حذف",
-        "delete-customers-action-title": "{ count, plural, 1 {1 مشتري} other {# مشتري} } حذف",
+        "delete-customers-title": "مطمئنيد؟ { count, plural, =1 {1 مشتري} other {# مشتري} } از حذف",
+        "delete-customers-action-title": "{ count, plural, =1 {1 مشتري} other {# مشتري} } حذف",
         "delete-customers-text": ".مراقب باشيد، پس از تأييد، تمام مشتريانِ انتخاب شده حذف، و تمامي داده هاي مربوطه غير قابل دسترسي مي شوند",
         "manage-users": "مديريت کاربرها",
         "manage-assets": "مديريت دارايي ها",
@@ -431,20 +431,20 @@
         "add-dashboard-text": "افزودن داشبورد جديد",
         "assign-dashboards": "تخصيص داشبوردها",
         "assign-new-dashboard": "تخصيص داشبورد جديد",
-        "assign-dashboards-text": "به مشتريان { count, plural, 1 {1 داشبورد} other {# داشبورد} } تخصيص",
-        "unassign-dashboards-action-text": "از مشتريان { count, plural, 1 {1 داشبورد} other {# داشبورد} } لغو تخصيص",
+        "assign-dashboards-text": "به مشتريان { count, plural, =1 {1 داشبورد} other {# داشبورد} } تخصيص",
+        "unassign-dashboards-action-text": "از مشتريان { count, plural, =1 {1 داشبورد} other {# داشبورد} } لغو تخصيص",
         "delete-dashboards": "حذف داشبوردها",
         "unassign-dashboards": "لغو تخصيص داشبوردها",
-        "unassign-dashboards-action-title": "از مشتري { count, plural, 1 {1 داشبورد} other {# داشبورد} } لغو تخصيص",
+        "unassign-dashboards-action-title": "از مشتري { count, plural, =1 {1 داشبورد} other {# داشبورد} } لغو تخصيص",
         "delete-dashboard-title": "مطمئنيد؟ '{{dashboardTitle}}' از حذف",
         "delete-dashboard-text": ".مراقب باشيد، پس از تأييد، داشبورد و تمامي داده هاي مربوطه، غير قابل بازيابي مي شوند",
-        "delete-dashboards-title": "مطمئنيد؟ { count, plural, 1 {1 داشبورد} other {# داشبورد} } از حذف",
-        "delete-dashboards-action-title": "{ count, plural, 1 {1 داشبورد} other {# داشبورد} } حذف",
+        "delete-dashboards-title": "مطمئنيد؟ { count, plural, =1 {1 داشبورد} other {# داشبورد} } از حذف",
+        "delete-dashboards-action-title": "{ count, plural, =1 {1 داشبورد} other {# داشبورد} } حذف",
         "delete-dashboards-text": ".مراقب باشيد، پس از تأييد، تمام داشبوردهاي انتخاب شده حذف، و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند ",
         "unassign-dashboard-title": "مطمئنيد؟ '{{dashboardTitle}}' از لغو تخصيص داشبورد",
         "unassign-dashboard-text": ".پس از تأييد، داشبورد، لغو تخصيص و خارج از دسترس مشتري مي شود",
         "unassign-dashboard": "لغو تخصيص داشبورد",
-        "unassign-dashboards-title": "مطمئنيد؟ { count, plural, 1 {1 داشبورد} other {# داشبورد} } از لغو تخصيص",
+        "unassign-dashboards-title": "مطمئنيد؟ { count, plural, =1 {1 داشبورد} other {# داشبورد} } از لغو تخصيص",
         "unassign-dashboards-text": ".پس از تأييد، تمام داشبوردهاي انتخاب شده، لغو تخصيص و خارج از دسترس مشتري مي شوند",
         "public-dashboard-title": "داشبورد اکنون عمومي است",
         "public-dashboard-text": ":</a>قابل دسترسي است<a href='{{publicLink}}' target='_blank'> اکنون عمومي بوده و از طريق پيوند عمومي ديگر ، <b>{{dashboardTitle}}</b> ،داشبورد شما",
@@ -521,7 +521,7 @@
         "manage-states": "مديريت وضعيت هاي داشبورد",
         "states": "وضعيت هاي داشبورد",
         "search-states": "جستجوي وضعيت هاي داشبورد",
-        "selected-states": "انتخاب شدند { count, plural, 1 {1 وضعيت داشبورد} other {# وضعيت داشبورد} }",
+        "selected-states": "انتخاب شدند { count, plural, =1 {1 وضعيت داشبورد} other {# وضعيت داشبورد} }",
         "edit-state": "ويرايش وضعيت داشبورد",
         "delete-state": "حذف وضعيت داشبورد",
         "add-state": "افزودن وضعيت داشبورد",
@@ -554,11 +554,11 @@
         "alarm": "حوزه هاي هشدار",
         "timeseries-required": ".سري هاي زماني موجودي مورد نياز است",
         "timeseries-or-attributes-required": ".سري هاي زماني / ويژگي هاي موجودي مورد نياز است",
-        "maximum-timeseries-or-attributes": "{ count, plural, 1 {.1 سري زماني / ويژگي مجاز است} other {# سري زماني / ويژگي مجازند} } بيشترين",
+        "maximum-timeseries-or-attributes": "{ count, plural, =1 {.1 سري زماني / ويژگي مجاز است} other {# سري زماني / ويژگي مجازند} } بيشترين",
         "alarm-fields-required": ".حوزه هاي هشدار مورد نياز است",
         "function-types": "نوع توابع",
         "function-types-required": ".نوع تابع مورد نياز است",
-        "maximum-function-types": "{ count, plural, 1 {.1 نوع تابع مجاز است} other {# نوع تابع مجازند} } بيشترين",
+        "maximum-function-types": "{ count, plural, =1 {.1 نوع تابع مجاز است} other {# نوع تابع مجازند} } بيشترين",
         "time-description": "برچسب زماني مقدار فعلي؛",
         "value-description": "مقدار فعلي؛",
         "prev-value-description": "نتيجه ي فراخوانيِ تابع قبلي؛",
@@ -615,11 +615,11 @@
         "manage-credentials": "مديريت اعتبارنامه ها",
         "delete": "حذف دستگاه",
         "assign-devices": "تخصيص دستگاه ها",
-        "assign-devices-text": "به مشتري { count, plural, 1 {1 دستگاه} other {# دستگاه} } تخصيص",
+        "assign-devices-text": "به مشتري { count, plural, =1 {1 دستگاه} other {# دستگاه} } تخصيص",
         "delete-devices": "حذف دستگاه ها",
         "unassign-from-customer": "لغو تخصيص از مشتري",
         "unassign-devices": "لغو تخصيص دستگاه ها",
-        "unassign-devices-action-title": "از مشتري { count, plural, 1 {1 دستگاه} other {# دستگاه} } لغو تخصيص",
+        "unassign-devices-action-title": "از مشتري { count, plural, =1 {1 دستگاه} other {# دستگاه} } لغو تخصيص",
         "assign-new-device": "تخصيص دستگاه جديد",
         "make-public-device-title": "مطمئنيد؟ '{{deviceName}}' از عمومي سازي دستگاه",
         "make-public-device-text": ".پس از تأييد، دستگاه و تمامي داده هايش عمومي و قابل دسترسي براي ديگران مي شود",
@@ -628,13 +628,13 @@
         "view-credentials": "نمايش اعتبارنامه ها",
         "delete-device-title": "مطمئنيد؟ '{{deviceName}}' از حذف",
         "delete-device-text": ".مراقب باشيد، پس از تأييد، دستگاه و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
-        "delete-devices-title": "مطمئنيد؟ { count, plural, 1 {1 دستگاه} other {# دستگاه} } از حذف",
-        "delete-devices-action-title": "{ count, plural, 1 {1 دستگاه} other {# دستگاه} } حذف",
+        "delete-devices-title": "مطمئنيد؟ { count, plural, =1 {1 دستگاه} other {# دستگاه} } از حذف",
+        "delete-devices-action-title": "{ count, plural, =1 {1 دستگاه} other {# دستگاه} } حذف",
         "delete-devices-text": ".مراقب باشيد، پس از تأييد، تمام دستگاه هاي انتخاب شده، حذف، و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
         "unassign-device-title": "مطمئنيد؟ '{{deviceName}}' از لغو تخصيص",
         "unassign-device-text": ".پس از تأييد، دستگاه، لغو تخصيص و خارج از دسترس مشتري مي شود",
         "unassign-device": "لغو تخصيص دستگاه",
-        "unassign-devices-title": "مطمئنيد؟ { count, plural, 1 {1 دستگاه} other {# دستگاه} } از لغو تخصيص",
+        "unassign-devices-title": "مطمئنيد؟ { count, plural, =1 {1 دستگاه} other {# دستگاه} } از لغو تخصيص",
         "unassign-devices-text": ".پس از تأييد، تمام دستگاه هاي انتخاب شده، لغو تخصيص و خارج از دسترس مشتري مي شوند",
         "device-credentials": "اعتبارنامه هاي دستگاه",
         "credentials-type": "نوع اعتبارنامه ها",
@@ -718,55 +718,55 @@
         "type-required": ".نوع موجودي مورد نياز است",
         "type-device": "دستگاه",
         "type-devices": "دستگاه ها",
-        "list-of-devices": "{ count, plural, 1 {يک دستگاه} other {ليست # دستگاه} }",
+        "list-of-devices": "{ count, plural, =1 {يک دستگاه} other {ليست # دستگاه} }",
         "device-name-starts-with": "شروع مي شود '{{prefix}}' دستگاه هايي که نامشان با",
         "type-asset": "دارايي",
         "type-assets": "دارايي ها",
-        "list-of-assets": "{ count, plural, 1 {يک دارايي} other {ليست # دارايي} }",
+        "list-of-assets": "{ count, plural, =1 {يک دارايي} other {ليست # دارايي} }",
         "asset-name-starts-with": "شروع مي شود '{{prefix}}' دارايي هايي که نامشان با",
         "type-entity-view": "نمايش موجودي",
         "type-entity-views": "نمايش هاي موجودي",
-        "list-of-entity-views": "{ count, plural, 1 {يک نمايش موجودي} other {ليست # نمايش موجودي} }",
+        "list-of-entity-views": "{ count, plural, =1 {يک نمايش موجودي} other {ليست # نمايش موجودي} }",
         "entity-view-name-starts-with": "شروع مي شود '{{prefix}}' نمايش هاي موجودي که نامشان با",
         "type-rule": "قاعده",
         "type-rules": "قواعد",
-        "list-of-rules": "{ count, plural, 1 {يک قاعده} other {ليست # قاعده} }",
+        "list-of-rules": "{ count, plural, =1 {يک قاعده} other {ليست # قاعده} }",
         "rule-name-starts-with": "شروع مي شود '{{prefix}}' قواعدي که نامشان با",
         "type-plugin": "ابزار جانبي",
         "type-plugins": "ابزارهاي جانبي",
-        "list-of-plugins": "{ count, plural, 1 {يک ابزار جانبي} other {ليست # ابزار جانبي} }",
+        "list-of-plugins": "{ count, plural, =1 {يک ابزار جانبي} other {ليست # ابزار جانبي} }",
         "plugin-name-starts-with": "شروع مي شود '{{prefix}}' ابزارهاي جانبي که نامشان با",
         "type-tenant": "کاربر",
         "type-tenants": "کاربران",
-        "list-of-tenants": "{ count, plural, 1 {يک کاربر} other {ليست # کاربر} }",
+        "list-of-tenants": "{ count, plural, =1 {يک کاربر} other {ليست # کاربر} }",
         "tenant-name-starts-with": "شروع مي شود '{{prefix}}' کاربرهايي که نامشان با",
         "type-customer": "مشتري",
         "type-customers": "مشتريان",
-        "list-of-customers": "{ count, plural, 1 {يک مشتري} other {ليست # مشتري} }",
+        "list-of-customers": "{ count, plural, =1 {يک مشتري} other {ليست # مشتري} }",
         "customer-name-starts-with": "شروع مي شود '{{prefix}}' مشترياني که نامشان با",
         "type-user": "کاربر",
         "type-users": "کاربران",
-        "list-of-users": "{ count, plural, 1 {يک کاربر} other {ليست # کاربر} }",
+        "list-of-users": "{ count, plural, =1 {يک کاربر} other {ليست # کاربر} }",
         "user-name-starts-with": "شروع مي شود '{{prefix}}' کاربرهايي که نامشان با",
         "type-dashboard": "داشبورد",
         "type-dashboards": "داشبوردها",
-        "list-of-dashboards": "{ count, plural, 1 {يک داشبورد} other {ليست # داشبورد} }",
+        "list-of-dashboards": "{ count, plural, =1 {يک داشبورد} other {ليست # داشبورد} }",
         "dashboard-name-starts-with": "شروع مي شود '{{prefix}}' داشبوردهايي که نامشان با",
         "type-alarm": "هشدار",
         "type-alarms": "هشدارها",
-        "list-of-alarms": "{ count, plural, 1 {يک هشدار} other {ليست # هشدار} }",
+        "list-of-alarms": "{ count, plural, =1 {يک هشدار} other {ليست # هشدار} }",
         "alarm-name-starts-with": "شروع مي شود '{{prefix}}' هشدارهايي که نامشان با",
         "type-rulechain": "زنجيره قواعد",
         "type-rulechains": "زنجيره هاي قواعد",
-        "list-of-rulechains": "{ count, plural, 1 {يک زنجيره قواعد} other {ليست # زنجيره قواعد} }",
+        "list-of-rulechains": "{ count, plural, =1 {يک زنجيره قواعد} other {ليست # زنجيره قواعد} }",
         "rulechain-name-starts-with": "شروع مي شود '{{prefix}}' زنجيره هاي قواعدي که نامشان با",
         "type-rulenode": "گره قواعد",
         "type-rulenodes": "گره هاي قواعد",
-        "list-of-rulenodes": "{ count, plural, 1 {يک گره قواعد} other {ليست # گره قواعد} }",
+        "list-of-rulenodes": "{ count, plural, =1 {يک گره قواعد} other {ليست # گره قواعد} }",
         "rulenode-name-starts-with": "شروع مي شود '{{prefix}}' گره هاي قواعدي که نامشان با",
         "type-current-customer": "مشتري فعلي",
         "search": "جستجوي موجودي ها",
-        "selected-entities": "انتخاب شدند { count, plural, 1 {1 موجودي} other {# موجودي} }",
+        "selected-entities": "انتخاب شدند { count, plural, =1 {1 موجودي} other {# موجودي} }",
         "entity-name": "نام موجودي",
         "details": "جزئيات موجودي",
         "no-entities-prompt": "هيچ موجودي اي يافت نشد",
@@ -810,21 +810,21 @@
         "add-entity-view-text": "افزودن نمايش موجودي جديد",
         "delete": "حذف نمايش موجودي",
         "assign-entity-views": "تخصيص نمايش هاي موجودي",
-        "assign-entity-views-text": "به مشتري { count, plural, 1 {1 نمايش موجودي} other {# نمايش موجودي} } تخصيص",
+        "assign-entity-views-text": "به مشتري { count, plural, =1 {1 نمايش موجودي} other {# نمايش موجودي} } تخصيص",
         "delete-entity-views": "حذف نمايش هاي موجودي",
         "unassign-from-customer": "لغو تخصيص از مشتري",
         "unassign-entity-views": "لغو تخصيص نمايش هاي موجودي",
-        "unassign-entity-views-action-title": "از مشتري { count, plural, 1 {1 نمايش موجودي} other {# نمايش موجودي} } لغو تخصيص",
+        "unassign-entity-views-action-title": "از مشتري { count, plural, =1 {1 نمايش موجودي} other {# نمايش موجودي} } لغو تخصيص",
         "assign-new-entity-view": "تخصيص نمايش موجودي جديد",
         "delete-entity-view-title": "مطمئنيد؟ '{{entityViewName}}' از حذف نمايش موجودي",
         "delete-entity-view-text": ".مراقب باشيد، پس از تأييد، نمايش موجودي و تمامي داده هاي مربوطه، غير قابل بازيابي مي شوند",
-        "delete-entity-views-title": "مطمئنيد؟ { count, plural, 1 {1 نمايش موجودي} other {# نمايش موجودي} } از حذف نمايش موجودي",
-        "delete-entity-views-action-title": "{ count, plural, 1 {1 نمايش موجودي} other {# نمايش موجودي} } حذف",
+        "delete-entity-views-title": "مطمئنيد؟ { count, plural, =1 {1 نمايش موجودي} other {# نمايش موجودي} } از حذف نمايش موجودي",
+        "delete-entity-views-action-title": "{ count, plural, =1 {1 نمايش موجودي} other {# نمايش موجودي} } حذف",
         "delete-entity-views-text": ".مراقب باشيد، پس از تأييد، تمام نمايش هاي موجوديِ انتخاب شده حذف، و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
         "unassign-entity-view-title": "مطمئنيد؟ '{{entityViewName}}' از لغو تخصيص نمايش موجودي",
         "unassign-entity-view-text": ".پس از تأييد، نمايش موجودي، لغو تخصيص و خارج از دسترس مشتري مي شود",
         "unassign-entity-view": "لغو تخصيص نمايش موجودي",
-        "unassign-entity-views-title": "مطمئنيد؟ { count, plural, 1 {1 نمايش موجودي} other {# نمايش موجودي} } از لغو تخصيص",
+        "unassign-entity-views-title": "مطمئنيد؟ { count, plural, =1 {1 نمايش موجودي} other {# نمايش موجودي} } از لغو تخصيص",
         "unassign-entity-views-text": ".پس از تأييد، تمام نمايش هاي موجوديِ انتخاب شده، لغو تخصيص و خارج از دسترس مشتري مي شوند",
         "entity-view-type": "نوع نمايش موجودي",
         "entity-view-type-required": ".نوع نمايش موجودي مورد نياز است",
@@ -896,7 +896,7 @@
     },
     "extension": {
         "extensions": "دنباله ها",
-        "selected-extensions": "انتخاب شدند { count, plural, 1 {1 افزونه} other {افزونه ها #} }",
+        "selected-extensions": "انتخاب شدند { count, plural, =1 {1 افزونه} other {افزونه ها #} }",
         "type": "نوع",
         "key": "کليد",
         "value": "مقدار",
@@ -910,7 +910,7 @@
         "edit": "ويرايش دنباله",
         "delete-extension-title": "مطمئنيد؟ '{{extensionId}}' از حذف افزونه",
         "delete-extension-text": ".مراقب باشيد، پس از تأييد، افزونه و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
-        "delete-extensions-title": "مطمئنيد؟ { count, plural, 1 {1 افزونه} other {# افزونه} } از حذف",
+        "delete-extensions-title": "مطمئنيد؟ { count, plural, =1 {1 افزونه} other {# افزونه} } از حذف",
         "delete-extensions-text": ".مراقب باشيد، پس از تأييد، تمام افزونه هاي انتخاب شده حذف مي گردند",
         "converters": "مبدّل ها",
         "converter-id": "مبدّل ID",
@@ -1063,8 +1063,8 @@
     "grid": {
         "delete-item-title": "از حذف اين مورد مطمئنيد؟",
         "delete-item-text": ".مراقب باشيد، پس از تأييد، اين مورد و تمامي داده هاي مربوطه غيرقابل بازيابي مي شوند",
-        "delete-items-title": "مطمئنيد؟ { count, plural, 1 {1 مورد} other {# مورد} } از حذف",
-        "delete-items-action-title": "{ count, plural, 1 {1 مورد} other {# مورد} } حذف",
+        "delete-items-title": "مطمئنيد؟ { count, plural, =1 {1 مورد} other {# مورد} } از حذف",
+        "delete-items-action-title": "{ count, plural, =1 {1 مورد} other {# مورد} } حذف",
         "delete-items-text": ".مراقب باشيد، پس از تأييد، تمام مواردِ انتخاب شده حذف، و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
         "add-item-text": "افزودن مورد جديد",
         "no-items-text": "هيچ موردي يافت نشد",
@@ -1165,7 +1165,7 @@
         },
         "from-relations": "ارتباطات خارج از محدوده",
         "to-relations": "ارتباطات داخل محدوده",
-        "selected-relations": "انتخاب شدند { count, plural, 1 {1 ارتباط} other {ارتباط #} }",
+        "selected-relations": "انتخاب شدند { count, plural, =1 {1 ارتباط} other {ارتباط #} }",
         "type": "نوع",
         "to-entity-type": "به نوع موجودي",
         "to-entity-name": "به نام موجودي",
@@ -1181,11 +1181,11 @@
         "edit": "ويرايش ارتباط",
         "delete-to-relation-title": "مطمئنيد؟ '{{entityName}}' از حذف ارتباط با موجودي",
         "delete-to-relation-text": ".غيرمرتبط با موجودي فعلي مي شود '{{entityName}}' مراقب باشيد، پس از تأييد، موجودي",
-        "delete-to-relations-title": "مطمئنيد؟ { count, plural, 1 {1 ارتباط} other {# ارتباط} } از حذف",
+        "delete-to-relations-title": "مطمئنيد؟ { count, plural, =1 {1 ارتباط} other {# ارتباط} } از حذف",
         "delete-to-relations-text": ".مراقب باشيد، پس از تأييد، تمام روابطِ انتخاب شده حذف، و موجودي هاي مربوطه، غيرمرتبط با موجودي فعلي مي شوند",
         "delete-from-relation-title": "مطمئنيد؟ '{{entityName}}' از حذف ارتباط از موجودي",
         "delete-from-relation-text": ".مي شود '{{entityName}}' مراقب باشيد، پس از تأييد، موجودي فعلي، غيرمرتبط از جانب موجودي",
-        "delete-from-relations-title": "مطمئنيد؟ { count, plural, 1 {1 ارتباط} other {# ارتباط} } از حذف",
+        "delete-from-relations-title": "مطمئنيد؟ { count, plural, =1 {1 ارتباط} other {# ارتباط} } از حذف",
         "delete-from-relations-text": ".مراقب باشيد، پس از تأييد، تمام روابطِ انتخاب شده حذف، و موجودي فعلي، غيرمرتبط از جانب موجودي هاي مربوطه مي شود",
         "remove-relation-filter": "حذف فيلتر ارتباط",
         "add-relation-filter": "افزودن فيلتر ارتباط",
@@ -1208,8 +1208,8 @@
         "set-root-rulechain-text": ".پس از تأييد، زنجيره قواعد، به عنوان ريشه تعيين شده و به تمام پيامهاي انتقالي رسيدگي مي کند",
         "delete-rulechain-title": "مطمئنيد؟ '{{ruleChainName}}' از حذف زنجيره قواعد",
         "delete-rulechain-text": ".مراقب باشيد، پس از تأييد، زنجيره قواعد و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
-        "delete-rulechains-title": "مطمئنيد؟ { count, plural, 1 {1 زنجيره قواعد} other {# زنجيره قواعد} } از حذف",
-        "delete-rulechains-action-title": "{ count, plural, 1 {1 زنجيره قواعد} other {# زنجيره قواعد} } حذف",
+        "delete-rulechains-title": "مطمئنيد؟ { count, plural, =1 {1 زنجيره قواعد} other {# زنجيره قواعد} } از حذف",
+        "delete-rulechains-action-title": "{ count, plural, =1 {1 زنجيره قواعد} other {# زنجيره قواعد} } حذف",
         "delete-rulechains-text": ".مراقب باشيد، پس از تأييد، تمام زنجيره هاي قواعدِ انتخاب شده حذف، و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
         "add-rulechain-text": "افزودن زنجيره قواعد جديد",
         "no-rulechains-text": "هيچ زنجيره قواعدي يافت نشد",
@@ -1307,8 +1307,8 @@
         "tenant-details": "جزئيات کاربر",
         "delete-tenant-title": "مطمئنيد؟ '{{tenantTitle}}' از حذف کاربر",
         "delete-tenant-text": ".مراقب باشيد، پس از تأييد، کاربر و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
-        "delete-tenants-title": "مطمئنيد؟ { count, plural, 1 {1 کاربر} other {# کاربر} } از حذف",
-        "delete-tenants-action-title": "{ count, plural, 1 {1 کاربر} other {# کاربر} } حذف",
+        "delete-tenants-title": "مطمئنيد؟ { count, plural, =1 {1 کاربر} other {# کاربر} } از حذف",
+        "delete-tenants-action-title": "{ count, plural, =1 {1 کاربر} other {# کاربر} } حذف",
         "delete-tenants-text": ".مراقب باشيد، پس از تأييد، تمام کاربران حذف، و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
         "title": "عنوان",
         "title-required": ".عنوان مورد نياز است",
@@ -1322,10 +1322,10 @@
         "tenant-required": "کاربر مورد نياز است"
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, 1 {1 ثانيه} other {ثانيه #} }",
-        "minutes-interval": "{ minutes, plural, 1 {1 دقيقه} other {دقيقه #} }",
-        "hours-interval": "{ hours, plural, 1 {1 ساعت} other {ساعت #} }",
-        "days-interval": "{ days, plural, 1 {1 روز} other {روز #} }",
+        "seconds-interval": "{ seconds, plural, =1 {1 ثانيه} other {ثانيه #} }",
+        "minutes-interval": "{ minutes, plural, =1 {1 دقيقه} other {دقيقه #} }",
+        "hours-interval": "{ hours, plural, =1 {1 ساعت} other {ساعت #} }",
+        "days-interval": "{ days, plural, =1 {1 روز} other {روز #} }",
         "days": "روزها",
         "hours": "ساعات",
         "minutes": "دقايق",
@@ -1333,10 +1333,10 @@
         "advanced": "پيشرفته"
     },
     "timewindow": {
-        "days": "{ days, plural, 1 { روز } other {روز #} }",
-        "hours": "{ hours, plural, 0 { 1ساعت } 1 { ساعت } other {# ساعت } }",
-        "minutes": "{ minutes, plural, 0 { 1دقيقه } 1 { دقيقه } other {دقيقه # } }",
-        "seconds": "{ seconds, plural, 0 { 1ثانيه } 1 { ثانيه } other {ثانيه # } }",
+        "days": "{ days, plural, =1 { روز } other {روز #} }",
+        "hours": "{ hours, plural, =0 { 1ساعت } =1 { ساعت } other {# ساعت } }",
+        "minutes": "{ minutes, plural, =0 { 1دقيقه } =1 { دقيقه } other {دقيقه # } }",
+        "seconds": "{ seconds, plural, =0 { 1ثانيه } =1{ ثانيه } other {ثانيه # } }",
         "realtime": "بي درنگ",
         "history": "تاريخچه",
         "last-prefix": "آخرين",
@@ -1362,8 +1362,8 @@
         "user-details": "جزئيات کاربر",
         "delete-user-title": "مطمئنيد؟ '{{userEmail}}' از حذف کاربر",
         "delete-user-text": ".مراقب باشيد، پس از تأييد، کاربر و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
-        "delete-users-title": "مطمئنيد؟ { count, plural, 1 {1 کاربر} other {# کاربر} } از حذف",
-        "delete-users-action-title": "{ count, plural, 1 {1 کاربر} other {کاربر #} } حذف",
+        "delete-users-title": "مطمئنيد؟ { count, plural, =1 {1 کاربر} other {# کاربر} } از حذف",
+        "delete-users-action-title": "{ count, plural, =1 {1 کاربر} other {کاربر #} } حذف",
         "delete-users-text": ".مراقب باشيد، پس از تأييد، تمام کاربرهاي انتخاب شده حذف، و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
         "activation-email-sent-message": "!پست الکترونيک فعال سازي با موفقيت ارسال شد",
         "resend-activation": "ارسال مجدد فعال سازي",
@@ -1482,8 +1482,8 @@
         "widgets-bundle-details": "جزئيات بسته ويجت",
         "delete-widgets-bundle-title": "مطمئنيد؟ '{{widgetsBundleTitle}}' از حذف بسته ويجت",
         "delete-widgets-bundle-text": ".مراقب باشيد، پس از تأييد، بسته ويجت و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
-        "delete-widgets-bundles-title": "مطمئنيد؟ { count, plural, 1 {1 بسته ويجت} other {# بسته ويجت} } از حذف",
-        "delete-widgets-bundles-action-title": "{ count, plural, 1 {1 بسته ويجت} other {# بسته ويجت} } حذف",
+        "delete-widgets-bundles-title": "مطمئنيد؟ { count, plural, =1 {1 بسته ويجت} other {# بسته ويجت} } از حذف",
+        "delete-widgets-bundles-action-title": "{ count, plural, =1 {1 بسته ويجت} other {# بسته ويجت} } حذف",
         "delete-widgets-bundles-text": ".مراقب باشيد، پس از تأييد، تمام بسته هاي ويجتِ انتخاب شده حذف، و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
         "no-widgets-bundles-matching": "يافت نشد '{{widgetsBundle}}' هيچ بسته ويجتي منطبق بر",
         "widgets-bundle-required": ".بسته ويجت مورد نياز است",
@@ -1519,7 +1519,7 @@
         "use-dashboard-timewindow": "استفاده از پنجره زمان داشبورد",
         "display-legend": "نمايش فهرست علائم",
         "datasources": "منابع داده",
-        "maximum-datasources": "{ count, plural, 1 {.1 منبع داده مجاز است} other {# منبع داده مجازند.} } بيشترين",
+        "maximum-datasources": "{ count, plural, =1 {.1 منبع داده مجاز است} other {# منبع داده مجازند.} } بيشترين",
         "datasource-type": "نوع",
         "datasource-parameters": "پارامترها",
         "remove-datasource": "حذف منبع داده",
diff --git a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
index ce66154f10..6bcb239167 100644
--- a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
@@ -245,8 +245,8 @@
         "acknowledge": "Acquitter",
         "aknowledge-alarm-text": "Êtes-vous sûr de vouloir reconnaître l'alarme?",
         "aknowledge-alarm-title": "Reconnaître l'alarme",
-        "aknowledge-alarms-text": "Êtes-vous sûr de vouloir acquitter { count, plural, 1 {1 alarme} other {# alarmes} }?",
-        "aknowledge-alarms-title": "Acquitter { count, plural, 1 {1 alarme} other {# alarmes} }",
+        "aknowledge-alarms-text": "Êtes-vous sûr de vouloir acquitter { count, plural, =1 {1 alarme} other {# alarmes} }?",
+        "aknowledge-alarms-title": "Acquitter { count, plural, =1 {1 alarme} other {# alarmes} }",
         "alarm": "Alarme",
         "alarm-details": "Détails de l'alarme",
         "alarm-required": "Une alarme est requise",
@@ -256,8 +256,8 @@
         "clear": "Effacer",
         "clear-alarm-text": "Êtes-vous sûr de vouloir effacer l'alarme?",
         "clear-alarm-title": "Effacer l'alarme",
-        "clear-alarms-text": "Êtes-vous sûr de vouloir effacer {count, plural, 1 {1 alarme} other {# alarmes} }?",
-        "clear-alarms-title": "Effacer {count, plural, 1 {1 alarme} other {# alarmes} }",
+        "clear-alarms-text": "Êtes-vous sûr de vouloir effacer {count, plural, =1 {1 alarme} other {# alarmes} }?",
+        "clear-alarms-title": "Effacer {count, plural, =1 {1 alarme} other {# alarmes} }",
         "clear-time": "Heure d'éffacement",
         "created-time": "Heure de création",
         "details": "Détails",
@@ -285,7 +285,7 @@
             "UNACK": "non acquittée"
         },
         "select-alarm": "Sélectionnez une alarme",
-        "selected-alarms": "{count, plural, 1 {1 alarme} other {# alarmes} } sélectionnées",
+        "selected-alarms": "{count, plural, =1 {1 alarme} other {# alarmes} } sélectionnées",
         "severity": "Gravité",
         "severity-critical": "Critique",
         "severity-indeterminate": "indéterminée",
@@ -380,7 +380,7 @@
         "assign-asset-to-customer": "Attribuer des actifs au client",
         "assign-asset-to-customer-text": "Veuillez sélectionner les actifs à attribuer au client",
         "assign-assets": "Attribuer des actifs",
-        "assign-assets-text": "Attribuer {count, plural, 1 {1 asset} other {# assets} } au client",
+        "assign-assets-text": "Attribuer {count, plural, =1 {1 asset} other {# assets} } au client",
         "assign-new-asset": "Attribuer un nouvel Asset",
         "assign-to-customer": "Attribuer au client",
         "assign-to-customer-text": "Veuillez sélectionner le client pour attribuer le ou les actifs",
@@ -390,9 +390,9 @@
         "delete-asset-text": "Faites attention, après la confirmation, l'actif et toutes les données associées deviendront irrécupérables.",
         "delete-asset-title": "Êtes-vous sûr de vouloir supprimer l'actif '{{assetName}}'?",
         "delete-assets": "Supprimer des actifs",
-        "delete-assets-action-title": "Supprimer {count, plural, 1 {1 asset} other {# assets} }",
+        "delete-assets-action-title": "Supprimer {count, plural, =1 {1 asset} other {# assets} }",
         "delete-assets-text": "Attention, après la confirmation, tous les actifs sélectionnés seront supprimés et toutes les données associées deviendront irrécupérables.",
-        "delete-assets-title": "Êtes-vous sûr de vouloir supprimer {count, plural, 1 {1 asset} other {# assets} }?",
+        "delete-assets-title": "Êtes-vous sûr de vouloir supprimer {count, plural, =1 {1 asset} other {# assets} }?",
         "description": "Description",
         "details": "Détails",
         "enter-asset-type": "Entrez le type d'actif",
@@ -421,9 +421,9 @@
         "unassign-asset-text": "Après la confirmation, l'actif sera non attribué et ne sera pas accessible au client.",
         "unassign-asset-title": "Êtes-vous sûr de vouloir retirer l'attribution de l'actif '{{assetName}}'?",
         "unassign-assets": "Retirer les actifs",
-        "unassign-assets-action-title": "Retirer {count, plural, 1 {1 asset} other {# assets} } du client",
+        "unassign-assets-action-title": "Retirer {count, plural, =1 {1 asset} other {# assets} } du client",
         "unassign-assets-text": "Après la confirmation, tous les actifs sélectionnés ne seront pas attribués et ne seront pas accessibles au client.",
-        "unassign-assets-title": "Êtes-vous sûr de vouloir retirer l'attribution de {count, plural, 1 {1 asset} other {# assets} }?",
+        "unassign-assets-title": "Êtes-vous sûr de vouloir retirer l'attribution de {count, plural, =1 {1 asset} other {# assets} }?",
         "unassign-from-customer": "Retirer du client",
         "view-assets": "Afficher les actifs",
         "label": "Étiquette (label)",
@@ -432,15 +432,15 @@
         "unassign-asset-from-edge": "Désattribuer l'actif",
         "unassign-asset-from-edge-title": "Voulez-vous vraiment annuler l'attribution de l'actif '{{assetName}}'?",
         "unassign-asset-from-edge-text": "Après la confirmation, l'actif sera désaffecté et ne sera pas accessible par le edge.",
-        "unassign-assets-from-edge-action-title": "Retirer {count, plural, 1 {1 asset} other {# assets} } de la bordure",
-        "unassign-assets-from-edge-title": "Êtes-vous sûr de vouloir désattribuer { count, plural, 1 {1 asset} other {# assets} }?",
+        "unassign-assets-from-edge-action-title": "Retirer {count, plural, =1 {1 asset} other {# assets} } de la bordure",
+        "unassign-assets-from-edge-title": "Êtes-vous sûr de vouloir désattribuer { count, plural, =1 {1 asset} other {# assets} }?",
         "unassign-assets-from-edge-text": "Après la confirmation, tous les actifs sélectionnés seront désaffectés et ne seront pas accessibles par le edge.",
         "asset-type-max-length": "Le type d'actif doit être inférieur à 256",
         "name-max-length": "Le nom doit être inférieur à 256",
         "label-max-length": "L'étiquette doit être inférieure à 256",
         "help-text": "Use '%' selon besoin : '%asset_name_contains%', '%asset_name_ends', 'asset_starts_with'.",
         "search": "Rechercher des actifs",
-        "selected-assets": "{ count, plural, 1 {1 asset} other {# assets} } sélectionnés"
+        "selected-assets": "{ count, plural, =1 {1 asset} other {# assets} } sélectionnés"
     },
     "attribute": {
         "add": "Ajouter un attribut",
@@ -450,7 +450,7 @@
         "attributes-scope": "Étendue des attributs d'entité",
         "delete-attributes": "Supprimer les attributs",
         "delete-attributes-text": "Attention, après la confirmation, tous les attributs sélectionnés seront supprimés.",
-        "delete-attributes-title": "Êtes-vous sûr de vouloir supprimer {count, plural, 1 {1 attribut} other {# attributs} }?",
+        "delete-attributes-title": "Êtes-vous sûr de vouloir supprimer {count, plural, =1 {1 attribut} other {# attributs} }?",
         "enter-attribute-value": "Entrez la valeur de l'attribut",
         "key": "Clé",
         "key-required": "La Clé d'attribut est requise.",
@@ -462,8 +462,8 @@
         "scope-latest-telemetry": "Dernière télémétrie",
         "scope-server": "Attributs du serveur",
         "scope-shared": "Attributs partagés",
-        "selected-attributes": "{count, plural, 1 {1 attribut} other {# attributs} } sélectionnés",
-        "selected-telemetry": "{count, plural, 1 {1 unité de télémétrie} other {# unités de télémétrie} } sélectionnées",
+        "selected-attributes": "{count, plural, =1 {1 attribut} other {# attributs} } sélectionnés",
+        "selected-telemetry": "{count, plural, =1 {1 unité de télémétrie} other {# unités de télémétrie} } sélectionnées",
         "show-on-widget": "Afficher sur le widget",
         "value": "Valeur",
         "value-required": "La valeur d'attribut est obligatoire.",
@@ -638,9 +638,9 @@
         "delete": "Supprimer le client",
         "delete-customer-text": "Faites attention, après la confirmation, le client et toutes les données associées deviendront irrécupérables.",
         "delete-customer-title": "Êtes-vous sûr de vouloir supprimer le client '{{customerTitle}}'?",
-        "delete-customers-action-title": "Supprimer {count, plural, 1 {1 customer} other {# customers} }",
+        "delete-customers-action-title": "Supprimer {count, plural, =1 {1 customer} other {# customers} }",
         "delete-customers-text": "Faites attention, après la confirmation, tous les clients sélectionnés seront supprimés et toutes les données associées deviendront irrécupérables.",
-        "delete-customers-title": "Êtes-vous sûr de vouloir supprimer {count, plural, 1 {1 customer} other {# customers} }?",
+        "delete-customers-title": "Êtes-vous sûr de vouloir supprimer {count, plural, =1 {1 customer} other {# customers} }?",
         "description": "Description",
         "details": "Détails",
         "devices": "Dispositifs du client",
@@ -675,7 +675,7 @@
         "title-required": "Le titre est requis.",
         "title-max-length": "La longueur du titre doit être moins que 256",
         "search": "Rechercher clients",
-        "selected-customers": "{ count, plural, 1 {1 customer} other {# customers} } sélectionnés",
+        "selected-customers": "{ count, plural, =1 {1 customer} other {# customers} } sélectionnés",
         "manage-edges": "Gérer les edges"
     },
     "dashboard": {
@@ -687,7 +687,7 @@
         "assign-dashboard-to-customer": "Attribuer des tableaux de bord au client",
         "assign-dashboard-to-customer-text": "Veuillez sélectionner les tableaux de bord à attribuer au client",
         "assign-dashboards": "Attribuer des tableaux de bord",
-        "assign-dashboards-text": "Attribuer {count, plural, 1 {1 tableau de bord} other {# tableaux de bord} } aux clients",
+        "assign-dashboards-text": "Attribuer {count, plural, =1 {1 tableau de bord} other {# tableaux de bord} } aux clients",
         "assign-new-dashboard": "Attribuer un nouveau tableau de bord",
         "assign-to-customer": "Attribuer au client",
         "assign-to-customer-text": "Veuillez sélectionner le client pour attribuer le ou les tableaux de bord",
@@ -718,9 +718,9 @@
         "delete-dashboard-text": "Faites attention, après la confirmation, le tableau de bord et toutes les données associées deviendront irrécupérables.",
         "delete-dashboard-title": "Êtes-vous sûr de vouloir supprimer le tableau de bord '{{dashboardTitle}}'?",
         "delete-dashboards": "Supprimer les tableaux de bord",
-        "delete-dashboards-action-title": "Supprimer {count, plural, 1 {1 tableau de bord} other {# tableaux de bord} }",
+        "delete-dashboards-action-title": "Supprimer {count, plural, =1 {1 tableau de bord} other {# tableaux de bord} }",
         "delete-dashboards-text": "Attention, après la confirmation, tous les tableaux de bord sélectionnés seront supprimés et toutes les données associées deviendront irrécupérables.",
-        "delete-dashboards-title": "Voulez-vous vraiment supprimer {count, plural, 1 {1 tableau de bord} other {# tableaux de bord} }?",
+        "delete-dashboards-title": "Voulez-vous vraiment supprimer {count, plural, =1 {1 tableau de bord} other {# tableaux de bord} }?",
         "delete-state": "Supprimer l'état du tableau de bord",
         "delete-state-text": "Etes-vous sûr de vouloir supprimer l'état du tableau de bord avec le nom '{{stateName}}'?",
         "delete-state-title": "Supprimer l'état du tableau de bord",
@@ -783,7 +783,7 @@
         "select-state": "Sélectionnez l'état cible",
         "select-widget-subtitle": "Liste des types de widgets disponibles",
         "select-widget-title": "Sélectionner un widget",
-        "selected-states": "{count, plural, 1 {1 état du tableau de bord} other {# états du tableau de bord} } sélectionnés",
+        "selected-states": "{count, plural, =1 {1 état du tableau de bord} other {# états du tableau de bord} } sélectionnés",
         "set-background": "Définir l'arrière-plan",
         "settings": "Paramètres",
         "show-details": "Afficher les détails",
@@ -805,10 +805,10 @@
         "unassign-dashboard-text": "Après la confirmation, le tableau de bord ne sera pas attribué et ne sera pas accessible au client.",
         "unassign-dashboard-title": "Êtes-vous sûr de vouloir annuler l'affectation du tableau de bord '{{dashboardTitle}}'?",
         "unassign-dashboards": "Retirer les tableaux de bord",
-        "unassign-dashboards-action-text": "Annuler l'affectation {count, plural, 1 {1 tableau de bord} other {# tableaux de bord} } des clients",
-        "unassign-dashboards-action-title": "Annuler l'affectation {count, plural, 1 {1 tableau de bord} other {# tableaux de bord} } du client",
+        "unassign-dashboards-action-text": "Annuler l'affectation {count, plural, =1 {1 tableau de bord} other {# tableaux de bord} } des clients",
+        "unassign-dashboards-action-title": "Annuler l'affectation {count, plural, =1 {1 tableau de bord} other {# tableaux de bord} } du client",
         "unassign-dashboards-text": "Après la confirmation, tous les tableaux de bord sélectionnés ne seront pas attribués et ne seront pas accessibles au client.",
-        "unassign-dashboards-title": "Etes-vous sûr de vouloir annuler l'affectation {count, plural, 1 {1 tableau de bord} other {# tableaux de bord} }?",
+        "unassign-dashboards-title": "Etes-vous sûr de vouloir annuler l'affectation {count, plural, =1 {1 tableau de bord} other {# tableaux de bord} }?",
         "unassign-from-customer": "Retirer du client",
         "unassign-from-customers": "Retirer les tableaux de bord des clients",
         "unassign-from-customers-text": "Veuillez sélectionner les clients à annuler l'attribution du ou des tableaux de bord",
@@ -849,10 +849,10 @@
         "dashboard-css": "CSS du tableau de bord",
         "no-states-text": "Aucun état trouvé",
         "search": "Rechercher des tableaux de bord",
-        "selected-dashboards": "{ count, plural, 1 {1 dashboard} other {# dashboards} } sélectionné",
+        "selected-dashboards": "{ count, plural, =1 {1 dashboard} other {# dashboards} } sélectionné",
         "home-dashboard": "Tableau de bord d'accueil",
         "home-dashboard-hide-toolbar": "Masquer la barre d'outils du tableau de bord d'accueil",
-        "unassign-dashboards-from-edge-title": "Êtes-vous certain de vouloir désattribuer { count, plural, 1 {1 dashboard} other {# dashboards} }?",
+        "unassign-dashboards-from-edge-title": "Êtes-vous certain de vouloir désattribuer { count, plural, =1 {1 dashboard} other {# dashboards} }?",
         "non-existent-dashboard-state-error": "L'état du tableau de bord avec ID \"{{ stateId }}\" non trouvé"
     },
     "datakey": {
@@ -867,8 +867,8 @@
         "function-types": "Types de fonctions",
         "function-types-required": "Les types de fonctions sont obligatoires",
         "label": "Label",
-        "maximum-function-types": "Maximum {count, plural, 1 {1 type de fonction est autorisé.} other {# types de fonctions sont autorisés} }",
-        "maximum-timeseries-or-attributes": "Maximum {count, plural, 1 {1 timeseries / attribut est autorisé.} other {# timeseries / attributs sont autorisés} }",
+        "maximum-function-types": "Maximum {count, plural, =1 {1 type de fonction est autorisé.} other {# types de fonctions sont autorisés} }",
+        "maximum-timeseries-or-attributes": "Maximum {count, plural, =1 {1 timeseries / attribut est autorisé.} other {# timeseries / attributs sont autorisés} }",
         "prev-orig-value-description": "valeur précédente d'origine;",
         "prev-value-description": "résultat de l'appel de fonction précédent;",
         "settings": "Paramètres",
@@ -915,7 +915,7 @@
         "assign-device-to-customer": "Attribuer des dispositifs au client",
         "assign-device-to-customer-text": "Veuillez sélectionner les dispositif à affecter au client",
         "assign-devices": "Attribuer des dispositifs",
-        "assign-devices-text": "Attribuer {count, plural, 1 {1 dispositif} other {# dispositifs} } au client",
+        "assign-devices-text": "Attribuer {count, plural, =1 {1 dispositif} other {# dispositifs} } au client",
         "assign-new-device": "Attribuer un nouveau dispositif",
         "assign-to-customer": "Attribuer au client",
         "assign-to-customer-text": "Veuillez sélectionner le client pour attribuer le ou les dispositifs",
@@ -931,9 +931,9 @@
         "delete-device-text": "Faites attention, après la confirmation, le dispositif et toutes les données associées deviendront irrécupérables.",
         "delete-device-title": "Êtes-vous sûr de vouloir supprimer le dispositif '{{deviceName}}'?",
         "delete-devices": "Supprimer les dispositifs",
-        "delete-devices-action-title": "Supprimer {count, plural, 1 {1 device} other {# devices} }",
+        "delete-devices-action-title": "Supprimer {count, plural, =1 {1 device} other {# devices} }",
         "delete-devices-text": "Faites attention, après la confirmation, tous les dispositifs sélectionnés seront supprimés et toutes les données associées deviendront irrécupérables.",
-        "delete-devices-title": "Êtes-vous sûr de vouloir supprimer {count, plural, 1 {1 device} other {# devices} }?",
+        "delete-devices-title": "Êtes-vous sûr de vouloir supprimer {count, plural, =1 {1 device} other {# devices} }?",
         "description": "Description",
         "details": "Détails",
         "device": "Dispositif",
@@ -987,9 +987,9 @@
         "unassign-device-text": "Après la confirmation, le dispositif ne sera pas attribué et ne sera pas accessible au client.",
         "unassign-device-title": "Êtes-vous sûr de vouloir annuler l'affection du dispositif {{deviceName}} '?",
         "unassign-devices": "Annuler l'affectation des dispositifs",
-        "unassign-devices-action-title": "Annuler l'affectation de {count, plural, 1 {1 device} other {#devices} } du client",
+        "unassign-devices-action-title": "Annuler l'affectation de {count, plural, =1 {1 device} other {#devices} } du client",
         "unassign-devices-text": "Après la confirmation, tous les dispositifs sélectionnés ne seront pas attribues et ne seront pas accessibles par le client.",
-        "unassign-devices-title": "Voulez-vous vraiment annuler l'affectation de {count, plural, 1 {1 device} other {# devices} }?",
+        "unassign-devices-title": "Voulez-vous vraiment annuler l'affectation de {count, plural, =1 {1 device} other {# devices} }?",
         "unassign-from-customer": "Retirer du client",
         "use-device-name-filter": "Utiliser le filtre",
         "view-credentials": "Afficher les informations d'identification",
@@ -997,7 +997,7 @@
         "assign-device-to-edge-text": "Veuillez sélectionner la bordure pour attribuer le ou les dispositifs",
         "unassign-device-from-edge-title": "Êtes-vous sûr de vouloir annuler l'affection du dispositif {{deviceName}} '?",
         "unassign-device-from-edge-text": "Après la confirmation, dispositif sera non attribué et ne sera pas accessible a la bordure.",
-        "unassign-devices-from-edge-title": "Voulez-vous vraiment annuler l'attribution de {count, plural, 1 {1 device} other {# devices} }?",
+        "unassign-devices-from-edge-title": "Voulez-vous vraiment annuler l'attribution de {count, plural, =1 {1 device} other {# devices} }?",
         "unassign-devices-from-edge-text": "Après la confirmation, tous les dispositifs sélectionnés ne seront pas attribues et ne seront pas accessibles par la bordure.",
         "device-type-max-length": "La longueur du type de dispositif doit être moins de 256",
         "help-text": "Utilisez '%' au besoin: '%device_name_contains%', '%device_name_ends', 'device_starts_with'.",
@@ -1049,7 +1049,7 @@
         "import": "Importer dispositif",
         "device-file": "Fichier du dispositif",
         "search": "Rechercher des dispositifs",
-        "selected-devices": "{ count, plural, 1 {1 device} other {# devices} } sélectionnés",
+        "selected-devices": "{ count, plural, =1 {1 device} other {# devices} } sélectionnés",
         "device-configuration": "Configuration du dipositif",
         "transport-configuration": "Configuration du transport",
         "wizard": {
@@ -1071,7 +1071,7 @@
         "device-profile-details": "Détails du profile de dispositif",
         "no-device-profiles-text": "Aucun profil de dispositif trouvé",
         "search": "Rechercher profil de dispositif",
-        "selected-device-profiles": "{ count, plural, 1 {1 device profile} other {# device profiles} } sélectionné",
+        "selected-device-profiles": "{ count, plural, =1 {1 device profile} other {# device profiles} } sélectionné",
         "no-device-profiles-matching": "Aucun dispositif correspondant à '{{entity}}' trouvé.",
         "device-profile-required": "Un profil de dispositif est requis.",
         "idCopiedMessage": "L'Id du profil de dispositif a été copié au presse-papier",
@@ -1104,7 +1104,7 @@
         "select-queue-hint": "Choisissez d'une liste déroulante.",
         "delete-device-profile-title": "Êtes-vous certain de vouloir supprimer le profile de dispositif '{{deviceProfileName}}'?",
         "delete-device-profile-text": "Attention, après confirmation le profil du dispositif et toutes les données associées deviendront irrécupérables.",
-        "delete-device-profiles-title": "Êtes-vous certainde vouloir supprimer { count, plural, 1 {1 device profile} other {# device profiles} }?",
+        "delete-device-profiles-title": "Êtes-vous certainde vouloir supprimer { count, plural, =1 {1 device profile} other {# device profiles} }?",
         "delete-device-profiles-text": "Attention, après confirmation les profils des dispositifs sélectionnés et toutes les données associées deviendront irrécupérables.",
         "set-default-device-profile-title": "Êtes-vous certain de vouloir faire du profil de dispositif '{{deviceProfileName}}' le profil par défaut?",
         "set-default-device-profile-text": "Après confirmation, le profil de dispositif sera le profil par défaut et sera utilisé pour les nouveaux dispositifs n'ayant pas de profil.",
@@ -1159,7 +1159,7 @@
         "delete": "Supprimer la bordure",
         "delete-edge-title": "Êtes-vous sûr de vouloir supprimer la bordure '{{edgeName}}'?",
         "delete-edge-text": "Faites attention, après la confirmation, la bordure et toutes les données associées deviendront irrécupérables",
-        "delete-edges-title": "Êtes-vous sûr de vouloir supprimer {count, plural, 1 {1 bordure} other {# bordure} }?",
+        "delete-edges-title": "Êtes-vous sûr de vouloir supprimer {count, plural, =1 {1 bordure} other {# bordure} }?",
         "delete-edges-text": "Faites attention, après la confirmation, tous les bordures sélectionnés seront supprimés et toutes les données associées deviendront irrécupérables.",
         "name": "Nom",
         "name-starts-with": "Le nom du bord commence par",
@@ -1186,7 +1186,7 @@
         "unassign-from-customer": "Retirer du client",
         "unassign-edge-title": "Êtes-vous sûr de vouloir annuler l'affection du dispositif {{edgeName}}",
         "unassign-edge-text": "Après la confirmation, le dispositif ne sera pas attribué et ne sera pas accessible au client",
-        "unassign-edges-title": "Voulez-vous vraiment annuler l'attribution de {count, plural, 1 {1 bordure} other {# bordures} }?",
+        "unassign-edges-title": "Voulez-vous vraiment annuler l'attribution de {count, plural, =1 {1 bordure} other {# bordures} }?",
         "unassign-edges-text": "Après la confirmation, tous les bordures sélectionnés ne seront plus attribués et ne seront pas accessibles par le client.",
         "make-public": "Make edge public",
         "make-public-edge-title": "Are you sure you want to make the edge '{{edgeName}}' public?",
@@ -1219,7 +1219,7 @@
         "rulechain-templates": "Modèles de chaîne de règles",
         "rulechains": "Chaînes de règles de la bordure",
         "search": "Rechercher les bords",
-        "selected-edges": "{count, plural, 1 {1 bordure} other {# bords} } sélectionné",
+        "selected-edges": "{count, plural, =1 {1 bordure} other {# bords} } sélectionné",
         "any-edge": "Tout bord",
         "no-edge-types-matching": "Aucun type d'arête correspondant à \"{{entitySubtype}}\" n'a été trouvé.",
         "edge-type-list-empty": "Aucun type d'arête sélectionné.",
@@ -1304,17 +1304,17 @@
         "entity-view-name-starts-with": "Les vues d'entité dont le nom commence par '{{prefix}}'",
         "key": "Clé",
         "key-name": "Nom de la clé",
-        "list-of-alarms": "{count, plural, 1 {Une alarme} other {Liste de # alarmes} }",
-        "list-of-assets": "{count, plural, 1 {Un Asset} other {Liste de # Assets} }",
-        "list-of-customers": "{count, plural, 1 {Un client} other {Liste de # clients} }",
-        "list-of-dashboards": "{count, plural, 1 {Un tableau de bord} other {Liste de # tableaux de bord} }",
-        "list-of-devices": "{count, plural, 1 {Un dispositif} other {Liste de # dispositifs} }",
-        "list-of-plugins": "{count, plural, 1 {Un plugin} other {Liste de # plugins} }",
-        "list-of-rulechains": "{count, plural, 1 {Une chaîne de règles} other {Liste de # chaînes de règles} }",
-        "list-of-rulenodes": "{count, plural, 1 {Un noeud de règles} other {Liste de # noeuds de règles} }",
-        "list-of-rules": "{count, plural, 1 {Une règle} other {Liste de # règles} }",
-        "list-of-tenants": "{count, plural, 1 {Un tenant} other {Liste de # tenants} }",
-        "list-of-users": "{count, plural, 1 {Un utilisateur} other {Liste de # utilisateurs} }",
+        "list-of-alarms": "{count, plural, =1 {Une alarme} other {Liste de # alarmes} }",
+        "list-of-assets": "{count, plural, =1 {Un Asset} other {Liste de # Assets} }",
+        "list-of-customers": "{count, plural, =1 {Un client} other {Liste de # clients} }",
+        "list-of-dashboards": "{count, plural, =1 {Un tableau de bord} other {Liste de # tableaux de bord} }",
+        "list-of-devices": "{count, plural, =1 {Un dispositif} other {Liste de # dispositifs} }",
+        "list-of-plugins": "{count, plural, =1 {Un plugin} other {Liste de # plugins} }",
+        "list-of-rulechains": "{count, plural, =1 {Une chaîne de règles} other {Liste de # chaînes de règles} }",
+        "list-of-rulenodes": "{count, plural, =1 {Un noeud de règles} other {Liste de # noeuds de règles} }",
+        "list-of-rules": "{count, plural, =1 {Une règle} other {Liste de # règles} }",
+        "list-of-tenants": "{count, plural, =1 {Un tenant} other {Liste de # tenants} }",
+        "list-of-users": "{count, plural, =1 {Un utilisateur} other {Liste de # utilisateurs} }",
         "missing-entity-filter-error": "Le filtre est manquant pour l'alias '{{alias}}'.",
         "name-starts-with": "Nom commence par",
         "no-alias-matching": "'{{alias}}' introuvable.",
@@ -1332,11 +1332,11 @@
         "rulenode-name-starts-with": "Les noeuds de régles dont le nom commence par '{{prefix}}'",
         "type-edge": "Bordure",
         "type-edges": "Bordures",
-        "list-of-edges": "{ count, plural, 1 {Une bordure} other {Liste de # bordures} }",
+        "list-of-edges": "{ count, plural, =1 {Une bordure} other {Liste de # bordures} }",
         "edge-name-starts-with": "Bordures dont les noms commencent par '{{prefix}}'",
         "search": "Recherche d'entités",
         "select-entities": "Sélectionner des entités",
-        "selected-entities": "{count, plural, 1 {1 entité} other {# entités} } sélectionnées",
+        "selected-entities": "{count, plural, =1 {1 entité} other {# entités} } sélectionnées",
         "tenant-name-starts-with": "Les Tenant dont le nom commence par '{{prefix}}'",
         "type": "Type",
         "type-alarm": "Alarme",
@@ -1397,7 +1397,7 @@
         "assign-entity-view-to-customer": "Attribuer une (des) vue (s) d'entité à un client",
         "assign-entity-view-to-customer-text": "Veuillez sélectionner les vues d'entité à affecter au client",
         "assign-entity-views": "Attribuer des vues d'entité",
-        "assign-entity-views-text": "Attribuer { count, plural, 1 {1 entityView} other {# entityViews} } au client",
+        "assign-entity-views-text": "Attribuer { count, plural, =1 {1 entityView} other {# entityViews} } au client",
         "assign-new-entity-view": "Attribuer une nouvelle vue d'entité",
         "assign-to-customer": "Attribuer au client",
         "assign-to-customer-text": "Veuillez sélectionner le client auquel attribuer la ou les vues d'entité.",
@@ -1415,9 +1415,9 @@
         "delete-entity-view-text": "Attention, après la confirmation, la vue de l'entité et toutes les données associées deviendront irrécupérables.",
         "delete-entity-view-title": "Êtes-vous sûr de vouloir supprimer la vue de l'entité '{{entityViewName}}'?",
         "delete-entity-views": "Supprimer les vues d'entité",
-        "delete-entity-views-action-title": "Supprimer { count, plural, 1 {1 entityView} other {# entityViews} }",
+        "delete-entity-views-action-title": "Supprimer { count, plural, =1 {1 entityView} other {# entityViews} }",
         "delete-entity-views-text": "Attention, après la confirmation, toutes les vues d'entité sélectionnées seront supprimées et toutes les données associées deviendront irrécupérables.",
-        "delete-entity-views-title": "Êtes-vous sûr de vouloir voir l'entité { count, plural, 1 {1 entityView} other {# entityViews} }?",
+        "delete-entity-views-title": "Êtes-vous sûr de vouloir voir l'entité { count, plural, =1 {1 entityView} other {# entityViews} }?",
         "description": "Description",
         "details": "Détails",
         "duplicate-alias-error": "Alias '{{alias}}' existe déjà. <br> Les alias de vue d'entité doivent être uniques dans le tableau de bord.",
@@ -1448,9 +1448,9 @@
         "assign-entity-view-to-edge-text": "Veuillez sélectionner la bordure auquel attribuer la ou les vues d'entité.",
         "unassign-entity-view-from-edge-title": "Voulez-vous vraiment annuler l'attribution de la vue d'entité '{{entityViewName}}'?",
         "unassign-entity-view-from-edge-text": "Après la confirmation, la vue de l'entité sera non attribuée et ne sera pas accessible par la bordure.",
-        "unassign-entity-views-from-edge-action-title": "Annuler l'attribution { count, plural, 1 {1 entityView} other {# entityViews} } de la bordure",
+        "unassign-entity-views-from-edge-action-title": "Annuler l'attribution { count, plural, =1 {1 entityView} other {# entityViews} } de la bordure",
         "unassign-entity-view-from-edge": "Annuler l'attribution des vues d'entité",
-        "unassign-entity-views-from-edge-title": "Êtes-vous sûr de vouloir annuler l'attribution { count, plural, 1 {1 entityView} other {# entityViews} }?",
+        "unassign-entity-views-from-edge-title": "Êtes-vous sûr de vouloir annuler l'attribution { count, plural, =1 {1 entityView} other {# entityViews} }?",
         "unassign-entity-views-from-edge-text": "Après la confirmation, toutes les vues des entités sélectionnées seront non attribuées et ne seront pas accessibles par la bordure.",
         "management": "Gestion de vue d'entité",
         "name": "Nom",
@@ -1483,15 +1483,15 @@
         "unassign-entity-view-text": "Après la confirmation, la vue de l'entité sera non attribuée et ne sera pas accessible par le client.",
         "unassign-entity-view-title": "Voulez-vous vraiment annuler l'attribution de la vue d'entité '{{entityViewName}}'?",
         "unassign-entity-views": "Annuler l'attribution des vues d'entité",
-        "unassign-entity-views-action-title": "Annuler l'attribution { count, plural, 1 {1 entityView} other {# entityViews} } du client",
+        "unassign-entity-views-action-title": "Annuler l'attribution { count, plural, =1 {1 entityView} other {# entityViews} } du client",
         "unassign-entity-views-text": "Après la confirmation, toutes les vues des entités sélectionnées seront non attribuées et ne seront pas accessibles par le client.",
-        "unassign-entity-views-title": "Êtes-vous sûr de vouloir annuler l'attribution { count, plural, 1 {1 entityView} other {# entityViews} }?",
+        "unassign-entity-views-title": "Êtes-vous sûr de vouloir annuler l'attribution { count, plural, =1 {1 entityView} other {# entityViews} }?",
         "unassign-from-customer": "Annuler l'attribution au client",
         "use-entity-view-name-filter": "Use filter",
         "view-entity-views": "Voir les vues d'entité",
         "idCopiedMessage": "L'ID de la vue d'entité a été copiée dans le presse-papier",
         "search": "Rechercher des vues d'entité",
-        "selected-entity-views": "{ count, plural, 1 {1 entity view} other {# entity views} } sélectionnés"
+        "selected-entity-views": "{ count, plural, =1 {1 entity view} other {# entity views} } sélectionnés"
     },
     "error": {
         "unable-to-connect": "Impossible de se connecter au serveur! Veuillez vérifier votre connexion Internet.",
@@ -1571,7 +1571,7 @@
         "delete-extension-text": "Attention, après la confirmation, l'extension et toutes les données associées deviendront irrécupérables.",
         "delete-extension-title": "Êtes-vous sûr de vouloir supprimer l'extension '{{extensionId}}'?",
         "delete-extensions-text": "Attention, après la confirmation, toutes les extensions sélectionnées seront supprimées.",
-        "delete-extensions-title": "Êtes-vous sûr de vouloir supprimer {count, plural, 1 {1 extension} other {# extensions} }?",
+        "delete-extensions-title": "Êtes-vous sûr de vouloir supprimer {count, plural, =1 {1 extension} other {# extensions} }?",
         "device-name-expression": "expression du nom du dispositif",
         "device-name-filter": "Filtre de nom de dispositif",
         "device-type-expression": "expression de type de dispositif",
@@ -1657,7 +1657,7 @@
         "response-timeout": "Délai de réponse en millisecondes",
         "response-topic-expression": "Expression du topic de la réponse",
         "retry-interval": "Intervalle de nouvelle tentative en millisecondes",
-        "selected-extensions": "{count, plural, 1 {1 extension} other {# extensions} } sélectionné",
+        "selected-extensions": "{count, plural, =1 {1 extension} other {# extensions} } sélectionné",
         "server-side-rpc": "RPC côté serveur",
         "ssl": "Ssl",
         "sync": {
@@ -1699,9 +1699,9 @@
         "delete-item-text": "Faites attention, après la confirmation, cet élément et toutes les données associées deviendront irrécupérables.",
         "delete-item-title": "Êtes-vous sûr de vouloir supprimer cet élément?",
         "delete-items": "Supprimer les éléments",
-        "delete-items-action-title": "Supprimer {count, plural, 1 {1 élément} other {# éléments} }",
+        "delete-items-action-title": "Supprimer {count, plural, =1 {1 élément} other {# éléments} }",
         "delete-items-text": "Attention, après la confirmation, tous les éléments sélectionnés seront supprimés et toutes les données associées deviendront irrécupérables.",
-        "delete-items-title": "Êtes-vous sûr de vouloir supprimer {count, plural, 1 {1 élément} other {# éléments} }?",
+        "delete-items-title": "Êtes-vous sûr de vouloir supprimer {count, plural, =1 {1 élément} other {# éléments} }?",
         "item-details": "Détails de l'élément",
         "no-items-text": "Aucun élément trouvé",
         "scroll-to-top": "Défiler vers le haut"
@@ -1807,11 +1807,11 @@
         "delete-from-relation-text": "Attention, après la confirmation, l'entité actuelle ne sera pas liée à l'entité '{{entityName}}'.",
         "delete-from-relation-title": "Êtes-vous sûr de vouloir supprimer la relation de l'entité '{{entityName}}'?",
         "delete-from-relations-text": "Attention, après la confirmation, toutes les relations sélectionnées seront supprimées et l'entité actuelle ne sera pas liée aux entités correspondantes.",
-        "delete-from-relations-title": "Êtes-vous sûr de vouloir supprimer {count, plural, 1 {1 relation} other {# relations} }?",
+        "delete-from-relations-title": "Êtes-vous sûr de vouloir supprimer {count, plural, =1 {1 relation} other {# relations} }?",
         "delete-to-relation-text": "Attention, après la confirmation, l'entité '{{entityName}} ne sera plus liée à l'entité actuelle.",
         "delete-to-relation-title": "Êtes-vous sûr de vouloir supprimer la relation avec l'entité '{{entityName}}'?",
         "delete-to-relations-text": "Attention, après la confirmation, toutes les relations sélectionnées seront supprimées et les entités correspondantes ne seront pas liées à l'entité en cours.",
-        "delete-to-relations-title": "Êtes-vous sûr de vouloir supprimer {count, plural, 1 {1 relation} other {# relations} }?",
+        "delete-to-relations-title": "Êtes-vous sûr de vouloir supprimer {count, plural, =1 {1 relation} other {# relations} }?",
         "direction": "Sens",
         "direction-type": {
             "FROM": "de",
@@ -1832,7 +1832,7 @@
             "FROM": "De",
             "TO": "Vers"
         },
-        "selected-relations": "{count, plural, 1 {1 relation} other {# relations} } sélectionné",
+        "selected-relations": "{count, plural, =1 {1 relation} other {# relations} } sélectionné",
         "to-entity": "Vers l'entité",
         "to-entity-name": "vers le nom de l'entité",
         "to-entity-type": "Vers le type d'entité",
@@ -1848,9 +1848,9 @@
         "delete": "Supprimer la chaîne de règles",
         "delete-rulechain-text": "Attention, après la confirmation, la chaîne de règles et toutes les données associées deviendront irrécupérables.",
         "delete-rulechain-title": "Voulez-vous vraiment supprimer la chaîne de règles '{{ruleChainName}}'?",
-        "delete-rulechains-action-title": "Supprimer {count, plural, 1 {1 chaîne de règles} other {# chaînes de règles} }",
+        "delete-rulechains-action-title": "Supprimer {count, plural, =1 {1 chaîne de règles} other {# chaînes de règles} }",
         "delete-rulechains-text": "Attention, après la confirmation, toutes les chaînes de règles sélectionnées seront supprimées et toutes les données associées deviendront irrécupérables.",
-        "delete-rulechains-title": "Êtes-vous sûr de vouloir supprimer {count, plural, 1 {1 chaîne de règles} other {#  chaînes de règles} }?",
+        "delete-rulechains-title": "Êtes-vous sûr de vouloir supprimer {count, plural, =1 {1 chaîne de règles} other {#  chaînes de règles} }?",
         "description": "Description",
         "details": "Détails",
         "events": "Evénements",
@@ -1882,7 +1882,7 @@
         "unassign-rulechains": "Retirer chaînes de règles",
         "unassign-rulechain-title": "AÊtes-vous sûr de vouloir retirer l'attribution de chaînes de règles '{{ruleChainName}}'?",
         "unassign-rulechain-from-edge-text": "Après la confirmation, l'actif sera non attribué et ne sera pas accessible a la bordure.",
-        "unassign-rulechains-from-edge-action-title": "Retirer {count, plural, 1 {1 chaîne de règles} other {# chaînes de règles} } de la bordure",
+        "unassign-rulechains-from-edge-action-title": "Retirer {count, plural, =1 {1 chaîne de règles} other {# chaînes de règles} } de la bordure",
         "unassign-rulechains-from-edge-text": "Après la confirmation, tous les chaînes de règles sélectionnés ne seront pas attribués et ne seront pas accessibles a la bordure.",
         "assign-rulechain-to-edge-title": "Attribuer les chaînes de règles a la bordure",
         "assign-rulechain-to-edge-text": "Veuillez sélectionner la bordure pour attribuer le ou les chaînes de règles",
@@ -1898,11 +1898,11 @@
         "unset-auto-assign-to-edge-text": "Après la confirmation, la chaîne de règles d'arêtes ne sera plus automatiquement affectée aux arêtes lors de la création.",
         "edge-template-root": "Racine du modèle",
         "search": "Rechercher des chaînes de règles",
-        "selected-rulechains": "{count, plural, 1 {1 rule chain} other {# rule chains} } sélectionné",
+        "selected-rulechains": "{count, plural, =1 {1 rule chain} other {# rule chains} } sélectionné",
         "open-rulechain": "Ouvrir la Chaîne de règles",
         "assign-to-edge": "Attribuer à Bordure",
         "edge-rulechain": "Chaîne de règles Bordure",
-        "unassign-rulechains-from-edge-title": "Voulez-vous vraiment annuler l'attribution de {count, plural, 1 {1 rulechain} other {# rulechains} }?"
+        "unassign-rulechains-from-edge-title": "Voulez-vous vraiment annuler l'attribution de {count, plural, =1 {1 rulechain} other {# rulechains} }?"
     },
     "rulenode": {
         "add": "Ajouter un noeud de règle",
@@ -1981,9 +1981,9 @@
         "delete": "Supprimer le Tenant",
         "delete-tenant-text": "Attention, après la confirmation, le Tenant et toutes les données associées deviendront irrécupérables.",
         "delete-tenant-title": "Êtes-vous sûr de vouloir supprimer le tenant '{{tenantTitle}}'?",
-        "delete-tenants-action-title": "Supprimer {count, plural, 1 {1 tenant} other {# tenants} }",
+        "delete-tenants-action-title": "Supprimer {count, plural, =1 {1 tenant} other {# tenants} }",
         "delete-tenants-text": "Attention, après la confirmation, tous les Tenants sélectionnés seront supprimés et toutes les données associées deviendront irrécupérables.",
-        "delete-tenants-title": "Êtes-vous sûr de vouloir supprimer {count, plural, 1 {1 tenant} other {# tenants} }?",
+        "delete-tenants-title": "Êtes-vous sûr de vouloir supprimer {count, plural, =1 {1 tenant} other {# tenants} }?",
         "description": "Description",
         "details": "Détails",
         "events": "Événements",
@@ -2000,31 +2000,31 @@
         "title": "Titre",
         "title-required": "Le titre est requis.",
         "search": "Rechercher les Tenants",
-        "selected-tenants": "{ count, plural, 1 {1 tenant} other {# tenants} } sélectionnés"
+        "selected-tenants": "{ count, plural, =1 {1 tenant} other {# tenants} } sélectionnés"
     },
     "timeinterval": {
         "advanced": "Avancé",
         "days": "Jours",
-        "days-interval": "{days, plural, 1 {1 jour} other {# jours} }",
+        "days-interval": "{days, plural, =1 {1 jour} other {# jours} }",
         "hours": "Heures",
-        "hours-interval": "{hours, plural, 1 {1 heure} other {# heures} }",
+        "hours-interval": "{hours, plural, =1 {1 heure} other {# heures} }",
         "minutes": "Minutes",
-        "minutes-interval": "{minutes, plural, 1 {1 minute} other {# minutes} }",
+        "minutes-interval": "{minutes, plural, =1 {1 minute} other {# minutes} }",
         "seconds": "Secondes",
-        "seconds-interval": "{seconds, plural, 1 {1 seconde} other {# secondes} }"
+        "seconds-interval": "{seconds, plural, =1 {1 seconde} other {# secondes} }"
     },
     "timewindow": {
         "date-range": "Plage de dates",
-        "days": "{days, plural, 1 {jour} other {# jours} }",
+        "days": "{days, plural, =1 {jour} other {# jours} }",
         "edit": "Modifier timewindow",
         "history": "Historique",
-        "hours": "{hours, plural, 0 {heure} 1 {1 heure} other {# heures} }",
+        "hours": "{hours, plural, =0 {heure} =1 {1 heure} other {# heures} }",
         "last": "Dernier",
         "last-prefix": "dernier",
-        "minutes": "{minutes, plural, 0 {minute} 1 {1 minute} other {# minutes} }",
+        "minutes": "{minutes, plural, =0 {minute} =1 {1 minute} other {# minutes} }",
         "period": "de {{startTime}} à {{endTime}}",
         "realtime": "Temps réel",
-        "seconds": "{seconds, plural, 0 {second} 1 {1 second} other {# seconds} }",
+        "seconds": "{seconds, plural, =0 {second} =1 {1 second} other {# seconds} }",
         "time-period": "Période",
         "hide": "Masquer"
     },
@@ -2045,9 +2045,9 @@
         "delete": "Supprimer l'utilisateur",
         "delete-user-text": "Attention, après la confirmation, l'utilisateur et toutes les données associées deviendront irrécupérables.",
         "delete-user-title": "Êtes-vous sûr de vouloir supprimer l'utilisateur '{{userEmail}}'?",
-        "delete-users-action-title": "Supprimer {count, plural, 1 {1 utilisateur} other {# utilisateurs} }",
+        "delete-users-action-title": "Supprimer {count, plural, =1 {1 utilisateur} other {# utilisateurs} }",
         "delete-users-text": "Attention, après la confirmation, tous les utilisateurs sélectionnés seront supprimés et toutes les données associées deviendront irrécupérables.",
-        "delete-users-title": "Êtes-vous sûr de vouloir supprimer {count, plural, 1 {1 utilisateur} other {# utilisateurs} }?",
+        "delete-users-title": "Êtes-vous sûr de vouloir supprimer {count, plural, =1 {1 utilisateur} other {# utilisateurs} }?",
         "description": "Description",
         "details": "Détails",
         "disable-account": "Désactiver le compte d'utilisateur",
@@ -2075,7 +2075,7 @@
         "user-required": "L'utilisateur est requis",
         "users": "Utilisateurs",
         "search": "Rechercher des utilisateurs",
-        "selected-users": "{ count, plural, 1 {1 user} other {# users} } sélectionnés"
+        "selected-users": "{ count, plural, =1 {1 user} other {# users} } sélectionnés"
     },
     "value": {
         "boolean": "booléen",
@@ -2190,7 +2190,7 @@
         "general-settings": "Paramètres généraux",
         "height": "Hauteur",
         "margin": "Marge",
-        "maximum-datasources": "Maximum {count, plural, 1 {1 datasource est autorisé.} other {# datasources sont autorisés} }",
+        "maximum-datasources": "Maximum {count, plural, =1 {1 datasource est autorisé.} other {# datasources sont autorisés} }",
         "mobile-mode-settings": "Paramètres du mode mobile",
         "order": "Ordre",
         "padding": "Padding",
@@ -2310,9 +2310,9 @@
         "delete": "Supprimer le groupe de widgets",
         "delete-widgets-bundle-text": "Attention, après la confirmation, le groupe de widgets et toutes les données associées deviendront irrécupérables.",
         "delete-widgets-bundle-title": "Êtes-vous sûr de vouloir supprimer le groupe de widgets '{{widgetsBundleTitle}}'?",
-        "delete-widgets-bundles-action-title": "Supprimer {count, plural, 1 {1 groupe de widgets} other {# groupes de widgets} }",
+        "delete-widgets-bundles-action-title": "Supprimer {count, plural, =1 {1 groupe de widgets} other {# groupes de widgets} }",
         "delete-widgets-bundles-text": "Attention, après la confirmation, tous les groupes de widgets sélectionnés seront supprimés et toutes les données associées deviendront irrécupérables.",
-        "delete-widgets-bundles-title": "Voulez-vous vraiment supprimer {count, plural, 1 {1 groupe de widgets} other {# groupes de widgets} }?",
+        "delete-widgets-bundles-title": "Voulez-vous vraiment supprimer {count, plural, =1 {1 groupe de widgets} other {# groupes de widgets} }?",
         "details": "Détails",
         "empty": "Le groupe de widgets est vide",
         "export": "Exporter le groupe de widgets",
diff --git a/ui-ngx/src/assets/locale/locale.constant-it_IT.json b/ui-ngx/src/assets/locale/locale.constant-it_IT.json
index 52485e3722..159bb96998 100644
--- a/ui-ngx/src/assets/locale/locale.constant-it_IT.json
+++ b/ui-ngx/src/assets/locale/locale.constant-it_IT.json
@@ -149,17 +149,17 @@
         "acknowledge": "Conferma",
         "clear": "Cancella",
         "search": "Cerca allarmi",
-        "selected-alarms": "{ count, plural, 1 {1 allarme selezionato} other {# allarmi selezionati} }",
+        "selected-alarms": "{ count, plural, =1 {1 allarme selezionato} other {# allarmi selezionati} }",
         "no-data": "Nessun dato da visualizzare",
         "polling-interval": "Intervallo di polling (sec) Allarmi",
         "polling-interval-required": "Intervallo di polling Allarmi richiesto.",
         "min-polling-interval-message": "L'intervallo di polling deve essere di almeno 1 sec.",
-        "aknowledge-alarms-title": "Conferma { count, plural, 1 {1 allarme} other {# allarmi} }",
-        "aknowledge-alarms-text": "Sei sicuro di voler confermare { count, plural, 1 {1 allarme} other {# allarmi} }?",
+        "aknowledge-alarms-title": "Conferma { count, plural, =1 {1 allarme} other {# allarmi} }",
+        "aknowledge-alarms-text": "Sei sicuro di voler confermare { count, plural, =1 {1 allarme} other {# allarmi} }?",
         "aknowledge-alarm-title": "Conferma allarme",
         "aknowledge-alarm-text": "Sei sicuro di voler confermare l'allarme?",
-        "clear-alarms-title": "Elimina { count, plural, 1 {1 allarme} other {# allarmi} }",
-        "clear-alarms-text": "Sei sicuro di voler eliminare { count, plural, 1 {1 allarme} other {# allarmi} }?",
+        "clear-alarms-title": "Elimina { count, plural, =1 {1 allarme} other {# allarmi} }",
+        "clear-alarms-text": "Sei sicuro di voler eliminare { count, plural, =1 {1 allarme} other {# allarmi} }?",
         "clear-alarm-title": "Elimina allarme",
         "clear-alarm-text": "Sei sicuro di voler eliminare l'allarme?",
         "alarm-status-filter": "Filtro stato allarme"
@@ -245,15 +245,15 @@
         "add-asset-text": "Aggiungi un nuovo asset",
         "asset-details": "Dettagli Asset",
         "assign-assets": "Assegna asset",
-        "assign-assets-text": "Assegna { count, plural, 1 {1 asset} other {# asset} } al cliente",
+        "assign-assets-text": "Assegna { count, plural, =1 {1 asset} other {# asset} } al cliente",
         "delete-assets": "Cancella asset",
         "unassign-assets": "Annulla assegnazione asset",
-        "unassign-assets-action-title": "Annulla assegnazione { count, plural, 1 {1 asset} other {# asset} } al cliente",
+        "unassign-assets-action-title": "Annulla assegnazione { count, plural, =1 {1 asset} other {# asset} } al cliente",
         "assign-new-asset": "Assegna un nuovo asset",
         "delete-asset-title": "Sei sicuro di voler cancellare l'asset '{{assetName}}'?",
         "delete-asset-text": "Attenzione, dopo la conferma l'asset e tutti i relativi dati non saranno più recuperabili.",
-        "delete-assets-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 asset} other {# asset} }?",
-        "delete-assets-action-title": "Elimina { count, plural, 1 {1 asset} other {# asset} }",
+        "delete-assets-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 asset} other {# asset} }?",
+        "delete-assets-action-title": "Elimina { count, plural, =1 {1 asset} other {# asset} }",
         "delete-assets-text": "Attenzione, dopo la modifica tutti gli asset selezionati saranno rimossi e tutti i relativi dati non saranno più recuperabili.",
         "make-public-asset-title": "Sei sicuro di voler rendere pubblico l'asset '{{assetName}}'?",
         "make-public-asset-text": "Dopo la conferma l'asset e tutti i suoi dati saranno resi pubblici e accessibili dagli altri.",
@@ -262,7 +262,7 @@
         "unassign-asset-title": "Sei sicuro di voler annullare l'assegnazione dell'asset '{{assetName}}'?",
         "unassign-asset-text": "Dopo la conferma l'assegnazione dell'asset sarà annullata e l'asset non sarà più accessibile dal cliente.",
         "unassign-asset": "Annulla assegnazione asset",
-        "unassign-assets-title": "Sei sicuro di voler annullare l'assegnazione di { count, plural, 1 {1 asset} other {# asset} }?",
+        "unassign-assets-title": "Sei sicuro di voler annullare l'assegnazione di { count, plural, =1 {1 asset} other {# asset} }?",
         "unassign-assets-text": "Dopo la conferma sarà annullata l'assegnazione di tutti gli asset selezionati e questi non saranno più accessibili dal cliente.",
         "copyId": "Copia Id asset",
         "idCopiedMessage": "Id Asset copiato negli Appunti",
@@ -286,7 +286,7 @@
         "key-required": "Attributo chiave richiesto.",
         "value": "Valore",
         "value-required": "Attributo valore richiesto.",
-        "delete-attributes-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 attributo} other {# attributi} }?",
+        "delete-attributes-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 attributo} other {# attributi} }?",
         "delete-attributes-text": "Attenzione, dopo la conferma tutti gli attributi selezionati saranno rimossi.",
         "delete-attributes": "Elimina attributi",
         "enter-attribute-value": "Inserisci il valore dell'attributo",
@@ -296,8 +296,8 @@
         "prev-widget": "Widget precedente",
         "add-to-dashboard": "Aggiungi alla dashboard",
         "add-widget-to-dashboard": "Aggiungi widget alla dashboard",
-        "selected-attributes": "{ count, plural, 1 {1 attributo selezionato} other {# attributi selezionati} }",
-        "selected-telemetry": "{ count, plural, 1 {1 unità di telemetria selezionata} other {# unità di telemetria selezionate} }"
+        "selected-attributes": "{ count, plural, =1 {1 attributo selezionato} other {# attributi selezionati} }",
+        "selected-telemetry": "{ count, plural, =1 {1 unità di telemetria selezionata} other {# unità di telemetria selezionate} }"
     },
     "audit-log": {
         "audit": "Audit",
@@ -396,8 +396,8 @@
         "customer-details": "Dettagli cliente",
         "delete-customer-title": "Sei sicuro di voler eliminare il cliente '{{customerTitle}}'?",
         "delete-customer-text": "Attenzione, dopo la conferma il cliente e tutti i suoi dati non saranno più recuperabili.",
-        "delete-customers-title": "Sei sicuro di voler cancellare { count, plural, 1 {1 cliente} other {# clienti} }?",
-        "delete-customers-action-title": "Elimina { count, plural, 1 {1 cliente} other {# clienti} }",
+        "delete-customers-title": "Sei sicuro di voler cancellare { count, plural, =1 {1 cliente} other {# clienti} }?",
+        "delete-customers-action-title": "Elimina { count, plural, =1 {1 cliente} other {# clienti} }",
         "delete-customers-text": "Attenzione, dopo la conferma tutti i clienti selezionati saranno rimossi e i loro dati non saranno più recuperabili.",
         "manage-users": "Gestisci utenti",
         "manage-assets": "Gestisci asset",
@@ -456,20 +456,20 @@
         "add-dashboard-text": "Aggiungi nuova dashboard",
         "assign-dashboards": "Assegna dashboard",
         "assign-new-dashboard": "Assegna nuova dashboard",
-        "assign-dashboards-text": "Assegna { count, plural, 1 {1 dashboard} other {# dashboard} } ai clienti",
-        "unassign-dashboards-action-text": "Annulla assegnazione { count, plural, 1 {1 dashboard} other {# dashboard} } ai clienti",
+        "assign-dashboards-text": "Assegna { count, plural, =1 {1 dashboard} other {# dashboard} } ai clienti",
+        "unassign-dashboards-action-text": "Annulla assegnazione { count, plural, =1 {1 dashboard} other {# dashboard} } ai clienti",
         "delete-dashboards": "Elimina dashboard",
         "unassign-dashboards": "Annulla assegnazione dashboard",
-        "unassign-dashboards-action-title": "Annulla assegnazione { count, plural, 1 {1 dashboard} other {# dashboard} } al cliente",
+        "unassign-dashboards-action-title": "Annulla assegnazione { count, plural, =1 {1 dashboard} other {# dashboard} } al cliente",
         "delete-dashboard-title": "Sei sicuro di voler cancellare la dashboard '{{dashboardTitle}}'?",
         "delete-dashboard-text": "Attenzione, dopo la conferma la dashboard e tutti i suoi dati non saranno più recuperabili.",
-        "delete-dashboards-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 dashboard} other {# dashboard} }?",
-        "delete-dashboards-action-title": "Cancella { count, plural, 1 {1 dashboard} other {# dashboard} }",
+        "delete-dashboards-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 dashboard} other {# dashboard} }?",
+        "delete-dashboards-action-title": "Cancella { count, plural, =1 {1 dashboard} other {# dashboard} }",
         "delete-dashboards-text": "Attenzione, dopo la conferma tutte le dashboard selezionate saranno eliminate e tutti i loro dati non saranno più recuperabili.",
         "unassign-dashboard-title": "Sei sicuro di voler annullare l'assegnazione della dashboard '{{dashboardTitle}}'?",
         "unassign-dashboard-text": "Dopo la conferma sarà annullata l'assegnazione della dashboard e questa non sarà più accessibile dal cliente.",
         "unassign-dashboard": "Annulla assegnazione dashboard",
-        "unassign-dashboards-title": "Sei sicuro di voler annullare l'assegnazione di  { count, plural, 1 {1 dashboard} other {# dashboard} }?",
+        "unassign-dashboards-title": "Sei sicuro di voler annullare l'assegnazione di  { count, plural, =1 {1 dashboard} other {# dashboard} }?",
         "unassign-dashboards-text": "Dopo la conferma sarà annullata l'assegnazione di tutte le dashboard selezionate e queste non saranno più accessibili dal cliente.",
         "public-dashboard-title": "La Dashboard è ora pubblica",
         "public-dashboard-text": "La dashboard <b>{{dashboardTitle}}</b> è ora pubblica e accessibile al <a href='{{publicLink}}' target='_blank'>link</a>:",
@@ -546,7 +546,7 @@
         "manage-states": "Gestisci stati dashboard",
         "states": "Stati dashboard",
         "search-states": "Ricerca stati dashboard",
-        "selected-states": "{ count, plural, 1 {1 stato dashboard selezionato} other {# stati dashboard selezionati} }",
+        "selected-states": "{ count, plural, =1 {1 stato dashboard selezionato} other {# stati dashboard selezionati} }",
         "edit-state": "Modifica stato dashboard",
         "delete-state": "Elimina stato dashboard",
         "add-state": "Aggiungi stato dashboard",
@@ -579,11 +579,11 @@
         "alarm": "Campi allarme",
         "timeseries-required": "Le serie temporali dell'entità sono richieste.",
         "timeseries-or-attributes-required": "Le serie temporali o gli attributi dell'entità sono richiesti.",
-        "maximum-timeseries-or-attributes": "Massimo { count, plural, 1 {1 serie temporale/attributo consentito.} other {# serie temporali/attributi consentiti.} }",
+        "maximum-timeseries-or-attributes": "Massimo { count, plural, =1 {1 serie temporale/attributo consentito.} other {# serie temporali/attributi consentiti.} }",
         "alarm-fields-required": "Campi allarme obbligatori.",
         "function-types": "Tipi funzione",
         "function-types-required": "Tipi funzione obbligatorio.",
-        "maximum-function-types": "Massimo { count, plural, 1 {1 tipo di funzione consentito.} other {# tipi di funzione consentiti} }",
+        "maximum-function-types": "Massimo { count, plural, =1 {1 tipo di funzione consentito.} other {# tipi di funzione consentiti} }",
         "time-description": "timestamp del valore corrente;",
         "value-description": "il valore corrente;",
         "prev-value-description": "risultato della precedente chiamata alla funzione;",
@@ -640,11 +640,11 @@
         "manage-credentials": "Gestisci credenziali",
         "delete": "Elimina dispositivo",
         "assign-devices": "Assegna dispositivi",
-        "assign-devices-text": "Assegna { count, plural, 1 {1 dispositivo} other {# dispositivi} } al cliente",
+        "assign-devices-text": "Assegna { count, plural, =1 {1 dispositivo} other {# dispositivi} } al cliente",
         "delete-devices": "Elimina dispositivi",
         "unassign-from-customer": "Annulla assegnazione al cliente",
         "unassign-devices": "Annulla assegnazione dispositivi",
-        "unassign-devices-action-title": "Annulla assegnazione { count, plural, 1 {1 dispositivo} other {# dispositivi} } al cliente",
+        "unassign-devices-action-title": "Annulla assegnazione { count, plural, =1 {1 dispositivo} other {# dispositivi} } al cliente",
         "assign-new-device": "Assegna nuovo dispositivo",
         "make-public-device-title": "Sei sicuro di voler rendere pubblico il dispositivo '{{deviceName}}'?",
         "make-public-device-text": "Dopo la conferma il dispositivo e tutti i suoi dati saranno resi pubblici e accessibili dagli altri.",
@@ -653,13 +653,13 @@
         "view-credentials": "Visualizza credenziali",
         "delete-device-title": "Sei sicuro di voler eliminare il dispositivo '{{deviceName}}'?",
         "delete-device-text": "Attenzione, dopo la conferma il dispositivo e tutti i suoi dati non saranno più recuperabili.",
-        "delete-devices-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 dispositivo} other {# dispositivi} }?",
-        "delete-devices-action-title": "Elimina { count, plural, 1 {1 dispositivo} other {# dispositivi} }",
+        "delete-devices-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 dispositivo} other {# dispositivi} }?",
+        "delete-devices-action-title": "Elimina { count, plural, =1 {1 dispositivo} other {# dispositivi} }",
         "delete-devices-text": "Attenzione, dopo la conferma tutti i dispositivi selezionati saranno eliminati e i relativi dati non saranno più recuperabili.",
         "unassign-device-title": "Sei sicuro di voler annullare l'assegnazione del dispositivo '{{deviceName}}'?",
         "unassign-device-text": "Dopo la conferma sarà annullata l'assegnazione del dispositivo e questo non sarà più accessibile dal cliente.",
         "unassign-device": "Annulla assegnazione dispositivo",
-        "unassign-devices-title": "Sei sicuro di voler annullare l'assegnazione di { count, plural, 1 {1 dispositivo} other {# dispositivi} }?",
+        "unassign-devices-title": "Sei sicuro di voler annullare l'assegnazione di { count, plural, =1 {1 dispositivo} other {# dispositivi} }?",
         "unassign-devices-text": "Dopo la conferma sarà annullata l'assegnazione di tutti i dispositivi selezionati e questi non saranno più accessibili dal cliente.",
         "device-credentials": "Credenziali Dispositivo",
         "credentials-type": "Tipo credenziali",
@@ -747,55 +747,55 @@
         "type-required": "Tipo entità obbligatorio.",
         "type-device": "Dispositivo",
         "type-devices": "Dispositivi",
-        "list-of-devices": "{ count, plural, 1 {Un dispositivo} other {Lista di # dispositivi} }",
+        "list-of-devices": "{ count, plural, =1 {Un dispositivo} other {Lista di # dispositivi} }",
         "device-name-starts-with": "Dispositivi i cui nomi iniziano per '{{prefix}}'",
         "type-asset": "Asset",
         "type-assets": "Asset",
-        "list-of-assets": "{ count, plural, 1 {Un asset} other {Lista di # asset} }",
+        "list-of-assets": "{ count, plural, =1 {Un asset} other {Lista di # asset} }",
         "asset-name-starts-with": "Asset i cui nomi iniziano per '{{prefix}}'",
         "type-entity-view": "Vista entità",
         "type-entity-views": "Viste entità",
-        "list-of-entity-views": "{ count, plural, 1 {Una vista entità} other {Lista di # viste entità} }",
+        "list-of-entity-views": "{ count, plural, =1 {Una vista entità} other {Lista di # viste entità} }",
         "entity-view-name-starts-with": "Viste entità i cui nomi iniziano per '{{prefix}}'",
         "type-rule": "Regola",
         "type-rules": "Regole",
-        "list-of-rules": "{ count, plural, 1 {Una regola} other {Lista di # regole} }",
+        "list-of-rules": "{ count, plural, =1 {Una regola} other {Lista di # regole} }",
         "rule-name-starts-with": "Regole i cui nomi iniziano per '{{prefix}}'",
         "type-plugin": "Plugin",
         "type-plugins": "Plugin",
-        "list-of-plugins": "{ count, plural, 1 {Un plugin} other {Lista di # plugin} }",
+        "list-of-plugins": "{ count, plural, =1 {Un plugin} other {Lista di # plugin} }",
         "plugin-name-starts-with": "Plugin i cui nomi iniziano per '{{prefix}}'",
         "type-tenant": "Tenant",
         "type-tenants": "Tenants",
-        "list-of-tenants": "{ count, plural, 1 {One tenant} other {Lista di # tenants} }",
+        "list-of-tenants": "{ count, plural, =1 {One tenant} other {Lista di # tenants} }",
         "tenant-name-starts-with": "Tenants whose names start with '{{prefix}}'",
         "type-customer": "Cliente",
         "type-customers": "Clienti",
-        "list-of-customers": "{ count, plural, 1 {Un cliente} other {Lista di # clienti} }",
+        "list-of-customers": "{ count, plural, =1 {Un cliente} other {Lista di # clienti} }",
         "customer-name-starts-with": "Clienti i cui nomi iniziano per '{{prefix}}'",
         "type-user": "Utente",
         "type-users": "Utenti",
-        "list-of-users": "{ count, plural, 1 {Un utente} other {Lista di # utenti} }",
+        "list-of-users": "{ count, plural, =1 {Un utente} other {Lista di # utenti} }",
         "user-name-starts-with": "Utenti i cui nomi iniziano per '{{prefix}}'",
         "type-dashboard": "Dashboard",
         "type-dashboards": "Dashboard",
-        "list-of-dashboards": "{ count, plural, 1 {Una dashboard} other {Lista di # dashboard} }",
+        "list-of-dashboards": "{ count, plural, =1 {Una dashboard} other {Lista di # dashboard} }",
         "dashboard-name-starts-with": "Dashboard i cui nomi iniziano per '{{prefix}}'",
         "type-alarm": "Allarme",
         "type-alarms": "Allarmi",
-        "list-of-alarms": "{ count, plural, 1 {Un allarme} other {Lista di # allarmi} }",
+        "list-of-alarms": "{ count, plural, =1 {Un allarme} other {Lista di # allarmi} }",
         "alarm-name-starts-with": "Allarmi i cui nomi iniziano per '{{prefix}}'",
         "type-rulechain": "Rule chain",
         "type-rulechains": "Rule chain",
-        "list-of-rulechains": "{ count, plural, 1 {Una rule chain} other {Lista di # catene di regole} }",
+        "list-of-rulechains": "{ count, plural, =1 {Una rule chain} other {Lista di # catene di regole} }",
         "rulechain-name-starts-with": "Catene di regole i cui nomi iniziano per '{{prefix}}'",
         "type-rulenode": "Nodo regola",
         "type-rulenodes": "Nodi regola",
-        "list-of-rulenodes": "{ count, plural, 1 {Un nodo regola} other {Lista di # nodi regola} }",
+        "list-of-rulenodes": "{ count, plural, =1 {Un nodo regola} other {Lista di # nodi regola} }",
         "rulenode-name-starts-with": "Nodi regola i cui nomi iniziano per '{{prefix}}'",
         "type-current-customer": "Cliente attuale",
         "search": "Ricerca entità",
-        "selected-entities": "{ count, plural, 1 {1 entità selezionata} other {# entità selezionate} }",
+        "selected-entities": "{ count, plural, =1 {1 entità selezionata} other {# entità selezionate} }",
         "entity-name": "Nome entità",
         "details": "Dettagli entità",
         "no-entities-prompt": "Nessuna entità trovata",
@@ -839,21 +839,21 @@
         "add-entity-view-text": "Aggiungi nuova vista entità",
         "delete": "Elimina vista entità",
         "assign-entity-views": "Assegna viste entità",
-        "assign-entity-views-text": "Assegna { count, plural, 1 {1 vista entità} other {# viste entità} } al cliente",
+        "assign-entity-views-text": "Assegna { count, plural, =1 {1 vista entità} other {# viste entità} } al cliente",
         "delete-entity-views": "Elimina viste entità",
         "unassign-from-customer": "Annulla assegnazione al cliente",
         "unassign-entity-views": "Annulla assegnazione viste entità",
-        "unassign-entity-views-action-title": "Annulla assegnazione { count, plural, 1 {1 vista entità} other {# viste entità} } al cliente",
+        "unassign-entity-views-action-title": "Annulla assegnazione { count, plural, =1 {1 vista entità} other {# viste entità} } al cliente",
         "assign-new-entity-view": "Assegna nuova vista entità",
         "delete-entity-view-title": "Sei sicuro di voler eliminare la vista entità '{{entity-viewName}}'?",
         "delete-entity-view-text": "Attenzione, dopo la conferma la vista entità e tutti i suoi dati non saranno più recuperabili.",
-        "delete-entity-views-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 vista entità} other {# viste entità} }?",
-        "delete-entity-views-action-title": "Elimina { count, plural, 1 {1 vista entità} other {# viste entità} }",
+        "delete-entity-views-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 vista entità} other {# viste entità} }?",
+        "delete-entity-views-action-title": "Elimina { count, plural, =1 {1 vista entità} other {# viste entità} }",
         "delete-entity-views-text": "Attenzione, dopo la conferma tutte le vista entità selezionati saranno eliminate e i relativi dati non saranno più recuperabili.",
         "unassign-entity-view-title": "Sei sicuro di voler annullare l'assegnazione della vista entità '{{entity-viewName}}'?",
         "unassign-entity-view-text": "Dopo la conferma sarà annullata l'assegnazione della vista entità e questa non sarà più accessibile dal cliente.",
         "unassign-entity-view": "Annulla assegnazione vista entità",
-        "unassign-entity-views-title": "Sei sicuro di voler annullare l'assegnazione di { count, plural, 1 {1 vista entità} other {# viste entità} }?",
+        "unassign-entity-views-title": "Sei sicuro di voler annullare l'assegnazione di { count, plural, =1 {1 vista entità} other {# viste entità} }?",
         "unassign-entity-views-text": "Dopo la conferma sarà annullata l'assegnazione di tutte le vista entità selezionate e queste non saranno più accessibili dal cliente.",
         "entity-view-type": "Tipo vista entità",
         "entity-view-type-required": "Tipo vista entità obbligatorio.",
@@ -930,7 +930,7 @@
     },
     "extension": {
         "extensions": "Estensioni",
-        "selected-extensions": "{ count, plural, 1 {1 estensione selezionata} other {# estensioni selezionate} }",
+        "selected-extensions": "{ count, plural, =1 {1 estensione selezionata} other {# estensioni selezionate} }",
         "type": "Tipo",
         "key": "Chiave",
         "value": "Valore",
@@ -944,7 +944,7 @@
         "edit": "Modifica estensione",
         "delete-extension-title": "Sei sicuro di voler eliminare l'estensione '{{extensionId}}'?",
         "delete-extension-text": "Attenzione, dopo la conferma l'estensione e tutti i suoi data non saranno più recuperabili.",
-        "delete-extensions-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 estensione} other {# estensioni} }?",
+        "delete-extensions-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 estensione} other {# estensioni} }?",
         "delete-extensions-text": "Attenzione, dopo la conferma tutte le estensioni selezionate saranno eliminate.",
         "converters": "Convertitori",
         "converter-id": "Id convertitore",
@@ -1097,8 +1097,8 @@
     "grid": {
         "delete-item-title": "Sei sicuro di voler eliminare questo elemento?",
         "delete-item-text": "Attenzione, dopo la conferma questo elemento e tutti i suoi dati non saranno più recuperabili.",
-        "delete-items-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 elemento} other {# elementi} }?",
-        "delete-items-action-title": "Elimina { count, plural, 1 {1 elemento} other {# elementi} }",
+        "delete-items-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 elemento} other {# elementi} }?",
+        "delete-items-action-title": "Elimina { count, plural, =1 {1 elemento} other {# elementi} }",
         "delete-items-text": "Attenzione, dopo la conferma tutti gli elementi selezionati saranno rimossi e i relativi dati non saranno più recuperabili.",
         "add-item-text": "Aggiungi nuovo elemento",
         "no-items-text": "Nessun elemento trovato",
@@ -1203,7 +1203,7 @@
         },
         "from-relations": "Relazioni in uscita",
         "to-relations": "Relazioni in ingresso",
-        "selected-relations": "{ count, plural, 1 {1 relazione selezionata} other {# relazioni selezionate} }",
+        "selected-relations": "{ count, plural, =1 {1 relazione selezionata} other {# relazioni selezionate} }",
         "type": "Tipo",
         "to-entity-type": "A tipo entità",
         "to-entity-name": "A nome entità",
@@ -1219,11 +1219,11 @@
         "edit": "Modifica relazione",
         "delete-to-relation-title": "Sei sicuro di voler eliminare la relazione con l'entità '{{entityName}}'?",
         "delete-to-relation-text": "Attenzione, dopo la conferma l'entità '{{entityName}}' sarà scollegata dall'entità corrente.",
-        "delete-to-relations-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 relazione} other {# relazioni} }?",
+        "delete-to-relations-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 relazione} other {# relazioni} }?",
         "delete-to-relations-text": "Attenzione, dopo la conferma tutte le relazioni selezionate saranno rimosse e le corrispondenti entità scollegate da quella corrente.",
         "delete-from-relation-title": "Sei sicuro di voler eliminare la relazione dall'entità  '{{entityName}}'?",
         "delete-from-relation-text": "Attenzione, dopo la conferma l'entità corrente sarà scollegata dall'entità '{{entityName}}'.",
-        "delete-from-relations-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 relazione} other {# relazioni} }?",
+        "delete-from-relations-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 relazione} other {# relazioni} }?",
         "delete-from-relations-text": "Attenzione, dopo la conferma tutte le relazioni selezionate saranno rimosse e l'entità corrente scollegata dalle corrispondenti entità.",
         "remove-relation-filter": "Rimuovi filtro relazioni",
         "add-relation-filter": "Aggiungi filtro relazioni",
@@ -1246,8 +1246,8 @@
         "set-root-rulechain-text": "Dopo la conferma la rule chain diverrà root a gestirà tutti i messaggi in arrivo.",
         "delete-rulechain-title": "Sei sicuro di voler eliminare la rule chain '{{ruleChainName}}'?",
         "delete-rulechain-text": "Attenzione, dopo la conferma la rule chain e tutti i dati relativi non saranno più recuperabili.",
-        "delete-rulechains-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 rule chain} other {# rule chain} }?",
-        "delete-rulechains-action-title": "Elimina { count, plural, 1 {1 rule chain} other {# rule chain} }",
+        "delete-rulechains-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 rule chain} other {# rule chain} }?",
+        "delete-rulechains-action-title": "Elimina { count, plural, =1 {1 rule chain} other {# rule chain} }",
         "delete-rulechains-text": "Attenzione, dopo la conferma tutte le rule chain selezionate saranno rimosse e tutti i relativi dati non saranno più recuperabili.",
         "add-rulechain-text": "Aggiungi nuova rule chain",
         "no-rulechains-text": "Nessuna rule chain trovata",
@@ -1345,8 +1345,8 @@
         "tenant-details": "Dettagli tenant",
         "delete-tenant-title": "Sei sicuro di voler eliminare il tenant '{{tenantTitle}}'?",
         "delete-tenant-text": "Attenzione, dopo la conferma il tenant e tutti i suoi dati non saranno più recuperabili.",
-        "delete-tenants-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 tenant} other {# tenant} }?",
-        "delete-tenants-action-title": "Elimina { count, plural, 1 {1 tenant} other {# tenant} }",
+        "delete-tenants-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 tenant} other {# tenant} }?",
+        "delete-tenants-action-title": "Elimina { count, plural, =1 {1 tenant} other {# tenant} }",
         "delete-tenants-text": "Attenzione, dopo la conferma tutti i tenant selezionati saranno eliminati e tutti i loro dati non saranno più recuperabili.",
         "title": "Titolo",
         "title-required": "Titolo obbligatorio.",
@@ -1360,10 +1360,10 @@
         "tenant-required": "Tenant obbligatorio"
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, 1 {1 secondo} other {# secondi} }",
-        "minutes-interval": "{ minutes, plural, 1 {1 minuto} other {# minuti} }",
-        "hours-interval": "{ hours, plural, 1 {1 ora} other {# ore} }",
-        "days-interval": "{ days, plural, 1 {1 giorno} other {# giorni} }",
+        "seconds-interval": "{ seconds, plural, =1 {1 secondo} other {# secondi} }",
+        "minutes-interval": "{ minutes, plural, =1 {1 minuto} other {# minuti} }",
+        "hours-interval": "{ hours, plural, =1 {1 ora} other {# ore} }",
+        "days-interval": "{ days, plural, =1 {1 giorno} other {# giorni} }",
         "days": "Giorni",
         "hours": "Ore",
         "minutes": "Minuti",
@@ -1371,10 +1371,10 @@
         "advanced": "Avanzate"
     },
     "timewindow": {
-        "days": "{ days, plural, 1 { giorno } other {# giorni } }",
-        "hours": "{ hours, plural, 0 { ora } 1 {1 ora } other {# ore } }",
-        "minutes": "{ minutes, plural, 0 { minuto } 1 {1 minuto } other {# minuti } }",
-        "seconds": "{ seconds, plural, 0 { secondo } 1 {1 secondo } other {# secondi } }",
+        "days": "{ days, plural, =1 { giorno } other {# giorni } }",
+        "hours": "{ hours, plural, =0 { ora } =1 {1 ora } other {# ore } }",
+        "minutes": "{ minutes, plural, =0 { minuto } =1 {1 minuto } other {# minuti } }",
+        "seconds": "{ seconds, plural, =0 { secondo } =1 {1 secondo } other {# secondi } }",
         "realtime": "Realtime",
         "history": "Cronologia",
         "last-prefix": "ultimo",
@@ -1401,8 +1401,8 @@
         "user-details": "Dettagli utente",
         "delete-user-title": "Sei sicuro di voler eliminare l'utente '{{userEmail}}'?",
         "delete-user-text": "Attenzione, dopo la conferma l'utente e tutti i suoi dati non saranno più recuperabili.",
-        "delete-users-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 utente} other {# utenti} }?",
-        "delete-users-action-title": "Elimina { count, plural, 1 {1 utente} other {# utenti} }",
+        "delete-users-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 utente} other {# utenti} }?",
+        "delete-users-action-title": "Elimina { count, plural, =1 {1 utente} other {# utenti} }",
         "delete-users-text": "Attenzione, dopo la conferma tutti gli utenti selezionati saranno eliminati e tutti i relativi dati non saranno più recuperabili.",
         "activation-email-sent-message": "Email di attivazione inviata con successo!",
         "resend-activation": "Invia di nuovo attivazione",
@@ -1525,8 +1525,8 @@
         "widgets-bundle-details": "Dettagli bundle widget",
         "delete-widgets-bundle-title": "Sei sicuro di voler eliminare il bundle widget '{{widgetsBundleTitle}}'?",
         "delete-widgets-bundle-text": "Attenzione, dopo la conferma il bundle widget e tutti i suoi dati non saranno più recuperabili.",
-        "delete-widgets-bundles-title": "Sei sicuro di voler eliminare { count, plural, 1 {1 bundle widget} other {# bundle widget} }?",
-        "delete-widgets-bundles-action-title": "Elimina { count, plural, 1 {1 bundle widget} other {# bundle widget} }",
+        "delete-widgets-bundles-title": "Sei sicuro di voler eliminare { count, plural, =1 {1 bundle widget} other {# bundle widget} }?",
+        "delete-widgets-bundles-action-title": "Elimina { count, plural, =1 {1 bundle widget} other {# bundle widget} }",
         "delete-widgets-bundles-text": "Attenzione, dopo la conferma tutti i bundle widget selezionati saranno rimossi e tutti i loro dati non saranno più recuperabili.",
         "no-widgets-bundles-matching": "Nessun bundle widget corrispondente a  '{{widgetsBundle}}' è stato trovato.",
         "widgets-bundle-required": "Bundle widget obbligatorio.",
@@ -1564,7 +1564,7 @@
         "display-timewindow": "Mostra intervallo temporale",
         "display-legend": "Mostra legenda",
         "datasources": "Sorgenti dei dati",
-        "maximum-datasources": "Massimo { count, plural, 1 {1 sorgente dati consentita.} other {# sorgenti dati consentite} }",
+        "maximum-datasources": "Massimo { count, plural, =1 {1 sorgente dati consentita.} other {# sorgenti dati consentite} }",
         "datasource-type": "Tipo",
         "datasource-parameters": "Parametri",
         "remove-datasource": "Rimuovi sorgente dati",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ja_JP.json b/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
index 6420f4fce5..5d0e259f09 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
@@ -127,15 +127,15 @@
 		"acknowledge": "認める",
 		"clear": "クリア",
 		"search": "アラームの検索",
-		"selected-alarms": "{ count, plural, 1 {1 alarm} other {# alarms} }選択された",
+		"selected-alarms": "{ count, plural, =1 {1 alarm} other {# alarms} }選択された",
 		"no-data": "表示するデータがありません",
 		"polling-interval": "アラームポーリング間隔（秒）",
 		"polling-interval-required": "アラームのポーリング間隔が必要です。",
 		"min-polling-interval-message": "少なくとも1秒間のポーリング間隔が許可されます。",
-		"aknowledge-alarms-title": "{ count, plural, 1 {1 alarm} other {# alarms} }",
-		"aknowledge-alarms-text": "{ count, plural, 1 {1 alarm} other {# alarms} }?",
-		"clear-alarms-title": "{ count, plural, 1 {1 alarm} other {# alarms} }",
-		"clear-alarms-text": "{ count, plural, 1 {1 alarm} other {# alarms} }?"
+		"aknowledge-alarms-title": "{ count, plural, =1 {1 alarm} other {# alarms} }",
+		"aknowledge-alarms-text": "{ count, plural, =1 {1 alarm} other {# alarms} }?",
+		"clear-alarms-title": "{ count, plural, =1 {1 alarm} other {# alarms} }",
+		"clear-alarms-text": "{ count, plural, =1 {1 alarm} other {# alarms} }?"
 	},
 	"alias": {
 		"add": "エイリアスを追加する",
@@ -213,15 +213,15 @@
 		"add-asset-text": "新しいアセットを追加する",
 		"asset-details": "資産の詳細",
 		"assign-assets": "アセットの割り当て",
-		"assign-assets-text": "{ count, plural, 1 {1 asset} other {# assets} }顧客に",
+		"assign-assets-text": "{ count, plural, =1 {1 asset} other {# assets} }顧客に",
 		"delete-assets": "アセットを削除する",
 		"unassign-assets": "アセットの割り当てを解除する",
-		"unassign-assets-action-title": "{ count, plural, 1 {1 asset} other {# assets} }顧客から",
+		"unassign-assets-action-title": "{ count, plural, =1 {1 asset} other {# assets} }顧客から",
 		"assign-new-asset": "新しいアセットを割り当てる",
 		"delete-asset-title": "'{{assetName}}'?",
 		"delete-asset-text": "確認後、資産と関連するすべてのデータが回復不能になることに注意してください。",
-		"delete-assets-title": "{ count, plural, 1 {1 asset} other {# assets} }?",
-		"delete-assets-action-title": "{ count, plural, 1 {1 asset} other {# assets} }",
+		"delete-assets-title": "{ count, plural, =1 {1 asset} other {# assets} }?",
+		"delete-assets-action-title": "{ count, plural, =1 {1 asset} other {# assets} }",
 		"delete-assets-text": "確認後、選択したすべての資産が削除され、関連するすべてのデータは回復不能になりますので注意してください。",
 		"make-public-asset-title": "'{{assetName}}'パブリック？",
 		"make-public-asset-text": "確認後、資産とそのすべてのデータは公開され、他の人がアクセスできるようになります。",
@@ -230,7 +230,7 @@
 		"unassign-asset-title": "'{{assetName}}'?",
 		"unassign-asset-text": "確認後、資産は割り当て解除され、顧客はアクセスできなくなります。",
 		"unassign-asset": "アセットの割り当てを解除する",
-		"unassign-assets-title": "{ count, plural, 1 {1 asset} other {# assets} }?",
+		"unassign-assets-title": "{ count, plural, =1 {1 asset} other {# assets} }?",
 		"unassign-assets-text": "確認後、選択されたすべての資産が割り当て解除され、顧客がアクセスできなくなります。",
 		"copyId": "アセットIDをコピーする",
 		"idCopiedMessage": "アセットIDがクリップボードにコピーされました",
@@ -254,7 +254,7 @@
 		"key-required": "属性キーは必須です。",
 		"value": "値",
 		"value-required": "属性値は必須です。",
-		"delete-attributes-title": "{ count, plural, 1 {1 attribute} other {# attributes} }?",
+		"delete-attributes-title": "{ count, plural, =1 {1 attribute} other {# attributes} }?",
 		"delete-attributes-text": "注意してください。確認後、選択したすべての属性が削除されます。",
 		"delete-attributes": "属性を削除する",
 		"enter-attribute-value": "属性値を入力",
@@ -264,8 +264,8 @@
 		"prev-widget": "前のウィジェット",
 		"add-to-dashboard": "ダッシュボードに追加",
 		"add-widget-to-dashboard": "ウィジェットをダッシュ​​ボードに追加する",
-		"selected-attributes": "{ count, plural, 1 {1 attribute} other {# attributes} }選択された",
-		"selected-telemetry": "{ count, plural, 1 {1 telemetry unit} other {# telemetry units} }選択された"
+		"selected-attributes": "{ count, plural, =1 {1 attribute} other {# attributes} }選択された",
+		"selected-telemetry": "{ count, plural, =1 {1 telemetry unit} other {# telemetry units} }選択された"
 	},
 	"audit-log": {
 		"audit": "監査",
@@ -359,8 +359,8 @@
 		"customer-details": "お客様情報",
 		"delete-customer-title": "'{{customerTitle}}'?",
 		"delete-customer-text": "確認後、お客様および関連するすべてのデータが回復不能になるので注意してください。",
-		"delete-customers-title": "{ count, plural, 1 {1 customer} other {# customers} }?",
-		"delete-customers-action-title": "{ count, plural, 1 {1 customer} other {# customers} }",
+		"delete-customers-title": "{ count, plural, =1 {1 customer} other {# customers} }?",
+		"delete-customers-action-title": "{ count, plural, =1 {1 customer} other {# customers} }",
 		"delete-customers-text": "確認後、選択したすべての顧客は削除され、関連するすべてのデータは回復不能になります。",
 		"manage-users": "ユーザーを管理する",
 		"manage-assets": "アセットを管理する",
@@ -419,20 +419,20 @@
 		"add-dashboard-text": "新しいダッシュボードを追加する",
 		"assign-dashboards": "ダッシュボードの割り当て",
 		"assign-new-dashboard": "新しいダッシュボードを割り当てる",
-		"assign-dashboards-text": "{ count, plural, 1 {1 dashboard} other {# dashboards} }顧客に",
-		"unassign-dashboards-action-text": "{ count, plural, 1 {1 dashboard} other {# dashboards} }顧客から",
+		"assign-dashboards-text": "{ count, plural, =1 {1 dashboard} other {# dashboards} }顧客に",
+		"unassign-dashboards-action-text": "{ count, plural, =1 {1 dashboard} other {# dashboards} }顧客から",
 		"delete-dashboards": "ダッシュボードの削除",
 		"unassign-dashboards": "ダッシュボードの割り当てを解除する",
-		"unassign-dashboards-action-title": "{ count, plural, 1 {1 dashboard} other {# dashboards} }顧客から",
+		"unassign-dashboards-action-title": "{ count, plural, =1 {1 dashboard} other {# dashboards} }顧客から",
 		"delete-dashboard-title": "'{{dashboardTitle}}'?",
 		"delete-dashboard-text": "確認後、ダッシュボードとすべての関連データが回復不能になるので注意してください。",
-		"delete-dashboards-title": "{ count, plural, 1 {1 dashboard} other {# dashboards} }?",
-		"delete-dashboards-action-title": "{ count, plural, 1 {1 dashboard} other {# dashboards} }",
+		"delete-dashboards-title": "{ count, plural, =1 {1 dashboard} other {# dashboards} }?",
+		"delete-dashboards-action-title": "{ count, plural, =1 {1 dashboard} other {# dashboards} }",
 		"delete-dashboards-text": "注意してください。確認後、選択したダッシュボードはすべて削除され、関連するすべてのデータは回復不能になります。",
 		"unassign-dashboard-title": "'{{dashboardTitle}}'?",
 		"unassign-dashboard-text": "確認後、ダッシュボードは割り当てられなくなり、顧客はアクセスできなくなります。",
 		"unassign-dashboard": "ダッシュボードの割り当てを解除する",
-		"unassign-dashboards-title": "{ count, plural, 1 {1 dashboard} other {# dashboards} }?",
+		"unassign-dashboards-title": "{ count, plural, =1 {1 dashboard} other {# dashboards} }?",
 		"unassign-dashboards-text": "確認の後、選択したすべてのダッシュボードは割り当てられなくなり、顧客はアクセスできなくなります。",
 		"public-dashboard-title": "ダッシュボードは公開されました",
 		"public-dashboard-text": "<b>{{dashboardTitle}}</b> is now public and accessible via next public <a href='{{publicLink}}' target='_blank'>link</a>:",
@@ -509,7 +509,7 @@
 		"manage-states": "ダッシュボードの状態を管理する",
 		"states": "ダッシュボードの状態",
 		"search-states": "検索ダッシュボードの状態",
-		"selected-states": "{ count, plural, 1 {1 dashboard state} other {# dashboard states} }選択された",
+		"selected-states": "{ count, plural, =1 {1 dashboard state} other {# dashboard states} }選択された",
 		"edit-state": "ダッシュボードの状態を編集する",
 		"delete-state": "ダッシュボードの状態を削除する",
 		"add-state": "ダッシュボードの状態を追加する",
@@ -542,11 +542,11 @@
 		"alarm": "アラームフィールド",
 		"timeseries-required": "エンティティの時系列データが必要です。",
 		"timeseries-or-attributes-required": "エンティティのtimeseries /属性は必須です。",
-		"maximum-timeseries-or-attributes": "{ count, plural, 1 {1 timeseries/attribute is allowed.} other {# timeseries/attributes are allowed} }",
+		"maximum-timeseries-or-attributes": "{ count, plural, =1 {1 timeseries/attribute is allowed.} other {# timeseries/attributes are allowed} }",
 		"alarm-fields-required": "アラームフィールドが必要です。",
 		"function-types": "関数型",
 		"function-types-required": "関数型が必要です。",
-		"maximum-function-types": "{ count, plural, 1 {1 function type is allowed.} other {# function types are allowed} }"
+		"maximum-function-types": "{ count, plural, =1 {1 function type is allowed.} other {# function types are allowed} }"
 	},
 	"datasource": {
 		"type": "データソースタイプ",
@@ -598,11 +598,11 @@
 		"manage-credentials": "資格情報を管理する",
 		"delete": "デバイスを削除する",
 		"assign-devices": "デバイスを割り当てる",
-		"assign-devices-text": "{ count, plural, 1 {1 device} other {# devices} }顧客に",
+		"assign-devices-text": "{ count, plural, =1 {1 device} other {# devices} }顧客に",
 		"delete-devices": "デバイスを削除する",
 		"unassign-from-customer": "顧客からの割り当て解除",
 		"unassign-devices": "デバイスの割り当てを解除する",
-		"unassign-devices-action-title": "{ count, plural, 1 {1 device} other {# devices} }顧客から",
+		"unassign-devices-action-title": "{ count, plural, =1 {1 device} other {# devices} }顧客から",
 		"assign-new-device": "新しいデバイスを割り当てる",
 		"make-public-device-title": "'{{deviceName}}'パブリック？",
 		"make-public-device-text": "確認後、デバイスとそのすべてのデータは公開され、他のユーザーがアクセスできるようになります。",
@@ -611,13 +611,13 @@
 		"view-credentials": "資格情報を表示する",
 		"delete-device-title": "'{{deviceName}}'?",
 		"delete-device-text": "確認後、デバイスと関連するすべてのデータが回復不能になるので注意してください。",
-		"delete-devices-title": "{ count, plural, 1 {1 device} other {# devices} }?",
-		"delete-devices-action-title": "{ count, plural, 1 {1 device} other {# devices} }",
+		"delete-devices-title": "{ count, plural, =1 {1 device} other {# devices} }?",
+		"delete-devices-action-title": "{ count, plural, =1 {1 device} other {# devices} }",
 		"delete-devices-text": "注意してください。確認後、選択したすべてのデバイスが削除され、関連するすべてのデータは回復不能になります。",
 		"unassign-device-title": "'{{deviceName}}'?",
 		"unassign-device-text": "確認の後、デバイスは割り当てが解除され、顧客がアクセスできなくなります。",
 		"unassign-device": "デバイスの割り当てを解除する",
-		"unassign-devices-title": "{ count, plural, 1 {1 device} other {# devices} }?",
+		"unassign-devices-title": "{ count, plural, =1 {1 device} other {# devices} }?",
 		"unassign-devices-text": "確認の後、選択されたすべてのデバイスが割り当て解除され、顧客がアクセスできなくなります。",
 		"device-credentials": "デバイス資格情報",
 		"credentials-type": "資格情報タイプ",
@@ -701,51 +701,51 @@
 		"type-required": "エンティティタイプが必要です。",
 		"type-device": "デバイス",
 		"type-devices": "デバイス",
-		"list-of-devices": "{ count, plural, 1 {One device} other {List of # devices} }",
+		"list-of-devices": "{ count, plural, =1 {One device} other {List of # devices} }",
 		"device-name-starts-with": "'{{prefix}}'",
 		"type-asset": "資産",
 		"type-assets": "資産",
-		"list-of-assets": "{ count, plural, 1 {One asset} other {List of # assets} }",
+		"list-of-assets": "{ count, plural, =1 {One asset} other {List of # assets} }",
 		"asset-name-starts-with": "'{{prefix}}'",
 		"type-rule": "ルール",
 		"type-rules": "ルール",
-		"list-of-rules": "{ count, plural, 1 {One rule} other {List of # rules} }",
+		"list-of-rules": "{ count, plural, =1 {One rule} other {List of # rules} }",
 		"rule-name-starts-with": "'{{prefix}}'",
 		"type-plugin": "プラグイン",
 		"type-plugins": "プラグイン",
-		"list-of-plugins": "{ count, plural, 1 {One plugin} other {List of # plugins} }",
+		"list-of-plugins": "{ count, plural, =1 {One plugin} other {List of # plugins} }",
 		"plugin-name-starts-with": "'{{prefix}}'",
 		"type-tenant": "テナント",
 		"type-tenants": "テナント",
-		"list-of-tenants": "{ count, plural, 1 {One tenant} other {List of # tenants} }",
+		"list-of-tenants": "{ count, plural, =1 {One tenant} other {List of # tenants} }",
 		"tenant-name-starts-with": "'{{prefix}}'",
 		"type-customer": "顧客",
 		"type-customers": "顧客",
-		"list-of-customers": "{ count, plural, 1 {One customer} other {List of # customers} }",
+		"list-of-customers": "{ count, plural, =1 {One customer} other {List of # customers} }",
 		"customer-name-starts-with": "'{{prefix}}'",
 		"type-user": "ユーザー",
 		"type-users": "ユーザー",
-		"list-of-users": "{ count, plural, 1 {One user} other {List of # users} }",
+		"list-of-users": "{ count, plural, =1 {One user} other {List of # users} }",
 		"user-name-starts-with": "'{{prefix}}'",
 		"type-dashboard": "ダッシュボード",
 		"type-dashboards": "ダッシュボード",
-		"list-of-dashboards": "{ count, plural, 1 {One dashboard} other {List of # dashboards} }",
+		"list-of-dashboards": "{ count, plural, =1 {One dashboard} other {List of # dashboards} }",
 		"dashboard-name-starts-with": "'{{prefix}}'",
 		"type-alarm": "警報",
 		"type-alarms": "アラーム",
-		"list-of-alarms": "{ count, plural, 1 {One alarms} other {List of # alarms} }",
+		"list-of-alarms": "{ count, plural, =1 {One alarms} other {List of # alarms} }",
 		"alarm-name-starts-with": "'{{prefix}}'",
 		"type-rulechain": "ルールチェーン",
 		"type-rulechains": "ルールチェーン",
-		"list-of-rulechains": "{ count, plural, 1 {One rule chain} other {List of # rule chains} }",
+		"list-of-rulechains": "{ count, plural, =1 {One rule chain} other {List of # rule chains} }",
 		"rulechain-name-starts-with": "'{{prefix}}'",
 		"type-rulenode": "ルールノード",
 		"type-rulenodes": "ルールノード",
-		"list-of-rulenodes": "{ count, plural, 1 {One rule node} other {List of # rule nodes} }",
+		"list-of-rulenodes": "{ count, plural, =1 {One rule node} other {List of # rule nodes} }",
 		"rulenode-name-starts-with": "'{{prefix}}'",
 		"type-current-customer": "現在の顧客",
 		"search": "検索エンティティ",
-		"selected-entities": "{ count, plural, 1 {1 entity} other {# entities} }選択された",
+		"selected-entities": "{ count, plural, =1 {1 entity} other {# entities} }選択された",
 		"entity-name": "エンティティ名",
 		"details": "エンティティの詳細",
 		"no-entities-prompt": "エンティティが見つかりません",
@@ -783,7 +783,7 @@
 	},
 	"extension": {
 		"extensions": "拡張機能",
-		"selected-extensions": "{ count, plural, 1 {1 extension} other {# extensions} }選択された",
+		"selected-extensions": "{ count, plural, =1 {1 extension} other {# extensions} }選択された",
 		"type": "タイプ",
 		"key": "キー",
 		"value": "値",
@@ -797,7 +797,7 @@
 		"edit": "拡張機能を編集する",
 		"delete-extension-title": "'{{extensionId}}'?",
 		"delete-extension-text": "確認後、拡張子と関連するすべてのデータが回復不能になることに注意してください。",
-		"delete-extensions-title": "{ count, plural, 1 {1 extension} other {# extensions} }?",
+		"delete-extensions-title": "{ count, plural, =1 {1 extension} other {# extensions} }?",
 		"delete-extensions-text": "注意してください。確認後、選択したすべての内線番号が削除されます。",
 		"converters": "コンバーター",
 		"converter-id": "コンバーターID",
@@ -948,8 +948,8 @@
 	"grid": {
 		"delete-item-title": "このアイテムを削除してもよろしいですか？",
 		"delete-item-text": "注意してください。確認後、この項目と関連するすべてのデータは回復不能になります。",
-		"delete-items-title": "{ count, plural, 1 {1 item} other {# items} }?",
-		"delete-items-action-title": "{ count, plural, 1 {1 item} other {# items} }",
+		"delete-items-title": "{ count, plural, =1 {1 item} other {# items} }?",
+		"delete-items-action-title": "{ count, plural, =1 {1 item} other {# items} }",
 		"delete-items-text": "注意してください。確認後、選択したすべてのアイテムが削除され、関連するすべてのデータは回復不能になります。",
 		"add-item-text": "新しいアイテムを追加",
 		"no-items-text": "項目は見つかりませんでした",
@@ -1052,7 +1052,7 @@
 		},
 		"from-relations": "アウトバウンド関係",
 		"to-relations": "インバウンド関係",
-		"selected-relations": "{ count, plural, 1 {1 relation} other {# relations} }選択された",
+		"selected-relations": "{ count, plural, =1 {1 relation} other {# relations} }選択された",
 		"type": "タイプ",
 		"to-entity-type": "エンティティタイプへ",
 		"to-entity-name": "エンティティ名に",
@@ -1068,11 +1068,11 @@
 		"edit": "関係を編集する",
 		"delete-to-relation-title": "'{{entityName}}'?",
 		"delete-to-relation-text": "'{{entityName}}'現在のエンティティとは無関係です。",
-		"delete-to-relations-title": "{ count, plural, 1 {1 relation} other {# relations} }?",
+		"delete-to-relations-title": "{ count, plural, =1 {1 relation} other {# relations} }?",
 		"delete-to-relations-text": "注意してください。確認後、選択されたリレーションはすべて削除され、対応するエンティティは現在のエンティティとは無関係になります。",
 		"delete-from-relation-title": "'{{entityName}}'?",
 		"delete-from-relation-text": "'{{entityName}}'.",
-		"delete-from-relations-title": "{ count, plural, 1 {1 relation} other {# relations} }?",
+		"delete-from-relations-title": "{ count, plural, =1 {1 relation} other {# relations} }?",
 		"delete-from-relations-text": "注意してください。確認後、選択されたリレーションはすべて削除され、現在のエンティティは対応するエンティティとは無関係になります。",
 		"remove-relation-filter": "関係フィルタを削除する",
 		"add-relation-filter": "関係フィルタを追加する",
@@ -1095,8 +1095,8 @@
 		"set-root-rulechain-text": "確認後、ルールチェーンはルートになり、すべての受信トランスポートメッセージを処理します。",
 		"delete-rulechain-title": "'{{ruleChainName}}'?",
 		"delete-rulechain-text": "確認後、ルールチェーンと関連するすべてのデータが回復不能になるので注意してください。",
-		"delete-rulechains-title": "{ count, plural, 1 {1 rule chain} other {# rule chains} }?",
-		"delete-rulechains-action-title": "{ count, plural, 1 {1 rule chain} other {# rule chains} }",
+		"delete-rulechains-title": "{ count, plural, =1 {1 rule chain} other {# rule chains} }?",
+		"delete-rulechains-action-title": "{ count, plural, =1 {1 rule chain} other {# rule chains} }",
 		"delete-rulechains-text": "確認後、選択したすべてのルールチェーンが削除され、関連するすべてのデータが回復不能になるので注意してください。",
 		"add-rulechain-text": "新しいルールチェーンを追加する",
 		"no-rulechains-text": "ルールチェーンが見つかりません",
@@ -1194,8 +1194,8 @@
 		"tenant-details": "テナントの詳細",
 		"delete-tenant-title": "'{{tenantTitle}}'?",
 		"delete-tenant-text": "確認後、テナントと関連するすべてのデータが回復不能になるので注意してください。",
-		"delete-tenants-title": "{ count, plural, 1 {1 tenant} other {# tenants} }?",
-		"delete-tenants-action-title": "{ count, plural, 1 {1 tenant} other {# tenants} }",
+		"delete-tenants-title": "{ count, plural, =1 {1 tenant} other {# tenants} }?",
+		"delete-tenants-action-title": "{ count, plural, =1 {1 tenant} other {# tenants} }",
 		"delete-tenants-text": "注意してください。確認後、選択されたすべてのテナントが削除され、関連するすべてのデータは回復不能になります。",
 		"title": "タイトル",
 		"title-required": "タイトルは必須です。",
@@ -1209,10 +1209,10 @@
 		"tenant-required": "テナントが必要です"
 	},
 	"timeinterval": {
-		"seconds-interval": "{ seconds, plural, 1 {1 second} other {# seconds} }",
-		"minutes-interval": "{ minutes, plural, 1 {1 minute} other {# minutes} }",
-		"hours-interval": "{ hours, plural, 1 {1 hour} other {# hours} }",
-		"days-interval": "{ days, plural, 1 {1 day} other {# days} }",
+		"seconds-interval": "{ seconds, plural, =1 {1 second} other {# seconds} }",
+		"minutes-interval": "{ minutes, plural, =1 {1 minute} other {# minutes} }",
+		"hours-interval": "{ hours, plural, =1 {1 hour} other {# hours} }",
+		"days-interval": "{ days, plural, =1 {1 day} other {# days} }",
 		"days": "日々",
 		"hours": "時間",
 		"minutes": "分",
@@ -1220,10 +1220,10 @@
 		"advanced": "上級"
 	},
 	"timewindow": {
-		"days": "{ days, plural, 1 { day } other {# days } }",
-		"hours": "{ hours, plural, 0 { hour } 1 {1 hour } other {# hours } }",
-		"minutes": "{ minutes, plural, 0 { minute } 1 {1 minute } other {# minutes } }",
-		"seconds": "{ seconds, plural, 0 { second } 1 {1 second } other {# seconds } }",
+		"days": "{ days, plural, =1 { day } other {# days } }",
+		"hours": "{ hours, plural, =0 { hour } =1 {1 hour } other {# hours } }",
+		"minutes": "{ minutes, plural, =0 { minute } =1 {1 minute } other {# minutes } }",
+		"seconds": "{ seconds, plural, =0 { second } =1 {1 second } other {# seconds } }",
 		"realtime": "リアルタイム",
 		"history": "歴史",
 		"last-prefix": "最終",
@@ -1249,8 +1249,8 @@
 		"user-details": "ユーザーの詳細",
 		"delete-user-title": "'{{userEmail}}'?",
 		"delete-user-text": "確認後、ユーザーと関連するすべてのデータが回復不能になるので注意してください。",
-		"delete-users-title": "{ count, plural, 1 {1 user} other {# users} }?",
-		"delete-users-action-title": "{ count, plural, 1 {1 user} other {# users} }",
+		"delete-users-title": "{ count, plural, =1 {1 user} other {# users} }?",
+		"delete-users-action-title": "{ count, plural, =1 {1 user} other {# users} }",
 		"delete-users-text": "注意してください。確認後、選択したすべてのユーザーが削除され、関連するすべてのデータは回復不能になります。",
 		"activation-email-sent-message": "アクティベーション電子メールが正常に送信されました！",
 		"resend-activation": "アクティブ化を再送",
@@ -1367,8 +1367,8 @@
 		"widgets-bundle-details": "ウィジェットのバンドルの詳細",
 		"delete-widgets-bundle-title": "'{{widgetsBundleTitle}}'?",
 		"delete-widgets-bundle-text": "確認後、ウィジェットはバンドルされ、関連するすべてのデータは回復不能になります。",
-		"delete-widgets-bundles-title": "{ count, plural, 1 {1 widgets bundle} other {# widgets bundles} }?",
-		"delete-widgets-bundles-action-title": "{ count, plural, 1 {1 widgets bundle} other {# widgets bundles} }",
+		"delete-widgets-bundles-title": "{ count, plural, =1 {1 widgets bundle} other {# widgets bundles} }?",
+		"delete-widgets-bundles-action-title": "{ count, plural, =1 {1 widgets bundle} other {# widgets bundles} }",
 		"delete-widgets-bundles-text": "確認後、選択したすべてのウィジェットバンドルは削除され、関連するすべてのデータは回復不能になります。",
 		"no-widgets-bundles-matching": "'{{widgetsBundle}}'発見されました。",
 		"widgets-bundle-required": "ウィジェットバンドルが必要です。",
@@ -1404,7 +1404,7 @@
 		"use-dashboard-timewindow": "ダッシュボードのタイムウィンドウを使用する",
 		"display-legend": "伝説を表示",
 		"datasources": "データソース",
-		"maximum-datasources": "{ count, plural, 1 {1 datasource is allowed.} other {# datasources are allowed} }",
+		"maximum-datasources": "{ count, plural, =1 {1 datasource is allowed.} other {# datasources are allowed} }",
 		"datasource-type": "タイプ",
 		"datasource-parameters": "パラメーター",
 		"remove-datasource": "データソースを削除",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ka_GE.json b/ui-ngx/src/assets/locale/locale.constant-ka_GE.json
index c33964e3b9..5973d87268 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ka_GE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ka_GE.json
@@ -159,11 +159,11 @@
     "polling-interval-required": "კითხვის ინტერვალი აუცილებელია",
     "min-polling-interval-message": "გამოთხვისი მინიმალური ინტერვალი",
     "aknowledge-alarms-title": "გაფრთხილების დასტური სათაური",
-    "aknowledge-alarms-text": "დარწმუნებული ხართ რომ გინდათ დაადასტუროთ { count, plural, 1 {1 alarm} other {# alarms} }?",
+    "aknowledge-alarms-text": "დარწმუნებული ხართ რომ გინდათ დაადასტუროთ { count, plural, =1 {1 alarm} other {# alarms} }?",
     "aknowledge-alarm-title": "დაადასტურე გაფრთხილება",
     "aknowledge-alarm-text": "გაფრთხილების დადასტურება",
-    "clear-alarms-title": "წაშლა { count, plural, 1 {1 alarm} other {# alarms} }",
-    "clear-alarms-text": "დარწმუნებული ხართ რომ გინდათ წაშალოთ { count, plural, 1 {1 alarm} other {# alarms} }?",
+    "clear-alarms-title": "წაშლა { count, plural, =1 {1 alarm} other {# alarms} }",
+    "clear-alarms-text": "დარწმუნებული ხართ რომ გინდათ წაშალოთ { count, plural, =1 {1 alarm} other {# alarms} }?",
     "clear-alarm-title": "გართხილების სათაურის წაშლა",
     "clear-alarm-text": "ნამდვილად გინდათ გაფრთხილების წაშლა",
     "alarm-status-filter": "განგაშის სტატუსის ფილტრი",
@@ -255,15 +255,15 @@
     "add-asset-text": "აქტივის დამატება",
     "asset-details": "აქტივების დეტალები",
     "assign-assets": "აქტივის მინიჭება",
-    "assign-assets-text": "აქტივის { count, plural, 1 {1 asset} other {# assets} } მინიჭება კლიენტზე",
+    "assign-assets-text": "აქტივის { count, plural, =1 {1 asset} other {# assets} } მინიჭება კლიენტზე",
     "delete-assets": "აქტივების წაშლა",
     "unassign-assets": "აქტივების მოშორება",
-    "unassign-assets-action-title": "გამოხმობა { count, plural, 1 {1 asset} other {# assets} } კლიენტისგან",
+    "unassign-assets-action-title": "გამოხმობა { count, plural, =1 {1 asset} other {# assets} } კლიენტისგან",
     "assign-new-asset": "ახალი აქტივის მინიჭება",
     "delete-asset-title": "დარწმუნებული ხართ რომ წავშალო '{{assetName}}' აქტივი?",
     "delete-asset-text": "ფრთხილად, დადასტურების შემდეგ ყველა აქტივი წაიშლება და მონაცემები ვეღარ აღდგება.",
-    "delete-assets-title": "დარწმუნებული ხართ რომ წაიშალოს { count, plural, 1 {1 asset} other {# assets} }?",
-    "delete-assets-action-title": " { count, plural, 1 {1 asset} other {# assets} } წაშლა",
+    "delete-assets-title": "დარწმუნებული ხართ რომ წაიშალოს { count, plural, =1 {1 asset} other {# assets} }?",
+    "delete-assets-action-title": " { count, plural, =1 {1 asset} other {# assets} } წაშლა",
     "delete-assets-text": "ფრთხილად, დადასტურების შემდეგ ყველა მონიშნული აქტივი წაიშლება და მონაცემები ვეღარ აღდგება.",
     "make-public-asset-title": "დარწმუნებული ხართ რომ გნებავთ აქტივის '{{assetName}}' გასაჯაროება?",
     "make-public-asset-text": "დადასტურების შედეგად აქტივი და მისი მონაცემები გახდება საჯარო და ხელმისაწვდომი ყველასთვის.",
@@ -272,7 +272,7 @@
     "unassign-asset-title": "დატწმუნებული ხართ რომ გნებავთ აქტივის '{{assetName}}' გამოხმობა?",
     "unassign-asset-text": "დადასტურების შედეგად აქტივი გახდება კლიენტისთვის ხელმიუწვდომელი.",
     "unassign-asset": "აქტივის გამოხმობა",
-    "unassign-assets-title": "დარწმუნებული ხართ რომ გნებავთ გამოიხმოთ { count, plural, 1 {1 asset} other {# assets} }?",
+    "unassign-assets-title": "დარწმუნებული ხართ რომ გნებავთ გამოიხმოთ { count, plural, =1 {1 asset} other {# assets} }?",
     "unassign-assets-text": "დადასტურების შედეგად ყველა მონიშნული აქტივი გახდება კლიენტისთვის ხელმიუწვდომელი.",
     "copyId": "აქტივის ID-ის  დაკოპირება",
     "idCopiedMessage": "აქტივი დაკოპირებულია კლიპბორდში",
@@ -283,7 +283,7 @@
     "import": "აქტივების იმპორტი",
     "asset-file": "აქტივის ფაილი",
     "search": "აქტივების ძიება",
-    "selected-assets": "{ count, plural, 1 {1 asset} other {# assets} } მონიშნულია",
+    "selected-assets": "{ count, plural, =1 {1 asset} other {# assets} } მონიშნულია",
     "label": "ნიშნული"
   },
   "attribute": {
@@ -300,7 +300,7 @@
     "key-required": "ატრიბუტის გასაღები სავალდებულოა.",
     "value": "მნიშვნელობა",
     "value-required": "ატრიბუტის მნიშვნელობა საჭიროა.",
-    "delete-attributes-title": "დარწმუნებული ხართ რომ გსურთ წაშალოთ { count, plural, 1 {1 attribute} other {# attributes} }?",
+    "delete-attributes-title": "დარწმუნებული ხართ რომ გსურთ წაშალოთ { count, plural, =1 {1 attribute} other {# attributes} }?",
     "delete-attributes-text": "ფრთხილად, დადასტურების შემდეგ ყველა მონიშნული ატრიბუტი წაიშლება.",
     "delete-attributes": "ატრიბუტების წაშკა",
     "enter-attribute-value": "შეიყვანეთ ატრიბუტის მნიშვნელობა",
@@ -310,8 +310,8 @@
     "prev-widget": "წინა ვიჯეტი",
     "add-to-dashboard": "დეშბორდზე დამატება",
     "add-widget-to-dashboard": "ვიჯეტის დეშბორდზე დამატება",
-    "selected-attributes": "{ count, plural, 1 {1 attribute} other {# attributes} } მონიშნულია",
-    "selected-telemetry": "{ count, plural, 1 {1 telemetry unit} other {# telemetry units} } მონიშნულია"
+    "selected-attributes": "{ count, plural, =1 {1 attribute} other {# attributes} } მონიშნულია",
+    "selected-telemetry": "{ count, plural, =1 {1 telemetry unit} other {# telemetry units} } მონიშნულია"
   },
   "audit-log": {
     "audit": "აუდიტი",
@@ -409,8 +409,8 @@
     "customer-details": "მომხმარებლის დეტალები",
     "delete-customer-title": "დარწმუნებული ხართ რომ გსურთ წაშალოთ მომხმარებელი  '{{customerTitle}}'?",
     "delete-customer-text": "ყურადღებით დადასტურების შემდეგ ყველა მონიშნული მომხმარებელი და მასთან დაკავშირებული მონაცემები წაიშლება.",
-    "delete-customers-title": "დაწრმუნებული ხართ რომ გსურთ წაშალოთ { count, plural, 1 {1 customer} other {# customers} }?",
-    "delete-customers-action-title": "წაშლა { count, plural, 1 {1 customer} other {# customers} }",
+    "delete-customers-title": "დაწრმუნებული ხართ რომ გსურთ წაშალოთ { count, plural, =1 {1 customer} other {# customers} }?",
+    "delete-customers-action-title": "წაშლა { count, plural, =1 {1 customer} other {# customers} }",
     "delete-customers-text": "ყურადღებით დადასტურების შემდეგ ყველა მონიშნული მომხმარებელი და მასთან დაკავშირებული მონაცემები წაიშლება.",
     "manage-users": "მომხმარებლების მართვა",
     "manage-assets": "აქტივების მართვა",
@@ -471,20 +471,20 @@
     "add-dashboard-text": "დაამატე ახალი დეშბორდი",
     "assign-dashboards": "მიამაგრე დეშბორდები",
     "assign-new-dashboard": "მიამაგრე ახალი დეშბორდი",
-    "assign-dashboards-text": "მიამაგრე { count, plural, 1 {1 dashboard} other {# dashboards} } მომხმარებელს",
-    "unassign-dashboards-action-text": "მოხსენი { count, plural, 1 {1 dashboard} other {# dashboards} } მომხმარებელს",
+    "assign-dashboards-text": "მიამაგრე { count, plural, =1 {1 dashboard} other {# dashboards} } მომხმარებელს",
+    "unassign-dashboards-action-text": "მოხსენი { count, plural, =1 {1 dashboard} other {# dashboards} } მომხმარებელს",
     "delete-dashboards": "დეშბორდების წაშლა",
     "unassign-dashboards": "დეშბორდების მოხსნა",
-    "unassign-dashboards-action-title": "მოხსენი { count, plural, 1 {1 dashboard} other {# dashboards} } მომხმარებელს",
+    "unassign-dashboards-action-title": "მოხსენი { count, plural, =1 {1 dashboard} other {# dashboards} } მომხმარებელს",
     "delete-dashboard-title": "დარწმუნებული ხართ რომ გინდათ დეშბორდის წაშლა  '{{dashboardTitle}}'?",
     "delete-dashboard-text": "ყურადღებით, დადასტურების შემდეგ დეშბორდი ყველა მონიშნული  მონაცემები გახდება ხელმიუწვდომელი",
-    "delete-dashboards-title": "დარწმუნებული ხართ რომ გინდათ წაშლა { count, plural, 1 {1 dashboard} other {# dashboards} }?",
-    "delete-dashboards-action-title": "წაშლა { count, plural, 1 {1 dashboard} other {# dashboards} }",
+    "delete-dashboards-title": "დარწმუნებული ხართ რომ გინდათ წაშლა { count, plural, =1 {1 dashboard} other {# dashboards} }?",
+    "delete-dashboards-action-title": "წაშლა { count, plural, =1 {1 dashboard} other {# dashboards} }",
     "delete-dashboards-text": "ყურადღებით, დადასტურების შემდეგ დეშბორდი ყველა მონიშნული  მონაცემები გახდება ხელმიუწვდომელი",
     "unassign-dashboard-title": "ნამდვილად გსურთ დეშბორდის გამოხმობა '{{dashboardTitle}}'?",
     "unassign-dashboard-text": "დადასტურების შემდგომ დეშბორდი არ იქნება ხელმისაწვდომი კლიენტისთვის",
     "unassign-dashboard": "დეშბორდის გამოხმობა",
-    "unassign-dashboards-title": "ნამდვილად გსურთ დეშბორდის გამოხმობა  { count, plural, 1 {1 dashboard} other {# dashboards} }?",
+    "unassign-dashboards-title": "ნამდვილად გსურთ დეშბორდის გამოხმობა  { count, plural, =1 {1 dashboard} other {# dashboards} }?",
     "unassign-dashboards-text": "დადასტურების შემდგომ დეშბორდი არ იქნება ხელმისაწვდომი კლიენტისთვის",
     "public-dashboard-title": "დეშბორდი ხელმისაწვდომია",
     "public-dashboard-text": "დეშბორდი ხელმისაწვდომია  <b>{{dashboardTitle}}</b> is now public and accessible via next public <a href='{{publicLink}}' target='_blank'>link</a>:",
@@ -561,7 +561,7 @@
     "manage-states": "გააკონტროლე დეშბორდის მდგომარეობა",
     "states": "დეშბორდის მდგომარეობა",
     "search-states": "მოძებნე დეშბორდის მდგომარეობა",
-    "selected-states": "{ count, plural, 1 {1 dashboard state} other {# dashboard states} } არჩეულია",
+    "selected-states": "{ count, plural, =1 {1 dashboard state} other {# dashboard states} } არჩეულია",
     "edit-state": "დეშბორდის მდგომარეობის რედაქტირება",
     "delete-state": "დეშბორდის მდგომარეობის წაშლა",
     "add-state": "დაამატე დეშბორდის მდგომარეობა",
@@ -579,7 +579,7 @@
     "select-state": "მდგომარების არჩევა",
     "state-controller": "მდგომარების კონტროლერი",
     "search": "მოძებნე დეშბორდი",
-    "selected-dashboards": "{ count, plural, 1 {1 dashboard} other {# dashboards} } არჩეულია"
+    "selected-dashboards": "{ count, plural, =1 {1 dashboard} other {# dashboards} } არჩეულია"
   },
   "datakey": {
     "settings": "პარამეტრები",
@@ -597,11 +597,11 @@
     "alarm": "განგაში",
     "timeseries-required": "ტელემეტრია ობიექტის სავალდებულოა",
     "timeseries-or-attributes-required": "ტელემეტრია/ატრიბუტები სავალდებულოა",
-    "maximum-timeseries-or-attributes": "მაქსიმალური { count, plural, 1 {1 timeseries/attribute is allowed.} other {# timeseries/attributes are allowed} }",
+    "maximum-timeseries-or-attributes": "მაქსიმალური { count, plural, =1 {1 timeseries/attribute is allowed.} other {# timeseries/attributes are allowed} }",
     "alarm-fields-required": "განგაშის ველები სავალდებულოა",
     "function-types": "ფუნქციის ტიპები",
     "function-types-required": "ფუნქციის ტიპები სავალდებულოა",
-    "maximum-function-types": "მაქსიუმალური { count, plural, 1 {1 function type is allowed.} other {# function types are allowed} }",
+    "maximum-function-types": "მაქსიუმალური { count, plural, =1 {1 function type is allowed.} other {# function types are allowed} }",
     "time-description": "დრო არსებული მნიშნველობისთვის",
     "value-description": "არსებული ღირებულება",
     "prev-value-description": "წინა ფუნქციის რეზულტატი",
@@ -659,11 +659,11 @@
     "manage-credentials": "მომხმარებლის ცანაწერის მართვა",
     "delete": "მოწყობილობის წაშლა",
     "assign-devices": "მოწყობილობის მინიჭება",
-    "assign-devices-text": "მიანიჭე { count, plural, 1 {1 device} other {# devices} } კლიენტს",
+    "assign-devices-text": "მიანიჭე { count, plural, =1 {1 device} other {# devices} } კლიენტს",
     "delete-devices": "წაშალე მოწყობილობები",
     "unassign-from-customer": "მოხსენი მოხმარებელს",
     "unassign-devices": "მოხსენი მოწყობილოებები",
-    "unassign-devices-action-title": "მოხსენი { count, plural, 1 {1 device} other {# devices} } მოხმარებელს",
+    "unassign-devices-action-title": "მოხსენი { count, plural, =1 {1 device} other {# devices} } მოხმარებელს",
     "assign-new-device": "მიამაგრე ახალი მოწყობილობა",
     "make-public-device-title": "დარწმუნებული ხართ რომ გინდათ გახადოთ '{{deviceName}}' საჯარო?",
     "make-public-device-text": "დადასტურების შემდგომ , მოწყობილობა და ყველა მასთან დაკავშირებული მონაცემები იქნება საჯარო და ხელმისაწვდომი",
@@ -672,13 +672,13 @@
     "view-credentials": "მონაცემთა ბაზის ნახვა",
     "delete-device-title": "დარწმუნებული ხართ რო გინდათ წაშალოთ მოწყობილობა '{{deviceName}}'?",
     "delete-device-text": "ყურადღებით , დადასტურების შემდგომ , მოწყობილობა და ყველა მასთან დაკავშირებული ჩანაწერი არ იქნება ხელმისაწვდომი",
-    "delete-devices-title": "დარწმუნებული ხართ რო გინდათ წაშალოთ { count, plural, 1 {1 device} other {# devices} }?",
-    "delete-devices-action-title": "წაშლა { count, plural, 1 {1 device} other {# devices} }",
+    "delete-devices-title": "დარწმუნებული ხართ რო გინდათ წაშალოთ { count, plural, =1 {1 device} other {# devices} }?",
+    "delete-devices-action-title": "წაშლა { count, plural, =1 {1 device} other {# devices} }",
     "delete-devices-text": "ყურადღებით , დადასტურების შემდგომ , მოწყობილობა და ყველა მასთან დაკავშირებული ჩანაწერი არ იქნება ხელმისაწვდომი",
     "unassign-device-title": "დარწმუნებული ხართ რო გინდათ გამოიხმოთ '{{deviceName}}'?",
     "unassign-device-text": "დადასტურების შემდგომ , მოწყობილობა არ იქნება მომხმარებლისთვის  ხელმისაწვდომი",
     "unassign-device": "მოწყობილობის გამოხმობა",
-    "unassign-devices-title": "დარწმუნებული ხართ რო გინდათ გამოიხმოთ  { count, plural, 1 {1 device} other {# devices} }?",
+    "unassign-devices-title": "დარწმუნებული ხართ რო გინდათ გამოიხმოთ  { count, plural, =1 {1 device} other {# devices} }?",
     "unassign-devices-text": "დადასტურების შემდგომ , მოწყობილობა არ იქნება მომხმარებლისთვის  ხელმისაწვდომი",
     "device-credentials": "მოწყობილობის სარეგისტრაციო მონაცემები",
     "credentials-type": "მომხმარებლის ჩანაწერი",
@@ -715,7 +715,7 @@
     "import": "იმპორტირებული მოწყობილობა",
     "device-file": "მოწყობილობის ფაილი",
     "search": "მოწყობილობების ძიება",
-    "selected-devices": "{ count, plural, 1 {1 device} other {# devices} } არჩეულია"
+    "selected-devices": "{ count, plural, =1 {1 device} other {# devices} } არჩეულია"
   },
   "dialog": {
     "close": "დახუურე დიალოგი"
@@ -771,55 +771,55 @@
     "type-required": "ობიექტის ტიპი სავალდებულოა",
     "type-device": "მოწყობილობა",
     "type-devices": "მოწყობილობები",
-    "list-of-devices": "{ count, plural, 1 {One device} other {List of # devices} }",
+    "list-of-devices": "{ count, plural, =1 {One device} other {List of # devices} }",
     "device-name-starts-with": "მოწყობილობები რომლების სახელიც იწყება '{{prefix}}' -ით",
     "type-asset": "აქტივი",
     "type-assets": "აქტივები",
-    "list-of-assets": "{ count, plural, 1 {ერთი აქტიობა} other {სია შემდეგი აქტიობები} }",
+    "list-of-assets": "{ count, plural, =1 {ერთი აქტიობა} other {სია შემდეგი აქტიობები} }",
     "asset-name-starts-with": "აქტიობები, რომელიც იწყება '{{prefix}}' ით",
     "type-entity-view": "წარმოდგენილი ობიექტი",
     "type-entity-views": "წარმოდგენილი ობიექტები",
-    "list-of-entity-views": "{ count, plural, 1 {ერთი ობიექტი} other {სია შემდეგი ობიექტებიდან} }",
+    "list-of-entity-views": "{ count, plural, =1 {ერთი ობიექტი} other {სია შემდეგი ობიექტებიდან} }",
     "entity-view-name-starts-with": "ობიექტი, რომელიც იწყება '{{prefix}}' ით",
     "type-rule": " წესი",
     "type-rules": " წესები",
-    "list-of-rules": "{ count, plural, 1 {ერთი წესი} other {სია შემდეგი წესებისგან} }",
+    "list-of-rules": "{ count, plural, =1 {ერთი წესი} other {სია შემდეგი წესებისგან} }",
     "rule-name-starts-with": "წესი, ვისი სახელიც იწყება '{{prefix}}' ით",
     "type-plugin": "პლაგინი",
     "type-plugins": "პლაგინები",
-    "list-of-plugins": "{ count, plural, 1 {ერთი პლაგინი} other {სია შემდეგი პლაგინებისგან} }",
+    "list-of-plugins": "{ count, plural, =1 {ერთი პლაგინი} other {სია შემდეგი პლაგინებისგან} }",
     "plugin-name-starts-with": "პლაგინი ვისი სახელიც იწყება '{{prefix}}' ით",
     "type-tenant": "მეპატრონე",
     "type-tenants": "მეპატრონეები",
-    "list-of-tenants": "{ count, plural, 1 {ერთი მომხმარებელი} other {სია შემდეგი მომხმარებლებისგან} }",
+    "list-of-tenants": "{ count, plural, =1 {ერთი მომხმარებელი} other {სია შემდეგი მომხმარებლებისგან} }",
     "tenant-name-starts-with": "მომხმარებლები ვისი სახელიც იწყება '{{prefix}}' ით",
     "type-customer": "მომხმარებელი",
     "type-customers": "მომხმარებლები",
-    "list-of-customers": " { count, plural, 1 {ერთი მომხმარებელი} other {სია შემდეგი მომხმარებლებისგან} }",
+    "list-of-customers": " { count, plural, =1 {ერთი მომხმარებელი} other {სია შემდეგი მომხმარებლებისგან} }",
     "customer-name-starts-with": "მომხმარებლები ვისი სახელიც იწყება '{{prefix}}' ით",
     "type-user": "მომხმარებელი",
     "type-users": "მომხმარებლები",
-    "list-of-users": "მომხმარებელთა სია { count, plural, 1 {ერთი მომხმარებელი} other {სია შემდეგი მომხმარებლებისგან} }",
+    "list-of-users": "მომხმარებელთა სია { count, plural, =1 {ერთი მომხმარებელი} other {სია შემდეგი მომხმარებლებისგან} }",
     "user-name-starts-with": "მომხმარებლების ჯგუფი რომლის სახელებიც იწყება  '{{prefix}}' ით",
     "type-dashboard": "დეშბორდი",
     "type-dashboards": "დეშბორდები",
-    "list-of-dashboards": "{ count, plural, 1 {დეშბორდი} other {დეშბორდების სია} }",
+    "list-of-dashboards": "{ count, plural, =1 {დეშბორდი} other {დეშბორდების სია} }",
     "dashboard-name-starts-with": "დეშბორდები რომლების სახელებიც იწყება '{{prefix}}' -ით",
     "type-alarm": "განგაში",
     "type-alarms": "განგაშები",
-    "list-of-alarms": "{ count, plural, 1 {ერთი განგაში} other {განგაშის სია} }",
+    "list-of-alarms": "{ count, plural, =1 {ერთი განგაში} other {განგაშის სია} }",
     "alarm-name-starts-with": "განგაშები რომლების სახელებიც იწყება '{{prefix}}' -ით",
     "type-rulechain": "წესების ჯაჭვი",
     "type-rulechains": "წესების ჯაჭვები",
-    "list-of-rulechains": "{ count, plural, 1 {ერთი წესების ჯაჭვი} other {წესების ჯაჭვის სია} }",
+    "list-of-rulechains": "{ count, plural, =1 {ერთი წესების ჯაჭვი} other {წესების ჯაჭვის სია} }",
     "rulechain-name-starts-with": "წესების ჯაჭვები რომელთა სახელებიც იწყება '{{prefix}}' -ით",
     "type-rulenode": "წესების ნოუდი",
     "type-rulenodes": "წესების ნოუდები",
-    "list-of-rulenodes": "{ თვლა, plural, 1 {ერთი წესების ნოუდი} other {წესების ნოდების სია} }",
+    "list-of-rulenodes": "{ თვლა, plural, =1 {ერთი წესების ნოუდი} other {წესების ნოდების სია} }",
     "rulenode-name-starts-with": "წესების ნოუდები რომლების სახელებიც იწყება '{{prefix}}' -ით",
     "type-current-customer": "არსებული მომხმარებელი",
     "search": "ობიექტის ძიება",
-    "selected-entities": "{ count, plural, 1 {1 ობიექტი} other {# ობიექტები} } არჩეულია",
+    "selected-entities": "{ count, plural, =1 {1 ობიექტი} other {# ობიექტები} } არჩეულია",
     "entity-name": "ობიექტის სახელი",
     "entity-label": "ობიექტის ეტიკეტი",
     "details": "ობიექტის დეტალები",
@@ -881,21 +881,21 @@
     "add-entity-view-text": " წარმოდგენილი ობიექტების დამატება",
     "delete": "წარმოდგენილი ობიექტების წაშლა",
     "assign-entity-views": "წარმოდგენილი ობიექტების დამატება",
-    "assign-entity-views-text": "მომხმარებლის  { count, plural, 1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }",
+    "assign-entity-views-text": "მომხმარებლის  { count, plural, =1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }",
     "delete-entity-views": "წარმოდგენილი ობიექტების წაშლა",
     "unassign-from-customer": "მომხმარებლისდან გამოხმობა",
     "unassign-entity-views": "წარმოდგენილი ობიექტების გამოხმობა",
-    "unassign-entity-views-action-title": "გამოხმობა მომხმარებლის  { count, plural, 1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }",
+    "unassign-entity-views-action-title": "გამოხმობა მომხმარებლის  { count, plural, =1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }",
     "assign-new-entity-view": "ახალი  წარმოდგენილი ობიექტები",
     "delete-entity-view-title": "ნამდვილათ გინდათ  წარმოდგენილი ობიექტების წაშლა '{{entityViewName}}'?",
     "delete-entity-view-text": "ყურადღება! თანხმობის შემთხვევაში ობიექტის ჯგუფი და ყველა შესაბამისი ინფორმაცია არ დაექვემდებარება აღდგენას",
-    "delete-entity-views-title": "დარწმუნებული ხართ რომ გინდათ წაშალოთ  { count, plural, 1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }?",
-    "delete-entity-views-action-title": " წაშალა  { count, plural, 1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }?",
+    "delete-entity-views-title": "დარწმუნებული ხართ რომ გინდათ წაშალოთ  { count, plural, =1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }?",
+    "delete-entity-views-action-title": " წაშალა  { count, plural, =1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }?",
     "delete-entity-views-text": "ყურადღება! თანხმობის შემთხვევაში ობიექტის ჯგუფი და ყველა შესაბამისი ინფორმაცია არ დაექვემდებარება აღდგენას",
     "unassign-entity-view-title": "დარწმუნებული ხართ რომ გინდათ გამოიხმოთ  წარმოდგენილი ობიექტები '{{entityViewName}}'?",
     "unassign-entity-view-text": "ყურადღება! თანხმობის შემთხვევაში ობიექტის ჯგუფი და ყველა შესაბამისი ინფორმაცია მომხმარებლისთვის იქნება მიუწვდომელი",
     "unassign-entity-view": "წარმოდგენილი ობიექტების გამოხმობა",
-    "unassign-entity-views-title": "დარწმუნებული ხართ რომ გინდათ გამოიხმოთ  { count, plural, 1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }?",
+    "unassign-entity-views-title": "დარწმუნებული ხართ რომ გინდათ გამოიხმოთ  { count, plural, =1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }?",
     "unassign-entity-views-text": "თანხმობის შემთხვევაში ობიექტის ჯგუფი და ყველა შესაბამისი ინფორმაცია მომხმარებლისთვის იქნება მიუწვდომელი",
     "entity-view-type": "წარმოდგენილი ობიექტების ტიპი",
     "entity-view-type-required": "წარმოდგენილი ობიექტების  ტიპი აუცილებელია",
@@ -975,7 +975,7 @@
   },
   "extension": {
     "extensions": "დამატებითი აპი",
-    "selected-extensions": "{ count, plural, 1 {1 დამატებითი აპი} other {# დამატებითი აპიები} } selected",
+    "selected-extensions": "{ count, plural, =1 {1 დამატებითი აპი} other {# დამატებითი აპიები} } selected",
     "type": "ტიპი",
     "key": "გასაღები",
     "value": "მნიშვნელობა",
@@ -989,7 +989,7 @@
     "edit": "დამატებითი აპის რედაქტირება",
     "delete-extension-title": "დარწმუნებული ხართ რომ გინდათ წაშალოთ დამატებითი აპი '{{extensionId}}'?",
     "delete-extension-text": "ყურადღება, თანხმობი შემდეგ დამატებითი აპი და ყველა მასთან დაკავშირებული ინფორმაცია სამუდამოდ წაიშლება",
-    "delete-extensions-title": "დარწმუნებული ხართ რომ გინდათ წაშალოთ { count, plural, 1 {1 დამატებითი აპი} other {# დამატებითი აპები} }?",
+    "delete-extensions-title": "დარწმუნებული ხართ რომ გინდათ წაშალოთ { count, plural, =1 {1 დამატებითი აპი} other {# დამატებითი აპები} }?",
     "delete-extensions-text": "ყურადღებით, თანხმობის შემდეგ ყველა დამატებითი აპი წაიშლება",
     "converters": "გადამყვანები",
     "converter-id": "გადამყვანის-ID",
@@ -1142,8 +1142,8 @@
   "grid": {
     "delete-item-title": "დარწმუნებული ხართ რომ გინდათ წაშალოთ წარმოდგენილი ობიექტები",
     "delete-item-text": "ყურადღება! თანხმობის შემთხვევაში ობიექტის ჯგუფი და ყველა შესაბამისი ინფორმაცია არ დაექვემდებარება აღდგენას",
-    "delete-items-title": "დარწმუნებული ხართ რომ გინდათ წაშალოთ  { count, plural, 1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }?",
-    "delete-items-action-title": " წაშალა  { count, plural, 1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }?",
+    "delete-items-title": "დარწმუნებული ხართ რომ გინდათ წაშალოთ  { count, plural, =1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }?",
+    "delete-items-action-title": " წაშალა  { count, plural, =1 {1 წარმოდგენილი ობიექტები} other {# წარმოდგენილი ობიექტები} }?",
     "delete-items-text": "ყურადღება! თანხმობის შემთხვევაში ობიექტის ჯგუფი და ყველა შესაბამისი ინფორმაცია არ დაექვემდებარება აღდგენას",
     "add-item-text": "ახალი ობიექტის დამატება",
     "no-items-text": "ობიექტი არ იძებნება",
@@ -1286,7 +1286,7 @@
     },
     "from-relations": "ურთიერთობებიდან",
     "to-relations": "მოთხოვნა",
-    "selected-relations": "შერჩეული  { count, plural, 1 {1 ურთიერთობები } other {#ურთიერთობები} }",
+    "selected-relations": "შერჩეული  { count, plural, =1 {1 ურთიერთობები } other {#ურთიერთობები} }",
     "type": "ტიპი",
     "to-entity-type": "ერთეული ობიექტის ტიპისთვის",
     "to-entity-name": "პირის სახელი",
@@ -1302,11 +1302,11 @@
     "edit": "რედაქტირება",
     "delete-to-relation-title": "ნამდვილათ გსურთ წაშალოთ '{{entityName}}'?",
     "delete-to-relation-text": "ყურედღება ! დადასტურების შემდეგ '{{entityName}}' იქნება უკან გამოხმობილი",
-    "delete-to-relations-title": "ნამდვილათ გსურთ წაშალოთ  { count, plural, 1 {1 ქმედება} other {# ქმედება} }?",
+    "delete-to-relations-title": "ნამდვილათ გსურთ წაშალოთ  { count, plural, =1 {1 ქმედება} other {# ქმედება} }?",
     "delete-to-relations-text": "ყურედღება ! დადასტურების შემდეგ შერჩეული ობიექტი იქნება უკან გამოხმობილი",
     "delete-from-relation-title": "დარწმუნებული ხართ რო გინდათ '{{entityName}}' იდან ობიექტის წაშლა?",
     "delete-from-relation-text": "ყურედღება ! დადასტურების შემდეგ '{{entityName}}' იქნება უკან გამოხმობილი",
-    "delete-from-relations-title": "ნამდვილათ გსურთ წაშალოთ  { count, plural, 1 {1 ქმედება} other {# ქმედება} }?",
+    "delete-from-relations-title": "ნამდვილათ გსურთ წაშალოთ  { count, plural, =1 {1 ქმედება} other {# ქმედება} }?",
     "delete-from-relations-text": "ყურედღება ! დადასტურების შემდეგ არჩეული ობიექტები იქნება უკან გამოხმობილი არსებული ობიექტებიდან",
     "remove-relation-filter": "რელაციის ფილტრის მოშორება",
     "add-relation-filter": "რელაციის ფილტრის დამატება",
@@ -1329,8 +1329,8 @@
     "set-root-rulechain-text": "ყურედღება ! დადასტურების შემდეგ არჩეული  წესების წყობა იქნება ძირეული  და დაამუშავებს ყველა შემოსულ იმფოს",
     "delete-rulechain-title": "ნამდვილათ გსურთ წაშალოთ წესების წყობა '{{ruleChainName}}'?",
     "delete-rulechain-text": "ყურედღება ! დადასტურების შემდეგ არჩეული  წესების წყობა და მასთან დაკავშირებული ყველა ინფო იქნება წაშლილი",
-    "delete-rulechains-title": "ნამდვილათ გსურთ წაშალოთ  { count, plural, 1 {1 წესების წყობა} other {# წესების წყობა} }?",
-    "delete-rulechains-action-title": " წაშალა  { count, plural, 1 {1 წესების წყობა} other {# წესების წყობა} }?",
+    "delete-rulechains-title": "ნამდვილათ გსურთ წაშალოთ  { count, plural, =1 {1 წესების წყობა} other {# წესების წყობა} }?",
+    "delete-rulechains-action-title": " წაშალა  { count, plural, =1 {1 წესების წყობა} other {# წესების წყობა} }?",
     "delete-rulechains-text": "ყურედღება ! დადასტურების შემდეგ არჩეული  წესების წყობა და მასთან დაკავშირებული ყველა ინფო იქნება წაშლილი",
     "add-rulechain-text": "ახალი წესების წყობის ფუნქციონალის დამატება",
     "no-rulechains-text": " წესების წყობის ფუნქციონალი არ იძებნება",
@@ -1429,8 +1429,8 @@
     "tenant-details": "ტენანტის დეტალები",
     "delete-tenant-title": "დარწმუნებული ხართ რომ გსურთ '{{tenantTitle}}'-ის წაშლა ?",
     "delete-tenant-text": "ფრთხილად, დადასტურების შემდეგ ტენანტი და მასთან ასოცირებული მონაცემები იქნება დაკარგული.",
-    "delete-tenants-title": "დარწმუნებული ხართ რომ გსურთ წაშალოთ { count, plural, 1 {1 ტენანტი} other {# ტენანტი} }?",
-    "delete-tenants-action-title": "{ count, plural, 1 {1 ტენანტი} other {# ტენანტი} } წაშლა",
+    "delete-tenants-title": "დარწმუნებული ხართ რომ გსურთ წაშალოთ { count, plural, =1 {1 ტენანტი} other {# ტენანტი} }?",
+    "delete-tenants-action-title": "{ count, plural, =1 {1 ტენანტი} other {# ტენანტი} } წაშლა",
     "delete-tenants-text": "ფრთხილად, დადასტურების შემდეგ ყველა მონიშნული ტენანტი და მასთან ასოცირებული მონაცემები იქნება დაკარგული.",
     "title": "სათაური",
     "title-required": "სათაური საჭიროა",
@@ -1443,13 +1443,13 @@
     "no-tenants-matching": "ტენანტი '{{entity}}'  ვერ მოიძებნა.",
     "tenant-required": "ტენანტი სავალდებულოა",
     "search": "ტენანტის ძებნა",
-    "selected-tenants": "{ count, plural, 1 {1 ტენანტი} other {# ტენანტი} } მონიშნულია"
+    "selected-tenants": "{ count, plural, =1 {1 ტენანტი} other {# ტენანტი} } მონიშნულია"
   },
   "timeinterval": {
-    "seconds-interval": "{ seconds, plural, 1 {1 წამი} other {# წამი} }",
-    "minutes-interval": "{ minutes, plural, 1 {1 წუთი} other {# წუთი} }",
-    "hours-interval": "{ hours, plural, 1 {1 ს} other {# საათი} }",
-    "days-interval": "{ days, plural, 1 {1 დღე} other {# დღე} }",
+    "seconds-interval": "{ seconds, plural, =1 {1 წამი} other {# წამი} }",
+    "minutes-interval": "{ minutes, plural, =1 {1 წუთი} other {# წუთი} }",
+    "hours-interval": "{ hours, plural, =1 {1 ს} other {# საათი} }",
+    "days-interval": "{ days, plural, =1 {1 დღე} other {# დღე} }",
     "days": "დღე",
     "hours": "საათი",
     "minutes": "წუთი",
@@ -1457,10 +1457,10 @@
     "advanced": "დამატებითი"
   },
   "timewindow": {
-    "days": "{ days, plural, 1 { დღე } other {# დღე } }",
-    "hours": "{ hours, plural, 0 { საათი } 1 {1 საათი } other {# საათი } }",
-    "minutes": "{ minutes, plural, 0 { წუთი } 1 {1 წუთი } other {# წუთი } }",
-    "seconds": "{ seconds, plural, 0 { წამი } 1 {1 წამი } other {# წამი } }",
+    "days": "{ days, plural, =1 { დღე } other {# დღე } }",
+    "hours": "{ hours, plural, =0 { საათი } =1 {1 საათი } other {# საათი } }",
+    "minutes": "{ minutes, plural, =0 { წუთი } =1 {1 წუთი } other {# წუთი } }",
+    "seconds": "{ seconds, plural, =0 { წამი } =1 {1 წამი } other {# წამი } }",
     "realtime": "რეალური დრო",
     "history": "ისტორია",
     "last-prefix": "ბოლო",
@@ -1487,8 +1487,8 @@
     "user-details": "მომხმარებლის დეტალები",
     "delete-user-title": "დარწმუნებული ხართ რომ გინდათ '{{userEmail}}' -ის წაშლა?",
     "delete-user-text": "ფრთხილად, დადასტურების შემდეგ მომხმარებელი და მასთან ასოცირებული მონაცემები იქნება დაკარგული.",
-    "delete-users-title": "დარწმუნებული ხათ რომ გსურთ წაშალოთ { count, plural, 1 {1 მომხმარებელი} other {# მომხმარებლები} }?",
-    "delete-users-action-title": "{ count, plural, 1 {1 მომხმარებელი} other {# მომხმარებლები} } წაშლა",
+    "delete-users-title": "დარწმუნებული ხათ რომ გსურთ წაშალოთ { count, plural, =1 {1 მომხმარებელი} other {# მომხმარებლები} }?",
+    "delete-users-action-title": "{ count, plural, =1 {1 მომხმარებელი} other {# მომხმარებლები} } წაშლა",
     "delete-users-text": "ფრთხილად, დადასტურების შემდეგ ყველა მონიშნული მომხმარებელი და მასთან ასოცირებული მონაცემები იქნება დაკარგული.",
     "activation-email-sent-message": "აქტივაციი სელფოსტა წარმატებით გაიგზავნა!",
     "resend-activation": "აქტივაციის გადაგზავნა",
@@ -1514,7 +1514,7 @@
     "login-as-tenant-admin": "შესვლა როგორც ტენანტ ადმინი",
     "login-as-customer-user": "შესვლა, როგორც კლიენტის მომხმარებელი",
     "search": "მომხმარებლების ძებნა",
-    "selected-users": "{ count, plural, 1 {1 მომხმარებელი} other {# მომხმარებლები} } მონიშნულია",
+    "selected-users": "{ count, plural, =1 {1 მომხმარებელი} other {# მომხმარებლები} } მონიშნულია",
     "disable-account": "მომხმარებლის ანგარიშის გამორთვა",
     "enable-account": "მომხმარებლის ანგარიშის ჩართვა",
     "enable-account-message": "მომხმარებლის ანგარიშის წარმატებით ჩაირთო!",
@@ -1615,8 +1615,8 @@
     "widgets-bundle-details": "ვიჯეტების ნაკრების დეტალები",
     "delete-widgets-bundle-title": "დარწმუნებული ხართ რომ გსურთ ვიჯეტების ნაკრების წაშლა '{{widgetsBundleTitle}}'?",
     "delete-widgets-bundle-text": "ფრთხილად, დადასტურების შემდეგ ვიჯეტების ნაკრები და მასთან ასოცირებული მონაცემები იქნება დაკარგული.",
-    "delete-widgets-bundles-title": "დარწმუნებული ხარ  რომ გსურს წაშალო { count, plural, 1 {1 ვიჯეტის ნაკრები} other {# ვიჯეტების ნაკრები} }?",
-    "delete-widgets-bundles-action-title": "{ count, plural, 1 {1 ვიჯეტის ნაკრები} other {# ვიჯეტის ნაკრებები} } წაშლა",
+    "delete-widgets-bundles-title": "დარწმუნებული ხარ  რომ გსურს წაშალო { count, plural, =1 {1 ვიჯეტის ნაკრები} other {# ვიჯეტების ნაკრები} }?",
+    "delete-widgets-bundles-action-title": "{ count, plural, =1 {1 ვიჯეტის ნაკრები} other {# ვიჯეტის ნაკრებები} } წაშლა",
     "delete-widgets-bundles-text": "ფრთხილად, დადასტურების შემდეგ ყველა მონიშნული ვიჯეტების ნაკრები და მასთან ასოცირებული მონაცემები იქნება დაკარგული.",
     "no-widgets-bundles-matching": "ვიჯეტის ნაკრები  '{{widgetsBundle}}'  ვერ მოიძებნა.",
     "widgets-bundle-required": "ვიჯეტის ნაკრები სავალდებულოა.",
@@ -1654,7 +1654,7 @@
     "display-timewindow": "ქრონომეტრაჟის ჩვენება",
     "display-legend": "ლეგენდის ჩვენება",
     "datasources": "მონაცემთა წყაროები",
-    "maximum-datasources": "მაქს. { count, plural, 1 {1 მონცემთა წყარო დაშვებულია.} other {# მონაცემტა წყაროები დაშვებულია} }",
+    "maximum-datasources": "მაქს. { count, plural, =1 {1 მონცემთა წყარო დაშვებულია.} other {# მონაცემტა წყაროები დაშვებულია} }",
     "datasource-type": "ტიპი",
     "datasource-parameters": "პარამეტრები",
     "remove-datasource": "მონაცემთა წყაროს წაშლა",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ko_KR.json b/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
index 1d05b49950..3c2b20c82e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
@@ -265,17 +265,17 @@
         "acknowledge": "확인",
         "clear": "지우기",
         "search": "알람 검색",
-        "selected-alarms": "{ count, plural, 1 {1 개 알람} other {# 개 알람} }이 선택됨",
+        "selected-alarms": "{ count, plural, =1 {1 개 알람} other {# 개 알람} }이 선택됨",
         "no-data": "표시할 데이터가 없습니다",
         "polling-interval": "알람 풀링 간격 (초)",
         "polling-interval-required": "알람 풀링 간격을 입력하세요.",
         "min-polling-interval-message": "1초 이상의 간격만 허용됩니다.",
-        "aknowledge-alarms-title": "{ count, plural, 1 {1 개 알람} other {# 개 알람} } 확인",
-        "aknowledge-alarms-text": "{ count, plural, 1 {1 개 알람} other {# 개 알람} }의 알람을 수용하시겠습니까?",
+        "aknowledge-alarms-title": "{ count, plural, =1 {1 개 알람} other {# 개 알람} } 확인",
+        "aknowledge-alarms-text": "{ count, plural, =1 {1 개 알람} other {# 개 알람} }의 알람을 수용하시겠습니까?",
         "aknowledge-alarm-title": "알람 확인",
         "aknowledge-alarm-text": "알람을 확인하시겠습니까??",
-        "clear-alarms-title": "{ count, plural, 1 {1 개 알람} other {# 개 알람} } 해제",
-        "clear-alarms-text": "{ count, plural, 1 {1 개 알람} other {# 개 알람} }을 해제하시겠습니까?",
+        "clear-alarms-title": "{ count, plural, =1 {1 개 알람} other {# 개 알람} } 해제",
+        "clear-alarms-text": "{ count, plural, =1 {1 개 알람} other {# 개 알람} }을 해제하시겠습니까?",
         "clear-alarm-title": "알람 해제",
         "clear-alarm-text": "알람을 해제하시겠습니까?",
         "alarm-status-filter": "알람 상태 필터",
@@ -373,15 +373,15 @@
         "add-asset-text": "새로운 자산 추가",
         "asset-details": "자산 상세 내역",
         "assign-assets": "자산 할당",
-        "assign-assets-text": "{ count, plural, 1 {1 개 자산} other {# 개 자산} }을 커스터머에게 할당",
+        "assign-assets-text": "{ count, plural, =1 {1 개 자산} other {# 개 자산} }을 커스터머에게 할당",
         "delete-assets": "자산 삭제",
         "unassign-assets": "자산 할당 해제",
-        "unassign-assets-action-title": "{ count, plural, 1 {1 개 자산} other {# 개 자산} }을 커스터머로부터 할당 해제",
+        "unassign-assets-action-title": "{ count, plural, =1 {1 개 자산} other {# 개 자산} }을 커스터머로부터 할당 해제",
         "assign-new-asset": "새로운 자산 할당",
         "delete-asset-title": "자산 '{{assetName}}'을(를) 삭제하시겠습니까?",
         "delete-asset-text": "자산 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
-        "delete-assets-title": "{ count, plural, 1 {1 개 자산} other {# 개 자산} }을 삭제하시겠습니까?",
-        "delete-assets-action-title": "{ count, plural, 1 {1 개 자산} other {# 개 자산} } 삭제",
+        "delete-assets-title": "{ count, plural, =1 {1 개 자산} other {# 개 자산} }을 삭제하시겠습니까?",
+        "delete-assets-action-title": "{ count, plural, =1 {1 개 자산} other {# 개 자산} } 삭제",
         "delete-assets-text": "자산 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
         "make-public-asset-title": "자산 '{{assetName}}'을(를) 공개 상태로 변경하시겠습니까?",
         "make-public-asset-text": "자산 및 관련 데이터가 공개로 전환되면 다른 이들이 접근할 수 있게 됩니다.",
@@ -390,7 +390,7 @@
         "unassign-asset-title": "자산 '{{assetName}}'을 할당 해제 하시겠습니까?",
         "unassign-asset-text": "자산이 할당 해제되면 커스터머가 접근할 수 없게 됩니다.",
         "unassign-asset": "자산 할당 해제",
-        "unassign-assets-title": "{ count, plural, 1 {1 개 자산} other {# 개 자산} }을 할당 해제 하시겠습니까?",
+        "unassign-assets-title": "{ count, plural, =1 {1 개 자산} other {# 개 자산} }을 할당 해제 하시겠습니까?",
         "unassign-assets-text": "자산이 할당 해제되면 커스터머가 접근할 수 없게 됩니다.",
         "copyId": "자산 ID 복사",
         "idCopiedMessage": "자산 ID가 클립보드로 복사되었습니다",
@@ -401,7 +401,7 @@
         "import": "자산 불러오기",
         "asset-file": "자산 파일",
         "search": "자산 검색",
-        "selected-assets": "{ count, plural, 1 {1 개 자산} other {# 개 자산} } 선택됨",
+        "selected-assets": "{ count, plural, =1 {1 개 자산} other {# 개 자산} } 선택됨",
         "label": "라벨"
     },
     "attribute": {
@@ -418,7 +418,7 @@
         "key-required": "속성 키를 입력하세요.",
         "value": "Value",
         "value-required": "속성 값을 입력하세요.",
-        "delete-attributes-title": "{ count, plural, 1 {속성} other {여러 속성들을} } 삭제하시겠습니까??",
+        "delete-attributes-title": "{ count, plural, =1 {속성} other {여러 속성들을} } 삭제하시겠습니까??",
         "delete-attributes-text": "모든 선택된 속성들이 제거 될 것이므로 주의하십시오.",
         "delete-attributes": "속성 삭제",
         "enter-attribute-value": "속성 값 입력",
@@ -428,8 +428,8 @@
         "prev-widget": "이전 위젯",
         "add-to-dashboard": "대시보드에 추가",
         "add-widget-to-dashboard": "대시보드에 위젯 추가",
-        "selected-attributes": "{ count, plural, 1 {1 개 속성} other {# 개 속성} }이 선택됨",
-        "selected-telemetry": "{ count, plural, 1 {1 개의 텔레메트리 단위} other {# 개의 텔레메트리 단위} }가 선택됨",
+        "selected-attributes": "{ count, plural, =1 {1 개 속성} other {# 개 속성} }이 선택됨",
+        "selected-telemetry": "{ count, plural, =1 {1 개의 텔레메트리 단위} other {# 개의 텔레메트리 단위} }가 선택됨",
         "no-attributes-text": "아무 속성도 찾을 수 없습니다",
         "no-telemetry-text": "아무 텔레메트리도 찾을 수 없습니다."
     },
@@ -588,8 +588,8 @@
         "customer-details": "커스터머 상세 정보",
         "delete-customer-title": "'{{customerTitle}}' 커스터머를 삭제하시겠습니까?",
         "delete-customer-text": "커스터머 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
-        "delete-customers-title": "{ count, plural, 1 {1 개 커스터머} other {# 개 커스터머} }를 삭제하시겠습니까?",
-        "delete-customers-action-title": "{ count, plural, 1 {1 개 커스터머} other {# 개 커스터머} } 삭제",
+        "delete-customers-title": "{ count, plural, =1 {1 개 커스터머} other {# 개 커스터머} }를 삭제하시겠습니까?",
+        "delete-customers-action-title": "{ count, plural, =1 {1 개 커스터머} other {# 개 커스터머} } 삭제",
         "delete-customers-text": "커스터머 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
         "manage-users": "사용자 관리",
 		"manage-assets": "자산 관리",
@@ -609,7 +609,7 @@
         "default-customer": "기본 커스터머",
         "default-customer-required": "테넌트 수준에서 대시보드를 디버그 하기 위해서는 기본 커스터머이 필요합니다.",
         "search": "커스터머 검색",
-        "selected-customers": "{ count, plural, 1 {1 개 커스터머} other {# 개 커스터머} } 선택됨"
+        "selected-customers": "{ count, plural, =1 {1 개 커스터머} other {# 개 커스터머} } 선택됨"
     },
     "datetime": {
         "date-from": "시작 날짜",
@@ -650,20 +650,20 @@
         "add-dashboard-text": "대시보드 추가",
         "assign-dashboards": "대시보드 할당",
         "assign-new-dashboard": "새 대시보드 할당",
-        "assign-dashboards-text": "{ count, plural, 1 {1 개 대시보드} other {# 개 대시보드} }를 커스터머에 할당",
-        "unassign-dashboards-action-text": "{ count, plural, 1 {1 개 대시보드} other {# 개 대시보드} }를 커스터머로부터 지정 해제",
+        "assign-dashboards-text": "{ count, plural, =1 {1 개 대시보드} other {# 개 대시보드} }를 커스터머에 할당",
+        "unassign-dashboards-action-text": "{ count, plural, =1 {1 개 대시보드} other {# 개 대시보드} }를 커스터머로부터 지정 해제",
         "delete-dashboards": "대시보드 삭제",
         "unassign-dashboards": "대시보드 할당 취소",
-        "unassign-dashboards-action-title": "{ count, plural, 1 {1 개 대시보드} other {# 개 대시보드} }를 커스터머에 할당 취소",
+        "unassign-dashboards-action-title": "{ count, plural, =1 {1 개 대시보드} other {# 개 대시보드} }를 커스터머에 할당 취소",
         "delete-dashboard-title": "대시보드 '{{dashboardTitle}}'을(를) 삭제하시겠습니까?",
         "delete-dashboard-text": "대시보드 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
-        "delete-dashboards-title": "{ count, plural, 1 {1 개 대시보드} other {# 개 대시보드} }를 삭제하시겠습니까?",
-        "delete-dashboards-action-title": "{ count, plural, 1 {1 개 대시보드} other {# 개 대시보드} }를 삭제",
+        "delete-dashboards-title": "{ count, plural, =1 {1 개 대시보드} other {# 개 대시보드} }를 삭제하시겠습니까?",
+        "delete-dashboards-action-title": "{ count, plural, =1 {1 개 대시보드} other {# 개 대시보드} }를 삭제",
         "delete-dashboards-text": "대시보드 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
         "unassign-dashboard-title": "대시보드 '{{dashboardTitle}}'의 할당을 해제하시겠습니까?",
         "unassign-dashboard-text": "대시보드가 할당 해제되고 커스터머는 접근 할 수 없게 됩니다.",
         "unassign-dashboard": "대시보드 할달 취소",
-        "unassign-dashboards-title": "{ count, plural, 1 {1 개 대시보드} other {# 개 대시보드} }의 할당을 취소하시겠습니까?",
+        "unassign-dashboards-title": "{ count, plural, =1 {1 개 대시보드} other {# 개 대시보드} }의 할당을 취소하시겠습니까?",
         "unassign-dashboards-text": "선택된 대시보드가 할당 해제되고 커스터머는 접근 할 수 없게 됩니다.",
         "public-dashboard-title": "대시보드가 공개되었습니다",
         "public-dashboard-text": "당신의 대시보드 <b>{{dashboardTitle}}</b>는 이제 공개되어서 다음 공개 <a href='{{publicLink}}' target='_blank'>링크</a>를 통해 접근될 수 있습니다:",
@@ -744,7 +744,7 @@
         "manage-states": "대시보드 상태 관리",
         "states": "대시보드 상태",
         "search-states": "대시보드 상태 검색",
-        "selected-states": "{ count, plural, 1 {1 개 대시보드 상태} other {# 개 대시보드 상태} } 선택됨",
+        "selected-states": "{ count, plural, =1 {1 개 대시보드 상태} other {# 개 대시보드 상태} } 선택됨",
         "edit-state": "대시보드 상태 편집",
         "delete-state": "대시보드 상태 삭제",
         "add-state": "대시보드 상태 추가",
@@ -763,7 +763,7 @@
         "select-state": "대상 상태 선택",
         "state-controller": "상태 컨트롤러",
         "search": "대시보드 검색",
-        "selected-dashboards": "{ count, plural, 1 {1 개 대시보드} other {# 개 대시보드} } 선택됨"
+        "selected-dashboards": "{ count, plural, =1 {1 개 대시보드} other {# 개 대시보드} } 선택됨"
     },
     "datakey": {
         "settings": "설정",
@@ -782,11 +782,11 @@
         "timeseries-required": "장치 시계열 를 입력하세요.",
         "timeseries-or-attributes-required": "장치 시계열/속성 를 입력하세요.",
         "alarm-fields-timeseries-or-attributes-required": "Alarm fields or entity timeseries/attributes are required.",
-        "maximum-timeseries-or-attributes": "Maximum { count, plural, 1 {1 timeseries/attribute is allowed.} other {# timeseries/attributes are allowed} }",
+        "maximum-timeseries-or-attributes": "Maximum { count, plural, =1 {1 timeseries/attribute is allowed.} other {# timeseries/attributes are allowed} }",
         "alarm-fields-required": "알람 필드를 입력하세요.",
         "function-types": "함수 유형",
         "function-types-required": "함수 유형을 입력하세요.",
-        "maximum-function-types": "최대 { count, plural, 1 {1 개 함수} other {# 개 함수} } 종류만 허용됩니다.",
+        "maximum-function-types": "최대 { count, plural, =1 {1 개 함수} other {# 개 함수} } 종류만 허용됩니다.",
         "time-description": "현재 값의 타임스탬프;",
         "value-description": "현재 값;",
         "prev-value-description": "이전 함수 호출의 결과;",
@@ -845,11 +845,11 @@
         "manage-credentials": "자격 증명 관리",
         "delete": "장치 삭제",
         "assign-devices": "장치 할당",
-        "assign-devices-text": "{ count, plural, 1 {장치 1 개} other {장치 # 개} }를 커스터머에 할당",
+        "assign-devices-text": "{ count, plural, =1 {장치 1 개} other {장치 # 개} }를 커스터머에 할당",
         "delete-devices": "장치 삭제",
         "unassign-from-customer": "커스터머 할당 해제",
         "unassign-devices": "장치 할당 취소",
-        "unassign-devices-action-title": "{ count, plural, 1 {장치 1 개} other {장치 # 개} }를 커스터머에게서 할당 해제",
+        "unassign-devices-action-title": "{ count, plural, =1 {장치 1 개} other {장치 # 개} }를 커스터머에게서 할당 해제",
         "assign-new-device": "새로운 장치 할당",
         "make-public-device-title": "Are you sure you want to make the device '{{deviceName}}' public?",
         "make-public-device-text": "After the confirmation the device and all its data will be made public and accessible by others.",
@@ -858,13 +858,13 @@
         "view-credentials": "크리덴셜 보기",
         "delete-device-title": "'{{deviceName}}' 장치를 삭제하시겠습니까?",
         "delete-device-text": "장치 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
-        "delete-devices-title": "{ count, plural, 1 {장치 1 개} other {장치 # 개} }를 삭제하시겠습니까?",
-        "delete-devices-action-title": "{ count, plural, 1 {장치 1 개} other {장치 # 개} } 삭제",
+        "delete-devices-title": "{ count, plural, =1 {장치 1 개} other {장치 # 개} }를 삭제하시겠습니까?",
+        "delete-devices-action-title": "{ count, plural, =1 {장치 1 개} other {장치 # 개} } 삭제",
         "delete-devices-text": "장치 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
         "unassign-device-title": "'{{deviceName}}' 장치 할당을 해제하시겠습니까?",
         "unassign-device-text": "장치가 할당 해제되고 커스터머는 액세스 할 수 없게됩니다.",
         "unassign-device": "장치 할당 취소",
-        "unassign-devices-title": "{ count, plural, 1 {장치 1 개} other {장치 # 개} }의  할당을 해제하시겠습니까??",
+        "unassign-devices-title": "{ count, plural, =1 {장치 1 개} other {장치 # 개} }의  할당을 해제하시겠습니까??",
         "unassign-devices-text": "선택된 장치가 할당 해제되고 커스터머는 액세스 할 수 없게됩니다.",
         "device-credentials": "장치 크리덴셜",
         "credentials-type": "크리덴셜 타입",
@@ -909,7 +909,7 @@
         "import": "장치 불러오기",
         "device-file": "장치 파일",
         "search": "장치 검색",
-        "selected-devices": "{ count, plural, 1 {1 개 장치} other {# 개 장치} } 선택됨",
+        "selected-devices": "{ count, plural, =1 {1 개 장치} other {# 개 장치} } 선택됨",
         "device-configuration": "장치 설정",
         "transport-configuration": "전송 설정",
         "wizard": {
@@ -931,7 +931,7 @@
         "device-profile-details": "장치 프로파일 상세 정보",
         "no-device-profiles-text": "아무 장치 프로파일도 찾을 수 없습니다",
         "search": "장치 프로파일 검색",
-        "selected-device-profiles": "{ count, plural, 1 {1 개 장치 프로파일} other {# 개 장치 프로파일} } 선택됨",
+        "selected-device-profiles": "{ count, plural, =1 {1 개 장치 프로파일} other {# 개 장치 프로파일} } 선택됨",
         "no-device-profiles-matching": "No device profile matching '{{entity}}' were found.",
         "device-profile-required": "장치 프로파일을 입력하세요",
         "idCopiedMessage": "Device profile Id has been copied to clipboard",
@@ -961,7 +961,7 @@
         "select-queue-hint": "Select from a drop-down list.",
         "delete-device-profile-title": "Are you sure you want to delete the device profile '{{deviceProfileName}}'?",
         "delete-device-profile-text": "Be careful, after the confirmation the device profile and all related data will become unrecoverable.",
-        "delete-device-profiles-title": "Are you sure you want to delete { count, plural, 1 {1 개 장치 프로파일} other {# 개 장치 프로파일} }?",
+        "delete-device-profiles-title": "Are you sure you want to delete { count, plural, =1 {1 개 장치 프로파일} other {# 개 장치 프로파일} }?",
         "delete-device-profiles-text": "Be careful, after the confirmation all selected device profiles will be removed and all related data will become unrecoverable.",
         "set-default-device-profile-title": "Are you sure you want to make the device profile '{{deviceProfileName}}' default?",
         "set-default-device-profile-text": "After the confirmation the device profile will be marked as default and will be used for new devices with no profile specified.",
@@ -1049,7 +1049,7 @@
         "condition-repeating-value-range": "Count of events should be in a range from 1 to 2147483647.",
         "condition-repeating-value-pattern": "Count of events should be integers.",
         "condition-repeating-value-required": "Count of events is required.",
-        "condition-repeat-times": "Repeats { count, plural, 1 {1 time} other {# times} }",
+        "condition-repeat-times": "Repeats { count, plural, =1 {1 time} other {# times} }",
         "schedule-type": "Scheduler type",
         "schedule-type-required": "Scheduler type is required.",
         "schedule": "Schedule",
@@ -1126,66 +1126,66 @@
         "type-required": "개체의 유형을 입력하세요.",
         "type-device": "장치",
         "type-devices": "장치",
-        "list-of-devices": "{ count, plural, 1 {1 개 장치} other {# 개 장치} }",
+        "list-of-devices": "{ count, plural, =1 {1 개 장치} other {# 개 장치} }",
         "device-name-starts-with": "이름이 '{{prefix}}'로 시작되는 장치",
         "type-device-profile": "Device profile",
         "type-device-profiles": "Device profiles",
-        "list-of-device-profiles": "{ count, plural, 1 {1 개 장치 프로파일} other {# 개 장치 프로파일 목록} }",
+        "list-of-device-profiles": "{ count, plural, =1 {1 개 장치 프로파일} other {# 개 장치 프로파일 목록} }",
         "device-profile-name-starts-with": "Device profiles whose names start with '{{prefix}}'",
         "type-asset": "자산",
         "type-assets": "자산",
-        "list-of-assets": "{ count, plural, 1 {1 개 자산} other {# 개 자산} }",
+        "list-of-assets": "{ count, plural, =1 {1 개 자산} other {# 개 자산} }",
         "asset-name-starts-with": "이름이 '{{prefix}}'로 시작되는 자산",
         "type-entity-view": "개체 보기",
         "type-entity-views": "개체 보기",
-        "list-of-entity-views": "{ count, plural, 1 {1 개 자산 보기} other {# 개 자산 보기} }",
+        "list-of-entity-views": "{ count, plural, =1 {1 개 자산 보기} other {# 개 자산 보기} }",
         "entity-view-name-starts-with": "이름이 '{{prefix}}'로 시작되는 자산 보기",
         "type-rule": "규칙",
         "type-rules": "규칙",
-        "list-of-rules": "{ count, plural, 1 {1 개 규칙} other {# 개 규칙} }",
+        "list-of-rules": "{ count, plural, =1 {1 개 규칙} other {# 개 규칙} }",
         "rule-name-starts-with": "이름이 '{{prefix}}'로 시작되는 규칙",
         "type-plugin": "플러그인",
         "type-plugins": "플러그인",
-        "list-of-plugins": "{ count, plural, 1 {1 개 플러그인} other {# 개 플러그인} }",
+        "list-of-plugins": "{ count, plural, =1 {1 개 플러그인} other {# 개 플러그인} }",
         "plugin-name-starts-with": "이름이 '{{prefix}}'로 시작되는 플러그인",
         "type-tenant": "테넌트",
         "type-tenants": "테넌트",
-        "list-of-tenants": "{ count, plural, 1 {1 개 테넌트} other {# 개 테넌트} }",
+        "list-of-tenants": "{ count, plural, =1 {1 개 테넌트} other {# 개 테넌트} }",
         "tenant-name-starts-with": "이름이 '{{prefix}}'로 시작되는 테넌트",
         "type-tenant-profile": "테넌트 프로파일",
         "type-tenant-profiles": "테넌트 프로파일",
-        "list-of-tenant-profiles": "{ count, plural, 1 {1 개 테넌트 프로파일} other {# 개 테넌트 프로파일 목록} }",
+        "list-of-tenant-profiles": "{ count, plural, =1 {1 개 테넌트 프로파일} other {# 개 테넌트 프로파일 목록} }",
         "tenant-profile-name-starts-with": "'이름이 {{prefix}}'로 시작하는 테넌트 프로파일",
         "type-customer": "커스터머",
         "type-customers": "커스터머",
-        "list-of-customers": "{ count, plural, 1 {1 개 커스터머} other {# 개 커스터머} }",
+        "list-of-customers": "{ count, plural, =1 {1 개 커스터머} other {# 개 커스터머} }",
         "customer-name-starts-with": "이름이 '{{prefix}}'로 시작되는 커스터머",
         "type-user": "사용자",
         "type-users": "사용자",
-        "list-of-users": "{ count, plural, 1 {1 개 사용자} other {# 개 사용자} }",
+        "list-of-users": "{ count, plural, =1 {1 개 사용자} other {# 개 사용자} }",
         "user-name-starts-with": "이름이 '{{prefix}}'로 시작되는 사용자",
         "type-dashboard": "대시보드",
         "type-dashboards": "대시보드",
-        "list-of-dashboards": "{ count, plural, 1 {1 개 대시보드} other {# 개 대시보드} }",
+        "list-of-dashboards": "{ count, plural, =1 {1 개 대시보드} other {# 개 대시보드} }",
         "dashboard-name-starts-with": "이름이 '{{prefix}}'로 시작되는 대시보드",
         "type-alarm": "알람",
         "type-alarms": "알람",
-        "list-of-alarms": "{ count, plural, 1 {1 개 알람} other {# 개 알람} }",
+        "list-of-alarms": "{ count, plural, =1 {1 개 알람} other {# 개 알람} }",
         "alarm-name-starts-with": "이름이 '{{prefix}}'로 시작되는 알람",
         "type-rulechain": "규칙 사슬",
         "type-rulechains": "규칙 사슬",
-        "list-of-rulechains": "{ count, plural, 1 {1 개 규칙 사슬} other {# 개 규칙 사슬} }",
+        "list-of-rulechains": "{ count, plural, =1 {1 개 규칙 사슬} other {# 개 규칙 사슬} }",
         "rulechain-name-starts-with": "이름이 '{{prefix}}'로 시작되는 규칙 사슬",
         "type-rulenode": "규칙 노드",
         "type-rulenodes": "규칙 노드",
-        "list-of-rulenodes": "{ count, plural, 1 {1 개 규칙 노드} other {# 개 규칙 노드의 목록} }",
+        "list-of-rulenodes": "{ count, plural, =1 {1 개 규칙 노드} other {# 개 규칙 노드의 목록} }",
         "rulenode-name-starts-with": "이름이 '{{prefix}}'로 시작되는 규칙 노트",
         "type-current-customer": "현재 커스터머",
         "type-current-tenant": "현재 테넌트",
         "type-current-user": "현재 사용자",
         "type-current-user-owner": "현재 소유자",
         "search": "개체 검색",
-        "selected-entities": "{ count, plural, 1 {1 개체} other {# 개체} } 선택됨",
+        "selected-entities": "{ count, plural, =1 {1 개체} other {# 개체} } 선택됨",
         "entity-name": "개체 이름",
         "entity-label": "개체 라벨",
         "details": "개체 상세",
@@ -1250,21 +1250,21 @@
         "add-entity-view-text": "새로운 개체 보기 추가",
         "delete": "Delete entity view",
         "assign-entity-views": "개체 보기 할당",
-        "assign-entity-views-text": "{ count, plural, 1 {1 개 개체 보기} other {# 개 개체 보기} }를 커스터머에 할당",
+        "assign-entity-views-text": "{ count, plural, =1 {1 개 개체 보기} other {# 개 개체 보기} }를 커스터머에 할당",
         "delete-entity-views": "Delete entity views",
         "unassign-from-customer": "Unassign from customer",
         "unassign-entity-views": "Unassign entity views",
-        "unassign-entity-views-action-title": "{ count, plural, 1 {1 개 개체 보기} other {# 개 개체 보기} }를 커스터머로 부터 할당 해제",
+        "unassign-entity-views-action-title": "{ count, plural, =1 {1 개 개체 보기} other {# 개 개체 보기} }를 커스터머로 부터 할당 해제",
         "assign-new-entity-view": "Assign new entity view",
         "delete-entity-view-title": "Are you sure you want to delete the entity view '{{entityViewName}}'?",
         "delete-entity-view-text": "Be careful, after the confirmation the entity view and all related data will become unrecoverable.",
-        "delete-entity-views-title": "Are you sure you want to delete { count, plural, 1 {1 개 개체 보기} other {# 개 개체 보기} }?",
-        "delete-entity-views-action-title": "Delete { count, plural, 1 {1 개 개체 보기} other {# 개 개체 보기} }",
+        "delete-entity-views-title": "Are you sure you want to delete { count, plural, =1 {1 개 개체 보기} other {# 개 개체 보기} }?",
+        "delete-entity-views-action-title": "Delete { count, plural, =1 {1 개 개체 보기} other {# 개 개체 보기} }",
         "delete-entity-views-text": "Be careful, after the confirmation all selected entity views will be removed and all related data will become unrecoverable.",
         "unassign-entity-view-title": "Are you sure you want to unassign the entity view '{{entityViewName}}'?",
         "unassign-entity-view-text": "After the confirmation the entity view will be unassigned and won't be accessible by the customer.",
         "unassign-entity-view": "Unassign entity view",
-        "unassign-entity-views-title": "Are you sure you want to unassign { count, plural, 1 {1 개 개체 보기} other {# 개 개체 보기} }?",
+        "unassign-entity-views-title": "Are you sure you want to unassign { count, plural, =1 {1 개 개체 보기} other {# 개 개체 보기} }?",
         "unassign-entity-views-text": "After the confirmation all selected entity views will be unassigned and won't be accessible by the customer.",
         "entity-view-type": "개체 보기 유형",
         "entity-view-type-required": "Entity View type is required.",
@@ -1311,7 +1311,7 @@
         "make-private-entity-view-title": "Are you sure you want to make the entity view '{{entityViewName}}' private?",
         "make-private-entity-view-text": "After the confirmation the entity view and all its data will be made private and won't be accessible by others.",
         "search": "Search entity views",
-        "selected-entity-views": "{ count, plural, 1 {1 개 개체 보기} other {# 개 개체 보기} } 선택됨"
+        "selected-entity-views": "{ count, plural, =1 {1 개 개체 보기} other {# 개 개체 보기} } 선택됨"
     },
     "event": {
         "event-type": "이벤트 타입",
@@ -1345,7 +1345,7 @@
     },
     "extension": {
         "extensions": "확장",
-        "selected-extensions": "{ count, plural, 1 {1 개 확장} other {# 개 확장} }이 선택됨",
+        "selected-extensions": "{ count, plural, =1 {1 개 확장} other {# 개 확장} }이 선택됨",
         "type": "유형",
         "key": "키",
         "value": "값",
@@ -1359,7 +1359,7 @@
         "edit": "확장 편집",
         "delete-extension-title": "확장 '{{extensionId}}'을 삭제하시겠습니까?",
         "delete-extension-text": "확장 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
-        "delete-extensions-title": "{ count, plural, 1 {1 개 확장} other {# 개 확장} }을 삭제하시겠습니까?",
+        "delete-extensions-title": "{ count, plural, =1 {1 개 확장} other {# 개 확장} }을 삭제하시겠습니까?",
         "delete-extensions-text": "선택된 모든 확장이 삭제됩니다.",
         "converters": "변환기",
         "converter-id": "변환기 ID",
@@ -1673,8 +1673,8 @@
     "grid": {
         "delete-item-title": "이 항목을 삭제 하시겠습니까?",
         "delete-item-text": "항목 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
-        "delete-items-title": "{ count, plural, 1 {아이템 1 개} other {아이템 # 개} }를 삭제하시겠습니까?",
-        "delete-items-action-title": "{ count, plural, 1 {아이템 1 개} other {아이템 # 개} } 삭제",
+        "delete-items-title": "{ count, plural, =1 {아이템 1 개} other {아이템 # 개} }를 삭제하시겠습니까?",
+        "delete-items-action-title": "{ count, plural, =1 {아이템 1 개} other {아이템 # 개} } 삭제",
         "delete-items-text": "항목 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
         "add-item-text": "새로운 아이템 추가",
         "no-items-text": "아이템이 없습니다.",
@@ -1824,7 +1824,7 @@
         },
         "from-relations": "발신 관계",
         "to-relations": "수신 관계",
-        "selected-relations": "{ count, plural, 1 {1 개 관계} other {# 개 관계} } 선택됨",
+        "selected-relations": "{ count, plural, =1 {1 개 관계} other {# 개 관계} } 선택됨",
         "type": "유형",
         "to-entity-type": "받는 개체 유형",
         "to-entity-name": "받는 개체 이름",
@@ -1840,11 +1840,11 @@
         "edit": "관계 편집",
         "delete-to-relation-title": "개체 '{{entityName}}'을(를) 삭제하시겠습니까?",
         "delete-to-relation-text": "주의: 개체 '{{entityName}}'는 현재 개체와 관계가 해제됩니다.",
-        "delete-to-relations-title": "{ count, plural, 1 {1 개 관계} other {# 개 관계} }를 삭제하시겠습니까?",
+        "delete-to-relations-title": "{ count, plural, =1 {1 개 관계} other {# 개 관계} }를 삭제하시겠습니까?",
         "delete-to-relations-text": "주의: 모든 선택된 관계는 제거되며, 해당되는 개체는 현재의 개체와 관계가 해제됩니다.",
         "delete-from-relation-title": "개체 '{{entityName}}'의 관계를 삭제하시겠습니까?",
         "delete-from-relation-text": "주의: 현재 개체는 개체 '{{entityName}}'와의 관계가 해제됩니다.",
-        "delete-from-relations-title": "{ count, plural, 1 {1 개 관계} other {# 개 관계} }를 삭제하시겠습니까?",
+        "delete-from-relations-title": "{ count, plural, =1 {1 개 관계} other {# 개 관계} }를 삭제하시겠습니까?",
         "delete-from-relations-text": "주의: 모든 선택된 관계는 제거되며, 현제 개체는 해당되는 대체와 관계가 해제됩니다.",
         "remove-relation-filter": "관계 필터 삭제",
         "add-relation-filter": "관계 필터 추가",
@@ -1868,8 +1868,8 @@
         "set-root-rulechain-text": "규칙 사슬은 루트가 되며, 인입하는 전송 메시지를 모두 취급하게 됩니다.",
         "delete-rulechain-title": "규칙 사슬 '{{ruleChainName}}'을 삭제하시겠습니까?",
         "delete-rulechain-text": "주의: 규칙 사슬 및 관련된 모든 데이터의 복구가 불가능해집니다.",
-        "delete-rulechains-title": "{ count, plural, 1 {1 개 규칙 사슬} other {# 개 규칙 사슬} }을 삭제하시겠습니까?",
-        "delete-rulechains-action-title": "{ count, plural, 1 {1 개 규칙 사슬} other {# 개 규칙 사슬} } 삭제",
+        "delete-rulechains-title": "{ count, plural, =1 {1 개 규칙 사슬} other {# 개 규칙 사슬} }을 삭제하시겠습니까?",
+        "delete-rulechains-action-title": "{ count, plural, =1 {1 개 규칙 사슬} other {# 개 규칙 사슬} } 삭제",
         "delete-rulechains-text": "주의: 모든 선택된 규칙 사슬은 삭제되며, 모든 관련된 데이터는 복구가 불가능해집니다.",
         "add-rulechain-text": "새로운 규칙 사슬 추가",
         "no-rulechains-text": "아무 규칙 사슬도 없습니다.",
@@ -1891,7 +1891,7 @@
         "management": "규칙 관리",
         "debug-mode": "디버그 모드",
         "search": "규칙 사슬 검색",
-        "selected-rulechains": "{ count, plural, 1 {1 개 규칙 사슬} other {# 개 규칙 사슬} } 선택됨",
+        "selected-rulechains": "{ count, plural, =1 {1 개 규칙 사슬} other {# 개 규칙 사슬} } 선택됨",
         "open-rulechain": "규칙 사슬 열기"
     },
     "rulenode": {
@@ -1982,8 +1982,8 @@
         "tenant-details": "테넌트 상세 정보",
         "delete-tenant-title": "'{{tenantTitle}}' 테넌트를 삭제하시겠습니까?",
         "delete-tenant-text": "테넌트 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
-        "delete-tenants-title": "{ count, plural, 1 {테넌트 1 개} other {테넌트 # 개} }를 삭제하시겠습니까?",
-        "delete-tenants-action-title": "{ count, plural, 1 {테넌트 1 개} other {테넌트 # 개} } 삭제",
+        "delete-tenants-title": "{ count, plural, =1 {테넌트 1 개} other {테넌트 # 개} }를 삭제하시겠습니까?",
+        "delete-tenants-action-title": "{ count, plural, =1 {테넌트 1 개} other {테넌트 # 개} } 삭제",
         "delete-tenants-text": "테넌트 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
         "title": "제목",
         "title-required": "제목을 입력하세요.",
@@ -1996,7 +1996,7 @@
         "no-tenants-matching": "태넌트 '{{entity}}'을(를) 찾을 수 없습니다.",
         "tenant-required": "테넌트가 필요합니다.",
         "search": "테넌트 검색",
-        "selected-tenants": "{ count, plural, 1 {1 개 테넌트} other {# 개 테넌트} } 선택됨",
+        "selected-tenants": "{ count, plural, =1 {1 개 테넌트} other {# 개 테넌트} } 선택됨",
         "isolated-tb-rule-engine": "Processing in isolated ThingsBoard Rule Engine container",
         "isolated-tb-rule-engine-details": "Requires separate microservice(s) per isolated Tenant"
 	},
@@ -2008,7 +2008,7 @@
         "tenant-profile-details": "Tenant profile details",
         "no-tenant-profiles-text": "아무 테넌트 프로파일도 찾지 못했습니다",
         "search": "테넌트 프로파일 검색",
-        "selected-tenant-profiles": "{ count, plural, 1 {1 개 테넌트 프로파일} other {# 개 테넌트 프로파일} } 선택됨",
+        "selected-tenant-profiles": "{ count, plural, =1 {1 개 테넌트 프로파일} other {# 개 테넌트 프로파일} } 선택됨",
         "no-tenant-profiles-matching": "No tenant profile matching '{{entity}}' were found.",
         "tenant-profile-required": "테넌트 프로파일을 입력하세요",
         "idCopiedMessage": "테넌트 프로파일 ID가 클립보드에 저장되었습니다",
@@ -2023,7 +2023,7 @@
         "default": "기본값",
         "delete-tenant-profile-title": "Are you sure you want to delete the tenant profile '{{tenantProfileName}}'?",
         "delete-tenant-profile-text": "Be careful, after the confirmation the tenant profile and all related data will become unrecoverable.",
-        "delete-tenant-profiles-title": "{ count, plural, 1 {1 개 테넌트 프로파일} other {# 개 테넌트 프로파일} }을 삭제하시겠습니까?",
+        "delete-tenant-profiles-title": "{ count, plural, =1 {1 개 테넌트 프로파일} other {# 개 테넌트 프로파일} }을 삭제하시겠습니까?",
         "delete-tenant-profiles-text": "Be careful, after the confirmation all selected tenant profiles will be removed and all related data will become unrecoverable.",
         "set-default-tenant-profile-title": "Are you sure you want to make the tenant profile '{{tenantProfileName}}' default?",
         "set-default-tenant-profile-text": "After the confirmation the tenant profile will be marked as default and will be used for new tenants with no profile specified.",
@@ -2082,10 +2082,10 @@
         "max-sms-range": "Maximum number of SMS sent can't be negative"
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, 1 {1 초} other {# 초} }",
-        "minutes-interval": "{ minutes, plural, 1 {1 분} other {# 분} }",
-        "hours-interval": "{ hours, plural, 1 {1 시간} other {# 시간} }",
-        "days-interval": "{ days, plural, 1 {1 일} other {# 일} }",
+        "seconds-interval": "{ seconds, plural, =1 {1 초} other {# 초} }",
+        "minutes-interval": "{ minutes, plural, =1 {1 분} other {# 분} }",
+        "hours-interval": "{ hours, plural, =1 {1 시간} other {# 시간} }",
+        "days-interval": "{ days, plural, =1 {1 일} other {# 일} }",
         "days": "일",
         "hours": "시간",
         "minutes": "분",
@@ -2099,10 +2099,10 @@
         "days": "일"
     },
     "timewindow": {
-        "days": "{ days, plural, 1 {1 일 } other {# 일 } }",
-        "hours": "{ hours, plural, 0 {0 시간 } 1 {1 시간 } other {# 시간 } }",
-        "minutes": "{ minutes, plural, 0 {0 분 } 1 {1 분 } other {# 분 } }",
-        "seconds": "{ seconds, plural, 0 {0 초 } 1 {1 초 } other {# 초 } }",
+        "days": "{ days, plural, =1 {1 일 } other {# 일 } }",
+        "hours": "{ hours, plural, =0 {0 시간 } =1 {1 시간 } other {# 시간 } }",
+        "minutes": "{ minutes, plural, =0 {0 분 } =1 {1 분 } other {# 분 } }",
+        "seconds": "{ seconds, plural, =0 {0 초 } =1 {1 초 } other {# 초 } }",
         "realtime": "실시간",
         "history": "기록",
         "last-prefix": "과거",
@@ -2129,8 +2129,8 @@
         "user-details": "사용자 상세 정보",
         "delete-user-title": "사용자 '{{userEmail}}'을(를) 삭제하시겠습니까?",
         "delete-user-text": "사용자 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
-        "delete-users-title": "{ count, plural, 1 {사용자 1명} other {사용자 #명} }을 삭제하시겠습니까?",
-        "delete-users-action-title": "{ count, plural, 1 {사용자 1명} other {사용자 #명} } 삭제",
+        "delete-users-title": "{ count, plural, =1 {사용자 1명} other {사용자 #명} }을 삭제하시겠습니까?",
+        "delete-users-action-title": "{ count, plural, =1 {사용자 1명} other {사용자 #명} } 삭제",
         "delete-users-text": "사용자 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
         "activation-email-sent-message": "활성화 이메일을 보냈습니다!",
         "resend-activation": "활성화 재전송",
@@ -2156,7 +2156,7 @@
         "login-as-tenant-admin": "테넌트 관리자로 로그인",
         "login-as-customer-user": "커스터머 사용자로 로그인",
         "search": "사용자 검색",
-        "selected-users": "{ count, plural, 1 {1명 사용자} other {#명 사용자} } 선택됨",
+        "selected-users": "{ count, plural, =1 {1명 사용자} other {#명 사용자} } 선택됨",
         "disable-account": "사용자 계정 비활성화",
         "enable-account": "사용자 계정 활성",
         "enable-account-message": "사용자 계정이 성공적으로 활성화 되었습니다!",
@@ -2268,8 +2268,8 @@
         "widgets-bundle-details": "위젯 번들 상세 정보",
         "delete-widgets-bundle-title": "'{{widgetsBundleTitle}}' 위젯 번들을 삭제하시겠습니까?",
         "delete-widgets-bundle-text": "위젯 번들 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
-        "delete-widgets-bundles-title": "{ count, plural, 1 {위젯 번들 1 개} other {위젯 번들 # 개} }를 삭제하시겠습니까?",
-        "delete-widgets-bundles-action-title": "{ count, plural, 1 {위젯 번들 1 개} other {위젯 번들 # 개} } 삭제",
+        "delete-widgets-bundles-title": "{ count, plural, =1 {위젯 번들 1 개} other {위젯 번들 # 개} }를 삭제하시겠습니까?",
+        "delete-widgets-bundles-action-title": "{ count, plural, =1 {위젯 번들 1 개} other {위젯 번들 # 개} } 삭제",
         "delete-widgets-bundles-text": "위젯 번들 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
         "no-widgets-bundles-matching": "'{{widgetsBundle}}' 와(과) 일치하는 위젯 번들을 찾을 수 없습니다.",
         "widgets-bundle-required": "위젯 번들을 입력하세요.",
@@ -2281,7 +2281,7 @@
         "widgets-bundle-file": "위젯 번들 파일",
         "invalid-widgets-bundle-file-error": "위젯 번들을 가져오기 할 수 없습니다.: 잘못된 위젯 번들 데이터 구조입니다.",
         "search": "위젯 번들 검색",
-        "selected-widgets-bundles": "{ count, plural, 1 {1 개 위젯 번들} other {# 개 위젯 번들} } 선택됨",
+        "selected-widgets-bundles": "{ count, plural, =1 {1 개 위젯 번들} other {# 개 위젯 번들} } 선택됨",
         "open-widgets-bundle": "위젯 번들 열기"
     },
     "widget-config": {
@@ -2310,7 +2310,7 @@
         "display-timewindow": "타임윈도우 표시",
         "display-legend": "범례 표시",
         "datasources": "데이터 소스",
-		"maximum-datasources": "최대 { count, plural, 1 {1 개의 데이터 소스만 허용됩니다.} other {# 개의 데이터 소스만 허용됩니다.} }",
+		"maximum-datasources": "최대 { count, plural, =1 {1 개의 데이터 소스만 허용됩니다.} other {# 개의 데이터 소스만 허용됩니다.} }",
         "datasource-type": "유형",
         "datasource-parameters": "파라미터",
         "remove-datasource": "데이터소스 삭제",
diff --git a/ui-ngx/src/assets/locale/locale.constant-lv_LV.json b/ui-ngx/src/assets/locale/locale.constant-lv_LV.json
index 77ca2300b5..97998587da 100644
--- a/ui-ngx/src/assets/locale/locale.constant-lv_LV.json
+++ b/ui-ngx/src/assets/locale/locale.constant-lv_LV.json
@@ -128,17 +128,17 @@
         "acknowledge": "Apstiprināt",
         "clear": "Notīrīt",
         "search": "Meklēt trauksmes",
-        "selected-alarms": "{ count, plural, 1 {1 alarm} other {# trauksmes} } selected",
+        "selected-alarms": "{ count, plural, =1 {1 alarm} other {# trauksmes} } selected",
         "no-data": "Nav datu ko attēlot",
         "polling-interval": "Trauksmju pārbaužu intervāls (sec)",
         "polling-interval-required": "Trauksmju pārbaužu intervāls ir nepieciešams.",
         "min-polling-interval-message": "Vismaz 1 sekundes pārbaužu intervāls ir atļauts.",
-        "aknowledge-alarms-title": "Apstiprināt { count, plural, 1 {1 alarm} other {# trauksmes} }",
-        "aknowledge-alarms-text": "Vai Jūs tiešām vēlaties apstirpināt { count, plural, 1 {1 alarm} other {# trauksmes} }?",
+        "aknowledge-alarms-title": "Apstiprināt { count, plural, =1 {1 alarm} other {# trauksmes} }",
+        "aknowledge-alarms-text": "Vai Jūs tiešām vēlaties apstirpināt { count, plural, =1 {1 alarm} other {# trauksmes} }?",
         "aknowledge-alarm-title": "Apstiprināt trauksmi",
         "aknowledge-alarm-text": "Vai Jūs tiešām vēlaties apstiprināt trauksmi?",
-        "clear-alarms-title": "Dzēst { count, plural, 1 {1 alarm} other {# trauksmes} }",
-        "clear-alarms-text": "Vai Jūs tiešām vēlaties dzēst { count, plural, 1 {1 alarm} other {# trauksmes} }?",
+        "clear-alarms-title": "Dzēst { count, plural, =1 {1 alarm} other {# trauksmes} }",
+        "clear-alarms-text": "Vai Jūs tiešām vēlaties dzēst { count, plural, =1 {1 alarm} other {# trauksmes} }?",
         "clear-alarm-title": "Dzēst trauksmi",
         "clear-alarm-text": "Vai Jūs tiešām vēlaties dzēst trauksmi?",
         "alarm-status-filter": "Trauksmes statusa filtrs"
@@ -224,15 +224,15 @@
         "add-asset-text": "Pievieno jaunu aktīvu",
         "asset-details": "Aktīvu detaļas",
         "assign-assets": "Piešķirt aktīvus",
-        "assign-assets-text": "Piešķirt { count, plural, 1 {1 asset} other {# aktīvus} } klientam",
+        "assign-assets-text": "Piešķirt { count, plural, =1 {1 asset} other {# aktīvus} } klientam",
         "delete-assets": "Dzēst aktīvus",
         "unassign-assets": "Noņemt aktīvus",
-        "unassign-assets-action-title": "Noņemt { count, plural, 1 {1 asset} other {# aktīvus} } no klienta",
+        "unassign-assets-action-title": "Noņemt { count, plural, =1 {1 asset} other {# aktīvus} } no klienta",
         "assign-new-asset": "Pieškirt jaunu aktīvu",
         "delete-asset-title": "Vai esat pārliecināts,ka vēlaties dzēst aktīvu '{{assetName}}'?",
         "delete-asset-text": "Esiet uzmanīgs, pēc apstiprināšanas aktīvs un saistītie dati nebūs atjaunojami.",
-        "delete-assets-title": "Vai esat pārliecināts ka vēlaties dzēst { count, plural, 1 {1 asset} other {# aktīvus} }?",
-        "delete-assets-action-title": "Dzēst { count, plural, 1 {1 asset} other {# aktīvus} }",
+        "delete-assets-title": "Vai esat pārliecināts ka vēlaties dzēst { count, plural, =1 {1 asset} other {# aktīvus} }?",
+        "delete-assets-action-title": "Dzēst { count, plural, =1 {1 asset} other {# aktīvus} }",
         "delete-assets-text": "Esiet uzmanīgs, pēc apstiprinājuma visi izvēlētie aktīvi tiks dzēsti un saistītā informācija nebūs atjaunojama.",
         "make-public-asset-title": "Vai esat pārliecināts ka vēlaties aktīvu '{{assetName}}' veidot publisku?",
         "make-public-asset-text": "Pēc apstiprinājuma aktīvs un tā dati tiks publiski pieejami.",
@@ -241,7 +241,7 @@
         "unassign-asset-title": "Vai esat pārliecināts ka vēlaties noņemt aktīvu '{{assetName}}'?",
         "unassign-asset-text": "Pēc apstiprināšanas aktīvs tiks noņemts un nebūs pieejams klientiem.",
         "unassign-asset": "Noņemt aktīvu",
-        "unassign-assets-title": "Vai esat pārliecināts ka vēlaties noņemt  { count, plural, 1 {1 asset} other {# aktīvus} }?",
+        "unassign-assets-title": "Vai esat pārliecināts ka vēlaties noņemt  { count, plural, =1 {1 asset} other {# aktīvus} }?",
         "unassign-assets-text": "Pēc apstiprināšanas visi izvēlētie aktīvi būs noņemti un nebūs pieejami klientiem.",
         "copyId": "Kopēt aktīva Id",
         "idCopiedMessage": "Aktīva Id ir kopēts uz starpliktuvi",
@@ -266,7 +266,7 @@
         "key-required": "Atribūta atslēga ir nepieciešama.",
         "value": "Vērtība",
         "value-required": "Atribūta vērtība ir nepieciešama.",
-        "delete-attributes-title": "Vai esat pārliecināts ka vēlaties dzēst { count, plural, 1 {1 attribute} other {# attribūtus} }?",
+        "delete-attributes-title": "Vai esat pārliecināts ka vēlaties dzēst { count, plural, =1 {1 attribute} other {# attribūtus} }?",
         "delete-attributes-text": "Esiet uzmanīgs, pēc apstiprinājuma visi izvēlētie atribūti tiks dzēsti.",
         "delete-attributes": "Dzēst atribūtu",
         "enter-attribute-value": "Ievadiet atribūta vērtību",
@@ -276,8 +276,8 @@
         "prev-widget": "Iepriekšējais logrīks",
         "add-to-dashboard": "Pievienot panelim",
         "add-widget-to-dashboard": "Pievienot logrīku panelim",
-        "selected-attributes": "{ count, plural, 1 {1 attribute} other {# atribūtus} } izvēlētajam",
-        "selected-telemetry": "{ count, plural, 1 {1 telemetry unit} other {# telemetrijas vienības} } izvēlētas"
+        "selected-attributes": "{ count, plural, =1 {1 attribute} other {# atribūtus} } izvēlētajam",
+        "selected-telemetry": "{ count, plural, =1 {1 telemetry unit} other {# telemetrijas vienības} } izvēlētas"
     },
     "audit-log": {
         "audit": "Audits",
@@ -373,8 +373,8 @@
         "customer-details": "Klienta detaļas",
         "delete-customer-title": "Vai esat pārliecināts, ka vēlaties dzēst klientu '{{customerTitle}}'?",
         "delete-customer-text": "Esiet uzmanīgs, pēc apstiprinājuma klients un tā saistītie dati nebūs atjaunojami.",
-        "delete-customers-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, 1 {1 customer} other {# klientus} }?",
-        "delete-customers-action-title": "Dzēst { count, plural, 1 {1 customer} other {# klientus} }",
+        "delete-customers-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, =1 {1 customer} other {# klientus} }?",
+        "delete-customers-action-title": "Dzēst { count, plural, =1 {1 customer} other {# klientus} }",
         "delete-customers-text": "Esiet uzmanīgs, pēc apstiprinājuma visi izvēlētie klienti tisk dzēsti un to saistītie dati nebūs atjaunojami.",
         "manage-users": "Pārvaldīt lietotājus",
         "manage-assets": "Pārvaldīt aktīvus",
@@ -433,20 +433,20 @@
         "add-dashboard-text": "Pievienot jaunu paneli",
         "assign-dashboards": "Pieškirt paneļus",
         "assign-new-dashboard": "Pieškirt jaunu paneli",
-        "assign-dashboards-text": "Pieškirt { count, plural, 1 {1 dashboard} other {# paneļus} } klientiem",
-        "unassign-dashboards-action-text": "Noņemt { count, plural, 1 {1 dashboard} other {# paneļus} } no klientiem",
+        "assign-dashboards-text": "Pieškirt { count, plural, =1 {1 dashboard} other {# paneļus} } klientiem",
+        "unassign-dashboards-action-text": "Noņemt { count, plural, =1 {1 dashboard} other {# paneļus} } no klientiem",
         "delete-dashboards": "Dzēst paneļus",
         "unassign-dashboards": "Noņemt paneļus",
-        "unassign-dashboards-action-title": "Noņemt { count, plural, 1 {1 dashboard} other {# paneļus} } no klienta",
+        "unassign-dashboards-action-title": "Noņemt { count, plural, =1 {1 dashboard} other {# paneļus} } no klienta",
         "delete-dashboard-title": "Vai esat pārliecināts ka vēlaties dzēst paneli '{{dashboardTitle}}'?",
         "delete-dashboard-text": "Esiet uzmanīgs, pēc apstiprinājuma panelis un visi tā saistītie dati nebūs atjaunojami.",
-        "delete-dashboards-title": "Vai esat pārliecināts ka vēlaties dzēst  { count, plural, 1 {1 dashboard} other {# paneļus} }?",
-        "delete-dashboards-action-title": "Dzēst { count, plural, 1 {1 dashboard} other {# paneļus} }",
+        "delete-dashboards-title": "Vai esat pārliecināts ka vēlaties dzēst  { count, plural, =1 {1 dashboard} other {# paneļus} }?",
+        "delete-dashboards-action-title": "Dzēst { count, plural, =1 {1 dashboard} other {# paneļus} }",
         "delete-dashboards-text": "Esiet uzmanīgs, pēc apstiprinājuma visi izvēlētie paneļi būs noņemti un visi saistitie dati nebūs atjaunojami.",
         "unassign-dashboard-title": "Vai esat pārliecināts, ka vēlaties noņemt paneli '{{dashboardTitle}}'?",
         "unassign-dashboard-text": "Pēc apstiprinājuma panelis tiks noņemts un nebūs pieejams klientam.",
         "unassign-dashboard": "Noņemt paneli",
-        "unassign-dashboards-title": "Vai esat pārliecināts ka vēlaties noņemt { count, plural, 1 {1 dashboard} other {# paneļus} }?",
+        "unassign-dashboards-title": "Vai esat pārliecināts ka vēlaties noņemt { count, plural, =1 {1 dashboard} other {# paneļus} }?",
         "unassign-dashboards-text": "Pēc apstiprinājuma visi izvēlētie paneļi būs noņemti un nebūs pieejami klientam.",
         "public-dashboard-title": "Panelis tagad ir publisks",
         "public-dashboard-text": "Jūsu panelis <b>{{dashboardTitle}}</b> tagad ir publisks un pieejams pēc saites  <a href='{{publicLink}}' target='_blank'>link</a>:",
@@ -523,7 +523,7 @@
         "manage-states": "Pārvaldīt paneļa stāvokļus",
         "states": "Paneļa stāvokļi",
         "search-states": "Meklēt paneļa stāvokļus",
-        "selected-states": "{ count, plural, 1 {1 dashboard state} other {# paneļu statusus} } atlasītos",
+        "selected-states": "{ count, plural, =1 {1 dashboard state} other {# paneļu statusus} } atlasītos",
         "edit-state": "Rediģēt paneļa stāvokli",
         "delete-state": "Dzēst paneļa stāvokli",
         "add-state": "Pievienot paneļa stāvokli",
@@ -556,11 +556,11 @@
         "alarm": "Trauksme",
         "timeseries-required": "Vienības laika periodi ir nepieciešami.",
         "timeseries-or-attributes-required": "Vienības laika periodi/atribūti ir nepieciešami.",
-        "maximum-timeseries-or-attributes": "Maksimums { count, plural, 1 {1 timeseries/attribute is allowed.} other {# laika sērijas/atribūti ir atļauti} }",
+        "maximum-timeseries-or-attributes": "Maksimums { count, plural, =1 {1 timeseries/attribute is allowed.} other {# laika sērijas/atribūti ir atļauti} }",
         "alarm-fields-required": "Trauksmes lauki ir nepieciešami.",
         "function-types": "Funkciju tipi",
         "function-types-required": "Funkciju tipi ir nepieciešami.",
-        "maximum-function-types": "Maksimums { count, plural, 1 {1 function type is allowed.} other {# funkciju tipi ir atļauti} }",
+        "maximum-function-types": "Maksimums { count, plural, =1 {1 function type is allowed.} other {# funkciju tipi ir atļauti} }",
         "time-description": "Laika zīmogs patreizējai vērtībai;",
         "value-description": "patreizējā vērtība;",
         "prev-value-description": "rezultāts no iepriekšējā funkciju pieprasījuma;",
@@ -617,11 +617,11 @@
         "manage-credentials": "Pārvaldīt akreditācijas datus",
         "delete": "Dzēst iekārtu",
         "assign-devices": "Pieškirt iekārtas",
-        "assign-devices-text": "Piešķirt { count, plural, 1 {1 device} other {# iekārtas} } klientam",
+        "assign-devices-text": "Piešķirt { count, plural, =1 {1 device} other {# iekārtas} } klientam",
         "delete-devices": "Dzēst iekārtas",
         "unassign-from-customer": "Noņemt no klienta",
         "unassign-devices": "Noņemt iekārtas",
-        "unassign-devices-action-title": "Noņemt { count, plural, 1 {1 device} other {# iekārtas} } no klienta",
+        "unassign-devices-action-title": "Noņemt { count, plural, =1 {1 device} other {# iekārtas} } no klienta",
         "assign-new-device": "Pieškirt jaunu iekārtu",
         "make-public-device-title": "Vai esat pārliecināts ka vēlaties veidot iekārtu '{{deviceName}}' publisku?",
         "make-public-device-text": "Pēc apstiprinājuma iekārta un tās saistītie dati būs pieejami publiski un pieejami citiem.",
@@ -630,13 +630,13 @@
         "view-credentials": "Skatīt akreditācijas datus",
         "delete-device-title": "Vai esat pārliecināts, ka vēlaties dzēst iekārtu '{{deviceName}}'?",
         "delete-device-text": "Esat uzmanīgs, pēc apstiprinājuma iekārta un tās saistītie dati nebūs atjaunojami.",
-        "delete-devices-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, 1 {1 device} other {# iekārtas} }?",
-        "delete-devices-action-title": "Dzēst { count, plural, 1 {1 device} other {# iekārtas} }",
+        "delete-devices-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, =1 {1 device} other {# iekārtas} }?",
+        "delete-devices-action-title": "Dzēst { count, plural, =1 {1 device} other {# iekārtas} }",
         "delete-devices-text": "Esat uzmanīgs, pēc apstiprinājuma iekārtas un to saistītie dati tiks noņemti un nebūs atjaunojami.",
         "unassign-device-title": "Vai esat pārliecināts, ka vēlaties noņemt iekārtu '{{deviceName}}'?",
         "unassign-device-text": "Pēc apstiprinājuma iekārta tiks noņemta un nebūs pieejama klientam.",
         "unassign-device": "Noņemt iekārtu",
-        "unassign-devices-title": "Vai esat pārliecināts, ka vēlaties noņemt  { count, plural, 1 {1 device} other {# iekārtas} }?",
+        "unassign-devices-title": "Vai esat pārliecināts, ka vēlaties noņemt  { count, plural, =1 {1 device} other {# iekārtas} }?",
         "unassign-devices-text": "Pēc apstipinājuma visas atlasītās iekārtas būs noņemtas un nebūs pieejamas klientam.",
         "device-credentials": "iekārtas akreditācijas dati",
         "credentials-type": "Akreditācijas datu tips",
@@ -727,55 +727,55 @@
         "type-required": "Vienības tips ir nepieciešams.",
         "type-device": "Iekārta",
         "type-devices": "Iekārtas",
-        "list-of-devices": "{ count, plural, 1 {One device} other {List of # iekārtas} }",
+        "list-of-devices": "{ count, plural, =1 {One device} other {List of # iekārtas} }",
         "device-name-starts-with": "Iekārtas, kuras nosaukumi sākas ar '{{prefix}}'",
         "type-asset": "Aktīvs",
         "type-assets": "Aktīvi",
-        "list-of-assets": "{ count, plural, 1 {One asset} other {List of # aktīvi} }",
+        "list-of-assets": "{ count, plural, =1 {One asset} other {List of # aktīvi} }",
         "asset-name-starts-with": "Aktīvi, kuru nosaukumi sākas ar '{{prefix}}'",
         "type-entity-view": "Vienības skats View",
         "type-entity-views": "Vienības skati",
-        "list-of-entity-views": "{ count, plural, 1 {One entity view} other {List of # vienību skati} }",
+        "list-of-entity-views": "{ count, plural, =1 {One entity view} other {List of # vienību skati} }",
         "entity-view-name-starts-with": "Vienibas skati, kuru nosaukumi sākas ar '{{prefix}}'",
         "type-rule": "Noteikums",
         "type-rules": "Noteikumi",
-        "list-of-rules": "{ count, plural, 1 {One rule} other {List of # noteikumi} }",
+        "list-of-rules": "{ count, plural, =1 {One rule} other {List of # noteikumi} }",
         "rule-name-starts-with": "Noteikumi, kuru nosaukumi sākas ar '{{prefix}}'",
         "type-plugin": "Spraudnis",
         "type-plugins": "Spraudņi",
-        "list-of-plugins": "{ count, plural, 1 {One plugin} other {List of # spraudņi} }",
+        "list-of-plugins": "{ count, plural, =1 {One plugin} other {List of # spraudņi} }",
         "plugin-name-starts-with": "Spraudņi, kuru vārds sākas ar '{{prefix}}'",
         "type-tenant": "Īrnieks",
         "type-tenants": "Īrnieki",
-        "list-of-tenants": "{ count, plural, 1 {One tenant} other {List of # īrnieki} }",
+        "list-of-tenants": "{ count, plural, =1 {One tenant} other {List of # īrnieki} }",
         "tenant-name-starts-with": "Īrnieki, kuru nosaukumi sākas ar '{{prefix}}'",
         "type-customer": "Klients",
         "type-customers": "Klienti",
-        "list-of-customers": "{ count, plural, 1 {One customer} other {List of # klienti} }",
+        "list-of-customers": "{ count, plural, =1 {One customer} other {List of # klienti} }",
         "customer-name-starts-with": "Klienti, kuru nosaukumi sākas ar '{{prefix}}'",
         "type-user": "Lietotājs",
         "type-users": "Lietotāji",
-        "list-of-users": "{ count, plural, 1 {One user} other {List of # lietotāji} }",
+        "list-of-users": "{ count, plural, =1 {One user} other {List of # lietotāji} }",
         "user-name-starts-with": "Lietotāji, kuru nosaukums sākas ar '{{prefix}}'",
         "type-dashboard": "Panelis",
         "type-dashboards": "Paneļi",
-        "list-of-dashboards": "{ count, plural, 1 {One dashboard} other {List of # paneļi} }",
+        "list-of-dashboards": "{ count, plural, =1 {One dashboard} other {List of # paneļi} }",
         "dashboard-name-starts-with": "Paneļi, kuru nosaukums sākas ar '{{prefix}}'",
         "type-alarm": "Trauksme",
         "type-alarms": "Trauksmes",
-        "list-of-alarms": "{ count, plural, 1 {One alarms} other {List of # trauksmes} }",
+        "list-of-alarms": "{ count, plural, =1 {One alarms} other {List of # trauksmes} }",
         "alarm-name-starts-with": "Trauksmes, kuru nosaukumi sākas ar '{{prefix}}'",
         "type-rulechain": "Noteikumu ķēde",
         "type-rulechains": "Noteikumu ķēdes",
-        "list-of-rulechains": "{ count, plural, 1 {One rule chain} other {List of # noteikumu ķēdes} }",
+        "list-of-rulechains": "{ count, plural, =1 {One rule chain} other {List of # noteikumu ķēdes} }",
         "rulechain-name-starts-with": "Noteikumu ķēdes, kuru nosaukumi sākas ar '{{prefix}}'",
         "type-rulenode": "Noteikumu node",
         "type-rulenodes": "Noteikumu nodes",
-        "list-of-rulenodes": "{ count, plural, 1 {One rule node} other {List of # noteikumu nodes} }",
+        "list-of-rulenodes": "{ count, plural, =1 {One rule node} other {List of # noteikumu nodes} }",
         "rulenode-name-starts-with": "Noteikumu nodes, juru nosaukumi sākas ar '{{prefix}}'",
         "type-current-customer": "Pašreizējais klients",
         "search": "Meklēšanas vienības",
-        "selected-entities": "{ count, plural, 1 {1 entity} other {# vienības} } atlasītas",
+        "selected-entities": "{ count, plural, =1 {1 entity} other {# vienības} } atlasītas",
         "entity-name": "Vienības nosaukums",
         "details": "Vienības detaļas",
         "no-entities-prompt": "Nav vienības atrastas",
@@ -819,21 +819,21 @@
         "add-entity-view-text": "Pievienot jaunu vienību skatu",
         "delete": "Dzēsts vienību skatu",
         "assign-entity-views": "Piešķirt vienību skatus",
-        "assign-entity-views-text": "Piešķirt { count, plural, 1 {1 entityView} other {# vienību skati} } klientam",
+        "assign-entity-views-text": "Piešķirt { count, plural, =1 {1 entityView} other {# vienību skati} } klientam",
         "delete-entity-views": "Dzēst vienību skatus",
         "unassign-from-customer": "Noņemt no klienta",
         "unassign-entity-views": "Noņemt vienību skatus",
-        "unassign-entity-views-action-title": "Noņemt { count, plural, 1 {1 entityView} other {# vienību skati} } no klienta",
+        "unassign-entity-views-action-title": "Noņemt { count, plural, =1 {1 entityView} other {# vienību skati} } no klienta",
         "assign-new-entity-view": "Piešķirt jaunu vienību skatu",
         "delete-entity-view-title": "Vai esat pārliecināts,ka vēlaties dzēst vienību skatu '{{entityViewName}}'?",
         "delete-entity-view-text": "Esiet uzmanīgs, pēc apstiprinājuma vienību skats un tā sasitītie dati nebūs atjaunojami.",
-        "delete-entity-views-title": "Vai esat pārliecināts, ka vēlaties vienību skatu { count, plural, 1 {1 entityView} other {# vienību skati} }?",
-        "delete-entity-views-action-title": "Dzēst { count, plural, 1 {1 entityView} other {# vienību skati} }",
+        "delete-entity-views-title": "Vai esat pārliecināts, ka vēlaties vienību skatu { count, plural, =1 {1 entityView} other {# vienību skati} }?",
+        "delete-entity-views-action-title": "Dzēst { count, plural, =1 {1 entityView} other {# vienību skati} }",
         "delete-entity-views-text": "Esiet uzmanīgs, pēc apstiprinājuma visir atlasītie vienības skati tiks noņemti un to saistītie dati nebūs atjaunojami.",
         "unassign-entity-view-title": "Vai esat pārliecināts, ka vēlaties atspējot vienību skatu '{{entityViewName}}'?",
         "unassign-entity-view-text": "Pēc apstiprinājuma vienību skats tiks atspējots un nebūs pieejams klientam.",
         "unassign-entity-view": "Atspējot vienību skatu",
-        "unassign-entity-views-title": "Vai esat pārliecināts, ka vēlaties atspējot  { count, plural, 1 {1 entityView} other {# vienību skatus} }?",
+        "unassign-entity-views-title": "Vai esat pārliecināts, ka vēlaties atspējot  { count, plural, =1 {1 entityView} other {# vienību skatus} }?",
         "unassign-entity-views-text": "Pēc apstiprinājuma visi atlasītie vienību skati būs atspējoti un nebūs pieejami klientiem.",
         "entity-view-type": "Vienību skata tips",
         "entity-view-type-required": "Vienību skata tips ir nepieciešams.",
@@ -910,7 +910,7 @@
     },
     "extension": {
         "extensions": "Paplašinājumi",
-        "selected-extensions": "{ count, plural, 1 {1 extension} other {# paplašinājumi} } atlasītie",
+        "selected-extensions": "{ count, plural, =1 {1 extension} other {# paplašinājumi} } atlasītie",
         "type": "Tips",
         "key": "Atslēga",
         "value": "Vērtība",
@@ -924,7 +924,7 @@
         "edit": "Rediģēt paplašinājumu",
         "delete-extension-title": "Vai esat pārliecināts, ka vēlaties dzēst paplašinājumu '{{extensionId}}'?",
         "delete-extension-text": "Esiet uzmanīgs, pēc apstiprinājuma paplašinājums un visi tā saistītie dati nebūs atjaunojami.",
-        "delete-extensions-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, 1 {1 extension} other {# paplašinājumus} }?",
+        "delete-extensions-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, =1 {1 extension} other {# paplašinājumus} }?",
         "delete-extensions-text": "Esiet uzmanīgs, pēc apstiprinājuma visi atlasītie paplašinājumi tiks dzēsti.",
         "converters": "Pārveidotāji",
         "converter-id": "Pārveidotāja id",
@@ -1077,8 +1077,8 @@
     "grid": {
         "delete-item-title": "Vai esat pārliecināts, ka vēlaties dzēst šo priekšmetu?",
         "delete-item-text": "Esiet uzmanīgs, pēc apstiprinājuma šī priekšmeta dati nebūs atjaunojami.",
-        "delete-items-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, 1 {1 item} other {# priekšmetus} }?",
-        "delete-items-action-title": "Dzēst { count, plural, 1 {1 item} other {# priekšmeti} }",
+        "delete-items-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, =1 {1 item} other {# priekšmetus} }?",
+        "delete-items-action-title": "Dzēst { count, plural, =1 {1 item} other {# priekšmeti} }",
         "delete-items-text": "Esiet uzmanīgs, pēc apstiprinājuma visi atlasītie priekšmeti tiks noņemti un to saistītie dati nebūs atjaunojami.",
         "add-item-text": "Pievienot jaunu priekšmetu",
         "no-items-text": "Nav priekšmeti atrasti",
@@ -1212,7 +1212,7 @@
         },
         "from-relations": "Izejošāsa attiecības",
         "to-relations": "Ienākošās attiecības",
-        "selected-relations": "{ count, plural, 1 {1 relation} other {# attiecības} } atlasītas",
+        "selected-relations": "{ count, plural, =1 {1 relation} other {# attiecības} } atlasītas",
         "type": "Tips",
         "to-entity-type": "Uz vienību tipu",
         "to-entity-name": "Uz vienību nosaukumu",
@@ -1228,11 +1228,11 @@
         "edit": "Rediģēt attiecību",
         "delete-to-relation-title": "Vai esat pārliecināts, ka vēlaties dzēst attiecību uz vienību '{{entityName}}'?",
         "delete-to-relation-text": "Esiet uzmanīgs, pēc apstiprinājuma vienība '{{entityName}}' būs atsaistīta no patreizējās vienības.",
-        "delete-to-relations-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, 1 {1 relation} other {# attiecības} }?",
+        "delete-to-relations-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, =1 {1 relation} other {# attiecības} }?",
         "delete-to-relations-text": "Esiet uzmanīgs, pēc apstiprināšanas visas atlasītās attiecības būs noņemtas un attiecīgās vienības būs atsaistītas no patreizējās vienības.",
         "delete-from-relation-title": "Vai esat pārliecināts, ka vēlaties dzēst attiecību no vienības '{{entityName}}'?",
         "delete-from-relation-text": "Esiet uzmanīgs, pēc apstiprinājuma patreizējā vienība būs atsaistīta no vienības '{{entityName}}'.",
-        "delete-from-relations-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, 1 {1 relation} other {# attiecības} }?",
+        "delete-from-relations-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, =1 {1 relation} other {# attiecības} }?",
         "delete-from-relations-text": "Esiet uzmanīgs, pēc apstiprinājuma visas atlasītās attiecības būs noņemtas un patreizējā vienība tiks atsaistīta no attiecīgās vienības.",
         "remove-relation-filter": "Noņemt attiecību filtru",
         "add-relation-filter": "Pievienot attiecību filtru",
@@ -1255,8 +1255,8 @@
         "set-root-rulechain-text": "Pēc apstiprinājuma noteikuma ķēde tiks veidota kā sakne un apstrādās visu ienākošo informāciju.",
         "delete-rulechain-title": "Vai esat pārliecināts, ka vēlaties dzēst noteikumu ķēdi '{{ruleChainName}}'?",
         "delete-rulechain-text": "Esiet uzmanīgs, pēc apstiprinājuma noteikumu ķēde un saistītā informācija nebūs atjaunojama.",
-        "delete-rulechains-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, 1 {1 rule chain} other {# noteikumu ķēdes} }?",
-        "delete-rulechains-action-title": "Dzēst { count, plural, 1 {1 rule chain} other {# noteikumu ķēdes} }",
+        "delete-rulechains-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, =1 {1 rule chain} other {# noteikumu ķēdes} }?",
+        "delete-rulechains-action-title": "Dzēst { count, plural, =1 {1 rule chain} other {# noteikumu ķēdes} }",
         "delete-rulechains-text": "Esiet uzmanīgs, pēc apstiprinājuma visas atlasītās noteikumu ķēdes tiks noņemtas un to saistītos datus nevarēs atjaunot.",
         "add-rulechain-text": "Pievienot jaunu noteikumu ķēdi",
         "no-rulechains-text": "Nav noteikumu ķēdes atrastas",
@@ -1355,8 +1355,8 @@
         "tenant-details": "Īrnieka detaļas",
         "delete-tenant-title": "Vai esat pārliecināts, ka vēlaties dzēst īrnieku '{{tenantTitle}}'?",
         "delete-tenant-text": "Esiet uzmanīgs, pēc apstiprinājuma īrnieks un tā saistītie dati nebūs atjaunojami.",
-        "delete-tenants-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, 1 {1 tenant} other {# īrniekus} }?",
-        "delete-tenants-action-title": "Dzēst { count, plural, 1 {1 tenant} other {# īrniekus} }",
+        "delete-tenants-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, =1 {1 tenant} other {# īrniekus} }?",
+        "delete-tenants-action-title": "Dzēst { count, plural, =1 {1 tenant} other {# īrniekus} }",
         "delete-tenants-text": "Esiet uzmanīgs, pēc apstiprinājuma visi atlasītie īrnieki tiks noņemti un saistītie dati nebūs atjaunojami.",
         "title": "Virsraksts",
         "title-required": "Virsraksts ir nepieciešams.",
@@ -1370,10 +1370,10 @@
         "tenant-required": "Īrnieks ir nepieciešams"
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, 1 {1 second} other {# sekundes} }",
-        "minutes-interval": "{ minutes, plural, 1 {1 minute} other {# minūtes} }",
-        "hours-interval": "{ hours, plural, 1 {1 hour} other {# stundas} }",
-        "days-interval": "{ days, plural, 1 {1 day} other {# dienas} }",
+        "seconds-interval": "{ seconds, plural, =1 {1 second} other {# sekundes} }",
+        "minutes-interval": "{ minutes, plural, =1 {1 minute} other {# minūtes} }",
+        "hours-interval": "{ hours, plural, =1 {1 hour} other {# stundas} }",
+        "days-interval": "{ days, plural, =1 {1 day} other {# dienas} }",
         "days": "Dienas",
         "hours": "Stundas",
         "minutes": "Minūtes",
@@ -1381,10 +1381,10 @@
         "advanced": "Pieredzējis lietotājs"
     },
     "timewindow": {
-        "days": "{ days, plural, 1 { day } other {# dienas } }",
-        "hours": "{ hours, plural, 0 { hour } 1 {1 hour } other {# stundas } }",
-        "minutes": "{ minutes, plural, 0 { minute } 1 {1 minute } other {# minūtes } }",
-        "seconds": "{ seconds, plural, 0 { second } 1 {1 second } other {# sekundes } }",
+        "days": "{ days, plural, =1 { day } other {# dienas } }",
+        "hours": "{ hours, plural, =0 { hour } =1 {1 hour } other {# stundas } }",
+        "minutes": "{ minutes, plural, =0 { minute } =1 {1 minute } other {# minūtes } }",
+        "seconds": "{ seconds, plural, =0 { second } =1 {1 second } other {# sekundes } }",
         "realtime": "Reālajā laikā",
         "history": "Vēsture",
         "last-prefix": "Pēdējās",
@@ -1410,8 +1410,8 @@
         "user-details": "Lietotāja detaļas",
         "delete-user-title": "Vai esat pārliecināts, ka vēlaties dzēst lietotāju  '{{userEmail}}'?",
         "delete-user-text": "Esiet uzmanīgs, pēc apstiprinājuma lietotājs un tā saistītie dati nebūs atjaunojami.",
-        "delete-users-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, 1 {1 user} other {# lietotājus} }?",
-        "delete-users-action-title": "Dzēst { count, plural, 1 {1 user} other {# lietotājus} }",
+        "delete-users-title": "Vai esat pārliecināts, ka vēlaties dzēst { count, plural, =1 {1 user} other {# lietotājus} }?",
+        "delete-users-action-title": "Dzēst { count, plural, =1 {1 user} other {# lietotājus} }",
         "delete-users-text": "Esiet uzmanīgs, pēc apstiprinājuma visi atlasītie lietotāji tiks noņemti un to saistītie dati nebūs atjaunojami.",
         "activation-email-sent-message": "Aktivizācijas email ir sekmīgi nosūtīts!",
         "resend-activation": "Atkārtoti nosūtīt aktivizāciju",
@@ -1530,8 +1530,8 @@
         "widgets-bundle-details": "Logrīku apkopojumu detaļas",
         "delete-widgets-bundle-title": "Vai esat pārliecināts, ka vēlaties dzēst logrīku apkopojumu '{{widgetsBundleTitle}}'?",
         "delete-widgets-bundle-text": "Esiet uzmanīgs, pēc apstiprinājuma logrīka apkopojums un tā saistītie dati nebūs atjaunojami.",
-        "delete-widgets-bundles-title": "vai esat pārliecināts, ka vēlaties dzēst { count, plural, 1 {1 widgets bundle} other {# logrīku apkopojumus} }?",
-        "delete-widgets-bundles-action-title": "Dzēst { count, plural, 1 {1 widgets bundle} other {# logrīku apkopojumus} }",
+        "delete-widgets-bundles-title": "vai esat pārliecināts, ka vēlaties dzēst { count, plural, =1 {1 widgets bundle} other {# logrīku apkopojumus} }?",
+        "delete-widgets-bundles-action-title": "Dzēst { count, plural, =1 {1 widgets bundle} other {# logrīku apkopojumus} }",
         "delete-widgets-bundles-text": "Esiet uzmanīgs, pēc apstiprinājuma visi atlasītie logrīku apkopojumi tiks noņemti un to saistītie dati nebūs atjaunojami.",
         "no-widgets-bundles-matching": "Nav logrīku apkopojumu saderības '{{widgetsBundle}}' atrastas.",
         "widgets-bundle-required": "Logrīku apkopojums ir nepieciešams.",
@@ -1568,7 +1568,7 @@
         "display-timewindow": "Rādīt laika logu",
         "display-legend": "Rādīt leģendu",
         "datasources": "Datu avoti",
-        "maximum-datasources": "Maksimums { count, plural, 1 {1 datasource is allowed.} other {# datu avoti atļautie} }",
+        "maximum-datasources": "Maksimums { count, plural, =1 {1 datasource is allowed.} other {# datu avoti atļautie} }",
         "datasource-type": "Tips",
         "datasource-parameters": "Parametri",
         "remove-datasource": "Noņemt datu avotu",
diff --git a/ui-ngx/src/assets/locale/locale.constant-pt_BR.json b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
index 78a81f4b57..3498825210 100644
--- a/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
@@ -167,17 +167,17 @@
     "acknowledge": "Confirmar",
     "clear": "Limpar",
     "search": "Pesquisar alarmes",
-    "selected-alarms": "{ count, plural, 1 {1 alarm} other {# alarms} } selecionado(s)",
+    "selected-alarms": "{ count, plural, =1 {1 alarm} other {# alarms} } selecionado(s)",
     "no-data": "Nenhum dado para exibição",
     "polling-interval": "Intervalo seletivo de alarmes (s)",
     "polling-interval-required": "O intervalo de chamada seletiva de alarmes é obrigatório.",
     "min-polling-interval-message": "É permitido no mínimo 1 segundo de intervalo de chamada seletiva.",
-    "aknowledge-alarms-title": "Confirmar { count, plural, 1 {1 alarm} other {# alarms} }",
-    "aknowledge-alarms-text": "Tem certeza de que deseja confirmar { count, plural, 1 {1 alarm} other {# alarms} }?",
+    "aknowledge-alarms-title": "Confirmar { count, plural, =1 {1 alarm} other {# alarms} }",
+    "aknowledge-alarms-text": "Tem certeza de que deseja confirmar { count, plural, =1 {1 alarm} other {# alarms} }?",
     "aknowledge-alarm-title": "Confirmar alarme",
     "aknowledge-alarm-text": "Tem certeza de que deseja confirmar o alarme?",
-    "clear-alarms-title": "Limpar { count, plural, 1 {1 alarm} other {# alarms} }",
-    "clear-alarms-text": "Tem certeza de que deseja limpar { count, plural, 1 {1 alarm} other {# alarms} }?",
+    "clear-alarms-title": "Limpar { count, plural, =1 {1 alarm} other {# alarms} }",
+    "clear-alarms-text": "Tem certeza de que deseja limpar { count, plural, =1 {1 alarm} other {# alarms} }?",
     "clear-alarm-title": "Limpar alarme",
     "clear-alarm-text": "Tem certeza de que deseja limpar alarme?",
     "alarm-status-filter": "Filtro de status de alarmes",
@@ -274,15 +274,15 @@
     "add-asset-text": "Adicionar novo ativo",
     "asset-details": "Detalhes do ativo",
     "assign-assets": "Atribuir ativos",
-    "assign-assets-text": "Atribuir { count, plural, 1 {1 asset} other {# assets} } a cliente",
+    "assign-assets-text": "Atribuir { count, plural, =1 {1 asset} other {# assets} } a cliente",
     "delete-assets": "Excluir ativos",
     "unassign-assets": "Remover atribuição de ativos",
-    "unassign-assets-action-title": "Remover atribuição de { count, plural, 1 {1 asset} other {# assets} } a cliente",
+    "unassign-assets-action-title": "Remover atribuição de { count, plural, =1 {1 asset} other {# assets} } a cliente",
     "assign-new-asset": "Atribuir novo ativo",
     "delete-asset-title": "Tem certeza de que deseja excluir o ativo '{{assetName}}'?",
     "delete-asset-text": "Cuidado, após confirmar, não será possível recuperar o ativo e nenhum dado associado.",
-    "delete-assets-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 asset} other {# assets} }?",
-    "delete-assets-action-title": "Excluir { count, plural, 1 {1 asset} other {# assets} }",
+    "delete-assets-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 asset} other {# assets} }?",
+    "delete-assets-action-title": "Excluir { count, plural, =1 {1 asset} other {# assets} }",
     "delete-assets-text": "Cuidado, após confirmar, todos os ativos selecionados serão removidos e não será possível recuperar nenhum dado associado.",
     "make-public-asset-title": "Tem certeza de que deseja tornar o ativo '{{assetName}}' público?",
     "make-public-asset-text": "Após confirmar, o ativo e todos os dados associados a ele se tornarão públicos e poderão ser acessados por outros.",
@@ -291,7 +291,7 @@
     "unassign-asset-title": "Tem certeza de que deseja remover a atribuição do ativo '{{assetName}}'?",
     "unassign-asset-text": "Após confirmar, a atribuição do ativo será removida e ele não poderá ser acessado pelo cliente.",
     "unassign-asset": "Remover atribuição de ativo",
-    "unassign-assets-title": "Tem certeza de que deseja remover a atribuição de { count, plural, 1 {1 asset} other {# assets} }?",
+    "unassign-assets-title": "Tem certeza de que deseja remover a atribuição de { count, plural, =1 {1 asset} other {# assets} }?",
     "unassign-assets-text": "Após confirmar, a atribuição de todos os ativos selecionados será removida e eles não poderão ser acessados pelo cliente.",
     "copyId": "Copiar ID do ativo",
     "idCopiedMessage": "O ID do ativo foi copiado para a área de transferência",
@@ -302,7 +302,7 @@
     "import": "Importar ativos",
     "asset-file": "Arquivo de ativos",
     "search": "Pesquisar ativo",
-    "selected-assets": "{ count, plural, 1 {1 asset} other {# assets} } selecionado(s)",
+    "selected-assets": "{ count, plural, =1 {1 asset} other {# assets} } selecionado(s)",
     "label": "Etiqueta"
   },
   "attribute": {
@@ -319,7 +319,7 @@
     "key-required": "A chave de atributo é obrigatória.",
     "value": "Valor",
     "value-required": "O valor do atributo é obrigatório.",
-    "delete-attributes-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 attribute} other {# attributes} }?",
+    "delete-attributes-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 attribute} other {# attributes} }?",
     "delete-attributes-text": "Cuidado, após confirmar, todos os atributos selecionados serão removidos.",
     "delete-attributes": "Excluir atributos",
     "enter-attribute-value": "Inserir valor do atributo",
@@ -329,8 +329,8 @@
     "prev-widget": "Widget anterior",
     "add-to-dashboard": "Adicionar ao dashboard",
     "add-widget-to-dashboard": "Adicionar widget ao dashboard",
-    "selected-attributes": "{ count, plural, 1 {1 attribute} other {# attributes} } selecionado(s)",
-    "selected-telemetry": "{ count, plural, 1 {1 telemetry unit} other {# telemetry units} } selecionado(s)",
+    "selected-attributes": "{ count, plural, =1 {1 attribute} other {# attributes} } selecionado(s)",
+    "selected-telemetry": "{ count, plural, =1 {1 telemetry unit} other {# telemetry units} } selecionado(s)",
     "no-attributes-text": "Nenhum atributo encontrado",
     "no-telemetry-text": "Nenhuma telemetria encontrada"
   },
@@ -434,8 +434,8 @@
     "customer-details": "Detalhes do cliente",
     "delete-customer-title": "Tem certeza de que deseja excluir o ativo cliente '{{customerTitle}}'?",
     "delete-customer-text": "Cuidado, após confirmar, não será possível recuperar o cliente e nenhum dado associado.",
-    "delete-customers-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 customer} other {# customers} }?",
-    "delete-customers-action-title": "Excluir { count, plural, 1 {1 customer} other {# customers} }",
+    "delete-customers-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 customer} other {# customers} }?",
+    "delete-customers-action-title": "Excluir { count, plural, =1 {1 customer} other {# customers} }",
     "delete-customers-text": "Cuidado, após confirmar, todos os clientes selecionados serão removidos e não será possível recuperar nenhum dado associado.",
     "manage-users": "Gerenciar usuários",
     "manage-assets": "Gerenciar ativos",
@@ -455,7 +455,7 @@
     "default-customer": "Cliente predefinido",
     "default-customer-required": "O cliente predefinido é necessário para depurar o dashboard no nível de locatário",
     "search": "Pesquisar clientes",
-    "selected-customers": "{ count, plural, 1 {1 customer} other {# customers} } selecionado(s)"
+    "selected-customers": "{ count, plural, =1 {1 customer} other {# customers} } selecionado(s)"
   },
   "datetime": {
     "date-from": "Data de",
@@ -496,20 +496,20 @@
     "add-dashboard-text": "Adicionar novo dashboard",
     "assign-dashboards": "Atribuir dashboards",
     "assign-new-dashboard": "Atribuir novo dashboard",
-    "assign-dashboards-text": "Atribuir { count, plural, 1 {1 dashboard} other {# dashboards} } a clientes",
-    "unassign-dashboards-action-text": "Remover atribuição de { count, plural, 1 {1 dashboard} other {# dashboards} } a clientes",
+    "assign-dashboards-text": "Atribuir { count, plural, =1 {1 dashboard} other {# dashboards} } a clientes",
+    "unassign-dashboards-action-text": "Remover atribuição de { count, plural, =1 {1 dashboard} other {# dashboards} } a clientes",
     "delete-dashboards": "Excluir dashboards",
     "unassign-dashboards": "Remover atribuição de dashboards",
-    "unassign-dashboards-action-title": "Remover atribuição de { count, plural, 1 {1 dashboard} other {# dashboards} } a cliente",
+    "unassign-dashboards-action-title": "Remover atribuição de { count, plural, =1 {1 dashboard} other {# dashboards} } a cliente",
     "delete-dashboard-title": "Tem certeza de que deseja excluir o dashboard '{{dashboardTitle}}'?",
     "delete-dashboard-text": "Cuidado, após confirmar, não será possível recuperar o dashboard e nenhum dado associado.",
-    "delete-dashboards-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 dashboard} other {# dashboards} }?",
-    "delete-dashboards-action-title": "Excluir { count, plural, 1 {1 dashboard} other {# dashboards} }",
+    "delete-dashboards-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 dashboard} other {# dashboards} }?",
+    "delete-dashboards-action-title": "Excluir { count, plural, =1 {1 dashboard} other {# dashboards} }",
     "delete-dashboards-text": "Cuidado, após confirmar, todos os dashboards selecionados serão removidos e não será possível recuperar nenhum dado associado.",
     "unassign-dashboard-title": "Tem certeza de que deseja remover a atribuição do dashboard '{{dashboardTitle}}'?",
     "unassign-dashboard-text": "Após confirmar, a atribuição do dashboard será removida e ele não poderá ser acessado pelo cliente.",
     "unassign-dashboard": "Remover atribuição de dashboard",
-    "unassign-dashboards-title": "Tem certeza de que deseja remover a atribuição de { count, plural, 1 {1 dashboard} other {# dashboards} }?",
+    "unassign-dashboards-title": "Tem certeza de que deseja remover a atribuição de { count, plural, =1 {1 dashboard} other {# dashboards} }?",
     "unassign-dashboards-text": "Após confirmar, a atribuição de todos os dashboards selecionados será removida e eles não poderão ser acessados pelo cliente.",
     "public-dashboard-title": "Agora o dashboard é público",
     "public-dashboard-text": "Agora o dashboard <b>{{dashboardTitle}}</b> é público e pode ser acessado pelo próximo <a href='{{publicLink}}' target='_blank'>link</a> público:",
@@ -590,7 +590,7 @@
     "manage-states": "Gerenciar estados de dashboards",
     "states": "Estados de dashboards",
     "search-states": "Pesquisar estados de dashboards",
-    "selected-states": "{ count, plural, 1 {1 dashboard state} other {# dashboard states} } selecionado(s)",
+    "selected-states": "{ count, plural, =1 {1 dashboard state} other {# dashboard states} } selecionado(s)",
     "edit-state": "Editar estado de dashboard",
     "delete-state": "Excluir estado de dashboard",
     "add-state": "Adicionar estado de dashboard",
@@ -609,7 +609,7 @@
     "select-state": "Selecionar estado alvo",
     "state-controller": "Controlador de estado",
     "search": "Selecionar dashboards",
-    "selected-dashboards": "{ count, plural, 1 {1 dashboard} other {# dashboards} } selecionado(s)"
+    "selected-dashboards": "{ count, plural, =1 {1 dashboard} other {# dashboards} } selecionado(s)"
   },
   "datakey": {
     "settings": "Configurações",
@@ -628,11 +628,11 @@
     "timeseries-required": "Os intervalos de tempo de entidade são obrigatórios.",
     "timeseries-or-attributes-required": "Os intervalos de tempo/atributos de entidade são obrigatórios.",
     "alarm-fields-timeseries-or-attributes-required": "Os campos de alarmes ou intervalos de tempo/atributos de entidade são obrigatórios.",
-    "maximum-timeseries-or-attributes": "No máximo { count, plural, 1 {1 timeseries/attribute is allowed.} other {# timeseries/attributes are allowed} }",
+    "maximum-timeseries-or-attributes": "No máximo { count, plural, =1 {1 timeseries/attribute is allowed.} other {# timeseries/attributes are allowed} }",
     "alarm-fields-required": "Os campos de alarmes são obrigatórios.",
     "function-types": "Tipos de função",
     "function-types-required": "Os tipos de função são obrigatórios.",
-    "maximum-function-types": "No máximo { count, plural, 1 {1 function type is allowed.} other {# function types are allowed} }",
+    "maximum-function-types": "No máximo { count, plural, =1 {1 function type is allowed.} other {# function types are allowed} }",
     "time-description": "carimbo de data/horário do valor atual;",
     "value-description": "o valor atual;",
     "prev-value-description": "resultado da chamada de função anterior;",
@@ -691,11 +691,11 @@
     "manage-credentials": "Gerenciar credenciais",
     "delete": "Excluir dispositivo",
     "assign-devices": "Atribuir dispositivos",
-    "assign-devices-text": "Atribuir { count, plural, 1 {1 device} other {# devices} } a cliente",
+    "assign-devices-text": "Atribuir { count, plural, =1 {1 device} other {# devices} } a cliente",
     "delete-devices": "Excluir dispositivos",
     "unassign-from-customer": "Remover atribuição a cliente",
     "unassign-devices": "Remover atribuição de dispositivos",
-    "unassign-devices-action-title": "Remover atribuição de { count, plural, 1 {1 device} other {# devices} } a cliente",
+    "unassign-devices-action-title": "Remover atribuição de { count, plural, =1 {1 device} other {# devices} } a cliente",
     "assign-new-device": "Atribuir novo dispositivo",
     "make-public-device-title": "Tem certeza de que deseja tornar o dispositivo '{{deviceName}}' público?",
     "make-public-device-text": "Após confirmar, o dispositivo e todos os dados associados a ele se tornarão públicos e poderão ser acessados por outros.",
@@ -704,13 +704,13 @@
     "view-credentials": "Exibir credenciais",
     "delete-device-title": "Tem certeza de que deseja excluir o dispositivo '{{deviceName}}'?",
     "delete-device-text": "Cuidado, após confirmar, não será possível recuperar o dispositivo e nenhum dado associado.",
-    "delete-devices-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 device} other {# devices} }?",
-    "delete-devices-action-title": "Excluir { count, plural, 1 {1 device} other {# devices} }",
+    "delete-devices-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 device} other {# devices} }?",
+    "delete-devices-action-title": "Excluir { count, plural, =1 {1 device} other {# devices} }",
     "delete-devices-text": "Cuidado, após confirmar, todos os dispositivos selecionados serão removidos e não será possível recuperar nenhum dado associado.",
     "unassign-device-title": "Tem certeza de que deseja remover a atribuição do dispositivo '{{deviceName}}'?",
     "unassign-device-text": "Após confirmar, a atribuição do dispositivo será removida e ele não poderá ser acessado pelo cliente.",
     "unassign-device": "Remover atribuição de dispositivo",
-    "unassign-devices-title": "Tem certeza de que deseja remover a atribuição de { count, plural, 1 {1 device} other {# devices} }?",
+    "unassign-devices-title": "Tem certeza de que deseja remover a atribuição de { count, plural, =1 {1 device} other {# devices} }?",
     "unassign-devices-text": "Após confirmar, a atribuição de todos os dispositivos selecionados será removida e eles não poderão ser acessados pelo cliente.",
     "device-credentials": "Credenciais do dispositivo",
     "credentials-type": "Tipo de credencial",
@@ -747,7 +747,7 @@
     "import": "Importar dispositivo",
     "device-file": "Arquivo de dispositivo",
     "search": "Pesquisar dispositivos",
-    "selected-devices": "{ count, plural, 1 {1 device} other {# devices} } selecionado(s)"
+    "selected-devices": "{ count, plural, =1 {1 device} other {# devices} } selecionado(s)"
   },
   "dialog": {
     "close": "Fechar diálogo"
@@ -803,58 +803,58 @@
     "type-required": "O tipo de entidade é obrigatório.",
     "type-device": "Dispositivo",
     "type-devices": "Dispositivos",
-    "list-of-devices": "{ count, plural, 1 {One device} other {List of # devices} }",
+    "list-of-devices": "{ count, plural, =1 {One device} other {List of # devices} }",
     "device-name-starts-with": "Dispositivos cujos nomes começam com '{{prefix}}'",
     "type-asset": "Ativo",
     "type-assets": "Ativos",
-    "list-of-assets": "{ count, plural, 1 {One asset} other {List of # assets} }",
+    "list-of-assets": "{ count, plural, =1 {One asset} other {List of # assets} }",
     "asset-name-starts-with": "Ativos cujos nomes começam com '{{prefix}}'",
     "type-entity-view": "Exibição de entidade",
     "type-entity-views": "Exibições de entidades",
-    "list-of-entity-views": "{ count, plural, 1 {One entity view} other {List of # entity views} }",
+    "list-of-entity-views": "{ count, plural, =1 {One entity view} other {List of # entity views} }",
     "entity-view-name-starts-with": "Exibições de entidades cujos nomes começam com '{{prefix}}'",
     "type-rule": "Regra",
     "type-rules": "Regras",
-    "list-of-rules": "{ count, plural, 1 {One rule} other {List of # rules} }",
+    "list-of-rules": "{ count, plural, =1 {One rule} other {List of # rules} }",
     "rule-name-starts-with": "Regras cujos nomes começam com '{{prefix}}'",
     "type-plugin": "Plug-in",
     "type-plugins": "Plug-ins",
-    "list-of-plugins": "{ count, plural, 1 {One plugin} other {List of # plugins} }",
+    "list-of-plugins": "{ count, plural, =1 {One plugin} other {List of # plugins} }",
     "plugin-name-starts-with": "Plug-ins cujos nomes começam com '{{prefix}}'",
     "type-tenant": "Locatário",
     "type-tenants": "Locatários",
-    "list-of-tenants": "{ count, plural, 1 {One tenant} other {List of # tenants} }",
+    "list-of-tenants": "{ count, plural, =1 {One tenant} other {List of # tenants} }",
     "tenant-name-starts-with": "Locatários cujos nomes começam com '{{prefix}}'",
     "type-customer": "Cliente",
     "type-customers": "Clientes",
-    "list-of-customers": "{ count, plural, 1 {One customer} other {List of # customers} }",
+    "list-of-customers": "{ count, plural, =1 {One customer} other {List of # customers} }",
     "customer-name-starts-with": "Clientes cujos nomes começam com '{{prefix}}'",
     "type-user": "Usuário",
     "type-users": "Usuários",
-    "list-of-users": "{ count, plural, 1 {One user} other {List of # users} }",
+    "list-of-users": "{ count, plural, =1 {One user} other {List of # users} }",
     "user-name-starts-with": "Usuários cujos nomes começam com '{{prefix}}'",
     "type-dashboard": "Dashboard",
     "type-dashboards": "Dashboards",
-    "list-of-dashboards": "{ count, plural, 1 {One dashboard} other {List of # dashboards} }",
+    "list-of-dashboards": "{ count, plural, =1 {One dashboard} other {List of # dashboards} }",
     "dashboard-name-starts-with": "Dashboards cujos nomes começam com '{{prefix}}'",
     "type-alarm": "Alarme",
     "type-alarms": "Alarmes",
-    "list-of-alarms": "{ count, plural, 1 {One alarms} other {List of # alarms} }",
+    "list-of-alarms": "{ count, plural, =1 {One alarms} other {List of # alarms} }",
     "alarm-name-starts-with": "Alarmes cujos nomes começam com '{{prefix}}'",
     "type-rulechain": "Cadeia de regras",
     "type-rulechains": "Cadeias de regras",
-    "list-of-rulechains": "{ count, plural, 1 {One rule chain} other {List of # rule chains} }",
+    "list-of-rulechains": "{ count, plural, =1 {One rule chain} other {List of # rule chains} }",
     "rulechain-name-starts-with": "Cadeias de regras cujos nomes começam com '{{prefix}}'",
     "type-rulenode": "Nó de regra",
     "type-rulenodes": "Nós de regras",
-    "list-of-rulenodes": "{ count, plural, 1 {One rule node} other {List of # rule nodes} }",
+    "list-of-rulenodes": "{ count, plural, =1 {One rule node} other {List of # rule nodes} }",
     "rulenode-name-starts-with": "Nós de regras cujos nomes começam com '{{prefix}}'",
     "type-current-customer": "Cliente atual",
     "type-current-tenant": "Locatário atual",
     "type-current-user": "Usuário atual",
     "type-current-user-owner": "Proprietário de usuário atual",
     "search": "Pesquisar entidades",
-    "selected-entities": "{ count, plural, 1 {1 entity} other {# entities} } selecionado(s)",
+    "selected-entities": "{ count, plural, =1 {1 entity} other {# entities} } selecionado(s)",
     "entity-name": "Nome da entidade",
     "entity-label": "Etiqueta de entidade",
     "details": "Detalhes de entidades",
@@ -918,21 +918,21 @@
     "add-entity-view-text": "Adicionar nova exibição de entidade",
     "delete": "Excluir exibição de entidade",
     "assign-entity-views": "Atribuir exibições de entidades",
-    "assign-entity-views-text": "Atribuir { count, plural, 1 {1 entity view} other {# entity views} } a cliente",
+    "assign-entity-views-text": "Atribuir { count, plural, =1 {1 entity view} other {# entity views} } a cliente",
     "delete-entity-views": "Excluir exibições de entidades",
     "unassign-from-customer": "Remover atribuição a cliente",
     "unassign-entity-views": "Remover atribuição de exibições de entidades",
-    "unassign-entity-views-action-title": "Remover atribuição de { count, plural, 1 {1 entity view} other {# entity views} } a cliente",
+    "unassign-entity-views-action-title": "Remover atribuição de { count, plural, =1 {1 entity view} other {# entity views} } a cliente",
     "assign-new-entity-view": "Atribuir nova exibição de entidade",
     "delete-entity-view-title": "Tem certeza de que deseja excluir a exibição de entidade '{{entityViewName}}'?",
     "delete-entity-view-text": "Cuidado, após confirmar, não será possível recuperar a exibição de entidade e todos os dados associados.",
-    "delete-entity-views-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 entity view} other {# entity views} }?",
-    "delete-entity-views-action-title": "Excluir { count, plural, 1 {1 entity view} other {# entity views} }",
+    "delete-entity-views-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 entity view} other {# entity views} }?",
+    "delete-entity-views-action-title": "Excluir { count, plural, =1 {1 entity view} other {# entity views} }",
     "delete-entity-views-text": "Cuidado, após confirmar, todas as exibições de entidades selecionadas serão removidas e não será possível recuperar nenhum dado associado.",
     "unassign-entity-view-title": "Tem certeza de que deseja remover a atribuição da exibição de entidade '{{entityViewName}}'?",
     "unassign-entity-view-text": "Após confirmar, a atribuição da exibição de entidade será removida e ela não poderá ser acessada pelo cliente.",
     "unassign-entity-view": "Remover atribuição de exibição de entidade",
-    "unassign-entity-views-title": "Tem certeza de que deseja remover a atribuição de { count, plural, 1 {1 entity view} other {# entity views} }?",
+    "unassign-entity-views-title": "Tem certeza de que deseja remover a atribuição de { count, plural, =1 {1 entity view} other {# entity views} }?",
     "unassign-entity-views-text": "Após confirmar, a atribuição de todas as exibições de entidade selecionadas será removida e elas não poderão ser acessadas pelo cliente.",
     "entity-view-type": "Tipo de exibições de entidades",
     "entity-view-type-required": "O tipo de exibição de entidade é obrigatório.",
@@ -979,7 +979,7 @@
     "make-private-entity-view-title": "Tem certeza de que deseja tornar a exibição de entidade '{{entityViewName}}' privada?",
     "make-private-entity-view-text": "Após confirmar, a exibição de entidade e todos os dados associados a ela se tornarão privados e não poderão ser acessados por outros.",
     "search": "Pesquisar exibições de entidades",
-    "selected-entity-views": "{ count, plural, 1 {1 entity view} other {# entity views} } selecionado(s)"
+    "selected-entity-views": "{ count, plural, =1 {1 entity view} other {# entity views} } selecionado(s)"
   },
   "event": {
     "event-type": "Tipo de evento",
@@ -1013,7 +1013,7 @@
   },
   "extension": {
     "extensions": "Extensões",
-    "selected-extensions": "{ count, plural, 1 {1 extension} other {# extensions} } selecionado(s)",
+    "selected-extensions": "{ count, plural, =1 {1 extension} other {# extensions} } selecionado(s)",
     "type": "Tipo",
     "key": "Chave",
     "value": "Valor",
@@ -1027,7 +1027,7 @@
     "edit": "Editar extensão",
     "delete-extension-title": "Tem certeza de que deseja excluir a extensão '{{extensionId}}'?",
     "delete-extension-text": "Cuidado, após confirmar, não será possível recuperar a extensão e nenhum dado associado.",
-    "delete-extensions-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 extension} other {# extensions} }?",
+    "delete-extensions-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 extension} other {# extensions} }?",
     "delete-extensions-text": "Cuidado, após confirmar, todas as extensões selecionadas serão removidas.",
     "converters": "Conversores",
     "converter-id": "ID do conversor",
@@ -1336,8 +1336,8 @@
   "grid": {
     "delete-item-title": "Tem certeza de que deseja excluir este item?",
     "delete-item-text": "Cuidado, após confirmar, não será possível recuperar este item e nenhum dado associado.",
-    "delete-items-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 item} other {# items} }?",
-    "delete-items-action-title": "Excluir { count, plural, 1 {1 item} other {# items} }",
+    "delete-items-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 item} other {# items} }?",
+    "delete-items-action-title": "Excluir { count, plural, =1 {1 item} other {# items} }",
     "delete-items-text": "Cuidado, após confirmar, todos os itens selecionados serão removidos e não será possível recuperar nenhum dado associado.",
     "add-item-text": "Adicionar novo item",
     "no-items-text": "Nenhum item encontrado",
@@ -1486,7 +1486,7 @@
     },
     "from-relations": "Relações de saída",
     "to-relations": "Relações de entrada",
-    "selected-relations": "{ count, plural, 1 {1 relation} other {# relations} } selecionado(s)",
+    "selected-relations": "{ count, plural, =1 {1 relation} other {# relations} } selecionado(s)",
     "type": "Tipo",
     "to-entity-type": "Para tipo de entidade",
     "to-entity-name": "Para nome de entidade",
@@ -1502,11 +1502,11 @@
     "edit": "Editar relação",
     "delete-to-relation-title": "Tem certeza de que deseja excluir a relação com a entidade '{{entityName}}'?",
     "delete-to-relation-text": "Cuidado, após confirmar, a relação da entidade '{{entityName}}' com a entidade atual será anulada.",
-    "delete-to-relations-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 relation} other {# relations} }?",
+    "delete-to-relations-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 relation} other {# relations} }?",
     "delete-to-relations-text": "Cuidado, após confirmar, todas as relações serão removidas e a relação das entidades correspondentes com a entidade atual será anulada.",
     "delete-from-relation-title": "Tem certeza de que deseja excluir a relação da entidade '{{entityName}}'?",
     "delete-from-relation-text": "Cuidado, após confirmar, a relação da entidade atual com a entidade '{{entityName}}' será anulada.",
-    "delete-from-relations-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 relation} other {# relations} }?",
+    "delete-from-relations-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 relation} other {# relations} }?",
     "delete-from-relations-text": "Cuidado, após confirmar, todas as relações serão removidas e a relação da entidade atual com as entidades correspondentes será anulada.",
     "remove-relation-filter": "Remover filtro de relação",
     "add-relation-filter": "Adicionar filtro de relação",
@@ -1530,8 +1530,8 @@
     "set-root-rulechain-text": "Após confirmar, a cadeia de regras se tornará em raiz e irá tratar todas as mensagens de transporte recebidas.",
     "delete-rulechain-title": "Tem certeza de que deseja excluir a cadeia de regras '{{ruleChainName}}'?",
     "delete-rulechain-text": "Cuidado, após confirmar, não será possível recuperar a cadeia de regras e todos os dados associados.",
-    "delete-rulechains-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 rule chain} other {# rule chains} }?",
-    "delete-rulechains-action-title": "Excluir { count, plural, 1 {1 rule chain} other {# rule chains} }",
+    "delete-rulechains-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 rule chain} other {# rule chains} }?",
+    "delete-rulechains-action-title": "Excluir { count, plural, =1 {1 rule chain} other {# rule chains} }",
     "delete-rulechains-text": "Cuidado, após confirmar, todas as cadeias de regras serão removidas e não será possível recuperar nenhum dado associado.",
     "add-rulechain-text": "Adicionar nova cadeia de regras",
     "no-rulechains-text": "Nenhuma cadeia de regras encontrada",
@@ -1553,7 +1553,7 @@
     "management": "Gerenciamento de regras",
     "debug-mode": "Modo de depuração",
     "search": "Pesquisar cadeias de regras",
-    "selected-rulechains": "{ count, plural, 1 {1 rule chain} other {# rule chains} } selecionada(s)",
+    "selected-rulechains": "{ count, plural, =1 {1 rule chain} other {# rule chains} } selecionada(s)",
     "open-rulechain": "Abrir cadeia de regras"
   },
   "rulenode": {
@@ -1644,8 +1644,8 @@
     "tenant-details": "Detalhes do locatário",
     "delete-tenant-title": "Tem certeza de que deseja excluir o locatário '{{tenantTitle}}'?",
     "delete-tenant-text": "Cuidado, após confirmar, não será possível recuperar o locatário e nenhum dado associado.",
-    "delete-tenants-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 tenant} other {# tenants} }?",
-    "delete-tenants-action-title": "Excluir { count, plural, 1 {1 tenant} other {# tenants} }",
+    "delete-tenants-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 tenant} other {# tenants} }?",
+    "delete-tenants-action-title": "Excluir { count, plural, =1 {1 tenant} other {# tenants} }",
     "delete-tenants-text": "Cuidado, após confirmar, todos os locatários selecionados serão removidos e não será possível recuperar nenhum dado associado.",
     "title": "Título",
     "title-required": "O título é obrigatório.",
@@ -1658,15 +1658,15 @@
     "no-tenants-matching": "Nenhum locatário encontrado que coincida com '{{entity}}'.",
     "tenant-required": "O locatário é obrigatório",
     "search": "Pesquisar locatários",
-    "selected-tenants": "{ count, plural, 1 {1 tenant} other {# tenants} } selecionado(s)",
+    "selected-tenants": "{ count, plural, =1 {1 tenant} other {# tenants} } selecionado(s)",
     "isolated-tb-rule-engine": "Processamento em contêiner isolado do ThingsBoard Rule Engine",
     "isolated-tb-rule-engine-details": "Exige microsserviço(s) separado(s) para cada locatário isolado"
   },
   "timeinterval": {
-    "seconds-interval": "{ seconds, plural, 1 {1 second} other {# seconds} }",
-    "minutes-interval": "{ minutes, plural, 1 {1 minute} other {# minutes} }",
-    "hours-interval": "{ hours, plural, 1 {1 hour} other {# hours} }",
-    "days-interval": "{ days, plural, 1 {1 day} other {# days} }",
+    "seconds-interval": "{ seconds, plural, =1 {1 second} other {# seconds} }",
+    "minutes-interval": "{ minutes, plural, =1 {1 minute} other {# minutes} }",
+    "hours-interval": "{ hours, plural, =1 {1 hour} other {# hours} }",
+    "days-interval": "{ days, plural, =1 {1 day} other {# days} }",
     "days": "Dias",
     "hours": "Horas",
     "minutes": "Minutos",
@@ -1674,10 +1674,10 @@
     "advanced": "Avançado"
   },
   "timewindow": {
-    "days": "{ days, plural, 1 { day } other {# days } }",
-    "hours": "{ hours, plural, 0 { hour } 1 {1 hour } other {# hours } }",
-    "minutes": "{ minutes, plural, 0 { minute } 1 {1 minute } other {# minutes } }",
-    "seconds": "{ seconds, plural, 0 { second } 1 {1 second } other {# seconds } }",
+    "days": "{ days, plural, =1 { day } other {# days } }",
+    "hours": "{ hours, plural, =0 { hour } =1 {1 hour } other {# hours } }",
+    "minutes": "{ minutes, plural, =0 { minute } =1 {1 minute } other {# minutes } }",
+    "seconds": "{ seconds, plural, =0 { second } =1 {1 second } other {# seconds } }",
     "realtime": "Tempo real",
     "history": "Histórico",
     "last-prefix": "último",
@@ -1704,8 +1704,8 @@
     "user-details": "Detalhes do usuário",
     "delete-user-title": "Tem certeza de que deseja excluir o usuário '{{userEmail}}'?",
     "delete-user-text": "Cuidado, após confirmar, não será possível recuperar o usuário e nenhum dado associado.",
-    "delete-users-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 user} other {# users} }?",
-    "delete-users-action-title": "Excluir { count, plural, 1 {1 user} other {# users} }",
+    "delete-users-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 user} other {# users} }?",
+    "delete-users-action-title": "Excluir { count, plural, =1 {1 user} other {# users} }",
     "delete-users-text": "Cuidado, após confirmar, todos os usuários selecionados serão removidos e não será possível recuperar nenhum dado associado.",
     "activation-email-sent-message": "O e-mail de ativação foi enviado corretamente!",
     "resend-activation": "Reenviar ativação",
@@ -1731,7 +1731,7 @@
     "login-as-tenant-admin": "Login como administrador de locatários",
     "login-as-customer-user": "Login como usuário do cliente",
     "search": "Pesquisar usuários",
-    "selected-users": "{ count, plural, 1 {1 user} other {# users} } selecionado(s)",
+    "selected-users": "{ count, plural, =1 {1 user} other {# users} } selecionado(s)",
     "disable-account": "Desativar conta de usuário",
     "enable-account": "Ativar conta de usuário",
     "enable-account-message": "A conta de usuário foi ativada corretamente!",
@@ -1843,8 +1843,8 @@
     "widgets-bundle-details": "Detalhes do pacote de widgets",
     "delete-widgets-bundle-title": "Tem certeza de que deseja excluir o pacote de widgets '{{widgetsBundleTitle}}'?",
     "delete-widgets-bundle-text": "Cuidado, após confirmar, não será possível recuperar o pacote de widgets e nenhum dado associado.",
-    "delete-widgets-bundles-title": "Tem certeza de que deseja excluir { count, plural, 1 {1 widgets bundle} other {# widgets bundles} }?",
-    "delete-widgets-bundles-action-title": "Excluir { count, plural, 1 {1 widgets bundle} other {# widgets bundles} }",
+    "delete-widgets-bundles-title": "Tem certeza de que deseja excluir { count, plural, =1 {1 widgets bundle} other {# widgets bundles} }?",
+    "delete-widgets-bundles-action-title": "Excluir { count, plural, =1 {1 widgets bundle} other {# widgets bundles} }",
     "delete-widgets-bundles-text": "Cuidado, após confirmar, todos os pacotes de widgets selecionados serão removidos e não será possível recuperar nenhum dado associado.",
     "no-widgets-bundles-matching": "Nenhum conversor de pacotes de widgets encontrado que coincida com '{{widgetsBundle}}'.",
     "widgets-bundle-required": "O pacote de widgets é obrigatório.",
@@ -1856,7 +1856,7 @@
     "widgets-bundle-file": "Arquivo de pacote de widgets",
     "invalid-widgets-bundle-file-error": "Impossível importar pacote de widgets: Estrutura de dados de pacote de widgets inválida.",
     "search": "Pesquisar pacotes de widgets",
-    "selected-widgets-bundles": "{ count, plural, 1 {1 widgets bundle} other {# widgets bundles} } selecionado(s)",
+    "selected-widgets-bundles": "{ count, plural, =1 {1 widgets bundle} other {# widgets bundles} } selecionado(s)",
     "open-widgets-bundle": "Abrir pacote de widgets"
   },
   "widget-config": {
@@ -1885,7 +1885,7 @@
     "display-timewindow": "Exibir timewindow",
     "display-legend": "Exibir legenda",
     "datasources": "Fontes de dados",
-    "maximum-datasources": "No máximo { count, plural, 1 {1 datasource is allowed.} other {# datasources are allowed} }",
+    "maximum-datasources": "No máximo { count, plural, =1 {1 datasource is allowed.} other {# datasources are allowed} }",
     "datasource-type": "Tipo",
     "datasource-parameters": "Parâmetros",
     "remove-datasource": "Remover fonte de dados",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ro_RO.json b/ui-ngx/src/assets/locale/locale.constant-ro_RO.json
index 01af73ece5..121df2468c 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ro_RO.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ro_RO.json
@@ -150,17 +150,17 @@
         "acknowledge": "Marchează Observat",
         "clear": "Şterge",
         "search": "Caută Alarme",
-        "selected-alarms": "{ count, plural, 1 {o alarmă} other {# alarme} } selectate",
+        "selected-alarms": "{ count, plural, =1 {o alarmă} other {# alarme} } selectate",
         "no-data": "Nu există date de afişat",
         "polling-interval": "Interval actualizare alarme (secunde)",
         "polling-interval-required": "Intervalul pentru actualizarea alarmelor este obligatoriu",
         "min-polling-interval-message": "Valoarea minimă permisă pentru interval actualizare alarme este o secundă",
-        "aknowledge-alarms-title": "Ai selectat { count, plural, 1 {o alarmă} other {# alarme} }",
-        "aknowledge-alarms-text": "Sigur vrei să marchezi ca 'Observat' { count, plural, 1 {o alarmă} other {# alarme} }?",
+        "aknowledge-alarms-title": "Ai selectat { count, plural, =1 {o alarmă} other {# alarme} }",
+        "aknowledge-alarms-text": "Sigur vrei să marchezi ca 'Observat' { count, plural, =1 {o alarmă} other {# alarme} }?",
         "aknowledge-alarm-title": "Alarmă Observată",
         "aknowledge-alarm-text": "Sigur vrei să marchezi alarma ca 'Observat'?",
-        "clear-alarms-title": "Şterge { count, plural, 1 {o alarmă} other {# alarme} }",
-        "clear-alarms-text": "Sigur vrei să ștergi { count, plural, 1 {o alarmă} other {# alarme} }?",
+        "clear-alarms-title": "Şterge { count, plural, =1 {o alarmă} other {# alarme} }",
+        "clear-alarms-text": "Sigur vrei să ștergi { count, plural, =1 {o alarmă} other {# alarme} }?",
         "clear-alarm-title": "Şterge Alarma",
         "clear-alarm-text": "Sigur vrei să ștergi alarma?",
         "alarm-status-filter": "Stare Filtre Alarmă",
@@ -252,15 +252,15 @@
         "add-asset-text": "Adaugă proprietate",
         "asset-details": "Detalii proprietate",
         "assign-assets": "Repartizează proprietăţi",
-        "assign-assets-text": "Repartizează { count, plural, 1 {o proprietate} other {# proprietăţi} } clientului",
+        "assign-assets-text": "Repartizează { count, plural, =1 {o proprietate} other {# proprietăţi} } clientului",
         "delete-assets": "Şterge proprietăţi",
         "unassign-assets": "Şterge repartizare proprietăţi",
-        "unassign-assets-action-title": "Şterge repartizare { count, plural, 1 {o proprietate} other {# proprietăţi} } clientului",
+        "unassign-assets-action-title": "Şterge repartizare { count, plural, =1 {o proprietate} other {# proprietăţi} } clientului",
         "assign-new-asset": "Repartizează proprietate nouă",
         "delete-asset-title": "Sigur vrei să ștergi '{{assetName}}'?",
         "delete-asset-text": "ATENŢIE! După confirmare, proprietatea şi toate datele referitoare la aceasta, vor fi șterse IREVERSIBIL!",
-        "delete-assets-title": "Sigur vrei să ștergi { count, plural, 1 {o proprietate} other {# proprietăţi} }?",
-        "delete-assets-action-title": "Ştergi { count, plural, 1 {o proprietate} other {# proprietăţi} }",
+        "delete-assets-title": "Sigur vrei să ștergi { count, plural, =1 {o proprietate} other {# proprietăţi} }?",
+        "delete-assets-action-title": "Ştergi { count, plural, =1 {o proprietate} other {# proprietăţi} }",
         "delete-assets-text": "ATENŢIE! După confirmare, toate proprietăţile selectate şi toate datele referitoare la aceastea, vor fi șterse IREVERSIBIL!",
         "make-public-asset-title": "Sigur vrei ca proprietatea '{{assetName}}' să devină publică ",
         "make-public-asset-text": "ATENŢIE! După confirmare, proprietatea selectată şi toate datele referitoare la aceasta vor putea fi accesate de către oricine",
@@ -269,7 +269,7 @@
         "unassign-asset-title": "Sigur vrei să ştergi repartizarea pentru proprietatea '{{assetName}}'?",
         "unassign-asset-text": "ATENŢIE! După confirmare, repartizarea proprietăţii nu va mai putea fi accesată de către client",
         "unassign-asset": "Şterge repartizare proprietate",
-        "unassign-assets-title": "Sigur vrei să ştergi repartizarea pentru { count, plural, 1 {o proprietate} other {# proprietăţi} }?",
+        "unassign-assets-title": "Sigur vrei să ştergi repartizarea pentru { count, plural, =1 {o proprietate} other {# proprietăţi} }?",
         "unassign-assets-text": "ATENŢIE! După confirmare, repartizările proprietăţilor selectate nu  vor mai putea fi accesate de către client",
         "copyId": "Copiază ID proprietate",
         "idCopiedMessage": "ID-ul proprietăţii a fost copiat în clipboard",
@@ -295,7 +295,7 @@
         "key-required": "Cheia atributului este obligatorie",
         "value": "Valoare",
         "value-required": "Valoarea atributului este obligatorie",
-        "delete-attributes-title": "Sigur vrei să ștergi { count, plural, 1 {un atribut} other {# atribute} }?",
+        "delete-attributes-title": "Sigur vrei să ștergi { count, plural, =1 {un atribut} other {# atribute} }?",
         "delete-attributes-text": "ATENŢIE! După confirmare, toate atributele selectate vor fi şterse",
         "delete-attributes": "Şterge Atribute",
         "enter-attribute-value": "Specifică Valoarea Atributului",
@@ -305,8 +305,8 @@
         "prev-widget": "Widget Precedent",
         "add-to-dashboard": "Adaugă în panou",
         "add-widget-to-dashboard": "Adaugă Widget În Panou",
-        "selected-attributes": "{ count, plural, 1 {un atribut} other {# atribute} } selectate",
-        "selected-telemetry": "{ count, plural, 1 {o unitate telemetrică} other {# unităţi telemetrice} } selectate"
+        "selected-attributes": "{ count, plural, =1 {un atribut} other {# atribute} } selectate",
+        "selected-telemetry": "{ count, plural, =1 {o unitate telemetrică} other {# unităţi telemetrice} } selectate"
     },
     "audit-log": {
         "audit": "Audit",
@@ -405,8 +405,8 @@
         "customer-details": "Detalii Client",
         "delete-customer-title": "Vrei să ștergi clientul '{{customerTitle}}'?",
         "delete-customer-text": "ATENŢIE! După confirmare, clientul şi toate datele referitoare la acesta vor fi șterse IREVERSIBIL!",
-        "delete-customers-title": "Vrei să ștergi { count, plural, 1 {un client} other {# clienţi} }?",
-        "delete-customers-action-title": "Şterge { count, plural, 1 {un client} other {# clienţi} }",
+        "delete-customers-title": "Vrei să ștergi { count, plural, =1 {un client} other {# clienţi} }?",
+        "delete-customers-action-title": "Şterge { count, plural, =1 {un client} other {# clienţi} }",
         "delete-customers-text": "ATENŢIE! După confirmare, toaţi clienţii selectate şi toate datele referitoare la aceaştia, vor fi șterse IREVERSIBIL!",
         "manage-users": "Administrare Utilizatori",
         "manage-assets": "Administrare Proprietăţi",
@@ -465,20 +465,20 @@
         "add-dashboard-text": "Adăugare Panou Nou",
         "assign-dashboards": "Repartizare Panouri",
         "assign-new-dashboard": "Repartizare Panou Nou",
-        "assign-dashboards-text": "Repartizează { count, plural, 1 {un panou} other {# panouri} } clienţilor",
-        "unassign-dashboards-action-text": "Şterge repartizare { count, plural, 1 {un panou} other {# panouri} } către clienți",
+        "assign-dashboards-text": "Repartizează { count, plural, =1 {un panou} other {# panouri} } clienţilor",
+        "unassign-dashboards-action-text": "Şterge repartizare { count, plural, =1 {un panou} other {# panouri} } către clienți",
         "delete-dashboards": "Şterge Panouri",
         "unassign-dashboards": "Şterge Repartizare Panouri",
-        "unassign-dashboards-action-title": "Şterge Repartizare { count, plural, 1 {un panou} other {# panouri} } către client",
+        "unassign-dashboards-action-title": "Şterge Repartizare { count, plural, =1 {un panou} other {# panouri} } către client",
         "delete-dashboard-title": "Vrei să ștergi panoul '{{dashboardTitle}}'?",
         "delete-dashboard-text": "ATENŢIE! După confirmare, panoul și datele aferente acestuia vor fi șterse IREVERSIBIL!",
-        "delete-dashboards-title": "Vrei să ștergi { count, plural, 1 {un panou} other {# panouri} }?",
-        "delete-dashboards-action-title": "Ştergere { count, plural, 1 {un panou} other {# panouri} }",
+        "delete-dashboards-title": "Vrei să ștergi { count, plural, =1 {un panou} other {# panouri} }?",
+        "delete-dashboards-action-title": "Ştergere { count, plural, =1 {un panou} other {# panouri} }",
         "delete-dashboards-text": "ATENŢIE! După confirmare, panourile selectate şi datele aferente acestora vor fi șterse IREVERSIBIL!",
         "unassign-dashboard-title": "Vrei să ştergi repartizarea panoului '{{dashboardTitle}}'?",
         "unassign-dashboard-text": "ATENŢIE! După confirmare, panoul nu va mai putea fi accesat de către client",
         "unassign-dashboard": "Şterge Repartizare Panou",
-        "unassign-dashboards-title": "Vrei să ştergi repartizarea a { count, plural, 1 {un panou} other {# panouri} }?",
+        "unassign-dashboards-title": "Vrei să ştergi repartizarea a { count, plural, =1 {un panou} other {# panouri} }?",
         "unassign-dashboards-text": "ATENŢIE! După confirmare, panoul nu va mai putea fi accesat de către client",
         "public-dashboard-title": "Panoul a devenit public",
         "public-dashboard-text": "Panoul tău <b>{{dashboardTitle}}</b> a devenit public şi este accesibil la <a href='{{publicLink}}' target='_blank'>link</a>:",
@@ -555,7 +555,7 @@
         "manage-states": "Administrare Stări Panou",
         "states": "Stări Panou",
         "search-states": "Caută Stări Panou",
-        "selected-states": "{ count, plural, 1 {o stare panou} other {# stări panou} } selectate",
+        "selected-states": "{ count, plural, =1 {o stare panou} other {# stări panou} } selectate",
         "edit-state": "Editează Stare Panou",
         "delete-state": "Şterge Stare Panou",
         "add-state": "Adaugă Stare Panou",
@@ -589,11 +589,11 @@
         "alarm": "Câmpuri Alarmă",
         "timeseries-required": "Seriile temporale pentru entitate sunt obligatorii",
         "timeseries-or-attributes-required": "Seriile temporale sau atributele pentru entitate sunt obligatorii",
-        "maximum-timeseries-or-attributes": "{ count, plural, 1 { Este permisă maximum o serie temporală sau atribut} other {Sunt permise maximum # serii temporale sau atribute} }",
+        "maximum-timeseries-or-attributes": "{ count, plural, =1 { Este permisă maximum o serie temporală sau atribut} other {Sunt permise maximum # serii temporale sau atribute} }",
         "alarm-fields-required": "Câmpurile pentru alarmă sunt obligatorii",
         "function-types": "Tipuri Funcţie",
         "function-types-required": "Tipurile de funcţie sunt obligatorii",
-        "maximum-function-types": "Maximum { count, plural, 1 {Este permis doar un tip de funcţie} other {Sunt permise doar # tipuri de funcţie} }",
+        "maximum-function-types": "Maximum { count, plural, =1 {Este permis doar un tip de funcţie} other {Sunt permise doar # tipuri de funcţie} }",
         "time-description": "Cronologie valoare curentă;",
         "value-description": "valoare curentă;",
         "prev-value-description": "Rezultat execuție funcţie precedentă;",
@@ -650,11 +650,11 @@
         "manage-credentials": "Administrare Acreditări",
         "delete": "Şterge Dispozitiv",
         "assign-devices": "Repartizeză Dispozitive",
-        "assign-devices-text": "Repartizeză { count, plural, 1 {un dispozitiv} other {# dispozitive} } Clientului",
+        "assign-devices-text": "Repartizeză { count, plural, =1 {un dispozitiv} other {# dispozitive} } Clientului",
         "delete-devices": "Şterge Dispozitive",
         "unassign-from-customer": "Şterge repartizarea către client",
         "unassign-devices": "Şterge repartizarea dispozitivelor",
-        "unassign-devices-action-title": "Şterge repartizarea a { count, plural, 1 {un dispozitiv} other {# dispozitive} } de la client",
+        "unassign-devices-action-title": "Şterge repartizarea a { count, plural, =1 {un dispozitiv} other {# dispozitive} } de la client",
         "assign-new-device": "Repartizare Dispozitiv Nou",
         "make-public-device-title": "Sigur vrei să faci dispozitivul '{{deviceName}}' public?",
         "make-public-device-text": "După confirmare, dispozitivul și toate datele aferente acestuia vor fi făcute publice, fiind deci accesibile oricui",
@@ -663,13 +663,13 @@
         "view-credentials": "Vezi Credențiale",
         "delete-device-title": "Sigur vrei să ștergi dispozitivul '{{deviceName}}'?",
         "delete-device-text": "ATENȚIE! După confirmare, dispozitivul împreună cu datele aferente acestuia vor fi șterse IREVERSIBIL!",
-        "delete-devices-title": "Sigur vrei să ștergi { count, plural, 1 {un dispozitiv} other {# dispozitive} }?",
-        "delete-devices-action-title": "Delete { count, plural, 1 {un dispozitiv} other {# dispozitive} }",
+        "delete-devices-title": "Sigur vrei să ștergi { count, plural, =1 {un dispozitiv} other {# dispozitive} }?",
+        "delete-devices-action-title": "Delete { count, plural, =1 {un dispozitiv} other {# dispozitive} }",
         "delete-devices-text": "ATENȚIE! După confirmare, toate dispozitivele selectate, împreună cu datele aferente acestora, vor fi șterse IREVERSIBIL!",
         "unassign-device-title": "Sigur vrei să ștergi repartizarea dispozitivului '{{deviceName}}'?",
         "unassign-device-text": "ATENȚIE! După confirrmare, dispozitivul nu va mai fi accesibil clientului",
         "unassign-device": "Șterge repartizare dispozitiv",
-        "unassign-devices-title": "Sigur vrei să ștergi repartizarea pentru { count, plural, 1 {un dispozitiv} other {# devices} }?",
+        "unassign-devices-title": "Sigur vrei să ștergi repartizarea pentru { count, plural, =1 {un dispozitiv} other {# devices} }?",
         "unassign-devices-text": "ATENȚIE! După confirmare, repartizarea dispozitivelor va fi ștearsă, acestea nemaifiind accesibile clientului",
         "device-credentials": "Credențiale Dispozitiv",
         "credentials-type": "Tip Credențiale",
@@ -760,55 +760,55 @@
         "type-required": "Tipul entității este necesar",
         "type-device": "Dispozitiv",
         "type-devices": "Dispozitive",
-        "list-of-devices": "{ count, plural, 1 {un dispozitiv} other {Listă # dispozitive} }",
+        "list-of-devices": "{ count, plural, =1 {un dispozitiv} other {Listă # dispozitive} }",
         "device-name-starts-with": "Dispozitive a căror nume începe cu '{{prefix}}'",
         "type-asset": "Proprietate",
         "type-assets": "Proprietăți",
-        "list-of-assets": "{ count, plural, 1 {o proprietate} other {Listă # proprietăți} }",
+        "list-of-assets": "{ count, plural, =1 {o proprietate} other {Listă # proprietăți} }",
         "asset-name-starts-with": "Proprietate a cărei nume începe cu '{{prefix}}'",
         "type-entity-view": "Entitate Definită",
         "type-entity-views": "Entități Definite",
-        "list-of-entity-views": "{ count, plural, 1 {o entitate definită} other {Listă # entități definite} }",
+        "list-of-entity-views": "{ count, plural, =1 {o entitate definită} other {Listă # entități definite} }",
         "entity-view-name-starts-with": "Entități definite al căror nume începe cu '{{prefix}}'",
         "type-rule": "Regulă",
         "type-rules": "Reguli",
-        "list-of-rules": "{ count, plural, 1 {o regulă} other {Listă  # reguli} }",
+        "list-of-rules": "{ count, plural, =1 {o regulă} other {Listă  # reguli} }",
         "rule-name-starts-with": "Reguli al căror nume începe cu '{{prefix}}'",
         "type-plugin": "Plugin",
         "type-plugins": "Plugin-uri",
-        "list-of-plugins": "{ count, plural, 1 {un plugin} other {Listă # plugin-uri} }",
+        "list-of-plugins": "{ count, plural, =1 {un plugin} other {Listă # plugin-uri} }",
         "plugin-name-starts-with": "Plugin-uri al căror nume începe cu '{{prefix}}'",
         "type-tenant": "Locatar",
         "type-tenants": "Locatari",
-        "list-of-tenants": "{ count, plural, 1 {un locatar} other {Listă  # locatari} }",
+        "list-of-tenants": "{ count, plural, =1 {un locatar} other {Listă  # locatari} }",
         "tenant-name-starts-with": "Locatari al căror nume începe cu '{{prefix}}'",
         "type-customer": "Client",
         "type-customers": "Clienţi",
-        "list-of-customers": "{ count, plural, 1 {un client} other {Listă # Clienţi} }",
+        "list-of-customers": "{ count, plural, =1 {un client} other {Listă # Clienţi} }",
         "customer-name-starts-with": "Clienţi al căror nume începe cu '{{prefix}}'",
         "type-user": "Utilizator",
         "type-users": "Utilizatori",
-        "list-of-users": "{ count, plural, 1 {un utilizator} other {Listă # utilizatori} }",
+        "list-of-users": "{ count, plural, =1 {un utilizator} other {Listă # utilizatori} }",
         "user-name-starts-with": "Utilizatori al căror nume începe cu '{{prefix}}'",
         "type-dashboard": "Panou Control",
         "type-dashboards": "Panouri Control",
-        "list-of-dashboards": "{ count, plural, 1 {un panou control} other {Listă  # panouri control} }",
+        "list-of-dashboards": "{ count, plural, =1 {un panou control} other {Listă  # panouri control} }",
         "dashboard-name-starts-with": "Panouri control al căror nume începe cu '{{prefix}}'",
         "type-alarm": "Alarmă",
         "type-alarms": "Alarme",
-        "list-of-alarms": "{ count, plural, 1 {o alarmă} other {Listă # alarme} }",
+        "list-of-alarms": "{ count, plural, =1 {o alarmă} other {Listă # alarme} }",
         "alarm-name-starts-with": "Alarme al căror nume începe cu '{{prefix}}'",
         "type-rulechain": "Flux",
         "type-rulechains": "Fluxuri",
-        "list-of-rulechains": "{ count, plural, 1 {un flux} other {Listă # fluxuri} }",
+        "list-of-rulechains": "{ count, plural, =1 {un flux} other {Listă # fluxuri} }",
         "rulechain-name-starts-with": "Fluxuri al căror nume începe cu '{{prefix}}'",
         "type-rulenode": "Nod flux",
         "type-rulenodes": "Noduri flux",
-        "list-of-rulenodes": "{ count, plural, 1 {un nod flux} other {Listă # noduri flux} }",
+        "list-of-rulenodes": "{ count, plural, =1 {un nod flux} other {Listă # noduri flux} }",
         "rulenode-name-starts-with": "Noduri flux al căror nume începe cu '{{prefix}}'",
         "type-current-customer": "Client Curent",
         "search": "Caută Entități",
-        "selected-entities": "{ count, plural, 1 {o entitate} other {# entități} } selectate",
+        "selected-entities": "{ count, plural, =1 {o entitate} other {# entități} } selectate",
         "entity-name": "Nume Entitate",
         "entity-label": "Etichetă Entitate",
         "details": "Detalii Entitate",
@@ -870,21 +870,21 @@
         "add-entity-view-text": "Adaugă Entitate Definită",
         "delete": "ßterge Entitate Definită",
         "assign-entity-views": "Repartizează Entitate Definită",
-        "assign-entity-views-text": "Repartizează { count, plural, 1 {o entitate definită} other {# entități definite} } clientului",
+        "assign-entity-views-text": "Repartizează { count, plural, =1 {o entitate definită} other {# entități definite} } clientului",
         "delete-entity-views": "Şterge Entități Definite",
         "unassign-from-customer": "Ştergere Repartizare Către Client",
         "unassign-entity-views": "Ştergere Repartizare Entități Definite",
-        "unassign-entity-views-action-title": "Şterge repartizare { count, plural, 1 {o entitate definită} other {# entități definite} } de la client ",
+        "unassign-entity-views-action-title": "Şterge repartizare { count, plural, =1 {o entitate definită} other {# entități definite} } de la client ",
         "assign-new-entity-view": "Repartizează Entitate Definită Nouă",
         "delete-entity-view-title": "Sigur vrei să ștergi entitatea definită : '{{entityViewName}}'?",
         "delete-entity-view-text": "ATENŢIE! După confirmare, entitatea definită şi toate datele asociate cu aceasta vor fi șterse IREVERSIBIL!",
-        "delete-entity-views-title": "Sigur vrei să ștergi{ count, plural, 1 {o entitate definită} other {# entități definite} }?",
-        "delete-entity-views-action-title": "Şterge { count, plural, 1 {o entitate definită} other {# entități definite} }",
+        "delete-entity-views-title": "Sigur vrei să ștergi{ count, plural, =1 {o entitate definită} other {# entități definite} }?",
+        "delete-entity-views-action-title": "Şterge { count, plural, =1 {o entitate definită} other {# entități definite} }",
         "delete-entity-views-text": "ATENŢIE! După confirmare, toate entitățile definite și datele asociate acestora vor fi șterse IREVERSIBIL!",
         "unassign-entity-view-title": "Sigur vrei să ștergi repartizarea entității definite : '{{entityViewName}}'?",
         "unassign-entity-view-text": "ATENŢIE! După confirmare, clientul nu va mai putea accesa entitatea definită selectată",
         "unassign-entity-view": "Şterge Repartizare Entitate Definită",
-        "unassign-entity-views-title": "Sigur vrei să ștergi repartizarea a { count, plural, 1 {o entitate definită} other {# entități definite} }?",
+        "unassign-entity-views-title": "Sigur vrei să ștergi repartizarea a { count, plural, =1 {o entitate definită} other {# entități definite} }?",
         "unassign-entity-views-text": "ATENŢIE! După confirmare, clientul nu va mai putea accesa entitățile definite selectate",
         "entity-view-type": "Tip Entitate Definită",
         "entity-view-type-required": "Tipul ecranului pentru entitate este obligatoriu",
@@ -961,7 +961,7 @@
     },
     "extension": {
         "extensions": "Extensii",
-        "selected-extensions": "{ count, plural, 1 {o extensie selectată} other {# extensii selectate} }",
+        "selected-extensions": "{ count, plural, =1 {o extensie selectată} other {# extensii selectate} }",
         "type": "Tip",
         "key": "Cheie",
         "value": "Valoare",
@@ -975,7 +975,7 @@
         "edit": "Editează Extensie",
         "delete-extension-title": "Sigur vrei să ștergi extensia: '{{extensionId}}'?",
         "delete-extension-text": "ATENŢIE! După confirmare, extensia şi toate datele asociate acesteia, vor fi șterse IREVERSIBIL!",
-        "delete-extensions-title": "Sigur vrei să ștergi { count, plural, 1 {o extensie} other {# extensii} }?",
+        "delete-extensions-title": "Sigur vrei să ștergi { count, plural, =1 {o extensie} other {# extensii} }?",
         "delete-extensions-text": "ATENŢIE! După confirmare, toate extensiile selectate vor fi șterse IREVERSIBIL!",
         "converters": "Convertoare",
         "converter-id": "ID Convertoare",
@@ -1128,8 +1128,8 @@
     "grid": {
         "delete-item-title": "Sigur vrei să ștergi elementul?",
         "delete-item-text": "ATENŢIE! După confirmare, elementul şi toate datele referitoare la acesta, vor fi șterse IREVERSIBIL!",
-        "delete-items-title": "Sigur vrei să ștergi { count, plural, 1 {un element} other {# elemente} }?",
-        "delete-items-action-title": "Şterge { count, plural, 1 {un element} other {# elemente} }",
+        "delete-items-title": "Sigur vrei să ștergi { count, plural, =1 {un element} other {# elemente} }?",
+        "delete-items-action-title": "Şterge { count, plural, =1 {un element} other {# elemente} }",
         "delete-items-text": "ATENŢIE! După confirmare, toate elementele selectate şi toate datele referitoare la acestea, vor fi șterse IREVERSIBIL!",
         "add-item-text": "Adaugă Element Nou",
         "no-items-text": "Nu Au Fost Găsite Elemente",
@@ -1274,7 +1274,7 @@
         },
         "from-relations": "Ieșire",
         "to-relations": "Intrare",
-        "selected-relations": "{ count, plural, 1 {o relaţie selectată } other {# relaţii selectate } }",
+        "selected-relations": "{ count, plural, =1 {o relaţie selectată } other {# relaţii selectate } }",
         "type": "Tip",
         "to-entity-type": "Către Tip Entitate",
         "to-entity-name": "Către Nume Entitate",
@@ -1290,11 +1290,11 @@
         "edit": "Şterge Relaţie",
         "delete-to-relation-title": "Sigur vrei să ștergi relația către entitatea '{{entityName}}'?",
         "delete-to-relation-text": "ATENŢIE! După confirmare,relaţia către entitatea '{{entityName}}' va fi ştearsă",
-        "delete-to-relations-title": "Sigur vrei să ștergi { count, plural, 1 {o relaţie} other {# relaţii} }?",
+        "delete-to-relations-title": "Sigur vrei să ștergi { count, plural, =1 {o relaţie} other {# relaţii} }?",
         "delete-to-relations-text": "ATENŢIE! După confirmare, relaţiile selectate către entităţile corespondente și toate referirile la acestea, vor fi șterse IREVERSIBIL!",
         "delete-from-relation-title": "Sigur vrei să ștergi relația dinspre entitatea '{{entityName}}'?",
         "delete-from-relation-text": "ATENŢIE! După confirmare,relaţia dinspre entitatea '{{entityName}}' va fi ștearsă",
-        "delete-from-relations-title": "Sigur vrei să ștergi { count, plural, 1 {o relaţie} other {# relaţii} }?",
+        "delete-from-relations-title": "Sigur vrei să ștergi { count, plural, =1 {o relaţie} other {# relaţii} }?",
         "delete-from-relations-text": "ATENŢIE! După confirmare, relaţiile selectate către entităţile corespondente și toate referirile la acestea, vor fi șterse IREVERSIBIL!",
         "remove-relation-filter": "Elimină Filtru Relaţie",
         "add-relation-filter": "Adaugă Filtru Relaţie",
@@ -1317,8 +1317,8 @@
         "set-root-rulechain-text": "ATENŢIE! După confirmare, fluxul va deveni rădăcină şi va gestiona toate mesajele de intrare",
         "delete-rulechain-title": "Sigur vrei să ștergi fluxul '{{ruleChainName}}'?",
         "delete-rulechain-text": "ATENŢIE! După confirmare, fluxul şi toate datele referitoare la acesta, vor fi șterse IREVERSIBIL!",
-        "delete-rulechains-title": "Sigur vrei să ștergi { count, plural, 1 {un flux} other {# fluxuri} }?",
-        "delete-rulechains-action-title": "Ştergi { count, plural, 1 {un flux} other {# fluxuri} }",
+        "delete-rulechains-title": "Sigur vrei să ștergi { count, plural, =1 {un flux} other {# fluxuri} }?",
+        "delete-rulechains-action-title": "Ştergi { count, plural, =1 {un flux} other {# fluxuri} }",
         "delete-rulechains-text": "ATENŢIE! După confirmare, fluxul şi toate datele referitoare la acesta, vor fi șterse IREVERSIBIL!",
         "add-rulechain-text": "Adaugă Flux Nou",
         "no-rulechains-text": "Nu au fost găsite fluxuri",
@@ -1417,8 +1417,8 @@
         "tenant-details": "Detalii Locatar",
         "delete-tenant-title": "Sigur vrei să ștergi locatarul: '{{tenantTitle}}'?",
         "delete-tenant-text": "ATENŢIE! După confirmare, locatarul şi toate datele referitoare la acesta, vor fi șterse IREVERSIBIL!",
-        "delete-tenants-title": "Sigur vrei să ștergi { count, plural, 1 {un locatar} other {# locatari} } ?",
-        "delete-tenants-action-title": "Şterge { count, plural, 1 {un locatar} other {# locatari} }",
+        "delete-tenants-title": "Sigur vrei să ștergi { count, plural, =1 {un locatar} other {# locatari} } ?",
+        "delete-tenants-action-title": "Şterge { count, plural, =1 {un locatar} other {# locatari} }",
         "delete-tenants-text": "ATENŢIE! După confirmare, locatarii selectaţi şi datele aferente acestora, vor fi șterse IREVERSIBIL!",
         "title": "Titlu",
         "title-required": "Titlul este obligatoriu",
@@ -1432,10 +1432,10 @@
         "tenant-required": "Locatarul este obligatoriu"
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, 1 {o secundă} other {# secunde} }",
-        "minutes-interval": "{ minutes, plural, 1 {un minut} other {# minute} }",
-        "hours-interval": "{ hours, plural, 1 {o oră} other {# ore} }",
-        "days-interval": "{ days, plural, 1 {o zi} other {# zile} }",
+        "seconds-interval": "{ seconds, plural, =1 {o secundă} other {# secunde} }",
+        "minutes-interval": "{ minutes, plural, =1 {un minut} other {# minute} }",
+        "hours-interval": "{ hours, plural, =1 {o oră} other {# ore} }",
+        "days-interval": "{ days, plural, =1 {o zi} other {# zile} }",
         "days": "Zile",
         "hours": "Ore",
         "minutes": "Minute",
@@ -1443,10 +1443,10 @@
         "advanced": "Personalizat"
     },
     "timewindow": {
-        "days": "{ days, plural, 1 {o zi} other {# zile} }",
-        "hours": "{ hours, plural,  1 {o oră} other {# ore} }",
-        "minutes": "{ minutes, plural,  1 {un minut} other {# minute} }",
-        "seconds": "{ seconds, plural,  1 {o secundă} other {# secunde} }",
+        "days": "{ days, plural, =1 {o zi} other {# zile} }",
+        "hours": "{ hours, plural, =1 {o oră} other {# ore} }",
+        "minutes": "{ minutes, plural, =1 {un minut} other {# minute} }",
+        "seconds": "{ seconds, plural, =1 {o secundă} other {# secunde} }",
         "realtime": "Timp Real",
         "history": "Istoric",
         "last-prefix": "Interval:",
@@ -1473,8 +1473,8 @@
         "user-details": "Detalii Utilizator",
         "delete-user-title": "Sigur vrei să ștergi utilizatorul '{{userEmail}}'?",
         "delete-user-text": "ATENŢIE! După confirmare, utilizatorul şi toate datele aferente acestuia, vor fi șterse IREVERSIBIL!",
-        "delete-users-title": "Sigur vrei să ștergi { count, plural, 1 {un utilizator} other {# utilizatori} }?",
-        "delete-users-action-title": "Ştergere { count, plural, 1 {un utilizator} other {# utilizatori} }",
+        "delete-users-title": "Sigur vrei să ștergi { count, plural, =1 {un utilizator} other {# utilizatori} }?",
+        "delete-users-action-title": "Ştergere { count, plural, =1 {un utilizator} other {# utilizatori} }",
         "delete-users-text": "ATENŢIE! După confirmare, toţi utilizatorii selectaţi împreună cu datele aferente acestora, vor fi șterse IREVERSIBIL!",
         "activation-email-sent-message": "Mesajul eMail pentru activare a fost trimis cu succes!",
         "resend-activation": "Retrimite mesaj eMail de activare",
@@ -1599,8 +1599,8 @@
         "widgets-bundle-details": "Detalii Pachet Widgeturi",
         "delete-widgets-bundle-title": "Sigur vrei să ștergi pachetul de widgeturi '{{widgetsBundleTitle}}'?",
         "delete-widgets-bundle-text": "ATENŢIE! După Confirmare, pachetul de widgeturi şi toate datele aferente acestuia, vor fi șterse IREVERSIBIL!",
-        "delete-widgets-bundles-title": "Sigur vrei să ștergi { count, plural, 1 {un pachet widgeturi} other {# pachete widgeturi} }?",
-        "delete-widgets-bundles-action-title": "Şterge { count, plural, 1 {un packet widgeturi} other {# pachete widgeturi} }",
+        "delete-widgets-bundles-title": "Sigur vrei să ștergi { count, plural, =1 {un pachet widgeturi} other {# pachete widgeturi} }?",
+        "delete-widgets-bundles-action-title": "Şterge { count, plural, =1 {un packet widgeturi} other {# pachete widgeturi} }",
         "delete-widgets-bundles-text": "ATENŢIE! După confirmare, toate pachetele selectate de widget-uri şi datele aferente acestuia, vor fi șterse IREVERSIBIL!",
         "no-widgets-bundles-matching": "Nu au fost găsite pachete de widgeturi conținând textul '{{widgetsBundle}}' ",
         "widgets-bundle-required": "Denumirea pachetelor de widgeturi este obligatorie",
@@ -1638,7 +1638,7 @@
         "display-timewindow": "Afişare Interval Timp",
         "display-legend": "Afişare Legendă",
         "datasources": "Surse Date",
-        "maximum-datasources": "Maximum { count, plural, 1 {o sursă date permisă} other {# surse date permise} }",
+        "maximum-datasources": "Maximum { count, plural, =1 {o sursă date permisă} other {# surse date permise} }",
         "datasource-type": "Tip",
         "datasource-parameters": "Parametri",
         "remove-datasource": "Elimină Sursă Date",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ru_RU.json b/ui-ngx/src/assets/locale/locale.constant-ru_RU.json
index e9d5587d4d..ed4afa01a1 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ru_RU.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ru_RU.json
@@ -176,17 +176,17 @@
         "acknowledge": "Подтвердить",
         "clear": "Сбросить",
         "search": "Поиск оповещений",
-        "selected-alarms": "Выбрано { count, plural, 1 {1 оповещение} few {# оповещения} other {# оповещений} }",
+        "selected-alarms": "Выбрано { count, plural, =1 {1 оповещение} few {# оповещения} other {# оповещений} }",
         "no-data": "Нет данных для отображения",
         "polling-interval": "Интервал опроса оповещений (сек)",
         "polling-interval-required": "Интервал опроса оповещений обязателен.",
         "min-polling-interval-message": "Минимальный интервал опроса оповещений 1 секунда.",
-        "aknowledge-alarms-title": "Подтвердить { count, plural, 1 {1 оповещение} other {# оповещений} }",
-        "aknowledge-alarms-text": "Вы точно хотите подтвердить { count, plural, 1 {1 оповещение} other {# оповещений} }?",
+        "aknowledge-alarms-title": "Подтвердить { count, plural, =1 {1 оповещение} other {# оповещений} }",
+        "aknowledge-alarms-text": "Вы точно хотите подтвердить { count, plural, =1 {1 оповещение} other {# оповещений} }?",
         "aknowledge-alarm-title": "Подтвердить оповещение",
         "aknowledge-alarm-text": "Вы точно хотите подтвердить оповещение?",
-        "clear-alarms-title": "Сбросить { count, plural, 1 {1 оповещение} other {# оповещений} }",
-        "clear-alarms-text": "Вы точно хотите сбросить { count, plural, 1 {1 оповещение} other {# оповещений} }?",
+        "clear-alarms-title": "Сбросить { count, plural, =1 {1 оповещение} other {# оповещений} }",
+        "clear-alarms-text": "Вы точно хотите сбросить { count, plural, =1 {1 оповещение} other {# оповещений} }?",
         "clear-alarm-title": "Сбросить оповещение",
         "clear-alarm-text": "Вы точно хотите сбросить оповещение?",
         "alarm-status-filter": "Фильтр оповещений",
@@ -279,15 +279,15 @@
         "add-asset-text": "Добавить новый актив",
         "asset-details": "Подробности об активе",
         "assign-assets": "Присвоить активы",
-        "assign-assets-text": "Присвоить { count, plural, 1 {1 актив} few {# актива} other {# активов} } клиенту",
+        "assign-assets-text": "Присвоить { count, plural, =1 {1 актив} few {# актива} other {# активов} } клиенту",
         "delete-assets": "Удалить активы",
         "unassign-assets": "Отозвать активы",
-        "unassign-assets-action-title": "Отозвать { count, plural, 1 {1 актив} few {# актива} other {# активов} } у клиента",
+        "unassign-assets-action-title": "Отозвать { count, plural, =1 {1 актив} few {# актива} other {# активов} } у клиента",
         "assign-new-asset": "Присвоить новый актив",
         "delete-asset-title": "Вы точно хотите удалить '{{assetName}}'?",
         "delete-asset-text": "Внимание, после подтверждения актив и все связанные с ним данные будут безвозвратно удалены.",
-        "delete-assets-title": "Вы точно хотите удалить { count, plural, 1 {1 актив} few {# актива} other {# активов} }",
-        "delete-assets-action-title": "Удалить { count, plural, 1 {1 актив} few {# актива} other {# активов} }",
+        "delete-assets-title": "Вы точно хотите удалить { count, plural, =1 {1 актив} few {# актива} other {# активов} }",
+        "delete-assets-action-title": "Удалить { count, plural, =1 {1 актив} few {# актива} other {# активов} }",
         "delete-assets-text": "Внимание, после подтверждения выбранные активы и все связанные с ними данные будут безвозвратно удалены.",
         "make-public-asset-title": "Вы точно хотите открыть общий доступ к активу '{{assetName}}'?",
         "make-public-asset-text": "Внимание, после подтверждения актив и все связанные с ним данные станут общедоступными.",
@@ -296,7 +296,7 @@
         "unassign-asset-title": "Вы точно хотите отозвать актив '{{assetName}}'?",
         "unassign-asset-text": "После подтверждения актив будут отозван, и клиент потеряет к нему доступ.",
         "unassign-asset": "Отозвать актив",
-        "unassign-assets-title": "Вы точно хотите отозвать { count, plural, 1 {1 актив} few {# актива} other {# активов} }?",
+        "unassign-assets-title": "Вы точно хотите отозвать { count, plural, =1 {1 актив} few {# актива} other {# активов} }?",
         "unassign-assets-text": "После подтверждения активы будут отозваны, и клиент потеряет к ним доступ.",
         "copyId": "Копировать ИД актива",
         "idCopiedMessage": "ИД актива скопировано в буфер обмена",
@@ -322,7 +322,7 @@
         "key-required": "Ключ атрибута обязателен.",
         "value": "Значение",
         "value-required": "Значение атрибута обязательно.",
-        "delete-attributes-title": "Вы уверенны, что хотите удалить { count, plural, one {1 атрибут} few {# атрибута} other {# атрибутов} }? ",
+        "delete-attributes-title": "Вы уверенны, что хотите удалить { count, plural, =1 {1 атрибут} few {# атрибута} other {# атрибутов} }? ",
         "delete-attributes-text": "Внимание, после подтверждения выбранные атрибуты будут удалены.",
         "delete-attributes": "Удалить атрибуты",
         "enter-attribute-value": "Введите значение атрибута",
@@ -332,8 +332,8 @@
         "prev-widget": "Предыдущий виджет",
         "add-to-dashboard": "Добавить на дашборд",
         "add-widget-to-dashboard": "Добавить виджет на дашборд",
-        "selected-attributes": "{ count, plural, 1 {Выбран} other {Выбраны} } { count, plural, one {1 атрибут} few {# атрибута} other {# атрибутов} }",
-        "selected-telemetry": "{ count, plural, 1 {Выбран} other {Выбраны} } { count, plural, 1 {1 параметр} few {# параметра} other {# параметров} } телеметрии"
+        "selected-attributes": "{ count, plural, =1 {Выбран} other {Выбраны} } { count, plural, =1 {1 атрибут} few {# атрибута} other {# атрибутов} }",
+        "selected-telemetry": "{ count, plural, =1 {Выбран} other {Выбраны} } { count, plural, =1 {1 параметр} few {# параметра} other {# параметров} } телеметрии"
     },
     "audit-log": {
         "audit": "Аудит",
@@ -432,8 +432,8 @@
         "customer-details": "Подробности о клиенте",
         "delete-customer-title": "Вы точно хотите удалить клиента '{{customerTitle}}'?",
         "delete-customer-text": "Внимание, после подтверждения клиент и все связанные с ним данные будут безвозвратно удалены.",
-        "delete-customers-title": "Вы точно хотите удалить { count, plural, 1 {1 клиент} few {# клиента} other {# клиентов} }?",
-        "delete-customers-action-title": "Удалить { count, plural, 1 {1 клиент} few {# клиента} other {# клиентов} }",
+        "delete-customers-title": "Вы точно хотите удалить { count, plural, =1 {1 клиент} few {# клиента} other {# клиентов} }?",
+        "delete-customers-action-title": "Удалить { count, plural, =1 {1 клиент} few {# клиента} other {# клиентов} }",
         "delete-customers-text": "Внимание, после подтверждения выбранные клиенты и все связанные с ними данные будут безвозвратно удалены.",
         "manage-users": "Управление пользователями",
         "manage-assets": "Управление активами",
@@ -494,20 +494,20 @@
         "add-dashboard-text": "Добавить новый дашборд",
         "assign-dashboards": "Прикрепить дашборды",
         "assign-new-dashboard": "Прикрепить новый дашборд",
-        "assign-dashboards-text": "Прикрепить { count, plural, 1 {1 дашборд} few {# дашборда} other {# дашбордов} } к клиенту",
-        "unassign-dashboards-action-text": "Отозвать { count, plural, 1 {1 дашборд} few {# дашборда} other {# дашбордов} } у клиента",
+        "assign-dashboards-text": "Прикрепить { count, plural, =1 {1 дашборд} few {# дашборда} other {# дашбордов} } к клиенту",
+        "unassign-dashboards-action-text": "Отозвать { count, plural, =1 {1 дашборд} few {# дашборда} other {# дашбордов} } у клиента",
         "delete-dashboards": "Удалить дашборды",
         "unassign-dashboards": "Отозвать дашборды",
-        "unassign-dashboards-action-title": "Отозвать { count, plural, one {1 дашборд} few {# дашборда} other {# дашбордов} } у клиента",
+        "unassign-dashboards-action-title": "Отозвать { count, plural, =1 {1 дашборд} few {# дашборда} other {# дашбордов} } у клиента",
         "delete-dashboard-title": "Вы точно хотите удалить дашборд '{{dashboardTitle}}'?",
         "delete-dashboard-text": "Внимание, после подтверждения дашборд и все связанные с ним данные будут безвозвратно утеряны.",
-        "delete-dashboards-title": "Вы точно хотите удалить { count, plural, one {1 дашборд} few {# дашборда} other {# дашбордов} }?",
-        "delete-dashboards-action-title": "Удалить { count, plural, one {1 дашборд} few {# дашборда} other {# дашбордов} }",
+        "delete-dashboards-title": "Вы точно хотите удалить { count, plural, =1 {1 дашборд} few {# дашборда} other {# дашбордов} }?",
+        "delete-dashboards-action-title": "Удалить { count, plural, =1 {1 дашборд} few {# дашборда} other {# дашбордов} }",
         "delete-dashboards-text": "Внимание, после подтверждения дашборды и все связанные с ними данные будут безвозвратно утеряны.",
         "unassign-dashboard-title": "Вы точно хотите отозвать дашборд '{{dashboardTitle}}'?",
         "unassign-dashboard-text": "После подтверждения дашборд не будет доступен клиенту.",
         "unassign-dashboard": "Отозвать дашборд",
-        "unassign-dashboards-title": "Вы точно хотите отозвать { count, plural, one {1 дашборд} few {# дашборда} other {# дашбордов} }?",
+        "unassign-dashboards-title": "Вы точно хотите отозвать { count, plural, =1 {1 дашборд} few {# дашборда} other {# дашбордов} }?",
         "unassign-dashboards-text": "После подтверждения выбранные дашборды не будут доступны клиенту.",
         "public-dashboard-title": "Теперь дашборд общедоступный",
         "public-dashboard-text": "Теперь ваш дашборд <b>{{dashboardTitle}}</b> доступен всем по <a href='{{publicLink}}' target='_blank'>ссылке</a>:",
@@ -584,7 +584,7 @@
         "manage-states": "Управление состоянием дашборда",
         "states": "Состояния дашборда",
         "search-states": "Поиск состояния дашборда",
-        "selected-states": "Выбрано { count, plural, 1 {1 состояние} few {# состояния} other {# состояний} } дашборда",
+        "selected-states": "Выбрано { count, plural, =1 {1 состояние} few {# состояния} other {# состояний} } дашборда",
         "edit-state": "Изменить состояние дашборда",
         "delete-state": "Удалить состояние дашборда",
         "add-state": "Добавить состояние дашборда",
@@ -680,11 +680,11 @@
         "manage-credentials": "Управление учетными данными",
         "delete": "Удалить устройство",
         "assign-devices": "Присвоить устройство",
-        "assign-devices-text": "Присвоить { count, plural, one {1 устройство} few {# устройства} other {# устройств} } клиенту",
+        "assign-devices-text": "Присвоить { count, plural, =1 {1 устройство} few {# устройства} other {# устройств} } клиенту",
         "delete-devices": "Удалить устройства",
         "unassign-from-customer": "Отозвать у клиенту",
         "unassign-devices": "Отозвать устройства",
-        "unassign-devices-action-title": "Отозвать у клиента { count, plural, one {1 устройство} few {# устройства} other {# устройств} }",
+        "unassign-devices-action-title": "Отозвать у клиента { count, plural, =1 {1 устройство} few {# устройства} other {# устройств} }",
         "assign-new-device": "Присвоить новое устройство",
         "make-public-device-title": "Вы точно хотите открыть общий доступ к устройству '{{deviceName}}'?",
         "make-public-device-text": "После подтверждения устройство и все связанные с ним данные будут общедоступными.",
@@ -693,13 +693,13 @@
         "view-credentials": "Просмотреть учетные данные",
         "delete-device-title": "Вы точно хотите удалить устройство '{{deviceName}}'?",
         "delete-device-text": "Внимание, после подтверждения устройство и все связанные с ним данные будут безвозвратно утеряны.",
-        "delete-devices-title": "Вы точно хотите удалить { count, plural, one {1 устройство} few {# устройства} other {# устройств} }?",
-        "delete-devices-action-title": "Удалить { count, plural, one {1 устройство} few {# устройства} other {# устройств} }",
+        "delete-devices-title": "Вы точно хотите удалить { count, plural, =1 {1 устройство} few {# устройства} other {# устройств} }?",
+        "delete-devices-action-title": "Удалить { count, plural, =1 {1 устройство} few {# устройства} other {# устройств} }",
         "delete-devices-text": "Внимание, после подтверждения выбранные устройства и все связанные с ними данные будут безвозвратно утеряны..",
         "unassign-device-title": "Вы точно хотите отозвать устройство '{{deviceName}}'?",
         "unassign-device-text": "После подтверждения устройство будет недоступно клиенту.",
         "unassign-device": "Отозвать устройство",
-        "unassign-devices-title": "Вы точно хотите отозвать { count, plural, one {1 устройство} few {# устройства} other {# устройств} }?",
+        "unassign-devices-title": "Вы точно хотите отозвать { count, plural, =1 {1 устройство} few {# устройства} other {# устройств} }?",
         "unassign-devices-text": "После подтверждения выбранные устройства будут недоступны клиенту.",
         "device-credentials": "Учетные данные устройства",
         "credentials-type": "Тип учетных данных",
@@ -789,56 +789,56 @@
         "type-required": "Тип объекта обязателен.",
         "type-device": "Устройство",
         "type-devices": "Устройства",
-        "list-of-devices": "{ count, plural, 1 {Одно устройство} other {Список из # устройств} }",
+        "list-of-devices": "{ count, plural, =1 {Одно устройство} other {Список из # устройств} }",
         "device-name-starts-with": "Устройства, чьи название начинается с '{{prefix}}'",
         "type-asset": "Актив",
         "type-assets": "Активы",
-        "list-of-assets": "{ count, plural, 1 {Один актив} other {Список из # активов} }",
+        "list-of-assets": "{ count, plural, =1 {Один актив} other {Список из # активов} }",
         "asset-name-starts-with": "Активы, чьи название начинается с '{{prefix}}'",
         "type-entity-view": "Представление Объекта",
         "type-entity-views": "Представления Объекта",
-        "list-of-entity-views": "{ count, plural, 1 {Одно представление объекта} other {Список из # представлений объекта} }",
+        "list-of-entity-views": "{ count, plural, =1 {Одно представление объекта} other {Список из # представлений объекта} }",
         "entity-view-name-starts-with": "Представления Объекта, чьи название начинается с '{{prefix}}'",
         "type-rule": "Правило",
         "type-rules": "Правила",
-        "list-of-rules": "{ count, plural, 1 {Одно правило} other {Список из # правил} }",
+        "list-of-rules": "{ count, plural, =1 {Одно правило} other {Список из # правил} }",
         "rule-name-starts-with": "Правила, чьи названия начинаются с '{{prefix}}'",
         "type-plugin": "Плагин",
         "type-plugins": "Плагины",
-        "list-of-plugins": "{ count, plural, 1 {Один плагин} other {Список из # плагинов} }",
+        "list-of-plugins": "{ count, plural, =1 {Один плагин} other {Список из # плагинов} }",
         "plugin-name-starts-with": "Плагины, чьи имена начинаются с '{{prefix}}'",
         "type-tenant": "Владелец",
         "type-tenants": "Владельцы",
-        "list-of-tenants": "{ count, plural, 1 {Один владелец} other {Список из # владельцев} }",
+        "list-of-tenants": "{ count, plural, =1 {Один владелец} other {Список из # владельцев} }",
         "tenant-name-starts-with": "Владельцы, чьи имена начинаются с '{{prefix}}'",
         "type-customer": "Клиент",
         "type-customers": "Клиенты",
-        "list-of-customers": "{ count, plural, 1 {Один клиент} other {Список из # клиентов} }",
+        "list-of-customers": "{ count, plural, =1 {Один клиент} other {Список из # клиентов} }",
         "customer-name-starts-with": "Клиенты, чьи имена начинаются с '{{prefix}}'",
         "type-user": "Пользователь",
         "type-users": "Пользователи",
-        "list-of-users": "{ count, plural, 1 {Один пользователь} other {Список из # пользователей} }",
+        "list-of-users": "{ count, plural, =1 {Один пользователь} other {Список из # пользователей} }",
         "user-name-starts-with": "Пользователи, чьи имена начинаются с '{{prefix}}'",
         "type-dashboard": "Дашборд",
         "type-dashboards": "Дашборды",
-        "list-of-dashboards": "{ count, plural, 1 {Один дашборд} other {Список из # дашбордов} }",
+        "list-of-dashboards": "{ count, plural, =1 {Один дашборд} other {Список из # дашбордов} }",
         "dashboard-name-starts-with": "Дашборды, чьи названия начинаются с '{{prefix}}'",
         "type-alarm": "Оповещение",
         "type-alarms": "Оповещения",
-        "list-of-alarms": "{ count, plural, 1 {Одно оповещение} other {Список из # оповещений} }",
+        "list-of-alarms": "{ count, plural, =1 {Одно оповещение} other {Список из # оповещений} }",
         "alarm-name-starts-with": "Оповещения, чьи названия начинаются с '{{prefix}}'",
         "type-rulechain": "Цепочка правил",
         "type-rulechains": "Цепочки правил",
-        "list-of-rulechains": "{ count, plural, 1 {Одна цепочка правил} other {Список из # цепочек правил} }",
+        "list-of-rulechains": "{ count, plural, =1 {Одна цепочка правил} other {Список из # цепочек правил} }",
         "rulechain-name-starts-with": "Цепочки правил, чьи названия начинаются с '{{prefix}}'",
         "type-rulenode": "Правило",
         "type-rulenodes": "Правила",
-        "list-of-rulenodes": "{ count, plural, 1 {Одно правило} other {Список из # правил} }",
+        "list-of-rulenodes": "{ count, plural, =1 {Одно правило} other {Список из # правил} }",
         "rulenode-name-starts-with": "Правила, чьи названия начинаются с '{{prefix}}'",
         "type-current-customer": "Текущий клиент",
         "type-current-tenant": "Текущий владелец",
         "search": "Поиск объектов",
-        "selected-entities": "Выбран(ы) { count, plural, 1 {1 объект} few {# объекта} other {# объектов} }",
+        "selected-entities": "Выбран(ы) { count, plural, =1 {1 объект} few {# объекта} other {# объектов} }",
         "entity-name": "Название объекта",
         "entity-label": "Метка объекта",
         "details": "Подробности об объекте",
@@ -900,21 +900,21 @@
         "add-entity-view-text": "Добавить новое представление объекта",
         "delete": "Удалить представление объекта",
         "assign-entity-views": "Назначить представления объектов",
-        "assign-entity-views-text": "Назначить клиенту { count, plural, 1 {1 представление объекта} few {# представления объектов} other {# представлений объектов} }",
+        "assign-entity-views-text": "Назначить клиенту { count, plural, =1 {1 представление объекта} few {# представления объектов} other {# представлений объектов} }",
         "delete-entity-views": "Удалить представления объектов",
         "unassign-from-customer": "Отозвать у клиента",
         "unassign-entity-views": "Отозвать представления объектов",
-        "unassign-entity-views-action-title": "Отозвать у клиента { count, plural, 1 {1 представление объекта} few {# представления объектов} other {# представлений объектов} }",
+        "unassign-entity-views-action-title": "Отозвать у клиента { count, plural, =1 {1 представление объекта} few {# представления объектов} other {# представлений объектов} }",
         "assign-new-entity-view": "Назначит новое представление объекта",
         "delete-entity-view-title": "Вы точно хотите удалить представление объекта '{{entityViewName}}'?",
         "delete-entity-view-text": "Внимание, после подтверждения представление объекта и все связанные с ним данные будут безвозвратно удалены.",
-        "delete-entity-views-title": "Вы точно хотите удалить { count, plural, 1 {1 представление объекта} few {# представления объектов} other {# представлений объектов} }?",
-        "delete-entity-views-action-title": "Удалить { count, plural, 1 {1 представление объекта} few {# представления объектов} other {# представлений объектов} }",
+        "delete-entity-views-title": "Вы точно хотите удалить { count, plural, =1 {1 представление объекта} few {# представления объектов} other {# представлений объектов} }?",
+        "delete-entity-views-action-title": "Удалить { count, plural, =1 {1 представление объекта} few {# представления объектов} other {# представлений объектов} }",
         "delete-entity-views-text": "Внимание, после подтверждения выбранные представления объектов и все связанные с ними данные будут безвозвратно удалены.",
         "unassign-entity-view-title": "Вы точно хотите отозвать представление объекта '{{entityViewName}}'?",
         "unassign-entity-view-text": "После подтверждение представление объекта будет недоступно клиенту.",
         "unassign-entity-view": "Отозвать представление объекта",
-        "unassign-entity-views-title": "Вы точно хотите отозвать { count, plural, 1 {1 представление объекта} few {# представления объектов} other {# представлений объектов} }?",
+        "unassign-entity-views-title": "Вы точно хотите отозвать { count, plural, =1 {1 представление объекта} few {# представления объектов} other {# представлений объектов} }?",
         "unassign-entity-views-text": "После подтверждение выбранные представления объектов будет недоступно клиенту.",
         "entity-view-type": "Тип представления объекта",
         "entity-view-type-required": "Тип представления объекта обязателен.",
@@ -993,7 +993,7 @@
     },
     "extension": {
         "extensions": "Расширение",
-        "selected-extensions": "Выбрано { count, plural, 1 {1 расширение} few {# расширения} other {# расширений} }",
+        "selected-extensions": "Выбрано { count, plural, =1 {1 расширение} few {# расширения} other {# расширений} }",
         "type": "Тип",
         "key": "Ключ",
         "value": "Значение",
@@ -1007,7 +1007,7 @@
         "edit": "Редактировать расширение",
         "delete-extension-title": "Вы точно хотите удалить расширение '{{extensionId}}'?",
         "delete-extension-text": "Внимание, после подтверждения расширение и все связанные с ним данные будут безвозвратно удалены.",
-        "delete-extensions-title": "Вы точно хотите удалить { count, plural, 1 {1 расширение} few {# расширения} other {# расширений} }?",
+        "delete-extensions-title": "Вы точно хотите удалить { count, plural, =1 {1 расширение} few {# расширения} other {# расширений} }?",
         "delete-extensions-text": "Внимание, после подтверждения выбранные расширения будут удалены.",
         "converters": "Конвертеры",
         "converter-id": "ИД конвертера",
@@ -1159,8 +1159,8 @@
     "grid": {
         "delete-item-title": "Вы точно хотите удалить этот объект?",
         "delete-item-text": "Внимание, после подтверждения объект и все связанные с ним данные будут безвозвратно утеряны.",
-        "delete-items-title": "Вы точно хотите удалить { count, plural, one {1 объект} few {# объекта} other {# объектов} }?",
-        "delete-items-action-title": "Удалить { count, plural, one {1 объект} few {# объекта} other {# объектов} }",
+        "delete-items-title": "Вы точно хотите удалить { count, plural, =1 {1 объект} few {# объекта} other {# объектов} }?",
+        "delete-items-action-title": "Удалить { count, plural, =1 {1 объект} few {# объекта} other {# объектов} }",
         "delete-items-text": "Внимание, после подтверждения выбранные объекты и все связанные с ними данные будут безвозвратно утеряны.",
         "add-item-text": "Добавить новый объект",
         "no-items-text": "Объекты не найдены",
@@ -1307,7 +1307,7 @@
         },
         "from-relations": "Исходящие отношения",
         "to-relations": "Входящие отношения",
-        "selected-relations": "Выбрано { count, plural, 1 {1 отношение} few {# отношения} other {# отношений} }",
+        "selected-relations": "Выбрано { count, plural, =1 {1 отношение} few {# отношения} other {# отношений} }",
         "type": "Тип",
         "to-entity-type": "К типу объекта",
         "to-entity-name": "К объекта",
@@ -1323,11 +1323,11 @@
         "edit": "Редактировать отношение",
         "delete-to-relation-title": "Вы точно хотите удалить отношение, идущее к объекту '{{entityName}}'?",
         "delete-to-relation-text": "Внимание, после подтверждения объект '{{entityName}}' будет отвязан от текущего объекта.",
-        "delete-to-relations-title": "Вы точно хотите удалить { count, plural, 1 {1 отношение} few {# отношения} other {# отношений} }?",
+        "delete-to-relations-title": "Вы точно хотите удалить { count, plural, =1 {1 отношение} few {# отношения} other {# отношений} }?",
         "delete-to-relations-text": "Внимание, после подтверждения выбранные объекты будут отвязаны от текущего объекта.",
         "delete-from-relation-title": "Вы точно хотите удалить отношение, идущее от объекта '{{entityName}}'?",
         "delete-from-relation-text": "Внимание, после подтверждения текущий объект будет отвязан от объекта '{{entityName}}'.",
-        "delete-from-relations-title": "Вы точно хотите удалить { count, plural, 1 {1 отношение} few {# отношения} other {# отношений} }?",
+        "delete-from-relations-title": "Вы точно хотите удалить { count, plural, =1 {1 отношение} few {# отношения} other {# отношений} }?",
         "delete-from-relations-text": "Внимание, после подтверждения выбранные объекты будут отвязаны от соответствующих объектов.",
         "remove-relation-filter": "Удалить фильтр отношений",
         "add-relation-filter": "Добавить фильтр отношений",
@@ -1350,8 +1350,8 @@
         "set-root-rulechain-text": "После подтверждения цепочка правил станет корневой и будет обрабатывать все входящие сообщения.",
         "delete-rulechain-title": "Вы точно хотите удалить цепочку правил '{{ruleChainName}}'?",
         "delete-rulechain-text": "Внимание, после подтверждения цепочка правил и все связанные с ней данные будут безвозвратно удалены.",
-        "delete-rulechains-title": "Вы точно хотите удалить { count, plural, 1 {1 цепочку правил} few {# цепочки правил} other {# цепочек правил} }?",
-        "delete-rulechains-action-title": "Удалить { count, plural, 1 {1 цепочку правил} few {# цепочки правил} other {# цепочек правил} }",
+        "delete-rulechains-title": "Вы точно хотите удалить { count, plural, =1 {1 цепочку правил} few {# цепочки правил} other {# цепочек правил} }?",
+        "delete-rulechains-action-title": "Удалить { count, plural, =1 {1 цепочку правил} few {# цепочки правил} other {# цепочек правил} }",
         "delete-rulechains-text": "Внимание, после подтверждения выбранные цепочки правил и все связанные с ними данные будут безвозвратно удалены.",
         "add-rulechain-text": "Добавить новую цепочку правил",
         "no-rulechains-text": "Цепочки правил не найдены",
@@ -1455,8 +1455,8 @@
         "tenant-details": "Подробности об владельце",
         "delete-tenant-title": "Вы точно хотите удалить владельца '{{tenantTitle}}'?",
         "delete-tenant-text": "Внимание, после подтверждения владелец и все связанные с ним данные будут безвозвратно утеряны.",
-        "delete-tenants-title": "Вы точно хотите удалить { count, plural, one {1 владельца}  other {# владельцев} }?",
-        "delete-tenants-action-title": "Удалить { count, plural, one {1 владельца}  other {# владельцев} }",
+        "delete-tenants-title": "Вы точно хотите удалить { count, plural, =1 {1 владельца}  other {# владельцев} }?",
+        "delete-tenants-action-title": "Удалить { count, plural, =1 {1 владельца}  other {# владельцев} }",
         "delete-tenants-text": "Внимание, после подтверждения выбранные Владельцы и все связанные с ними данные будут безвозвратно утеряны.",
         "title": "Имя",
         "title-required": "Имя обязательно.",
@@ -1470,10 +1470,10 @@
         "tenant-required": "Владелец обязателен"
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, one {1 секунда} few {# секунды} other {# секунд} }",
-        "minutes-interval": "{ minutes, plural, one {1 минута} few {# минуты} other {# минут} }",
-        "hours-interval": "{ hours, plural, one {1 час} few {# часа} other {# часов} }",
-        "days-interval": "{ days, plural, one {1 день} few {# дня} other {# дней} }",
+        "seconds-interval": "{ seconds, plural, =1 {1 секунда} few {# секунды} other {# секунд} }",
+        "minutes-interval": "{ minutes, plural, =1 {1 минута} few {# минуты} other {# минут} }",
+        "hours-interval": "{ hours, plural, =1 {1 час} few {# часа} other {# часов} }",
+        "days-interval": "{ days, plural, =1 {1 день} few {# дня} other {# дней} }",
         "days": "Дни",
         "hours": "Часы",
         "minutes": "Минуты",
@@ -1481,10 +1481,10 @@
         "advanced": "Дополнительно"
     },
     "timewindow": {
-        "days": "{ days, plural, one {1 день} few {# дня} other {# дней} }",
-        "hours": "{ hours, plural, one {1 час} few {# часа} other {# часов} }",
-        "minutes": "{ minutes, plural, one {1 минута} few {# минуты} other {# минут} }",
-        "seconds": "{ seconds, plural, one {1 секунда} few {# секунды} other {# секунд} }",
+        "days": "{ days, plural, =1 {1 день} few {# дня} other {# дней} }",
+        "hours": "{ hours, plural, =1 {1 час} few {# часа} other {# часов} }",
+        "minutes": "{ minutes, plural, =1 {1 минута} few {# минуты} other {# минут} }",
+        "seconds": "{ seconds, plural, =1 {1 секунда} few {# секунды} other {# секунд} }",
         "realtime": "Режим реального времени",
         "history": "История",
         "last-prefix": "Последние",
@@ -1511,8 +1511,8 @@
         "user-details": "Подробности о пользователе",
         "delete-user-title": "Вы точно хотите удалить пользователя '{{userEmail}}'?",
         "delete-user-text": "Внимание, после подтверждения пользователь и все связанные с ним данные будут безвозвратно утеряны.",
-        "delete-users-title": "Вы точно хотите удалить { count, plural, one {1 пользователя} other {# пользователей} }?",
-        "delete-users-action-title": "Удалить { count, plural, one {1 пользователя} other {# пользователей} }",
+        "delete-users-title": "Вы точно хотите удалить { count, plural, =1 {1 пользователя} other {# пользователей} }?",
+        "delete-users-action-title": "Удалить { count, plural, =1 {1 пользователя} other {# пользователей} }",
         "delete-users-text": "Внимание, после подтверждения выбранные пользователи и все связанные с ними данные будут безвозвратно утеряны.",
         "activation-email-sent-message": "Активационное письмо успешно отправлено!",
         "resend-activation": "Повторить отправку активационного письма",
@@ -1638,8 +1638,8 @@
         "widgets-bundle-details": "Подробности о наборе виджетов",
         "delete-widgets-bundle-title": "Вы точно хотите удалить набор виджетов '{{widgetsBundleTitle}}'?",
         "delete-widgets-bundle-text": "Внимание, после подтверждения набор виджетов и все связанные с ним данные будут безвозвратно утеряны.",
-        "delete-widgets-bundles-title": "Вы точно хотите удалить { count, plural, one {1 набор виджетов} few {# набора виджетов} other {# наборов виджетов} }?",
-        "delete-widgets-bundles-action-title": "Удалить { count, plural, one {1 набор виджетов} few {# набора виджетов} other {# наборов виджетов} }",
+        "delete-widgets-bundles-title": "Вы точно хотите удалить { count, plural, =1 {1 набор виджетов} few {# набора виджетов} other {# наборов виджетов} }?",
+        "delete-widgets-bundles-action-title": "Удалить { count, plural, =1 {1 набор виджетов} few {# набора виджетов} other {# наборов виджетов} }",
         "delete-widgets-bundles-text": "Внимание, после подтверждения выбранные наборы виджетов и все связанные с ними данные будут безвозвратно утеряны..",
         "no-widgets-bundles-matching": "Набор виджетов '{{widgetsBundle}}' не найден.",
         "widgets-bundle-required": "Набор виджетов обязателен.",
diff --git a/ui-ngx/src/assets/locale/locale.constant-sl_SI.json b/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
index 04d7bcd25f..0937374fc8 100644
--- a/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
+++ b/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
@@ -265,17 +265,17 @@
     "acknowledge": "Potrdi",
     "clear": "Počisti",
     "search": "Iskanje alarmov",
-    "selected-alarms": "{ count, plural, 1 {1 alarm} other {# alarms} } izbran",
+    "selected-alarms": "{ count, plural, =1 {1 alarm} other {# alarms} } izbran",
     "no-data": "Ni podatkov za prikaz",
     "polling-interval": "Interval iskanja alarmov (s)",
     "polling-interval-required": "Zahtevan je interval glasovanja alarmov.",
     "min-polling-interval-message": "Dovoljen je vsaj 1-sekundni interval glasovanja.",
-    "aknowledge-alarms-title": "Potrdite { count, plural, 1 {1 alarm} other {# alarms} }",
-    "aknowledge-alarms-text": "Ali ste prepričani, da želite potrditi { count, plural, 1 {1 alarm} other {# alarms} }?",
+    "aknowledge-alarms-title": "Potrdite { count, plural, =1 {1 alarm} other {# alarms} }",
+    "aknowledge-alarms-text": "Ali ste prepričani, da želite potrditi { count, plural, =1 {1 alarm} other {# alarms} }?",
     "aknowledge-alarm-title": "Potrdite alarm",
     "aknowledge-alarm-text": "Ali ste prepričani, da želite potrditi alarm?",
-    "clear-alarms-title": "Počisti { count, plural, 1 {1 alarm} other {# alarmi} }",
-    "clear-alarms-text": "Ali ste prepričani, da želite počistiti { count, plural, 1 {1 alarm} other {# alarme} }?",
+    "clear-alarms-title": "Počisti { count, plural, =1 {1 alarm} other {# alarmi} }",
+    "clear-alarms-text": "Ali ste prepričani, da želite počistiti { count, plural, =1 {1 alarm} other {# alarme} }?",
     "clear-alarm-title": "Počisti alarm",
     "clear-alarm-text": "Ali ste prepričani, da želite počistiti alarm?",
     "alarm-status-filter": "Filter stanja alarma",
@@ -373,15 +373,15 @@
     "add-asset-text": "Dodaj novo sredstvo",
     "asset-details": "Podrobnosti o sredstvih",
     "assign-assets": "Dodelitev sredstev",
-    "assign-assets-text": "Stranki dodeli { count, plural, 1 {1 sredstvo} other {# assets} }",
+    "assign-assets-text": "Stranki dodeli { count, plural, =1 {1 sredstvo} other {# assets} }",
     "delete-assets": "Izbriši sredstva",
     "unassign-assets": "Preklic dodelitve sredstev",
-    "unassign-assets-action-title": "Stranki ne dodeli { count, plural, 1 {1 sredstvo} other {# assets} }",
+    "unassign-assets-action-title": "Stranki ne dodeli { count, plural, =1 {1 sredstvo} other {# assets} }",
     "assign-new-asset": "Dodeli novo sredstvo",
     "delete-asset-title": "Ali ste prepričani, da želite izbrisati sredstvo '{{assetName}}'?",
     "delete-asset-text": "Bodite previdni, po potrditvi bo sredstvo in vsi povezani podatki nepopravljivi.",
-    "delete-assets-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 sredstvo} other {# assets} }?",
-    "delete-assets-action-title": "Izbriši { count, plural, 1 {1 sredstvo} other {# assets} }",
+    "delete-assets-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 sredstvo} other {# assets} }?",
+    "delete-assets-action-title": "Izbriši { count, plural, =1 {1 sredstvo} other {# assets} }",
     "delete-assets-text": "Bodite previdni, po potrditvi bodo vsa izbrana sredstva odstranjena in vsi povezani podatki bodo postali nepopravljivi.",
     "make-public-asset-title": "Ali ste prepričani, da želite sredstvo '{{assetName}}' objaviti kot javno?",
     "make-public-asset-text": "Po potrditvi bodo sredstvo in vsi njegovi podatki javno dostopni in dostopni drugim.",
@@ -390,7 +390,7 @@
     "unassign-asset-title": "Ali ste prepričani, da želite dodeliti sredstvo '{{assetName}}'?",
     "unassign-asset-text": "Po potrditvi sredstvo ne bo dodeljeno in stranka ne bo dostopna.",
     "unassign-asset": "Preklic dodelitve sredstva",
-    "unassign-assets-title": "Ali ste prepričani, da želite odpovedati { count, plural, 1 {1 asset} other {# assets} }?",
+    "unassign-assets-title": "Ali ste prepričani, da želite odpovedati { count, plural, =1 {1 asset} other {# assets} }?",
     "unassign-assets-text": "Po potrditvi vsa izbrana sredstva ne bodo dodeljena in stranka ne bo dostopna do njih.",
     "copyId": "Kopiraj ID sredstva",
     "idCopiedMessage": "ID sredstva je kopiran v odložišče",
@@ -401,7 +401,7 @@
     "import": "Uvozi sredstva",
     "asset-file": "Datoteka sredstva",
     "search": "Išči sredstva",
-    "selected-assets": "{ count, plural, 1 {1 asset} other {# assets} } izbrano",
+    "selected-assets": "{ count, plural, =1 {1 asset} other {# assets} } izbrano",
     "label": "Oznaka"
   },
   "attribute": {
@@ -418,7 +418,7 @@
     "key-required": "Potreben je ključ atributa.",
     "value": "Vrednost",
     "value-required": "Vrednost atributa je obvezna.",
-    "delete-attributes-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 attribute} other {# attributes} }?",
+    "delete-attributes-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 attribute} other {# attributes} }?",
     "delete-attributes-text": "Bodite previdni, po potrditvi bodo odstranjeni vsi izbrani atributi.",
     "delete-attributes": "Izbriši atribute",
     "enter-attribute-value": "Vnesite vrednost atributa",
@@ -428,8 +428,8 @@
     "prev-widget": "Prejšnji pripomoček",
     "add-to-dashboard": "Dodaj na nadzorno ploščo",
     "add-widget-to-dashboard": "Dodaj pripomoček na nadzorno ploščo",
-    "selected-attributes": "{ count, plural, 1 {1 attribute} other {# attributes} } izbrano",
-    "selected-telemetry": "{ count, plural, 1 {1 telemetry unit} other {# telemetry units} } izbran",
+    "selected-attributes": "{ count, plural, =1 {1 attribute} other {# attributes} } izbrano",
+    "selected-telemetry": "{ count, plural, =1 {1 telemetry unit} other {# telemetry units} } izbran",
     "no-attributes-text": "Ni najdenih atributov",
     "no-telemetry-text": "Telemetrija ni najdena"
   },
@@ -588,8 +588,8 @@
     "customer-details": "Podrobnosti o stranki",
     "delete-customer-title": "Ali ste prepričani, da želite izbrisati stranko '{{customerTitle}}'?",
     "delete-customer-text": "Previdno, po potrditvi bo stranka in vsi povezani podatki postali nepopravljivi.",
-    "delete-customers-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 customer} other {# customers} }?",
-    "delete-customers-action-title": "Izbriši { count, plural, 1 {1 customer} other {# customers} }",
+    "delete-customers-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 customer} other {# customers} }?",
+    "delete-customers-action-title": "Izbriši { count, plural, =1 {1 customer} other {# customers} }",
     "delete-customers-text": "Bodite previdni, po potrditvi bodo vse izbrane stranke odstranjene in vsi povezani podatki bodo postali nepopravljivi.",
     "manage-users": "Upravljanje uporabnikov",
     "manage-assets": "Upravljanje sredstev",
@@ -609,7 +609,7 @@
     "default-customer": "Privzeta stranka",
     "default-customer-required": "Za razhroščevanje nadzorne plošče na ravni najemnika je potrebna privzeta stranka",
     "search": "Iskanje strank",
-    "selected-customers": "{ count, plural, 1 {1 customer} other {# customers} } izbrano"
+    "selected-customers": "{ count, plural, =1 {1 customer} other {# customers} } izbrano"
   },
   "datetime": {
     "date-from": "Datum, od",
@@ -650,20 +650,20 @@
     "add-dashboard-text": "Dodaj novo nadzorno ploščo",
     "assign-dashboards": "Dodeli nadzorne plošče",
     "assign-new-dashboard": "Dodeli novo nadzorno ploščo",
-    "assign-dashboards-text": "Strankam dodeli { count, plural, 1 {1 dashboard} other {# dashboards} }",
-    "unassign-dashboards-action-text": "Strankam ne dodeli { count, plural, 1 {1 dashboard} other {# dashboards} }",
+    "assign-dashboards-text": "Strankam dodeli { count, plural, =1 {1 dashboard} other {# dashboards} }",
+    "unassign-dashboards-action-text": "Strankam ne dodeli { count, plural, =1 {1 dashboard} other {# dashboards} }",
     "delete-dashboards": "Izbriši nadzorne plošče",
     "unassign-dashboards": "Preklic dodelitve nadzornih plošč",
-    "unassign-dashboards-action-title": "Stranki odstrani { count, plural, 1 {1 dashboard} other {# dashboards} }",
+    "unassign-dashboards-action-title": "Stranki odstrani { count, plural, =1 {1 dashboard} other {# dashboards} }",
     "delete-dashboard-title": "Ali ste prepričani, da želite izbrisati nadzorno ploščo '{{dashboardTitle}}'?",
     "delete-dashboard-text": "Previdno, po potrditvi bodo armaturna plošča in vsi povezani podatki nepopravljivi.",
-    "delete-dashboards-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 dashboard} other {# dashboards} }?",
-    "delete-dashboards-action-title": "Izbriši { count, plural, 1 {1 dashboard} other {# dashboards} }",
+    "delete-dashboards-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 dashboard} other {# dashboards} }?",
+    "delete-dashboards-action-title": "Izbriši { count, plural, =1 {1 dashboard} other {# dashboards} }",
     "delete-dashboards-text": "Bodite previdni, po potrditvi bodo vse izbrane nadzorne plošče odstranjene in vsi povezani podatki bodo postali nepopravljivi.",
     "unassign-dashboard-title": "Ali ste prepričani, da želite odstraniti nadzorno ploščo '{{dashboardTitle}}'?",
     "unassign-dashboard-text": "Po potrditvi bo nadzorna plošča odstranjena in nedostopna stranki.",
     "unassign-dashboard": "Preklic dodelitve nadzorne plošče",
-    "unassign-dashboards-title": "Ali ste prepričani, da želite odstraniti { count, plural, 1 {1 dashboard} other {# dashboards} }?",
+    "unassign-dashboards-title": "Ali ste prepričani, da želite odstraniti { count, plural, =1 {1 dashboard} other {# dashboards} }?",
     "unassign-dashboards-text": "Po potrditvi bodo vse izbrane nadzorne plošče odstranjene in nedostopne stranki.",
     "public-dashboard-title": "Nadzorna plošča je zdaj javna",
     "public-dashboard-text": "Vaša nadzorna plošča <b>{{dashboardTitle}}</b> je zdaj javna in dostopna prek naslednje javne <a href='{{publicLink}}' target='_blank'>povezave</a>",
@@ -744,7 +744,7 @@
     "manage-states": "Upravljanje stanj nadzorne plošče",
     "states": "Stanja na nadzorni plošči",
     "search-states": "Išči stanja na nadzorni plošči",
-    "selected-states": "{ count, plural, 1 {1 dashboard state} other {# dashboard state} } izbrano",
+    "selected-states": "{ count, plural, =1 {1 dashboard state} other {# dashboard state} } izbrano",
     "edit-state": "Uredi stanje nadzorne plošče",
     "delete-state": "Izbriši stanje armaturne plošče",
     "add-state": "Dodaj stanje nadzorne plošče",
@@ -763,7 +763,7 @@
     "select-state": "Izberi ciljno stanje",
     "state-controller": "Državni nadzornik",
     "search": "Iskanje po nadzornih ploščah",
-    "selected-dashboards": "{ count, plural, 1 {1 dashboard} other {# dashboards} } izbrano"
+    "selected-dashboards": "{ count, plural, =1 {1 dashboard} other {# dashboards} } izbrano"
   },
   "datakey": {
     "settings": "Nastavitve",
@@ -782,11 +782,11 @@
     "timeseries-required": "Potrebni so časovni nizi entitet.",
     "timeseries-or-attributes-required": "Potrebni so časovni nizi / atributi entitet.",
     "alarm-fields-timeseries-or-attributes-required": "Polja alarma ali časovni nizi / atributi entitet so obvezni.",
-    "maximum-timeseries-or-attributes": "Največ { count, plural, 1 {1 timeseries / attribute is allowed.} other {# timeseries / attributes are allowed} }",
+    "maximum-timeseries-or-attributes": "Največ { count, plural, =1 {1 timeseries / attribute is allowed.} other {# timeseries / attributes are allowed} }",
     "alarm-fields-required": "Polja alarma so obvezna.",
     "function-types": "Vrste funkcij",
     "function-types-required": "Zahtevane so vrste funkcij.",
-    "maximum-function-types": "Največ dovoljeno je { count, plural, 1 {1 type of function.} other {# vrste funkcij so dovoljene} }",
+    "maximum-function-types": "Največ dovoljeno je { count, plural, =1 {1 type of function.} other {# vrste funkcij so dovoljene} }",
     "time-description": "časovni žig trenutne vrednosti;",
     "value-description": "trenutna vrednost;",
     "prev-value-description": "rezultat prejšnjega klica funkcije;",
@@ -845,11 +845,11 @@
     "manage-credentials": "Upravljanje poverilnic",
     "delete": "Izbriši napravo",
     "assign-devices": "Dodeli naprave",
-    "assign-devices-text": "Kupcu dodeli { count, plural, 1 {1 device} other {# devices} }",
+    "assign-devices-text": "Kupcu dodeli { count, plural, =1 {1 device} other {# devices} }",
     "delete-devices": "Izbriši naprave",
     "unassign-from-customer": "Odjavi od stranke",
     "unassign-devices": "Odjavi naprave",
-    "unassign-devices-action-title": "Odstrani { count, plural, 1 {1 device} other {# devices} } od stranke",
+    "unassign-devices-action-title": "Odstrani { count, plural, =1 {1 device} other {# devices} } od stranke",
     "assign-new-device": "Dodeli novo napravo",
     "make-public-device-title": "Ali ste prepričani, da želite napravo '{{deviceName}}' narediti javno?",
     "make-public-device-text": "Po potrditvi bo naprava in vsi njeni podatki javno dostopni drugim.",
@@ -858,13 +858,13 @@
     "view-credentials": "Ogled poverilnic",
     "delete-device-title": "Ali ste prepričani, da želite izbrisati napravo '{{deviceName}}'?",
     "delete-device-text": "Previdno, po potrditvi naprava in vsi povezani podatki postanejo nepopravljivi.",
-    "delete-devices-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 device} other {# naprav} }?",
-    "delete-devices-action-title": "Izbriši { count, plural, 1 {1 device} other {# devices} }",
+    "delete-devices-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 device} other {# naprav} }?",
+    "delete-devices-action-title": "Izbriši { count, plural, =1 {1 device} other {# devices} }",
     "delete-devices-text": "Bodite previdni, po potrditvi bodo vse izbrane naprave odstranjene in vsi povezani podatki nepopravljivi.",
     "unassign-device-title": "Ali ste prepričani, da želite odstraniti napravo '{{deviceName}}'?",
     "unassign-device-text": "Po potrditvi naprava ne bo dodeljena in nedostopna stranki.",
     "unassign-device": "Preklic dodelitve naprave",
-    "unassign-devices-title": "Ali ste prepričani, da želite odstraniti { count, plural, 1 {1 device} other {# naprave} }?",
+    "unassign-devices-title": "Ali ste prepričani, da želite odstraniti { count, plural, =1 {1 device} other {# naprave} }?",
     "unassign-devices-text": "Po potrditvi bodo vse izbrane naprave nedodeljene in nedostopne stranki.",
     "device-credentials": "Poverilnice naprave",
     "credentials-type": "Vrsta poverilnic",
@@ -909,7 +909,7 @@
     "import": "Uvozi napravo",
     "device-file": "Datoteka naprave",
     "search": "Iskalne naprave",
-    "selected-devices": "{ count, plural, 1 {1 device} other {# devices} } izbrano",
+    "selected-devices": "{ count, plural, =1 {1 device} other {# devices} } izbrano",
     "device-configuration": "Device configuration",
     "transport-configuration": "Transport configuration",
     "wizard": {
@@ -931,7 +931,7 @@
     "device-profile-details": "Device profile details",
     "no-device-profiles-text": "No device profiles found",
     "search": "Search device profiles",
-    "selected-device-profiles": "{ count, plural, 1 {1 device profile} other {# device profiles} } selected",
+    "selected-device-profiles": "{ count, plural, =1 {1 device profile} other {# device profiles} } selected",
     "no-device-profiles-matching": "No device profile matching '{{entity}}' were found.",
     "device-profile-required": "Device profile is required",
     "idCopiedMessage": "Device profile Id has been copied to clipboard",
@@ -961,7 +961,7 @@
     "select-queue-hint": "Select from a drop-down list.",
     "delete-device-profile-title": "Are you sure you want to delete the device profile '{{deviceProfileName}}'?",
     "delete-device-profile-text": "Be careful, after the confirmation the device profile and all related data will become unrecoverable.",
-    "delete-device-profiles-title": "Are you sure you want to delete { count, plural, 1 {1 device profile} other {# device profiles} }?",
+    "delete-device-profiles-title": "Are you sure you want to delete { count, plural, =1 {1 device profile} other {# device profiles} }?",
     "delete-device-profiles-text": "Be careful, after the confirmation all selected device profiles will be removed and all related data will become unrecoverable.",
     "set-default-device-profile-title": "Are you sure you want to make the device profile '{{deviceProfileName}}' default?",
     "set-default-device-profile-text": "After the confirmation the device profile will be marked as default and will be used for new devices with no profile specified.",
@@ -1049,7 +1049,7 @@
     "condition-repeating-value-range": "Count of events should be in a range from 1 to 2147483647.",
     "condition-repeating-value-pattern": "Count of events should be integers.",
     "condition-repeating-value-required": "Count of events is required.",
-    "condition-repeat-times": "Repeats { count, plural, 1 {1 time} other {# times} }",
+    "condition-repeat-times": "Repeats { count, plural, =1 {1 time} other {# times} }",
     "schedule-type": "Scheduler type",
     "schedule-type-required": "Scheduler type is required.",
     "schedule": "Schedule",
@@ -1126,66 +1126,66 @@
     "type-required": "Zahteva se vrsta entitete.",
     "type-device": "Naprava",
     "type-devices": "Naprave",
-    "list-of-devices": "{ count, plural, 1 {One device} other {List of # devices} }",
+    "list-of-devices": "{ count, plural, =1 {One device} other {List of # devices} }",
     "device-name-starts-with": "Naprave, katerih imena se začnejo z '{{prefix}}'",
     "type-device-profile": "Device profile",
     "type-device-profiles": "Device profiles",
-    "list-of-device-profiles": "{ count, plural, 1 {One device profile} other {List of # device profiles} }",
+    "list-of-device-profiles": "{ count, plural, =1 {One device profile} other {List of # device profiles} }",
     "device-profile-name-starts-with": "Device profiles whose names start with '{{prefix}}'",
     "type-asset": "Sredstvo",
     "type-assets": "Sredstva",
-    "list-of-assets": "{ count, plural, 1 {One asset} other {Seznam # sredstev} }",
+    "list-of-assets": "{ count, plural, =1 {One asset} other {Seznam # sredstev} }",
     "asset-name-starts-with": "Sredstva, katerih imena se začnejo z '{{prefix}}'",
     "type-entity-view": "Pogled entitete",
     "type-entity-views": "Pogledi entitet",
-    "list-of-entity-views": "{ count, plural, 1 {One entity view} other {Seznam # pogledov entitet} }",
+    "list-of-entity-views": "{ count, plural, =1 {One entity view} other {Seznam # pogledov entitet} }",
     "entity-view-name-starts-with": "Pogledi entitet, katerih imena se začnejo z '{{prefix}}'",
     "type-rule": "Pravilo",
     "type-rules": "Pravila",
-    "list-of-rules": "{ count, plural, 1 {One rule} other {Seznam # pravil} }",
+    "list-of-rules": "{ count, plural, =1 {One rule} other {Seznam # pravil} }",
     "rule-name-starts-with": "Pravila, katerih imena se začnejo z '{{prefix}}'",
     "type-plugin": "Vključiti",
     "type-plugins": "Vtičniki",
-    "list-of-plugins": "{ count, plural, 1 {One plugin} other {List of # plugins} }",
+    "list-of-plugins": "{ count, plural, =1 {One plugin} other {List of # plugins} }",
     "plugin-name-starts-with": "Vtičniki, katerih imena se začnejo z '{{prefix}}'",
     "type-tenant": "Najemnik",
     "type-tenants": "Najemniki",
-    "list-of-tenants": "{ count, plural, 1 {One najemnik} other {Seznam # najemnikov} }",
+    "list-of-tenants": "{ count, plural, =1 {One najemnik} other {Seznam # najemnikov} }",
     "tenant-name-starts-with": "Najemniki, katerih imena se začnejo z '{{prefix}}'",
     "type-tenant-profile": "Tenant profile",
     "type-tenant-profiles": "Tenant profiles",
-    "list-of-tenant-profiles": "{ count, plural, 1 {One tenant profile} other {List of # tenant profiles} }",
+    "list-of-tenant-profiles": "{ count, plural, =1 {One tenant profile} other {List of # tenant profiles} }",
     "tenant-profile-name-starts-with": "Tenant profiles whose names start with '{{prefix}}'",
     "type-customer": "Stranka",
     "type-customers": "Stranke",
-    "list-of-customers": "{ count, plural, 1 {One customer} other {List of # customers} }",
+    "list-of-customers": "{ count, plural, =1 {One customer} other {List of # customers} }",
     "customer-name-starts-with": "Stranke, katerih imena se začnejo z '{{prefix}}'",
     "type-user": "Uporabnik",
     "type-users": "Uporabniki",
-    "list-of-users": "{ count, plural, 1 {One user} other {List of # users} }",
+    "list-of-users": "{ count, plural, =1 {One user} other {List of # users} }",
     "user-name-starts-with": "Uporabniki, katerih imena se začnejo z '{{prefix}}'",
     "type-dashboard": "Nadzorna plošča",
     "type-dashboards": "Nadzorne plošče",
-    "list-of-dashboards": "{ count, plural, 1 {One dashboard} other {List of # dashboards} }",
+    "list-of-dashboards": "{ count, plural, =1 {One dashboard} other {List of # dashboards} }",
     "dashboard-name-starts-with": "Nadzorne plošče, katerih imena se začnejo z '{{prefix}}'",
     "type-alarm": "Alarm",
     "type-alarms": "Alarmi",
-    "list-of-alarms": "{ count, plural, 1 {One alarms} other {List of # alarms} }",
+    "list-of-alarms": "{ count, plural, =1 {One alarms} other {List of # alarms} }",
     "alarm-name-starts-with": "Alarmi, katerih imena se začnejo z '{{prefix}}'",
     "type-rulechain": "Veriga pravil",
     "type-rulechains": "Pravila",
-    "list-of-rulechains": "{ count, plural, 1 {One rule chain} other {List of # rule chains} }",
+    "list-of-rulechains": "{ count, plural, =1 {One rule chain} other {List of # rule chains} }",
     "rulechain-name-starts-with": "Verige pravil, katerih imena se začnejo z '{{prefix}}'",
     "type-rulenode": "Vozlišče pravila",
     "type-rulenodes": "Vozlišča pravil",
-    "list-of-rulenodes": "{ count, plural, 1 {One rule node} other {List of # rule nodes} }",
+    "list-of-rulenodes": "{ count, plural, =1 {One rule node} other {List of # rule nodes} }",
     "rulenode-name-starts-with": "Vozlišča pravil, katerih imena se začnejo z '{{prefix}}'",
     "type-current-customer": "Trenutna stranka",
     "type-current-tenant": "Trenutni najemnik",
     "type-current-user": "Trenutni uporabnik",
     "type-current-user-owner": "Trenutni lastnik uporabnika",
     "search": "Iskanje entitet",
-    "selected-entities": "{ count, plural, 1 {1 entity} other {# entitet} } izbranih",
+    "selected-entities": "{ count, plural, =1 {1 entity} other {# entitet} } izbranih",
     "entity-name": "Ime entitete",
     "entity-label": "Oznaka entitete",
     "details": "Podrobnosti o entiteti",
@@ -1250,21 +1250,21 @@
     "add-entity-view-text": "Dodaj nov pogled entitete",
     "delete": "Izbriši pogled entitete",
     "assign-entity-views": "Dodelitev pogledov entitete",
-    "assign-entity-views-text": "Stranki dodeli { count, plural, 1 {1 entity view} other {# entity views} }",
+    "assign-entity-views-text": "Stranki dodeli { count, plural, =1 {1 entity view} other {# entity views} }",
     "delete-entity-views": "Izbriši poglede entitet",
     "unassign-from-customer": "Odstrani od stranke",
     "unassign-entity-views": "Odstrani poglede entitete",
-    "unassign-entity-views-action-title": "Od stranke odstrani { count, plural, 1 {1 entity view} other {# entity views} }",
+    "unassign-entity-views-action-title": "Od stranke odstrani { count, plural, =1 {1 entity view} other {# entity views} }",
     "assign-new-entity-view": "Dodeli nov pogled entitete",
     "delete-entity-view-title": "Ali ste prepričani, da želite izbrisati pogled entitete '{{entityViewName}}'?",
     "delete-entity-view-text": "Bodite previdni, po potrditvi bodo pogled entitete in vsi povezani podatki nepopravljivi.",
-    "delete-entity-views-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 entity view} other {# entity views} }?",
-    "delete-entity-views-action-title": "Izbriši { count, plural, 1 {1 entity view} other {# entity views} }",
+    "delete-entity-views-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 entity view} other {# entity views} }?",
+    "delete-entity-views-action-title": "Izbriši { count, plural, =1 {1 entity view} other {# entity views} }",
     "delete-entity-views-text": "Bodite previdni, po potrditvi bodo odstranjeni vsi pogledi izbranih entitet in vsi povezani podatki bodo postali nepopravljivi.",
     "unassign-entity-view-title": "Ali ste prepričani, da želite odstraniti pogled entitete '{{entityViewName}}?",
     "unassign-entity-view-text": "Po potrditvi bo pogled entitete odstranjen in nedostopen stranki.",
     "unassign-entity-view": "Odstrani pogled entitete",
-    "unassign-entity-views-title": "Ali ste prepričani, da želite odstraniti { count, plural, 1 {1 entity view} other {# entity views} }?",
+    "unassign-entity-views-title": "Ali ste prepričani, da želite odstraniti { count, plural, =1 {1 entity view} other {# entity views} }?",
     "unassign-entity-views-text": "Po potrditvi bodo vsi pogledi izbranih entitet odstranjeni in stranki nedostopni.",
     "entity-view-type": "Vrsta pogleda entitete",
     "entity-view-type-required": "Zahteva se vrsta pogleda entitete.",
@@ -1311,7 +1311,7 @@
     "make-private-entity-view-title": "Ali ste prepričani, da želite pogled entitete '{{entityViewName}}' narediti zaseben?",
     "make-private-entity-view-text": "Po potrditvi bodo pogled entitete in vsi njegovi podatki postali zasebni in drugim nedostopni.",
     "search": "Išči poglede entitet",
-    "selected-entity-views": "{ count, plural, 1 {1 entity view} other {# entity views} } izbranih"
+    "selected-entity-views": "{ count, plural, =1 {1 entity view} other {# entity views} } izbranih"
   },
   "event": {
     "event-type": "Vrsta dogodka",
@@ -1345,7 +1345,7 @@
   },
   "extension": {
     "extensions": "Razširitve",
-    "selected-extensions": "{ count, plural, 1 {1 extension} other {# extensions} } izbrano",
+    "selected-extensions": "{ count, plural, =1 {1 extension} other {# extensions} } izbrano",
     "type": "Vrsta",
     "key": "Ključ",
     "value": "Vrednost",
@@ -1359,7 +1359,7 @@
     "edit": "Uredi razširitev",
     "delete-extension-title": "Ali ste prepričani, da želite izbrisati razširitev '{{extensionId}}'?",
     "delete-extension-text": "Bodite previdni, po potrditvi podaljšanje in vsi povezani podatki ne bodo več obnovljivi.",
-    "delete-extensions-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 extension} other {# extensions} }?",
+    "delete-extensions-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 extension} other {# extensions} }?",
     "delete-extensions-text": "Previdno, po potrditvi bodo odstranjene vse izbrane razširitve.",
     "converters": "Pretvorniki",
     "converter-id": "ID pretvornika",
@@ -1673,8 +1673,8 @@
   "grid": {
     "delete-item-title": "Ali ste prepričani, da želite izbrisati ta element?",
     "delete-item-text": "Bodite previdni, po potrditvi bodo ta element in vsi povezani podatki nepopravljivi.",
-    "delete-items-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 item} other {# items} }?",
-    "delete-items-action-title": "Izbriši { count, plural, 1 {1 item} other {# items} }",
+    "delete-items-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 item} other {# items} }?",
+    "delete-items-action-title": "Izbriši { count, plural, =1 {1 item} other {# items} }",
     "delete-items-text": "Bodite previdni, po potrditvi bodo vsi izbrani elementi odstranjeni in vsi povezani podatki nepopravljivi.",
     "add-item-text": "Dodaj novo postavko",
     "no-items-text": "Ni najdenih postavk",
@@ -1824,7 +1824,7 @@
     },
     "from-relations": "Odhodna razmerja",
     "to-relations": "Vhodna razmerja",
-    "selected-relations": "{ count, plural, 1 {1 relationship} other {# Relations} } izbran",
+    "selected-relations": "{ count, plural, =1 {1 relationship} other {# Relations} } izbran",
     "type": "Vrsta",
     "to-entity-type": "Za vrsto entitete",
     "to-entity-name": "Za ime entitete",
@@ -1840,11 +1840,11 @@
     "edit": "Uredi relacijo",
     "delete-to-relation-title": "Ali ste prepričani, da želite izbrisati relacijo z entiteto '{{entityName}}'?",
     "delete-to-relation-text": "Previdno, po potrditvi entiteta '{{entityName}}' ne bo v relaciji s trenutno entiteto.",
-    "delete-to-relations-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 relacijo} other {# relacije} }?",
+    "delete-to-relations-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 relacijo} other {# relacije} }?",
     "delete-to-relations-text": "Bodite previdni, po potrditvi bodo vse izbrane relacije odstranjene in entitete ne bodo povezane med sabo.",
     "delete-from-relation-title": "Ali ste prepričani, da želite izbrisati relacijo iz entitete '{{entityName}}'?",
     "delete-from-relation-text": "Bodite previdni, po potrditvi trenutna entiteta ne bo v relacijii z entiteto '{{entityName}}'.",
-    "delete-from-relations-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 relacija} other {# odnosi} }?",
+    "delete-from-relations-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 relacija} other {# odnosi} }?",
     "delete-from-relations-text": "Bodite previdni, po potrditvi bodo odstranjene vse izbrane relacije in trenutna entiteta ne bo v relaciji z omenjenimi entitetami.",
     "remove-relation-filter": "Odstrani relacijski filter",
     "add-relation-filter": "Dodaj relacijski filter",
@@ -1868,8 +1868,8 @@
     "set-root-rulechain-text": "Po potrditvi bo veriga pravil postala izvorna in bo obravnavala vsa dohodna prometna sporočila.",
     "delete-rulechain-title": "Ali ste prepričani, da želite izbrisati verigo pravil '{{ruleChainName}}'?",
     "delete-rulechain-text": "Bodite previdni, po potrditvi bodo veriga pravil in vsi povezani podatki nepopravljivi.",
-    "delete-rulechains-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 rule chain} other {# rule chains} }?",
-    "delete-rulechains-action-title": "Izbriši { count, plural, 1 {1 rule chain} other {# rule chains} }",
+    "delete-rulechains-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 rule chain} other {# rule chains} }?",
+    "delete-rulechains-action-title": "Izbriši { count, plural, =1 {1 rule chain} other {# rule chains} }",
     "delete-rulechains-text": "Bodite previdni, po potrditvi bodo odstranjene vse izbrane verige pravil in vsi povezani podatki bodo postali nepopravljivi.",
     "add-rulechain-text": "Dodaj novo verigo pravil",
     "no-rulechains-text": "Nobena veriga pravil ni najdena",
@@ -1891,7 +1891,7 @@
     "management": "Upravljanje pravil",
     "debug-mode": "Način za odpravljanje napak",
     "search": "Iskanje verig pravil",
-    "selected-rulechains": "{ count, plural, 1 {1 rule chain} other {# rule chains} } izbrano",
+    "selected-rulechains": "{ count, plural, =1 {1 rule chain} other {# rule chains} } izbrano",
     "open-rulechain": "Odprta veriga pravil"
   },
   "rulenode": {
@@ -1982,8 +1982,8 @@
     "tenant-details": "Podrobnosti o najemniku",
     "delete-tenant-title": "Ali ste prepričani, da želite izbrisati najemnika '{{tenantTitle}}'?",
     "delete-tenant-text": "Previdno, po potrditvi bodo najemnik in vsi povezani podatki postali nepopravljivi.",
-    "delete-tenants-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 tenant} other {# tenants} }?",
-    "delete-tenants-action-title": "Izbriši { count, plural, 1 {1 tenant} other {# tenants} }",
+    "delete-tenants-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 tenant} other {# tenants} }?",
+    "delete-tenants-action-title": "Izbriši { count, plural, =1 {1 tenant} other {# tenants} }",
     "delete-tenants-text": "Bodite previdni, po potrditvi bodo vsi izbrani najemniki odstranjeni in vsi povezani podatki nepopravljivi.",
     "title": "Naslov",
     "title-required": "Naslov je obvezen.",
@@ -1996,7 +1996,7 @@
     "no-tenants-matching": "Najden ni bil noben najemnik, ki se ujema z '{{entity}}'.",
     "tenant-required": "Najemnik je obvezen",
     "search": "Iskanje najemnikov",
-    "selected-tenants": "{ count, plural, 1 {1 tenant} other {# tenants} } izbran",
+    "selected-tenants": "{ count, plural, =1 {1 tenant} other {# tenants} } izbran",
     "isolated-tb-rule-engine": "Obdelava v izoliranem odlagališču ThingsBoard Rule Engine",
     "isolated-tb-rule-engine-details": "Zahteva ločene mikro storitve na izoliranega najemnika"
   },
@@ -2008,7 +2008,7 @@
     "tenant-profile-details": "Tenant profile details",
     "no-tenant-profiles-text": "No tenant profiles found",
     "search": "Search tenant profiles",
-    "selected-tenant-profiles": "{ count, plural, 1 {1 tenant profile} other {# tenant profiles} } selected",
+    "selected-tenant-profiles": "{ count, plural, =1 {1 tenant profile} other {# tenant profiles} } selected",
     "no-tenant-profiles-matching": "No tenant profile matching '{{entity}}' were found.",
     "tenant-profile-required": "Tenant profile is required",
     "idCopiedMessage": "Tenant profile Id has been copied to clipboard",
@@ -2023,7 +2023,7 @@
     "default": "Default",
     "delete-tenant-profile-title": "Are you sure you want to delete the tenant profile '{{tenantProfileName}}'?",
     "delete-tenant-profile-text": "Be careful, after the confirmation the tenant profile and all related data will become unrecoverable.",
-    "delete-tenant-profiles-title": "Are you sure you want to delete { count, plural, 1 {1 tenant profile} other {# tenant profiles} }?",
+    "delete-tenant-profiles-title": "Are you sure you want to delete { count, plural, =1 {1 tenant profile} other {# tenant profiles} }?",
     "delete-tenant-profiles-text": "Be careful, after the confirmation all selected tenant profiles will be removed and all related data will become unrecoverable.",
     "set-default-tenant-profile-title": "Are you sure you want to make the tenant profile '{{tenantProfileName}}' default?",
     "set-default-tenant-profile-text": "After the confirmation the tenant profile will be marked as default and will be used for new tenants with no profile specified.",
@@ -2082,10 +2082,10 @@
     "max-sms-range": "Maximum number of SMS sent can't be negative"
   },
   "timeinterval": {
-    "seconds-interval": "{ seconds, plural, 1 {1 second} other {# seconds} }",
-    "minutes-interval": "{ minutes, plural, 1 {1 minute} other {# minutes} }",
-    "hours-interval": "{ hours, plural, 1 {1 hour} other {# hours} }",
-    "days-interval": "{ days, plural, 1 {1 day} other {# days} }",
+    "seconds-interval": "{ seconds, plural, =1 {1 second} other {# seconds} }",
+    "minutes-interval": "{ minutes, plural, =1 {1 minute} other {# minutes} }",
+    "hours-interval": "{ hours, plural, =1 {1 hour} other {# hours} }",
+    "days-interval": "{ days, plural, =1 {1 day} other {# days} }",
     "days": "Dnevi",
     "hours": "Ure",
     "minutes": "Minute",
@@ -2099,10 +2099,10 @@
     "days": "Days"
   },
   "timewindow": {
-    "days": "{ days, plural, 1 {dan} other {# dni} }",
-    "hours": "{ hours, plural, 0 {hour} 1 {1 hour} other {# hours} }",
-    "minutes": "{ minute, plural, 0 {minute} 1 {1 minuta} other {# minut} }",
-    "seconds": "{ seconds, plural, 0 {second} 1 {1 second} other {# seconds} }",
+    "days": "{ days, plural, =1 {dan} other {# dni} }",
+    "hours": "{ hours, plural, =0 {hour} =1 {1 hour} other {# hours} }",
+    "minutes": "{ minute, plural, =0 {minute} =1 {1 minuta} other {# minut} }",
+    "seconds": "{ seconds, plural, =0 {second} =1 {1 second} other {# seconds} }",
     "realtime": "V realnem času",
     "history": "Zgodovina",
     "last-prefix": "zadnji",
@@ -2129,8 +2129,8 @@
     "user-details": "Podrobnosti o uporabniku",
     "delete-user-title": "Ali ste prepričani, da želite izbrisati uporabnika '{{userEmail}}'?",
     "delete-user-text": "Previdno, po potrditvi bodo uporabnik in vsi povezani podatki nepopravljivi.",
-    "delete-users-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 user} other {# users} }?",
-    "delete-users-action-title": "Izbriši { count, plural, 1 {1 user} other {# users} }",
+    "delete-users-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 user} other {# users} }?",
+    "delete-users-action-title": "Izbriši { count, plural, =1 {1 user} other {# users} }",
     "delete-users-text": "Previdno, po potrditvi bodo vsi izbrani uporabniki odstranjeni in vsi povezani podatki nepopravljivi.",
     "activation-email-sent-message": "Aktivacijsko e-poštno sporočilo je bilo uspešno poslano!",
     "resend-activation": "Znova pošlji aktivacijo",
@@ -2156,7 +2156,7 @@
     "login-as-tenant-admin": "Prijava kot skrbnik najemnika",
     "login-as-customer-user": "Prijavi se kot uporabnik stranke",
     "search": "Iskanje uporabnikov",
-    "selected-users": "{ count, plural, 1 {1 user} other {# users} } izbranih",
+    "selected-users": "{ count, plural, =1 {1 user} other {# users} } izbranih",
     "disable-account": "Onemogoči uporabniški račun",
     "enable-account": "Omogoči uporabniški račun",
     "enable-account-message": "Uporabniški račun je bil uspešno omogočen!",
@@ -2268,8 +2268,8 @@
     "widgets-bundle-details": "Podrobnosti o paketu pripomočkov",
     "delete-widgets-bundle-title": "Ali ste prepričani, da želite izbrisati paket pripomočkov '{{widgetsBundleTitle}}'?",
     "delete-widgets-bundle-text": "Bodite previdni, po potrditvi bodo pripomočki in vsi povezani podatki postali nepopravljivi.",
-    "delete-widgets-bundles-title": "Ali ste prepričani, da želite izbrisati { count, plural, 1 {1 widgets bundle} other {# widgets bundles} }?",
-    "delete-widgets-bundles-action-title": "Izbriši { count, plural, 1 {1 widgets bundle} other {# widgets bundles} }",
+    "delete-widgets-bundles-title": "Ali ste prepričani, da želite izbrisati { count, plural, =1 {1 widgets bundle} other {# widgets bundles} }?",
+    "delete-widgets-bundles-action-title": "Izbriši { count, plural, =1 {1 widgets bundle} other {# widgets bundles} }",
     "delete-widgets-bundles-text": "Bodite previdni, po potrditvi bodo odstranjeni vsi paketi pripomočkov, vsi povezani podatki pa bodo postali nepopravljivi.",
     "no-widgets-bundles-matching": "Najden ni bil noben paket pripomočkov, ki se ujema z '{{widgetsBundle}}'.",
     "widgets-bundle-required": "Paket pripomočkov je potreben.",
@@ -2281,7 +2281,7 @@
     "widgets-bundle-file": "Datoteka paketa pripomočkov",
     "invalid-widgets-bundle-file-error": "Ni mogoče uvoziti paketa pripomočkov: neveljavna podatkovna struktura paketa pripomočkov.",
     "search": "Iskanje po paketih pripomočkov",
-    "selected-widgets-bundles": "{ count, plural, 1 {1 widgets bundle} other {# widgets bundles} } izbranih",
+    "selected-widgets-bundles": "{ count, plural, =1 {1 widgets bundle} other {# widgets bundles} } izbranih",
     "open-widgets-bundle": "Odpri paket pripomočkov"
   },
   "widget-config": {
@@ -2310,7 +2310,7 @@
     "display-timewindow": "Prikaži časovno okno",
     "display-legend": "Prikaži legendo",
     "datasources": "Viri podatkov",
-    "maximum-datasources": "Največ { count, plural, 1 {1 vir podatkov je dovoljen.} other {# vir podatkov je dovoljen} }",
+    "maximum-datasources": "Največ { count, plural, =1 {1 vir podatkov je dovoljen.} other {# vir podatkov je dovoljen} }",
     "datasource-type": "Vrsta",
     "datasource-parameters": "Parametri",
     "remove-datasource": "Odstrani vir podatkov",
diff --git a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
index 174c648e7a..4bc58a8783 100644
--- a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
@@ -287,17 +287,17 @@
     "acknowledge": "Onayla",
     "clear": "Temizle",
     "search": "Alarm ara",
-    "selected-alarms": "{ count, plural, 1 {1 alarm} other {# alarm} } seçildi",
+    "selected-alarms": "{ count, plural, =1 {1 alarm} other {# alarm} } seçildi",
     "no-data": "Görüntülenecek veri bulunmuyor",
     "polling-interval": "Alarm yoklama aralığı (saniye)",
     "polling-interval-required": "Alarm yoklama aralığı gerekli.",
     "min-polling-interval-message": "Alarm yoklama aralığı en az 1 saniye olmalıdır.",
-    "aknowledge-alarms-title": "{ count, plural, 1 {1 alarmı} other {# alarmı} } onayla",
-    "aknowledge-alarms-text": "{ count, plural, 1 {1 alarmı} other {# alarmı} } onaylamak istediğinize emin misiniz?",
+    "aknowledge-alarms-title": "{ count, plural, =1 {1 alarmı} other {# alarmı} } onayla",
+    "aknowledge-alarms-text": "{ count, plural, =1 {1 alarmı} other {# alarmı} } onaylamak istediğinize emin misiniz?",
     "aknowledge-alarm-title": "Alarmı Onayla",
     "aknowledge-alarm-text": "Alarmı onaylamak istediğinizden emin misiniz?",
-    "clear-alarms-title": "{ count, plural, 1 {1 alarmı} other {# alarmı} } temizle",
-    "clear-alarms-text": "{ count, plural, 1 {1 alarmı} other {# alarmı} } temizlemek istediğinize emin misiniz?",
+    "clear-alarms-title": "{ count, plural, =1 {1 alarmı} other {# alarmı} } temizle",
+    "clear-alarms-text": "{ count, plural, =1 {1 alarmı} other {# alarmı} } temizlemek istediğinize emin misiniz?",
     "clear-alarm-title": "Alarmı Temizle",
     "clear-alarm-text": "Alarmı silmek istediğinizden emin misiniz?",
     "alarm-status-filter": "Alarm Durum Filtresi",
@@ -400,17 +400,17 @@
     "add-asset-text": "Yeni varlık ekle",
     "asset-details": "Varlık detayları",
     "assign-assets": "Varlıkları ata",
-    "assign-assets-text": "{ count, plural, 1 {1 varlığı} other {# varlığı} } kullanıcı grubuna ata",
+    "assign-assets-text": "{ count, plural, =1 {1 varlığı} other {# varlığı} } kullanıcı grubuna ata",
     "assign-asset-to-edge-title": "Varlıkları Uç'a Ata",
     "assign-asset-to-edge-text": "Lütfen uca atanacak varlıkları seçin",
     "delete-assets": "Varlıkları sil",
     "unassign-assets": "Varlıkların atamalarını kaldır",
-    "unassign-assets-action-title": "{ count, plural, 1 {1 varlığın} other {# varlığın} } atamalarını kullanıcı grubundan kaldır",
+    "unassign-assets-action-title": "{ count, plural, =1 {1 varlığın} other {# varlığın} } atamalarını kullanıcı grubundan kaldır",
     "assign-new-asset": "Yeni varlık ata",
     "delete-asset-title": "'{{assetName}}' isimli varlığı silmek istediğinize emin misiniz?",
     "delete-asset-text": "UYARI: Onaylandıktan sonra varlık ve ilgili tüm veriler geri yüklenemeyecek şekilde silinecek.",
-    "delete-assets-title": "{ count, plural, 1 {1 varlığı} other {# varlığı} } silmek istediğinize emin misiniz?",
-    "delete-assets-action-title": "{ count, plural, 1 {1 varlığı} other {# varlığı} } sil",
+    "delete-assets-title": "{ count, plural, =1 {1 varlığı} other {# varlığı} } silmek istediğinize emin misiniz?",
+    "delete-assets-action-title": "{ count, plural, =1 {1 varlığı} other {# varlığı} } sil",
     "delete-assets-text": "UYARI: Onaylandıktan sonra tüm seçili varlıklar ver ilgili tüm veriler geri yüklenemyeck şekilde silinecek.",
     "make-public-asset-title": "'{{assetName}}' isimli varlığı açık hale getirmek istediğinize emin misiniz?",
     "make-public-asset-text": "Onaylandıktan sonra varlık ve ilgili veriler açık hale gelecek ve başkaları tarafından erişilebilir olacaktır.",
@@ -419,7 +419,7 @@
     "unassign-asset-title": "'{{assetName}}' isimli varlığın atamasını kaldırmak istediğinize emin misiniz?",
     "unassign-asset-text": "Onaylandıktan sonra varlığın ataması kaldırılacak ve kullanıcı grubu tarafından erişilemez olacaktır.",
     "unassign-asset": "Varlık atamasını kaldır",
-    "unassign-assets-title": " { count, plural, 1 {1 varlık} other {# varlık} } atamasını kaldırmak istediğinize emin misiniz?",
+    "unassign-assets-title": " { count, plural, =1 {1 varlık} other {# varlık} } atamasını kaldırmak istediğinize emin misiniz?",
     "unassign-assets-text": "Onaylandıktan sonra tüm seçili varlıkların ataması kaldırılacak ve kullanıcı grubu tarafından erişilemez olacaktır.",
     "unassign-assets-from-edge": "Uçtan varlıkların atamasını kaldır",
     "copyId": "Varlık kimliğini kopyala",
@@ -437,9 +437,9 @@
     "unassign-asset-from-edge": "Öğe atamasını kaldır",
     "unassign-asset-from-edge-title": "'{{assetName}}' öğesinin atamasını kaldırmak istediğinizden emin misiniz?",
     "unassign-asset-from-edge-text": "Onaydan sonra varlığın ataması kaldırılacak ve uç tarafından erişilebilir olmayacaktır.",
-    "unassign-assets-from-edge-title": "{ count, plural, 1 {1 varlık} other {# varlık} } atamasını kaldırmak istediğinizden emin misiniz?",
+    "unassign-assets-from-edge-title": "{ count, plural, =1 {1 varlık} other {# varlık} } atamasını kaldırmak istediğinizden emin misiniz?",
     "unassign-assets-from-edge-text": "Onaydan sonra seçilen tüm varlıkların ataması kaldırılacak ve uç tarafından erişilebilir olmayacaktır.",
-    "selected-assets": "{ count, plural, 1 {1 varlık} other {# varlık} } seçildi"
+    "selected-assets": "{ count, plural, =1 {1 varlık} other {# varlık} } seçildi"
   },
   "attribute": {
     "attributes": "Öznitelikler",
@@ -455,7 +455,7 @@
     "key-required": "Öznitelik anahtarı gerekli.",
     "value": "Değer",
     "value-required": "Öznitelik değeri gerekli.",
-    "delete-attributes-title": "Silmek istediğinize emin misiniz { count, plural, 1 {1 öznitelik} other {# öznitelik} }?",
+    "delete-attributes-title": "Silmek istediğinize emin misiniz { count, plural, =1 {1 öznitelik} other {# öznitelik} }?",
     "delete-attributes-text": "UYARI: Onaylandıktan sonra tüm seçili öznitelikler kaldırılacak.",
     "delete-attributes": "Öznitelikleri sil",
     "enter-attribute-value": "Öznitelik değeri gir",
@@ -465,8 +465,8 @@
     "prev-widget": "Önceki gösterge",
     "add-to-dashboard": "Gösterge paneline ekle",
     "add-widget-to-dashboard": "Göstergeyi, gösterge paneline ekle",
-    "selected-attributes": "{ count, plural, 1 {1 öznitelik} other {# öznitelik} } seçildi",
-    "selected-telemetry": "{ count, plural, 1 {1 telemetri birimi} other {# telemetri birimi} } seçildi",
+    "selected-attributes": "{ count, plural, =1 {1 öznitelik} other {# öznitelik} } seçildi",
+    "selected-telemetry": "{ count, plural, =1 {1 telemetri birimi} other {# telemetri birimi} } seçildi",
     "no-attributes-text": "Öznitelik bulunamadı",
     "no-telemetry-text": "Telemetri bulunamadı"
   },
@@ -639,8 +639,8 @@
     "customer-details": "Kullanıcı Grubu detayları",
     "delete-customer-title": "'{{customerTitle}}' Kullanıcı Grubunu silmek istediğinizden emin misiniz?",
     "delete-customer-text": "Dikkatli olun, onaydan sonra kullanıcı grubu ve ilgili tüm veriler kurtarılamaz hale gelecektir.",
-    "delete-customers-title": "{ count, plural, 1 {1 kullanıcı grubunu} other {# kullanıcı grubunu} } silmek istediğinize emin misiniz?",
-    "delete-customers-action-title": "{ count, plural, 1 {1 kullanıcı grubunu} other {# kullanıcı grubunu} } sil",
+    "delete-customers-title": "{ count, plural, =1 {1 kullanıcı grubunu} other {# kullanıcı grubunu} } silmek istediğinize emin misiniz?",
+    "delete-customers-action-title": "{ count, plural, =1 {1 kullanıcı grubunu} other {# kullanıcı grubunu} } sil",
     "delete-customers-text": "YARI: Onaylandıktan sonra tüm seçili kullanıcı grupları ve ilişkili veriler geri yüklenemez şekilde silinecek.",
     "manage-users": "Kullanıcıları yönet",
     "manage-assets": "Varlıkları yönet",
@@ -660,7 +660,7 @@
     "default-customer": "Varsayılan kullanıcı grubu",
     "default-customer-required": "Tenant düzeyinde gösterge tablosunda hata ayıklamak için varsayılan kullanıcı grubu gerekiyor",
     "search": "Kullanıcı grubu ara",
-    "selected-customers": "{ count, plural, 1 {1 kullanıcı grubu} other {# kullanıcı grubu} } seçildi",
+    "selected-customers": "{ count, plural, =1 {1 kullanıcı grubu} other {# kullanıcı grubu} } seçildi",
     "edges": "Kullanıcı Grubu uç örnekleri",
     "manage-edges": "Uçları yönet"
   },
@@ -711,20 +711,20 @@
     "add-dashboard-text": "Yeni Gösterge paneli ekle",
     "assign-dashboards": "Gösterge panelleri ata",
     "assign-new-dashboard": "Yeni gösterge paneli ata",
-    "assign-dashboards-text": "{ count, plural, 1 {1 gösterge panelini} other {# gösterge panelini} } kullanıcı grubuna ata",
-    "unassign-dashboards-action-text": "Kullanıcı Gruplarından atama { count, plural, 1 {1 gösterge tablosu} other {# panolar} }",
+    "assign-dashboards-text": "{ count, plural, =1 {1 gösterge panelini} other {# gösterge panelini} } kullanıcı grubuna ata",
+    "unassign-dashboards-action-text": "Kullanıcı Gruplarından atama { count, plural, =1 {1 gösterge tablosu} other {# panolar} }",
     "delete-dashboards": "Gösterge panellerini sil",
     "unassign-dashboards": "Gösterge panellerinden atamayı kaldır",
-    "unassign-dashboards-action-title": "{ count, plural, 1 {1 gösterge panelinin} other {# gösterge panelinin} } atamaları kullanıcı grubundan kaldır",
+    "unassign-dashboards-action-title": "{ count, plural, =1 {1 gösterge panelinin} other {# gösterge panelinin} } atamaları kullanıcı grubundan kaldır",
     "delete-dashboard-title": "'{{dashboardTitle}}' isimli gösterge panelini silmek istediğinize emin misiniz?",
     "delete-dashboard-text": "UYARI: Onaylandıktan sonra gösterge paneli ve ilişkili verileri geri yüklenemez şekilde silinecek.",
-    "delete-dashboards-title": "{ count, plural, 1 {1 gösterge panelini} other {# gösterge panelini} } silmek istediğinize emin misiniz?",
-    "delete-dashboards-action-title": "{ count, plural, 1 {1 gösterge panelini} other {# gösterge panelini} } sil",
+    "delete-dashboards-title": "{ count, plural, =1 {1 gösterge panelini} other {# gösterge panelini} } silmek istediğinize emin misiniz?",
+    "delete-dashboards-action-title": "{ count, plural, =1 {1 gösterge panelini} other {# gösterge panelini} } sil",
     "delete-dashboards-text": "UYARI: Onaylandıktan sonra tüm seçili gösterge panelleri ve ilişkili verileri geri yüklenemez şekilde silinecek.",
     "unassign-dashboard-title": "'{{dashboardTitle}}' isimli gösterge panelindeki atamayı kaldırmak istediğinize emin misiniz?",
     "unassign-dashboard-text": "Onaylandıktan sonra gösterge panelinin ataması kaldırılacak ve kullanıcı grubu tarafından erişilemez hale gelecektir.",
     "unassign-dashboard": "Gösterge panelinin ataması kaldır",
-    "unassign-dashboards-title": "{count, plural, 1 {1 gösterge panelindeki} other {# gösterge panelindeki} } atamayı kaldırmak istediğinize emin misiniz?",
+    "unassign-dashboards-title": "{count, plural, =1 {1 gösterge panelindeki} other {# gösterge panelindeki} } atamayı kaldırmak istediğinize emin misiniz?",
     "unassign-dashboards-text": "Onaylandıktan <sonra seçili gösterge panellerinin atamaları kaldırılacak ve kullanıcı grubu tarafından erişilemez hale gelecektir.",
     "public-dashboard-title": "Gösterge paneli açık hale getirildi",
     "public-dashboard-text": "Gösterge paneliniz <b>{{dashboardTitle}}</b> açık hale getirildi ve bu <a href='{{publicLink}}' target='_blank'>bağlantıdan</a> erişilebilir durumda",
@@ -816,7 +816,7 @@
     "manage-states": "Gösterge paneli durumlarını yönet",
     "states": "Gösterge paneli durumları",
     "search-states": "Gösterge paneli durumlarını ara",
-    "selected-states": "{ count, plural, 1 {1 gösterge paneli durumu} other {# gösterge paneli durumları} } seçildi",
+    "selected-states": "{ count, plural, =1 {1 gösterge paneli durumu} other {# gösterge paneli durumları} } seçildi",
     "edit-state": "Gösterge paneli durumunu düzenle",
     "delete-state": "Gösterge paneli durumunu sil",
     "add-state": "Gösterge paneli durumu ekle",
@@ -835,11 +835,11 @@
     "select-state": "Hedef durumu seçin",
     "state-controller": "Durum denetleyicisi",
     "search": "Gösterge panellerini ara",
-    "selected-dashboards": "{ count, plural, 1 {1 gösterge paneli} other {# gösterge panelleri} } seçildi",
+    "selected-dashboards": "{ count, plural, =1 {1 gösterge paneli} other {# gösterge panelleri} } seçildi",
     "home-dashboard": "Ana sayfa gösterge paneli",
     "home-dashboard-hide-toolbar": "Ana sayfa gösterge paneli araç çubuğunu gizle",
     "unassign-dashboard-from-edge-text": "Onaydan sonra gösterge panelinin ataması kaldırılacak ve uç tarafından erişilebilir olmayacaktır.",
-    "unassign-dashboards-from-edge-title": "{ count, plural, 1 {1 gösterge paneli} other {# gösterge panelleri} } atamasını kaldırmak istediğinizden emin misiniz?",
+    "unassign-dashboards-from-edge-title": "{ count, plural, =1 {1 gösterge paneli} other {# gösterge panelleri} } atamasını kaldırmak istediğinizden emin misiniz?",
     "unassign-dashboards-from-edge-text": "Onaydan sonra, seçilen tüm gösterge panellerinin ataması kaldırılacak ve uç tarafından erişilemeyecek.",
     "assign-dashboard-to-edge": "Gösterge panellerini uca ata",
     "assign-dashboard-to-edge-text": "Lütfen uca atanacak gösterge panellerini seçin"
@@ -861,11 +861,11 @@
     "timeseries-required": "Zaman serisi öğesi gerekli.",
     "timeseries-or-attributes-required": "Zaman serisi/öznitelikler öğesi gerekli.",
     "alarm-fields-timeseries-or-attributes-required": "Alarm alanları veya Zaman serisi/öznitelikler öğesi gerekli.",
-    "maximum-timeseries-or-attributes": "Maksimum { count, plural, 1 {1 zamanserisi/öznitelik kabul edilir.} other {# zamanserisi/öznitelik kabul edilir} }",
+    "maximum-timeseries-or-attributes": "Maksimum { count, plural, =1 {1 zamanserisi/öznitelik kabul edilir.} other {# zamanserisi/öznitelik kabul edilir} }",
     "alarm-fields-required": "Alarm alanları gerekli.",
     "function-types": "Fonksiyon türleri",
     "function-types-required": "Fonksiyon türleri gerekli.",
-    "maximum-function-types": "Maksimum { count, plural, 1 {1 fonksiyon türü kabul edilir.} other {# fonksiyon türü kabul edilir} }",
+    "maximum-function-types": "Maksimum { count, plural, =1 {1 fonksiyon türü kabul edilir.} other {# fonksiyon türü kabul edilir} }",
     "time-description": "geçerli değerin zaman damgası;",
     "value-description": "geçerli değer;",
     "prev-value-description": "önceki fonksiyon çağrısının sonucu;",
@@ -928,11 +928,11 @@
     "manage-credentials": "Kimlik bilgilerini yönet",
     "delete": "Cihaz sil",
     "assign-devices": "Cihaz ata",
-    "assign-devices-text": "{ count, plural, 1 {1 cihazı} other {# cihazı} } kullanıcı grubuna ata",
+    "assign-devices-text": "{ count, plural, =1 {1 cihazı} other {# cihazı} } kullanıcı grubuna ata",
     "delete-devices": "Cihazları sil",
     "unassign-from-customer": "Kullanıcı Grubundan atamayı kaldır",
     "unassign-devices": "Cihazlardan atamayı kaldır",
-    "unassign-devices-action-title": "{ count, plural, 1 {1 cihazın} other {# cihazın} } atamasını kullanıcı grubundan kaldır",
+    "unassign-devices-action-title": "{ count, plural, =1 {1 cihazın} other {# cihazın} } atamasını kullanıcı grubundan kaldır",
     "unassign-device-from-edge-title": "'{{deviceName}}' cihazının atamasını kaldırmak istediğinizden emin misiniz?",
     "unassign-device-from-edge-text": "Onaydan sonra cihazın ataması kaldırılacak ve cihaza uç tarafından erişilemeyecek.",
     "unassign-devices-from-edge": "Cihazların atamasını uçtan kaldır",
@@ -944,13 +944,13 @@
     "view-credentials": "Kimlik bilgilerini görüntüle",
     "delete-device-title": "'{{deviceName}}' isimli cihazı silmek istediğinize emin misiniz?",
     "delete-device-text": "UYARI: Onaylandıktan sonra cihaz ve ilişkili verileri geri yüklenemez şekilde silinecek.",
-    "delete-devices-title": "{ count, plural, 1 {1 cihazı} other {# cihazı} } silmek istediğinize emin misiniz?",
-    "delete-devices-action-title": "{ count, plural, 1 {1 cihazı} other {# cihazı} } sil",
+    "delete-devices-title": "{ count, plural, =1 {1 cihazı} other {# cihazı} } silmek istediğinize emin misiniz?",
+    "delete-devices-action-title": "{ count, plural, =1 {1 cihazı} other {# cihazı} } sil",
     "delete-devices-text": "UYARI: Onaylandıktan sonra tüm seçili cihazlar ve ilişkili verileri geri yüklenemez şekilde silinecek.",
     "unassign-device-title": "'{{deviceName}}' isimli cihazın atamasını kaldırmak istediğinize emin misiniz?",
     "unassign-device-text": "Onaylandıktan sonra cihazın ataması kaldırılacak ve kullanıcı grubu tarafından erişilemez olacak.",
     "unassign-device": "Cihaz atamasını kaldır",
-    "unassign-devices-title": "{ count, plural, 1 {1 cihazın} other {# cihazın} } atamasını kaldırmak istediğinize emin misiniz?",
+    "unassign-devices-title": "{ count, plural, =1 {1 cihazın} other {# cihazın} } atamasını kaldırmak istediğinize emin misiniz?",
     "unassign-devices-text": "Onaylandıktan sonra seçili cihazların atamaları kaldırılacak ve kullanıcı grubu tarafından erişilemez olacak.",
     "device-credentials": "Cihaz Kimlik Bilgileri",
     "loading-device-credentials": "Cihaz kimlik bilgileri yükleniyor...",
@@ -1017,7 +1017,7 @@
     "import": "Cihazı içe aktar",
     "device-file": "Cihaz dosyası",
     "search": "Cihaz ara",
-    "selected-devices": "{ count, plural, 1 {1 cihaz} other {# cihaz} } seçildi",
+    "selected-devices": "{ count, plural, =1 {1 cihaz} other {# cihaz} } seçildi",
     "device-configuration": "Cihaz yapılandırması",
     "transport-configuration": "Aktarım yapılandırması",
     "wizard": {
@@ -1029,7 +1029,7 @@
       "customer-to-assign-device": "Cihazı atamak için kullanıcı grubu",
       "add-credentials": "Kimlik bilgileri ekle"
     },
-    "unassign-devices-from-edge-title": "{ count, plural, 1 {1 cihazın} other {# cihazın} } atamasını kaldırmak istediğinizden emin misiniz?",
+    "unassign-devices-from-edge-title": "{ count, plural, =1 {1 cihazın} other {# cihazın} } atamasını kaldırmak istediğinizden emin misiniz?",
     "unassign-devices-from-edge-text": "Onaydan sonra, seçilen tüm cihazların ataması kaldırılacak ve uç tarafından erişilemeyecek."
   },
   "device-profile": {
@@ -1041,7 +1041,7 @@
     "device-profile-details": "Cihaz profili ayrıntıları",
     "no-device-profiles-text": "Cihaz profili bulunamadı",
     "search": "Cihaz profillerini ara",
-    "selected-device-profiles": "{ count, plural, 1 {1 cihaz profili} other {# cihaz profili} } seçildi",
+    "selected-device-profiles": "{ count, plural, =1 {1 cihaz profili} other {# cihaz profili} } seçildi",
     "no-device-profiles-matching": "'{{entity}}' ile eşleşen cihaz profili bulunamadı.",
     "device-profile-required": "Cihaz profili gerekli",
     "idCopiedMessage": "Cihaz profili kimliği panoya kopyalandı",
@@ -1078,7 +1078,7 @@
     "select-queue-hint": "Açılır listeden seçin veya özel bir ad ekleyin.",
     "delete-device-profile-title": "'{{deviceProfileName}}' cihaz profilini silmek istediğinizden emin misiniz?",
     "delete-device-profile-text": "Dikkatli olun, onaydan sonra cihaz profili ve ilgili tüm veriler kurtarılamaz hale gelecektir.",
-    "delete-device-profiles-title": "{ count, plural, 1 {1 cihaz profilini} other {# cihaz profilini} } silmek istediğinizden emin misiniz?",
+    "delete-device-profiles-title": "{ count, plural, =1 {1 cihaz profilini} other {# cihaz profilini} } silmek istediğinizden emin misiniz?",
     "delete-device-profiles-text": "Dikkatli olun, onaydan sonra seçilen tüm cihaz profilleri kaldırılacak ve ilgili tüm veriler kurtarılamaz hale gelecektir.",
     "set-default-device-profile-title": "'{{deviceProfileName}}' cihaz profilini varsayılan yapmak istediğinizden emin misiniz?",
     "set-default-device-profile-text": "Onaydan sonra cihaz profili varsayılan olarak işaretlenecek ve profil belirtilmemiş yeni cihazlar için kullanılacaktır.",
@@ -1189,8 +1189,8 @@
     "condition-repeating-value-range": "Etkinlik sayısı 1 ile 2147483647 arasında olmalıdır.",
     "condition-repeating-value-pattern": "Etkinlik sayısı tamsayı olmalıdır.",
     "condition-repeating-value-required": "Etkinlik sayısı gerekli.",
-    "condition-repeat-times": "{ count, plural, 1 {1 kere} other {# kere} } tekrar eder",
-    "condition-repeat-times-dynamic": "\"{ attribute }\" ({ count, plural, 1 {1 kere} other {# kere} } tekrar eder)",
+    "condition-repeat-times": "{ count, plural, =1 {1 kere} other {# kere} } tekrar eder",
+    "condition-repeat-times-dynamic": "\"{ attribute }\" ({ count, plural, =1 {1 kere} other {# kere} } tekrar eder)",
     "schedule-type": "Plan türü",
     "schedule-type-required": "Plan türü gerekli.",
     "schedule": "Plan",
@@ -1400,7 +1400,7 @@
     "delete": "Delete edge",
     "delete-edge-title": "Are you sure you want to delete the edge '{{edgeName}}'?",
     "delete-edge-text": "Be careful, after the confirmation the edge and all related data will become unrecoverable.",
-    "delete-edges-title": "Are you sure you want to edge { count, plural, 1 {1 edge} other {# edges} }?",
+    "delete-edges-title": "Are you sure you want to edge { count, plural, =1 {1 edge} other {# edges} }?",
     "delete-edges-text": "Be careful, after the confirmation all selected edges will be removed and all related data will become unrecoverable.",
     "name": "Name",
     "name-starts-with": "Edge name starts with",
@@ -1427,7 +1427,7 @@
     "unassign-from-customer": "Unassign from customer",
     "unassign-edge-title": "Are you sure you want to unassign the edge '{{edgeName}}'?",
     "unassign-edge-text": "After the confirmation the edge will be unassigned and won't be accessible by the customer.",
-    "unassign-edges-title": "Are you sure you want to unassign { count, plural, 1 {1 edge} other {# edges} }?",
+    "unassign-edges-title": "Are you sure you want to unassign { count, plural, =1 {1 edge} other {# edges} }?",
     "unassign-edges-text": "After the confirmation all selected edges will be unassigned and won't be accessible by the customer.",
     "make-public": "Make edge public",
     "make-public-edge-title": "Are you sure you want to make the edge '{{edgeName}}' public?",
@@ -1460,7 +1460,7 @@
     "rulechain-templates": "Rule chain templates",
     "rulechains": "Rule chains",
     "search": "Search edges",
-    "selected-edges": "{ count, plural, 1 {1 edge} other {# edges} } selected",
+    "selected-edges": "{ count, plural, =1 {1 edge} other {# edges} } selected",
     "any-edge": "Any edge",
     "no-edge-types-matching": "No edge types matching '{{entitySubtype}}' were found.",
     "edge-type-list-empty": "No edge types selected.",
@@ -1560,66 +1560,66 @@
     "type-required": "Öğe türü gerekli.",
     "type-device": "Cihaz",
     "type-devices": "Cihazlar",
-    "list-of-devices": "{ count, plural, 1 {Bir cihaz} other {# cihazın listesi} }",
+    "list-of-devices": "{ count, plural, =1 {Bir cihaz} other {# cihazın listesi} }",
     "device-name-starts-with": "İsimleri '{{prefix}}' ile başlayan cihazlar",
     "type-device-profile": "Cihaz profili",
     "type-device-profiles": "Cihaz profilleri",
-    "list-of-device-profiles": "{ count, plural, 1 {Bir cihaz profili} other {# cihaz profilinin listesi} }",
+    "list-of-device-profiles": "{ count, plural, =1 {Bir cihaz profili} other {# cihaz profilinin listesi} }",
     "device-profile-name-starts-with": "Adları '{{prefix}}' ile başlayan cihaz profilleri",
     "type-asset": "Varlık",
     "type-assets": "Varlıklar",
-    "list-of-assets": "{ count, plural, 1 {Bir varlık} other {# Varlığın Listesi} }",
+    "list-of-assets": "{ count, plural, =1 {Bir varlık} other {# Varlığın Listesi} }",
     "asset-name-starts-with": "İsmi '{{prefix}}' ile başlayan varlıklar",
     "type-entity-view": "Varlık Görünümü",
     "type-entity-views": "Varlık Görünümleri",
-    "list-of-entity-views": "{ count, plural, 1 {Bir varlık görünümü} other {# varlık görüntüleme} } listesi",
+    "list-of-entity-views": "{ count, plural, =1 {Bir varlık görünümü} other {# varlık görüntüleme} } listesi",
     "entity-view-name-starts-with": "İsmi {{prefix}} ile başlayan varlık görünümleri",
     "type-rule": "Kural",
     "type-rules": "Kurallar",
-    "list-of-rules": "{ count, plural, 1 {Bir kural} other {# Kuralın Listesi} }",
+    "list-of-rules": "{ count, plural, =1 {Bir kural} other {# Kuralın Listesi} }",
     "rule-name-starts-with": "İsmi '{{prefix}}' ile başlayan kurallar",
     "type-plugin": "Eklenti",
     "type-plugins": "Eklentiler",
-    "list-of-plugins": "{ count, plural, 1 {Bir eklenti} other {# Eklentinin Listesi} }",
+    "list-of-plugins": "{ count, plural, =1 {Bir eklenti} other {# Eklentinin Listesi} }",
     "plugin-name-starts-with": "İsmi '{{prefix}}' ile başlayan eklentiler",
     "type-tenant": "Tenant",
     "type-tenants": "Tenantlar",
-    "list-of-tenants": "{ count, plural, 1 {Bir tenant} other {# Tenantın Listesi} }",
+    "list-of-tenants": "{ count, plural, =1 {Bir tenant} other {# Tenantın Listesi} }",
     "tenant-name-starts-with": "İsmi '{{prefix}}' ile başlayan tenantlar",
     "type-tenant-profile": "Tenant profili",
     "type-tenant-profiles": "Tenant profilleri",
-    "list-of-tenant-profiles": "{ count, plural, 1 {Bir tenant profili} other {# tenant profili listesi} }",
+    "list-of-tenant-profiles": "{ count, plural, =1 {Bir tenant profili} other {# tenant profili listesi} }",
     "tenant-profile-name-starts-with": "İsmi '{{prefix}}' ile başlayan tenant profilleri",
     "type-customer": "Kullanıcı Grubu",
     "type-customers": "Kullanıcı Grupları",
-    "list-of-customers": "{ count, plural, 1 {Bir kullanıcı grubu} other {# kullanıcı grupları listesi} }",
+    "list-of-customers": "{ count, plural, =1 {Bir kullanıcı grubu} other {# kullanıcı grupları listesi} }",
     "customer-name-starts-with": "İsmi '{{prefix}}' ile başlayan kullanıcı grupları",
     "type-user": "Kullanıcı",
     "type-users": "Kullanıcılar",
-    "list-of-users": "{ count, plural, 1 {Bir kullanıcı} other {# kullanıcı listesi} }",
+    "list-of-users": "{ count, plural, =1 {Bir kullanıcı} other {# kullanıcı listesi} }",
     "user-name-starts-with": "İsmi '{{prefix}}' ile başlayan kullanıcılar",
     "type-dashboard": "Gösterge Paneli",
     "type-dashboards": "Gösterge Panelleri",
-    "list-of-dashboards": "{ count, plural, 1 {Bir gösterge paneli} other {# gösterge paneli listesi} }",
+    "list-of-dashboards": "{ count, plural, =1 {Bir gösterge paneli} other {# gösterge paneli listesi} }",
     "dashboard-name-starts-with": "İsmi '{{prefix}}' ile başlayan gösterge panelleri",
     "type-alarm": "Alarm",
     "type-alarms": "Alarmlar",
-    "list-of-alarms": "{ count, plural, 1 {Bir alarm} other {# alarm listesi} }",
+    "list-of-alarms": "{ count, plural, =1 {Bir alarm} other {# alarm listesi} }",
     "alarm-name-starts-with": "İsmi '{{prefix}}' ile başlayan alarmlar",
     "type-rulechain": "Kural zinciri",
     "type-rulechains": "Kural zincirleri",
-    "list-of-rulechains": "{ count, plural, 1 {Bir kural zinciri} other {# kural zinciri listesi} }",
+    "list-of-rulechains": "{ count, plural, =1 {Bir kural zinciri} other {# kural zinciri listesi} }",
     "rulechain-name-starts-with": "İsmi '{{prefix}}' ile başlayan kural zincirleri",
     "type-rulenode": "Kural düğümü",
     "type-rulenodes": "Kural düğümleri",
-    "list-of-rulenodes": "{ count, plural, 1 {One rule node} other {List of # rule nodes} }",
+    "list-of-rulenodes": "{ count, plural, =1 {One rule node} other {List of # rule nodes} }",
     "rulenode-name-starts-with": "İsmi '{{prefix}}' ile başlayan kural düğümleri",
     "type-current-customer": "Aktif Kullanıcı Grubu",
     "type-current-tenant": "Aktif Tenant",
     "type-current-user": "Aktif Kullanıcı",
     "type-current-user-owner": "Aktif Kullanıcı Sahibi",
     "search": "Öğeleri ara",
-    "selected-entities": "{ count, plural, 1 {1 öğe} other {# öğe} } seçildi",
+    "selected-entities": "{ count, plural, =1 {1 öğe} other {# öğe} } seçildi",
     "entity-name": "Öğe adı",
     "entity-label": "Öğe etiketi",
     "details": "Öğe detayları",
@@ -1629,7 +1629,7 @@
     "type-api-usage-state": "API Kullanım Durumu",
     "type-edge": "Uç",
     "type-edges": "Uçlar",
-    "list-of-edges": "{ count, plural, 1 {Bir uç} other {# uç listesi} }",
+    "list-of-edges": "{ count, plural, =1 {Bir uç} other {# uç listesi} }",
     "edge-name-starts-with": "İsmi '{{prefix}}' ile başlayan uçlar",
     "type-tb-resource": "Kaynak",
     "type-ota-package": "OTA paketi"
@@ -1692,21 +1692,21 @@
     "add-entity-view-text": "Yeni öğe görünümü ekle",
     "delete": "Öğe görünümünü sil",
     "assign-entity-views": "Öğe görünümlerini ata",
-    "assign-entity-views-text": "{ count, plural, 1 {1 öğe görünümünü} other {# öğe görünümünü} } kullanıcı grubuna ata",
+    "assign-entity-views-text": "{ count, plural, =1 {1 öğe görünümünü} other {# öğe görünümünü} } kullanıcı grubuna ata",
     "delete-entity-views": "Öğe görünümlerini sil",
     "unassign-from-customer": "Kullanıcı grubundan atamayı kaldır",
     "unassign-entity-views": "Öğe görünümlerinin atamasını kaldır",
-    "unassign-entity-views-action-title": "{ count, plural, 1 {1 öğe görünümünü} other {# öğe görünümünü} } kullanıcı grubundan kaldır",
+    "unassign-entity-views-action-title": "{ count, plural, =1 {1 öğe görünümünü} other {# öğe görünümünü} } kullanıcı grubundan kaldır",
     "assign-new-entity-view": "Yeni öğe görünümü ata",
     "delete-entity-view-title": "'{{entityViewName}}' öğe görünümünü silmek istediğinizden emin misiniz?",
     "delete-entity-view-text": "Dikkatli olun, onaydan sonra öğe görünümü ve ilgili tüm veriler kurtarılamaz hale gelecektir.",
-    "delete-entity-views-title": "{ count, plural, 1 {1 öğe görünümünü} other {# öğe görünümünü} } silmek istediğinizden emin misiniz?",
-    "delete-entity-views-action-title": "{ count, plural, 1 {1 öğe görünümünü} other {# öğe görünümünü} } sil",
+    "delete-entity-views-title": "{ count, plural, =1 {1 öğe görünümünü} other {# öğe görünümünü} } silmek istediğinizden emin misiniz?",
+    "delete-entity-views-action-title": "{ count, plural, =1 {1 öğe görünümünü} other {# öğe görünümünü} } sil",
     "delete-entity-views-text": "Dikkatli olun, onaydan sonra seçilen tüm öğe görünümleri kaldırılacak ve ilgili tüm veriler kurtarılamaz hale gelecektir.",
     "unassign-entity-view-title": "'{{entityViewName}}' öğe görünümünün atamasını kaldırmak istediğinizden emin misiniz?",
     "unassign-entity-view-text": "Onaydan sonra öğe görünümünün ataması kaldırılacak ve müşteri tarafından erişilebilir olmayacaktır.",
     "unassign-entity-view": "Öğe görünümünün atamasını kaldır",
-    "unassign-entity-views-title": "{ count, plural, 1 {1 öğe görünümünün} other {# öğe görünümünün} } atamasını kaldırmak istediğinizden emin misiniz?",
+    "unassign-entity-views-title": "{ count, plural, =1 {1 öğe görünümünün} other {# öğe görünümünün} } atamasını kaldırmak istediğinizden emin misiniz?",
     "unassign-entity-views-text": "Onaydan sonra, seçilen tüm öğe görünümlerinin ataması kaldırılacak ve kullanıcı grubu tarafından erişilebilir olmayacaktır.",
     "entity-view-type": "Öğe Görünümü türü",
     "entity-view-type-required": "Öğe Görünümü türü gerekli.",
@@ -1756,9 +1756,9 @@
     "assign-entity-view-to-edge-text": "Lütfen uca atanacak öğe görünümlerini seçin",
     "unassign-entity-view-from-edge-title": "'{{entityViewName}}' öğe görünümünün atamasını kaldırmak istediğinizden emin misiniz?",
     "unassign-entity-view-from-edge-text": "Onaydan sonra öğe görünümünün ataması kaldırılacak ve uç tarafından erişilebilir olmayacaktır.",
-    "unassign-entity-views-from-edge-action-title": "{ count, plural, 1 {1 öğe görünümünü} other {# öğe görünümünü} } uçtan kaldır",
+    "unassign-entity-views-from-edge-action-title": "{ count, plural, =1 {1 öğe görünümünü} other {# öğe görünümünü} } uçtan kaldır",
     "unassign-entity-view-from-edge": "Öğe görünümünün atamasını kaldır",
-    "unassign-entity-views-from-edge-title": "{ count, plural, 1 {1 öğe görünümünün} other {# öğe görünümünün} } atamasını kaldırmak istediğinizden emin misiniz?",
+    "unassign-entity-views-from-edge-title": "{ count, plural, =1 {1 öğe görünümünün} other {# öğe görünümünün} } atamasını kaldırmak istediğinizden emin misiniz?",
     "unassign-entity-views-from-edge-text": "Onaydan sonra, seçilen tüm öğe görünümlerinin ataması kaldırılacak ve uç tarafından erişilebilir olmayacaktır."
   },
   "event": {
@@ -1799,7 +1799,7 @@
   },
   "extension": {
     "extensions": "Uzantılar",
-    "selected-extensions": "{ count, plural, 1 {1 uzantı} other {# uzantı} } seçildi",
+    "selected-extensions": "{ count, plural, =1 {1 uzantı} other {# uzantı} } seçildi",
     "type": "Tür",
     "key": "Anahtar",
     "value": "Değer",
@@ -1813,7 +1813,7 @@
     "edit": "Uzantıyı düzenle",
     "delete-extension-title": "'{{extensionId}}' uzantısını silmek istediğinizden emin misiniz?",
     "delete-extension-text": "Dikkatli olun, onaydan sonra uzantı ve ilgili tüm veriler kurtarılamaz hale gelecektir.",
-    "delete-extensions-title": "{ count, plural, 1 {1 uzantıyı} other {# uzantıyı} } silmek istediğinizden emin misiniz?",
+    "delete-extensions-title": "{ count, plural, =1 {1 uzantıyı} other {# uzantıyı} } silmek istediğinizden emin misiniz?",
     "delete-extensions-text": "Dikkatli olun, onaydan sonra seçilen tüm uzantılar kaldırılacaktır.",
     "converters": "Çeviriciler",
     "converter-id": "Çevirici ID",
@@ -2130,8 +2130,8 @@
   "grid": {
     "delete-item-title": "Bu öğeyi silmek istediğinizden emin misiniz?",
     "delete-item-text": "Dikkatli olun, onaylandıktan sonra bu öğe ve ilgili tüm veriler kurtarılamaz hale gelecektir.",
-    "delete-items-title": "{ count, plural, 1 {1 öğeyi} other {# öğeyi} } silmek istediğinizden emin misiniz??",
-    "delete-items-action-title": "{ count, plural, 1 {1 öğeyi} other {# öğeyi} } sil",
+    "delete-items-title": "{ count, plural, =1 {1 öğeyi} other {# öğeyi} } silmek istediğinizden emin misiniz??",
+    "delete-items-action-title": "{ count, plural, =1 {1 öğeyi} other {# öğeyi} } sil",
     "delete-items-text": "Dikkatli olun, onaydan sonra seçilen tüm öğeler kaldırılacak ve ilgili tüm veriler kurtarılamaz hale gelecektir.",
     "add-item-text": "Yeni öğe ekle",
     "no-items-text": "Hiç bir öğe bulunamadı",
@@ -2271,8 +2271,8 @@
     "checksum-hint": "Checksum boşsa, otomatik olarak oluşturulur",
     "checksum-algorithm": "Checksum algoritması",
     "checksum-copied-message": "Paket checksum panoya kopyalandı",
-    "change-firmware": "Firmware değişikliği { count, plural, 1 {1 cihazın} other {# cihazın} } güncellenmesine neden olabilir.",
-    "change-software": "Software değişikliği { count, plural, 1 {1 cihazın} other {# cihazın} }.",
+    "change-firmware": "Firmware değişikliği { count, plural, =1 {1 cihazın} other {# cihazın} } güncellenmesine neden olabilir.",
+    "change-software": "Software değişikliği { count, plural, =1 {1 cihazın} other {# cihazın} }.",
     "chose-compatible-device-profile": "Yüklenen paket yalnızca seçilen profile sahip cihazlar için geçerli olacaktır.",
     "chose-firmware-distributed-device": "Cihazlara dağıtılacak firmware'i seçin",
     "chose-software-distributed-device": "Cihazlara dağıtılacak software'i seçin",
@@ -2285,7 +2285,7 @@
     "delete-ota-update-text": "Dikkatli olun, onaydan sonra OTA güncellemesi kurtarılamaz hale gelecektir.",
     "delete-ota-update-title": "'{{title}}' OTA güncellemesini silmek istediğinizden emin misiniz?",
     "delete-ota-updates-text": "Dikkatli olun, onaydan sonra seçilen tüm OTA güncellemeleri kaldırılacaktır.",
-    "delete-ota-updates-title": "{ count, plural, 1 {1 OTA güncellemesini} other {# OTA güncellemesini} } silmek istediğinizden emin misiniz?",
+    "delete-ota-updates-title": "{ count, plural, =1 {1 OTA güncellemesini} other {# OTA güncellemesini} } silmek istediğinizden emin misiniz?",
     "description": "Açıklama",
     "direct-url": "Açık URL",
     "direct-url-copied-message": "Paket açık URL'si panoya kopyalandı",
@@ -2307,7 +2307,7 @@
     "package-type": "Paket Tipi",
     "packages-repository": "Paket deposu",
     "search": "Paketleri ara",
-    "selected-package": "{ count, plural, 1 {1 paket} other {# paket} } seçildi",
+    "selected-package": "{ count, plural, =1 {1 paket} other {# paket} } seçildi",
     "title": "Başlık",
     "title-required": "Başlık gerekli.",
     "types": {
@@ -2347,7 +2347,7 @@
     },
     "from-relations": "Giden ilişkiler",
     "to-relations": "Gelen ilişkiler",
-    "selected-relations": "{ count, plural, 1 {1 ilişki} other {# ilişki} } seçildi",
+    "selected-relations": "{ count, plural, =1 {1 ilişki} other {# ilişki} } seçildi",
     "type": "Tür",
     "to-entity-type": "Hedef Öğe Türü",
     "to-entity-name": "Hedef Öğe Adı",
@@ -2363,11 +2363,11 @@
     "edit": "İlişki düzenle",
     "delete-to-relation-title": "'{{entityName}}' öğesine olan ilişkiyi silmek istediğinize emin misiniz?",
     "delete-to-relation-text": "UYARI: Onaylandıktan sonra '{{entityName}}' öğesinin şimdiki öğeyle olan ilişkisi sona erecektir.",
-    "delete-to-relations-title": "{ count, plural, 1 {1 ilişkiyi} other {# ilişkiyi} } silmek istediğinize emin misiniz?",
+    "delete-to-relations-title": "{ count, plural, =1 {1 ilişkiyi} other {# ilişkiyi} } silmek istediğinize emin misiniz?",
     "delete-to-relations-text": "UYARI: Onaylandıktan sonra tüm seçili ilişkiler kaldırılacaktır ve ilgili öğelerin şimdiki öğeyle ilişkisi sona erecektir.",
     "delete-from-relation-title": "'{{entityName}}' öğesinden ilişkiyi silmek istediğinize emin misiniz?",
     "delete-from-relation-text": "UYARI: Onaylandıktan sonra şimdiki öğenin '{{entityName}}' öğesiyle ilişkisi sonlandırılacaktır.",
-    "delete-from-relations-title": "{ count, plural, 1 {1 ilişkiyi} other {# ilişkiyi} } silmek istediğinize emin misiniz?",
+    "delete-from-relations-title": "{ count, plural, =1 {1 ilişkiyi} other {# ilişkiyi} } silmek istediğinize emin misiniz?",
     "delete-from-relations-text": "UYARI: Onaylandıktan sonra tüm seçili ilişkiler kaldırılacak ve şimdiki öğenin ilgili tüm öğelerle ilişkisi sona erecektir.",
     "remove-relation-filter": "İlişki filtresini kaldır",
     "add-relation-filter": "İlişkisi ekle",
@@ -2383,9 +2383,9 @@
     "delete": "Kaynağı sil",
     "delete-resource-text": "Dikkatli olun, onaydan sonra kaynak kurtarılamaz hale gelecektir..",
     "delete-resource-title": "'{{resourceTitle}}' kaynağını silmek istediğinizden emin misiniz?",
-    "delete-resources-action-title": "{ count, plural, 1 {1 kaynağı} other {# kaynağı} } sil",
+    "delete-resources-action-title": "{ count, plural, =1 {1 kaynağı} other {# kaynağı} } sil",
     "delete-resources-text": "Lütfen seçilen kaynakların cihaz profillerinde kullanılsalar bile silineceğini unutmayın.",
-    "delete-resources-title": "{ count, plural, 1 {1 kaynağı} other {# kaynağı} } silmek istediğinizden emin misiniz?",
+    "delete-resources-title": "{ count, plural, =1 {1 kaynağı} other {# kaynağı} } silmek istediğinizden emin misiniz?",
     "download": "Kaynağı indir",
     "drop-file": "Bir kaynak dosyası bırakın veya yüklenecek dosyayı seçmek için tıklayın.",
     "empty": "Kaynak boş",
@@ -2399,7 +2399,7 @@
     "resource-type": "Kaynak türü",
     "resources-library": "Kaynak kütüphanesi",
     "search": "Kaynak ara",
-    "selected-resources": "{ count, plural, 1 {1 kaynak} other {# kaynak} } seçildi",
+    "selected-resources": "{ count, plural, =1 {1 kaynak} other {# kaynak} } seçildi",
     "system": "Sistem",
     "title": "Başlık",
     "title-required": "Başlık gerekli."
@@ -2418,8 +2418,8 @@
     "set-root-rulechain-text": "Onaydan sonra kural zinciri kökleşecek ve gelen tüm iletilerle ilgilenecek.",
     "delete-rulechain-title": "'{{ruleName}}' isimli kuralı silmek istediğinize emin misiniz?",
     "delete-rulechain-text": "UYARI: Onaylandıktan sonra kural ve ilişkili tüm veriler geri yüklenemez şekilde silinecektir.",
-    "delete-rulechains-title": "{ count, plural, 1 {1 kuralı} other {# kuralı} } sikmek istediğinize emin misiniz?",
-    "delete-rulechains-action-title": "{ count, plural, 1 {1 kuralı} other {# kuralı} } sil",
+    "delete-rulechains-title": "{ count, plural, =1 {1 kuralı} other {# kuralı} } sikmek istediğinize emin misiniz?",
+    "delete-rulechains-action-title": "{ count, plural, =1 {1 kuralı} other {# kuralı} } sil",
     "delete-rulechains-text": "UYARI: Onaylandıktan sonra seçili tüm kurallar ve ilişkili tüm veriler geri yüklenemez şekilde silinecektir.",
     "add-rulechain-text": "Yeni kural ekle",
     "no-rulechains-text": "Hiçbir kural bulunamadı",
@@ -2441,14 +2441,14 @@
     "management": "Kural yönetimi",
     "debug-mode": "Hata ayıklama modu",
     "search": "Kural Ara",
-    "selected-rulechains": "{ count, plural, 1 {1 kural} other {# kural} } seçildi",
+    "selected-rulechains": "{ count, plural, =1 {1 kural} other {# kural} } seçildi",
     "open-rulechain": "Kuralı Aç",
     "assign-new-rulechain": "Yeni kural zinciri atayın",
     "edge-template-root": "Şablon Kökü",
     "assign-to-edge": "Uca Ata",
     "edge-rulechain": "Uç kuralı zinciri",
     "unassign-rulechain-from-edge-text": "Onaydan sonra kural zincirinin ataması kaldırılacak ve kenar tarafından erişilebilir olmayacak.",
-    "unassign-rulechains-from-edge-title": "{ count, plural, 1 {1 kural zincirinin} other {# kural zincirinin} } atamasını kaldırmak istediğinizden emin misiniz?",
+    "unassign-rulechains-from-edge-title": "{ count, plural, =1 {1 kural zincirinin} other {# kural zincirinin} } atamasını kaldırmak istediğinizden emin misiniz?",
     "unassign-rulechains-from-edge-text": "Onaydan sonra, seçilen tüm kural zincirlerinin ataması kaldırılacak ve uç tarafından erişilemeyecek.",
     "assign-rulechain-to-edge-title": "Uca Kural Zinciri/Zincirleri Ata",
     "assign-rulechain-to-edge-text": "Lütfen uca atanacak kural zincirlerini seçin",
@@ -2554,8 +2554,8 @@
     "tenant-details": "Tenant detayları",
     "delete-tenant-title": "'{{tenantTitle}}' isimli tenantı silmek istediğinize emin misiniz?",
     "delete-tenant-text": "UYARI: Onaylandıktan sonra tenant ve ilişkili tüm veriler geri yüklenemez şekilde silinecektir.",
-    "delete-tenants-title": "{ count, plural, 1 {1 tenantı} other {# tenantı} } silmek istediğinize emin misiniz?",
-    "delete-tenants-action-title": "{ count, plural, 1 {1 tenantı} other {# tenantı} } sil",
+    "delete-tenants-title": "{ count, plural, =1 {1 tenantı} other {# tenantı} } silmek istediğinize emin misiniz?",
+    "delete-tenants-action-title": "{ count, plural, =1 {1 tenantı} other {# tenantı} } sil",
     "delete-tenants-text": "UYARI: Onaylandıktan sonra seçili tüm tenantlar ve ilişkili tüm veriler geri yüklenemez şekilde silinecektir",
     "title": "Başlık",
     "title-required": "Başlık gerekli.",
@@ -2568,7 +2568,7 @@
     "no-tenants-matching": "'{{entity}}' ile eşleşen tenant bulunamadı.",
     "tenant-required": "Tenant gerekli",
     "search": "Tenantları ara",
-    "selected-tenants": "{ count, plural, 1 {1 tenant} other {# tenant} } seçildi",
+    "selected-tenants": "{ count, plural, =1 {1 tenant} other {# tenant} } seçildi",
     "isolated-tb-rule-engine": "ThingsBoard soyutlanmış kural yönetimi konteynerda işlensin",
     "isolated-tb-rule-engine-details": "Her soyutlanmış tenant ayrı bir mikro servis gerektirir"
   },
@@ -2580,7 +2580,7 @@
     "tenant-profile-details": "Tenant profili ayrıntıları",
     "no-tenant-profiles-text": "Tenant profili bulunamadı",
     "search": "Tenant profillerini ara",
-    "selected-tenant-profiles": "{ count, plural, 1 {1 tenant profili} other {# tenant profili} } seçildi",
+    "selected-tenant-profiles": "{ count, plural, =1 {1 tenant profili} other {# tenant profili} } seçildi",
     "no-tenant-profiles-matching": "'{{entity}}' ile eşleşen tenant profili bulunamadı.",
     "tenant-profile-required": "Tenant profili gerekli",
     "idCopiedMessage": "Tenant profili kimliği panoya kopyalandı",
@@ -2595,7 +2595,7 @@
     "default": "Varsayılan",
     "delete-tenant-profile-title": "'{{tenantProfileName}}' tenant profilini silmek istediğinizden emin misiniz?",
     "delete-tenant-profile-text": "Dikkatli olun, onaydan sonra tenant profili ve ilgili tüm veriler kurtarılamaz hale gelecektir.",
-    "delete-tenant-profiles-title": "{ count, plural, 1 {1 tenant profilini} other {# tenant profilini} } silmek istediğinizden emin misiniz?",
+    "delete-tenant-profiles-title": "{ count, plural, =1 {1 tenant profilini} other {# tenant profilini} } silmek istediğinizden emin misiniz?",
     "delete-tenant-profiles-text": "Dikkatli olun, onaydan sonra seçilen tüm tenant profilleri kaldırılacak ve ilgili tüm veriler kurtarılamaz hale gelecektir.",
     "set-default-tenant-profile-title": "Tenant profilini '{{tenantProfileName}}' varsayılan yapmak istediğinizden emin misiniz?",
     "set-default-tenant-profile-text": "Onaydan sonra tenant profili varsayılan olarak işaretlenecek ve profili belirtilmemiş yeni tenantlar için kullanılacaktır.",
@@ -2675,10 +2675,10 @@
     "max-created-alarms-range": "Oluşturulan maksimum alarm sayısı negatif olamaz"
   },
   "timeinterval": {
-    "seconds-interval": "{ seconds, plural, 1 {1 saniye} other {# saniye} }",
-    "minutes-interval": "{ minutes, plural, 1 {1 dakika} other {# dakika} }",
-    "hours-interval": "{ hours, plural, 1 {1 saat} other {# saat} }",
-    "days-interval": "{ days, plural, 1 {1 gün} other {# gün} }",
+    "seconds-interval": "{ seconds, plural, =1 {1 saniye} other {# saniye} }",
+    "minutes-interval": "{ minutes, plural, =1 {1 dakika} other {# dakika} }",
+    "hours-interval": "{ hours, plural, =1 {1 saat} other {# saat} }",
+    "days-interval": "{ days, plural, =1 {1 gün} other {# gün} }",
     "days": "Gün",
     "hours": "Saat",
     "minutes": "Dakika",
@@ -2713,10 +2713,10 @@
     "days": "Gün"
   },
   "timewindow": {
-    "days": "{ days, plural, 1 { gün } other {# gün } }",
-    "hours": "{ hours, plural, 0 { saat } 1 {1 saat } other {# saat } }",
-    "minutes": "{ minutes, plural, 0 { dakika } 1 {1 dakika } other {# dakika } }",
-    "seconds": "{ seconds, plural, 0 { saniye } 1 {1 saniye } other {# saniye } }",
+    "days": "{ days, plural, =1 { gün } other {# gün } }",
+    "hours": "{ hours, plural, =0 { saat } =1 {1 saat } other {# saat } }",
+    "minutes": "{ minutes, plural, =0 { dakika } =1 {1 dakika } other {# dakika } }",
+    "seconds": "{ seconds, plural, =0 { saniye } =1 {1 saniye } other {# saniye } }",
     "realtime": "Gerçek zaman",
     "history": "Tarih",
     "last-prefix": "son",
@@ -2744,8 +2744,8 @@
     "user-details": "Kullanıcı detayları",
     "delete-user-title": "'{{userEmail}}' kullanıcısını silmek istediğinize emin misiniz?",
     "delete-user-text": "UYARI: Onaylandıktan sonra kullanıcı ve ilişkili tüm verileri geri yüklenemez şekilde silinecektir.",
-    "delete-users-title": "{ count, plural, 1 {1 kullanıcıyı} other {# kullanıcıyı} } sikmek istediğinize emin misiniz?",
-    "delete-users-action-title": "{ count, plural, 1 {1 kullancıyı} other {# kullanıcıyı} } sil",
+    "delete-users-title": "{ count, plural, =1 {1 kullanıcıyı} other {# kullanıcıyı} } sikmek istediğinize emin misiniz?",
+    "delete-users-action-title": "{ count, plural, =1 {1 kullancıyı} other {# kullanıcıyı} } sil",
     "delete-users-text": "UYARI: Onaylandıktan sonra kullanıcı ve ilişkili tüm verileri geri yüklenemez şekilde silinecektir.",
     "activation-email-sent-message": "Etkinleştirme e-postası başarılı bir şekilde gönderildi!",
     "resend-activation": "Etkinleştirme e-postasını yeniden gönder",
@@ -2771,7 +2771,7 @@
     "login-as-tenant-admin": "Tenant Yönetici Girişi",
     "login-as-customer-user": "Kullanıcı olarak giriş yap",
     "search": "Kullanıcı ara",
-    "selected-users": "{ count, plural, 1 {1 kullanıcı} other {# kullanıcı} } seçildi",
+    "selected-users": "{ count, plural, =1 {1 kullanıcı} other {# kullanıcı} } seçildi",
     "disable-account": "Kullanıcı Hesabını Devre Dışı Bırak",
     "enable-account": "Kullanıcı Hesabını Etkinleştir",
     "enable-account-message": "Kullanıcı hesabı başarıyla etkinleştirildi!",
@@ -2910,8 +2910,8 @@
     "widgets-bundle-details": "Gösterge paketi detayları",
     "delete-widgets-bundle-title": "'{{widgetsBundleTitle}}' isimli gösterge paketini silmek istediğinize emin misiniz?",
     "delete-widgets-bundle-text": "UYARI: Onaylandıktan sonra gösterge paketi ve ilişkili tüm veriler geri yüklenemez şekilde silinecektir.",
-    "delete-widgets-bundles-title": "{ count, plural, 1 {1 gösterge paketini} other {# gösterge paketini} } silmek istediğinize emin misiniz?",
-    "delete-widgets-bundles-action-title": "{ count, plural, 1 {1 gösterge paketini} other {# gösterge paketini} } sil",
+    "delete-widgets-bundles-title": "{ count, plural, =1 {1 gösterge paketini} other {# gösterge paketini} } silmek istediğinize emin misiniz?",
+    "delete-widgets-bundles-action-title": "{ count, plural, =1 {1 gösterge paketini} other {# gösterge paketini} } sil",
     "delete-widgets-bundles-text": "UYARI: Onaylandıktan sonra seçili tüm gösterge paketleri ve ilişkili tüm veriler geri yüklenemez şekilde silinecektir.",
     "no-widgets-bundles-matching": "'{{widgetsBundle}}' ile eşleşen gösterge paketi bulunamadı.",
     "widgets-bundle-required": "Gösterge paketi gerekli.",
@@ -2923,7 +2923,7 @@
     "widgets-bundle-file": "Gösterge paketi dosyası",
     "invalid-widgets-bundle-file-error": "Gösterge paketi içe aktarılamadı: Geçersiz gösterge paketi veri yapısı.",
     "search": "Gösterge paketi ara",
-    "selected-widgets-bundles": "{ count, plural, 1 {1 gösterge paketi} other {# gösterge paketi} } seçildi",
+    "selected-widgets-bundles": "{ count, plural, =1 {1 gösterge paketi} other {# gösterge paketi} } seçildi",
     "open-widgets-bundle": "Gösterge paketlerini aç",
     "loading-widgets-bundles": "Gösterge paketleri yükleniyor..."
   },
@@ -2954,7 +2954,7 @@
     "display-timewindow": "Zaman penceresini göster",
     "display-legend": "Lejant göster",
     "datasources": "Veri kaynakları",
-    "maximum-datasources": "En fazla { count, plural, 1 {1 veri kaynağı kullanılabilir.} other {# veri kaynağı kullanılabilir} }",
+    "maximum-datasources": "En fazla { count, plural, =1 {1 veri kaynağı kullanılabilir.} other {# veri kaynağı kullanılabilir} }",
     "datasource-type": "Tür",
     "datasource-parameters": "Parametreler",
     "remove-datasource": "Veri kaynağını kaldır",
diff --git a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
index 1522a03731..99a09485ce 100644
--- a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
+++ b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
@@ -192,17 +192,17 @@
         "acknowledge": "Прийняти",
         "clear": "Деактивувати",
         "search": "Шукати сигнали тривоги",
-        "selected-alarms": "{ count, plural, 1 {1 сигнал тривоги} other {# сигнали тривоги} } вибрані",
+        "selected-alarms": "{ count, plural, =1 {1 сигнал тривоги} other {# сигнали тривоги} } вибрані",
         "no-data": "Немає даних для відображення",
         "polling-interval": "Інтервал опитування (сек)",
         "polling-interval-required": "Необхідно задати інтервал опитування.",
         "min-polling-interval-message": "Дозволяється щонайменше 1 секунда інтервалу очікування.",
-        "aknowledge-alarms-title": "Підтвердити { count, plural, 1 {1 сигнал тривоги} other {# сигнали тривоги} }",
-        "aknowledge-alarms-text": "Ви впевнені, що хочете підтвердити { count, plural, 1 {1 сигнал тривоги} other {# сигнали тривоги} }?",
+        "aknowledge-alarms-title": "Підтвердити { count, plural, =1 {1 сигнал тривоги} other {# сигнали тривоги} }",
+        "aknowledge-alarms-text": "Ви впевнені, що хочете підтвердити { count, plural, =1 {1 сигнал тривоги} other {# сигнали тривоги} }?",
         "aknowledge-alarm-title": "Підтвердити сигнал тривоги",
         "aknowledge-alarm-text": "Ви впевнені, що хочете підтвердити сигнал тривоги?",
-        "clear-alarms-title": "Деактивувати { count, plural, 1 {1 сигнал тривоги} other {# сигнали тривоги} }",
-        "clear-alarms-text": "Ви впевнені, що хочете деактивувати { count, plural, 1 {1 сигнал тривоги} other {# сигнали тривоги} }?",
+        "clear-alarms-title": "Деактивувати { count, plural, =1 {1 сигнал тривоги} other {# сигнали тривоги} }",
+        "clear-alarms-text": "Ви впевнені, що хочете деактивувати { count, plural, =1 {1 сигнал тривоги} other {# сигнали тривоги} }?",
         "clear-alarm-title": "Деактивувати сигнал тривоги",
         "clear-alarm-text": "Ви впевнені, що хочете деактивувати сигнал тривоги?",
         "alarm-status-filter": "Фільтр статусу сигналу тривоги",
@@ -301,15 +301,15 @@
         "add-asset-text": "Додати новий актив",
         "asset-details": "Інформація про актив",
         "assign-assets": "Надати активи",
-        "assign-assets-text": "Надати { count, plural, 1 {1 актив} other {# активи} } клієнту",
+        "assign-assets-text": "Надати { count, plural, =1 {1 актив} other {# активи} } клієнту",
         "delete-assets": "Видалити активи",
         "unassign-assets": "Позбавити активів",
-        "unassign-assets-action-title": "Позбавити { count, plural, 1 {1 актив} other {# активи} } клієнта",
+        "unassign-assets-action-title": "Позбавити { count, plural, =1 {1 актив} other {# активи} } клієнта",
         "assign-new-asset": "Надати новий актив",
         "delete-asset-title": "Ви впевнені, що хочете видалити актив '{{assetName}}'?",
         "delete-asset-text": "Будьте обережні, після підтвердження, актив і всі пов'язані з ним дані буде втрачено",
-        "delete-assets-title": "Ви впевнені, що хочете видалити { count, plural, 1 {1 актив} other {# активи} }?",
-        "delete-assets-action-title": "Видалити{ count, plural, 1 {1 актив} other {# активи} }",
+        "delete-assets-title": "Ви впевнені, що хочете видалити { count, plural, =1 {1 актив} other {# активи} }?",
+        "delete-assets-action-title": "Видалити{ count, plural, =1 {1 актив} other {# активи} }",
         "delete-assets-text": "Будьте обережні, після підтвердження всі вибрані об'єкти буде видалено, і всі пов'язані з ними дані буде втрачено.",
         "make-public-asset-title": "Ви дійсно хочете, щоб актив '{{assetName}}' був загальнодоступним?",
         "make-public-asset-text": "Після підтвердження, актив і всі його дані будуть доступними для інших.",
@@ -318,7 +318,7 @@
         "unassign-asset-title": "Ви впевнені, що хочете позбавити активу '{{assetName}}'?",
         "unassign-asset-text": "Після підтвердження клієнт буде позбавлений активу. Дані активу не будуть доступні клієнту.",
         "unassign-asset": "Позбавити активу",
-        "unassign-assets-title": "Ви впевнені, що хочете позбавити активів { count, plural, 1 {1 актив} other {# активи} }?",
+        "unassign-assets-title": "Ви впевнені, що хочете позбавити активів { count, plural, =1 {1 актив} other {# активи} }?",
         "unassign-assets-text": "Після підтвердження, клієнт буде позбавлений усіх вибраних активів. Дані активів не будуть доступні клієнту.",
         "copyId": "Копіювати Id активу",
         "idCopiedMessage": "Id активу був скопійований у буфер обміну",
@@ -326,13 +326,13 @@
         "no-assets-matching": "Не знайдено жодних активів, що відповідають'{{entity}}'.",
         "asset-required": "Необхідно задати актив",
         "name-starts-with": "Назва активу починається з",
-        "selected-assets": "{ count, plural, 1 {1 актив} other {# активи} } selected",
+        "selected-assets": "{ count, plural, =1 {1 актив} other {# активи} } selected",
         "search": "Пошук активів",
         "select-group-to-add": "Виберіть цільову групу, щоб додати вибрані активи",
         "select-group-to-move": "Виберіть цільову групу для переміщення вибраних активів",
-        "remove-assets-from-group": "Ви впевнені, що хочете видалити { count, plural, 1 {1 актив} other {# актив} } з групи '{entityGroup}'?",
+        "remove-assets-from-group": "Ви впевнені, що хочете видалити { count, plural, =1 {1 актив} other {# актив} } з групи '{entityGroup}'?",
         "group": "Група активів",
-        "list-of-groups": "{ count, plural, 1 {Одна група активів} other {Список # груп активів} }",
+        "list-of-groups": "{ count, plural, =1 {Одна група активів} other {Список # груп активів} }",
         "group-name-starts-with": "Групи активів, чиї імена починаються з '{{prefix}}'",
         "import": "Імпортувати активи",
         "asset-file": "Файл з активами",
@@ -353,7 +353,7 @@
         "key-required": "Ключ атрибута обов'язковий.",
         "value": "Значення",
         "value-required": "Значення атрибута обов'язкове.",
-        "delete-attributes-title": "Ви впевнені, що хочете видалити { count, plural, 1 {1 attribute} other {# attributes} }?",
+        "delete-attributes-title": "Ви впевнені, що хочете видалити { count, plural, =1 {1 attribute} other {# attributes} }?",
         "delete-attributes-text": "Будьте обережні, після підтвердження, всі виділені атрибути будуть видалені.",
         "delete-attributes": "Видалити атрибути",
         "enter-attribute-value": "Введіть значення атрибута",
@@ -363,8 +363,8 @@
         "prev-widget": "Попередній віджет",
         "add-to-dashboard": "Додати до інформаційної панелі",
         "add-widget-to-dashboard": "Додати віджет до інформаційної панелі",
-        "selected-attributes": "{ count, plural, 1 {1 attribute} other {# attributes} } selected ...вибрані вибрати",
-        "selected-telemetry": "{ count, plural, 1 {1 telemetry unit} other {# telemetry units} } selected"
+        "selected-attributes": "{ count, plural, =1 {1 attribute} other {# attributes} } selected ...вибрані вибрати",
+        "selected-telemetry": "{ count, plural, =1 {1 telemetry unit} other {# telemetry units} } selected"
     },
     "audit-log": {
         "audit": "Операція",
@@ -444,11 +444,11 @@
         "management": "Управління перетворювачами даних",
         "add-converter-text": "Додати новий перетворювач даних",
         "no-converters-text": "Перетворювачів даних не знайдено",
-        "selected-converters": "{ count, plural, 1 {1 перетворювач даних} other {# перетворювачі даних} } вибраний",
+        "selected-converters": "{ count, plural, =1 {1 перетворювач даних} other {# перетворювачі даних} } вибраний",
         "delete-converter-title": "Ви впевнені, що хочете видалити перетворювач даних '{{converterName}}'?",
         "delete-converter-text": "Будьте обережні, після підтвердження, перетворювач даних та всі пов'язані з ним дані,стануть недоступними).",
-        "delete-converters-title": "Ви впевнені, що хочете видалити{ count, plural, 1 {1 перетворювач даних} other {# перетворювачі даних} }?",
-        "delete-converters-action-title": "Видалити { count, plural, 1 {1 перетворювач даних} other {# перетворювачі даних} }",
+        "delete-converters-title": "Ви впевнені, що хочете видалити{ count, plural, =1 {1 перетворювач даних} other {# перетворювачі даних} }?",
+        "delete-converters-action-title": "Видалити { count, plural, =1 {1 перетворювач даних} other {# перетворювачі даних} }",
         "delete-converters-text": "Будьте обережні, після підтвердження всі вибрані перетворювачі даних буде видалено, і всі пов'язані з ними дані буде втрачено.",
         "events": "Події",
         "add": "Додати перетворювач даних",
@@ -521,8 +521,8 @@
         "customer-details": "Інформація про клієнта",
         "delete-customer-title": "Ви впевнені, що хочете видалити клієнта '{{customerTitle}}'?",
         "delete-customer-text": "Будьте обережні, після підтвердження, клієнт та всі пов'язані з ним дані, стануть недоступними.",
-        "delete-customers-title": "Ви впевнені, що хочете видалити {count, plural, 1 {1 клієнт} other {# клієнти} }?",
-        "delete-customers-action-title": "Видалити{ count, plural, 1 {1 клієнт} other {# клієнти} }",
+        "delete-customers-title": "Ви впевнені, що хочете видалити {count, plural, =1 {1 клієнт} other {# клієнти} }?",
+        "delete-customers-action-title": "Видалити{ count, plural, =1 {1 клієнт} other {# клієнти} }",
         "delete-customers-text": "Будьте обережні, після підтвердження, всі вибрані клієнти будуть видалені і всі пов'язані з ними дані, стануть недоступними.",
         "manage-users": "Керування користувачами",
         "manage-assets": "Керування активами",
@@ -538,13 +538,13 @@
         "select-customer": "Виберіть клієнта",
         "no-customers-matching": "Клієнтів, які відповідають  '{{entity}}' не знайдено.",
         "customer-required": "Необхідно задати клієнта",
-        "selected-customers": "{ count, plural, 1 {1 клієнт} other {# клієнти} } вибрано",
+        "selected-customers": "{ count, plural, =1 {1 клієнт} other {# клієнти} } вибрано",
         "search": "Пошук клієнтів",
         "select-group-to-add": "Виберіть цільову групу, щоб додати вибраних клієнтів",
         "select-group-to-move": "Виберіть цільову групу для переміщення вибраних клієнтів",
-        "remove-customers-from-group": "Ви впевнені, що хочете видалити{ count, plural, 1 {1 клієнт} other {# клієнти} } з групи'{entityGroup}'?",
+        "remove-customers-from-group": "Ви впевнені, що хочете видалити{ count, plural, =1 {1 клієнт} other {# клієнти} } з групи'{entityGroup}'?",
         "group": "Група клієнтів",
-        "list-of-groups": "{ count, plural, 1 {Одна група клієнтів} other {Список # груп клієнтів} }",
+        "list-of-groups": "{ count, plural, =1 {Одна група клієнтів} other {Список # груп клієнтів} }",
         "group-name-starts-with": "Групи клієнтів, імена яких починаються з '{{prefix}}'",
         "select-default-customer": "Вибрати клієнта за замовчуванням",
         "default-customer": "Клієнт за замовчуванням",
@@ -605,20 +605,20 @@
         "add-dashboard-text": "Додати нову панель приладів",
         "assign-dashboards": "Призначити панель приладів",
         "assign-new-dashboard": "Призначити нову панель приладів",
-        "assign-dashboards-text": "Призначити { count, plural, 1 {1 панель приладів} other {# панелі приладів} } користувачам",
-        "unassign-dashboards-action-text": "Позбавити { count, plural, 1 {1 палелі приладів} other {# панелей приладів} } клієнтів",
+        "assign-dashboards-text": "Призначити { count, plural, =1 {1 панель приладів} other {# панелі приладів} } користувачам",
+        "unassign-dashboards-action-text": "Позбавити { count, plural, =1 {1 палелі приладів} other {# панелей приладів} } клієнтів",
         "delete-dashboards": "Видалити панель приладів",
         "unassign-dashboards": "Позбавити панелей приладів",
-        "unassign-dashboards-action-title": "Позбавити { count, plural, 1 {1 палелі приладів} other {# панелей приладів} } клієнтів",
+        "unassign-dashboards-action-title": "Позбавити { count, plural, =1 {1 палелі приладів} other {# панелей приладів} } клієнтів",
         "delete-dashboard-title": "Ви впевнені, що хочете видалити панель приладів '{{назва панелі приладів}}'?",
         "delete-dashboard-text": "Будьте обережні, після підтвердження, панель приладів і всі пов'язані з нею дані стануть недоступними.",
-        "delete-dashboards-title": "Ви впевнені, що хочете видалити { count, plural, 1 {1 панель приладів} other {# панелі приладів} }?",
-        "delete-dashboards-action-title": "Видалити { count, plural, 1 {1 панель приладів} other {# панелі приладів} }",
+        "delete-dashboards-title": "Ви впевнені, що хочете видалити { count, plural, =1 {1 панель приладів} other {# панелі приладів} }?",
+        "delete-dashboards-action-title": "Видалити { count, plural, =1 {1 панель приладів} other {# панелі приладів} }",
         "delete-dashboards-text": "Будьте обережні, після підтвердження, всі вибрані панелі приладів буде видалено, і всі пов'язані з ними дані стануть недоступними.",
         "unassign-dashboard-title": "Ви впевнені, що хочете позбавити панелі приладів '{{назва інформаційної панелі}}'?",
         "unassign-dashboard-text": "Після підтвердження, клієнт буде позбавлений панелі приладів. Панель приладів і пов'язані з нею дані будуть недоступні клієнтові.",
         "unassign-dashboard": "Позбавити панелі приладів",
-        "unassign-dashboards-title": "Ви впевнені, що хочете позбавити { count, plural, 1 {1 панелі приладів} other {# панелей приладів} }?",
+        "unassign-dashboards-title": "Ви впевнені, що хочете позбавити { count, plural, =1 {1 панелі приладів} other {# панелей приладів} }?",
         "unassign-dashboards-text": "Після підтвердження, клієтн буде позбавлений усіх вибраних панелей приладів і даних, які з ними пов'язані.",
         "public-dashboard-title": "Панель приладів тепер публічна",
         "public-dashboard-text": "Ваша панель приладів <b>{{dashboardTitle}}</b> тепер публічна і доступна іншим <a href='{{publicLink}}' target='_blank'>link</a>:",
@@ -700,7 +700,7 @@
         "manage-states": "Керування станами панелі візуалізації",
         "states": "Стани панелі візуалізації",
         "search-states": "Пошук станів панелі візуалізації",
-        "selected-states": "{ count, plural, 1 {1 dashboard state} other {# dashboard states} } вибрано",
+        "selected-states": "{ count, plural, =1 {1 dashboard state} other {# dashboard states} } вибрано",
         "edit-state": "Редагувати стан панелі візуалізації",
         "delete-state": "Видалити стан панелі візуалізації ",
         "add-state": "Додати стан панелі візуалізації",
@@ -734,11 +734,11 @@
         "alarm": "Поля сигнала тривоги",
         "timeseries-required": "Необхідно вказати Телеметрія.",
         "timeseries-or-attributes-required": "Необхідно вказати телеметрію/атрибути.",
-        "maximum-timeseries-or-attributes": "Максимальні { count, plural, 1 {1 телеметрія/атрибут дозволені.} other {# телеметрія/атрибути дозволені} }",
+        "maximum-timeseries-or-attributes": "Максимальні { count, plural, =1 {1 телеметрія/атрибут дозволені.} other {# телеметрія/атрибути дозволені} }",
         "alarm-fields-required": "Необхідно вказати поля сигнала тривоги.",
         "function-types": "Типи функцій",
         "function-types-required": "Необхідно вказати типи функцій.",
-        "maximum-function-types": "Maximum { count, plural, 1 {1 function type is allowed.} other {# function types are allowed} }",
+        "maximum-function-types": "Maximum { count, plural, =1 {1 function type is allowed.} other {# function types are allowed} }",
         "time-description": "мітка часу поточного значення;",
         "value-description": "поточне значення;",
         "prev-value-description": "результат попереднього виклику функції;",
@@ -797,11 +797,11 @@
         "manage-credentials": "Керування авторизаційними даними",
         "delete": "Видалити пристрій",
         "assign-devices": "Призначити пристрої",
-        "assign-devices-text": "Призначити { count, plural, 1 {1 пристрій} other {# пристрої} } клієнту",
+        "assign-devices-text": "Призначити { count, plural, =1 {1 пристрій} other {# пристрої} } клієнту",
         "delete-devices": "Видалити пристрої",
         "unassign-from-customer": "Позбавити клієнта пристроїв",
         "unassign-devices": "Позбавити пристроїв",
-        "unassign-devices-action-title": "Позбавити клієнта { count, plural, 1 {1 пристрою} other {# пристроїв} }",
+        "unassign-devices-action-title": "Позбавити клієнта { count, plural, =1 {1 пристрою} other {# пристроїв} }",
         "assign-new-device": "Призначити новий пристрій",
         "make-public-device-title": "Ви впевнені, що хочете зробити пристрій '{{deviceName}}' публічним?",
         "make-public-device-text": "Після підтвердження пристрій і всі його дані будуть публічними та доступними для інших.",
@@ -810,13 +810,13 @@
         "view-credentials": "Переглянути авторизаційні дані",
         "delete-device-title": "Ви впевнені, що хочете видалити пристрій '{{deviceName}}'?",
         "delete-device-text": "Будьте обережні, після підтвердження, пристрій і всі пов'язані з ним дані стануть недоступними.",
-        "delete-devices-title": "Ви впевнені, що хочете видалити { count, plural, 1 {1 пристрій} other {# пристрої} }?",
-        "delete-devices-action-title": "Видалити { count, plural, 1 {1 пристрій} other {# пристрої} }",
+        "delete-devices-title": "Ви впевнені, що хочете видалити { count, plural, =1 {1 пристрій} other {# пристрої} }?",
+        "delete-devices-action-title": "Видалити { count, plural, =1 {1 пристрій} other {# пристрої} }",
         "delete-devices-text": "Будьте обережні, після підтвердження, всі вибрані пристрої будуть видалені, і всі пов'язані з ними дані стануть недоступними.",
         "unassign-device-title": "Ви впевнені, що хочете позбавити пристрою '{{deviceName}}'?",
         "unassign-device-text": "Після підтвердження, клієнт буде позбавлений пристрою.",
         "unassign-device": "Позбавити пристою",
-        "unassign-devices-title": "Ви впевненені, що хочете позбавити { count, plural, 1 {1 пристрою} other {# пристроїв} }?",
+        "unassign-devices-title": "Ви впевненені, що хочете позбавити { count, plural, =1 {1 пристрою} other {# пристроїв} }?",
         "unassign-devices-text": "Після підтвердження, клієнт буде позбавлений пристрою і пристрій стане не доступним клієнту",
         "device-credentials": "Авторизаційні дані прстрою",
         "credentials-type": "Тип авторизаційних даних",
@@ -851,13 +851,13 @@
         "select-device": "Виберіть пристрій",
         "import": "Імпортувати пристрої",
         "device-file": "Файл з пристроями",
-        "selected-devices": "{ count, plural, 1 {1 пристрій} other {# пристрої} } вибрано",
+        "selected-devices": "{ count, plural, =1 {1 пристрій} other {# пристрої} } вибрано",
         "search": "Шукати пристрої",
         "select-group-to-add": "Виберіть цільову групу, щоб додати вибраний пристрій",
         "select-group-to-move": "Виберіть цільову групу для переміщення вибраних пристроїв",
-        "remove-devices-from-group": "Ви впевнені, що хочете видалити { count, plural, 1 {1 пристрій} other {# пристрої} } з групи '{entityGroup}'?",
+        "remove-devices-from-group": "Ви впевнені, що хочете видалити { count, plural, =1 {1 пристрій} other {# пристрої} } з групи '{entityGroup}'?",
         "group": "Група пристроїв",
-        "list-of-groups": "{ count, plural, 1 {Одна група пристроїв} other {Список # груп пристроїв} }",
+        "list-of-groups": "{ count, plural, =1 {Одна група пристроїв} other {Список # груп пристроїв} }",
         "group-name-starts-with": "Групи пристроїв, імена яких починаються з '{{prefix}}'"
     },
     "dialog": {
@@ -914,64 +914,64 @@
         "type-required": "Необхідно задати тип сутності.",
         "type-device": "Пристрій",
         "type-devices": "Пристрої",
-        "list-of-devices": "{ count, plural, 1 {Один пристрій} other {Список # пристроїв} }",
+        "list-of-devices": "{ count, plural, =1 {Один пристрій} other {Список # пристроїв} }",
         "device-name-starts-with": "Пристрої, імена яких починаються з '{{prefix}}'",
         "type-asset": "Актив",
         "type-assets": "Активи",
-        "list-of-assets": "{ count, plural, 1 {Один актив} other {Список # активів} }",
+        "list-of-assets": "{ count, plural, =1 {Один актив} other {Список # активів} }",
         "asset-name-starts-with": "Активи,  імена яких починаються з '{{prefix}}'",
         "type-entity-view": "Перегляд сутності",
         "type-entity-views": "Перегляди сутності",
-        "list-of-entity-views": "{ count, plural, 1 {Один перегляд сутності} other {Список # переглядів сутності} }",
+        "list-of-entity-views": "{ count, plural, =1 {Один перегляд сутності} other {Список # переглядів сутності} }",
         "entity-view-name-starts-with": "Перегляди сутностей, імена яких починаються з '{{prefix}}'",
         "type-rule": "Правило",
         "type-rules": "Правила",
-        "list-of-rules": "{ count, plural, 1 {Одне правило} other {Список # правил} }",
+        "list-of-rules": "{ count, plural, =1 {Одне правило} other {Список # правил} }",
         "rule-name-starts-with": "Правила, імена яких починаються з '{{prefix}}'",
         "type-plugin": "Плагін",
         "type-plugins": "Плагіни",
-        "list-of-plugins": "{ count, plural, 1 {Один плагін} other {Список # плагінів} }",
+        "list-of-plugins": "{ count, plural, =1 {Один плагін} other {Список # плагінів} }",
         "plugin-name-starts-with": "Плагіни, імена яких починаються з  '{{prefix}}'",
         "type-tenant": "Власник",
         "type-tenants": "Власники",
-        "list-of-tenants": "{ count, plural, 1 {Один власник} other {Список # власників} }",
+        "list-of-tenants": "{ count, plural, =1 {Один власник} other {Список # власників} }",
         "tenant-name-starts-with": "Власники, імена яких починаються з '{{prefix}}'",
         "type-customer": "Клієнт",
         "type-customers": "Клієнти",
-        "list-of-customers": "{ count, plural, 1 {Один клієнт} other {Список # клієнтів} }",
+        "list-of-customers": "{ count, plural, =1 {Один клієнт} other {Список # клієнтів} }",
         "customer-name-starts-with": "Клієнти, імена яких починаються з '{{prefix}}'",
         "type-user": "Користувач",
         "type-users": "Користувачі",
-        "list-of-users": "{ count, plural, 1 {Один користувач} other {Список # користувачів } }",
+        "list-of-users": "{ count, plural, =1 {Один користувач} other {Список # користувачів } }",
         "user-name-starts-with": "Користувачі, імена яких починаються з '{{prefix}}'",
         "type-dashboard": "Панель візуалізації",
         "type-dashboards": "Панелі візуалізації",
-        "list-of-dashboards": "{ count, plural, 1 {Одна панель візуалізації} other {Список # панелей візуалізації} }",
+        "list-of-dashboards": "{ count, plural, =1 {Одна панель візуалізації} other {Список # панелей візуалізації} }",
         "dashboard-name-starts-with": "Панелі візуалізації, імена яких починаються з '{{prefix}}'",
         "type-alarm": "Сигнал тривоги",
         "type-alarms": "Сигнали тривоги",
-        "list-of-alarms": "{ count, plural, 1 {Один сигнал тривоги} other {Список # сигналів тривоги} }",
+        "list-of-alarms": "{ count, plural, =1 {Один сигнал тривоги} other {Список # сигналів тривоги} }",
         "alarm-name-starts-with": "Сигнали тривоги, імена яких починаються  '{{prefix}}'",
         "type-rulechain": "Ланцюжок правил",
         "type-rulechains": "Ланцюжки правил",
-        "list-of-rulechains": "{ count, plural, 1 {Один ланцюжок правил} other {Список # ланцюжків правил} }",
+        "list-of-rulechains": "{ count, plural, =1 {Один ланцюжок правил} other {Список # ланцюжків правил} }",
         "rulechain-name-starts-with": "Правило ланцюжків, імена яких починаються '{{prefix}}'",
         "type-scheduler-event": "Scheduler event",
         "type-scheduler-events": "Scheduler events",
-        "list-of-scheduler-events": "{ count, plural, 1 {One scheduler event} other {List of # scheduler events} }",
+        "list-of-scheduler-events": "{ count, plural, =1 {One scheduler event} other {List of # scheduler events} }",
         "scheduler-event-name-starts-with": "Scheduler events whose names start with '{{prefix}}'",
         "type-blob-entity": "Blob entity",
         "type-blob-entities": "Blob entities",
-        "list-of-blob-entities": "{ count, plural, 1 {One blob entity} other {List of # blob entities} }",
+        "list-of-blob-entities": "{ count, plural, =1 {One blob entity} other {List of # blob entities} }",
         "blob-entity-name-starts-with": "Blob entities whose names start with '{{prefix}}'",
         "type-rulenode": "Правило",
         "type-rulenodes": "Правила",
-        "list-of-rulenodes": "{ count, plural, 1 {Одне правило} other {Список # правил} }",
+        "list-of-rulenodes": "{ count, plural, =1 {Одне правило} other {Список # правил} }",
         "rulenode-name-starts-with": "Список правил, імена яких починаються '{{prefix}}'",
         "type-current-customer": "Поточний клієнт",
         "type-current-tenant": "Поточний власник",
         "search": "Пошук сутностей",
-        "selected-entities": "{ count, plural, 1 {1 сутність} other {# сутності} } вибрано",
+        "selected-entities": "{ count, plural, =1 {1 сутність} other {# сутності} } вибрано",
         "entity-name": "Ім'я сутності",
         "entity-label": "Мітка сутності",
         "details": "Подробиці сутності",
@@ -981,11 +981,11 @@
         "type-entity-group": "Група сутностей",
         "type-converter": "Перетворювач даних",
         "type-converters": "Перетворювачі даних",
-        "list-of-converters": "{ count, plural, 1 {Однин перетворювач даних} other {Список # перетворювачів даних} }",
+        "list-of-converters": "{ count, plural, =1 {Однин перетворювач даних} other {Список # перетворювачів даних} }",
         "converter-name-starts-with": "Перетворювачі даних, імена яких починаються з '{{prefix}}'",
         "type-integration": "Інтеграція",
         "type-integrations": "Інтеграції",
-        "list-of-integrations": "{ count, plural, 1 {Одна інтеграція} other {Список # інтеграцій} }",
+        "list-of-integrations": "{ count, plural, =1 {Одна інтеграція} other {Список # інтеграцій} }",
         "integration-name-starts-with": "Інтеграції, імена яких починаються з '{{prefix}}'"
     },
     "entity-field": {
@@ -1033,8 +1033,8 @@
         "delete-entity-groups": "Видалити групи сутностей",
         "delete-entity-group-title": "Ви впевнені, що хочете видалити групу сутності '{{entityGroupName}}'?",
         "delete-entity-group-text": "Будьте обережні, після підтвердження, група сутностей і всі пов'язані з нею дані стануть недоступними.",
-        "delete-entity-groups-title": "Ви впевнені, що хочете видалити { count, plural, 1 {1 групу сутності} other {# групи сутностей} }?",
-        "delete-entity-groups-action-title": "Видалити { count, plural, 1 {1 групу сутності} other {# групи сутностей} }",
+        "delete-entity-groups-title": "Ви впевнені, що хочете видалити { count, plural, =1 {1 групу сутності} other {# групи сутностей} }?",
+        "delete-entity-groups-action-title": "Видалити { count, plural, =1 {1 групу сутності} other {# групи сутностей} }",
         "delete-entity-groups-text": "Будьте обережні, після підтвердження, всі виділені групи сутностей і  пов'язані з ними дані, стануть недоступними.",
         "device-groups": "Групи пристроїв",
         "asset-groups": "Групи активів",
@@ -1146,21 +1146,21 @@
         "add-entity-view-text": "Додати нове представлення сутності",
         "delete": "Видалити представлення сутності",
         "assign-entity-views": "Призначити представлення сутності",
-        "assign-entity-views-text": "Призначити { count, plural, 1 {1 представлення сутності} other {# представлення  сутностей } } клієнту",
+        "assign-entity-views-text": "Призначити { count, plural, =1 {1 представлення сутності} other {# представлення  сутностей } } клієнту",
         "delete-entity-views": "Видалити представлення сутностей",
         "unassign-from-customer": "Відкликати у клієнта",
         "unassign-entity-views": "Відкликати представлення сутностей",
-        "unassign-entity-views-action-title": "Відкликати { count, plural, 1 {1 представлення сутності} other {# представлень сутностей} } у клієнта",
+        "unassign-entity-views-action-title": "Відкликати { count, plural, =1 {1 представлення сутності} other {# представлень сутностей} } у клієнта",
         "assign-new-entity-view": "Призначити нове представлення сутності",
         "delete-entity-view-title": "Ви впевнені, що хочете видалити представлення сутності'{{entityViewName}}'?",
         "delete-entity-view-text": "Будьте обережні, після підтвердження, представлення сутності та всі пов'язані з ним дані стануть недоступними.",
-        "delete-entity-views-title": "Ви впевнені, що хочете видалити { count, plural, 1 {1 представлення сутності } other {# представлення сутностей } }?",
-        "delete-entity-views-action-title": "Видалити { count, plural, 1 {1 представлення сутності } other {# представлення сутностей } }",
+        "delete-entity-views-title": "Ви впевнені, що хочете видалити { count, plural, =1 {1 представлення сутності } other {# представлення сутностей } }?",
+        "delete-entity-views-action-title": "Видалити { count, plural, =1 {1 представлення сутності } other {# представлення сутностей } }",
         "delete-entity-views-text": "Будьте обережні, після підтвердження, всі виділені представлення сутностей та дні, пов'язані з ними стануть недоступними.",
         "unassign-entity-view-title": "Ви впевнені, що хочете відкликати представлення сутності '{{entityViewName}}'?",
         "unassign-entity-view-text": "Після підтвердження представлення сутності буде відкликане у клієнта. Дані представлення сутності не будуть доступні клієнту.",
         "unassign-entity-view": "Відкликати представлення сутності",
-        "unassign-entity-views-title": "Ви впевнені, що хочете відкликати { count, plural, 1 {1 представлення сутності} other {# представлень сутностей} }?",
+        "unassign-entity-views-title": "Ви впевнені, що хочете відкликати { count, plural, =1 {1 представлення сутності} other {# представлень сутностей} }?",
         "unassign-entity-views-text": "Після підтвердження, клієнта буде позбавлено всіх виділених представлень сутностей. Дані представлень сутностей не будуть доступні клієнту.",
         "entity-view-type": "Тип представлення сутності",
         "entity-view-type-required": "Необхідно вказати тип представлення сутності.",
@@ -1245,7 +1245,7 @@
     },
     "extension": {
         "extensions": "Розширення",
-        "selected-extensions": " вибрано { count, plural, 1 {1 розширення} other {# розширення} }",
+        "selected-extensions": " вибрано { count, plural, =1 {1 розширення} other {# розширення} }",
         "type": "Тип",
         "key": "Ключ",
         "value": "Значення",
@@ -1259,7 +1259,7 @@
         "edit": "Редагувати розширення",
         "delete-extension-title": "Ви дійсно бажаєте видалити розширення '{{extensionId}}'?",
         "delete-extension-text": "Будьте обережні, після підтвердження, розширення та всі пов'язані  з ним дані стануть недоступними.",
-        "delete-extensions-title": "Ви дійсно бажаєте видалити { count, plural, 1 {1 розширення} other {# розширення} }?",
+        "delete-extensions-title": "Ви дійсно бажаєте видалити { count, plural, =1 {1 розширення} other {# розширення} }?",
         "delete-extensions-text": "Будьте обережні, після підтвердження, всі вибрані розширення будуть видалені.",
         "converters": "Перетворювачі",
         "converter-id": "Id перетворювача",
@@ -1411,8 +1411,8 @@
     "grid": {
         "delete-item-title": "Ви впенені, що хочете видалити цей елемент?",
         "delete-item-text": "Будьте обережні, після підтвердження, цей елемент і всі пов'язані з ним дані, стануть недоступними.",
-        "delete-items-title": "Ви впенені, що хочете видалити { count, plural, 1 {1 елемент} other {# елементи} }?",
-        "delete-items-action-title": "Видалити{ count, plural, 1 {1 елемент} other {# елементи} }",
+        "delete-items-title": "Ви впенені, що хочете видалити { count, plural, =1 {1 елемент} other {# елементи} }?",
+        "delete-items-action-title": "Видалити{ count, plural, =1 {1 елемент} other {# елементи} }",
         "delete-items-text": "Будьте обережні, після підтвердження, всі виділені елементи і пов'язані з ними дані, стануть недоступними.",
         "add-item-text": "Додати новий елемент",
         "no-items-text": "Не знайдено жодного елемента",
@@ -1479,11 +1479,11 @@
         "management": "Управління інтеграціями",
         "add-integration-text": "Додати нову інтеграцію",
         "no-integrations-text": "Не знайдено жодної інтеграції",
-        "selected-integrations": "{ count, plural, 1 {1 інтеграція} other {# інтеграції} } вибрано",
+        "selected-integrations": "{ count, plural, =1 {1 інтеграція} other {# інтеграції} } вибрано",
         "delete-integration-title": "Ви впевнені, що хочете видалити інтеграцію '{{integrationName}}'?",
         "delete-integration-text": "Будьте обережні, після підтвердження інтеграція та всі пов'язані з нею дані стануть недоступними.",
-        "delete-integrations-title": "Ви впевнені, що хочете видалити { count, plural, 1 {1 інтеграцію} other {# інтеграції} }?",
-        "delete-integrations-action-title": "Видалити { count, plural, 1 {1 інтеграцію} other {# інтеграції} }",
+        "delete-integrations-title": "Ви впевнені, що хочете видалити { count, plural, =1 {1 інтеграцію} other {# інтеграції} }?",
+        "delete-integrations-action-title": "Видалити { count, plural, =1 {1 інтеграцію} other {# інтеграції} }",
         "delete-integrations-text": "Будьте обережні, після підтвердження всі вибрані інтеграції будуть видалені, і всі пов'язані з ними дані стануть недоступними.",
         "events": "Події",
         "add": "Додати інтеграцію",
@@ -1722,7 +1722,7 @@
         },
         "from-relations": "Вихідні відношення",
         "to-relations": "Вхідні відношення",
-        "selected-relations": "Вибрано { count, plural, 1 {1 відношення} other {# відношення} }",
+        "selected-relations": "Вибрано { count, plural, =1 {1 відношення} other {# відношення} }",
         "type": "Тип",
         "to-entity-type": "До типу сутності",
         "to-entity-name": "До імені сутності",
@@ -1738,11 +1738,11 @@
         "edit": "Редагувати відношення",
         "delete-to-relation-title": "Ви впевнені, що хочете видалити відношення до сутності '{{entityName}}'?",
         "delete-to-relation-text": "Будьте обережні, після підтвердження, сутність '{{entityName}}' не буде пов'язана з поточним об'єктом.",
-        "delete-to-relations-title": "Ви впевнені, що хочете видалити  { count, plural, 1 {1 відношення} other {# відношення} }?",
+        "delete-to-relations-title": "Ви впевнені, що хочете видалити  { count, plural, =1 {1 відношення} other {# відношення} }?",
         "delete-to-relations-text": "Будьте обережні, після підтвердження, всі вибрані відношення стануть не пов'язані з поточною сутністю.",
         "delete-from-relation-title": "Ви впевнені, що хочете видалити зв'язок, який йде від сутності '{{entityName}}'?",
         "delete-from-relation-text": "Будьте обережні, після підтвердження поточна сутність буде відв'язана від сутності '{{entityName}}'.",
-        "delete-from-relations-title": "Ви впевнені, що хочете видалити { count, plural, 1 {1 відношення} other {# відношення} }?",
+        "delete-from-relations-title": "Ви впевнені, що хочете видалити { count, plural, =1 {1 відношення} other {# відношення} }?",
         "delete-from-relations-text": "Будьте обережні, після підтвердження, всі вибрані відношення будуть видалені, а поточна сутність стане не зв'язаною з відповідними сутностями.",
         "remove-relation-filter": "Видалити фільтр відношення",
         "add-relation-filter": "Додати фільтр відношення",
@@ -1765,8 +1765,8 @@
         "set-root-rulechain-text": "Після підтвердження ланцюг правил стане основним і буде обробляти всі вхідні транспортні повідомлення.",
         "delete-rulechain-title": "Ви впевнені, що хочете видалити ланцюг правил '{{ruleChainName}}'?",
         "delete-rulechain-text": "Будьте обережні, після підтвердження ланцюг правил і всі пов'язані з ним дані стануть недоступними.",
-        "delete-rulechains-title": "Ви впевнені, що хочете видалити { count, plural, 1 {1 ланцюг правил} other {# ланцюги правил} }?",
-        "delete-rulechains-action-title": "Видалити{ count, plural, 1 {1 ланцюг правил} other {# ланцюги правил} }",
+        "delete-rulechains-title": "Ви впевнені, що хочете видалити { count, plural, =1 {1 ланцюг правил} other {# ланцюги правил} }?",
+        "delete-rulechains-action-title": "Видалити{ count, plural, =1 {1 ланцюг правил} other {# ланцюги правил} }",
         "delete-rulechains-text": "Будьте обережні, після підтвердження, вибрані ланцюги правил і всі пов'язані з ними дані стануть недоступними.",
         "add-rulechain-text": "Додати новий ланцюг правил",
         "no-rulechains-text": "Ланцюг правил не знайдено",
@@ -1871,10 +1871,10 @@
         "edit-scheduler-event": "Редагувати подію",
         "delete-scheduler-event": "Видалити подію",
         "no-scheduler-events": "Не знайдено жодних запланованих подій",
-        "selected-scheduler-events": "{ count, plural, 1 {1 запланована подія} other {# заплановані події} } вибрано",
+        "selected-scheduler-events": "{ count, plural, =1 {1 запланована подія} other {# заплановані події} } вибрано",
         "delete-scheduler-event-title": "Ви впевнені, що хочете видалити подію '{{schedulerEventName}}'?",
         "delete-scheduler-event-text": "Будьте обережні, після підтвердження подія і всі пов'язані з нею дані стануть недоступними.",
-        "delete-scheduler-events-title": "Ви впевнені, що хочете видалити { count, plural, 1 {1 запланована подія} other {# заплановані події} }?",
+        "delete-scheduler-events-title": "Ви впевнені, що хочете видалити { count, plural, =1 {1 запланована подія} other {# заплановані події} }?",
         "delete-scheduler-events-text": "Будьте обережні, після підтвердження всі вибрані події будуть видалені, і всі пов'язані з ними дані стануть недоступними.",
         "create": "Створити подію планувальника",
         "edit": "Змінити подію планувальника",
@@ -2019,8 +2019,8 @@
         "tenant-details": "Подробиці про власника",
         "delete-tenant-title": "Ви впевнені, що хочете видалити власника'{{tenantTitle}}'?",
         "delete-tenant-text": "Будьте обережні, після підтвердження власник і всі пов'язані з ним дані стануть недоступними.",
-        "delete-tenants-title": "Ви впевнені, що хочете видалити { count, plural, 1 {1 власник} other {# власники} }?",
-        "delete-tenants-action-title": "Видалити { count, plural, 1 {1 власник} other {# власники} }",
+        "delete-tenants-title": "Ви впевнені, що хочете видалити { count, plural, =1 {1 власник} other {# власники} }?",
+        "delete-tenants-action-title": "Видалити { count, plural, =1 {1 власник} other {# власники} }",
         "delete-tenants-text": "Будьте обережні, після підтвердження, усі вибрані власники будуть видалені, і всі пов'язані з ними дані стануть недоступними.",
         "title": "Назва",
         "title-required": "Необхідно вказати назву.",
@@ -2032,14 +2032,14 @@
         "select-tenant": "Вибрати власника",
         "no-tenants-matching": "Не знайдено жодних власників, які відповідають '{{entity}}'.",
         "tenant-required": "Необхідно вказати власника",
-        "selected-tenants": "{ count, plural, 1 {1 власник} other {# власники} } вибрано",
+        "selected-tenants": "{ count, plural, =1 {1 власник} other {# власники} } вибрано",
         "search": "Пошук власників"
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, 1 {1 секунда} other {# секунди} }",
-        "minutes-interval": "{ minutes, plural, 1 {1 хвилина} other {# хвилини} }",
-        "hours-interval": "{ hours, plural, 1 {1 година} other {# години} }",
-        "days-interval": "{ days, plural, 1 {1 день} other {# дні} }",
+        "seconds-interval": "{ seconds, plural, =1 {1 секунда} other {# секунди} }",
+        "minutes-interval": "{ minutes, plural, =1 {1 хвилина} other {# хвилини} }",
+        "hours-interval": "{ hours, plural, =1 {1 година} other {# години} }",
+        "days-interval": "{ days, plural, =1 {1 день} other {# дні} }",
         "days": "Дні",
         "hours": "Години",
         "minutes": "Хвилини",
@@ -2047,10 +2047,10 @@
         "advanced": "Додатково"
     },
     "timewindow": {
-        "days": "{ days, plural, 1 { день } other {# дні } }",
-        "hours": "{ hours, plural, 0 { годин } 1 {1 година } other {# години } }",
-        "minutes": "{ minutes, plural, 0 { хвилин } 1 {1 хвилина } other {# хвилини } }",
-        "seconds": "{ seconds, plural, 0 { секунд } 1 {1 секунда } other {# секунди } }",
+        "days": "{ days, plural, =1 { день } other {# дні } }",
+        "hours": "{ hours, plural, =0 { годин } =1 {1 година } other {# години } }",
+        "minutes": "{ minutes, plural, =0 { хвилин } =1 {1 хвилина } other {# хвилини } }",
+        "seconds": "{ seconds, plural, =0 { секунд } =1 {1 секунда } other {# секунди } }",
         "realtime": "Реальний час",
         "history": "Історія",
         "last-prefix": "Останнє",
@@ -2077,8 +2077,8 @@
         "user-details": "Подробиці про користувача",
         "delete-user-title": "Ви впевнені, що хочете видалити користувача'{{userEmail}}'?",
         "delete-user-text": "Будьте обережні, після підтвердження, користувач і всі пов'язані з ним дані стануть недоступними.",
-        "delete-users-title": "Ви впевнені, що хочете видалити { count, plural, 1 {1 користувача} other {# користувачів} }?",
-        "delete-users-action-title": "Видалити { count, plural, 1 {1 користувача} other {# користувачів} }",
+        "delete-users-title": "Ви впевнені, що хочете видалити { count, plural, =1 {1 користувача} other {# користувачів} }?",
+        "delete-users-action-title": "Видалити { count, plural, =1 {1 користувача} other {# користувачів} }",
         "delete-users-text": "Будьте обережні, після підтвердження, усіх виділених користувачів буде видалено, і всі пов'язані з ними дані стануть недоступними.",
         "activation-email-sent-message": "Активаційний лист успішно надіслано!",
         "resend-activation": "Повторно надіслати активаційного листа",
@@ -2100,7 +2100,7 @@
         "activation-link-text": "Для активації користувача, скористайтеся наступним <a href='{{activationLink}}' target='_blank'>посиланням</a> :",
         "copy-activation-link": "Скопіювати активаційне посилання ",
         "activation-link-copied-message": "Посилання на активацію користувача було скопійовано в буфер обміну",
-        "selected-users": "{ count, plural, 1 {1 користувач} other {# користувачі} } вибрано",
+        "selected-users": "{ count, plural, =1 {1 користувач} other {# користувачі} } вибрано",
         "search": "Пошук користувачів",
         "details": "Подробиці",
         "login-as-tenant-admin": "Увійти як адміністратор власника",
@@ -2209,8 +2209,8 @@
         "widgets-bundle-details": "Деталі пакетів віджетів",
         "delete-widgets-bundle-title": "Ви впевнені, що хочете видалити пакет віджетів '{{widgetsBundleTitle}}'?",
         "delete-widgets-bundle-text": "Будьте обережні, після підтвердження, пакети віджетів і всі пов'язані з ними дані стануть недоступними.",
-        "delete-widgets-bundles-title": "Ви впевнені, що хочете видалити { count, plural, 1 {пакет віджетів} other {# пакети віджетів} }?",
-        "delete-widgets-bundles-action-title": "Видалити { count, plural, 1 {1 пакет віджетів} other {# пакет віджетів} }",
+        "delete-widgets-bundles-title": "Ви впевнені, що хочете видалити { count, plural, =1 {пакет віджетів} other {# пакети віджетів} }?",
+        "delete-widgets-bundles-action-title": "Видалити { count, plural, =1 {1 пакет віджетів} other {# пакет віджетів} }",
         "delete-widgets-bundles-text": "Будьте обережні, після підтвердження, всі виділені пакети віджетів і всі пов'язані з ними дані стануть недоступними.",
         "no-widgets-bundles-matching": "Не знайдено жодних пакетів віджетів, які відповідають '{{widgetsBundle}}'.",
         "widgets-bundle-required": "Необхідно вказати пакет віджетів.",
@@ -2249,7 +2249,7 @@
         "legend": "Легенда",
         "display-legend": "Показати легенду",
         "datasources": "Джерела даних",
-        "maximum-datasources": "Максимально { count, plural, 1 {1 дозволене джерело даних.} other {# дозволені джерела даних } }",
+        "maximum-datasources": "Максимально { count, plural, =1 {1 дозволене джерело даних.} other {# дозволені джерела даних } }",
         "datasource-type": "Тип",
         "datasource-parameters": "Параметри",
         "remove-datasource": "Видалити джерело даних",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
index 2f1d4cab96..e0272a0d55 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
@@ -428,17 +428,17 @@
         "acknowledge": "应答",
         "clear": "清除",
         "search": "查找告警",
-        "selected-alarms": "已选择 { count, plural, 1 {# 个告警} other {# 个告警} }",
+        "selected-alarms": "已选择 { count, plural, =1 {# 个告警} other {# 个告警} }",
         "no-data": "无数据显示",
         "polling-interval": "告警轮询间隔(秒)",
         "polling-interval-required": "告警轮询间隔必填。",
         "min-polling-interval-message": "轮询间隔至少是1秒。",
-        "aknowledge-alarms-title": "确认 { count, plural, 1 {# 个告警} other {# 个告警} }",
-        "aknowledge-alarms-text": "确定要确认 { count, plural, 1 {# 个告警} other {# 个告警} }吗？",
+        "aknowledge-alarms-title": "确认 { count, plural, =1 {# 个告警} other {# 个告警} }",
+        "aknowledge-alarms-text": "确定要确认 { count, plural, =1 {# 个告警} other {# 个告警} }吗？",
         "aknowledge-alarm-title": "确认告警",
         "aknowledge-alarm-text": "确定要确认告警吗？",
-        "clear-alarms-title": "清除 { count, plural, 1 {# 个告警} other {# 个告警} }",
-        "clear-alarms-text": "确定要清除 { count, plural, 1 {# 个告警} other {# 个告警} }？",
+        "clear-alarms-title": "清除 { count, plural, =1 {# 个告警} other {# 个告警} }",
+        "clear-alarms-text": "确定要清除 { count, plural, =1 {# 个告警} other {# 个告警} }？",
         "clear-alarm-title": "清除警报",
         "clear-alarm-text": "确定要清除警报吗？",
         "alarm-status-filter": "告警状态筛选器",
@@ -545,17 +545,17 @@
         "add-asset-text": "添加新资产",
         "asset-details": "资产详情",
         "assign-assets": "分配资产",
-        "assign-assets-text": "分配 { count, plural, 1 {# 个资产} other {# 个资产} } 给客户",
+        "assign-assets-text": "分配 { count, plural, =1 {# 个资产} other {# 个资产} } 给客户",
         "assign-asset-to-edge-title": "将资产分配给边缘",
         "assign-asset-to-edge-text": "请选择要分配给边缘的资产",
         "delete-assets": "删除资产",
         "unassign-assets": "取消分配资产",
-        "unassign-assets-action-title": "从客户处取消分配 { count, plural, 1 {# 个资产} other {# 个资产} }",
+        "unassign-assets-action-title": "从客户处取消分配 { count, plural, =1 {# 个资产} other {# 个资产} }",
         "assign-new-asset": "分配新资产",
         "delete-asset-title": "确定要删除资产 '{{assetName}}'吗？",
         "delete-asset-text": "请注意：确认后，资产及其所有相关数据将不可恢复。",
-        "delete-assets-title": "确定要删除 { count, plural, 1 {# 个资产} other {# 个资产} }吗？",
-        "delete-assets-action-title": "删除 { count, plural, 1 {# 个资产} other {# 个资产} }",
+        "delete-assets-title": "确定要删除 { count, plural, =1 {# 个资产} other {# 个资产} }吗？",
+        "delete-assets-action-title": "删除 { count, plural, =1 {# 个资产} other {# 个资产} }",
         "delete-assets-text": "请注意：确认后，所有选定的资产将被删除，所有相关的数据将不可恢复。",
         "make-public-asset-title": "确定要将资产 '{{assetName}}' 设为公开吗？",
         "make-public-asset-text": "确认后，资产及其所有数据将被公开并被他人访问。",
@@ -564,7 +564,7 @@
         "unassign-asset-title": "确定要取消对'{{assetName}}'资产的分配吗？",
         "unassign-asset-text": "确认后，资产将未分配，客户无法访问。",
         "unassign-asset": "未分配资产",
-        "unassign-assets-title": "确定要取消分配 { count, plural, 1 {# 个资产} other {# 个资产} }吗？",
+        "unassign-assets-title": "确定要取消分配 { count, plural, =1 {# 个资产} other {# 个资产} }吗？",
         "unassign-assets-text": "确认后，所有选定的资产将被分配，客户无法访问。",
         "unassign-assets-from-edge": "取消分配边缘",
         "copyId": "复制资产ID",
@@ -582,9 +582,9 @@
         "unassign-asset-from-edge": "取消分配边缘",
         "unassign-asset-from-edge-title": "确定要取消对'{{assetName}}'资产的分配吗？",
         "unassign-asset-from-edge-text": "确认后，所有选定的资产将被分配，边缘无法访问。",
-        "unassign-assets-from-edge-title": "确定要取消分配 { count, plural, 1 {1 资产} other {# 个资产} }吗？",
+        "unassign-assets-from-edge-title": "确定要取消分配 { count, plural, =1 {1 资产} other {# 个资产} }吗？",
         "unassign-assets-from-edge-text": "确认后，所有选定的资产将被分配，边缘无法访问。",
-        "selected-assets": "已选择 { count, plural, 1 {# 个资产} other {# 个资产} }"
+        "selected-assets": "已选择 { count, plural, =1 {# 个资产} other {# 个资产} }"
     },
     "attribute": {
         "attributes": "属性",
@@ -601,7 +601,7 @@
         "key-required": "属性键必填。",
         "value": "数值",
         "value-required": "属性值必填。",
-        "delete-attributes-title": "确定要删除 { count, plural, 1 {# 个属性} other {# 个属性} }吗？",
+        "delete-attributes-title": "确定要删除 { count, plural, =1 {# 个属性} other {# 个属性} }吗？",
         "delete-attributes-text": "注意,确认后所有选中的属性都会被删除。",
         "delete-attributes": "删除属性",
         "enter-attribute-value": "输入属性值",
@@ -611,8 +611,8 @@
         "prev-widget": "上一个部件",
         "add-to-dashboard": "添加到仪表板",
         "add-widget-to-dashboard": "将部件添加到仪表板",
-        "selected-attributes": "已选择{ count, plural, 1 {# 个属性} other {# 个属性} }",
-        "selected-telemetry": "已选择 { count, plural, 1 {# 遥测} other {# 遥测} }",
+        "selected-attributes": "已选择{ count, plural, =1 {# 个属性} other {# 个属性} }",
+        "selected-telemetry": "已选择 { count, plural, =1 {# 遥测} other {# 遥测} }",
         "no-attributes-text": "未找到属性",
         "no-telemetry-text": "未找到遥测数据"
     },
@@ -789,8 +789,8 @@
         "customer-details": "客户详情",
         "delete-customer-title": "确定要删除客户'{{customerTitle}}'吗？",
         "delete-customer-text": "请注意：确认后，客户及其所有相关数据将不可恢复。",
-        "delete-customers-title": "确定要删除 { count, plural, 1 {# 个客户} other {# 个客户} }吗？",
-        "delete-customers-action-title": "删除 { count, plural, 1 {# 个客户} other {# 个客户} }",
+        "delete-customers-title": "确定要删除 { count, plural, =1 {# 个客户} other {# 个客户} }吗？",
+        "delete-customers-action-title": "删除 { count, plural, =1 {# 个客户} other {# 个客户} }",
         "delete-customers-text": "请注意：确认后，所有选定的客户将被删除，所有相关数据将不可恢复。",
         "manage-users": "管理用户",
         "manage-assets": "管理资产",
@@ -811,7 +811,7 @@
         "default-customer": "默认客户",
         "default-customer-required": "为了调试租户级别上的仪表板，需要默认客户。",
         "search": "查找客户",
-        "selected-customers": "已选择 { count, plural, 1 {# 个客户} other {# 个客户} }",
+        "selected-customers": "已选择 { count, plural, =1 {# 个客户} other {# 个客户} }",
         "edges": "客户边缘实例",
         "manage-edges": "管理边缘"
     },
@@ -863,20 +863,20 @@
         "add-dashboard-text": "添加新的仪表板",
         "assign-dashboards": "分配仪表板",
         "assign-new-dashboard": "分配新的仪表板",
-        "assign-dashboards-text": "分配 { count, plural, 1 {# 个仪表板} other {# 个仪表板} } 给客户",
-        "unassign-dashboards-action-text": "取消分配 { count, plural, 1 {# 个仪表板} other {# 个仪表板} } 给客户",
+        "assign-dashboards-text": "分配 { count, plural, =1 {# 个仪表板} other {# 个仪表板} } 给客户",
+        "unassign-dashboards-action-text": "取消分配 { count, plural, =1 {# 个仪表板} other {# 个仪表板} } 给客户",
         "delete-dashboards": "删除仪表板",
         "unassign-dashboards": "取消分配仪表板",
-        "unassign-dashboards-action-title": "取消分配此客户 { count, plural, 1 {# 个仪表板} other {# 个仪表板} }",
+        "unassign-dashboards-action-title": "取消分配此客户 { count, plural, =1 {# 个仪表板} other {# 个仪表板} }",
         "delete-dashboard-title": "确定要删除仪表板 '{{dashboardTitle}}'吗？",
         "delete-dashboard-text": "请注意：确认后，仪表板及其所有相关数据将不可恢复。",
-        "delete-dashboards-title": "确定要删除 { count, plural, 1 {# 个仪表板} other {# 个仪表板} }吗？",
-        "delete-dashboards-action-title": "删除 { count, plural, 1 {# 个仪表板} other {# 个仪表板} }",
+        "delete-dashboards-title": "确定要删除 { count, plural, =1 {# 个仪表板} other {# 个仪表板} }吗？",
+        "delete-dashboards-action-title": "删除 { count, plural, =1 {# 个仪表板} other {# 个仪表板} }",
         "delete-dashboards-text": "请注意：确认后，所有选定的仪表板将被删除，所有相关数据将不可恢复。",
         "unassign-dashboard-title": "确定要取消分配仪表板 '{{dashboardTitle}}'吗？",
         "unassign-dashboard-text": "确认后，面板将被取消分配，客户将无法访问。",
         "unassign-dashboard": "取消分配仪表板",
-        "unassign-dashboards-title": "确定要取消分配仪表板 { count, plural, 1 {# 个仪表板} other {# 个仪表板} } 吗？",
+        "unassign-dashboards-title": "确定要取消分配仪表板 { count, plural, =1 {# 个仪表板} other {# 个仪表板} } 吗？",
         "unassign-dashboards-text": "确认后，所有选定的仪表板将被取消分配，客户将无法访问。",
         "public-dashboard-title": "仪表板现已公开",
         "public-dashboard-text": "仪表板 <b>{{dashboardTitle}}</b> 已被公开，可通过如下 <a href='{{publicLink}}' target='_blank'>链接</a>访问:",
@@ -972,7 +972,7 @@
         "manage-states": "仪表板状态管理",
         "states": "仪表板状态",
         "search-states": "仪表板状态检索",
-        "selected-states": "已选择 { count, plural, 1 {# 个仪表板状态} other {# 个仪表板状态} }",
+        "selected-states": "已选择 { count, plural, =1 {# 个仪表板状态} other {# 个仪表板状态} }",
         "edit-state": "仪表板状态编辑",
         "delete-state": "删除仪表板状态",
         "add-state": "添加仪表板状态",
@@ -991,11 +991,11 @@
         "select-state": "选择目标状态",
         "state-controller": "状态控制",
         "search": "查找仪表板",
-        "selected-dashboards": "已选择 { count, plural, 1 {# 个仪表盘} other {# 个仪表盘} }",
+        "selected-dashboards": "已选择 { count, plural, =1 {# 个仪表盘} other {# 个仪表盘} }",
         "home-dashboard": "首页仪表板",
         "home-dashboard-hide-toolbar": "隐藏首页仪表板工具栏",
         "unassign-dashboard-from-edge-text": "确认后，所有选定的仪表板将被取消分配，边缘将无法访问。",
-        "unassign-dashboards-from-edge-title": "确定要取消分配仪表板 { count, plural, 1 {# 个仪表板} other {# 个仪表板} } 吗？",
+        "unassign-dashboards-from-edge-title": "确定要取消分配仪表板 { count, plural, =1 {# 个仪表板} other {# 个仪表板} } 吗？",
         "unassign-dashboards-from-edge-text": "确认后，所有选定的仪表板将被取消分配，边缘将无法访问。",
         "assign-dashboard-to-edge": "将仪表板分配给边缘",
         "assign-dashboard-to-edge-text": "请选择要分配给边缘的仪表板",
@@ -1018,7 +1018,7 @@
         "timeseries-required": "实体 Timeseries 必填。",
         "timeseries-or-attributes-required": "实体 Timeseries/属性必填。",
         "alarm-fields-timeseries-or-attributes-required": "告警字段或实体 Timeseries/属性必填。",
-        "maximum-timeseries-or-attributes": "最多允许 { count, plural, 1 {# 个 timeseries/属性。} other {# 个 timeseries/属性。} }",
+        "maximum-timeseries-or-attributes": "最多允许 { count, plural, =1 {# 个 timeseries/属性。} other {# 个 timeseries/属性。} }",
         "alarm-fields-required": "告警字段必填。",
         "function-types": "函数类型",
         "function-type": "函数类型",
@@ -1035,7 +1035,7 @@
         "timeseries-key": "时序数据键",
         "timeseries-key-functions": "时序数据函数",
         "timeseries-key-function": "时序数据函数",
-        "maximum-function-types": "最多允许 { count, plural, 1 {# 个函数类型} other {# 个函数类型} }",
+        "maximum-function-types": "最多允许 { count, plural, =1 {# 个函数类型} other {# 个函数类型} }",
         "time-description": "当前值的时间戳；",
         "value-description": "当前值；",
         "prev-value-description": "上一次函数调用的结果；",
@@ -1114,11 +1114,11 @@
         "manage-credentials": "管理凭据",
         "delete": "删除设备",
         "assign-devices": "分配设备",
-        "assign-devices-text": "将 {count,plural,1 {# 个设备} other {# 个设备} }分配给客户",
+        "assign-devices-text": "将 {count,plural, =1 {# 个设备} other {# 个设备} }分配给客户",
         "delete-devices": "删除设备",
         "unassign-from-customer": "取消分配客户",
         "unassign-devices": "取消分配设备",
-        "unassign-devices-action-title": "取消分配此客户 {count,plural,1 {# 个设备} other {# 个设备} }",
+        "unassign-devices-action-title": "取消分配此客户 {count,plural, =1 {# 个设备} other {# 个设备} }",
         "unassign-device-from-edge-title": "确定要取消分配设备 '{{deviceName}}' 吗？",
         "unassign-device-from-edge-text": "确认后,设备将被取消分配,边缘将无法访问。",
         "unassign-devices-from-edge": "取消分配边缘",
@@ -1130,13 +1130,13 @@
         "view-credentials": "查看凭据",
         "delete-device-title": "确定要删除设备的{{deviceName}}吗？",
         "delete-device-text": "请注意：确认后，设备及其所有相关数据将不可恢复。",
-        "delete-devices-title": "确定要删除{count,plural,1 {# 个设备} other {# 个设备} } 吗？",
-        "delete-devices-action-title": "删除 {count,plural,1 {# 个设备} other {# 个设备} }",
+        "delete-devices-title": "确定要删除{count,plural, =1 {# 个设备} other {# 个设备} } 吗？",
+        "delete-devices-action-title": "删除 {count,plural, =1 {# 个设备} other {# 个设备} }",
         "delete-devices-text": "请注意：确认后，所有选定的设备将被删除，所有相关数据将不可恢复。",
         "unassign-device-title": "确定要取消分配设备 '{{deviceName}}' 吗？",
         "unassign-device-text": "确认后，设备将被取消分配，客户将无法访问。",
         "unassign-device": "取消分配设备",
-        "unassign-devices-title": "确定要取消分配 {count,plural,1 {# 个设备} other {# 个设备} } 吗？",
+        "unassign-devices-title": "确定要取消分配 {count,plural, =1 {# 个设备} other {# 个设备} } 吗？",
         "unassign-devices-text": "确认后,所有选定的设备将被取消分配,并且客户将无法访问。",
         "device-credentials": "设备凭据",
         "loading-device-credentials": "加载设备凭证...",
@@ -1217,7 +1217,7 @@
         "import": "导入设备",
         "device-file": "设备文件",
         "search": "查找设备",
-        "selected-devices": "已选择 { count, plural, 1 {# 个设备} other {# 个设备} }",
+        "selected-devices": "已选择 { count, plural, =1 {# 个设备} other {# 个设备} }",
         "device-configuration": "设备配置",
         "transport-configuration": "传输配置",
         "wizard": {
@@ -1229,7 +1229,7 @@
             "customer-to-assign-device": "客户分配设备",
             "add-credentials": "添加凭据"
         },
-        "unassign-devices-from-edge-title": "确定要取消分配  { count, plural, 1 {1 个设备} other {# 个设备} } 吗？",
+        "unassign-devices-from-edge-title": "确定要取消分配  { count, plural, =1 {1 个设备} other {# 个设备} } 吗？",
         "unassign-devices-from-edge-text": "确认后,设备将被取消分配，边缘将无法访问。"
     },
     "asset-profile": {
@@ -1241,7 +1241,7 @@
         "asset-profile-details": "资产配置详情",
         "no-asset-profiles-text": "未找到资产配置",
         "search": "搜索资产配置",
-        "selected-asset-profiles": "已选择 { count, plural, 1 {1 个资产配置} other {# 个资产配置} }",
+        "selected-asset-profiles": "已选择 { count, plural, =1 {1 个资产配置} other {# 个资产配置} }",
         "no-asset-profiles-matching": "未找到与 '{{entity}}' 匹配的资产配置。",
         "asset-profile-required": "资产配置必填",
         "idCopiedMessage": "资产配置ID已复制到剪贴板",
@@ -1262,7 +1262,7 @@
         "select-queue-hint": "从下拉列表中选择。",
         "delete-asset-profile-title": "确定要删除 '{{assetProfileName}}' 资产配置吗？",
         "delete-asset-profile-text": "请注意：确认后，资产配置和所有相关数据将不可恢复。",
-        "delete-asset-profiles-title": "确定要删除 { count, plural, 1 {1 个资产配置} other {# 个资产配置} }吗？",
+        "delete-asset-profiles-title": "确定要删除 { count, plural, =1 {1 个资产配置} other {# 个资产配置} }吗？",
         "delete-asset-profiles-text": "请注意：确认后，所有选定的资产配置将被删除，所有相关数据将不可恢复。",
         "set-default-asset-profile-title": "确定要将 '{{assetProfileName}}' 设为默认资产配置吗？",
         "set-default-asset-profile-text": "确认后，资产配置将被标记为默认，并将用于未指定配置的新资产。",
@@ -1284,7 +1284,7 @@
         "device-profile-details": "设备配置详情",
         "no-device-profiles-text": "未找到设备配置",
         "search": "查找设备配置",
-        "selected-device-profiles": "已选择 { count, plural, 1 {# 个设备配置} other {# 个设备配置} }",
+        "selected-device-profiles": "已选择 { count, plural, =1 {# 个设备配置} other {# 个设备配置} }",
         "no-device-profiles-matching": "未找到与 '{{entity}}' 匹配的设备配置。",
         "device-profile-required": "设备配置必填",
         "idCopiedMessage": "设备配置 ID 已复制到剪贴板",
@@ -1322,7 +1322,7 @@
         "select-queue-hint": "从下拉列表中选择或添加自定义名称。",
         "delete-device-profile-title": "确定要删除 '{{deviceProfileName}}' 设备配置吗？",
         "delete-device-profile-text": "请注意：确认后，设备配置和所有相关数据将不可恢复。",
-        "delete-device-profiles-title": "确定要删除 { count, plural, 1 {# 个设备配置} other {# 个设备配置} }吗？",
+        "delete-device-profiles-title": "确定要删除 { count, plural, =1 {# 个设备配置} other {# 个设备配置} }吗？",
         "delete-device-profiles-text": "请注意：确认后，所有选定的设备配置将被删除，所有相关数据将不可恢复。",
         "set-default-device-profile-title": "确定要将设备配置 '{{deviceProfileName}}' 设为默认值吗？",
         "set-default-device-profile-text": "确认后，设备配置将被标记为默认，并将用于未指定配置的新设备。",
@@ -1443,8 +1443,8 @@
         "condition-repeating-value-range": "事件计数应在1到2147483647之间。",
         "condition-repeating-value-pattern": "事件计数应为整数。",
         "condition-repeating-value-required": "事件计数值必填。",
-        "condition-repeat-times": "重复 { count, plural, 1 {# 次} other {# 次} }",
-        "condition-repeat-times-dynamic": "重复\"{ attribute }\" ({ count, plural, 1 {1 时间} other {# 时间} })",
+        "condition-repeat-times": "重复 { count, plural, =1 {# 次} other {# 次} }",
+        "condition-repeat-times-dynamic": "重复\"{ attribute }\" ({ count, plural, =1 {1 时间} other {# 时间} })",
         "schedule-type": "计划程序类型",
         "schedule-type-required": "计划类型必填。",
         "schedule": "启用规则：",
@@ -1686,7 +1686,7 @@
         "delete": "删除边缘",
         "delete-edge-title": "确定删除边缘 '{{edgeName}}'吗？",
         "delete-edge-text": "当心, 确认后，边缘以及所有关联数据将不可恢复。",
-        "delete-edges-title": "确定删除 { count, plural, 1 {1 个边缘} other {# 个边缘} }吗？",
+        "delete-edges-title": "确定删除 { count, plural, =1 {1 个边缘} other {# 个边缘} }吗？",
         "delete-edges-text": "当心, 确认后，选定的边缘以及所有关联数据将不可恢复。",
         "name": "名称",
         "name-starts-with": "边缘名称前缀",
@@ -1713,7 +1713,7 @@
         "unassign-from-customer": "取消分配客户",
         "unassign-edge-title": "确定取消分配边缘 '{{edgeName}}' 吗？",
         "unassign-edge-text": "确定后，边缘将被取消分配，并且客户将无法访问。",
-        "unassign-edges-title": "确定要取消分配 {count,plural,1 {1 个边缘} other {# 个边缘} } 吗？",
+        "unassign-edges-title": "确定要取消分配 {count,plural, =1 {1 个边缘} other {# 个边缘} } 吗？",
         "unassign-edges-text": "确定后，所有选定的边缘将被取消分配，并且客户将无法访问。",
         "make-public": "公开",
         "make-public-edge-title": "确定要将边缘 '{{edgeName}}' 设为公开吗？",
@@ -1746,7 +1746,7 @@
         "rulechain-templates": "规则链模版",
         "rulechains": "规则链",
         "search": "搜索边缘",
-        "selected-edges": "{ count, plural, 1 {1 个边缘} other {# 个边缘} } 被选中",
+        "selected-edges": "{ count, plural, =1 {1 个边缘} other {# 个边缘} } 被选中",
         "any-edge": "任何边缘",
         "no-edge-types-matching": "未找到匹配的边缘类型 '{{entitySubtype}}'。",
         "edge-type-list-empty": "没有选择边缘类型。",
@@ -1847,63 +1847,63 @@
         "type-required": "实体类型必填。",
         "type-device": "设备",
         "type-devices": "设备",
-        "list-of-devices": "{ count, plural, 1 {1 个设备} other {# 个设备} }",
+        "list-of-devices": "{ count, plural, =1 {1 个设备} other {# 个设备} }",
         "device-name-starts-with": "以 '{{prefix}}' 开头的设备",
         "type-device-profile": "设备配置",
         "type-device-profiles": "设备配置",
-        "list-of-device-profiles": "{ count, plural, 1 {1 个设备配置} other {# 个设备配置} }",
+        "list-of-device-profiles": "{ count, plural, =1 {1 个设备配置} other {# 个设备配置} }",
         "device-profile-name-starts-with": "名称以 '{{prefix}}' 开头的设备配置",
         "type-asset-profile": "资产配置",
         "type-asset-profiles": "资产配置",
-        "list-of-asset-profiles": "{ count, plural, 1 {One asset profile} other {List of # asset profiles} }",
+        "list-of-asset-profiles": "{ count, plural, =1 {One asset profile} other {List of # asset profiles} }",
         "asset-profile-name-starts-with": "Asset profiles whose names start with '{{prefix}}'",
         "type-asset": "资产",
         "type-assets": "资产",
-        "list-of-assets": "{ count, plural, 1 {1 个资产} other {# 个资产} }",
+        "list-of-assets": "{ count, plural, =1 {1 个资产} other {# 个资产} }",
         "asset-name-starts-with": "以 '{{prefix}}' 开头的资产",
         "type-entity-view": "实体视图",
         "type-entity-views": "实体视图",
-        "list-of-entity-views": "{ count, plural, 1 {1 个实体视图} other {# 个实体视图} }",
+        "list-of-entity-views": "{ count, plural, =1 {1 个实体视图} other {# 个实体视图} }",
         "entity-view-name-starts-with": "以 '{{prefix}}' 开头的实体视图",
         "type-rule": "规则",
         "type-rules": "规则",
-        "list-of-rules": "{ count, plural, 1 {1 个规则} other {# 个规则} }",
+        "list-of-rules": "{ count, plural, =1 {1 个规则} other {# 个规则} }",
         "rule-name-starts-with": "以 '{{prefix}}' 开头的规则",
         "type-plugin": "插件",
         "type-plugins": "插件",
-        "list-of-plugins": "{ count, plural, 1 {1 个插件} other {# 个插件} }",
+        "list-of-plugins": "{ count, plural, =1 {1 个插件} other {# 个插件} }",
         "plugin-name-starts-with": "以 '{{prefix}}' 开头的插件",
         "type-tenant": "租户",
         "type-tenants": "租户",
-        "list-of-tenants": "{ count, plural, 1 {1 个租户} other {# 个租户} }",
+        "list-of-tenants": "{ count, plural, =1 {1 个租户} other {# 个租户} }",
         "tenant-name-starts-with": "以 '{{prefix}}' 开头的租户",
         "type-tenant-profile": "租户简介",
         "type-tenant-profiles": "租户配置",
-        "list-of-tenant-profiles": "{ count, plural, 1 {1 个租户配置} other {# 个租户配置} }",
+        "list-of-tenant-profiles": "{ count, plural, =1 {1 个租户配置} other {# 个租户配置} }",
         "tenant-profile-name-starts-with": "名称以 '{{prefix}}' 开头的租户配置",
         "type-customer": "客户",
         "type-customers": "客户",
-        "list-of-customers": "{ count, plural, 1 {1 个客户} other {# 个客户} }",
+        "list-of-customers": "{ count, plural, =1 {1 个客户} other {# 个客户} }",
         "customer-name-starts-with": "以 '{{prefix}}' 开头的客户",
         "type-user": "用户",
         "type-users": "用户",
-        "list-of-users": "{ count, plural, 1 {1 个用户} other {# 个用户} }",
+        "list-of-users": "{ count, plural, =1 {1 个用户} other {# 个用户} }",
         "user-name-starts-with": "以 '{{prefix}}' 开头的用户",
         "type-dashboard": "仪表板",
         "type-dashboards": "仪表板",
-        "list-of-dashboards": "{ count, plural, 1 {1 个仪表板} other {# 个仪表板} }",
+        "list-of-dashboards": "{ count, plural, =1 {1 个仪表板} other {# 个仪表板} }",
         "dashboard-name-starts-with": "以 '{{prefix}}' 开头的仪表板",
         "type-alarm": "告警",
         "type-alarms": "告警",
-        "list-of-alarms": "{ count, plural, 1 {1 个告警} other {# 个告警} }",
+        "list-of-alarms": "{ count, plural, =1 {1 个告警} other {# 个告警} }",
         "alarm-name-starts-with": "以 '{{prefix}}' 开头的告警",
         "type-rulechain": "规则链",
         "type-rulechains": "规则链库",
-        "list-of-rulechains": "{ count, plural, 1 {1 个规则链} other {# 个规则链} }",
+        "list-of-rulechains": "{ count, plural, =1 {1 个规则链} other {# 个规则链} }",
         "rulechain-name-starts-with": "规则链前缀名称 '{{prefix}}'",
         "type-rulenode": "规则节点",
         "type-rulenodes": "规则节点",
-        "list-of-rulenodes": "{ count, plural, 1 {1 个规则节点} other {# 个规则节点} }",
+        "list-of-rulenodes": "{ count, plural, =1 {1 个规则节点} other {# 个规则节点} }",
         "rulenode-name-starts-with": "名称以 '{{prefix}}' 开头的规则节点",
         "type-current-customer": "当前客户",
         "type-current-tenant": "当前租户",
@@ -1911,9 +1911,9 @@
         "type-current-user-owner": "当前用户所有者",
         "type-widgets-bundle": "Widgets bundle",
         "type-widgets-bundles": "Widgets bundles",
-        "list-of-widgets-bundles": "{ count, plural, 1 {1 个部件包} other {列表 # 部件包} }",
+        "list-of-widgets-bundles": "{ count, plural, =1 {1 个部件包} other {列表 # 部件包} }",
         "search": "实体检索",
-        "selected-entities": "已选择 { count, plural, 1 {# 个实体} other {# 个实体} }",
+        "selected-entities": "已选择 { count, plural, =1 {# 个实体} other {# 个实体} }",
         "entity-name": "实体名",
         "entity-label": "实体标签",
         "details": "实体详情",
@@ -1923,7 +1923,7 @@
         "type-api-usage-state": "Api使用状态",
         "type-edge": "边缘",
         "type-edges": "边缘",
-        "list-of-edges": "{ count, plural, 1 {1 个边缘} other {列表 # 个边缘} }",
+        "list-of-edges": "{ count, plural, =1 {1 个边缘} other {列表 # 个边缘} }",
         "edge-name-starts-with": "以 '{{prefix}}' 开头的边缘",
         "type-tb-resource": "资源",
         "type-ota-package": "OTA包"
@@ -1986,21 +1986,21 @@
         "add-entity-view-text": "添加新实体视图",
         "delete": "删除实体视图",
         "assign-entity-views": "分配实体视图",
-        "assign-entity-views-text": "分配 { count, plural, 1 {# 个实体视图} other {# 个实体视图} } 给客户",
+        "assign-entity-views-text": "分配 { count, plural, =1 {# 个实体视图} other {# 个实体视图} } 给客户",
         "delete-entity-views": "删除实体视图",
         "unassign-from-customer": "取消分配客户",
         "unassign-entity-views": "取消分配实体视图",
-        "unassign-entity-views-action-title": "从客户处取消分配{count,plural,1 {# 实体视图} other {# 实体视图} }",
+        "unassign-entity-views-action-title": "从客户处取消分配{count,plural, =1 {# 实体视图} other {# 实体视图} }",
         "assign-new-entity-view": "分配新实体视图",
         "delete-entity-view-title": "确定要删除实体视图 '{{entityViewName}}'吗？",
         "delete-entity-view-text": "请注意：确认后实体视图及其所有相关数据将不可恢复。",
-        "delete-entity-views-title": "确定要删除  { count, plural, 1 {# 实体视图} other {# 实体视图} }吗？",
-        "delete-entity-views-action-title": "删除 { count, plural, 1 {# 个实体视图} other {# 个实体视图} }",
+        "delete-entity-views-title": "确定要删除  { count, plural, =1 {# 实体视图} other {# 实体视图} }吗？",
+        "delete-entity-views-action-title": "删除 { count, plural, =1 {# 个实体视图} other {# 个实体视图} }",
         "delete-entity-views-text": "请注意：确认后，所有选定的实体视图将被删除，所有相关的数据将不可恢复。",
         "unassign-entity-view-title": "确定要取消对 '{{entityViewName}}' 实体视图的分配吗？",
         "unassign-entity-view-text": "确认后，实体视图将未分配，客户无法访问。",
         "unassign-entity-view": "未分配实体视图",
-        "unassign-entity-views-title": "确定要取消分配 { count, plural, 1 {# 个实体视图} other {# 个实体视图} } 吗？",
+        "unassign-entity-views-title": "确定要取消分配 { count, plural, =1 {# 个实体视图} other {# 个实体视图} } 吗？",
         "unassign-entity-views-text": "确认后，所有选定的实体视图将被分配，客户无法访问。",
         "entity-view-type": "实体视图类型",
         "entity-view-type-required": "实体视图类型必填。",
@@ -2045,7 +2045,7 @@
         "timeseries-data": "时间序列数据",
         "timeseries-data-hint": "配置目标实体的 Timeseries 数据键,以便实体视图可以访问这些键。此 Timeseries 数据是只读的。",
         "search": "查找实体视图",
-        "selected-entity-views": "已选择 { count, plural, 1 {# 个实体视图} other {# 个实体视图} }",
+        "selected-entity-views": "已选择 { count, plural, =1 {# 个实体视图} other {# 个实体视图} }",
         "make-public-entity-view-title": "确定要将实体视图 '{{entityViewName}}' 设为公开吗？",
         "make-public-entity-view-text": "确认后，实体视图及其所有数据将被公开并被他人访问。",
         "make-private-entity-view-title": "确定要将实体视图 '{{entityViewName}}' 设为私有吗？",
@@ -2054,9 +2054,9 @@
         "assign-entity-view-to-edge-text": "请选择要分配给边缘的实体视图",
         "unassign-entity-view-from-edge-title": "确定要取消对 '{{entityViewName}}' 实体视图的分配吗？",
         "unassign-entity-view-from-edge-text": "确认后，实体视图将未分配，边缘无法访问。",
-        "unassign-entity-views-from-edge-action-title": "从边缘处取消分配{count,plural,1 {# 实体视图} other {# 实体视图} }",
+        "unassign-entity-views-from-edge-action-title": "从边缘处取消分配{count,plural, =1 {# 实体视图} other {# 实体视图} }",
         "unassign-entity-view-from-edge": "未分配实体视图",
-        "unassign-entity-views-from-edge-title": "确定要取消分配 { count, plural, 1 {# 个实体视图} other {# 个实体视图} } 吗？",
+        "unassign-entity-views-from-edge-title": "确定要取消分配 { count, plural, =1 {# 个实体视图} other {# 个实体视图} } 吗？",
         "unassign-entity-views-from-edge-text": "确认后，所有选定的实体视图将被分配，边缘无法访问。"
     },
     "event": {
@@ -2106,7 +2106,7 @@
     },
     "extension": {
         "extensions": "扩展",
-        "selected-extensions": "已选择 { count, plural, 1 {# 个扩展} other {# 个扩展} }",
+        "selected-extensions": "已选择 { count, plural, =1 {# 个扩展} other {# 个扩展} }",
         "type": "类型",
         "key": "键名",
         "value": "价值",
@@ -2120,7 +2120,7 @@
         "edit": "编辑扩展",
         "delete-extension-title": "确定要删除扩展 '{{extensionId}}'吗？",
         "delete-extension-text": "请注意：确认后，扩展和所有相关数据将不可恢复。",
-        "delete-extensions-title": "确定要删除 { count, plural, 1 {# 个扩展} other {# 个扩展} }吗？",
+        "delete-extensions-title": "确定要删除 { count, plural, =1 {# 个扩展} other {# 个扩展} }吗？",
         "delete-extensions-text": "请注意：确认后，所有选定的扩展将被删除，所有相关数据将不可恢复。",
         "converters": "转换器",
         "converter-id": "转换器序号",
@@ -2440,8 +2440,8 @@
     "grid": {
         "delete-item-title": "确定要删除此项吗？",
         "delete-item-text": "请注意，确认后，项目及其所有相关数据将不可恢复。",
-        "delete-items-title": "确定删除 { count, plural, 1 {# 项} other {# 项} }吗？",
-        "delete-items-action-title": "删除 { count, plural, 1 {# 个元素} other {# 个元素} }",
+        "delete-items-title": "确定删除 { count, plural, =1 {# 项} other {# 项} }吗？",
+        "delete-items-action-title": "删除 { count, plural, =1 {# 个元素} other {# 个元素} }",
         "delete-items-text": "请注意，确认后所有选择的项目将被删除，所有相关数据将不可恢复。",
         "add-item-text": "添加新项目",
         "no-items-text": "未找到项目",
@@ -2625,7 +2625,7 @@
         "verify-your-identity": "身份验证",
         "select-way-to-verify": "选择验证方式",
         "resend-code": "重发验证码",
-        "resend-code-wait": "{ time, plural, 1 {1 秒} other {# 秒} }后重发验证码",
+        "resend-code-wait": "{ time, plural, =1 {1 秒} other {# 秒} }后重发验证码",
         "try-another-way": "尝试其他方法",
         "totp-auth-description": "请从验证APP中查看验证码。",
         "totp-auth-placeholder": "验证码",
@@ -2653,8 +2653,8 @@
         "checksum-hint": "如果校验和为空，会自动生成",
         "checksum-algorithm": "校验和算法",
         "checksum-copied-message": "包校验和已复制到剪贴板",
-        "change-firmware": "固件的更改可能会导致 { count, plural, 1 {1 个设备} other {# 个设备} } 的更新。",
-        "change-software": "软件的更改可能会导致 { count, plural, 1 {1 个设备} other {# 个设备} } 的更新。",
+        "change-firmware": "固件的更改可能会导致 { count, plural, =1 {1 个设备} other {# 个设备} } 的更新。",
+        "change-software": "软件的更改可能会导致 { count, plural, =1 {1 个设备} other {# 个设备} } 的更新。",
         "chose-compatible-device-profile": "上传的包仅适用于具有所选配置文件的设备。",
         "chose-firmware-distributed-device": "选择将分发到设备的固件",
         "chose-software-distributed-device": "选择将分发到设备的软件",
@@ -2667,7 +2667,7 @@
         "delete-ota-update-text": "请注意：确认后，OTA升级将不可恢复。",
         "delete-ota-update-title": "确定要删除 '{{title}}' OTA升级吗？",
         "delete-ota-updates-text": "请注意：确认后，所有选中的OTA升级将被删除。",
-        "delete-ota-updates-title": "确定要删除 { count, plural, 1 {1 OTA升级} other {# OTA升级} } 吗？",
+        "delete-ota-updates-title": "确定要删除 { count, plural, =1 {1 OTA升级} other {# OTA升级} } 吗？",
         "description": "说明",
         "direct-url": "直接URL",
         "direct-url-copied-message": "包直接URL已复制到剪贴板",
@@ -2690,7 +2690,7 @@
         "package-type": "包类型",
         "packages-repository": "包仓库",
         "search": "搜索包",
-        "selected-package": "{ count, plural, 1 {1 个包} other {# 个包} } 选中",
+        "selected-package": "{ count, plural, =1 {1 个包} other {# 个包} } 选中",
         "title": "标题",
         "title-required": "标题必填。",
         "title-max-length": "标题长度必须少于256个字符",
@@ -2785,17 +2785,17 @@
         },
         "password-requirement": {
             "at-least": "至少：",
-            "character": "{ count, plural, 1 {1 位字符} other {# 位字符} }",
-            "digit": "{ count, plural, 1 {1 位数字} other {# 位数字} }",
+            "character": "{ count, plural, =1 {1 位字符} other {# 位字符} }",
+            "digit": "{ count, plural, =1 {1 位数字} other {# 位数字} }",
             "incorrect-password-try-again": "密码不正确。再试一次",
-            "lowercase-letter": "{ count, plural, 1 {1 位小写字母} other {# 位小写字母} }",
+            "lowercase-letter": "{ count, plural, =1 {1 位小写字母} other {# 位小写字母} }",
             "new-passwords-not-match": "新密码不匹配",
             "password-should-not-contain-spaces": "密码不应包含空格",
             "password-not-meet-requirements": "密码不符合要求",
             "password-requirements": "密码要求",
             "password-should-difference": "新密码应与当前密码不同",
-            "special-character": "{ count, plural, 1 {1 位特殊字符} other {# 位特殊字符} }",
-            "uppercase-letter": "{ count, plural, 1 {1 位大写字母} other {# 位大写字母} }"
+            "special-character": "{ count, plural, =1 {1 位特殊字符} other {# 位特殊字符} }",
+            "uppercase-letter": "{ count, plural, =1 {1 位大写字母} other {# 位大写字母} }"
         }
     },
     "relation": {
@@ -2811,7 +2811,7 @@
         },
         "from-relations": "向外的关联",
         "to-relations": "向内的关联",
-        "selected-relations": "已选择{ count, plural, 1 {# 个关联} other {# 个关联} }",
+        "selected-relations": "已选择{ count, plural, =1 {# 个关联} other {# 个关联} }",
         "type": "类型",
         "to-entity-type": "到实体类型",
         "to-entity-name": "到实体名称",
@@ -2828,11 +2828,11 @@
         "edit": "编辑关联",
         "delete-to-relation-title": "确定要删除实体 '{{entityName}}' 的关联吗？",
         "delete-to-relation-text": "确定删除后实体 '{{entityName}}' 将取消与当前实体的关联关系。",
-        "delete-to-relations-title": "确定要删除 { count, plural, 1 {# 个关联} other {# 个关联} }吗？",
+        "delete-to-relations-title": "确定要删除 { count, plural, =1 {# 个关联} other {# 个关联} }吗？",
         "delete-to-relations-text": "确定删除所有选择的关联关系后，与当前实体对应的所有关联关系将被移除。",
         "delete-from-relation-title": "确定要从实体 '{{entityName}}' 删除关联吗？",
         "delete-from-relation-text": "确定删除后，当前实体将与实体 '{{entityName}}' 取消关联",
-        "delete-from-relations-title": "确定删除 { count, plural, 1 {# 个关联} other {# 个关联} } 吗？",
+        "delete-from-relations-title": "确定删除 { count, plural, =1 {# 个关联} other {# 个关联} } 吗？",
         "delete-from-relations-text": "确定删除所有选择的关联关系后，当前实体将与对应的实体取消关联",
         "remove-relation-filter": "移除关联筛选器",
         "add-relation-filter": "添加关联筛选器",
@@ -2848,9 +2848,9 @@
         "delete": "删除资源",
         "delete-resource-text": "请注意：确认后，资源将不可恢复。",
         "delete-resource-title": "确定要删除资源 '{{resourceTitle}}' 吗？",
-        "delete-resources-action-title": "删除 { count, plural, 1 {# 个资源} other {# 个资源} }",
+        "delete-resources-action-title": "删除 { count, plural, =1 {# 个资源} other {# 个资源} }",
         "delete-resources-text": "请注意：确认后，所有选定的资源将被删除。",
-        "delete-resources-title": "确定要删除 { count, plural, 1 {# 个资源} other {# 个资源} }吗？",
+        "delete-resources-title": "确定要删除 { count, plural, =1 {# 个资源} other {# 个资源} }吗？",
         "download": "Download resource",
         "drop-file": "拖拽资源文件或单击以选择要上传的文件。",
         "drop-resource-file-or": "Drag and drop a resource file or",
@@ -2865,7 +2865,7 @@
         "resource-type": "资源类型",
         "resources-library": "资源库",
         "search": "查找资源",
-        "selected-resources": "已选择{ count, plural, 1 {# 个资源} other {# 个资源} }",
+        "selected-resources": "已选择{ count, plural, =1 {# 个资源} other {# 个资源} }",
         "system": "系统",
         "title": "标题",
         "title-required": "标题是必填项。",
@@ -2886,8 +2886,8 @@
         "set-root-rulechain-text": "确认后，规则链将变为根规格链，并将处理所有传入的传输消息。",
         "delete-rulechain-title": " 确定要删除规则链'{{ruleChainName}}'吗？",
         "delete-rulechain-text": "请注意，确认后，规则链和所有相关数据将不可恢复。",
-        "delete-rulechains-title": "确定要删除{count, plural, 1 { 1 个规则链} other {# 个规则链} }吗？",
-        "delete-rulechains-action-title": "删除 { count, plural, 1 {# 个规则链} other {# 个规则链} }",
+        "delete-rulechains-title": "确定要删除{count, plural, =1 { 1 个规则链} other {# 个规则链} }吗？",
+        "delete-rulechains-action-title": "删除 { count, plural, =1 {# 个规则链} other {# 个规则链} }",
         "delete-rulechains-text": "请注意：确认后，所有选定的规则链将被删除，所有相关的数据将不可恢复。",
         "add-rulechain-text": "添加新的规则链",
         "no-rulechains-text": "未找到规则链",
@@ -2909,14 +2909,14 @@
         "management": "规则集管理",
         "debug-mode": "调试模式",
         "search": "查找规则链",
-        "selected-rulechains": "已选择 { count, plural, 1 {# 个规则链} other {# 个规则链} }",
+        "selected-rulechains": "已选择 { count, plural, =1 {# 个规则链} other {# 个规则链} }",
         "open-rulechain": "打开规则链",
         "assign-new-rulechain": "Assign new rulechain",
         "edge-template-root": "模版根链",
         "assign-to-edge": "分配给边缘",
         "edge-rulechain": "边缘规则链",
         "unassign-rulechain-from-edge-text": "确认后，规则链将会取消分配，边缘无法访问。",
-        "unassign-rulechains-from-edge-title": "确定要取消分配 { count, plural, 1 {1 个规则链} other {# 个规则链} }吗？",
+        "unassign-rulechains-from-edge-title": "确定要取消分配 { count, plural, =1 {1 个规则链} other {# 个规则链} }吗？",
         "unassign-rulechains-from-edge-text": "确认后，选定的规则链将会取消分配，边缘无法访问。",
         "assign-rulechain-to-edge-title": "分配规则链给边缘",
         "assign-rulechain-to-edge-text": "请选择要分配给边缘的规则链",
@@ -3041,9 +3041,9 @@
         "submit-strategy-type-required": "提交策略类型必填。",
         "processing-strategy-type-required": "处理策略类型必填。",
         "queues": "队列",
-        "selected-queues": "已选择 { count, plural, 1 {1 个队列} other {# 个队列} }",
+        "selected-queues": "已选择 { count, plural, =1 {1 个队列} other {# 个队列} }",
         "delete-queue-title": "确定要删除 '{{queueName}}' 队列吗？",
-        "delete-queues-title": "确定要删除 { count, plural, 1 {1 个队列} other {# 个队列} }吗？",
+        "delete-queues-title": "确定要删除 { count, plural, =1 {1 个队列} other {# 个队列} }吗？",
         "delete-queue-text": "请注意：确认后，队列和所有相关数据将不可恢复。",
         "delete-queues-text": "确认后，所有选定队列都将被删除，无法访问。",
         "search": "搜索队列",
@@ -3127,8 +3127,8 @@
         "title-max-length": "标题长度必须少于256个字符",
         "delete-tenant-title": "确定要删除租户'{{tenantTitle}}'吗？",
         "delete-tenant-text": "请注意：确认后，租户和所有相关数据将不可恢复。",
-        "delete-tenants-title": "确定要删除 {count,plural,1 {# 个租户} other {# 个租户} } 吗？",
-        "delete-tenants-action-title": "删除 { count, plural, 1 {# 个租户} other {# 个租户} }",
+        "delete-tenants-title": "确定要删除 {count,plural, =1 {# 个租户} other {# 个租户} } 吗？",
+        "delete-tenants-action-title": "删除 { count, plural, =1 {# 个租户} other {# 个租户} }",
         "delete-tenants-text": "请注意：确认后，所有选定的租户将被删除，所有相关数据将不可恢复。",
         "title": "标题",
         "title-required": "标题必填。",
@@ -3141,7 +3141,7 @@
         "no-tenants-matching": "未找到匹配 '{{entity}}' 的租户",
         "tenant-required": "租户必填",
         "search": "查找租户",
-        "selected-tenants": "已选择 { count, plural, 1 {# 个租户} other {# 个租户} }",
+        "selected-tenants": "已选择 { count, plural, =1 {# 个租户} other {# 个租户} }",
         "isolated-tb-rule-engine": "使用独立的规则引擎服务",
         "isolated-tb-rule-engine-details": "每个独立租户需要单独的规则引擎微服务"
     },
@@ -3154,7 +3154,7 @@
         "no-tenant-profiles-text": "未找到租户配置",
         "name-max-length": "名称长度必须少于256个字符",
         "search": "查找租户配置",
-        "selected-tenant-profiles": "已选择 { count, plural, 1 {# 个租户配置} other {# 个租户配置} }",
+        "selected-tenant-profiles": "已选择 { count, plural, =1 {# 个租户配置} other {# 个租户配置} }",
         "no-tenant-profiles-matching": "未找到与 '{{entity}}' 匹配的租户配置。",
         "tenant-profile-required": "租户配置必填",
         "idCopiedMessage": "租户配置ID已复制到剪贴板",
@@ -3169,7 +3169,7 @@
         "default": "默认",
         "delete-tenant-profile-title": "确定要删除租户配置 '{{tenantProfileName}}'吗？",
         "delete-tenant-profile-text": "请注意：确认后，租户配置和所有相关数据将不可恢复。",
-        "delete-tenant-profiles-title": "确定要删除 { count, plural, 1 {# 个租户配置} other {# 个租户配置} }吗？",
+        "delete-tenant-profiles-title": "确定要删除 { count, plural, =1 {# 个租户配置} other {# 个租户配置} }吗？",
         "delete-tenant-profiles-text": "请注意：确认后，所有选定的租户配置将被删除，所有相关数据将不可恢复。",
         "set-default-tenant-profile-title": "确定要将租户配置 '{{tenantProfileName}}' 设为默认值吗？",
         "set-default-tenant-profile-text": "确认后，此租户配置将被标记为默认配置，并将用于未指定配置的新租户。",
@@ -3314,10 +3314,10 @@
         }
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, 1 {# 秒} other {# 秒} }",
-        "minutes-interval": "{ minutes, plural, 1 {# 分} other {# 分} }",
-        "hours-interval": "{ hours, plural, 1 {# 小时} other {# 小时} }",
-        "days-interval": "{ days, plural, 1 {# 天} other {# 天} }",
+        "seconds-interval": "{ seconds, plural, =1 {# 秒} other {# 秒} }",
+        "minutes-interval": "{ minutes, plural, =1 {# 分} other {# 分} }",
+        "hours-interval": "{ hours, plural, =1 {# 小时} other {# 小时} }",
+        "days-interval": "{ days, plural, =1 {# 天} other {# 天} }",
         "days": "天",
         "hours": "小时",
         "minutes": "分钟",
@@ -3352,10 +3352,10 @@
         "days": "天"
     },
     "timewindow": {
-        "days": "{ days, plural, 1 {# 天 } other {# 天 } }",
-        "hours": "{ hours, plural, 0 {- 小时 } 1 {# 小时 } other {# 小时 } }",
-        "minutes": "{ minutes, plural, 0 {- 分 } 1 {# 分 } other {# 分 } }",
-        "seconds": "{ seconds, plural, 0 {- 秒 } 1 {# 秒 } other {# 秒 } }",
+        "days": "{ days, plural, =1 {# 天 } other {# 天 } }",
+        "hours": "{ hours, plural, =0 {- 小时 } =1 {# 小时 } other {# 小时 } }",
+        "minutes": "{ minutes, plural, =0 {- 分 } =1 {# 分 } other {# 分 } }",
+        "seconds": "{ seconds, plural, =0 {- 秒 } =1 {# 秒 } other {# 秒 } }",
         "realtime": "实时",
         "history": "历史",
         "last-prefix": "最后",
@@ -3383,8 +3383,8 @@
         "user-details": "用户详细信息",
         "delete-user-title": "确定要删除用户 '{{userEmail}}' 吗？",
         "delete-user-text": "请注意：确认后，用户和所有相关数据将不可恢复。",
-        "delete-users-title": "确定要删除 { count, plural, 1 {# 个用户} other {# 个用户} } 吗？",
-        "delete-users-action-title": "删除  { count, plural, 1 {# 个用户} other {# 个用户} }",
+        "delete-users-title": "确定要删除 { count, plural, =1 {# 个用户} other {# 个用户} } 吗？",
+        "delete-users-action-title": "删除  { count, plural, =1 {# 个用户} other {# 个用户} }",
         "delete-users-text": "请注意：确认后，所有选定的用户将被删除，所有相关数据将不可恢复。",
         "activation-email-sent-message": "激活电子邮件已成功发送！",
         "resend-activation": "重新发送激活",
@@ -3410,7 +3410,7 @@
         "login-as-tenant-admin": "以租户管理员身份登录",
         "login-as-customer-user": "以客户用户身份登录",
         "search": "查找用户",
-        "selected-users": "已选择 { count, plural, 1 {# 个用户} other {# 个用户} }",
+        "selected-users": "已选择 { count, plural, =1 {# 个用户} other {# 个用户} }",
         "disable-account": "禁用用户帐户",
         "enable-account": "启用用户帐户",
         "enable-account-message": "已成功启用用户帐户！",
@@ -3476,7 +3476,7 @@
         "previous-difference": "上一个差异",
         "next-difference": "下一个差异",
         "current": "当前",
-        "differences": "{ count, plural, 1 {1 个差异} other {# 个差异} }",
+        "differences": "{ count, plural, =1 {1 个差异} other {# 个差异} }",
         "create-entities-version": "创建实体版本",
         "default-sync-strategy": "默认同步策略",
         "sync-strategy-merge": "合并",
@@ -3489,7 +3489,7 @@
         "no-entities-to-restore-prompt": "请指定要还原的实体",
         "add-entity-type": "添加实体类型",
         "remove-all": "全部删除",
-        "version-create-result": "{ added, plural, 0 {没有实体} 1 {1 个实体} other {# 个实体} } 被添加。<br/>{ modified, plural, 0 {没有实体} 1 {1 个实体} other {# 个实体} } 被修改。<br/>{ removed, plural, 0 {没有实体} 1 {1 个实体} other {# 个实体} } 被删除。",
+        "version-create-result": "{ added, plural, =0 {没有实体} =1 {1 个实体} other {# 个实体} } 被添加。<br/>{ modified, plural, =0 {没有实体} =1 {1 个实体} other {# 个实体} } 被修改。<br/>{ removed, plural, =0 {没有实体} =1 {1 个实体} other {# 个实体} } 被删除。",
         "remove-other-entities": "删除其他实体",
         "find-existing-entity-by-name": "按名称查找现有实体",
         "restore-entities-from-version": "从版本 '{{versionName}}' 还原实体",
@@ -3647,8 +3647,8 @@
         "widgets-bundle-details": "部件包详细信息",
         "delete-widgets-bundle-title": "确定要删除部件包 '{{widgetsBundleTitle}}'吗？",
         "delete-widgets-bundle-text": "请注意：确认后，部件包和所有相关数据将不可恢复。",
-        "delete-widgets-bundles-title": "确定要删除  { count, plural, 1 {# 个部件包} other {# 个部件包} } 吗？",
-        "delete-widgets-bundles-action-title": "删除 { count, plural, 1 {# 个部件包} other {# 个部件包} }",
+        "delete-widgets-bundles-title": "确定要删除  { count, plural, =1 {# 个部件包} other {# 个部件包} } 吗？",
+        "delete-widgets-bundles-action-title": "删除 { count, plural, =1 {# 个部件包} other {# 个部件包} }",
         "delete-widgets-bundles-text": "请注意：确认后，所有选定的部件包将被删除，所有相关数据将不可恢复。",
         "no-widgets-bundles-matching": "未找到与 '{{widgetsBundle}}' 匹配的部件包。",
         "widgets-bundle-required": "部件包必填。",
@@ -3660,7 +3660,7 @@
         "widgets-bundle-file": "部件包文件",
         "invalid-widgets-bundle-file-error": "无法导入部件包：无效的部件包数据结构。",
         "search": "查找部件包",
-        "selected-widgets-bundles": "已选择 { count, plural, 1 {# 个部件包} other {# 个部件包} }",
+        "selected-widgets-bundles": "已选择 { count, plural, =1 {# 个部件包} other {# 个部件包} }",
         "open-widgets-bundle": "打开部件包",
         "loading-widgets-bundles": "加载部件包..."
     },
@@ -3693,7 +3693,7 @@
         "legend": "图例",
         "display-legend": "显示图例",
         "datasources": "数据源",
-        "maximum-datasources": "最大允许{ count, plural, 1 {1个数据源。} other {#个数据源。} }",
+        "maximum-datasources": "最大允许{ count, plural, =1 {1个数据源。} other {#个数据源。} }",
         "timeseries-key-error": "应至少指定一个时间序列数据密钥",
         "datasource-type": "类型",
         "datasource-parameters": "参数",
@@ -4758,29 +4758,6 @@
         "items-per-page-separator": "-"
     },
     "language": {
-        "language": "语言",
-        "locales": {
-            "de_DE": "德语",
-            "fr_FR": "法语",
-            "zh_CN": "简体中文",
-            "zh_TW": "繁體中文",
-            "en_US": "英语",
-            "it_IT": "意大利语",
-            "ko_KR": "韩语",
-            "ru_RU": "俄罗斯语",
-            "es_ES": "西班牙语",
-            "es_CA": "Catalan",
-            "ja_JP": "日本語",
-            "tr_TR": "土耳其语",
-            "fa_IR": "波斯语",
-            "uk_UA": "乌克兰语",
-            "cs_CZ": "捷克语",
-            "el_GR": "希腊语",
-            "ro_RO": "罗马尼亚语",
-            "lv_LV": "拉脱维亚语",
-            "ka_GE": "格鲁吉亚语",
-            "pt_BR": "葡萄牙语",
-            "sl_SI": "斯洛文尼亚语"
-        }
+        "language": "语言"
     }
 }
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
index e5a54a6198..e911b9f319 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
@@ -474,17 +474,17 @@
         "add-asset-text": "增加新資產",
         "asset-details": "資產詳細資訊",
         "assign-assets": "分配資產",
-        "assign-assets-text": "分配 { count, plural, 1 {1 資產} other {# 資產} } 給客戶",
+        "assign-assets-text": "分配 { count, plural, =1 {1 資產} other {# 資產} } 給客戶",
         "assign-asset-to-edge-title": "將資產分配給邊緣",
         "assign-asset-to-edge-text": "請選擇要分配給邊緣的資產",
         "delete-assets": "刪除資產",
         "unassign-assets": "取消分配資產",
-        "unassign-assets-action-title": "從客戶處取消分配 { count, plural, 1 {1 資產} other {# 資產} } ",
+        "unassign-assets-action-title": "從客戶處取消分配 { count, plural, =1 {1 資產} other {# 資產} } ",
         "assign-new-asset": "分配新資產",
         "delete-asset-title": "確定要刪除資產 '{{assetName}}'?",
         "delete-asset-text": "小心！確認後資產及其所有相關資料將無法恢復。",
-        "delete-assets-title": "確定要刪除 { count, plural, 1 {1 資產} other {# 資產} }?",
-        "delete-assets-action-title": "刪除 { count, plural, 1 {1 資產} other {# 資產} }",
+        "delete-assets-title": "確定要刪除 { count, plural, =1 {1 資產} other {# 資產} }?",
+        "delete-assets-action-title": "刪除 { count, plural, =1 {1 資產} other {# 資產} }",
         "delete-assets-text": "小心，確認後，所有選擇的資產將被刪除，所有相關的資料將變得無法恢復。",
         "make-public-asset-title": "你確定你想建立公開'{{assetName}}'資產?",
         "make-public-asset-text": "確認後，資產及其所有資料將被公開並被他人存取。",
@@ -493,7 +493,7 @@
         "unassign-asset-title": "您確定要取消對'{{assetName}}'資產的分配嗎？",
         "unassign-asset-text": "確認後，資產將未分配，客戶無法存取。",
         "unassign-asset": "未分配資產",
-        "unassign-assets-title": "您確定要取消分配 { count, plural, 1 {1 資產} other {# 資產} }嗎?",
+        "unassign-assets-title": "您確定要取消分配 { count, plural, =1 {1 資產} other {# 資產} }嗎?",
         "unassign-assets-text": "確認後，所有選擇的資產將被分配，客戶無法存取。",
         "unassign-assets-from-edge": "從邊緣取消分配資產",
         "copyId": "複製資產ID",
@@ -511,9 +511,9 @@
         "unassign-asset-from-edge": "取消分配資產",
         "unassign-asset-from-edge-title": "您確定要取消分配資產'{{assetName}}'嗎？",
         "unassign-asset-from-edge-text": "確認後，資產將被取消分配，邊緣將無法訪問。",
-        "unassign-assets-from-edge-title": "您確定要取消分配 { count, plural, 1 {1 資產} other {# 資產} }?",
+        "unassign-assets-from-edge-title": "您確定要取消分配 { count, plural, =1 {1 資產} other {# 資產} }?",
         "unassign-assets-from-edge-text": "確認後，所有選定的資產都將被取消分配，邊緣將無法訪問。.",
-        "selected-assets": "{ count, plural, 1 {1 資產} other {# 資產} }被選中"
+        "selected-assets": "{ count, plural, =1 {1 資產} other {# 資產} }被選中"
     },
     "attribute": {
         "attributes": "屬性",
@@ -530,7 +530,7 @@
         "key-required": "屬性鍵必填。",
         "value": "值",
         "value-required": "屬性值必填。",
-        "delete-attributes-title": "您確定要刪除 { count, plural, 1 {1 屬性} other {# 屬性} }嗎？",
+        "delete-attributes-title": "您確定要刪除 { count, plural, =1 {1 屬性} other {# 屬性} }嗎？",
         "delete-attributes-text": "注意,確認後所有選中的屬性都會被刪除。",
         "delete-attributes": "刪除屬性",
         "enter-attribute-value": "輸入屬性值",
@@ -540,8 +540,8 @@
         "prev-widget": "上一個部件",
         "add-to-dashboard": "增加到儀表板",
         "add-widget-to-dashboard": "將部件增加到儀表板",
-        "selected-attributes": "{ count, plural, 1 {1 屬性} other {# 屬性} } 被選中",
-        "selected-telemetry": "{ count, plural, 1 {1 遙測} other {# 遙測} }被選中",
+        "selected-attributes": "{ count, plural, =1 {1 屬性} other {# 屬性} } 被選中",
+        "selected-telemetry": "{ count, plural, =1 {1 遙測} other {# 遙測} }被選中",
         "no-attributes-text": "找不到屬性",
         "no-telemetry-text": "找不到遙測"
     },
@@ -717,8 +717,8 @@
         "customer-details": "客戶詳細資訊",
         "delete-customer-title": "您確定要刪除客戶'{{customerTitle}}'嗎？",
         "delete-customer-text": "小心！確認後，客戶及其所有相關資料將無法恢復。",
-        "delete-customers-title": "您確定要刪除 { count, plural, 1 {1 客戶} other {# 客戶} }嗎？",
-        "delete-customers-action-title": "刪除 { count, plural, 1 {1 客戶} other {# 客戶} }",
+        "delete-customers-title": "您確定要刪除 { count, plural, =1 {1 客戶} other {# 客戶} }嗎？",
+        "delete-customers-action-title": "刪除 { count, plural, =1 {1 客戶} other {# 客戶} }",
         "delete-customers-text": "小心！確認後，所有選擇的客戶將被刪除，所有相關資料將無法恢復。",
         "manage-users": "管理用戶",
         "manage-assets": "管理資產",
@@ -739,7 +739,7 @@
         "default-customer": "預設客戶",
         "default-customer-required": "為了測試租戶級別上的儀表板，需要預設客戶。",
         "search": "搜尋客戶",
-        "selected-customers": "{ count, plural, 1 {1 客戶} other {# 客戶} }被選中",
+        "selected-customers": "{ count, plural, =1 {1 客戶} other {# 客戶} }被選中",
         "edges": "客戶邊緣實體物件",
         "manage-edges": "管理邊緣"
     },
@@ -791,20 +791,20 @@
         "add-dashboard-text": "增加新的儀表板",
         "assign-dashboards": "分配儀表板",
         "assign-new-dashboard": "分配新的儀表板",
-        "assign-dashboards-text": "分配 { count, plural, 1 {1 儀表板} other {# 儀表板} } 給客戶",
-        "unassign-dashboards-action-text": "未分配 { count, plural, 1 {1 儀表板} other {# 儀表板} } 給客戶",
+        "assign-dashboards-text": "分配 { count, plural, =1 {1 儀表板} other {# 儀表板} } 給客戶",
+        "unassign-dashboards-action-text": "未分配 { count, plural, =1 {1 儀表板} other {# 儀表板} } 給客戶",
         "delete-dashboards": "刪除儀表板",
         "unassign-dashboards": "取消分配儀表板",
-        "unassign-dashboards-action-title": "從客戶處取消分配 { count, plural, 1 {1 儀表板} other {# 儀表板} } ",
+        "unassign-dashboards-action-title": "從客戶處取消分配 { count, plural, =1 {1 儀表板} other {# 儀表板} } ",
         "delete-dashboard-title": "您確定要刪除儀表板 '{{dashboardTitle}}'嗎？",
         "delete-dashboard-text": "小心！確認後儀表板及其所有相關資料將無法恢復。",
-        "delete-dashboards-title": "你確定你要刪除 { count, plural, 1 {1 儀表板} other {# 儀表板} }嗎？",
-        "delete-dashboards-action-title": "刪除 { count, plural, 1 {1 儀表板} other {# 儀表板} }",
+        "delete-dashboards-title": "你確定你要刪除 { count, plural, =1 {1 儀表板} other {# 儀表板} }嗎？",
+        "delete-dashboards-action-title": "刪除 { count, plural, =1 {1 儀表板} other {# 儀表板} }",
         "delete-dashboards-text": "小心！確認後所有選擇的儀表板將被刪除，所有相關資料將無法恢復。",
         "unassign-dashboard-title": "您確定要取消分配儀表板 '{{dashboardTitle}}'嗎？",
         "unassign-dashboard-text": "確認後，面板將被取消分配，客戶將無法存取。",
         "unassign-dashboard": "取消分配儀表板",
-        "unassign-dashboards-title": "您確定要取消分配儀表板 { count, plural, 1 {1 儀表板} other {# 儀表板} } 嗎？",
+        "unassign-dashboards-title": "您確定要取消分配儀表板 { count, plural, =1 {1 儀表板} other {# 儀表板} } 嗎？",
         "unassign-dashboards-text": "確認後，所有選擇的儀表板將被取消分配，客戶將無法存取。",
         "public-dashboard-title": "儀表板現已公佈",
         "public-dashboard-text": "你的儀表板<b>{{dashboardTitle}}</b> 已被公開，可通過如下<a href='{{publicLink}}' target='_blank'>連結</a>存取:",
@@ -900,7 +900,7 @@
         "manage-states": "儀表板狀態管理",
         "states": "儀表板狀態",
         "search-states": "儀表板狀態檢索",
-        "selected-states": "{ count, plural, 1 {1 儀表板狀態} other {# 儀表板狀態} } 選中",
+        "selected-states": "{ count, plural, =1 {1 儀表板狀態} other {# 儀表板狀態} } 選中",
         "edit-state": "儀表板狀態編輯",
         "delete-state": "刪除儀表板狀態",
         "add-state": "增加儀表板狀態",
@@ -919,11 +919,11 @@
         "select-state": "選擇目標狀態",
         "state-controller": "狀態控制",
         "search": "搜尋儀表板",
-        "selected-dashboards": "{ count, plural, 1 {1 儀表板} other {# 儀表板} }被選中",
+        "selected-dashboards": "{ count, plural, =1 {1 儀表板} other {# 儀表板} }被選中",
         "home-dashboard": "主儀表板",
         "home-dashboard-hide-toolbar": "隱藏主儀表板工具欄",
         "unassign-dashboard-from-edge-text": "確認後，儀表板將被取消分配，邊緣將無法訪問。",
-        "unassign-dashboards-from-edge-title": "您確定要取消分配 { count, plural, 1 {1 儀表板} other {# 儀表板} }嗎？",
+        "unassign-dashboards-from-edge-title": "您確定要取消分配 { count, plural, =1 {1 儀表板} other {# 儀表板} }嗎？",
         "unassign-dashboards-from-edge-text": "確認後，所有選定的儀表板都將被取消分配，且邊緣將無法訪問。",
         "assign-dashboard-to-edge": "將儀表板分配給邊緣",
         "assign-dashboard-to-edge-text": "請選擇要分配給邊緣的儀表板",
@@ -946,12 +946,12 @@
         "timeseries-required": "需要設備時間序列。",
         "timeseries-or-attributes-required": "設備時間/屬性必填。",
         "alarm-fields-timeseries-or-attributes-required": "需要警告字段或實體時間序列/屬性。",
-        "maximum-timeseries-or-attributes": "最大允許 { count, plural, 1 {1 時間序列/屬性} other {# 時間序列/屬性} }",
+        "maximum-timeseries-or-attributes": "最大允許 { count, plural, =1 {1 時間序列/屬性} other {# 時間序列/屬性} }",
         "alarm-fields-required": "警告字段必填。",
         "function-types": "函數類型",
         "function-type": "函數類型",
         "function-types-required": "需要函數類型。",
-        "maximum-function-types": "至少需要 { count, plural, 1 {1 函數類型} other {# 函數類型} }",
+        "maximum-function-types": "至少需要 { count, plural, =1 {1 函數類型} other {# 函數類型} }",
         "alarm-keys": "警告資料鍵",
         "alarm-key": "警告資料鍵",
         "alarm-key-functions": "警告鍵功能",
@@ -1027,11 +1027,11 @@
         "manage-credentials": "管理憑據",
         "delete": "刪除設備",
         "assign-devices": "分配設備",
-        "assign-devices-text": "將{count,plural,1 {1 設備} other {# 設備} }分配給客戶",
+        "assign-devices-text": "將{count,plural, =1 {1 設備} other {# 設備} }分配給客戶",
         "delete-devices": "刪除設備",
         "unassign-from-customer": "取消分配客戶",
         "unassign-devices": "取消分配設備",
-        "unassign-devices-action-title": "從客戶處取消分配{count,plural,1 {1 設備} other {# 設備} }",
+        "unassign-devices-action-title": "從客戶處取消分配{count,plural, =1 {1 設備} other {# 設備} }",
         "unassign-device-from-edge-title": "您確定要取消分配設備'{{deviceName}}'嗎？",
         "unassign-device-from-edge-text": "確認後，設備將被取消分配，邊緣將無法訪問。",
         "unassign-devices-from-edge": "從邊緣取消分配設備",
@@ -1043,13 +1043,13 @@
         "view-credentials": "查看憑據",
         "delete-device-title": "您確定要刪除設備的{{deviceName}}嗎？",
         "delete-device-text": "小心！確認後設備及其所有相關資料將無法恢復。",
-        "delete-devices-title": "您確定要刪除{count,plural,1 {1 設備} other {# 設備} } 嗎？",
-        "delete-devices-action-title": "刪除 {count,plural,1 {1 設備} other {# 設備} }",
+        "delete-devices-title": "您確定要刪除{count,plural, =1 {1 設備} other {# 設備} } 嗎？",
+        "delete-devices-action-title": "刪除 {count,plural, =1 {1 設備} other {# 設備} }",
         "delete-devices-text": "小心！確認後所有選擇的設備將被刪除,所有相關資料將無法恢復。",
         "unassign-device-title": "您確定要取消分配設備 '{{deviceName}}'？",
         "unassign-device-text": "確認後,設備將被取消分配,客戶將無法存取。",
         "unassign-device": "取消分配設備",
-        "unassign-devices-title": "您確定要取消分配{count,plural,1 {1 設備} other {# 設備} } 嗎？",
+        "unassign-devices-title": "您確定要取消分配{count,plural, =1 {1 設備} other {# 設備} } 嗎？",
         "unassign-devices-text": "確認後,所有選擇的設備將被取消分配,並且客戶將無法存取。",
         "device-credentials": "設備憑據",
         "loading-device-credentials": "正在加載設備憑據...",
@@ -1130,7 +1130,7 @@
         "import": "匯入設備",
         "device-file": "設備文件",
         "search": "搜尋設備",
-        "selected-devices": "{ count, plural, 1 {1 設備} other {# 設備} }被選中",
+        "selected-devices": "{ count, plural, =1 {1 設備} other {# 設備} }被選中",
         "device-configuration": "設備配置",
         "transport-configuration": "傳輸配置",
         "wizard": {
@@ -1142,7 +1142,7 @@
             "customer-to-assign-device": "客戶指定設備",
             "add-credentials": "新增驗證資訊"
         },
-        "unassign-devices-from-edge-title": "您確定要解除邊緣設備 { count, plural, 1 {1 device} other {# devices} }的指定嗎？",
+        "unassign-devices-from-edge-title": "您確定要解除邊緣設備 { count, plural, =1 {1 device} other {# devices} }的指定嗎？",
         "unassign-devices-from-edge-text": "確認後邊緣指定設備將解除指定及其所有相關資料將無法恢復。"
     },
     "asset-profile": {
@@ -1154,7 +1154,7 @@
         "asset-profile-details": "Asset profile details",
         "no-asset-profiles-text": "No asset profiles found",
         "search": "Search asset profiles",
-        "selected-asset-profiles": "{ count, plural, 1 {1 asset profile} other {# asset profiles} } selected",
+        "selected-asset-profiles": "{ count, plural, =1 {1 asset profile} other {# asset profiles} } selected",
         "no-asset-profiles-matching": "No asset profile matching '{{entity}}' were found.",
         "asset-profile-required": "Asset profile is required",
         "idCopiedMessage": "Asset profile Id has been copied to clipboard",
@@ -1175,7 +1175,7 @@
         "select-queue-hint": "Select from a drop-down list.",
         "delete-asset-profile-title": "Are you sure you want to delete the asset profile '{{assetProfileName}}'?",
         "delete-asset-profile-text": "Be careful, after the confirmation the asset profile and all related data will become unrecoverable.",
-        "delete-asset-profiles-title": "Are you sure you want to delete { count, plural, 1 {1 asset profile} other {# asset profiles} }?",
+        "delete-asset-profiles-title": "Are you sure you want to delete { count, plural, =1 {1 asset profile} other {# asset profiles} }?",
         "delete-asset-profiles-text": "Be careful, after the confirmation all selected asset profiles will be removed and all related data will become unrecoverable.",
         "set-default-asset-profile-title": "Are you sure you want to make the asset profile '{{assetProfileName}}' default?",
         "set-default-asset-profile-text": "After the confirmation the asset profile will be marked as default and will be used for new assets with no profile specified.",
@@ -1197,7 +1197,7 @@
         "device-profile-details": "設備協議詳情",
         "no-device-profiles-text": "未找到設備協議文件",
         "search": "搜尋設備協議",
-        "selected-device-profiles": "{ count, plural, 1 {1 設備協議} other {# 設備協議} }被選中",
+        "selected-device-profiles": "{ count, plural, =1 {1 設備協議} other {# 設備協議} }被選中",
         "no-device-profiles-matching": "未找到與 '{{entity}}'匹配的設備協議。",
         "device-profile-required": "需要設備協議",
         "idCopiedMessage": "設備協議Id已複製到剪貼板",
@@ -1235,7 +1235,7 @@
         "select-queue-hint": "從下拉列表中選擇。",
         "delete-device-profile-title": "您確定要刪除 '{{deviceProfileName}}' 設備協議嗎？",
         "delete-device-profile-text": "小心！確認後此設備協議及其OTA更新的相關資料將無法恢復。",
-        "delete-device-profiles-title": "您確定要刪除設備協議標題嗎{ count, plural, 1 {1 設備協議} other {# 設備協議} }？",
+        "delete-device-profiles-title": "您確定要刪除設備協議標題嗎{ count, plural, =1 {1 設備協議} other {# 設備協議} }？",
         "delete-device-profiles-text": "小心！確認後所有選擇的設備協議及其OTA更新的相關資料將無法恢復。",
         "set-default-device-profile-title": "您確定要將 '{{deviceProfileName}}' 設為設備協議預設值嗎？",
         "set-default-device-profile-text": "確認後此預設值將將做爲未指定的新設備協議。",
@@ -1356,8 +1356,8 @@
         "condition-repeating-value-range": "事件計數應在1到2147483647的範圍內。",
         "condition-repeating-value-pattern": "事件計數應該是整數",
         "condition-repeating-value-required": "需要事件計數。",
-        "condition-repeat-times": "重複 { count, plural, 1 {1 次} other {# 次 }",
-        "condition-repeat-times-dynamic": "重複 \"{ attribute }\" ({ count, plural, 1 {1 次} other {# 次} })",
+        "condition-repeat-times": "重複 { count, plural, =1 {1 次} other {# 次 } }",
+        "condition-repeat-times-dynamic": "重複 \"{ attribute }\" ({ count, plural, =1 {1 次} other {# 次} })",
         "schedule-type": "排程類型",
         "schedule-type-required": "排程類型必填",
         "schedule": "排程",
@@ -1599,7 +1599,7 @@
         "delete": "刪除邊緣",
         "delete-edge-title": "您確定要刪除邊緣'{{edgeName}}'嗎？",
         "delete-edge-text": "小心！確認後邊緣及其所有相關資料將無法恢復。",
-        "delete-edges-title": "您確定要刪除邊緣  { count, plural, 1 {1 edge} other {# edges} } 嗎？",
+        "delete-edges-title": "您確定要刪除邊緣  { count, plural, =1 {1 edge} other {# edges} } 嗎？",
         "delete-edges-text": "小心，確認後，所有選定的邊緣將被刪除，所有相關資料將無法恢復。",
         "name": "名稱",
         "name-starts-with": "邊緣名稱始于",
@@ -1626,7 +1626,7 @@
         "unassign-from-customer": "從客戶取消分配",
         "unassign-edge-title": "您確定要取消分配邊緣'{{edgeName}}'嗎？",
         "unassign-edge-text": "確認後，邊緣將被取消分配，客戶將無法訪問。",
-        "unassign-edges-title": "您確定要取消分配 { count, plural, 1 {1 邊緣} other {# 邊緣} }嗎？",
+        "unassign-edges-title": "您確定要取消分配 { count, plural, =1 {1 邊緣} other {# 邊緣} }嗎？",
         "unassign-edges-text": "確認後，所有選定的邊緣都將被取消分配，客戶將無法訪問。",
         "make-public": "公開邊緣",
         "make-public-edge-title": "您確定要公開邊緣'{{edgeName}}' 嗎？",
@@ -1659,7 +1659,7 @@
         "rulechain-templates": "角色鏈模型",
         "rulechains": "規則鏈",
         "search": "搜尋邊緣",
-        "selected-edges": "{ count, plural, 1 {1 邊緣} other {# 邊緣} }被選中",
+        "selected-edges": "{ count, plural, =1 {1 邊緣} other {# 邊緣} }被選中",
         "any-edge": "任何邊緣",
         "no-edge-types-matching": "未找到與'{{entitySubtype}}'匹配的邊緣類型。",
         "edge-type-list-empty": "未選擇邊緣類型",
@@ -1759,55 +1759,55 @@
         "type-required": "實體類型必填。",
         "type-device": "設備",
         "type-devices": "設備",
-        "list-of-devices": "{ count, plural, 1 {一個設備} other {# 設備列表} }",
+        "list-of-devices": "{ count, plural, =1 {一個設備} other {# 設備列表} }",
         "device-name-starts-with": "以 '{{prefix}}' 開頭的設備",
         "type-asset": "資產",
         "type-assets": "資產",
-        "list-of-assets": "{ count, plural, 1 {一個資產} other {# 資產列表} }",
+        "list-of-assets": "{ count, plural, =1 {一個資產} other {# 資產列表} }",
         "asset-name-starts-with": "以 '{{prefix}}' 開頭的資產",
         "type-entity-view": "實體視圖",
         "type-entity-views": "實體視圖",
-        "list-of-entity-views": "{ count, plural, 1 {一個實體視圖} other {# 實體視圖列表} }",
+        "list-of-entity-views": "{ count, plural, =1 {一個實體視圖} other {# 實體視圖列表} }",
         "entity-view-name-starts-with": "以 '{{prefix}}' 開頭的實體視圖",
         "type-rule": "規則",
         "type-rules": "規則",
-        "list-of-rules": "{ count, plural, 1 {一個規則} other {# 規則列表} }",
+        "list-of-rules": "{ count, plural, =1 {一個規則} other {# 規則列表} }",
         "rule-name-starts-with": "以 '{{prefix}}' 開頭的規則",
         "type-plugin": "插件",
         "type-plugins": "插件",
-        "list-of-plugins": "{ count, plural, 1 {一個插件} other {# 插件列表} }",
+        "list-of-plugins": "{ count, plural, =1 {一個插件} other {# 插件列表} }",
         "tenant-name-starts-with": "名稱以 '{{prefix}}'開頭的租戶",
         "type-tenant-profile": "租戶屬性",
         "type-tenant-profiles": "租戶屬性",
-        "list-of-tenant-profiles": "{ count, plural, 1 {一個租戶屬性} other {# 租戶屬性列表} }",
+        "list-of-tenant-profiles": "{ count, plural, =1 {一個租戶屬性} other {# 租戶屬性列表} }",
         "tenant-profile-name-starts-with": "名稱以 '{{prefix}}'開頭的租戶屬性",
         "plugin-name-starts-with": "以 '{{prefix}}' 開頭的插件",
         "type-tenant": "租戶",
         "type-tenants": "租戶",
-        "list-of-tenants": "{ count, plural, 1 {一個租戶} other {# 租戶列表} }",
+        "list-of-tenants": "{ count, plural, =1 {一個租戶} other {# 租戶列表} }",
         "type-customer": "客戶",
         "type-customers": "客戶",
-        "list-of-customers": "{ count, plural, 1 {一個客戶} other {# 客戶列表} }",
+        "list-of-customers": "{ count, plural, =1 {一個客戶} other {# 客戶列表} }",
         "customer-name-starts-with": "以 '{{prefix}}' 開頭的客戶",
         "type-user": "用戶",
         "type-users": "用戶",
-        "list-of-users": "{ count, plural, 1 {一個用戶} other {# 用戶列表} }",
+        "list-of-users": "{ count, plural, =1 {一個用戶} other {# 用戶列表} }",
         "user-name-starts-with": "以 '{{prefix}}' 開頭的用戶",
         "type-dashboard": "儀表板",
         "type-dashboards": "儀表板",
-        "list-of-dashboards": "{ count, plural, 1 {一個儀表板} other {# 儀表板列表} }",
+        "list-of-dashboards": "{ count, plural, =1 {一個儀表板} other {# 儀表板列表} }",
         "dashboard-name-starts-with": "以 '{{prefix}}' 開頭的儀表板",
         "type-alarm": "警告",
         "type-alarms": "警告",
-        "list-of-alarms": "{ count, plural, 1 {一個警告} other {# 警告列表} }",
+        "list-of-alarms": "{ count, plural, =1 {一個警告} other {# 警告列表} }",
         "alarm-name-starts-with": "以 '{{prefix}}' 開頭的警告",
         "type-rulechain": "規則鏈",
         "type-rulechains": "規則鏈",
-        "list-of-rulechains": "{ count, plural, 1 {一個規則鏈} other {# 規則鏈列表} }",
+        "list-of-rulechains": "{ count, plural, =1 {一個規則鏈} other {# 規則鏈列表} }",
         "rulechain-name-starts-with": "規則鏈前綴名稱 '{{prefix}}'",
         "type-rulenode": "規則節點",
         "type-rulenodes": "規則節點",
-        "list-of-rulenodes": "{ count, plural, 1 {一個規則節點} other {# 規則節點列表} }",
+        "list-of-rulenodes": "{ count, plural, =1 {一個規則節點} other {# 規則節點列表} }",
         "rulenode-name-starts-with": "名稱以'{{prefix}}'開頭的規則節點",
         "type-current-customer": "當前客戶",
         "type-current-tenant": "當前租戶",
@@ -1815,9 +1815,9 @@
         "type-current-user-owner": "當前用戶所有者",
         "type-widgets-bundle": "部件包",
         "type-widgets-bundles": "部件包",
-        "list-of-widgets-bundles": "{ count, plural, 1 {一個部件包} other {# 部件包列表} }",
+        "list-of-widgets-bundles": "{ count, plural, =1 {一個部件包} other {# 部件包列表} }",
         "search": "實體檢索",
-        "selected-entities": "{ count, plural, 1 {1 實體} other {# 實體} } 被選中",
+        "selected-entities": "{ count, plural, =1 {1 實體} other {# 實體} } 被選中",
         "entity-name": "實體名",
         "entity-label": "實體標籤",
         "details": "實體詳細資訊",
@@ -1827,7 +1827,7 @@
         "type-api-usage-state": "api使用狀態",
         "type-edge": "邊緣",
         "type-edges": "邊緣",
-        "list-of-edges": "{ count, plural, 1 {一個邊緣} other {# 邊緣列表} }",
+        "list-of-edges": "{ count, plural, =1 {一個邊緣} other {# 邊緣列表} }",
         "edge-name-starts-with": "名稱以'{{prefix}}'開頭的邊緣",
         "type-tb-resource": "資源",
         "type-ota-package": "OTA套件"
@@ -1890,21 +1890,21 @@
         "add-entity-view-text": "增加新實體視圖",
         "delete": "刪除實體視圖",
         "assign-entity-views": "分配實體視圖",
-        "assign-entity-views-text": "分配 { count, plural, 1 {1 實體視圖} other {# 實體視圖} } 給客戶",
+        "assign-entity-views-text": "分配 { count, plural, =1 {1 實體視圖} other {# 實體視圖} } 給客戶",
         "delete-entity-views": "刪除實體視圖",
         "unassign-from-customer": "取消分配客戶",
         "unassign-entity-views": "取消分配實體視圖",
-        "unassign-entity-views-action-title": "從客戶處取消分配{count,plural,1 {1 實體視圖} other {# 實體視圖} }",
+        "unassign-entity-views-action-title": "從客戶處取消分配{count,plural, =1 {1 實體視圖} other {# 實體視圖} }",
         "assign-new-entity-view": "分配新實體視圖",
         "delete-entity-view-title": "確定要刪除實體視圖 '{{entityViewName}}'?",
         "delete-entity-view-text": "小心！確認後實體視圖及其所有相關資料將無法恢復。",
-        "delete-entity-views-title": "確定要刪除 { count, plural, 1 {1 實體視圖} other {# 實體視圖} }?",
-        "delete-entity-views-action-title": "刪除 { count, plural, 1 {1 實體視圖} other {# 實體視圖} }",
+        "delete-entity-views-title": "確定要刪除 { count, plural, =1 {1 實體視圖} other {# 實體視圖} }?",
+        "delete-entity-views-action-title": "刪除 { count, plural, =1 {1 實體視圖} other {# 實體視圖} }",
         "delete-entity-views-text": "小心，確認後，所有選擇的實體視圖將被刪除，所有相關的資料將變得無法恢復。",
         "unassign-entity-view-title": "您確定要取消對 '{{entityViewName}}'實體視圖的分配嗎？",
         "unassign-entity-view-text": "確認後，實體視圖將未分配，客戶無法存取。",
         "unassign-entity-view": "未分配實體視圖",
-        "unassign-entity-views-title": "您確定要取消分配 { count, plural, 1 {1 實體視圖} other {# 實體視圖} }嗎?",
+        "unassign-entity-views-title": "您確定要取消分配 { count, plural, =1 {1 實體視圖} other {# 實體視圖} }嗎?",
         "unassign-entity-views-text": "確認後，所有選擇的實體視圖將被分配，客戶無法存取。",
         "entity-view-type": "實體視圖類型",
         "entity-view-type-required": "實體視圖類型必填。",
@@ -1949,7 +1949,7 @@
         "timeseries-data": "時間序列資料",
         "timeseries-data-hint": "配置目標實體的時間序列資料鍵,以便實體視圖可以存取這些鍵。這個時間序列資料是只讀的。",
         "search": "搜尋實體視圖",
-        "selected-entity-views": "{ count, plural, 1 {1 實體視圖} other {# 實體視圖} } 被選中",
+        "selected-entity-views": "{ count, plural, =1 {1 實體視圖} other {# 實體視圖} } 被選中",
         "make-public-entity-view-title": "你確定你想建立公開 '{{entityViewName}}' 實體視圖?",
         "make-public-entity-view-text": "確認後，實體視圖 及其所有資料將被公開並被他人存取。",
         "make-private-entity-view-title": "你確定你想建立私有 '{{entityViewName}}' 實體視圖?",
@@ -1958,9 +1958,9 @@
         "assign-entity-view-to-edge-text": "請選擇要分配給邊緣的實體視圖",
         "unassign-entity-view-from-edge-title": "您確定要取消分配實體視圖'{{entityViewName}}'嗎？",
         "unassign-entity-view-from-edge-text": "確認後，實體視圖將被取消分配，邊緣將無法訪問。",
-        "unassign-entity-views-from-edge-action-title": "從邊緣取消分配 { count, plural, 1 {1 實體視圖} other {# 實體視圖} } ",
+        "unassign-entity-views-from-edge-action-title": "從邊緣取消分配 { count, plural, =1 {1 實體視圖} other {# 實體視圖} } ",
         "unassign-entity-view-from-edge": "取消分配實體視圖",
-        "unassign-entity-views-from-edge-title": "您確定要取消分配{ count, plural, 1 {1 實體視圖} other {# 實體視圖} }嗎？",
+        "unassign-entity-views-from-edge-title": "您確定要取消分配{ count, plural, =1 {1 實體視圖} other {# 實體視圖} }嗎？",
         "unassign-entity-views-from-edge-text": "確認後，所有選定的實體視圖都將被取消分配，並且邊緣將無法訪問。"
     },
     "event": {
@@ -2010,7 +2010,7 @@
     },
     "extension": {
         "extensions": "擴展",
-        "selected-extensions": "{ count, plural, 1 {1 擴展} other {# 擴展} } 被選擇",
+        "selected-extensions": "{ count, plural, =1 {1 擴展} other {# 擴展} } 被選擇",
         "type": "類型",
         "key": "鍵名",
         "value": "值",
@@ -2024,7 +2024,7 @@
         "edit": "編輯擴展",
         "delete-extension-title": "確實要刪除擴展名'{{extensionId}}'嗎？",
         "delete-extension-text": "小心，確認後，擴展和所有相關資料將變得無法恢復。",
-        "delete-extensions-title": "您確定要刪除 { count, plural, 1 {1 表達式} other {# 表達式} }嗎?",
+        "delete-extensions-title": "您確定要刪除 { count, plural, =1 {1 表達式} other {# 表達式} }嗎?",
         "delete-extensions-text": "小心，確認後，所有選擇的擴展將被刪除。",
         "converters": "轉換器",
         "converter-id": "轉換器序號",
@@ -2344,8 +2344,8 @@
     "grid": {
         "delete-item-title": "您確定要刪除此項嗎？",
         "delete-item-text": "注意,確認後此項及其所有相關資料將變得無法恢復。",
-        "delete-items-title": "你確定你要刪除 { count, plural, 1 {1 項} other {# 項} }嗎？",
-        "delete-items-action-title": "刪除 { count, plural, 1 {1 項} other {# 項} }",
+        "delete-items-title": "你確定你要刪除 { count, plural, =1 {1 項} other {# 項} }嗎？",
+        "delete-items-action-title": "刪除 { count, plural, =1 {1 項} other {# 項} }",
         "delete-items-text": "注意,確認後所有選擇的項目將被刪除,所有相關資料將無法恢復。",
         "add-item-text": "增加新項目",
         "no-items-text": "沒有找到項目",
@@ -2502,7 +2502,7 @@
         "verify-your-identity": "驗證您的身份",
         "select-way-to-verify": "選擇驗證方式",
         "resend-code": "重發碼",
-        "resend-code-wait": "以 { time, plural, 1 {1 秒} other {# 秒} }重新發送程式碼",
+        "resend-code-wait": "以 { time, plural, =1 {1 秒} other {# 秒} }重新發送程式碼",
         "try-another-way": "嘗試別的方式",
         "totp-auth-description": "請輸入安全驗證碼從您的驗證應用程式",
         "totp-auth-placeholder": "程式碼",
@@ -2530,8 +2530,8 @@
         "checksum-hint": "如果核對為空，將自動生成",
         "checksum-algorithm": "核對演算法",
         "checksum-copied-message": "套件核對已複製到剪貼板",
-        "change-firmware": "韌體的更改可能會導致{ count, plural, 1 {1 設備} other {# 設備} }的更新。",
-        "change-software": "軟體的更改可能會導致{ count, plural, 1 {1 設備} other {# 設備} }的更新。",
+        "change-firmware": "韌體的更改可能會導致{ count, plural, =1 {1 設備} other {# 設備} }的更新。",
+        "change-software": "軟體的更改可能會導致{ count, plural, =1 {1 設備} other {# 設備} }的更新。",
         "chose-compatible-device-profile": "上傳套件只有在所選擇的設備配置檔案獲得",
         "chose-firmware-distributed-device": "選擇將分發到設備的韌體",
         "chose-software-distributed-device": "選擇將分發到設備的軟體",
@@ -2544,7 +2544,7 @@
         "delete-ota-update-text": "小心，確認後OTA更新將無法恢復。",
         "delete-ota-update-title": "您確定要刪除OTA更新 '{{title}}'嗎？",
         "delete-ota-updates-text": "小心，確認後，所有選擇的OTA更新都將被刪除。",
-        "delete-ota-updates-title": "您確定要刪除{ count, plural, 1 {1 OTA更新} other {# OTA更新} }嗎？",
+        "delete-ota-updates-title": "您確定要刪除{ count, plural, =1 {1 OTA更新} other {# OTA更新} }嗎？",
         "description": "描述",
         "direct-url": "直接URL",
         "direct-url-copied-message": "軟體包直接URL已複製到剪貼板",
@@ -2567,7 +2567,7 @@
         "package-type": "套件類型",
         "packages-repository": "軟體包存儲庫",
         "search": "搜尋套件",
-        "selected-package": "{ count, plural, 1 {1 套件} other {# 套件} } 被選中",
+        "selected-package": "{ count, plural, =1 {1 套件} other {# 套件} } 被選中",
         "title": "標題",
         "title-required": "需要標題。",
         "title-max-length": "標題應小於256",
@@ -2658,17 +2658,17 @@
         },
         "password-requirement": {
             "at-least": "至少：",
-            "character": "{ count, plural, 1 {1 字元} other {# 字元} }",
-            "digit": "{ count, plural, 1 {1 數字} other {# 數字} }",
+            "character": "{ count, plural, =1 {1 字元} other {# 字元} }",
+            "digit": "{ count, plural, =1 {1 數字} other {# 數字} }",
             "incorrect-password-try-again": "密碼不正確。再試一次",
-            "lowercase-letter": "{ count, plural, 1 {1 小寫字母} other {# 小寫字母} }",
+            "lowercase-letter": "{ count, plural, =1 {1 小寫字母} other {# 小寫字母} }",
             "new-passwords-not-match": "新密碼不匹配",
             "password-should-not-contain-spaces": "您的密碼不應包含空格",
             "password-not-meet-requirements": "密碼不符合要求",
             "password-requirements": "密碼要求",
             "password-should-difference": "新密碼應與當前密碼不同",
-            "special-character": "{ count, plural, 1 {1 特殊字元} other {# 特殊字元} }",
-            "uppercase-letter": "{ count, plural, 1 {1 大寫字母} other {# 大寫字母} }"
+            "special-character": "{ count, plural, =1 {1 特殊字元} other {# 特殊字元} }",
+            "uppercase-letter": "{ count, plural, =1 {1 大寫字母} other {# 大寫字母} }"
         }
     },
     "relation": {
@@ -2684,7 +2684,7 @@
         },
         "from-relations": "向外的關聯",
         "to-relations": "向內的關聯",
-        "selected-relations": "{ count, plural, 1 {1 關聯} other {# 關聯} } 被選中",
+        "selected-relations": "{ count, plural, =1 {1 關聯} other {# 關聯} } 被選中",
         "type": "類型",
         "to-entity-type": "到實體類型",
         "to-entity-name": "到實體名稱",
@@ -2701,11 +2701,11 @@
         "edit": "編輯關聯",
         "delete-to-relation-title": "確定要刪除實體 '{{entityName}}' 的關聯嗎?",
         "delete-to-relation-text": "確定刪除後實體 '{{entityName}}' 將取消與當前實體的關聯關係。",
-        "delete-to-relations-title": "確定要刪除 { count, plural, 1 {1 關聯} other {# 關聯} }?",
+        "delete-to-relations-title": "確定要刪除 { count, plural, =1 {1 關聯} other {# 關聯} }?",
         "delete-to-relations-text": "確定刪除所有選擇的關聯關係後，與當前實體對應的所有關聯關係將被移除。",
         "delete-from-relation-title": "確定要從實體 '{{entityName}}' 刪除關聯嗎?",
         "delete-from-relation-text": "確定刪除後，當前實體將與實體 '{{entityName}}' 取消關聯",
-        "delete-from-relations-title": "確定刪除 { count, plural, 1 {1 關聯} other {# 關聯} } 嗎?",
+        "delete-from-relations-title": "確定刪除 { count, plural, =1 {1 關聯} other {# 關聯} } 嗎?",
         "delete-from-relations-text": "確定刪除所有選擇的關聯關係後，當前實體將與對應的實體取消關聯",
         "remove-relation-filter": "移除關聯過濾器",
         "add-relation-filter": "增加關聯過濾器",
@@ -2721,9 +2721,9 @@
         "delete": "刪除資源",
         "delete-resource-text": "小心，確認後資源將無法恢復。",
         "delete-resource-title": "您確定要刪除資源'{{resourceTitle}}'嗎？",
-        "delete-resources-action-title": "刪除 { count, plural, 1 {1 資源} other {# 資源} }",
+        "delete-resources-action-title": "刪除 { count, plural, =1 {1 資源} other {# 資源} }",
         "delete-resources-text": "請注意，所選資源，即使用於設備協議，也將被刪除。",
-        "delete-resources-title": "您確定要刪除 { count, plural, 1 {1 資源} other {# 資源} }嗎？",
+        "delete-resources-title": "您確定要刪除 { count, plural, =1 {1 資源} other {# 資源} }嗎？",
         "download": "下載資源",
         "drop-file": "拖放資源文件或單擊以選擇要上傳的文件。",
         "drop-resource-file-or": "拖放資源文件或",
@@ -2738,7 +2738,7 @@
         "resource-type": "資源類型",
         "resources-library": "資源庫",
         "search": "搜尋資源",
-        "selected-resources": "{ count, plural, 1 {1 資源} other {# 資源} } 被選中",
+        "selected-resources": "{ count, plural, =1 {1 資源} other {# 資源} } 被選中",
         "system": "系統",
         "title": "標題",
         "title-required": "需要標題。",
@@ -2762,8 +2762,8 @@
         "set-root-rulechain-text": "確認之後，規則鏈將變為根規格鏈，並將處理所有傳入的傳輸消息。",
         "delete-rulechain-title": " 確實要刪除規則鏈'{{ruleChainName}}'嗎？",
         "delete-rulechain-text": "小心，在確認規則鏈和所有相關資料將變得無法恢復。",
-        "delete-rulechains-title": "確實要刪除{count, plural, 1 { 1 規則鏈} other {# 規則鏈庫} }嗎？",
-        "delete-rulechains-action-title": "刪除 { count, plural, 1 {1 規則鏈} other {# 規則鏈庫} }",
+        "delete-rulechains-title": "確實要刪除{count, plural, =1 { 1 規則鏈} other {# 規則鏈庫} }嗎？",
+        "delete-rulechains-action-title": "刪除 { count, plural, =1 {1 規則鏈} other {# 規則鏈庫} }",
         "delete-rulechains-text": "小心，確認後，所有選擇的規則鏈將被刪除，所有相關的資料將變得無法恢復。",
         "add-rulechain-text": "增加新的規則鏈",
         "no-rulechains-text": "規則鏈沒有發現",
@@ -2891,9 +2891,9 @@
         "submit-strategy-type-required": "提交策略類型必填",
         "processing-strategy-type-required": "處理策略類型必填",
         "queues": "佇列",
-        "selected-queues": "{ count, plural, 1 {1 佇列} other {# 佇列} }被選中",
+        "selected-queues": "{ count, plural, =1 {1 佇列} other {# 佇列} }被選中",
         "delete-queue-title": "您確定要刪除佇列'{{queueName}}'嗎？",
-        "delete-queues-title": "您確定要刪除{ count, plural, 1 {1 佇列} other {# 佇列} }嗎？",
+        "delete-queues-title": "您確定要刪除{ count, plural, =1 {1 佇列} other {# 佇列} }嗎？",
         "delete-queue-text": "小心，確認後佇列和所有相關資料將無法恢復。",
         "delete-queues-text": "確認後，所有選定的佇列將被刪除且無法訪問。",
         "search": "搜尋佇列",
@@ -2977,8 +2977,8 @@
         "title-max-length": "標題應小於256",
         "delete-tenant-title": "您確定要刪除租戶'{{tenantTitle}}'嗎？",
         "delete-tenant-text": "小心！確認後，租戶和所有相關資料將無法恢復。",
-        "delete-tenants-title": "您確定要刪除 {count,plural,1 {1 租戶} other {# 租戶} } 嗎？",
-        "delete-tenants-action-title": "刪除 { count, plural, 1 {1 租戶} other {# 租戶} }",
+        "delete-tenants-title": "您確定要刪除 {count,plural, =1 {1 租戶} other {# 租戶} } 嗎？",
+        "delete-tenants-action-title": "刪除 { count, plural, =1 {1 租戶} other {# 租戶} }",
         "delete-tenants-text": "小心！確認後，所有選擇的租戶將被刪除，所有相關資料將無法恢復。",
         "title": "標題",
         "title-required": "標題必填。",
@@ -2991,7 +2991,7 @@
         "no-tenants-matching": "沒有找到符合 '{{entity}}' 的租戶",
         "tenant-required": "租戶必填",
         "search": "搜尋租戶",
-        "selected-tenants": "{ count, plural, 1 {1 租戶} other {# 租戶} } 已選中",
+        "selected-tenants": "{ count, plural, =1 {1 租戶} other {# 租戶} } 已選中",
         "isolated-tb-rule-engine": "在隔離的ThingsBoard Rule規則引擎容器中處理",
         "isolated-tb-rule-engine-details": "每個獨立租戶需要單獨的微服務"
     },
@@ -3004,7 +3004,7 @@
         "no-tenant-profiles-text": "找不到租戶屬性",
         "name-max-length": "租戶屬性名稱應小於256",
         "search": "搜尋租戶屬性",
-        "selected-tenant-profiles": "{ count, plural, 1 {1 租戶屬性} other {# 租戶屬性} } 被選中",
+        "selected-tenant-profiles": "{ count, plural, =1 {1 租戶屬性} other {# 租戶屬性} } 被選中",
         "no-tenant-profiles-matching": "找不到與'{{entity}}'匹配的租戶屬性 ",
         "tenant-profile-required": "租戶屬性為必填",
         "idCopiedMessage": "租戶屬性Id已複製到剪貼板",
@@ -3019,7 +3019,7 @@
         "default": "預設",
         "delete-tenant-profile-title": "是否確定要刪除租戶屬性 '{{tenantProfileName}}'?",
         "delete-tenant-profile-text": "小心，確認後租戶屬性及所有相關資料將變得無法恢復。",
-        "delete-tenant-profiles-title": "您確定要刪除 { count, plural, 1 {1 租戶屬性} other {# 租戶屬性} }嗎？",
+        "delete-tenant-profiles-title": "您確定要刪除 { count, plural, =1 {1 租戶屬性} other {# 租戶屬性} }嗎？",
         "delete-tenant-profiles-text": "小心，確認後所有選定的租戶屬性將被刪除，所有相關資料將變得無法恢復。",
         "set-default-tenant-profile-title": "是否確定要將租戶屬性'{{tenantProfileName}}' 設為預設值?",
         "set-default-tenant-profile-text": "確認後，租戶屬性將被標記為預設值，並將用於未指定屬性的新租戶。",
@@ -3164,10 +3164,10 @@
         }
     },
     "timeinterval": {
-        "seconds-interval": "{ seconds, plural, 1 {1 秒} other {# 秒} }",
-        "minutes-interval": "{ minutes, plural, 1 {1 分} other {# 分} }",
-        "hours-interval": "{ hours, plural, 1 {1 小時} other {# 小時} }",
-        "days-interval": "{ days, plural, 1 {1 天} other {# 天} }",
+        "seconds-interval": "{ seconds, plural, =1 {1 秒} other {# 秒} }",
+        "minutes-interval": "{ minutes, plural, =1 {1 分} other {# 分} }",
+        "hours-interval": "{ hours, plural, =1 {1 小時} other {# 小時} }",
+        "days-interval": "{ days, plural, =1 {1 天} other {# 天} }",
         "days": "天",
         "hours": "時",
         "minutes": "分",
@@ -3202,10 +3202,10 @@
         "days": "天"
     },
     "timewindow": {
-        "days": "{ days, plural, 1 { 天 } other {# 天 } }",
-        "hours": "{ hours, plural, 0 { 小時 } 1 {1 小時 } other {# 小時 } }",
-        "minutes": "{ minutes, plural, 0 { 分 } 1 {1 分 } other {# 分 } }",
-        "seconds": "{ seconds, plural, 0 { 秒 } 1 {1 秒 } other {# 秒 } }",
+        "days": "{ days, plural, =1 { 天 } other {# 天 } }",
+        "hours": "{ hours, plural, =0 { 小時 } =1 {1 小時 } other {# 小時 } }",
+        "minutes": "{ minutes, plural, =0 { 分 } =1 {1 分 } other {# 分 } }",
+        "seconds": "{ seconds, plural, =0 { 秒 } =1 {1 秒 } other {# 秒 } }",
         "realtime": "實時",
         "history": "歷史",
         "last-prefix": "最後",
@@ -3233,8 +3233,8 @@
         "user-details": "用戶詳細訊息",
         "delete-user-title": "您確定要刪除用戶 '{{userEmail}}' 嗎？",
         "delete-user-text": "小心！確認後，用戶和所有相關資料將無法恢復。",
-        "delete-users-title": "你確定你要刪除 { count, plural, 1 {1 用戶} other {# 用戶} } 嗎？",
-        "delete-users-action-title": "刪除 { count, plural, 1 {1 用戶} other {# 用戶} }",
+        "delete-users-title": "你確定你要刪除 { count, plural, =1 {1 用戶} other {# 用戶} } 嗎？",
+        "delete-users-action-title": "刪除 { count, plural, =1 {1 用戶} other {# 用戶} }",
         "delete-users-text": "小心！確認後，所有選擇的用戶將被刪除，所有相關資料將無法恢復。",
         "activation-email-sent-message": "啟動電子郵件已成功發送！",
         "resend-activation": "重新發送啟動",
@@ -3260,7 +3260,7 @@
         "login-as-tenant-admin": "以租戶管理者帳號登入",
         "login-as-customer-user": "以顧客用戶帳號登入",
         "search": "搜尋用戶",
-        "selected-users": "{ count, plural, 1 {1 用戶} other {# 用戶} } 被選中",
+        "selected-users": "{ count, plural, =1 {1 用戶} other {# 用戶} } 被選中",
         "disable-account": "關閉用戶帳號",
         "enable-account": "啓用用戶帳號",
         "enable-account-message": "用戶帳號已成功啓用",
@@ -3326,7 +3326,7 @@
         "previous-difference": "上一個差異",
         "next-difference": "下一個差異",
         "current": "當前的",
-        "differences": "{ count, plural, 1 {1 差異} other {# 差異} }",
+        "differences": "{ count, plural, =1 {1 差異} other {# 差異} }",
         "create-entities-version": "創建實體版本",
         "default-sync-strategy": "預設同步策略",
         "sync-strategy-merge": "合併",
@@ -3339,7 +3339,7 @@
         "no-entities-to-restore-prompt": "請指定要恢復的實體",
         "add-entity-type": "增加實體類型",
         "remove-all": "移除全部",
-        "version-create-result": "{ added, plural, 0 {無實體} 1 {1 實體} other {# 實體} } 已增加。.<br/>{ modified, plural, 0 {無實體} 1 {1 實體} other {# 實體} } 已修改。<br/>{ removed, plural, 0 {無實體} 1 {1 實體} other {# 實體} } 已移除。",
+        "version-create-result": "{ added, plural, =0 {無實體} =1 {1 實體} other {# 實體} } 已增加。.<br/>{ modified, plural, =0 {無實體} =1 {1 實體} other {# 實體} } 已修改。<br/>{ removed, plural, =0 {無實體} =1 {1 實體} other {# 實體} } 已移除。",
         "remove-other-entities": "移除其他實體",
         "find-existing-entity-by-name": "按名稱查找現有實體",
         "restore-entities-from-version": "從版本'{{versionName}}恢復實體'",
@@ -3496,8 +3496,8 @@
         "widgets-bundle-details": "部件包詳細訊息",
         "delete-widgets-bundle-title": "您確定要刪除部件包 '{{widgetsBundleTitle}}'嗎？",
         "delete-widgets-bundle-text": "小心！確認後，部件包和所有相關資料將無法恢復。",
-        "delete-widgets-bundles-title": "你確定你要刪除 { count, plural, 1 {1 部件包} other {# 部件包} } 嗎？",
-        "delete-widgets-bundles-action-title": "刪除 { count, plural, 1 {1 部件包} other {# 部件包} }",
+        "delete-widgets-bundles-title": "你確定你要刪除 { count, plural, =1 {1 部件包} other {# 部件包} } 嗎？",
+        "delete-widgets-bundles-action-title": "刪除 { count, plural, =1 {1 部件包} other {# 部件包} }",
         "delete-widgets-bundles-text": "小心！確認後，所有選擇的部件包將被刪除，所有相關資料將無法恢復。",
         "no-widgets-bundles-matching": "沒有找到與 '{{widgetsBundle}}' 符合的部件包。",
         "widgets-bundle-required": "需要部件包。",
@@ -3509,7 +3509,7 @@
         "widgets-bundle-file": "部件包文件",
         "invalid-widgets-bundle-file-error": "無法匯入部件包：無效的部件包資料結構。",
         "search": "搜尋部件包",
-        "selected-widgets-bundles": "{ count, plural, 1 {1 部件包} other {#部件包} } 被選中",
+        "selected-widgets-bundles": "{ count, plural, =1 {1 部件包} other {#部件包} } 被選中",
         "open-widgets-bundle": "打開部件包",
         "loading-widgets-bundles": "加載部件包..."
     },
@@ -3542,7 +3542,7 @@
         "legend": "圖例",
         "display-legend": "顯示圖例",
         "datasources": "資料源",
-        "maximum-datasources": "最大允許 { count, plural, 1 {1 資料} other {# 資料} }",
+        "maximum-datasources": "最大允許 { count, plural, =1 {1 資料} other {# 資料} }",
         "datasource-type": "類型",
         "datasource-parameters": "參數",
         "remove-datasource": "移除資料源",
@@ -4591,28 +4591,6 @@
         }
     },
     "language": {
-        "language": "語言",
-        "locales": {
-            "de_DE": "Deutsch",
-            "fr_FR": "Français",
-            "zh_CN": "简体中文",
-            "zh_TW": "繁體中文",
-            "en_US": "English",
-            "it_IT": "Italiano",
-            "ko_KR": "한국어",
-            "ru_RU": "Русский",
-            "es_ES": "Español",
-            "ja_JP": "日本語",
-            "tr_TR": "Türkçe",
-            "fa_IR": "فارسي",
-            "uk_UA": "Українська",
-            "cs_CZ": "Česky",
-            "el_GR": "Ελληνικά",
-            "ro_RO": "Română",
-            "lv_LV": "Latviešu",
-            "ka_GE": "ქართული",
-            "pt_BR": "Português do Brasil",
-            "sl_SI": "Slovenščina"
-        }
+        "language": "語言"
     }
 }
diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss
index 64342a686a..bdf2c5463c 100644
--- a/ui-ngx/src/styles.scss
+++ b/ui-ngx/src/styles.scss
@@ -88,57 +88,6 @@ a:focus {
   border-bottom: 1px solid #4054b2;
 }
 
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  &, &.mat-headline-5 {
-    margin-top: 1rem;
-    margin-bottom: 1rem;
-  }
-}
-
-h1 {
-  font-size: 3.4rem;
-  font-weight: 400;
-  line-height: 4rem;
-}
-
-h2 {
-  font-size: 2.4rem;
-  font-weight: 400;
-  line-height: 3.2rem;
-}
-
-h3 {
-  font-size: 2rem;
-  font-weight: 500;
-  letter-spacing: .005em;
-}
-
-h4 {
-  font-size: 1.6rem;
-  font-weight: 400;
-  line-height: 2.4rem;
-  letter-spacing: .01em;
-}
-
-h5 {
-  font-size: 1.4rem;
-  font-weight: 400;
-  line-height: 2rem;
-  letter-spacing: .01em;
-}
-
-h6 {
-  font-size: 1.2rem;
-  font-weight: 400;
-  line-height: 1.6rem;
-  letter-spacing: .01em;
-}
-
 p {
   margin: .8em 0 1.6em;
   font-size: 1.6rem;
@@ -479,373 +428,6 @@ mat-label {
   }
 }
 
-.tb-markdown-view {
-  display: block;
-
-  $headings: h1, h2, h3, h4, h5, h6;
-
-  h1 {
-    font-size: 32px;
-    padding-right: 60px;
-  }
-
-  @each $heading in $headings {
-    #{$heading} {
-      color: #0F161D;
-      line-height: normal;
-      font-weight: 500;
-      border-bottom: none;
-      margin: 0;
-    }
-    & > #{$heading} {
-      padding: 30px 32px 10px;
-    }
-  }
-
-  p {
-    font-size: 16px;
-    font-weight: 400;
-    line-height: 1.25em;
-    margin: 0;
-  }
-
-  p + p {
-    margin-top: 10px;
-  }
-
-  p, div {
-    color: rgba(15, 22, 29, 0.8);
-    line-height: 1.5em;
-  }
-
-  & > p, & > div {
-    padding-right: 32px;
-    padding-left: 32px;
-  }
-
-  ul {
-    padding-left: 62px;
-    padding-right: 32px;
-    color: rgba(15, 22, 29, 0.8);
-    margin-top: 16px;
-    margin-bottom: 16px;
-  }
-
-  ul {
-    @each $heading in $headings {
-      & + #{$heading} {
-        padding-top: 14px;
-      }
-    }
-  }
-
-  li {
-    padding-bottom: .75em;
-    line-height: 1.5em;
-    ul {
-      margin-bottom: 0;
-    }
-    p {
-      padding-left: 0;
-    }
-  }
-
-  a {
-    font-weight: 500;
-    color: #2a7dec;
-    text-decoration: none;
-    border: none;
-    &:hover {
-      color: #2a7dec;
-      text-decoration: underline;
-      border: none;
-    }
-  }
-
-  & > table {
-    margin-left: 32px;
-    width: calc(100% - 64px);
-    border: 1px solid rgba(42,125,236,.2);
-    border-radius: 4px;
-    border-collapse: unset;
-    border-spacing: 0;
-    margin-top: 30px;
-    margin-bottom: 30px;
-    overflow: hidden;
-    table-layout: fixed;
-    &.auto {
-      table-layout: auto;
-    }
-
-    & > thead {
-      background-color: #f9fbff;
-      color: rgba(33,37,41,.6);
-
-      & > tr {
-        & > th {
-          border-bottom: 1px solid rgba(42,125,236,.2);
-          font-size: 16px;
-          padding: 12px 16px;
-          text-align: left;
-          margin: 0;
-          @media screen and (max-width: 400px) {
-            font-size: 12px;
-            padding: 12px 4px;
-            code:not([class*=language-]) {
-              font-size: 12px;
-            }
-          }
-        }
-      }
-    }
-
-    & > tbody {
-      & > tr:not(:last-child) {
-        & > td {
-          border-bottom: 1px solid rgba(42,125,236,.2);
-        }
-      }
-      & > tr {
-        & > td {
-          font-size: 16px;
-          padding: 12px 16px;
-          text-align: left;
-          margin: 0;
-          color: rgba(15, 22, 29, 0.8);
-          @media screen and (max-width: 400px) {
-            font-size: 12px;
-            padding: 12px 4px;
-            code:not([class*=language-]) {
-              font-size: 12px;
-            }
-          }
-        }
-      }
-    }
-    th, td {
-      font-size: .85em;
-      padding: 8px;
-      margin: 0;
-      text-align: left;
-    }
-    td[align=center], th[align=center] {
-      text-align: center;
-    }
-
-    td[align=right], th[align=right] {
-      text-align: right;
-    }
-
-    tr td div {
-      padding-left: 0;
-      padding-right: 0;
-    }
-  }
-
-
-  div.divider {
-    padding-top: 32px;
-    border-bottom: 1px solid rgba(15, 22, 29, 0.1);
-  }
-
-  ul + div.divider {
-    padding-top: 16px;
-  }
-
-  img {
-    max-width: 100%;
-  }
-
-  button.tb-button {
-    cursor: pointer;
-    display: inline-block;
-    border-radius: 4px;
-    border: none;
-    padding: 10px 20px;
-    line-height: 24px;
-    color: #fff;
-    background-color: #305680;
-    box-shadow: 0 1px 5px rgba(0, 0, 0, 0.12), 0 2px 2px rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
-    text-decoration: none;
-    font-size: 16px;
-    font-weight: 500;
-    transition: background-color .4s cubic-bezier(.25,.8,.25,1);
-  }
-
-  button.tb-button:hover {
-    background-color: #264363;
-    color: #fff;
-    text-decoration: none;
-  }
-
-  #video {
-    width: 100%;
-    margin: 0;
-    position: relative;
-  }
-
-
-  #video #video_wrapper {
-    position: relative;
-    width: 100%;
-    padding-bottom: 56.25%;
-    padding-left: 0;
-    padding-right: 0;
-  }
-
-  #video #video_wrapper iframe {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-  }
-
-  @media screen and (min-width: 750px) {
-    #video {
-      width: 100%;
-      display: block;
-    }
-  }
-
-  @media screen and (min-width: 1025px) {
-    #video {
-      width: 50%;
-      position: relative;
-    }
-  }
-
-  code:not([class*=language-]) {
-    color: #eb5757;
-    font-family: monospace;
-    font-size: 16px;
-  }
-
-  div.code-wrapper {
-    position: relative;
-    button.clipboard-btn {
-      pointer-events: none;
-      outline: none;
-      position: absolute;
-      width: 206px;
-      height: 42px;
-      top: 0;
-      right: 32px;
-      background: 0 0;
-      border: none;
-      -webkit-user-select: none;
-      -moz-user-select: none;
-      -ms-user-select: none;
-      user-select: none;
-      &.multiline {
-        right: 44px;
-      }
-      p {
-        padding: 8px;
-        top: 1px;
-        transition: .2s;
-        color: #2a7dec;
-        background: rgba(255,255,255,.85);
-        backdrop-filter: blur(4px);
-        opacity: 0;
-        font-weight: 500;
-        right: 32px;
-        position: absolute;
-      }
-      div {
-        background-color: #fff;
-        position: absolute;
-        width: 38px;
-        height: 38px;
-        top: 3px;
-        right: 3px;
-        padding: 10px;
-        img {
-          position: initial;
-          width: 18px;
-          height: 18px;
-          filter: invert(51%) sepia(6%) saturate(172%) hue-rotate(177deg) brightness(94%) contrast(92%);
-        }
-      }
-    }
-
-    &:hover {
-      cursor: pointer;
-      pre[class*="language-"] {
-        border: solid 1px #2a7dec;
-      }
-      button.clipboard-btn {
-        p {
-          opacity: 1;
-        }
-        div {
-          img {
-            filter: invert(49%) sepia(97%) saturate(3730%) hue-rotate(200deg) brightness(95%) contrast(95%);
-          }
-        }
-      }
-    }
-  }
-
-  th, td {
-    div.code-wrapper {
-      display: inline-block;
-      width: 100%;
-
-      button.clipboard-btn {
-        top: -10px;
-        right: 0;
-        padding: 0 3px;
-      }
-    }
-  }
-
-  pre[class*="language-"] {
-    font-size: 16px;
-    border: 1px solid rgba(42,125,236,.2);
-    border-radius: 4px;
-    background: 0 0;
-    padding: 8px 16px;
-    color: #212529;
-    .token.atrule, .token.attr-value, .token.keyword {
-      color: #2a7dec;
-    }
-    .token.selector, .token.attr-name, .token.string, .token.char, .token.builtin, .token.inserted {
-      color: #eb5757;
-    }
-    .token.punctuation {
-      color: #212529;
-    }
-    &.line-numbers {
-      padding-left: 66px;
-      & > code {
-        span.line-numbers-rows {
-          top: -12px;
-          bottom: -12px;
-          left: -66px;
-          width: 50px;
-          border: none;
-          padding: 8px 12px 8px 18px;
-          text-align: right;
-          background: #f9fbff;
-          & > span:before {
-            color: rgba(33,37,41,.6);
-            padding-right: 0;
-          }
-        }
-      }
-      &.no-line-numbers {
-        padding-left: 16px;
-        & > code {
-          span.line-numbers-rows {
-            display: none;
-          }
-        }
-      }
-    }
-  }
-}
-
 // Tooltipster
 
 .tooltipster-sidetip.tooltipster-tb {
@@ -869,6 +451,57 @@ mat-label {
    * MATERIAL DESIGN CUSTOMIZATIONS
    ********************************/
 
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    &, &.mat-headline-5 {
+      margin-top: 1rem;
+      margin-bottom: 1rem;
+    }
+  }
+
+  h1 {
+    font-size: 3.4rem;
+    font-weight: 400;
+    line-height: 4rem;
+  }
+
+  h2 {
+    font-size: 2.4rem;
+    font-weight: 400;
+    line-height: 3.2rem;
+  }
+
+  h3 {
+    font-size: 2rem;
+    font-weight: 500;
+    letter-spacing: .005em;
+  }
+
+  h4 {
+    font-size: 1.6rem;
+    font-weight: 400;
+    line-height: 2.4rem;
+    letter-spacing: .01em;
+  }
+
+  h5 {
+    font-size: 1.4rem;
+    font-weight: 400;
+    line-height: 2rem;
+    letter-spacing: .01em;
+  }
+
+  h6 {
+    font-size: 1.2rem;
+    font-weight: 400;
+    line-height: 1.6rem;
+    letter-spacing: .01em;
+  }
+
   .mat-mdc-tooltip {
     white-space: pre-line;
   }
diff --git a/ui-ngx/src/theme.scss b/ui-ngx/src/theme.scss
index 3e414b2c68..515c149898 100644
--- a/ui-ngx/src/theme.scss
+++ b/ui-ngx/src/theme.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 @use '@angular/material' as mat;
-@import '@mat-datetimepicker/core/datetimepicker/datetimepicker-theme';
+@import '../theme/datepicker-theme';
 @import './scss/constants';
 
 @include mat.all-component-typographies();
@@ -246,6 +246,7 @@ $tb-dark-theme: map_merge($tb-dark-theme, $color);
   @include mat.all-component-themes($tb-theme);
   @include mat-datetimepicker-theme($tb-theme);
   @include tb-components-theme($tb-theme);
+  @include mat.typography-hierarchy($tb-theme);
 }
 
 .tb-dark {
diff --git a/ui-ngx/src/theme/datepicker-theme.scss b/ui-ngx/src/theme/datepicker-theme.scss
new file mode 100644
index 0000000000..2cf1810fc6
--- /dev/null
+++ b/ui-ngx/src/theme/datepicker-theme.scss
@@ -0,0 +1,70 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@use '@angular/material' as mat;
+
+$mat-datetimepicker-selected-today-box-shadow-width: 1px;
+
+@mixin mat-datetimepicker-theme($theme) {
+
+  $primary: map-get($theme, primary);
+
+  $primary-color: mat.get-color-from-palette($primary);
+  $primary-contrast: mat.get-color-from-palette($primary, default-contrast);
+
+  .mat-datetimepicker-calendar-header {
+    background-color: $primary-color;
+    color: $primary-contrast;
+  }
+
+  .mat-datetimepicker-calendar-body-cell-content {
+    &.mat-datetimepicker-calendar-body-selected {
+      background-color: $primary-color;
+      color: $primary-contrast;
+    }
+
+    &.mat-datetimepicker-calendar-body-disabled > .mat-datetimepicker-calendar-body-selected {
+      background-color: rgba($primary-color, 0.4);
+    }
+
+    &.mat-datetimepicker-calendar-body-today {
+      &:not(.mat-datetimepicker-calendar-body-selected) {
+        border-color: $primary-color;
+      }
+
+      &.mat-datetimepicker-calendar-body-selected {
+        box-shadow: inset 0 0 0 $mat-datetimepicker-selected-today-box-shadow-width $primary-contrast;
+      }
+    }
+  }
+
+  .mat-datetimepicker-clock-center {
+    background-color: $primary-color;
+  }
+
+  .mat-datetimepicker-clock-hand {
+    background-color: $primary-color;
+
+    &::before {
+      background-color: $primary-color;
+    }
+  }
+
+  .mat-datetimepicker-clock-cell {
+    &.mat-datetimepicker-clock-cell-selected {
+      background-color: unquote("hsl(from #{$primary-color} h s calc(l + 5%))");
+    }
+  }
+}
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index 13f482187f..b939f898f1 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@2.2.0", "@ampproject/remapping@^2.1.0":
+"@ampproject/remapping@2.2.0", "@ampproject/remapping@^2.1.0", "@ampproject/remapping@^2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
   integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
@@ -23,99 +23,23 @@
     tsconfig-paths "^4.1.0"
     webpack-merge "^5.7.3"
 
-"@angular-devkit/architect@0.1501.6", "@angular-devkit/architect@>=0.1500.0 < 0.1600.0":
-  version "0.1501.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1501.6.tgz#dc8b935d6aa12a9a7e84fec7b5011dd7cf19b981"
-  integrity sha512-u07zZFlfrg0Qn4mu5M9Nz0pH2Yd2028XF/73980PsZMxwkSm4diF08v4bHk3UyR7yPT7phwvt4znj6ryZhx1gw==
+"@angular-devkit/architect@0.1502.1", "@angular-devkit/architect@>=0.1500.0 < 0.1600.0":
+  version "0.1502.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1502.1.tgz#0ab9919638f61eaa962b1863d99581c52ccfa2a9"
+  integrity sha512-/rtR0U4TJCplpnIfenoTOIn4omPUDDL8iAl6le0qelL2CXdEl6UjMBYF1ILS8OVMLfpEGUXfMLeZgRn0yb7DjA==
   dependencies:
-    "@angular-devkit/core" "15.1.6"
+    "@angular-devkit/core" "15.2.1"
     rxjs "6.6.7"
 
-"@angular-devkit/architect@0.1502.0":
-  version "0.1502.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1502.0.tgz#ef388474e87e79bfcf594db57851ab857a589605"
-  integrity sha512-/HmyAQhb4BNbcVRL2uaLwrJAAeYVUD42Bipoq8+kUNzoRv9QqJTIOx+2fSsmwBk8C+Jx3184UD3SfUmEnFPt4g==
-  dependencies:
-    "@angular-devkit/core" "15.2.0"
-    rxjs "6.6.7"
-
-"@angular-devkit/build-angular@^15.0.0":
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-15.1.6.tgz#93258f0d6a145cb2f070abbf50ac6e9a3a146a5e"
-  integrity sha512-cUiS1ziIPwuDmz+vt7ycHKt+B5w4JOQITZgZGZ0ddcJNJ257xG9OvF+WZ9unef4yte1wWscHkxDBHUHo7pHglA==
-  dependencies:
-    "@ampproject/remapping" "2.2.0"
-    "@angular-devkit/architect" "0.1501.6"
-    "@angular-devkit/build-webpack" "0.1501.6"
-    "@angular-devkit/core" "15.1.6"
-    "@babel/core" "7.20.12"
-    "@babel/generator" "7.20.7"
-    "@babel/helper-annotate-as-pure" "7.18.6"
-    "@babel/helper-split-export-declaration" "7.18.6"
-    "@babel/plugin-proposal-async-generator-functions" "7.20.7"
-    "@babel/plugin-transform-async-to-generator" "7.20.7"
-    "@babel/plugin-transform-runtime" "7.19.6"
-    "@babel/preset-env" "7.20.2"
-    "@babel/runtime" "7.20.7"
-    "@babel/template" "7.20.7"
-    "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "15.1.6"
-    ansi-colors "4.1.3"
-    autoprefixer "10.4.13"
-    babel-loader "9.1.2"
-    babel-plugin-istanbul "6.1.1"
-    browserslist "4.21.4"
-    cacache "17.0.4"
-    chokidar "3.5.3"
-    copy-webpack-plugin "11.0.0"
-    critters "0.0.16"
-    css-loader "6.7.3"
-    esbuild-wasm "0.16.17"
-    glob "8.0.3"
-    https-proxy-agent "5.0.1"
-    inquirer "8.2.4"
-    jsonc-parser "3.2.0"
-    karma-source-map-support "1.4.0"
-    less "4.1.3"
-    less-loader "11.1.0"
-    license-webpack-plugin "4.0.2"
-    loader-utils "3.2.1"
-    magic-string "0.27.0"
-    mini-css-extract-plugin "2.7.2"
-    open "8.4.0"
-    ora "5.4.1"
-    parse5-html-rewriting-stream "6.0.1"
-    piscina "3.2.0"
-    postcss "8.4.21"
-    postcss-loader "7.0.2"
-    resolve-url-loader "5.0.0"
-    rxjs "6.6.7"
-    sass "1.57.1"
-    sass-loader "13.2.0"
-    semver "7.3.8"
-    source-map-loader "4.0.1"
-    source-map-support "0.5.21"
-    terser "5.16.1"
-    text-table "0.2.0"
-    tree-kill "1.2.2"
-    tslib "2.4.1"
-    webpack "5.75.0"
-    webpack-dev-middleware "6.0.1"
-    webpack-dev-server "4.11.1"
-    webpack-merge "5.8.0"
-    webpack-subresource-integrity "5.1.0"
-  optionalDependencies:
-    esbuild "0.16.17"
-
-"@angular-devkit/build-angular@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-15.2.0.tgz#2a23abc3274aa755a8319123fe856bc9fd0874be"
-  integrity sha512-scEZSBlVPWk7cFEoIVjW3T84it6ZPB4AU/U+dLuIvBT1P0V7R4Kctp8J219eAKsxrjTdD6hvYKXSP2uBFoqgng==
+"@angular-devkit/build-angular@^15.0.0", "@angular-devkit/build-angular@^15.2.0":
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-15.2.1.tgz#11dacec9f651e4491bb5d914e8b84dc2e245c955"
+  integrity sha512-EgJqlrig9iuMvqySb4h8h2AAd8OwhBqY2JMMvs+hIASZvJi3n+Qd12BdlqLuAzykRyIAdy3OeLSAaXZrmeSk0A==
   dependencies:
     "@ampproject/remapping" "2.2.0"
-    "@angular-devkit/architect" "0.1502.0"
-    "@angular-devkit/build-webpack" "0.1502.0"
-    "@angular-devkit/core" "15.2.0"
+    "@angular-devkit/architect" "0.1502.1"
+    "@angular-devkit/build-webpack" "0.1502.1"
+    "@angular-devkit/core" "15.2.1"
     "@babel/core" "7.20.12"
     "@babel/generator" "7.20.14"
     "@babel/helper-annotate-as-pure" "7.18.6"
@@ -127,7 +51,7 @@
     "@babel/runtime" "7.20.13"
     "@babel/template" "7.20.7"
     "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "15.2.0"
+    "@ngtools/webpack" "15.2.1"
     ansi-colors "4.1.3"
     autoprefixer "10.4.13"
     babel-loader "9.1.2"
@@ -175,37 +99,18 @@
   optionalDependencies:
     esbuild "0.17.8"
 
-"@angular-devkit/build-webpack@0.1501.6":
-  version "0.1501.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1501.6.tgz#9f4dc6f4964ed0ac13a63e01822c83def225c051"
-  integrity sha512-FVWtzpCfakEvQGSFGiKoGSLxz2KoZqPdca5WiT4sHRO+hD0IvP+cABxvWJgRXYpeeQGqV9BgHz5pV7v20i4U8Q==
-  dependencies:
-    "@angular-devkit/architect" "0.1501.6"
-    rxjs "6.6.7"
-
-"@angular-devkit/build-webpack@0.1502.0":
-  version "0.1502.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1502.0.tgz#690b3d1124c86d25ba0413401b7c779b902c1dca"
-  integrity sha512-5xlHsuTZUaSvX+5/wfhbhr+CFVUSsLVNhiu3E4i9Qkyyb9Imj+KFZEuiy17p4fkYSUV7IXiQ34G5Axi5UCcnxQ==
+"@angular-devkit/build-webpack@0.1502.1":
+  version "0.1502.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1502.1.tgz#d0332b620a24a37ce132ef3fb771af3f991c6413"
+  integrity sha512-mQ9dbuoy0U2+caQCRMhUx88fA/WmBt+JkYt8nvtTUyhVTXm5XIVckTlIfqdVk0BCA1lT8AM4yFKmy97bFXuZeQ==
   dependencies:
-    "@angular-devkit/architect" "0.1502.0"
+    "@angular-devkit/architect" "0.1502.1"
     rxjs "6.6.7"
 
-"@angular-devkit/core@15.1.6", "@angular-devkit/core@^15.0.0":
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-15.1.6.tgz#61275ee83825fea0e24966bc450fc27e6d5c35c7"
-  integrity sha512-jGgxyRjecVf6lEyqDxz7ltMEndNPxIg720pk6r40fgsu0dU8w9vjJSJe7k0XdJiXVRcN6wZa/J5nO/xcwWVIsA==
-  dependencies:
-    ajv "8.12.0"
-    ajv-formats "2.1.1"
-    jsonc-parser "3.2.0"
-    rxjs "6.6.7"
-    source-map "0.7.4"
-
-"@angular-devkit/core@15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-15.2.0.tgz#79c9db21cf5d0e02c967346ca53e378dec09de2e"
-  integrity sha512-kUE5XvQzn+fiEvFqIk8x0q4hvRD+dKfAMM7p0uPQ69O9cj2b8c01oDvLOskvwhIJOnKTxnK/1d2gFQLupPci4A==
+"@angular-devkit/core@15.2.1", "@angular-devkit/core@^15.0.0":
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-15.2.1.tgz#78b03a134d354df6646a29c718bef6721ac9365e"
+  integrity sha512-m6lj5vvA/L21rUVm4PokK2SXZQE1Hjsw8AMNEaj+RlyVW36ISLm2TeeCdb441siBpLJkW+yA47bC2FUJ8HgsQQ==
   dependencies:
     ajv "8.12.0"
     ajv-formats "2.1.1"
@@ -213,12 +118,12 @@
     rxjs "6.6.7"
     source-map "0.7.4"
 
-"@angular-devkit/schematics@15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-15.2.0.tgz#ed6ae15fabac016c0d03775a559d33e30ead1d77"
-  integrity sha512-LrsbQWaMRrLPBCgTOw7F+BvA4mjCljC+42NmiId/GXdU9FljEw/Ly1+u7LJREnE1yYqGQeR8zd8xjgIS0mTc3A==
+"@angular-devkit/schematics@15.2.1":
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-15.2.1.tgz#de3e98fd4755878299d7e3a6961aa68854d2bad5"
+  integrity sha512-XfUAGUC/tjQDzXaEJxkTvC7glJa4vmqGJ8RSCrRQYQOUZUASZtjEr6dIZEkWDN7zllcLuK/ULE4ITdcQ438LMQ==
   dependencies:
-    "@angular-devkit/core" "15.2.0"
+    "@angular-devkit/core" "15.2.1"
     jsonc-parser "3.2.0"
     magic-string "0.29.0"
     ora "5.4.1"
@@ -282,30 +187,30 @@
     "@typescript-eslint/utils" "5.48.2"
 
 "@angular/animations@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-15.2.0.tgz#fde0cba556a780d4a80165ad1b9ab901fe841285"
-  integrity sha512-Hh/ijBlHsFlr6vR7e9KZgFpdQf+ebr3uIDDRsVHjRkt8utsv3CpUcJkb75UyTv+Ok5gYmfsI1Lj1CDYujyA0Fg==
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-15.2.1.tgz#7ee4e058bf1234d1780498af0407851bb591c04f"
+  integrity sha512-oQjTdXLVHzSnsHHPF3CM4bnT4uVQQW1vP4weFTXWhvybQ6vICcq57N9Ri8ZsvB0Sisqug6CPwZoUATCb5a2HXw==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/cdk@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-15.2.0.tgz#0711ace8b2d30f0512d5a9bd6342ea5962ff33e4"
-  integrity sha512-+D0gLmDZVCBMSZ6juImP0eXpL40hw4Ipm8KRQmF3UOU9T5xXMxzYjUI8N3J+ZUZsNzQwy+eW0HImkZ5St6YxvA==
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-15.2.1.tgz#29d3c1d7d85debdfc8de4a802d420f3190c835ea"
+  integrity sha512-kRwG0ujimOPhqDwQYcQ+pk7hpTr0yvaPkxAx5r1ytA6aQIvHJ1XaPzhtthsr5/PhpwzlH8k723xpejrLKcuR+w==
   dependencies:
     tslib "^2.3.0"
   optionalDependencies:
     parse5 "^7.1.2"
 
 "@angular/cli@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-15.2.0.tgz#d2f788b1cd0b3437eaa0edfd3166015998179d4e"
-  integrity sha512-Zy1kmcvqoQf316eirfxkS5vb8/3B9btZf0YvZH/hDHmAyzAs8cwfirU+ClhwLLb/T9i7HnB0YS+Pdz0XaQa/jQ==
-  dependencies:
-    "@angular-devkit/architect" "0.1502.0"
-    "@angular-devkit/core" "15.2.0"
-    "@angular-devkit/schematics" "15.2.0"
-    "@schematics/angular" "15.2.0"
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-15.2.1.tgz#727ab23741a86ea381eb09c1973b0957714dc253"
+  integrity sha512-mLMn+65oojWvu7Ew4na8QgCQb382kZ55xCGjyUDeNNdH/WbqeYC783Vcs7JpMMP1JnndIaeIzvpfjLja1/2UCw==
+  dependencies:
+    "@angular-devkit/architect" "0.1502.1"
+    "@angular-devkit/core" "15.2.1"
+    "@angular-devkit/schematics" "15.2.1"
+    "@schematics/angular" "15.2.1"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.3"
     ini "3.0.1"
@@ -322,16 +227,16 @@
     yargs "17.6.2"
 
 "@angular/common@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-15.2.0.tgz#b69a1581e9274d2adaced547b175ecd1637bf812"
-  integrity sha512-B+e5pbkvlwlSwlQjtDrYQq+Xs62mScWm1plEZRHQm3cjBhA0RFT3MiUa/YNaHv8VoGjlrOm1rdJVEVQQxroZTg==
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-15.2.1.tgz#2ffa669b4e54e05c5fb97181497446e093c466b0"
+  integrity sha512-nGFrZXrxLMkFyK4VYHHH6+/Hq92BjVls6UWuG1UblkYzGqPpr7dRQZGOXzJc48sEG2WOeVhlhyK+0tHFFaG08g==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/compiler-cli@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-15.2.0.tgz#790ce61bd411321ab7f9e0a8b3901709be8c9547"
-  integrity sha512-ETnRBdY/LGcmDRQ9GQc9KyCd1kuRnj+Y9luq2dCTMysP+NgylmYoGDsJOsDKm6SzPo+B4PSAyHX2J4CVQFHpPg==
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-15.2.1.tgz#fc17dd30d851b5d891a49104d7801537b7c5db44"
+  integrity sha512-IoS3IovbnY4hLWzeym5Kul/dJuncggMHuPnyrMbAnR6+eCZCLyRqQ5MykXDCsgfnRuVm8+PEZc0voA/5st2Vhw==
   dependencies:
     "@babel/core" "7.19.3"
     "@jridgewell/sourcemap-codec" "^1.4.14"
@@ -345,16 +250,16 @@
     yargs "^17.2.1"
 
 "@angular/compiler@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-15.2.0.tgz#d54bf21e542c78f21cbd05c217ebc1f2fb0233c1"
-  integrity sha512-bGMc8xBs/3l5Ab2PmGGifuWVLxCzmYQPXeBYrwpmy+aYCwGzuVKxQp6L1UjA0OZNra7Am8bu4mOsLSR9ENdX6w==
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-15.2.1.tgz#3724e472cfcded0b95dbb59e7dd8bc23ab3dfe54"
+  integrity sha512-eOA09iQWPEOJXig6W+out8MyZL2wdVu62Z79PWGQG8RWDSPV8XUFMAPfTOC8B43PT4hn/Avy/aauXl6O9l3vXw==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/core@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-15.2.0.tgz#9fcce5d2581faf8ae5d10d5d1aa052ff976923ec"
-  integrity sha512-UNHNcW3NqzMbG5gMjzXhb4xHrJcZq8rFdLwTLntB0oo2I/WxQFVlxz28nrW+Y09DbJf02MCASBLxD9If/6eT3g==
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-15.2.1.tgz#c2ec98fac41058d901e5b48ed7ee207d6a10bb95"
+  integrity sha512-CtN/cYDTGlELRcKBHxqnxmUhI9Euz2R+25dvjNtxB2tLzCehI6Fbmsb3NsC++jcAjL3QAmodpzzgULPtNJqs6A==
   dependencies:
     tslib "^2.3.0"
 
@@ -366,21 +271,21 @@
     tslib "^2.3.0"
 
 "@angular/forms@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-15.2.0.tgz#f2afe39b03e7a2a7354008a3c8deae03728eb9c3"
-  integrity sha512-a93ysagAhbbyNbWM1yjWcPZaZBNrNjZ6SNIQYyelqySeShStXlKrDxYY5q7G/qqGpQzg2YF5qCIOOQxJJA9//g==
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-15.2.1.tgz#77b070cb8397183eb0bf115cc40179b2e52f57e1"
+  integrity sha512-C3gWbjwcult/RPFJ4RtzwOoIrO2ZYPXF86gQuA1MFpASRsroWl/9HTdvkmLa+UeW8ZoSZt4QNl00dymO+ROUGg==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/language-service@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-15.2.0.tgz#5256d7269c2755b30bd918d8cf555789c5a4517a"
-  integrity sha512-Gwg/IWPiBZ+LE0hHxtQGvQuJ+A7YehL6p0k26ClP0HS7Wy0ERRD9+ITGh5SnhKTKVMRwOb4HYcLp0N5W3yTajw==
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-15.2.1.tgz#ad4de7adfbf42faff1a51f4deaddc5b6d1cfe893"
+  integrity sha512-G86FZ0kZTXpHoyR1XJVB17whJ+4pvdJwCVnuZGzJ18lRwBJQcNA0r9neXqH+6StjStgLz0Wre+mI+sQMklFOmw==
 
 "@angular/material@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-15.2.0.tgz#7613ebecf0e92569c17b4bbcd539f2f46d8e8b6e"
-  integrity sha512-3Y6MMureeqFx5mzVnLuWrm+MXtTBAZGq0cPNcS3HUSv4gpKE3gSE0b3I4c/jFF5tcS2eQKNkU/HDvSFrYz8/iA==
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-15.2.1.tgz#e73abd5c9413a4ae6a97b3a1a0f4fa6479bad55d"
+  integrity sha512-2CdOltJz35yZbcSw9xy5HCQXo2/3hoQDG7YQm0zbd6gq6NnVZdhrb1RT+KonIOO1a3cpH3zKilAsZLh7gfvDUg==
   dependencies:
     "@material/animation" "15.0.0-canary.684e33d25.0"
     "@material/auto-init" "15.0.0-canary.684e33d25.0"
@@ -432,23 +337,23 @@
     tslib "^2.3.0"
 
 "@angular/platform-browser-dynamic@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.0.tgz#cca7d0cea9dcb8ebf4c73162f304623386617030"
-  integrity sha512-OErEz/AX9S6I+RJUrFS/r9mF0rJGF1bhAvPjNvyc4mL+ai9JWZB6JgrZPzEz3v0nXG8SsAvnB1wJdKCp90Ed2g==
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.1.tgz#92969fff1a4b1881f3eb67fc8fa34c1fd6e4eb6c"
+  integrity sha512-KeDq7yYmVlYVS3DiNUgI1318eYXxIiZ281Rg9TrLCHSNmzFag821XiDmXs/eug3RsgoYCKZ/j9w+ey8Qqfw6/Q==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/platform-browser@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-15.2.0.tgz#787f427609e851fc75e8d47a1fa80e5fe012633c"
-  integrity sha512-+FB+KMoRHktF/MR7hn8ofubVLpu3+KZpudupKlxthPSL2KPMJn6h00ewrJDv3W+MtpqphqCjQSLmKpzw2UKKug==
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-15.2.1.tgz#cef395ca6de1b1ea4e88ce5547aaac7547d1c6ac"
+  integrity sha512-aUV4XfdeqHTXwMRAjgrmx43F22YwgaCZnU08Ufg4Dx3nfqL9ak3e5NfgUpMlKbj7qX2rGGt6GKhQwoDFR4Dg1g==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/router@^15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-15.2.0.tgz#8db19e6cd0f2f810e1d809401cd58989c108830c"
-  integrity sha512-FPmGP7DmJtzqgmM7FMs8bfe3vX0r6cdI4zbHMEVv7Zbn/yApgAzAsX7MXJYy7Oi45S6ZTH7SIVHVYVAqay1NVQ==
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-15.2.1.tgz#313d5f2710f7722367f0aea83438d4cf1a6d0eb1"
+  integrity sha512-KyCBpj7HXnGSLz1XRP/b3K2WKVgfdY84uJ1CSVsTjADiduIfvAd3LGDVERzkTo+JxAsL1CD/yg1nTiIbFbcuCA==
   dependencies:
     tslib "^2.3.0"
 
@@ -472,9 +377,9 @@
     "@babel/highlight" "^7.18.6"
 
 "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5":
-  version "7.20.14"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.14.tgz#4106fc8b755f3e3ee0a0a7c27dde5de1d2b2baf8"
-  integrity sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.0.tgz#c241dc454e5b5917e40d37e525e2f4530c399298"
+  integrity sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==
 
 "@babel/core@7.19.3":
   version "7.19.3"
@@ -497,7 +402,7 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/core@7.20.12", "@babel/core@^7.12.3":
+"@babel/core@7.20.12":
   version "7.20.12"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d"
   integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==
@@ -518,7 +423,28 @@
     json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/generator@7.20.14", "@babel/generator@^7.19.3", "@babel/generator@^7.20.7":
+"@babel/core@^7.12.3":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.0.tgz#1341aefdcc14ccc7553fcc688dd8986a2daffc13"
+  integrity sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.21.0"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-module-transforms" "^7.21.0"
+    "@babel/helpers" "^7.21.0"
+    "@babel/parser" "^7.21.0"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.0"
+    "@babel/types" "^7.21.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
+    semver "^6.3.0"
+
+"@babel/generator@7.20.14":
   version "7.20.14"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.14.tgz#9fa772c9f86a46c6ac9b321039400712b96f64ce"
   integrity sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==
@@ -527,13 +453,14 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/generator@7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a"
-  integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==
+"@babel/generator@^7.19.3", "@babel/generator@^7.20.7", "@babel/generator@^7.21.0", "@babel/generator@^7.21.1":
+  version "7.21.1"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd"
+  integrity sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==
   dependencies:
-    "@babel/types" "^7.20.7"
+    "@babel/types" "^7.21.0"
     "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
 "@babel/helper-annotate-as-pure@7.18.6", "@babel/helper-annotate-as-pure@^7.18.6":
@@ -562,27 +489,27 @@
     lru-cache "^5.1.1"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.5", "@babel/helper-create-class-features-plugin@^7.20.7":
-  version "7.20.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz#4349b928e79be05ed2d1643b20b99bb87c503819"
-  integrity sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz#64f49ecb0020532f19b1d014b03bccaa1ab85fb9"
+  integrity sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-member-expression-to-functions" "^7.20.7"
+    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-member-expression-to-functions" "^7.21.0"
     "@babel/helper-optimise-call-expression" "^7.18.6"
     "@babel/helper-replace-supers" "^7.20.7"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/helper-split-export-declaration" "^7.18.6"
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz#5ea79b59962a09ec2acf20a963a01ab4d076ccca"
-  integrity sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz#53ff78472e5ce10a52664272a239787107603ebb"
+  integrity sha512-N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
-    regexpu-core "^5.2.1"
+    regexpu-core "^5.3.1"
 
 "@babel/helper-define-polyfill-provider@^0.3.3":
   version "0.3.3"
@@ -608,13 +535,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
-  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
+  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
   dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/types" "^7.19.0"
+    "@babel/template" "^7.20.7"
+    "@babel/types" "^7.21.0"
 
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
@@ -623,12 +550,12 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-member-expression-to-functions@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz#a6f26e919582275a93c3aa6594756d71b0bb7f05"
-  integrity sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==
+"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5"
+  integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==
   dependencies:
-    "@babel/types" "^7.20.7"
+    "@babel/types" "^7.21.0"
 
 "@babel/helper-module-imports@^7.18.6":
   version "7.18.6"
@@ -637,10 +564,10 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0", "@babel/helper-module-transforms@^7.20.11":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0"
-  integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.0", "@babel/helper-module-transforms@^7.21.2":
+  version "7.21.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
+  integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-module-imports" "^7.18.6"
@@ -648,8 +575,8 @@
     "@babel/helper-split-export-declaration" "^7.18.6"
     "@babel/helper-validator-identifier" "^7.19.1"
     "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.10"
-    "@babel/types" "^7.20.7"
+    "@babel/traverse" "^7.21.2"
+    "@babel/types" "^7.21.2"
 
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
@@ -717,9 +644,9 @@
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
 "@babel/helper-validator-option@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
-  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
+  integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
 
 "@babel/helper-wrap-function@^7.18.9":
   version "7.20.5"
@@ -731,14 +658,14 @@
     "@babel/traverse" "^7.20.5"
     "@babel/types" "^7.20.5"
 
-"@babel/helpers@^7.19.0", "@babel/helpers@^7.20.7":
-  version "7.20.13"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.13.tgz#e3cb731fb70dc5337134cadc24cbbad31cc87ad2"
-  integrity sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==
+"@babel/helpers@^7.19.0", "@babel/helpers@^7.20.7", "@babel/helpers@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e"
+  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
   dependencies:
     "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.13"
-    "@babel/types" "^7.20.7"
+    "@babel/traverse" "^7.21.0"
+    "@babel/types" "^7.21.0"
 
 "@babel/highlight@^7.18.6":
   version "7.18.6"
@@ -749,10 +676,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.14.7", "@babel/parser@^7.19.3", "@babel/parser@^7.20.13", "@babel/parser@^7.20.7":
-  version "7.20.15"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.15.tgz#eec9f36d8eaf0948bb88c87a46784b5ee9fd0c89"
-  integrity sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==
+"@babel/parser@^7.14.7", "@babel/parser@^7.19.3", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.21.2":
+  version "7.21.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3"
+  integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
@@ -789,11 +716,11 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-class-static-block@^7.18.6":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz#92592e9029b13b15be0f7ce6a7aedc2879ca45a7"
-  integrity sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
+  integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.20.7"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
@@ -865,9 +792,9 @@
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
 "@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz#49f2b372519ab31728cc14115bb0998b15bfda55"
-  integrity sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
+  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
@@ -882,12 +809,12 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-private-property-in-object@^7.18.6":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz#309c7668f2263f1c711aa399b5a9a6291eef6135"
-  integrity sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc"
+  integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-create-class-features-plugin" "^7.20.5"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
@@ -1028,21 +955,21 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-block-scoping@^7.20.2":
-  version "7.20.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.15.tgz#3e1b2aa9cbbe1eb8d644c823141a9c5c2a22392d"
-  integrity sha512-Vv4DMZ6MiNOhu/LdaZsT/bsLRxgL94d269Mv4R/9sp6+Mp++X/JqypZYypJXLlM4mlL352/Egzbzr98iABH1CA==
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02"
+  integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-classes@^7.20.2":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz#f438216f094f6bb31dc266ebfab8ff05aecad073"
-  integrity sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ==
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665"
+  integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-compilation-targets" "^7.20.7"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-function-name" "^7.21.0"
     "@babel/helper-optimise-call-expression" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-replace-supers" "^7.20.7"
@@ -1088,11 +1015,11 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-for-of@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
-  integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e"
+  integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-function-name@^7.18.9":
   version "7.18.9"
@@ -1126,11 +1053,11 @@
     "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-modules-commonjs@^7.19.6":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz#8cb23010869bf7669fd4b3098598b6b2be6dc607"
-  integrity sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==
+  version "7.21.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7"
+  integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.20.11"
+    "@babel/helper-module-transforms" "^7.21.2"
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-simple-access" "^7.20.2"
 
@@ -1364,17 +1291,17 @@
   resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@7.20.13", "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+"@babel/runtime@7.20.13":
   version "7.20.13"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b"
   integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd"
-  integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==
+"@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
+  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
   dependencies:
     regenerator-runtime "^0.13.11"
 
@@ -1387,26 +1314,26 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/traverse@^7.19.3", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.13", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7":
-  version "7.20.13"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.13.tgz#817c1ba13d11accca89478bd5481b2d168d07473"
-  integrity sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==
+"@babel/traverse@^7.19.3", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2":
+  version "7.21.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.2.tgz#ac7e1f27658750892e815e60ae90f382a46d8e75"
+  integrity sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==
   dependencies:
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.7"
+    "@babel/generator" "^7.21.1"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-function-name" "^7.21.0"
     "@babel/helper-hoist-variables" "^7.18.6"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.13"
-    "@babel/types" "^7.20.7"
+    "@babel/parser" "^7.21.2"
+    "@babel/types" "^7.21.2"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.3", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.4.4":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
-  integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
+"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.3", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.4.4":
+  version "7.21.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.2.tgz#92246f6e00f91755893c2876ad653db70c8310d1"
+  integrity sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==
   dependencies:
     "@babel/helper-string-parser" "^7.19.4"
     "@babel/helper-validator-identifier" "^7.19.1"
@@ -1460,230 +1387,120 @@
     esquery "^1.4.0"
     jsdoc-type-pratt-parser "~3.1.0"
 
-"@esbuild/android-arm64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz#cf91e86df127aa3d141744edafcba0abdc577d23"
-  integrity sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==
-
 "@esbuild/android-arm64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.8.tgz#b3d5b65a3b2e073a6c7ee36b1f3c30c8f000315b"
   integrity sha512-oa/N5j6v1svZQs7EIRPqR8f+Bf8g6HBDjD/xHC02radE/NjKHK7oQmtmLxPs1iVwYyvE+Kolo6lbpfEQ9xnhxQ==
 
-"@esbuild/android-arm@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz#025b6246d3f68b7bbaa97069144fb5fb70f2fff2"
-  integrity sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==
-
 "@esbuild/android-arm@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.8.tgz#c41e496af541e175369d48164d0cf01a5f656cf6"
   integrity sha512-0/rb91GYKhrtbeglJXOhAv9RuYimgI8h623TplY2X+vA4EXnk3Zj1fXZreJ0J3OJJu1bwmb0W7g+2cT/d8/l/w==
 
-"@esbuild/android-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz#c820e0fef982f99a85c4b8bfdd582835f04cd96e"
-  integrity sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==
-
 "@esbuild/android-x64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.8.tgz#080fa67c29be77f5a3ca5ee4cc78d5bf927e3a3b"
   integrity sha512-bTliMLqD7pTOoPg4zZkXqCDuzIUguEWLpeqkNfC41ODBHwoUgZ2w5JBeYimv4oP6TDVocoYmEhZrCLQTrH89bg==
 
-"@esbuild/darwin-arm64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz#edef4487af6b21afabba7be5132c26d22379b220"
-  integrity sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==
-
 "@esbuild/darwin-arm64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.8.tgz#053622bf9a82f43d5c075b7818e02618f7b4a397"
   integrity sha512-ghAbV3ia2zybEefXRRm7+lx8J/rnupZT0gp9CaGy/3iolEXkJ6LYRq4IpQVI9zR97ID80KJVoUlo3LSeA/sMAg==
 
-"@esbuild/darwin-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz#42829168730071c41ef0d028d8319eea0e2904b4"
-  integrity sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==
-
 "@esbuild/darwin-x64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.8.tgz#8a1aadb358d537d8efad817bb1a5bff91b84734b"
   integrity sha512-n5WOpyvZ9TIdv2V1K3/iIkkJeKmUpKaCTdun9buhGRWfH//osmUjlv4Z5mmWdPWind/VGcVxTHtLfLCOohsOXw==
 
-"@esbuild/freebsd-arm64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz#1f4af488bfc7e9ced04207034d398e793b570a27"
-  integrity sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==
-
 "@esbuild/freebsd-arm64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.8.tgz#e6738d0081ba0721a5c6c674e84c6e7fcea61989"
   integrity sha512-a/SATTaOhPIPFWvHZDoZYgxaZRVHn0/LX1fHLGfZ6C13JqFUZ3K6SMD6/HCtwOQ8HnsNaEeokdiDSFLuizqv5A==
 
-"@esbuild/freebsd-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz#636306f19e9bc981e06aa1d777302dad8fddaf72"
-  integrity sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==
-
 "@esbuild/freebsd-x64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.8.tgz#1855e562f2b730f4483f6e94086e9e2597feb4c3"
   integrity sha512-xpFJb08dfXr5+rZc4E+ooZmayBW6R3q59daCpKZ/cDU96/kvDM+vkYzNeTJCGd8rtO6fHWMq5Rcv/1cY6p6/0Q==
 
-"@esbuild/linux-arm64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz#a003f7ff237c501e095d4f3a09e58fc7b25a4aca"
-  integrity sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==
-
 "@esbuild/linux-arm64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.8.tgz#481da38952721a3fdb77c17a36ceaacc4270b5c5"
   integrity sha512-v3iwDQuDljLTxpsqQDl3fl/yihjPAyOguxuloON9kFHYwopeJEf1BkDXODzYyXEI19gisEsQlG1bM65YqKSIww==
 
-"@esbuild/linux-arm@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz#b591e6a59d9c4fe0eeadd4874b157ab78cf5f196"
-  integrity sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==
-
 "@esbuild/linux-arm@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.8.tgz#18127072b270bb6321c6d11be20bfd30e0d6ad17"
   integrity sha512-6Ij8gfuGszcEwZpi5jQIJCVIACLS8Tz2chnEBfYjlmMzVsfqBP1iGmHQPp7JSnZg5xxK9tjCc+pJ2WtAmPRFVA==
 
-"@esbuild/linux-ia32@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz#24333a11027ef46a18f57019450a5188918e2a54"
-  integrity sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==
-
 "@esbuild/linux-ia32@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.8.tgz#ee400af7b3bc69e8ca2e593ca35156ffb9abd54f"
   integrity sha512-8svILYKhE5XetuFk/B6raFYIyIqydQi+GngEXJgdPdI7OMKUbSd7uzR02wSY4kb53xBrClLkhH4Xs8P61Q2BaA==
 
-"@esbuild/linux-loong64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz#d5ad459d41ed42bbd4d005256b31882ec52227d8"
-  integrity sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==
-
 "@esbuild/linux-loong64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.8.tgz#8c509d8a454693d39824b83b3f66c400872fce82"
   integrity sha512-B6FyMeRJeV0NpyEOYlm5qtQfxbdlgmiGdD+QsipzKfFky0K5HW5Td6dyK3L3ypu1eY4kOmo7wW0o94SBqlqBSA==
 
-"@esbuild/linux-mips64el@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz#4e5967a665c38360b0a8205594377d4dcf9c3726"
-  integrity sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==
-
 "@esbuild/linux-mips64el@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.8.tgz#f2b0d36e63fb26bc3f95b203b6a80638292101ca"
   integrity sha512-CCb67RKahNobjm/eeEqeD/oJfJlrWyw29fgiyB6vcgyq97YAf3gCOuP6qMShYSPXgnlZe/i4a8WFHBw6N8bYAA==
 
-"@esbuild/linux-ppc64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz#206443a02eb568f9fdf0b438fbd47d26e735afc8"
-  integrity sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==
-
 "@esbuild/linux-ppc64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.8.tgz#1e628be003e036e90423716028cc884fe5ba25bd"
   integrity sha512-bytLJOi55y55+mGSdgwZ5qBm0K9WOCh0rx+vavVPx+gqLLhxtSFU0XbeYy/dsAAD6xECGEv4IQeFILaSS2auXw==
 
-"@esbuild/linux-riscv64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz#c351e433d009bf256e798ad048152c8d76da2fc9"
-  integrity sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==
-
 "@esbuild/linux-riscv64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.8.tgz#419a815cb4c3fb9f1b78ef5295f5b48b8bf6427a"
   integrity sha512-2YpRyQJmKVBEHSBLa8kBAtbhucaclb6ex4wchfY0Tj3Kg39kpjeJ9vhRU7x4mUpq8ISLXRXH1L0dBYjAeqzZAw==
 
-"@esbuild/linux-s390x@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz#661f271e5d59615b84b6801d1c2123ad13d9bd87"
-  integrity sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==
-
 "@esbuild/linux-s390x@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.8.tgz#291c49ae5c3d11d226352755c0835911fe1a9e5c"
   integrity sha512-QgbNY/V3IFXvNf11SS6exkpVcX0LJcob+0RWCgV9OiDAmVElnxciHIisoSix9uzYzScPmS6dJFbZULdSAEkQVw==
 
-"@esbuild/linux-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz#e4ba18e8b149a89c982351443a377c723762b85f"
-  integrity sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==
-
 "@esbuild/linux-x64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.8.tgz#03199d91c76faf80bd54104f5cbf0a489bc39f6a"
   integrity sha512-mM/9S0SbAFDBc4OPoyP6SEOo5324LpUxdpeIUUSrSTOfhHU9hEfqRngmKgqILqwx/0DVJBzeNW7HmLEWp9vcOA==
 
-"@esbuild/netbsd-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz#7d4f4041e30c5c07dd24ffa295c73f06038ec775"
-  integrity sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==
-
 "@esbuild/netbsd-x64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.8.tgz#b436d767e1b21852f9ed212e2bb57f77203b0ae2"
   integrity sha512-eKUYcWaWTaYr9zbj8GertdVtlt1DTS1gNBWov+iQfWuWyuu59YN6gSEJvFzC5ESJ4kMcKR0uqWThKUn5o8We6Q==
 
-"@esbuild/openbsd-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz#970fa7f8470681f3e6b1db0cc421a4af8060ec35"
-  integrity sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==
-
 "@esbuild/openbsd-x64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.8.tgz#d1481d8539e21d4729cd04a0450a26c2c8789e89"
   integrity sha512-Vc9J4dXOboDyMXKD0eCeW0SIeEzr8K9oTHJU+Ci1mZc5njPfhKAqkRt3B/fUNU7dP+mRyralPu8QUkiaQn7iIg==
 
-"@esbuild/sunos-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz#abc60e7c4abf8b89fb7a4fe69a1484132238022c"
-  integrity sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==
-
 "@esbuild/sunos-x64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.8.tgz#2cfb8126e079b2c00fd1bf095541e9f5c47877e4"
   integrity sha512-0xvOTNuPXI7ft1LYUgiaXtpCEjp90RuBBYovdd2lqAFxje4sEucurg30M1WIm03+3jxByd3mfo+VUmPtRSVuOw==
 
-"@esbuild/win32-arm64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz#7b0ff9e8c3265537a7a7b1fd9a24e7bd39fcd87a"
-  integrity sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==
-
 "@esbuild/win32-arm64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.8.tgz#7c6ecfd097ca23b82119753bf7072bbaefe51e3a"
   integrity sha512-G0JQwUI5WdEFEnYNKzklxtBheCPkuDdu1YrtRrjuQv30WsYbkkoixKxLLv8qhJmNI+ATEWquZe/N0d0rpr55Mg==
 
-"@esbuild/win32-ia32@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz#e90fe5267d71a7b7567afdc403dfd198c292eb09"
-  integrity sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==
-
 "@esbuild/win32-ia32@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.8.tgz#cffec63c3cb0ef8563a04df4e09fa71056171d00"
   integrity sha512-Fqy63515xl20OHGFykjJsMnoIWS+38fqfg88ClvPXyDbLtgXal2DTlhb1TfTX34qWi3u4I7Cq563QcHpqgLx8w==
 
-"@esbuild/win32-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz#c5a1a4bfe1b57f0c3e61b29883525c6da3e5c091"
-  integrity sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==
-
 "@esbuild/win32-x64@0.17.8":
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.8.tgz#200a0965cf654ac28b971358ecdca9cc5b44c335"
   integrity sha512-1iuezdyDNngPnz8rLRDO2C/ZZ/emJLb72OsZeqQ6gL6Avko/XCXZw+NuxBSNhBAP13Hie418V7VMt9et1FMvpg==
 
-"@eslint/eslintrc@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
-  integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==
+"@eslint/eslintrc@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.0.tgz#943309d8697c52fc82c076e90c1c74fbbe69dbff"
+  integrity sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -1695,6 +1512,11 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@eslint/js@8.35.0":
+  version "8.35.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.35.0.tgz#b7569632b0b788a0ca0e438235154e45d42813a7"
+  integrity sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==
+
 "@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"
@@ -1713,9 +1535,9 @@
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
 "@geoman-io/leaflet-geoman-free@^2.13.0":
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/@geoman-io/leaflet-geoman-free/-/leaflet-geoman-free-2.14.1.tgz#9feafd807acbcc1f6c1248d99957b4e9be4849ca"
-  integrity sha512-Uvynea84IVnT7CNkxyF68gU+qerhDi1ybRJRWbwvMG09isIZzCiVbVkdQzXqlLRMRwY/FIYFwlbCCuv94ML5Gw==
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/@geoman-io/leaflet-geoman-free/-/leaflet-geoman-free-2.14.2.tgz#c84c2115c263f34d11dc0b43859551639fe3d56b"
+  integrity sha512-6lIyG8RvSVdFjVjiQgBPyNASjymSyqzsiUeBW0pA+q41lB5fAg4SDC6SfJvWdEyDHa81Jb5FWjUkCc9O+u0gbg==
   dependencies:
     "@turf/boolean-contains" "^6.5.0"
     "@turf/kinks" "^6.5.0"
@@ -1812,7 +1634,7 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9":
+"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
   integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
@@ -1830,10 +1652,10 @@
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
-"@mat-datetimepicker/core@~11.0.2":
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/@mat-datetimepicker/core/-/core-11.0.2.tgz#d89cf5f60a95567ca6e193fcc16a60e91172abdb"
-  integrity sha512-qZeiDWjSQ8OmjrQ7hDR3ynYHAFCTFHViNr38RaemNpfvTWvnYD+rRfD5/dWDo0VqLzkJjpQe0oFXgMkHqDFgzg==
+"@mat-datetimepicker/core@~11.0.3":
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/@mat-datetimepicker/core/-/core-11.0.3.tgz#8a3958a603d1d2ed8ddc443f0b10e89f1b8d16d6"
+  integrity sha512-1M9sPoB3TfRb8hREDnv5R6uTi0iMlaY6oskxew0a+HVNTzZOBhwWWdKnlect8u+pXCmRBZI0QdMwx8nazeBdnA==
   dependencies:
     tslib "^2.4.0"
 
@@ -2621,6 +2443,42 @@
     "@material/theme" "15.0.0-canary.684e33d25.0"
     tslib "^2.1.0"
 
+"@messageformat/core@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@messageformat/core/-/core-3.0.1.tgz#191e12cf9643704d1fd32e592a3fbdc194dd588e"
+  integrity sha512-yxj2+0e46hcZqJfNf0ZYbC2q6WlcGoh4g11mCyRtTueR0AD8F9z4JMYAS1aOiFG8Vl1LZg/h5hZHKmWTAyZq8g==
+  dependencies:
+    "@messageformat/date-skeleton" "^1.0.0"
+    "@messageformat/number-skeleton" "^1.0.0"
+    "@messageformat/parser" "^5.0.0"
+    "@messageformat/runtime" "^3.0.1"
+    make-plural "^7.0.0"
+    safe-identifier "^0.4.1"
+
+"@messageformat/date-skeleton@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@messageformat/date-skeleton/-/date-skeleton-1.0.1.tgz#980b8babe21a11433b6e1e8f6dc8c4cae4f5f56b"
+  integrity sha512-jPXy8fg+WMPIgmGjxSlnGJn68h/2InfT0TNSkVx0IGXgp4ynnvYkbZ51dGWmGySEK+pBiYUttbQdu5XEqX5CRg==
+
+"@messageformat/number-skeleton@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@messageformat/number-skeleton/-/number-skeleton-1.1.0.tgz#eb636738da8abbd35ccbeb84f7d84d63302aeb61"
+  integrity sha512-F0Io+GOSvFFxvp9Ze3L5kAoZ2NnOAT0Mr/jpGNd3fqo8A0t4NxNIAcCdggtl2B/gN2ErkIKSBVPrF7xcW1IGvA==
+
+"@messageformat/parser@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@messageformat/parser/-/parser-5.0.0.tgz#5737e69d7d4a469998b527710f1891174fc1b262"
+  integrity sha512-WiDKhi8F0zQaFU8cXgqq69eYFarCnTVxKcvhAONufKf0oUxbqLMW6JX6rV4Hqh+BEQWGyKKKHY4g1XA6bCLylA==
+  dependencies:
+    moo "^0.5.1"
+
+"@messageformat/runtime@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@messageformat/runtime/-/runtime-3.0.1.tgz#94d1f6c43265c28ef7aed98ecfcc0968c6c849ac"
+  integrity sha512-6RU5ol2lDtO8bD9Yxe6CZkl0DArdv0qkuoZC+ZwowU+cdRlVE1157wjCmlA5Rsf1Xc/brACnsZa5PZpEDfTFFg==
+  dependencies:
+    make-plural "^7.0.0"
+
 "@ngrx/effects@^15.3.0":
   version "15.3.0"
   resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-15.3.0.tgz#96af2d8121384d782e278a08b8b3643c1d08ae82"
@@ -2642,15 +2500,10 @@
   dependencies:
     tslib "^2.0.0"
 
-"@ngtools/webpack@15.1.6", "@ngtools/webpack@^15.1.6":
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-15.1.6.tgz#8fd657bbeb9958e89851810b74010925a2d6c4f8"
-  integrity sha512-ieHO6c3m+LZ93/B4n4QD908tUCkyNPFF9spMjJFZf8SRpLLvzOISMgiAej7UUxcBiB2kOfdVrpHf4Os4D9CsrQ==
-
-"@ngtools/webpack@15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-15.2.0.tgz#86df4d03f4acc30bc3cf1571664ddb2935a92d45"
-  integrity sha512-jrpIOsEQxkWf5RnKn1izAixO+/hh6GkKmMl+hCv4rnn98XlKDmNRhG2KEIHJZF/3IEcAv9HVlIETRnLoVyJeeQ==
+"@ngtools/webpack@15.2.1", "@ngtools/webpack@^15.1.6":
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-15.2.1.tgz#439ac075b2dcb9f304f0b7009182cc5049c7988a"
+  integrity sha512-YtA8rWAglPuf4CSStrFAxaprTSYE+DREGrJFc3WvZLcF5XrwVK+H4CC4Pmz07iYsG1TXShR4bWp1fbGw1cmBKw==
 
 "@ngx-translate/core@^14.0.0":
   version "14.0.0"
@@ -2718,9 +2571,9 @@
     which "^3.0.0"
 
 "@npmcli/installed-package-contents@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.0.1.tgz#3cad3141c95613426820128757a3549bef1b346b"
-  integrity sha512-GIykAFdOVK31Q1/zAtT5MbxqQL2vyl9mvFJv+OGu01zxbhL3p0xc8gJjdNGX1mWmUT43aEKVO2L6V/2j4TOsAA==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz#bfd817eccd9e8df200919e73f57f9e3d9e4f9e33"
+  integrity sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==
   dependencies:
     npm-bundled "^3.0.0"
     npm-normalize-package-bin "^3.0.0"
@@ -2756,13 +2609,13 @@
     read-package-json-fast "^3.0.0"
     which "^3.0.0"
 
-"@schematics/angular@15.2.0":
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-15.2.0.tgz#3ce5a5f488960e34e0f403483e4ffeda2cf028f8"
-  integrity sha512-KnsG7xyEbjg+6zflANkdynXdS3wi9rSCg+8Y7erKdygD90O/JcT68PcanvTU2GfawDkBtvAR5VMURw2TIfCTnw==
+"@schematics/angular@15.2.1":
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-15.2.1.tgz#c5e90ff4f3a0aa9470a6f20f71e55208e6ca2a19"
+  integrity sha512-D0LtMGXxhMwGoK89TG606kY6CfQWrdOQ/bjOg/33xXJQWvGqUK8ZQtD7/lhcu5RWi3jduPh7V8jYWuAoA69Eig==
   dependencies:
-    "@angular-devkit/core" "15.2.0"
-    "@angular-devkit/schematics" "15.2.0"
+    "@angular-devkit/core" "15.2.1"
+    "@angular-devkit/schematics" "15.2.1"
     jsonc-parser "3.2.0"
 
 "@socket.io/component-emitter@~3.1.0":
@@ -2795,6 +2648,13 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
   integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
 
+"@tufjs/models@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.0.tgz#5a5784e8770b7d014b5f87bff35af1f71fdebf1f"
+  integrity sha512-RRMu4uMxWnZlxaIBxahSb2IssFZiu188sndesZflWOe1cA/qUqtemSIoBWbuVKPvvdktapImWNnKpBcc+VrCQw==
+  dependencies:
+    minimatch "^6.1.0"
+
 "@turf/bbox@*", "@turf/bbox@^6.5.0":
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/@turf/bbox/-/bbox-6.5.0.tgz#bec30a744019eae420dac9ea46fb75caa44d8dc5"
@@ -3070,9 +2930,9 @@
   integrity sha512-ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA==
 
 "@types/http-proxy@^1.17.8":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a"
-  integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==
+  version "1.17.10"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.10.tgz#e576c8e4a0cc5c6a138819025a88e167ebb38d6c"
+  integrity sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g==
   dependencies:
     "@types/node" "*"
 
@@ -3151,9 +3011,9 @@
     "@types/leaflet" "*"
 
 "@types/leaflet@*", "@types/leaflet@^1.7.11":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.9.0.tgz#8caf452255e16cb15e0eabcb0d2a26793da0a6a2"
-  integrity sha512-7LeOSj7EloC5UcyOMo+1kc3S1UT3MjJxwqsMT1d2PTyvQz53w0Y0oSSk9nwZnOZubCmBvpSNGceucxiq+ZPEUw==
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.9.1.tgz#a220706b02c6024951d7fc2959d530c6941c4224"
+  integrity sha512-lYawM3I3lLO6rmBASaqdGgY6zUL4YHr3H79/axx7FNYyPXuj0P1DZHbkNo8Itbv0i7Y9EryLWtDXXROMygXhRA==
   dependencies:
     "@types/geojson" "*"
 
@@ -3172,22 +3032,15 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
   integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
 
-"@types/moment-timezone@^0.5.30":
-  version "0.5.30"
-  resolved "https://registry.yarnpkg.com/@types/moment-timezone/-/moment-timezone-0.5.30.tgz#340ed45fe3e715f4a011f5cfceb7cb52aad46fc7"
-  integrity sha512-aDVfCsjYnAQaV/E9Qc24C5Njx1CoDjXsEgkxtp9NyXDpYu4CCbmclb6QhWloS9UTU/8YROUEEdEkWI0D7DxnKg==
-  dependencies:
-    moment-timezone "*"
-
 "@types/mousetrap@^1.6.0", "@types/mousetrap@^1.6.9":
   version "1.6.11"
   resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.11.tgz#ef9620160fdcefcb85bccda8aaa3e84d7429376d"
   integrity sha512-F0oAily9Q9QQpv9JKxKn0zMKfOo36KHCW7myYsmUyf2t0g+sBTbG3UleTPoguHdE1z3GLFr3p7/wiOio52QFjQ==
 
 "@types/node@*", "@types/node@>=10.0.0":
-  version "18.13.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.13.0.tgz#0400d1e6ce87e9d3032c19eb6c58205b0d3f7850"
-  integrity sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==
+  version "18.14.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.5.tgz#4a13a6445862159303fc38586598a9396fc408b3"
+  integrity sha512-CRT4tMK/DHYhw1fcCEBwME9CSaZNclxfzVMe7GsO6ULSwsttbj70wSiX6rZdIjGblu93sTJxLdhNIT85KKI7Qw==
 
 "@types/node@~15.14.9":
   version "15.14.9"
@@ -3275,9 +3128,9 @@
     "@types/express" "*"
 
 "@types/serve-static@*", "@types/serve-static@^1.13.10":
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155"
-  integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d"
+  integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==
   dependencies:
     "@types/mime" "*"
     "@types/node" "*"
@@ -4089,7 +3942,7 @@ blocking-proxy@^1.0.0:
   dependencies:
     minimist "^1.2.0"
 
-body-parser@1.20.1, body-parser@^1.19.0:
+body-parser@1.20.1:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
   integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
@@ -4107,6 +3960,24 @@ body-parser@1.20.1, body-parser@^1.19.0:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
+body-parser@^1.19.0:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.5"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.2"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
+
 bonjour-service@^1.0.11:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.0.tgz#424170268d68af26ff83a5c640b95def01803a13"
@@ -4144,16 +4015,6 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browserslist@4.21.4:
-  version "4.21.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
-  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
-  dependencies:
-    caniuse-lite "^1.0.30001400"
-    electron-to-chromium "^1.4.251"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.9"
-
 browserslist@4.21.5, browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
   version "4.21.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
@@ -4262,10 +4123,10 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001449:
-  version "1.0.30001453"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001453.tgz#6d3a1501622bf424a3cee5ad9550e640b0de3de8"
-  integrity sha512-R9o/uySW38VViaTrOtwfbFEiBFUh7ST3uIG4OEymIG3/uKdHDO4xk/FaqfUw0d+irSUyFPy3dZszf9VvSTPnsA==
+caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001449:
+  version "1.0.30001460"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz#31d2e26f0a2309860ed3eff154e03890d9d851a7"
+  integrity sha512-Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ==
 
 canvas-gauges@^2.1.7:
   version "2.1.7"
@@ -4581,7 +4442,7 @@ content-disposition@0.5.4:
   dependencies:
     safe-buffer "5.2.1"
 
-content-type@~1.0.4:
+content-type@~1.0.4, content-type@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
@@ -4626,16 +4487,16 @@ copy-webpack-plugin@11.0.0:
     serialize-javascript "^6.0.0"
 
 core-js-compat@^3.25.1:
-  version "3.28.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.28.0.tgz#c08456d854608a7264530a2afa281fadf20ecee6"
-  integrity sha512-myzPgE7QodMg4nnd3K1TDoES/nADRStM8Gpz0D6nhkwbmwEnE0ZGJgoWsvQ722FR8D7xS0n0LV556RcEicjTyg==
+  version "3.29.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.29.0.tgz#1b8d9eb4191ab112022e7f6364b99b65ea52f528"
+  integrity sha512-ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ==
   dependencies:
     browserslist "^4.21.5"
 
 core-js@^3.26.1:
-  version "3.28.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.28.0.tgz#ed8b9e99c273879fdfff0edfc77ee709a5800e4a"
-  integrity sha512-GiZn9D4Z/rSYvTeg1ljAIsEqFm0LaN9gVtwDCrKL80zHtS31p9BAjmTxVqTQDMpwlMolJZOFntUG2uwyj7DAqw==
+  version "3.29.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.29.0.tgz#0273e142b67761058bcde5615c503c7406b572d6"
+  integrity sha512-VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -5376,10 +5237,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.4.251, electron-to-chromium@^1.4.284:
-  version "1.4.299"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.299.tgz#faa2069cd4879a73e540e533178db5c618768d41"
-  integrity sha512-lQ7ijJghH6pCGbfWXr6EY+KYCMaRSjgsY925r1p/TlpSfVM1VjHTcn1gAc15VM4uwti283X6QtjPTXdpoSGiZQ==
+electron-to-chromium@^1.4.284:
+  version "1.4.317"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.317.tgz#9a3d38a1a37f26a417d3d95dafe198ff11ed072b"
+  integrity sha512-JhCRm9v30FMNzQSsjl4kXaygU+qHBD0Yh7mKxyjmF0V8VwYVB6qpBRX28GyAucrM9wDCpSUctT6FpMUQxbyKuA==
 
 elkjs@^0.8.2:
   version "0.8.2"
@@ -5392,9 +5253,9 @@ emoji-regex@^8.0.0:
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 emoji-toolkit@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-toolkit/-/emoji-toolkit-7.0.0.tgz#63b5e5bdc63acd2e5629a0157969b94d414961fb"
-  integrity sha512-swoVbGlR/cyJ2ysrw1+axjRkEHAlH0myhbK1ybkv8zR6r9KpL4vzb96m3Y2j0hixUKj1Nb8YBQbk3ihB+XkpBw==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/emoji-toolkit/-/emoji-toolkit-7.0.1.tgz#4ea2a78fe4b40c7cdbe7ef5725c7011299932f09"
+  integrity sha512-l5aJyAhpC5s4mDuoVuqt4SzVjwIsIvakPh4ZGJJE4KWuWFCEHaXacQFkStVdD9zbRR+/BbRXob7u99o0lQFr8A==
 
 emojis-list@^3.0.0:
   version "3.0.0"
@@ -5423,10 +5284,10 @@ engine.io-parser@~5.0.3:
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.6.tgz#7811244af173e157295dec9b2718dfe42a64ef45"
   integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==
 
-engine.io@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.0.tgz#de27f79ecb58301171aea7956f3f6f4fa578490a"
-  integrity sha512-OgxY1c/RuCSeO/rTr8DIFXx76IzUUft86R7/P7MMbbkuzeqJoTNw2lmeD91IyGz41QYleIIjWeMJGgug043sfQ==
+engine.io@~6.4.1:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.1.tgz#8056b4526a88e779f9c280d820422d4e3eeaaae5"
+  integrity sha512-JFYQurD/nbsA5BSPmbaOSLa3tSVj8L6o4srSwXXY3NqE+gGUNmmPTbhn8tjzcCtSqhFgIeqef81ngny8JM25hw==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
@@ -5582,44 +5443,11 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-esbuild-wasm@0.16.17:
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.16.17.tgz#b8d41ab99a9b725765a138f0f1d2381e891f913d"
-  integrity sha512-Tn7NuMqRcM+T/qCOxbQRq0qrwWl1sUWp6ARfJRakE8Bepew6zata4qrKgH2YqovNC5e/2fcTa7o+VL/FAOZC1Q==
-
 esbuild-wasm@0.17.8:
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.17.8.tgz#c2348306430c27613ee3cc9a955cdd54df29137a"
   integrity sha512-zCmpxv95E0FuCmvdw1K836UHnj4EdiQnFfjTby35y3LAjRPtXMj3sbHDRHjbD8Mqg5lTwq3knacr/1qIFU51CQ==
 
-esbuild@0.16.17:
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.17.tgz#fc2c3914c57ee750635fee71b89f615f25065259"
-  integrity sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==
-  optionalDependencies:
-    "@esbuild/android-arm" "0.16.17"
-    "@esbuild/android-arm64" "0.16.17"
-    "@esbuild/android-x64" "0.16.17"
-    "@esbuild/darwin-arm64" "0.16.17"
-    "@esbuild/darwin-x64" "0.16.17"
-    "@esbuild/freebsd-arm64" "0.16.17"
-    "@esbuild/freebsd-x64" "0.16.17"
-    "@esbuild/linux-arm" "0.16.17"
-    "@esbuild/linux-arm64" "0.16.17"
-    "@esbuild/linux-ia32" "0.16.17"
-    "@esbuild/linux-loong64" "0.16.17"
-    "@esbuild/linux-mips64el" "0.16.17"
-    "@esbuild/linux-ppc64" "0.16.17"
-    "@esbuild/linux-riscv64" "0.16.17"
-    "@esbuild/linux-s390x" "0.16.17"
-    "@esbuild/linux-x64" "0.16.17"
-    "@esbuild/netbsd-x64" "0.16.17"
-    "@esbuild/openbsd-x64" "0.16.17"
-    "@esbuild/sunos-x64" "0.16.17"
-    "@esbuild/win32-arm64" "0.16.17"
-    "@esbuild/win32-ia32" "0.16.17"
-    "@esbuild/win32-x64" "0.16.17"
-
 esbuild@0.17.8:
   version "0.17.8"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.8.tgz#f7f799abc7cdce3f0f2e3e0c01f120d4d55193b4"
@@ -5706,9 +5534,9 @@ eslint-plugin-import@latest:
     tsconfig-paths "^3.14.1"
 
 eslint-plugin-jsdoc@latest:
-  version "40.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-40.0.0.tgz#7f433757aa91721e4b88a527dc17ac0437c3c075"
-  integrity sha512-LOPyIu1vAVvGPkye3ci0moj0iNf3f8bmin6do2DYDj+77NRXWnkmhKRy8swWsatUs3mB5jYPWPUsFg9pyfEiyA==
+  version "40.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-40.0.1.tgz#5f028b4928d5c77f54bfd3c42c00acb61d27bb9f"
+  integrity sha512-KkiRInury7YrjjV5aCHDxwsPy6XFt5p2b2CnpDMITnWs8patNPf5kj24+VXIWw45kP6z/B0GOKfrYczB56OjQQ==
   dependencies:
     "@es-joy/jsdoccomment" "~0.36.1"
     comment-parser "1.3.1"
@@ -5757,11 +5585,12 @@ eslint-visitor-keys@^3.3.0:
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
 eslint@^8.28.0:
-  version "8.34.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.34.0.tgz#fe0ab0ef478104c1f9ebc5537e303d25a8fb22d6"
-  integrity sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==
+  version "8.35.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.35.0.tgz#fffad7c7e326bae606f0e8f436a6158566d42323"
+  integrity sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==
   dependencies:
-    "@eslint/eslintrc" "^1.4.1"
+    "@eslint/eslintrc" "^2.0.0"
+    "@eslint/js" "8.35.0"
     "@humanwhocodes/config-array" "^0.11.8"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
@@ -5775,7 +5604,7 @@ eslint@^8.28.0:
     eslint-utils "^3.0.0"
     eslint-visitor-keys "^3.3.0"
     espree "^9.4.0"
-    esquery "^1.4.0"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
@@ -5815,10 +5644,10 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.2.tgz#c6d3fee05dd665808e2ad870631f221f5617b1d1"
-  integrity sha512-JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==
+esquery@^1.4.0, esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -6306,17 +6135,6 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 glob@8.1.0, glob@^8.0.1, glob@^8.0.3:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
@@ -6828,12 +6646,12 @@ is-arguments@^1.1.1:
     has-tostringtag "^1.0.0"
 
 is-array-buffer@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.1.tgz#deb1db4fcae48308d54ef2442706c0393997052a"
-  integrity sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
+  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
   dependencies:
     call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
+    get-intrinsic "^1.2.0"
     is-typed-array "^1.1.10"
 
 is-arrayish@^0.2.1:
@@ -7215,7 +7033,7 @@ jquery.terminal@^2.29.4:
   optionalDependencies:
     fsevents "^2.3.2"
 
-jquery@>=1.9.1, jquery@^3.6.0:
+jquery@>=1.9.1, jquery@^3.5.0, jquery@^3.6.0:
   version "3.6.3"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz#23ed2ffed8a19e048814f13391a19afcdba160e6"
   integrity sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==
@@ -7317,7 +7135,7 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-json5@^1.0.1:
+json5@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
   integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
@@ -7443,11 +7261,11 @@ jstree-bootstrap-theme@^1.0.1:
     jquery ">=1.9.1"
 
 jstree@^3.3.12:
-  version "3.3.14"
-  resolved "https://registry.yarnpkg.com/jstree/-/jstree-3.3.14.tgz#f0615160a39ad1b48b2bd734388ca3eb3f44577b"
-  integrity sha512-W8t+nFOKENXNIulvu+DW4gPcnpOXY0FswiTiOn1Fnhs6poRe6eA/Kf6fS1/GJJ8C8KEy0q3ttF6tbGRDmHIM/g==
+  version "3.3.15"
+  resolved "https://registry.yarnpkg.com/jstree/-/jstree-3.3.15.tgz#364bfa0fc4c0b1b7b5bc122cda44a0f09e59eba4"
+  integrity sha512-fNK2EBgGjaJQ3cJuINX/80vDeAufYWtM0csudgYl3eJG+eRAH/1r1IJVUOvAlJIa+uSgg+Fi8uGrt+Xbs92eKg==
   dependencies:
-    jquery "^3.6.0"
+    jquery "^3.5.0"
 
 jszip@^3.1.3, jszip@^3.10.1:
   version "3.10.1"
@@ -7630,9 +7448,9 @@ levn@^0.4.1:
     type-check "~0.4.0"
 
 libphonenumber-js@^1.10.4:
-  version "1.10.20"
-  resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.10.20.tgz#03c310adf83381eeceb4bd6830442fd14e64964d"
-  integrity sha512-kQovlKNdLcVzerbTPmJ+Fx4R+7/pYXmPDIllHjg7IxL4X6MsMG7jaT5opfYrBok0uqkByVif//JUR8e11l/V7w==
+  version "1.10.21"
+  resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.10.21.tgz#860312cbec1389e36e28389161025c7817a3ae32"
+  integrity sha512-/udZhx49av2r2gZR/+xXSrwcR8smX/sDNrVpOFrvW+CA26TfYTVZfwb3MIDvmwAYMLs7pXuJjZX0VxxGpqPhsA==
 
 license-webpack-plugin@4.0.2:
   version "4.0.2"
@@ -7730,15 +7548,15 @@ log-symbols@^4.1.0:
     is-unicode-supported "^0.1.0"
 
 log4js@^6.4.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.7.1.tgz#06e12b1ac915dd1067146ffad8215f666f7d2c51"
-  integrity sha512-lzbd0Eq1HRdWM2abSD7mk6YIVY0AogGJzb/z+lqzRk+8+XJP+M6L1MS5FUSc3jjGru4dbKjEMJmqlsoYYpuivQ==
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.8.0.tgz#f0fe9b2b82725aaf97f20692e23381a5c5722448"
+  integrity sha512-g+V8gZyurIexrOvWQ+AcZsIvuK/lBnx2argejZxL4gVZ4Hq02kUYH6WZOnqxgBml+zzQZYdaEoTN84B6Hzm8Fg==
   dependencies:
     date-format "^4.0.14"
     debug "^4.3.4"
     flatted "^3.2.7"
     rfdc "^1.3.0"
-    streamroller "^3.1.3"
+    streamroller "^3.1.5"
 
 loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
@@ -7770,16 +7588,9 @@ lru-cache@^6.0.0:
     yallist "^4.0.0"
 
 lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.15.0.tgz#4437550407da5ec8c4fe0946a137fe2f7f07a171"
-  integrity sha512-LKpNuyKR1lRsqN5DatvMOkW2nmUAwI22HoQK604nhs+WiRWSIC0MFUKq2XYUKv1fCVPK9Cro4d4Il3DxM80/fQ==
-
-magic-string@0.27.0, magic-string@^0.27.0:
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3"
-  integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==
-  dependencies:
-    "@jridgewell/sourcemap-codec" "^1.4.13"
+  version "7.18.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.1.tgz#4716408dec51d5d0104732647f584d1f6738b109"
+  integrity sha512-8/HcIENyQnfUTCDizRu9rrDyG6XG/21M4X7/YEGZeD76ZJilFPAUVb/2zysFf7VVO1LEjCDFyHp8pMMvozIrvg==
 
 magic-string@0.29.0:
   version "0.29.0"
@@ -7788,6 +7599,13 @@ magic-string@0.29.0:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.13"
 
+magic-string@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3"
+  integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.13"
+
 make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -7851,12 +7669,10 @@ make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1:
     socks-proxy-agent "^7.0.0"
     ssri "^10.0.0"
 
-make-plural@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-4.3.0.tgz#f23de08efdb0cac2e0c9ba9f315b0dff6b4c2735"
-  integrity sha512-xTYd4JVHpSCW+aqDof6w/MebaMVNTVYBZhbB/vi513xXdiPT92JMVCo0Jq8W2UZnzYRFeVbQiQ+I25l13JuKvA==
-  optionalDependencies:
-    minimist "^1.2.0"
+make-plural@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-7.2.0.tgz#93174b1419672a48a2340db6c1d3fb217530c684"
+  integrity sha512-WkdI+iaWaBCFM2wUXwos8Z7spg5Dt64Xe/VI6NpRaly21cDtD76N6S97K//UtzV0dHOiXX+E90TnszdXHG0aMg==
 
 marked@^4.0.17:
   version "4.2.12"
@@ -7911,25 +7727,6 @@ mermaid@^9.1.2:
     ts-dedent "^2.2.0"
     uuid "^9.0.0"
 
-messageformat-formatters@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/messageformat-formatters/-/messageformat-formatters-2.0.1.tgz#0492c1402a48775f751c9b17c0354e92be012b08"
-  integrity sha512-E/lQRXhtHwGuiQjI7qxkLp8AHbMD5r2217XNe/SREbBlSawe0lOqsFb7rflZJmlQFSULNLIqlcjjsCPlB3m3Mg==
-
-messageformat-parser@^4.1.2:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.3.tgz#b824787f57fcda7d50769f5b63e8d4fda68f5b9e"
-  integrity sha512-2fU3XDCanRqeOCkn7R5zW5VQHWf+T3hH65SzuqRvjatBK7r4uyFa5mEX+k6F9Bd04LVM5G4/BHBTUJsOdW7uyg==
-
-messageformat@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/messageformat/-/messageformat-2.3.0.tgz#de263c49029d5eae65d7ee25e0754f57f425ad91"
-  integrity sha512-uTzvsv0lTeQxYI2y1NPa1lItL5VRI8Gb93Y2K2ue5gBPyrbJxfDi/EYWxh2PKv5yO42AJeeqblS9MJSh/IEk4w==
-  dependencies:
-    make-plural "^4.3.0"
-    messageformat-formatters "^2.0.1"
-    messageformat-parser "^4.1.2"
-
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -8074,9 +7871,9 @@ minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
     yallist "^4.0.0"
 
 minipass@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.3.tgz#00bfbaf1e16e35e804f4aa31a7c1f6b8d9f0ee72"
-  integrity sha512-OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw==
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.4.tgz#7d0d97434b6a19f59c5c3221698b48bbf3b2cd06"
+  integrity sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ==
 
 minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
@@ -8098,18 +7895,23 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment-timezone@*, moment-timezone@^0.5.40:
-  version "0.5.40"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz#c148f5149fd91dd3e29bf481abc8830ecba16b89"
-  integrity sha512-tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg==
+moment-timezone@^0.5.41:
+  version "0.5.41"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.41.tgz#a7ad3285fd24aaf5f93b8119a9d749c8039c64c5"
+  integrity sha512-e0jGNZDOHfBXJGz8vR/sIMXvBIGJJcqFjmlg9lmE+5KX1U7/RZNMswfD8nKnNCnQdKTIj50IaRKwl1fvMLyyRg==
   dependencies:
-    moment ">= 2.9.0"
+    moment "^2.29.4"
 
-"moment@>= 2.9.0", moment@^2.29.1, moment@^2.29.4:
+moment@^2.29.4:
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
+moo@^0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
+  integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
+
 mousetrap@^1.6.5:
   version "1.6.5"
   resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9"
@@ -8249,12 +8051,12 @@ ngx-sharebuttons@^11.0.0:
   dependencies:
     tslib "^2.0.0"
 
-ngx-translate-messageformat-compiler@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ngx-translate-messageformat-compiler/-/ngx-translate-messageformat-compiler-5.1.0.tgz#97b2e9a5f8269f1783e92a2c85d27701a64893f3"
-  integrity sha512-3P/uut2IGXWfFAn5oYbwEJO6uYzUlySLf3zf13HvFreSlzI8APfUmv6v9mxt9LN0KeJKJiK3mmEbUzgqlsI8OA==
+ngx-translate-messageformat-compiler@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/ngx-translate-messageformat-compiler/-/ngx-translate-messageformat-compiler-6.2.0.tgz#54cd3dc151e29d035d483ad3ac8951fb1e074a25"
+  integrity sha512-niGhub53gMw8GbmP3u3OB7SVJn7z5JZodQxQxDb6ZE0A9c0WeVBzz30WbekQshBF7ijzLYE/qcM+lzTCpWkRmg==
   dependencies:
-    tslib "^2.3.1"
+    tslib "^2.4.1"
 
 ngx-window-token@>=6.0.0:
   version "6.0.0"
@@ -8307,7 +8109,7 @@ node-gyp@^9.0.0:
     tar "^6.1.2"
     which "^2.0.2"
 
-node-releases@^2.0.6, node-releases@^2.0.8:
+node-releases@^2.0.8:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
   integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
@@ -8517,16 +8319,7 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@8.4.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
-  integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
-  dependencies:
-    define-lazy-prop "^2.0.0"
-    is-docker "^2.1.1"
-    is-wsl "^2.2.0"
-
-open@8.4.1, open@^8.0.9:
+open@8.4.1:
   version "8.4.1"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.1.tgz#2ab3754c07f5d1f99a7a8d6a82737c95e3101cff"
   integrity sha512-/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg==
@@ -8543,6 +8336,15 @@ open@^7.4.2:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
 
+open@^8.0.9:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
+  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
+  dependencies:
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
+
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
@@ -8674,14 +8476,6 @@ parse-node-version@^1.0.1:
   resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
   integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
-parse5-html-rewriting-stream@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz#de1820559317ab4e451ea72dba05fddfd914480b"
-  integrity sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg==
-  dependencies:
-    parse5 "^6.0.1"
-    parse5-sax-parser "^6.0.1"
-
 parse5-html-rewriting-stream@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz#e376d3e762d2950ccbb6bb59823fc1d7e9fdac36"
@@ -8698,13 +8492,6 @@ parse5-htmlparser2-tree-adapter@^6.0.1:
   dependencies:
     parse5 "^6.0.1"
 
-parse5-sax-parser@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz#98b4d366b5b266a7cd90b4b58906667af882daba"
-  integrity sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg==
-  dependencies:
-    parse5 "^6.0.1"
-
 parse5-sax-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz#4c05064254f0488676aca75fb39ca069ec96dee5"
@@ -9107,6 +8894,16 @@ raw-body@2.5.1:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 raw-loader@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
@@ -9187,9 +8984,9 @@ rc-trigger@^5.0.4:
     rc-util "^5.19.2"
 
 rc-util@^5.15.0, rc-util@^5.19.2, rc-util@^5.21.0, rc-util@^5.26.0, rc-util@^5.27.0, rc-util@^5.9.8:
-  version "5.27.2"
-  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.27.2.tgz#472a7bab26a62856c2c016d18dc6356e46d01012"
-  integrity sha512-8XHRbeJOWlTR2Hk1K2xLaPOf7lZu+3taskAGuqOPccA676vB3ygrz3ZgdrA3wml40CzR9RlIEHDWwI7FZT3wBQ==
+  version "5.28.0"
+  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.28.0.tgz#9e5e441d5875b8bf0ba56c2f295042a28dcff580"
+  integrity sha512-KYDjhGodswVj29v0TRciKTqRPgumIFvFDndbCD227pitQ+0Cei196rxk+OXb/blu6V8zdTRK5RjCJn+WmHLvBA==
   dependencies:
     "@babel/runtime" "^7.18.3"
     react-is "^16.12.0"
@@ -9287,9 +9084,9 @@ read-package-json@^6.0.0:
     npm-normalize-package-bin "^3.0.0"
 
 readable-stream@^2.0.1, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -9300,9 +9097,9 @@ readable-stream@^2.0.1, readable-stream@~2.3.6:
     util-deprecate "~1.0.1"
 
 readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.1.tgz#f9f9b5f536920253b3d26e7660e7da4ccff9bb62"
+  integrity sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -9368,7 +9165,7 @@ regexpp@^3.2.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regexpu-core@^5.2.1:
+regexpu-core@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.1.tgz#66900860f88def39a5cb79ebd9490e84f17bcdfb"
   integrity sha512-nCOzW2V/X15XpLsK2rlgdwrysrBq+AauCn+omItIz4R1pIcmeot5zvjdmOBRLzEH/CkC6IxMJVmxDe3QcMuNVQ==
@@ -9563,6 +9360,11 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0,
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-identifier@^0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb"
+  integrity sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==
+
 safe-regex-test@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
@@ -9590,15 +9392,6 @@ sass-loader@13.2.0:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass@1.57.1:
-  version "1.57.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.57.1.tgz#dfafd46eb3ab94817145e8825208ecf7281119b5"
-  integrity sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==
-  dependencies:
-    chokidar ">=3.0.0 <4.0.0"
-    immutable "^4.0.0"
-    source-map-js ">=0.6.2 <2.0.0"
-
 sass@1.58.1:
   version "1.58.1"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.58.1.tgz#17ab0390076a50578ed0733f1cc45429e03405f6"
@@ -9866,14 +9659,14 @@ socket.io-parser@~4.2.1:
     debug "~4.3.1"
 
 socket.io@^4.4.1:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.6.0.tgz#82ebfd7652572872e10dbb19533fc7cb930d0bc3"
-  integrity sha512-b65bp6INPk/BMMrIgVvX12x3Q+NqlGqSlTuvKQWt0BUJ3Hyy3JangBl7fEoWZTXbOKlCqNPbQ6MbWgok/km28w==
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.6.1.tgz#62ec117e5fce0692fa50498da9347cfb52c3bc70"
+  integrity sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
     debug "~4.3.2"
-    engine.io "~6.4.0"
+    engine.io "~6.4.1"
     socket.io-adapter "~2.5.2"
     socket.io-parser "~4.2.1"
 
@@ -10057,7 +9850,7 @@ stop-iteration-iterator@^1.0.0:
   dependencies:
     internal-slot "^1.0.4"
 
-streamroller@^3.1.3:
+streamroller@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.5.tgz#1263182329a45def1ffaef58d31b15d13d2ee7ff"
   integrity sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==
@@ -10220,20 +10013,20 @@ terser-webpack-plugin@^5.1.3:
     serialize-javascript "^6.0.0"
     terser "^5.14.1"
 
-terser@5.16.1:
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880"
-  integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==
+terser@5.16.3:
+  version "5.16.3"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.3.tgz#3266017a9b682edfe019b8ecddd2abaae7b39c6b"
+  integrity sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q==
   dependencies:
     "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-terser@5.16.3, terser@^5.14.1:
-  version "5.16.3"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.3.tgz#3266017a9b682edfe019b8ecddd2abaae7b39c6b"
-  integrity sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q==
+terser@^5.14.1:
+  version "5.16.5"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.5.tgz#1c285ca0655f467f92af1bbab46ab72d1cb08e5a"
+  integrity sha512-qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg==
   dependencies:
     "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
@@ -10372,12 +10165,12 @@ ts-transformer-keys@^0.4.4:
   integrity sha512-LrqgvaFvar01/5mbunRyeLTSIkqoC2xfcpL/90aDY6vR07DGyH+UaYGdIEsUudnlAw2Sr0pxFgdZvE0QIyI4qA==
 
 tsconfig-paths@^3.14.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
-  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
+  integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
   dependencies:
     "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
+    json5 "^1.0.2"
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
@@ -10390,11 +10183,6 @@ tsconfig-paths@^4.1.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
-  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
-
 tslib@2.5.0, tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
@@ -10413,12 +10201,12 @@ tsutils@^3.21.0:
     tslib "^1.8.1"
 
 tuf-js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.0.0.tgz#c89daaf69b348081a86e9f766151dfd7ce0f5078"
-  integrity sha512-1dxsQwESDzACJjTdYHQ4wJ1f/of7jALWKfJEHSBWUQB/5UTJUx9SW6GHXp4mZ1KvdBRJCpGjssoPFGi4hvw8/A==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.0.tgz#25dd680bce9e3819e1fe4640d85186f862efb827"
+  integrity sha512-Tsqlm419OAlrkCE6rsf1WuPvww44vfK1ZHz+Uq9Mpq5JiV5qnJ9LLItvsbM9OipIIeSG3rydVBS4BmD40ts2uA==
   dependencies:
+    "@tufjs/models" "1.0.0"
     make-fetch-happen "^11.0.1"
-    minimatch "^6.1.0"
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
@@ -10577,7 +10365,7 @@ 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==
 
-update-browserslist-db@^1.0.10, update-browserslist-db@^1.0.9:
+update-browserslist-db@^1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
   integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
@@ -11053,9 +10841,9 @@ yargs@^16.1.1:
     yargs-parser "^20.2.2"
 
 yargs@^17.2.1:
-  version "17.7.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.0.tgz#b21e9af1e0a619a2a9c67b1133219b2975a07985"
-  integrity sha512-dwqOPg5trmrre9+v8SUo2q/hAwyKoVfu8OC1xPHKJGNdxAvPl4sKxL4vBnh3bQz/ZvvGAFeA5H3ou2kcOY8sQQ==
+  version "17.7.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
+  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
   dependencies:
     cliui "^8.0.1"
     escalade "^3.1.1"