Merge branch 'master' of github.com:thingsboard/thingsboard

 {
 {
   "title": "Firmware",
   "title": "Firmware",
+  "image": null,
   "configuration": {
   "configuration": {
     "description": "",
     "description": "",
     "widgets": {
     "widgets": {
@@ -247,7 +248,7 @@
                 "name": "Edit firmware",
                 "name": "Edit firmware",
                 "icon": "edit",
                 "icon": "edit",
                 "type": "customPretty",
                 "type": "customPretty",
-                "customHtml": "<form #editEntityForm=\"ngForm\" [formGroup]=\"editEntityFormGroup\"\n      (ngSubmit)=\"save()\"  class=\"edit-entity-form\">\n    <mat-toolbar fxLayout=\"row\" color=\"primary\">\n        <h2>Edit firmware {{entityName}}</h2>\n        <span fxFlex></span>\n        <button mat-icon-button (click)=\"cancel()\" 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 *ngIf=\"entity.deviceProfileId\" mat-dialog-content fxLayout=\"column\">\n        <tb-firmware-autocomplete\n            [useFullEntityId]=\"true\"\n            [deviceProfileId]=\"entity.deviceProfileId.id\"\n            formControlName=\"firmwareId\">\n        </tb-firmware-autocomplete>\n    </div>\n    <div mat-dialog-actions fxLayout=\"row\" fxLayoutAlign=\"end center\">\n        <button mat-button color=\"primary\"\n                type=\"button\"\n                [disabled]=\"(isLoading$ | async)\"\n                (click)=\"cancel()\" cdkFocusInitial>\n            Cancel\n        </button>\n        <button mat-button mat-raised-button color=\"primary\"\n                type=\"submit\"\n                [disabled]=\"(isLoading$ | async) || editEntityForm.invalid || !editEntityForm.dirty\">\n            Save\n        </button>\n    </div>\n</form>",
+                "customHtml": "<form #editEntityForm=\"ngForm\" [formGroup]=\"editEntityFormGroup\"\n      (ngSubmit)=\"save()\"  class=\"edit-entity-form\">\n    <mat-toolbar fxLayout=\"row\" color=\"primary\">\n        <h2>Edit firmware {{entityName}}</h2>\n        <span fxFlex></span>\n        <button mat-icon-button (click)=\"cancel()\" 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 *ngIf=\"entity.deviceProfileId\" mat-dialog-content fxLayout=\"column\">\n        <tb-ota-package-autocomplete\n            [useFullEntityId]=\"true\"\n            [deviceProfileId]=\"entity.deviceProfileId.id\"\n            formControlName=\"firmwareId\">\n        </tb-ota-package-autocomplete>\n    </div>\n    <div mat-dialog-actions fxLayout=\"row\" fxLayoutAlign=\"end center\">\n        <button mat-button color=\"primary\"\n                type=\"button\"\n                [disabled]=\"(isLoading$ | async)\"\n                (click)=\"cancel()\" cdkFocusInitial>\n            Cancel\n        </button>\n        <button mat-button mat-raised-button color=\"primary\"\n                type=\"submit\"\n                [disabled]=\"(isLoading$ | async) || editEntityForm.invalid || !editEntityForm.dirty\">\n            Save\n        </button>\n    </div>\n</form>",
                 "customCss": "",
                 "customCss": "",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet deviceService = $injector.get(widgetContext.servicesMap.get('deviceService'));\n\nopenEditEntityDialog();\n\nfunction openEditEntityDialog() {\n    customDialog.customDialog(htmlTemplate, EditEntityDialogController).subscribe();\n}\n\nfunction EditEntityDialogController(instance) {\n    let vm = instance;\n\n    vm.entityName = entityName;\n    vm.entity = {};\n\n    vm.editEntityFormGroup = vm.fb.group({\n        firmwareId: [null]\n    });\n\n    getEntityInfo();\n\n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n\n    vm.save = function() {\n        vm.editEntityFormGroup.markAsPristine();\n        saveEntity().subscribe(\n            function () {\n                // widgetContext.updateAliases();\n                vm.dialogRef.close(null);\n            }\n        );\n    };\n\n\n    function getEntityInfo() {\n        entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n            function (data) {\n                vm.entity = data;\n                vm.editEntityFormGroup.patchValue({\n                    firmwareId: vm.entity.firmwareId\n                }, {emitEvent: false});\n            }\n        );\n    }\n\n    function saveEntity() {\n        const formValues = vm.editEntityFormGroup.value;\n        vm.entity.firmwareId = formValues.firmwareId;\n        return deviceService.saveDevice(vm.entity);\n    }\n}",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet deviceService = $injector.get(widgetContext.servicesMap.get('deviceService'));\n\nopenEditEntityDialog();\n\nfunction openEditEntityDialog() {\n    customDialog.customDialog(htmlTemplate, EditEntityDialogController).subscribe();\n}\n\nfunction EditEntityDialogController(instance) {\n    let vm = instance;\n\n    vm.entityName = entityName;\n    vm.entity = {};\n\n    vm.editEntityFormGroup = vm.fb.group({\n        firmwareId: [null]\n    });\n\n    getEntityInfo();\n\n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n\n    vm.save = function() {\n        vm.editEntityFormGroup.markAsPristine();\n        saveEntity().subscribe(\n            function () {\n                // widgetContext.updateAliases();\n                vm.dialogRef.close(null);\n            }\n        );\n    };\n\n\n    function getEntityInfo() {\n        entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n            function (data) {\n                vm.entity = data;\n                vm.editEntityFormGroup.patchValue({\n                    firmwareId: vm.entity.firmwareId\n                }, {emitEvent: false});\n            }\n        );\n    }\n\n    function saveEntity() {\n        const formValues = vm.editEntityFormGroup.value;\n        vm.entity.firmwareId = formValues.firmwareId;\n        return deviceService.saveDevice(vm.entity);\n    }\n}",
                 "customResources": [],
                 "customResources": [],
@@ -257,7 +258,7 @@
                 "name": "Download firware",
                 "name": "Download firware",
                 "icon": "file_download",
                 "icon": "file_download",
                 "type": "custom",
                 "type": "custom",
-                "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet firmwareService = $injector.get(widgetContext.servicesMap.get('firmwareService'));\nlet deviceProfileService = $injector.get(widgetContext.servicesMap.get('deviceProfileService'));\n\ngetDeviceFirmware();\n\nfunction getDeviceFirmware() {\n    entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n        function (data) {\n            if (data.firmwareId !== null) {\n                firmwareService.downloadFirmware(data.firmwareId.id).subscribe();    \n            } else {\n                deviceProfileService.getDeviceProfile(data.deviceProfileId.id).subscribe(\n                    function (deviceProfile) {\n                        if (deviceProfile.firmwareId !== null) {\n                            firmwareService.downloadFirmware(deviceProfile.firmwareId.id).subscribe();\n                        } else {\n                            widgetContext.showToast('warn', 'Device ' + entityName +' has not firmware set.', 2000, 'top');\n\n                        }\n                });\n            }\n        }\n    );\n}",
+                "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet otaPackageService = $injector.get(widgetContext.servicesMap.get('otaPackageService'));\nlet deviceProfileService = $injector.get(widgetContext.servicesMap.get('deviceProfileService'));\n\ngetDeviceFirmware();\n\nfunction getDeviceFirmware() {\n    entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n        function (data) {\n            if (data.firmwareId !== null) {\n                otaPackageService.downloadOtaPackage(data.firmwareId.id).subscribe();    \n            } else {\n                deviceProfileService.getDeviceProfile(data.deviceProfileId.id).subscribe(\n                    function (deviceProfile) {\n                        if (deviceProfile.firmwareId !== null) {\n                            otaPackageService.downloadOtaPackage(deviceProfile.firmwareId.id).subscribe();\n                        } else {\n                            widgetContext.showToast('warn', 'Device ' + entityName +' has not firmware set.', 2000, 'top');\n\n                        }\n                });\n            }\n        }\n    );\n}",
                 "id": "12533058-42f6-e75f-620c-219c48d01ec0"
                 "id": "12533058-42f6-e75f-620c-219c48d01ec0"
               },
               },
               {
               {
@@ -1021,7 +1022,7 @@
                 "name": "Edit firmware",
                 "name": "Edit firmware",
                 "icon": "edit",
                 "icon": "edit",
                 "type": "customPretty",
                 "type": "customPretty",
-                "customHtml": "<form #editEntityForm=\"ngForm\" [formGroup]=\"editEntityFormGroup\"\n      (ngSubmit)=\"save()\"  class=\"edit-entity-form\">\n    <mat-toolbar fxLayout=\"row\" color=\"primary\">\n        <h2>Edit firmware {{entityName}}</h2>\n        <span fxFlex></span>\n        <button mat-icon-button (click)=\"cancel()\" 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 fxLayout=\"column\">\n        <tb-firmware-autocomplete\n            [useFullEntityId]=\"true\"\n            formControlName=\"firmwareId\">\n        </tb-firmware-autocomplete>\n    </div>\n    <div mat-dialog-actions fxLayout=\"row\" fxLayoutAlign=\"end center\">\n        <button mat-button color=\"primary\"\n                type=\"button\"\n                [disabled]=\"(isLoading$ | async)\"\n                (click)=\"cancel()\" cdkFocusInitial>\n            Cancel\n        </button>\n        <button mat-button mat-raised-button color=\"primary\"\n                type=\"submit\"\n                [disabled]=\"(isLoading$ | async) || editEntityForm.invalid || !editEntityForm.dirty\">\n            Save\n        </button>\n    </div>\n</form>",
+                "customHtml": "<form #editEntityForm=\"ngForm\" [formGroup]=\"editEntityFormGroup\"\n      (ngSubmit)=\"save()\"  class=\"edit-entity-form\">\n    <mat-toolbar fxLayout=\"row\" color=\"primary\">\n        <h2>Edit firmware {{entityName}}</h2>\n        <span fxFlex></span>\n        <button mat-icon-button (click)=\"cancel()\" 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 *ngIf=\"entity.deviceProfileId\" mat-dialog-content fxLayout=\"column\">\n        <tb-ota-package-autocomplete\n            [useFullEntityId]=\"true\"\n            [deviceProfileId]=\"entity.deviceProfileId.id\"\n            formControlName=\"firmwareId\">\n        </tb-ota-package-autocomplete>\n    </div>\n    <div mat-dialog-actions fxLayout=\"row\" fxLayoutAlign=\"end center\">\n        <button mat-button color=\"primary\"\n                type=\"button\"\n                [disabled]=\"(isLoading$ | async)\"\n                (click)=\"cancel()\" cdkFocusInitial>\n            Cancel\n        </button>\n        <button mat-button mat-raised-button color=\"primary\"\n                type=\"submit\"\n                [disabled]=\"(isLoading$ | async) || editEntityForm.invalid || !editEntityForm.dirty\">\n            Save\n        </button>\n    </div>\n</form>",
                 "customCss": "",
                 "customCss": "",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet deviceService = $injector.get(widgetContext.servicesMap.get('deviceService'));\n\nopenEditEntityDialog();\n\nfunction openEditEntityDialog() {\n    customDialog.customDialog(htmlTemplate, EditEntityDialogController).subscribe();\n}\n\nfunction EditEntityDialogController(instance) {\n    let vm = instance;\n\n    vm.entityName = entityName;\n    vm.entity = {};\n\n    vm.editEntityFormGroup = vm.fb.group({\n        firmwareId: [null]\n    });\n\n    getEntityInfo();\n\n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n\n    vm.save = function() {\n        vm.editEntityFormGroup.markAsPristine();\n        saveEntity().subscribe(\n            function () {\n                // widgetContext.updateAliases();\n                vm.dialogRef.close(null);\n            }\n        );\n    };\n\n\n    function getEntityInfo() {\n        entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n            function (data) {\n                vm.entity = data;\n                vm.editEntityFormGroup.patchValue({\n                    firmwareId: vm.entity.firmwareId\n                }, {emitEvent: false});\n            }\n        );\n    }\n\n    function saveEntity() {\n        const formValues = vm.editEntityFormGroup.value;\n        vm.entity.firmwareId = formValues.firmwareId;\n        return deviceService.saveDevice(vm.entity);\n    }\n}",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet deviceService = $injector.get(widgetContext.servicesMap.get('deviceService'));\n\nopenEditEntityDialog();\n\nfunction openEditEntityDialog() {\n    customDialog.customDialog(htmlTemplate, EditEntityDialogController).subscribe();\n}\n\nfunction EditEntityDialogController(instance) {\n    let vm = instance;\n\n    vm.entityName = entityName;\n    vm.entity = {};\n\n    vm.editEntityFormGroup = vm.fb.group({\n        firmwareId: [null]\n    });\n\n    getEntityInfo();\n\n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n\n    vm.save = function() {\n        vm.editEntityFormGroup.markAsPristine();\n        saveEntity().subscribe(\n            function () {\n                // widgetContext.updateAliases();\n                vm.dialogRef.close(null);\n            }\n        );\n    };\n\n\n    function getEntityInfo() {\n        entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n            function (data) {\n                vm.entity = data;\n                vm.editEntityFormGroup.patchValue({\n                    firmwareId: vm.entity.firmwareId\n                }, {emitEvent: false});\n            }\n        );\n    }\n\n    function saveEntity() {\n        const formValues = vm.editEntityFormGroup.value;\n        vm.entity.firmwareId = formValues.firmwareId;\n        return deviceService.saveDevice(vm.entity);\n    }\n}",
                 "customResources": [],
                 "customResources": [],
@@ -1031,7 +1032,7 @@
                 "name": "Download firware",
                 "name": "Download firware",
                 "icon": "file_download",
                 "icon": "file_download",
                 "type": "custom",
                 "type": "custom",
-                "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet firmwareService = $injector.get(widgetContext.servicesMap.get('firmwareService'));\nlet deviceProfileService = $injector.get(widgetContext.servicesMap.get('deviceProfileService'));\n\ngetDeviceFirmware();\n\nfunction getDeviceFirmware() {\n    entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n        function (data) {\n            if (data.firmwareId !== null) {\n                firmwareService.downloadFirmware(data.firmwareId.id).subscribe();    \n            } else {\n                deviceProfileService.getDeviceProfile(data.deviceProfileId.id).subscribe(\n                    function (deviceProfile) {\n                        if (deviceProfile.firmwareId !== null) {\n                            firmwareService.downloadFirmware(deviceProfile.firmwareId.id).subscribe();\n                        } else {\n                            widgetContext.showToast('warn', 'Device ' + entityName +' has not firmware set.', 2000, 'top');\n\n                        }\n                });\n            }\n        }\n    );\n}",
+                "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet otaPackageService = $injector.get(widgetContext.servicesMap.get('otaPackageService'));\nlet deviceProfileService = $injector.get(widgetContext.servicesMap.get('deviceProfileService'));\n\ngetDeviceFirmware();\n\nfunction getDeviceFirmware() {\n    entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n        function (data) {\n            if (data.firmwareId !== null) {\n                otaPackageService.downloadOtaPackage(data.firmwareId.id).subscribe();    \n            } else {\n                deviceProfileService.getDeviceProfile(data.deviceProfileId.id).subscribe(\n                    function (deviceProfile) {\n                        if (deviceProfile.firmwareId !== null) {\n                            otaPackageService.downloadOtaPackage(deviceProfile.firmwareId.id).subscribe();\n                        } else {\n                            widgetContext.showToast('warn', 'Device ' + entityName +' has not firmware set.', 2000, 'top');\n\n                        }\n                });\n            }\n        }\n    );\n}",
                 "id": "12533058-42f6-e75f-620c-219c48d01ec0"
                 "id": "12533058-42f6-e75f-620c-219c48d01ec0"
               },
               },
               {
               {
@@ -1297,7 +1298,7 @@
                 "name": "Edit firmware",
                 "name": "Edit firmware",
                 "icon": "edit",
                 "icon": "edit",
                 "type": "customPretty",
                 "type": "customPretty",
-                "customHtml": "<form #editEntityForm=\"ngForm\" [formGroup]=\"editEntityFormGroup\"\n      (ngSubmit)=\"save()\"  class=\"edit-entity-form\">\n    <mat-toolbar fxLayout=\"row\" color=\"primary\">\n        <h2>Edit firmware {{entityName}}</h2>\n        <span fxFlex></span>\n        <button mat-icon-button (click)=\"cancel()\" 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 fxLayout=\"column\">\n        <tb-firmware-autocomplete\n            [useFullEntityId]=\"true\"\n            formControlName=\"firmwareId\">\n        </tb-firmware-autocomplete>\n    </div>\n    <div mat-dialog-actions fxLayout=\"row\" fxLayoutAlign=\"end center\">\n        <button mat-button color=\"primary\"\n                type=\"button\"\n                [disabled]=\"(isLoading$ | async)\"\n                (click)=\"cancel()\" cdkFocusInitial>\n            Cancel\n        </button>\n        <button mat-button mat-raised-button color=\"primary\"\n                type=\"submit\"\n                [disabled]=\"(isLoading$ | async) || editEntityForm.invalid || !editEntityForm.dirty\">\n            Save\n        </button>\n    </div>\n</form>",
+                "customHtml": "<form #editEntityForm=\"ngForm\" [formGroup]=\"editEntityFormGroup\"\n      (ngSubmit)=\"save()\"  class=\"edit-entity-form\">\n    <mat-toolbar fxLayout=\"row\" color=\"primary\">\n        <h2>Edit firmware {{entityName}}</h2>\n        <span fxFlex></span>\n        <button mat-icon-button (click)=\"cancel()\" 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 *ngIf=\"entity.deviceProfileId\" mat-dialog-content fxLayout=\"column\">\n        <tb-ota-package-autocomplete\n            [useFullEntityId]=\"true\"\n            [deviceProfileId]=\"entity.deviceProfileId.id\"\n            formControlName=\"firmwareId\">\n        </tb-ota-package-autocomplete>\n    </div>\n    <div mat-dialog-actions fxLayout=\"row\" fxLayoutAlign=\"end center\">\n        <button mat-button color=\"primary\"\n                type=\"button\"\n                [disabled]=\"(isLoading$ | async)\"\n                (click)=\"cancel()\" cdkFocusInitial>\n            Cancel\n        </button>\n        <button mat-button mat-raised-button color=\"primary\"\n                type=\"submit\"\n                [disabled]=\"(isLoading$ | async) || editEntityForm.invalid || !editEntityForm.dirty\">\n            Save\n        </button>\n    </div>\n</form>",
                 "customCss": "",
                 "customCss": "",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet deviceService = $injector.get(widgetContext.servicesMap.get('deviceService'));\n\nopenEditEntityDialog();\n\nfunction openEditEntityDialog() {\n    customDialog.customDialog(htmlTemplate, EditEntityDialogController).subscribe();\n}\n\nfunction EditEntityDialogController(instance) {\n    let vm = instance;\n\n    vm.entityName = entityName;\n    vm.entity = {};\n\n    vm.editEntityFormGroup = vm.fb.group({\n        firmwareId: [null]\n    });\n\n    getEntityInfo();\n\n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n\n    vm.save = function() {\n        vm.editEntityFormGroup.markAsPristine();\n        saveEntity().subscribe(\n            function () {\n                // widgetContext.updateAliases();\n                vm.dialogRef.close(null);\n            }\n        );\n    };\n\n\n    function getEntityInfo() {\n        entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n            function (data) {\n                vm.entity = data;\n                vm.editEntityFormGroup.patchValue({\n                    firmwareId: vm.entity.firmwareId\n                }, {emitEvent: false});\n            }\n        );\n    }\n\n    function saveEntity() {\n        const formValues = vm.editEntityFormGroup.value;\n        vm.entity.firmwareId = formValues.firmwareId;\n        return deviceService.saveDevice(vm.entity);\n    }\n}",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet deviceService = $injector.get(widgetContext.servicesMap.get('deviceService'));\n\nopenEditEntityDialog();\n\nfunction openEditEntityDialog() {\n    customDialog.customDialog(htmlTemplate, EditEntityDialogController).subscribe();\n}\n\nfunction EditEntityDialogController(instance) {\n    let vm = instance;\n\n    vm.entityName = entityName;\n    vm.entity = {};\n\n    vm.editEntityFormGroup = vm.fb.group({\n        firmwareId: [null]\n    });\n\n    getEntityInfo();\n\n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n\n    vm.save = function() {\n        vm.editEntityFormGroup.markAsPristine();\n        saveEntity().subscribe(\n            function () {\n                // widgetContext.updateAliases();\n                vm.dialogRef.close(null);\n            }\n        );\n    };\n\n\n    function getEntityInfo() {\n        entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n            function (data) {\n                vm.entity = data;\n                vm.editEntityFormGroup.patchValue({\n                    firmwareId: vm.entity.firmwareId\n                }, {emitEvent: false});\n            }\n        );\n    }\n\n    function saveEntity() {\n        const formValues = vm.editEntityFormGroup.value;\n        vm.entity.firmwareId = formValues.firmwareId;\n        return deviceService.saveDevice(vm.entity);\n    }\n}",
                 "customResources": [],
                 "customResources": [],
@@ -1307,7 +1308,7 @@
                 "name": "Download firware",
                 "name": "Download firware",
                 "icon": "file_download",
                 "icon": "file_download",
                 "type": "custom",
                 "type": "custom",
-                "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet firmwareService = $injector.get(widgetContext.servicesMap.get('firmwareService'));\nlet deviceProfileService = $injector.get(widgetContext.servicesMap.get('deviceProfileService'));\n\ngetDeviceFirmware();\n\nfunction getDeviceFirmware() {\n    entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n        function (data) {\n            if (data.firmwareId !== null) {\n                firmwareService.downloadFirmware(data.firmwareId.id).subscribe();    \n            } else {\n                deviceProfileService.getDeviceProfile(data.deviceProfileId.id).subscribe(\n                    function (deviceProfile) {\n                        if (deviceProfile.firmwareId !== null) {\n                            firmwareService.downloadFirmware(deviceProfile.firmwareId.id).subscribe();\n                        } else {\n                            widgetContext.showToast('warn', 'Device ' + entityName +' has not firmware set.', 2000, 'top');\n\n                        }\n                });\n            }\n        }\n    );\n}",
+                "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet otaPackageService = $injector.get(widgetContext.servicesMap.get('otaPackageService'));\nlet deviceProfileService = $injector.get(widgetContext.servicesMap.get('deviceProfileService'));\n\ngetDeviceFirmware();\n\nfunction getDeviceFirmware() {\n    entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n        function (data) {\n            if (data.firmwareId !== null) {\n                otaPackageService.downloadOtaPackage(data.firmwareId.id).subscribe();    \n            } else {\n                deviceProfileService.getDeviceProfile(data.deviceProfileId.id).subscribe(\n                    function (deviceProfile) {\n                        if (deviceProfile.firmwareId !== null) {\n                            otaPackageService.downloadOtaPackage(deviceProfile.firmwareId.id).subscribe();\n                        } else {\n                            widgetContext.showToast('warn', 'Device ' + entityName +' has not firmware set.', 2000, 'top');\n\n                        }\n                });\n            }\n        }\n    );\n}",
                 "id": "12533058-42f6-e75f-620c-219c48d01ec0"
                 "id": "12533058-42f6-e75f-620c-219c48d01ec0"
               },
               },
               {
               {
@@ -1573,7 +1574,7 @@
                 "name": "Edit firmware",
                 "name": "Edit firmware",
                 "icon": "edit",
                 "icon": "edit",
                 "type": "customPretty",
                 "type": "customPretty",
-                "customHtml": "<form #editEntityForm=\"ngForm\" [formGroup]=\"editEntityFormGroup\"\n      (ngSubmit)=\"save()\"  class=\"edit-entity-form\">\n    <mat-toolbar fxLayout=\"row\" color=\"primary\">\n        <h2>Edit firmware {{entityName}}</h2>\n        <span fxFlex></span>\n        <button mat-icon-button (click)=\"cancel()\" 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 fxLayout=\"column\">\n        <tb-firmware-autocomplete\n            [useFullEntityId]=\"true\"\n            formControlName=\"firmwareId\">\n        </tb-firmware-autocomplete>\n    </div>\n    <div mat-dialog-actions fxLayout=\"row\" fxLayoutAlign=\"end center\">\n        <button mat-button color=\"primary\"\n                type=\"button\"\n                [disabled]=\"(isLoading$ | async)\"\n                (click)=\"cancel()\" cdkFocusInitial>\n            Cancel\n        </button>\n        <button mat-button mat-raised-button color=\"primary\"\n                type=\"submit\"\n                [disabled]=\"(isLoading$ | async) || editEntityForm.invalid || !editEntityForm.dirty\">\n            Save\n        </button>\n    </div>\n</form>",
+                "customHtml": "<form #editEntityForm=\"ngForm\" [formGroup]=\"editEntityFormGroup\"\n      (ngSubmit)=\"save()\"  class=\"edit-entity-form\">\n    <mat-toolbar fxLayout=\"row\" color=\"primary\">\n        <h2>Edit firmware {{entityName}}</h2>\n        <span fxFlex></span>\n        <button mat-icon-button (click)=\"cancel()\" 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 *ngIf=\"entity.deviceProfileId\" mat-dialog-content fxLayout=\"column\">\n        <tb-ota-package-autocomplete\n            [useFullEntityId]=\"true\"\n            [deviceProfileId]=\"entity.deviceProfileId.id\"\n            formControlName=\"firmwareId\">\n        </tb-ota-package-autocomplete>\n    </div>\n    <div mat-dialog-actions fxLayout=\"row\" fxLayoutAlign=\"end center\">\n        <button mat-button color=\"primary\"\n                type=\"button\"\n                [disabled]=\"(isLoading$ | async)\"\n                (click)=\"cancel()\" cdkFocusInitial>\n            Cancel\n        </button>\n        <button mat-button mat-raised-button color=\"primary\"\n                type=\"submit\"\n                [disabled]=\"(isLoading$ | async) || editEntityForm.invalid || !editEntityForm.dirty\">\n            Save\n        </button>\n    </div>\n</form>",
                 "customCss": "",
                 "customCss": "",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet deviceService = $injector.get(widgetContext.servicesMap.get('deviceService'));\n\nopenEditEntityDialog();\n\nfunction openEditEntityDialog() {\n    customDialog.customDialog(htmlTemplate, EditEntityDialogController).subscribe();\n}\n\nfunction EditEntityDialogController(instance) {\n    let vm = instance;\n\n    vm.entityName = entityName;\n    vm.entity = {};\n\n    vm.editEntityFormGroup = vm.fb.group({\n        firmwareId: [null]\n    });\n\n    getEntityInfo();\n\n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n\n    vm.save = function() {\n        vm.editEntityFormGroup.markAsPristine();\n        saveEntity().subscribe(\n            function () {\n                // widgetContext.updateAliases();\n                vm.dialogRef.close(null);\n            }\n        );\n    };\n\n\n    function getEntityInfo() {\n        entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n            function (data) {\n                vm.entity = data;\n                vm.editEntityFormGroup.patchValue({\n                    firmwareId: vm.entity.firmwareId\n                }, {emitEvent: false});\n            }\n        );\n    }\n\n    function saveEntity() {\n        const formValues = vm.editEntityFormGroup.value;\n        vm.entity.firmwareId = formValues.firmwareId;\n        return deviceService.saveDevice(vm.entity);\n    }\n}",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet deviceService = $injector.get(widgetContext.servicesMap.get('deviceService'));\n\nopenEditEntityDialog();\n\nfunction openEditEntityDialog() {\n    customDialog.customDialog(htmlTemplate, EditEntityDialogController).subscribe();\n}\n\nfunction EditEntityDialogController(instance) {\n    let vm = instance;\n\n    vm.entityName = entityName;\n    vm.entity = {};\n\n    vm.editEntityFormGroup = vm.fb.group({\n        firmwareId: [null]\n    });\n\n    getEntityInfo();\n\n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n\n    vm.save = function() {\n        vm.editEntityFormGroup.markAsPristine();\n        saveEntity().subscribe(\n            function () {\n                // widgetContext.updateAliases();\n                vm.dialogRef.close(null);\n            }\n        );\n    };\n\n\n    function getEntityInfo() {\n        entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n            function (data) {\n                vm.entity = data;\n                vm.editEntityFormGroup.patchValue({\n                    firmwareId: vm.entity.firmwareId\n                }, {emitEvent: false});\n            }\n        );\n    }\n\n    function saveEntity() {\n        const formValues = vm.editEntityFormGroup.value;\n        vm.entity.firmwareId = formValues.firmwareId;\n        return deviceService.saveDevice(vm.entity);\n    }\n}",
                 "customResources": [],
                 "customResources": [],
@@ -1583,7 +1584,7 @@
                 "name": "Download firware",
                 "name": "Download firware",
                 "icon": "file_download",
                 "icon": "file_download",
                 "type": "custom",
                 "type": "custom",
-                "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet firmwareService = $injector.get(widgetContext.servicesMap.get('firmwareService'));\nlet deviceProfileService = $injector.get(widgetContext.servicesMap.get('deviceProfileService'));\n\ngetDeviceFirmware();\n\nfunction getDeviceFirmware() {\n    entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n        function (data) {\n            if (data.firmwareId !== null) {\n                firmwareService.downloadFirmware(data.firmwareId.id).subscribe();    \n            } else {\n                deviceProfileService.getDeviceProfile(data.deviceProfileId.id).subscribe(\n                    function (deviceProfile) {\n                        if (deviceProfile.firmwareId !== null) {\n                            firmwareService.downloadFirmware(deviceProfile.firmwareId.id).subscribe();\n                        } else {\n                            widgetContext.showToast('warn', 'Device ' + entityName +' has not firmware set.', 2000, 'top');\n\n                        }\n                });\n            }\n        }\n    );\n}",
+                "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet otaPackageService = $injector.get(widgetContext.servicesMap.get('otaPackageService'));\nlet deviceProfileService = $injector.get(widgetContext.servicesMap.get('deviceProfileService'));\n\ngetDeviceFirmware();\n\nfunction getDeviceFirmware() {\n    entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n        function (data) {\n            if (data.firmwareId !== null) {\n                otaPackageService.downloadOtaPackage(data.firmwareId.id).subscribe();    \n            } else {\n                deviceProfileService.getDeviceProfile(data.deviceProfileId.id).subscribe(\n                    function (deviceProfile) {\n                        if (deviceProfile.firmwareId !== null) {\n                            otaPackageService.downloadOtaPackage(deviceProfile.firmwareId.id).subscribe();\n                        } else {\n                            widgetContext.showToast('warn', 'Device ' + entityName +' has not firmware set.', 2000, 'top');\n\n                        }\n                });\n            }\n        }\n    );\n}",
                 "id": "12533058-42f6-e75f-620c-219c48d01ec0"
                 "id": "12533058-42f6-e75f-620c-219c48d01ec0"
               },
               },
               {
               {
@@ -1849,7 +1850,7 @@
                 "name": "Edit firmware",
                 "name": "Edit firmware",
                 "icon": "edit",
                 "icon": "edit",
                 "type": "customPretty",
                 "type": "customPretty",
-                "customHtml": "<form #editEntityForm=\"ngForm\" [formGroup]=\"editEntityFormGroup\"\n      (ngSubmit)=\"save()\"  class=\"edit-entity-form\">\n    <mat-toolbar fxLayout=\"row\" color=\"primary\">\n        <h2>Edit firmware {{entityName}}</h2>\n        <span fxFlex></span>\n        <button mat-icon-button (click)=\"cancel()\" 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 fxLayout=\"column\">\n        <tb-firmware-autocomplete\n            [useFullEntityId]=\"true\"\n            formControlName=\"firmwareId\">\n        </tb-firmware-autocomplete>\n    </div>\n    <div mat-dialog-actions fxLayout=\"row\" fxLayoutAlign=\"end center\">\n        <button mat-button color=\"primary\"\n                type=\"button\"\n                [disabled]=\"(isLoading$ | async)\"\n                (click)=\"cancel()\" cdkFocusInitial>\n            Cancel\n        </button>\n        <button mat-button mat-raised-button color=\"primary\"\n                type=\"submit\"\n                [disabled]=\"(isLoading$ | async) || editEntityForm.invalid || !editEntityForm.dirty\">\n            Save\n        </button>\n    </div>\n</form>",
+                "customHtml": "<form #editEntityForm=\"ngForm\" [formGroup]=\"editEntityFormGroup\"\n      (ngSubmit)=\"save()\"  class=\"edit-entity-form\">\n    <mat-toolbar fxLayout=\"row\" color=\"primary\">\n        <h2>Edit firmware {{entityName}}</h2>\n        <span fxFlex></span>\n        <button mat-icon-button (click)=\"cancel()\" 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 *ngIf=\"entity.deviceProfileId\" mat-dialog-content fxLayout=\"column\">\n        <tb-ota-package-autocomplete\n            [useFullEntityId]=\"true\"\n            [deviceProfileId]=\"entity.deviceProfileId.id\"\n            formControlName=\"firmwareId\">\n        </tb-ota-package-autocomplete>\n    </div>\n    <div mat-dialog-actions fxLayout=\"row\" fxLayoutAlign=\"end center\">\n        <button mat-button color=\"primary\"\n                type=\"button\"\n                [disabled]=\"(isLoading$ | async)\"\n                (click)=\"cancel()\" cdkFocusInitial>\n            Cancel\n        </button>\n        <button mat-button mat-raised-button color=\"primary\"\n                type=\"submit\"\n                [disabled]=\"(isLoading$ | async) || editEntityForm.invalid || !editEntityForm.dirty\">\n            Save\n        </button>\n    </div>\n</form>",
                 "customCss": "",
                 "customCss": "",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet deviceService = $injector.get(widgetContext.servicesMap.get('deviceService'));\n\nopenEditEntityDialog();\n\nfunction openEditEntityDialog() {\n    customDialog.customDialog(htmlTemplate, EditEntityDialogController).subscribe();\n}\n\nfunction EditEntityDialogController(instance) {\n    let vm = instance;\n\n    vm.entityName = entityName;\n    vm.entity = {};\n\n    vm.editEntityFormGroup = vm.fb.group({\n        firmwareId: [null]\n    });\n\n    getEntityInfo();\n\n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n\n    vm.save = function() {\n        vm.editEntityFormGroup.markAsPristine();\n        saveEntity().subscribe(\n            function () {\n                // widgetContext.updateAliases();\n                vm.dialogRef.close(null);\n            }\n        );\n    };\n\n\n    function getEntityInfo() {\n        entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n            function (data) {\n                vm.entity = data;\n                vm.editEntityFormGroup.patchValue({\n                    firmwareId: vm.entity.firmwareId\n                }, {emitEvent: false});\n            }\n        );\n    }\n\n    function saveEntity() {\n        const formValues = vm.editEntityFormGroup.value;\n        vm.entity.firmwareId = formValues.firmwareId;\n        return deviceService.saveDevice(vm.entity);\n    }\n}",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet deviceService = $injector.get(widgetContext.servicesMap.get('deviceService'));\n\nopenEditEntityDialog();\n\nfunction openEditEntityDialog() {\n    customDialog.customDialog(htmlTemplate, EditEntityDialogController).subscribe();\n}\n\nfunction EditEntityDialogController(instance) {\n    let vm = instance;\n\n    vm.entityName = entityName;\n    vm.entity = {};\n\n    vm.editEntityFormGroup = vm.fb.group({\n        firmwareId: [null]\n    });\n\n    getEntityInfo();\n\n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n\n    vm.save = function() {\n        vm.editEntityFormGroup.markAsPristine();\n        saveEntity().subscribe(\n            function () {\n                // widgetContext.updateAliases();\n                vm.dialogRef.close(null);\n            }\n        );\n    };\n\n\n    function getEntityInfo() {\n        entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n            function (data) {\n                vm.entity = data;\n                vm.editEntityFormGroup.patchValue({\n                    firmwareId: vm.entity.firmwareId\n                }, {emitEvent: false});\n            }\n        );\n    }\n\n    function saveEntity() {\n        const formValues = vm.editEntityFormGroup.value;\n        vm.entity.firmwareId = formValues.firmwareId;\n        return deviceService.saveDevice(vm.entity);\n    }\n}",
                 "customResources": [],
                 "customResources": [],
@@ -1859,7 +1860,7 @@
                 "name": "Download firware",
                 "name": "Download firware",
                 "icon": "file_download",
                 "icon": "file_download",
                 "type": "custom",
                 "type": "custom",
-                "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet firmwareService = $injector.get(widgetContext.servicesMap.get('firmwareService'));\nlet deviceProfileService = $injector.get(widgetContext.servicesMap.get('deviceProfileService'));\n\ngetDeviceFirmware();\n\nfunction getDeviceFirmware() {\n    entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n        function (data) {\n            if (data.firmwareId !== null) {\n                firmwareService.downloadFirmware(data.firmwareId.id).subscribe();    \n            } else {\n                deviceProfileService.getDeviceProfile(data.deviceProfileId.id).subscribe(\n                    function (deviceProfile) {\n                        if (deviceProfile.firmwareId !== null) {\n                            firmwareService.downloadFirmware(deviceProfile.firmwareId.id).subscribe();\n                        } else {\n                            widgetContext.showToast('warn', 'Device ' + entityName +' has not firmware set.', 2000, 'top');\n\n                        }\n                });\n            }\n        }\n    );\n}",
+                "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet entityService = $injector.get(widgetContext.servicesMap.get('entityService'));\nlet otaPackageService = $injector.get(widgetContext.servicesMap.get('otaPackageService'));\nlet deviceProfileService = $injector.get(widgetContext.servicesMap.get('deviceProfileService'));\n\ngetDeviceFirmware();\n\nfunction getDeviceFirmware() {\n    entityService.getEntity(entityId.entityType, entityId.id).subscribe(\n        function (data) {\n            if (data.firmwareId !== null) {\n                otaPackageService.downloadOtaPackage(data.firmwareId.id).subscribe();    \n            } else {\n                deviceProfileService.getDeviceProfile(data.deviceProfileId.id).subscribe(\n                    function (deviceProfile) {\n                        if (deviceProfile.firmwareId !== null) {\n                            otaPackageService.downloadOtaPackage(deviceProfile.firmwareId.id).subscribe();\n                        } else {\n                            widgetContext.showToast('warn', 'Device ' + entityName +' has not firmware set.', 2000, 'top');\n\n                        }\n                });\n            }\n        }\n    );\n}",
                 "id": "12533058-42f6-e75f-620c-219c48d01ec0"
                 "id": "12533058-42f6-e75f-620c-219c48d01ec0"
               },
               },
               {
               {

@@ -59,8 +59,8 @@ CREATE TABLE IF NOT EXISTS resource (
     CONSTRAINT resource_unq_key UNIQUE (tenant_id, resource_type, resource_key)
     CONSTRAINT resource_unq_key UNIQUE (tenant_id, resource_type, resource_key)
 );
 );
 
 
-CREATE TABLE IF NOT EXISTS firmware (
-    id uuid NOT NULL CONSTRAINT firmware_pkey PRIMARY KEY,
+CREATE TABLE IF NOT EXISTS ota_package (
+    id uuid NOT NULL CONSTRAINT ota_package_pkey PRIMARY KEY,
     created_time bigint NOT NULL,
     created_time bigint NOT NULL,
     tenant_id uuid NOT NULL,
     tenant_id uuid NOT NULL,
     device_profile_id uuid,
     device_profile_id uuid,
@@ -75,7 +75,7 @@ CREATE TABLE IF NOT EXISTS firmware (
     data_size bigint,
     data_size bigint,
     additional_info varchar,
     additional_info varchar,
     search_text varchar(255),
     search_text varchar(255),
-    CONSTRAINT firmware_tenant_title_version_unq_key UNIQUE (tenant_id, title, version)
+    CONSTRAINT ota_package_tenant_title_version_unq_key UNIQUE (tenant_id, title, version)
 );
 );
 
 
 ALTER TABLE dashboard
 ALTER TABLE dashboard
@@ -101,13 +101,13 @@ DO $$
         IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_firmware_device_profile') THEN
         IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_firmware_device_profile') THEN
             ALTER TABLE device_profile
             ALTER TABLE device_profile
                 ADD CONSTRAINT fk_firmware_device_profile
                 ADD CONSTRAINT fk_firmware_device_profile
-                    FOREIGN KEY (firmware_id) REFERENCES firmware(id);
+                    FOREIGN KEY (firmware_id) REFERENCES ota_package(id);
         END IF;
         END IF;
 
 
         IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_software_device_profile') THEN
         IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_software_device_profile') THEN
             ALTER TABLE device_profile
             ALTER TABLE device_profile
                 ADD CONSTRAINT fk_software_device_profile
                 ADD CONSTRAINT fk_software_device_profile
-                    FOREIGN KEY (firmware_id) REFERENCES firmware(id);
+                    FOREIGN KEY (firmware_id) REFERENCES ota_package(id);
         END IF;
         END IF;
 
 
         IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_default_dashboard_device_profile') THEN
         IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_default_dashboard_device_profile') THEN
@@ -119,13 +119,13 @@ DO $$
         IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_firmware_device') THEN
         IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_firmware_device') THEN
             ALTER TABLE device
             ALTER TABLE device
                 ADD CONSTRAINT fk_firmware_device
                 ADD CONSTRAINT fk_firmware_device
-                    FOREIGN KEY (firmware_id) REFERENCES firmware(id);
+                    FOREIGN KEY (firmware_id) REFERENCES ota_package(id);
         END IF;
         END IF;
 
 
         IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_software_device') THEN
         IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_software_device') THEN
             ALTER TABLE device
             ALTER TABLE device
                 ADD CONSTRAINT fk_software_device
                 ADD CONSTRAINT fk_software_device
-                    FOREIGN KEY (firmware_id) REFERENCES firmware(id);
+                    FOREIGN KEY (firmware_id) REFERENCES ota_package(id);
         END IF;
         END IF;
     END;
     END;
 $$;
 $$;

@@ -317,25 +317,48 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
 
 
     private void handleGetAttributesRequest(TbActorCtx context, SessionInfoProto sessionInfo, GetAttributeRequestMsg request) {
     private void handleGetAttributesRequest(TbActorCtx context, SessionInfoProto sessionInfo, GetAttributeRequestMsg request) {
         int requestId = request.getRequestId();
         int requestId = request.getRequestId();
-        Futures.addCallback(getAttributesKvEntries(request), new FutureCallback<List<List<AttributeKvEntry>>>() {
-            @Override
-            public void onSuccess(@Nullable List<List<AttributeKvEntry>> result) {
-                GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
-                        .setRequestId(requestId)
-                        .addAllClientAttributeList(toTsKvProtos(result.get(0)))
-                        .addAllSharedAttributeList(toTsKvProtos(result.get(1)))
-                        .build();
-                sendToTransport(responseMsg, sessionInfo);
-            }
+        if (request.getOnlyShared()) {
+            Futures.addCallback(findAllAttributesByScope(DataConstants.SHARED_SCOPE), new FutureCallback<>() {
+                @Override
+                public void onSuccess(@Nullable List<AttributeKvEntry> result) {
+                    GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
+                            .setRequestId(requestId)
+                            .setSharedStateMsg(true)
+                            .addAllSharedAttributeList(toTsKvProtos(result))
+                            .build();
+                    sendToTransport(responseMsg, sessionInfo);
+                }
 
 
-            @Override
-            public void onFailure(Throwable t) {
-                GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
-                        .setError(t.getMessage())
-                        .build();
-                sendToTransport(responseMsg, sessionInfo);
-            }
-        }, MoreExecutors.directExecutor());
+                @Override
+                public void onFailure(Throwable t) {
+                    GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
+                            .setError(t.getMessage())
+                            .setSharedStateMsg(true)
+                            .build();
+                    sendToTransport(responseMsg, sessionInfo);
+                }
+            }, MoreExecutors.directExecutor());
+        } else {
+            Futures.addCallback(getAttributesKvEntries(request), new FutureCallback<>() {
+                @Override
+                public void onSuccess(@Nullable List<List<AttributeKvEntry>> result) {
+                    GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
+                            .setRequestId(requestId)
+                            .addAllClientAttributeList(toTsKvProtos(result.get(0)))
+                            .addAllSharedAttributeList(toTsKvProtos(result.get(1)))
+                            .build();
+                    sendToTransport(responseMsg, sessionInfo);
+                }
+
+                @Override
+                public void onFailure(Throwable t) {
+                    GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
+                            .setError(t.getMessage())
+                            .build();
+                    sendToTransport(responseMsg, sessionInfo);
+                }
+            }, MoreExecutors.directExecutor());
+        }
     }
     }
 
 
     private ListenableFuture<List<List<AttributeKvEntry>>> getAttributesKvEntries(GetAttributeRequestMsg request) {
     private ListenableFuture<List<List<AttributeKvEntry>>> getAttributesKvEntries(GetAttributeRequestMsg request) {
@@ -403,9 +426,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
             }
             }
             if (hasNotificationData) {
             if (hasNotificationData) {
                 AttributeUpdateNotificationMsg finalNotification = notification.build();
                 AttributeUpdateNotificationMsg finalNotification = notification.build();
-                attributeSubscriptions.entrySet().forEach(sub -> {
-                    sendToTransport(finalNotification, sub.getKey(), sub.getValue().getNodeId());
-                });
+                attributeSubscriptions.forEach((key, value) -> sendToTransport(finalNotification, key, value.getNodeId()));
             }
             }
         } else {
         } else {
             log.debug("[{}] No registered attributes subscriptions to process!", deviceId);
             log.debug("[{}] No registered attributes subscriptions to process!", deviceId);
@@ -475,7 +496,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
             if (sessions.size() >= systemContext.getMaxConcurrentSessionsPerDevice()) {
             if (sessions.size() >= systemContext.getMaxConcurrentSessionsPerDevice()) {
                 UUID sessionIdToRemove = sessions.keySet().stream().findFirst().orElse(null);
                 UUID sessionIdToRemove = sessions.keySet().stream().findFirst().orElse(null);
                 if (sessionIdToRemove != null) {
                 if (sessionIdToRemove != null) {
-                    notifyTransportAboutClosedSession(sessionIdToRemove, sessions.remove(sessionIdToRemove));
+                    notifyTransportAboutClosedSession(sessionIdToRemove, sessions.remove(sessionIdToRemove), "max concurrent sessions limit reached per device!");
                 }
                 }
             }
             }
             sessions.put(sessionId, new SessionInfoMetaData(new SessionInfo(SessionType.ASYNC, sessionInfo.getNodeId())));
             sessions.put(sessionId, new SessionInfoMetaData(new SessionInfo(SessionType.ASYNC, sessionInfo.getNodeId())));
@@ -521,7 +542,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
                 notifyTransportAboutProfileUpdate(k, v, ((DeviceCredentialsUpdateNotificationMsg) msg).getDeviceCredentials());
                 notifyTransportAboutProfileUpdate(k, v, ((DeviceCredentialsUpdateNotificationMsg) msg).getDeviceCredentials());
             });
             });
         } else {
         } else {
-            sessions.forEach(this::notifyTransportAboutClosedSession);
+            sessions.forEach((sessionId, sessionMd) -> notifyTransportAboutClosedSession(sessionId, sessionMd, "device credentials updated!"));
             attributeSubscriptions.clear();
             attributeSubscriptions.clear();
             rpcSubscriptions.clear();
             rpcSubscriptions.clear();
             dumpSessions();
             dumpSessions();
@@ -529,11 +550,15 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         }
         }
     }
     }
 
 
-    private void notifyTransportAboutClosedSession(UUID sessionId, SessionInfoMetaData sessionMd) {
+    private void notifyTransportAboutClosedSession(UUID sessionId, SessionInfoMetaData sessionMd, String message) {
+        SessionCloseNotificationProto sessionCloseNotificationProto = SessionCloseNotificationProto
+                .newBuilder()
+                .setMessage(message).build();
         ToTransportMsg msg = ToTransportMsg.newBuilder()
         ToTransportMsg msg = ToTransportMsg.newBuilder()
                 .setSessionIdMSB(sessionId.getMostSignificantBits())
                 .setSessionIdMSB(sessionId.getMostSignificantBits())
                 .setSessionIdLSB(sessionId.getLeastSignificantBits())
                 .setSessionIdLSB(sessionId.getLeastSignificantBits())
-                .setSessionCloseNotification(SessionCloseNotificationProto.getDefaultInstance()).build();
+                .setSessionCloseNotification(sessionCloseNotificationProto)
+                .build();
         systemContext.getTbCoreToTransportService().process(sessionMd.getSessionInfo().getNodeId(), msg);
         systemContext.getTbCoreToTransportService().process(sessionMd.getSessionInfo().getNodeId(), msg);
     }
     }
 
 
@@ -741,7 +766,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
             sessions.remove(sessionId);
             sessions.remove(sessionId);
             rpcSubscriptions.remove(sessionId);
             rpcSubscriptions.remove(sessionId);
             attributeSubscriptions.remove(sessionId);
             attributeSubscriptions.remove(sessionId);
-            notifyTransportAboutClosedSession(sessionId, sessionMD);
+            notifyTransportAboutClosedSession(sessionId, sessionMD, "session timeout!");
         });
         });
         if (!sessionsToRemove.isEmpty()) {
         if (!sessionsToRemove.isEmpty()) {
             dumpSessions();
             dumpSessions();

@@ -110,8 +110,11 @@ public class AlarmController extends BaseController {
         checkParameter(ALARM_ID, strAlarmId);
         checkParameter(ALARM_ID, strAlarmId);
         try {
         try {
             AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
             AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
-            checkAlarmId(alarmId, Operation.WRITE);
+            Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
 
 
+            logEntityAction(alarm.getOriginator(), alarm,
+                    getCurrentUser().getCustomerId(),
+                    ActionType.ALARM_DELETE, null);
             sendEntityNotificationMsg(getTenantId(), alarmId, EdgeEventActionType.DELETED);
             sendEntityNotificationMsg(getTenantId(), alarmId, EdgeEventActionType.DELETED);
 
 
             return alarmService.deleteAlarm(getTenantId(), alarmId);
             return alarmService.deleteAlarm(getTenantId(), alarmId);

@@ -17,7 +17,6 @@ package org.thingsboard.server.controller;
 
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -31,7 +30,6 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.DashboardInfo;
 import org.thingsboard.server.common.data.DashboardInfo;
-import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceInfo;
 import org.thingsboard.server.common.data.DeviceInfo;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -39,8 +37,8 @@ import org.thingsboard.server.common.data.EdgeUtils;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.EntityViewInfo;
 import org.thingsboard.server.common.data.EntityViewInfo;
-import org.thingsboard.server.common.data.Firmware;
-import org.thingsboard.server.common.data.FirmwareInfo;
+import org.thingsboard.server.common.data.OtaPackage;
+import org.thingsboard.server.common.data.OtaPackageInfo;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.TbResourceInfo;
 import org.thingsboard.server.common.data.TbResourceInfo;
@@ -70,7 +68,7 @@ import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.EntityViewId;
 import org.thingsboard.server.common.data.id.EntityViewId;
-import org.thingsboard.server.common.data.id.FirmwareId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
@@ -79,10 +77,6 @@ import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
 import org.thingsboard.server.common.data.id.WidgetsBundleId;
 import org.thingsboard.server.common.data.id.WidgetsBundleId;
-import org.thingsboard.server.common.data.kv.AttributeKvEntry;
-import org.thingsboard.server.common.data.kv.DataType;
-import org.thingsboard.server.common.data.kv.KvEntry;
-import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.SortOrder;
 import org.thingsboard.server.common.data.page.SortOrder;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
@@ -94,9 +88,6 @@ import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
-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.asset.AssetService;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.audit.AuditLogService;
 import org.thingsboard.server.dao.audit.AuditLogService;
@@ -110,7 +101,7 @@ import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
-import org.thingsboard.server.dao.firmware.FirmwareService;
+import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.oauth2.OAuth2ConfigTemplateService;
 import org.thingsboard.server.dao.oauth2.OAuth2ConfigTemplateService;
 import org.thingsboard.server.dao.oauth2.OAuth2Service;
 import org.thingsboard.server.dao.oauth2.OAuth2Service;
@@ -127,8 +118,9 @@ import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.action.RuleEngineEntityActionService;
 import org.thingsboard.server.service.component.ComponentDiscoveryService;
 import org.thingsboard.server.service.component.ComponentDiscoveryService;
-import org.thingsboard.server.service.firmware.FirmwareStateService;
+import org.thingsboard.server.service.ota.OtaPackageStateService;
 import org.thingsboard.server.service.edge.EdgeNotificationService;
 import org.thingsboard.server.service.edge.EdgeNotificationService;
 import org.thingsboard.server.service.edge.rpc.EdgeGrpcService;
 import org.thingsboard.server.service.edge.rpc.EdgeGrpcService;
 import org.thingsboard.server.service.edge.rpc.init.SyncEdgeService;
 import org.thingsboard.server.service.edge.rpc.init.SyncEdgeService;
@@ -147,11 +139,9 @@ import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 import javax.mail.MessagingException;
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Set;
 import java.util.UUID;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 
 import static org.thingsboard.server.dao.service.Validator.validateId;
 import static org.thingsboard.server.dao.service.Validator.validateId;
 
 
@@ -250,10 +240,10 @@ public abstract class BaseController {
     protected TbResourceService resourceService;
     protected TbResourceService resourceService;
 
 
     @Autowired
     @Autowired
-    protected FirmwareService firmwareService;
+    protected OtaPackageService otaPackageService;
 
 
     @Autowired
     @Autowired
-    protected FirmwareStateService firmwareStateService;
+    protected OtaPackageStateService otaPackageStateService;
 
 
     @Autowired
     @Autowired
     protected TbQueueProducerProvider producerProvider;
     protected TbQueueProducerProvider producerProvider;
@@ -279,6 +269,9 @@ public abstract class BaseController {
     @Autowired(required = false)
     @Autowired(required = false)
     protected EdgeGrpcService edgeGrpcService;
     protected EdgeGrpcService edgeGrpcService;
 
 
+    @Autowired
+    protected RuleEngineEntityActionService ruleEngineEntityActionService;
+
     @Value("${server.log_controller_error_stack_trace}")
     @Value("${server.log_controller_error_stack_trace}")
     @Getter
     @Getter
     private boolean logControllerErrorStackTrace;
     private boolean logControllerErrorStackTrace;
@@ -511,8 +504,8 @@ public abstract class BaseController {
                 case TB_RESOURCE:
                 case TB_RESOURCE:
                     checkResourceId(new TbResourceId(entityId.getId()), operation);
                     checkResourceId(new TbResourceId(entityId.getId()), operation);
                     return;
                     return;
-                case FIRMWARE:
-                    checkFirmwareId(new FirmwareId(entityId.getId()), operation);
+                case OTA_PACKAGE:
+                    checkOtaPackageId(new OtaPackageId(entityId.getId()), operation);
                     return;
                     return;
                 default:
                 default:
                     throw new IllegalArgumentException("Unsupported entity type: " + entityId.getEntityType());
                     throw new IllegalArgumentException("Unsupported entity type: " + entityId.getEntityType());
@@ -769,25 +762,25 @@ public abstract class BaseController {
         }
         }
     }
     }
 
 
-    Firmware checkFirmwareId(FirmwareId firmwareId, Operation operation) throws ThingsboardException {
+    OtaPackage checkOtaPackageId(OtaPackageId otaPackageId, Operation operation) throws ThingsboardException {
         try {
         try {
-            validateId(firmwareId, "Incorrect firmwareId " + firmwareId);
-            Firmware firmware = firmwareService.findFirmwareById(getCurrentUser().getTenantId(), firmwareId);
-            checkNotNull(firmware);
-            accessControlService.checkPermission(getCurrentUser(), Resource.FIRMWARE, operation, firmwareId, firmware);
-            return firmware;
+            validateId(otaPackageId, "Incorrect otaPackageId " + otaPackageId);
+            OtaPackage otaPackage = otaPackageService.findOtaPackageById(getCurrentUser().getTenantId(), otaPackageId);
+            checkNotNull(otaPackage);
+            accessControlService.checkPermission(getCurrentUser(), Resource.OTA_PACKAGE, operation, otaPackageId, otaPackage);
+            return otaPackage;
         } catch (Exception e) {
         } catch (Exception e) {
             throw handleException(e, false);
             throw handleException(e, false);
         }
         }
     }
     }
 
 
-    FirmwareInfo checkFirmwareInfoId(FirmwareId firmwareId, Operation operation) throws ThingsboardException {
+    OtaPackageInfo checkOtaPackageInfoId(OtaPackageId otaPackageId, Operation operation) throws ThingsboardException {
         try {
         try {
-            validateId(firmwareId, "Incorrect firmwareId " + firmwareId);
-            FirmwareInfo firmwareInfo = firmwareService.findFirmwareInfoById(getCurrentUser().getTenantId(), firmwareId);
-            checkNotNull(firmwareInfo);
-            accessControlService.checkPermission(getCurrentUser(), Resource.FIRMWARE, operation, firmwareId, firmwareInfo);
-            return firmwareInfo;
+            validateId(otaPackageId, "Incorrect otaPackageId " + otaPackageId);
+            OtaPackageInfo otaPackageIn = otaPackageService.findOtaPackageInfoById(getCurrentUser().getTenantId(), otaPackageId);
+            checkNotNull(otaPackageIn);
+            accessControlService.checkPermission(getCurrentUser(), Resource.OTA_PACKAGE, operation, otaPackageId, otaPackageIn);
+            return otaPackageIn;
         } catch (Exception e) {
         } catch (Exception e) {
             throw handleException(e, false);
             throw handleException(e, false);
         }
         }
@@ -809,7 +802,7 @@ public abstract class BaseController {
             customerId = user.getCustomerId();
             customerId = user.getCustomerId();
         }
         }
         if (e == null) {
         if (e == null) {
-            pushEntityActionToRuleEngine(entityId, entity, user, customerId, actionType, additionalInfo);
+            ruleEngineEntityActionService.pushEntityActionToRuleEngine(entityId, entity, user.getTenantId(), customerId, actionType, user, additionalInfo);
         }
         }
         auditLogService.logEntityAction(user.getTenantId(), customerId, user.getId(), user.getName(), entityId, entity, actionType, e, additionalInfo);
         auditLogService.logEntityAction(user.getTenantId(), customerId, user.getId(), user.getName(), entityId, entity, actionType, e, additionalInfo);
     }
     }
@@ -819,184 +812,6 @@ public abstract class BaseController {
         return error != null ? (Exception.class.isInstance(error) ? (Exception) error : new Exception(error)) : null;
         return error != null ? (Exception.class.isInstance(error) ? (Exception) error : new Exception(error)) : null;
     }
     }
 
 
-    private <E extends HasName, I extends EntityId> void pushEntityActionToRuleEngine(I entityId, E entity, User user, CustomerId customerId,
-                                                                                      ActionType actionType, Object... additionalInfo) {
-        String msgType = null;
-        switch (actionType) {
-            case ADDED:
-                msgType = DataConstants.ENTITY_CREATED;
-                break;
-            case DELETED:
-                msgType = DataConstants.ENTITY_DELETED;
-                break;
-            case UPDATED:
-                msgType = DataConstants.ENTITY_UPDATED;
-                break;
-            case ASSIGNED_TO_CUSTOMER:
-                msgType = DataConstants.ENTITY_ASSIGNED;
-                break;
-            case UNASSIGNED_FROM_CUSTOMER:
-                msgType = DataConstants.ENTITY_UNASSIGNED;
-                break;
-            case ATTRIBUTES_UPDATED:
-                msgType = DataConstants.ATTRIBUTES_UPDATED;
-                break;
-            case ATTRIBUTES_DELETED:
-                msgType = DataConstants.ATTRIBUTES_DELETED;
-                break;
-            case ALARM_ACK:
-                msgType = DataConstants.ALARM_ACK;
-                break;
-            case ALARM_CLEAR:
-                msgType = DataConstants.ALARM_CLEAR;
-                break;
-            case ASSIGNED_FROM_TENANT:
-                msgType = DataConstants.ENTITY_ASSIGNED_FROM_TENANT;
-                break;
-            case ASSIGNED_TO_TENANT:
-                msgType = DataConstants.ENTITY_ASSIGNED_TO_TENANT;
-                break;
-            case PROVISION_SUCCESS:
-                msgType = DataConstants.PROVISION_SUCCESS;
-                break;
-            case PROVISION_FAILURE:
-                msgType = DataConstants.PROVISION_FAILURE;
-                break;
-            case TIMESERIES_UPDATED:
-                msgType = DataConstants.TIMESERIES_UPDATED;
-                break;
-            case TIMESERIES_DELETED:
-                msgType = DataConstants.TIMESERIES_DELETED;
-                break;
-            case ASSIGNED_TO_EDGE:
-                msgType = DataConstants.ENTITY_ASSIGNED_TO_EDGE;
-                break;
-            case UNASSIGNED_FROM_EDGE:
-                msgType = DataConstants.ENTITY_UNASSIGNED_FROM_EDGE;
-                break;
-        }
-        if (!StringUtils.isEmpty(msgType)) {
-            try {
-                TbMsgMetaData metaData = new TbMsgMetaData();
-                metaData.putValue("userId", user.getId().toString());
-                metaData.putValue("userName", user.getName());
-                if (customerId != null && !customerId.isNullUid()) {
-                    metaData.putValue("customerId", customerId.toString());
-                }
-                if (actionType == ActionType.ASSIGNED_TO_CUSTOMER) {
-                    String strCustomerId = extractParameter(String.class, 1, additionalInfo);
-                    String strCustomerName = extractParameter(String.class, 2, additionalInfo);
-                    metaData.putValue("assignedCustomerId", strCustomerId);
-                    metaData.putValue("assignedCustomerName", strCustomerName);
-                } else if (actionType == ActionType.UNASSIGNED_FROM_CUSTOMER) {
-                    String strCustomerId = extractParameter(String.class, 1, additionalInfo);
-                    String strCustomerName = extractParameter(String.class, 2, additionalInfo);
-                    metaData.putValue("unassignedCustomerId", strCustomerId);
-                    metaData.putValue("unassignedCustomerName", strCustomerName);
-                } else if (actionType == ActionType.ASSIGNED_FROM_TENANT) {
-                    String strTenantId = extractParameter(String.class, 0, additionalInfo);
-                    String strTenantName = extractParameter(String.class, 1, additionalInfo);
-                    metaData.putValue("assignedFromTenantId", strTenantId);
-                    metaData.putValue("assignedFromTenantName", strTenantName);
-                } else if (actionType == ActionType.ASSIGNED_TO_TENANT) {
-                    String strTenantId = extractParameter(String.class, 0, additionalInfo);
-                    String strTenantName = extractParameter(String.class, 1, additionalInfo);
-                    metaData.putValue("assignedToTenantId", strTenantId);
-                    metaData.putValue("assignedToTenantName", strTenantName);
-                } else if (actionType == ActionType.ASSIGNED_TO_EDGE) {
-                    String strEdgeId = extractParameter(String.class, 1, additionalInfo);
-                    String strEdgeName = extractParameter(String.class, 2, additionalInfo);
-                    metaData.putValue("assignedEdgeId", strEdgeId);
-                    metaData.putValue("assignedEdgeName", strEdgeName);
-                } else if (actionType == ActionType.UNASSIGNED_FROM_EDGE) {
-                    String strEdgeId = extractParameter(String.class, 1, additionalInfo);
-                    String strEdgeName = extractParameter(String.class, 2, additionalInfo);
-                    metaData.putValue("unassignedEdgeId", strEdgeId);
-                    metaData.putValue("unassignedEdgeName", strEdgeName);
-                }
-                ObjectNode entityNode;
-                if (entity != null) {
-                    entityNode = json.valueToTree(entity);
-                    if (entityId.getEntityType() == EntityType.DASHBOARD) {
-                        entityNode.put("configuration", "");
-                    }
-                } else {
-                    entityNode = json.createObjectNode();
-                    if (actionType == ActionType.ATTRIBUTES_UPDATED) {
-                        String scope = extractParameter(String.class, 0, additionalInfo);
-                        @SuppressWarnings("unchecked")
-                        List<AttributeKvEntry> attributes = extractParameter(List.class, 1, additionalInfo);
-                        metaData.putValue(DataConstants.SCOPE, scope);
-                        if (attributes != null) {
-                            for (AttributeKvEntry attr : attributes) {
-                                addKvEntry(entityNode, attr);
-                            }
-                        }
-                    } else if (actionType == ActionType.ATTRIBUTES_DELETED) {
-                        String scope = extractParameter(String.class, 0, additionalInfo);
-                        @SuppressWarnings("unchecked")
-                        List<String> keys = extractParameter(List.class, 1, additionalInfo);
-                        metaData.putValue(DataConstants.SCOPE, scope);
-                        ArrayNode attrsArrayNode = entityNode.putArray("attributes");
-                        if (keys != null) {
-                            keys.forEach(attrsArrayNode::add);
-                        }
-                    } else if (actionType == ActionType.TIMESERIES_UPDATED) {
-                        @SuppressWarnings("unchecked")
-                        List<TsKvEntry> timeseries = extractParameter(List.class, 0, additionalInfo);
-                        addTimeseries(entityNode, timeseries);
-                    } else if (actionType == ActionType.TIMESERIES_DELETED) {
-                        @SuppressWarnings("unchecked")
-                        List<String> keys = extractParameter(List.class, 0, additionalInfo);
-                        if (keys != null) {
-                            ArrayNode timeseriesArrayNode = entityNode.putArray("timeseries");
-                            keys.forEach(timeseriesArrayNode::add);
-                        }
-                        entityNode.put("startTs", extractParameter(Long.class, 1, additionalInfo));
-                        entityNode.put("endTs", extractParameter(Long.class, 2, additionalInfo));
-                    }
-                }
-                TbMsg tbMsg = TbMsg.newMsg(msgType, entityId, customerId, metaData, TbMsgDataType.JSON, json.writeValueAsString(entityNode));
-                TenantId tenantId = user.getTenantId();
-                if (tenantId.isNullUid()) {
-                    if (entity instanceof HasTenantId) {
-                        tenantId = ((HasTenantId) entity).getTenantId();
-                    }
-                }
-                tbClusterService.pushMsgToRuleEngine(tenantId, entityId, tbMsg, null);
-            } catch (Exception e) {
-                log.warn("[{}] Failed to push entity action to rule engine: {}", entityId, actionType, e);
-            }
-        }
-    }
-
-    private void addKvEntry(ObjectNode entityNode, KvEntry kvEntry) throws Exception {
-        if (kvEntry.getDataType() == DataType.BOOLEAN) {
-            kvEntry.getBooleanValue().ifPresent(value -> entityNode.put(kvEntry.getKey(), value));
-        } else if (kvEntry.getDataType() == DataType.DOUBLE) {
-            kvEntry.getDoubleValue().ifPresent(value -> entityNode.put(kvEntry.getKey(), value));
-        } else if (kvEntry.getDataType() == DataType.LONG) {
-            kvEntry.getLongValue().ifPresent(value -> entityNode.put(kvEntry.getKey(), value));
-        } else if (kvEntry.getDataType() == DataType.JSON) {
-            if (kvEntry.getJsonValue().isPresent()) {
-                entityNode.set(kvEntry.getKey(), json.readTree(kvEntry.getJsonValue().get()));
-            }
-        } else {
-            entityNode.put(kvEntry.getKey(), kvEntry.getValueAsString());
-        }
-    }
-
-    private <T> T extractParameter(Class<T> clazz, int index, Object... additionalInfo) {
-        T result = null;
-        if (additionalInfo != null && additionalInfo.length > index) {
-            Object paramObject = additionalInfo[index];
-            if (clazz.isInstance(paramObject)) {
-                result = clazz.cast(paramObject);
-            }
-        }
-        return result;
-    }
-
     protected <E extends HasName> String entityToStr(E entity) {
     protected <E extends HasName> String entityToStr(E entity) {
         try {
         try {
             return json.writeValueAsString(json.valueToTree(entity));
             return json.writeValueAsString(json.valueToTree(entity));
@@ -1093,23 +908,6 @@ public abstract class BaseController {
         return result;
         return result;
     }
     }
 
 
-    private void addTimeseries(ObjectNode entityNode, List<TsKvEntry> timeseries) throws Exception {
-        if (timeseries != null && !timeseries.isEmpty()) {
-            ArrayNode result = entityNode.putArray("timeseries");
-            Map<Long, List<TsKvEntry>> groupedTelemetry = timeseries.stream()
-                    .collect(Collectors.groupingBy(TsKvEntry::getTs));
-            for (Map.Entry<Long, List<TsKvEntry>> entry : groupedTelemetry.entrySet()) {
-                ObjectNode element = json.createObjectNode();
-                element.put("ts", entry.getKey());
-                ObjectNode values = element.putObject("values");
-                for (TsKvEntry tsKvEntry : entry.getValue()) {
-                    addKvEntry(values, tsKvEntry);
-                }
-                result.add(element);
-            }
-        }
-    }
-
     protected void processDashboardIdFromAdditionalInfo(ObjectNode additionalInfo, String requiredFields) throws ThingsboardException {
     protected void processDashboardIdFromAdditionalInfo(ObjectNode additionalInfo, String requiredFields) throws ThingsboardException {
         String dashboardId = additionalInfo.has(requiredFields) ? additionalInfo.get(requiredFields).asText() : null;
         String dashboardId = additionalInfo.has(requiredFields) ? additionalInfo.get(requiredFields).asText() : null;
         if (dashboardId != null && !dashboardId.equals("null")) {
         if (dashboardId != null && !dashboardId.equals("null")) {

@@ -53,6 +53,7 @@ import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
@@ -75,6 +76,7 @@ import javax.annotation.Nullable;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 import static org.thingsboard.server.controller.EdgeController.EDGE_ID;
 import static org.thingsboard.server.controller.EdgeController.EDGE_ID;
@@ -153,7 +155,7 @@ public class DeviceController extends BaseController {
                 deviceStateService.onDeviceUpdated(savedDevice);
                 deviceStateService.onDeviceUpdated(savedDevice);
             }
             }
 
 
-            firmwareStateService.update(savedDevice, oldDevice);
+            otaPackageStateService.update(savedDevice, oldDevice);
 
 
             return savedDevice;
             return savedDevice;
         } catch (Exception e) {
         } catch (Exception e) {
@@ -778,4 +780,19 @@ public class DeviceController extends BaseController {
             throw handleException(e);
             throw handleException(e);
         }
         }
     }
     }
+
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/devices/count/{otaPackageType}", method = RequestMethod.GET)
+    @ResponseBody
+    public Long countDevicesByTenantIdAndDeviceProfileIdAndEmptyOtaPackage(@PathVariable("otaPackageType") String otaPackageType,
+                                                                           @RequestParam String deviceProfileId) throws ThingsboardException {
+        checkParameter("OtaPackageType", otaPackageType);
+        checkParameter("DeviceProfileId", deviceProfileId);
+        try {
+            return deviceService.countDevicesByTenantIdAndDeviceProfileIdAndEmptyOtaPackage(
+                    getCurrentUser().getTenantId(), new DeviceProfileId(UUID.fromString(deviceProfileId)), OtaPackageType.valueOf(otaPackageType));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
 }
 }

@@ -168,7 +168,7 @@ public class DeviceProfileController extends BaseController {
                     null,
                     null,
                     created ? ActionType.ADDED : ActionType.UPDATED, null);
                     created ? ActionType.ADDED : ActionType.UPDATED, null);
 
 
-            firmwareStateService.update(savedDeviceProfile, isFirmwareChanged, isSoftwareChanged);
+            otaPackageStateService.update(savedDeviceProfile, isFirmwareChanged, isSoftwareChanged);
 
 
             sendEntityNotificationMsg(getTenantId(), savedDeviceProfile.getId(),
             sendEntityNotificationMsg(getTenantId(), savedDeviceProfile.getId(),
                     deviceProfile.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
                     deviceProfile.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);

@@ -30,14 +30,14 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.Firmware;
-import org.thingsboard.server.common.data.FirmwareInfo;
+import org.thingsboard.server.common.data.OtaPackage;
+import org.thingsboard.server.common.data.OtaPackageInfo;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.firmware.ChecksumAlgorithm;
-import org.thingsboard.server.common.data.firmware.FirmwareType;
+import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
+import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.FirmwareId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -50,26 +50,26 @@ import java.nio.ByteBuffer;
 @RestController
 @RestController
 @TbCoreComponent
 @TbCoreComponent
 @RequestMapping("/api")
 @RequestMapping("/api")
-public class FirmwareController extends BaseController {
+public class OtaPackageController extends BaseController {
 
 
-    public static final String FIRMWARE_ID = "firmwareId";
+    public static final String OTA_PACKAGE_ID = "otaPackageId";
     public static final String CHECKSUM_ALGORITHM = "checksumAlgorithm";
     public static final String CHECKSUM_ALGORITHM = "checksumAlgorithm";
 
 
     @PreAuthorize("hasAnyAuthority( 'TENANT_ADMIN')")
     @PreAuthorize("hasAnyAuthority( 'TENANT_ADMIN')")
-    @RequestMapping(value = "/firmware/{firmwareId}/download", method = RequestMethod.GET)
+    @RequestMapping(value = "/otaPackage/{otaPackageId}/download", method = RequestMethod.GET)
     @ResponseBody
     @ResponseBody
-    public ResponseEntity<org.springframework.core.io.Resource> downloadFirmware(@PathVariable(FIRMWARE_ID) String strFirmwareId) throws ThingsboardException {
-        checkParameter(FIRMWARE_ID, strFirmwareId);
+    public ResponseEntity<org.springframework.core.io.Resource> downloadOtaPackage(@PathVariable(OTA_PACKAGE_ID) String strOtaPackageId) throws ThingsboardException {
+        checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
         try {
         try {
-            FirmwareId firmwareId = new FirmwareId(toUUID(strFirmwareId));
-            Firmware firmware = checkFirmwareId(firmwareId, Operation.READ);
+            OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
+            OtaPackage otaPackage = checkOtaPackageId(otaPackageId, Operation.READ);
 
 
-            ByteArrayResource resource = new ByteArrayResource(firmware.getData().array());
+            ByteArrayResource resource = new ByteArrayResource(otaPackage.getData().array());
             return ResponseEntity.ok()
             return ResponseEntity.ok()
-                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + firmware.getFileName())
-                    .header("x-filename", firmware.getFileName())
+                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + otaPackage.getFileName())
+                    .header("x-filename", otaPackage.getFileName())
                     .contentLength(resource.contentLength())
                     .contentLength(resource.contentLength())
-                    .contentType(parseMediaType(firmware.getContentType()))
+                    .contentType(parseMediaType(otaPackage.getContentType()))
                     .body(resource);
                     .body(resource);
         } catch (Exception e) {
         } catch (Exception e) {
             throw handleException(e);
             throw handleException(e);
@@ -77,144 +77,144 @@ public class FirmwareController extends BaseController {
     }
     }
 
 
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/firmware/info/{firmwareId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/otaPackage/info/{otaPackageId}", method = RequestMethod.GET)
     @ResponseBody
     @ResponseBody
-    public FirmwareInfo getFirmwareInfoById(@PathVariable(FIRMWARE_ID) String strFirmwareId) throws ThingsboardException {
-        checkParameter(FIRMWARE_ID, strFirmwareId);
+    public OtaPackageInfo getOtaPackageInfoById(@PathVariable(OTA_PACKAGE_ID) String strOtaPackageId) throws ThingsboardException {
+        checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
         try {
         try {
-            FirmwareId firmwareId = new FirmwareId(toUUID(strFirmwareId));
-            return checkNotNull(firmwareService.findFirmwareInfoById(getTenantId(), firmwareId));
+            OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
+            return checkNotNull(otaPackageService.findOtaPackageInfoById(getTenantId(), otaPackageId));
         } catch (Exception e) {
         } catch (Exception e) {
             throw handleException(e);
             throw handleException(e);
         }
         }
     }
     }
 
 
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
-    @RequestMapping(value = "/firmware/{firmwareId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/otaPackage/{otaPackageId}", method = RequestMethod.GET)
     @ResponseBody
     @ResponseBody
-    public Firmware getFirmwareById(@PathVariable(FIRMWARE_ID) String strFirmwareId) throws ThingsboardException {
-        checkParameter(FIRMWARE_ID, strFirmwareId);
+    public OtaPackage getOtaPackageById(@PathVariable(OTA_PACKAGE_ID) String strOtaPackageId) throws ThingsboardException {
+        checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
         try {
         try {
-            FirmwareId firmwareId = new FirmwareId(toUUID(strFirmwareId));
-            return checkFirmwareId(firmwareId, Operation.READ);
+            OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
+            return checkOtaPackageId(otaPackageId, Operation.READ);
         } catch (Exception e) {
         } catch (Exception e) {
             throw handleException(e);
             throw handleException(e);
         }
         }
     }
     }
 
 
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
-    @RequestMapping(value = "/firmware", method = RequestMethod.POST)
+    @RequestMapping(value = "/otaPackage", method = RequestMethod.POST)
     @ResponseBody
     @ResponseBody
-    public FirmwareInfo saveFirmwareInfo(@RequestBody FirmwareInfo firmwareInfo) throws ThingsboardException {
-        boolean created = firmwareInfo.getId() == null;
+    public OtaPackageInfo saveOtaPackageInfo(@RequestBody OtaPackageInfo otaPackageInfo) throws ThingsboardException {
+        boolean created = otaPackageInfo.getId() == null;
         try {
         try {
-            firmwareInfo.setTenantId(getTenantId());
-            checkEntity(firmwareInfo.getId(), firmwareInfo, Resource.FIRMWARE);
-            FirmwareInfo savedFirmwareInfo = firmwareService.saveFirmwareInfo(firmwareInfo);
-            logEntityAction(savedFirmwareInfo.getId(), savedFirmwareInfo,
+            otaPackageInfo.setTenantId(getTenantId());
+            checkEntity(otaPackageInfo.getId(), otaPackageInfo, Resource.OTA_PACKAGE);
+            OtaPackageInfo savedOtaPackageInfo = otaPackageService.saveOtaPackageInfo(otaPackageInfo);
+            logEntityAction(savedOtaPackageInfo.getId(), savedOtaPackageInfo,
                     null, created ? ActionType.ADDED : ActionType.UPDATED, null);
                     null, created ? ActionType.ADDED : ActionType.UPDATED, null);
-            return savedFirmwareInfo;
+            return savedOtaPackageInfo;
         } catch (Exception e) {
         } catch (Exception e) {
-            logEntityAction(emptyId(EntityType.FIRMWARE), firmwareInfo,
+            logEntityAction(emptyId(EntityType.OTA_PACKAGE), otaPackageInfo,
                     null, created ? ActionType.ADDED : ActionType.UPDATED, e);
                     null, created ? ActionType.ADDED : ActionType.UPDATED, e);
             throw handleException(e);
             throw handleException(e);
         }
         }
     }
     }
 
 
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
-    @RequestMapping(value = "/firmware/{firmwareId}", method = RequestMethod.POST)
+    @RequestMapping(value = "/otaPackage/{otaPackageId}", method = RequestMethod.POST)
     @ResponseBody
     @ResponseBody
-    public Firmware saveFirmwareData(@PathVariable(FIRMWARE_ID) String strFirmwareId,
-                                     @RequestParam(required = false) String checksum,
-                                     @RequestParam(CHECKSUM_ALGORITHM) String checksumAlgorithmStr,
-                                     @RequestBody MultipartFile file) throws ThingsboardException {
-        checkParameter(FIRMWARE_ID, strFirmwareId);
+    public OtaPackage saveOtaPackageData(@PathVariable(OTA_PACKAGE_ID) String strOtaPackageId,
+                                         @RequestParam(required = false) String checksum,
+                                         @RequestParam(CHECKSUM_ALGORITHM) String checksumAlgorithmStr,
+                                         @RequestBody MultipartFile file) throws ThingsboardException {
+        checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
         checkParameter(CHECKSUM_ALGORITHM, checksumAlgorithmStr);
         checkParameter(CHECKSUM_ALGORITHM, checksumAlgorithmStr);
         try {
         try {
-            FirmwareId firmwareId = new FirmwareId(toUUID(strFirmwareId));
-            FirmwareInfo info = checkFirmwareInfoId(firmwareId, Operation.READ);
-
-            Firmware firmware = new Firmware(firmwareId);
-            firmware.setCreatedTime(info.getCreatedTime());
-            firmware.setTenantId(getTenantId());
-            firmware.setDeviceProfileId(info.getDeviceProfileId());
-            firmware.setType(info.getType());
-            firmware.setTitle(info.getTitle());
-            firmware.setVersion(info.getVersion());
-            firmware.setAdditionalInfo(info.getAdditionalInfo());
+            OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
+            OtaPackageInfo info = checkOtaPackageInfoId(otaPackageId, Operation.READ);
+
+            OtaPackage otaPackage = new OtaPackage(otaPackageId);
+            otaPackage.setCreatedTime(info.getCreatedTime());
+            otaPackage.setTenantId(getTenantId());
+            otaPackage.setDeviceProfileId(info.getDeviceProfileId());
+            otaPackage.setType(info.getType());
+            otaPackage.setTitle(info.getTitle());
+            otaPackage.setVersion(info.getVersion());
+            otaPackage.setAdditionalInfo(info.getAdditionalInfo());
 
 
             ChecksumAlgorithm checksumAlgorithm = ChecksumAlgorithm.valueOf(checksumAlgorithmStr.toUpperCase());
             ChecksumAlgorithm checksumAlgorithm = ChecksumAlgorithm.valueOf(checksumAlgorithmStr.toUpperCase());
 
 
             byte[] bytes = file.getBytes();
             byte[] bytes = file.getBytes();
             if (StringUtils.isEmpty(checksum)) {
             if (StringUtils.isEmpty(checksum)) {
-                checksum = firmwareService.generateChecksum(checksumAlgorithm, ByteBuffer.wrap(bytes));
+                checksum = otaPackageService.generateChecksum(checksumAlgorithm, ByteBuffer.wrap(bytes));
             }
             }
 
 
-            firmware.setChecksumAlgorithm(checksumAlgorithm);
-            firmware.setChecksum(checksum);
-            firmware.setFileName(file.getOriginalFilename());
-            firmware.setContentType(file.getContentType());
-            firmware.setData(ByteBuffer.wrap(bytes));
-            firmware.setDataSize((long) bytes.length);
-            Firmware savedFirmware = firmwareService.saveFirmware(firmware);
-            logEntityAction(savedFirmware.getId(), savedFirmware, null, ActionType.UPDATED, null);
-            return savedFirmware;
+            otaPackage.setChecksumAlgorithm(checksumAlgorithm);
+            otaPackage.setChecksum(checksum);
+            otaPackage.setFileName(file.getOriginalFilename());
+            otaPackage.setContentType(file.getContentType());
+            otaPackage.setData(ByteBuffer.wrap(bytes));
+            otaPackage.setDataSize((long) bytes.length);
+            OtaPackage savedOtaPackage = otaPackageService.saveOtaPackage(otaPackage);
+            logEntityAction(savedOtaPackage.getId(), savedOtaPackage, null, ActionType.UPDATED, null);
+            return savedOtaPackage;
         } catch (Exception e) {
         } catch (Exception e) {
-            logEntityAction(emptyId(EntityType.FIRMWARE), null, null, ActionType.UPDATED, e, strFirmwareId);
+            logEntityAction(emptyId(EntityType.OTA_PACKAGE), null, null, ActionType.UPDATED, e, strOtaPackageId);
             throw handleException(e);
             throw handleException(e);
         }
         }
     }
     }
 
 
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/firmwares", method = RequestMethod.GET)
+    @RequestMapping(value = "/otaPackages", method = RequestMethod.GET)
     @ResponseBody
     @ResponseBody
-    public PageData<FirmwareInfo> getFirmwares(@RequestParam int pageSize,
-                                               @RequestParam int page,
-                                               @RequestParam(required = false) String textSearch,
-                                               @RequestParam(required = false) String sortProperty,
-                                               @RequestParam(required = false) String sortOrder) throws ThingsboardException {
+    public PageData<OtaPackageInfo> getOtaPackages(@RequestParam int pageSize,
+                                                 @RequestParam int page,
+                                                 @RequestParam(required = false) String textSearch,
+                                                 @RequestParam(required = false) String sortProperty,
+                                                 @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         try {
         try {
             PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
             PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
-            return checkNotNull(firmwareService.findTenantFirmwaresByTenantId(getTenantId(), pageLink));
+            return checkNotNull(otaPackageService.findTenantOtaPackagesByTenantId(getTenantId(), pageLink));
         } catch (Exception e) {
         } catch (Exception e) {
             throw handleException(e);
             throw handleException(e);
         }
         }
     }
     }
 
 
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/firmwares/{deviceProfileId}/{type}/{hasData}", method = RequestMethod.GET)
+    @RequestMapping(value = "/otaPackages/{deviceProfileId}/{type}/{hasData}", method = RequestMethod.GET)
     @ResponseBody
     @ResponseBody
-    public PageData<FirmwareInfo> getFirmwares(@PathVariable("deviceProfileId") String strDeviceProfileId,
-                                               @PathVariable("type") String strType,
-                                               @PathVariable("hasData") boolean hasData,
-                                               @RequestParam int pageSize,
-                                               @RequestParam int page,
-                                               @RequestParam(required = false) String textSearch,
-                                               @RequestParam(required = false) String sortProperty,
-                                               @RequestParam(required = false) String sortOrder) throws ThingsboardException {
+    public PageData<OtaPackageInfo> getOtaPackages(@PathVariable("deviceProfileId") String strDeviceProfileId,
+                                                   @PathVariable("type") String strType,
+                                                   @PathVariable("hasData") boolean hasData,
+                                                   @RequestParam int pageSize,
+                                                   @RequestParam int page,
+                                                   @RequestParam(required = false) String textSearch,
+                                                   @RequestParam(required = false) String sortProperty,
+                                                   @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("deviceProfileId", strDeviceProfileId);
         checkParameter("deviceProfileId", strDeviceProfileId);
         checkParameter("type", strType);
         checkParameter("type", strType);
         try {
         try {
             PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
             PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
-            return checkNotNull(firmwareService.findTenantFirmwaresByTenantIdAndDeviceProfileIdAndTypeAndHasData(getTenantId(),
-                    new DeviceProfileId(toUUID(strDeviceProfileId)), FirmwareType.valueOf(strType), hasData, pageLink));
+            return checkNotNull(otaPackageService.findTenantOtaPackagesByTenantIdAndDeviceProfileIdAndTypeAndHasData(getTenantId(),
+                    new DeviceProfileId(toUUID(strDeviceProfileId)), OtaPackageType.valueOf(strType), hasData, pageLink));
         } catch (Exception e) {
         } catch (Exception e) {
             throw handleException(e);
             throw handleException(e);
         }
         }
     }
     }
 
 
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
-    @RequestMapping(value = "/firmware/{firmwareId}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/otaPackage/{otaPackageId}", method = RequestMethod.DELETE)
     @ResponseBody
     @ResponseBody
-    public void deleteFirmware(@PathVariable("firmwareId") String strFirmwareId) throws ThingsboardException {
-        checkParameter(FIRMWARE_ID, strFirmwareId);
+    public void deleteOtaPackage(@PathVariable("otaPackageId") String strOtaPackageId) throws ThingsboardException {
+        checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
         try {
         try {
-            FirmwareId firmwareId = new FirmwareId(toUUID(strFirmwareId));
-            FirmwareInfo info = checkFirmwareInfoId(firmwareId, Operation.DELETE);
-            firmwareService.deleteFirmware(getTenantId(), firmwareId);
-            logEntityAction(firmwareId, info, null, ActionType.DELETED, null, strFirmwareId);
+            OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
+            OtaPackageInfo info = checkOtaPackageInfoId(otaPackageId, Operation.DELETE);
+            otaPackageService.deleteOtaPackage(getTenantId(), otaPackageId);
+            logEntityAction(otaPackageId, info, null, ActionType.DELETED, null, strOtaPackageId);
         } catch (Exception e) {
         } catch (Exception e) {
-            logEntityAction(emptyId(EntityType.FIRMWARE), null, null, ActionType.DELETED, e, strFirmwareId);
+            logEntityAction(emptyId(EntityType.OTA_PACKAGE), null, null, ActionType.DELETED, e, strOtaPackageId);
             throw handleException(e);
             throw handleException(e);
         }
         }
     }
     }

+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.action;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.HasName;
+import org.thingsboard.server.common.data.HasTenantId;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.kv.AttributeKvEntry;
+import org.thingsboard.server.common.data.kv.DataType;
+import org.thingsboard.server.common.data.kv.KvEntry;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+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.TbCoreComponent;
+import org.thingsboard.server.service.queue.TbClusterService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@TbCoreComponent
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class RuleEngineEntityActionService {
+    private final TbClusterService tbClusterService;
+
+    private static final ObjectMapper json = new ObjectMapper();
+
+    public void pushEntityActionToRuleEngine(EntityId entityId, HasName entity, TenantId tenantId, CustomerId customerId,
+                                             ActionType actionType, User user, Object... additionalInfo) {
+        String msgType = null;
+        switch (actionType) {
+            case ADDED:
+                msgType = DataConstants.ENTITY_CREATED;
+                break;
+            case DELETED:
+                msgType = DataConstants.ENTITY_DELETED;
+                break;
+            case UPDATED:
+                msgType = DataConstants.ENTITY_UPDATED;
+                break;
+            case ASSIGNED_TO_CUSTOMER:
+                msgType = DataConstants.ENTITY_ASSIGNED;
+                break;
+            case UNASSIGNED_FROM_CUSTOMER:
+                msgType = DataConstants.ENTITY_UNASSIGNED;
+                break;
+            case ATTRIBUTES_UPDATED:
+                msgType = DataConstants.ATTRIBUTES_UPDATED;
+                break;
+            case ATTRIBUTES_DELETED:
+                msgType = DataConstants.ATTRIBUTES_DELETED;
+                break;
+            case ALARM_ACK:
+                msgType = DataConstants.ALARM_ACK;
+                break;
+            case ALARM_CLEAR:
+                msgType = DataConstants.ALARM_CLEAR;
+                break;
+            case ALARM_DELETE:
+                msgType = DataConstants.ALARM_DELETE;
+                break;
+            case ASSIGNED_FROM_TENANT:
+                msgType = DataConstants.ENTITY_ASSIGNED_FROM_TENANT;
+                break;
+            case ASSIGNED_TO_TENANT:
+                msgType = DataConstants.ENTITY_ASSIGNED_TO_TENANT;
+                break;
+            case PROVISION_SUCCESS:
+                msgType = DataConstants.PROVISION_SUCCESS;
+                break;
+            case PROVISION_FAILURE:
+                msgType = DataConstants.PROVISION_FAILURE;
+                break;
+            case TIMESERIES_UPDATED:
+                msgType = DataConstants.TIMESERIES_UPDATED;
+                break;
+            case TIMESERIES_DELETED:
+                msgType = DataConstants.TIMESERIES_DELETED;
+                break;
+            case ASSIGNED_TO_EDGE:
+                msgType = DataConstants.ENTITY_ASSIGNED_TO_EDGE;
+                break;
+            case UNASSIGNED_FROM_EDGE:
+                msgType = DataConstants.ENTITY_UNASSIGNED_FROM_EDGE;
+                break;
+        }
+        if (!StringUtils.isEmpty(msgType)) {
+            try {
+                TbMsgMetaData metaData = new TbMsgMetaData();
+                if (user != null) {
+                    metaData.putValue("userId", user.getId().toString());
+                    metaData.putValue("userName", user.getName());
+                }
+                if (customerId != null && !customerId.isNullUid()) {
+                    metaData.putValue("customerId", customerId.toString());
+                }
+                if (actionType == ActionType.ASSIGNED_TO_CUSTOMER) {
+                    String strCustomerId = extractParameter(String.class, 1, additionalInfo);
+                    String strCustomerName = extractParameter(String.class, 2, additionalInfo);
+                    metaData.putValue("assignedCustomerId", strCustomerId);
+                    metaData.putValue("assignedCustomerName", strCustomerName);
+                } else if (actionType == ActionType.UNASSIGNED_FROM_CUSTOMER) {
+                    String strCustomerId = extractParameter(String.class, 1, additionalInfo);
+                    String strCustomerName = extractParameter(String.class, 2, additionalInfo);
+                    metaData.putValue("unassignedCustomerId", strCustomerId);
+                    metaData.putValue("unassignedCustomerName", strCustomerName);
+                } else if (actionType == ActionType.ASSIGNED_FROM_TENANT) {
+                    String strTenantId = extractParameter(String.class, 0, additionalInfo);
+                    String strTenantName = extractParameter(String.class, 1, additionalInfo);
+                    metaData.putValue("assignedFromTenantId", strTenantId);
+                    metaData.putValue("assignedFromTenantName", strTenantName);
+                } else if (actionType == ActionType.ASSIGNED_TO_TENANT) {
+                    String strTenantId = extractParameter(String.class, 0, additionalInfo);
+                    String strTenantName = extractParameter(String.class, 1, additionalInfo);
+                    metaData.putValue("assignedToTenantId", strTenantId);
+                    metaData.putValue("assignedToTenantName", strTenantName);
+                } else if (actionType == ActionType.ASSIGNED_TO_EDGE) {
+                    String strEdgeId = extractParameter(String.class, 1, additionalInfo);
+                    String strEdgeName = extractParameter(String.class, 2, additionalInfo);
+                    metaData.putValue("assignedEdgeId", strEdgeId);
+                    metaData.putValue("assignedEdgeName", strEdgeName);
+                } else if (actionType == ActionType.UNASSIGNED_FROM_EDGE) {
+                    String strEdgeId = extractParameter(String.class, 1, additionalInfo);
+                    String strEdgeName = extractParameter(String.class, 2, additionalInfo);
+                    metaData.putValue("unassignedEdgeId", strEdgeId);
+                    metaData.putValue("unassignedEdgeName", strEdgeName);
+                }
+                ObjectNode entityNode;
+                if (entity != null) {
+                    entityNode = json.valueToTree(entity);
+                    if (entityId.getEntityType() == EntityType.DASHBOARD) {
+                        entityNode.put("configuration", "");
+                    }
+                } else {
+                    entityNode = json.createObjectNode();
+                    if (actionType == ActionType.ATTRIBUTES_UPDATED) {
+                        String scope = extractParameter(String.class, 0, additionalInfo);
+                        @SuppressWarnings("unchecked")
+                        List<AttributeKvEntry> attributes = extractParameter(List.class, 1, additionalInfo);
+                        metaData.putValue(DataConstants.SCOPE, scope);
+                        if (attributes != null) {
+                            for (AttributeKvEntry attr : attributes) {
+                                addKvEntry(entityNode, attr);
+                            }
+                        }
+                    } else if (actionType == ActionType.ATTRIBUTES_DELETED) {
+                        String scope = extractParameter(String.class, 0, additionalInfo);
+                        @SuppressWarnings("unchecked")
+                        List<String> keys = extractParameter(List.class, 1, additionalInfo);
+                        metaData.putValue(DataConstants.SCOPE, scope);
+                        ArrayNode attrsArrayNode = entityNode.putArray("attributes");
+                        if (keys != null) {
+                            keys.forEach(attrsArrayNode::add);
+                        }
+                    } else if (actionType == ActionType.TIMESERIES_UPDATED) {
+                        @SuppressWarnings("unchecked")
+                        List<TsKvEntry> timeseries = extractParameter(List.class, 0, additionalInfo);
+                        addTimeseries(entityNode, timeseries);
+                    } else if (actionType == ActionType.TIMESERIES_DELETED) {
+                        @SuppressWarnings("unchecked")
+                        List<String> keys = extractParameter(List.class, 0, additionalInfo);
+                        if (keys != null) {
+                            ArrayNode timeseriesArrayNode = entityNode.putArray("timeseries");
+                            keys.forEach(timeseriesArrayNode::add);
+                        }
+                        entityNode.put("startTs", extractParameter(Long.class, 1, additionalInfo));
+                        entityNode.put("endTs", extractParameter(Long.class, 2, additionalInfo));
+                    }
+                }
+                TbMsg tbMsg = TbMsg.newMsg(msgType, entityId, customerId, metaData, TbMsgDataType.JSON, json.writeValueAsString(entityNode));
+                if (tenantId.isNullUid()) {
+                    if (entity instanceof HasTenantId) {
+                        tenantId = ((HasTenantId) entity).getTenantId();
+                    }
+                }
+                tbClusterService.pushMsgToRuleEngine(tenantId, entityId, tbMsg, null);
+            } catch (Exception e) {
+                log.warn("[{}] Failed to push entity action to rule engine: {}", entityId, actionType, e);
+            }
+        }
+    }
+
+
+    private <T> T extractParameter(Class<T> clazz, int index, Object... additionalInfo) {
+        T result = null;
+        if (additionalInfo != null && additionalInfo.length > index) {
+            Object paramObject = additionalInfo[index];
+            if (clazz.isInstance(paramObject)) {
+                result = clazz.cast(paramObject);
+            }
+        }
+        return result;
+    }
+
+    private void addTimeseries(ObjectNode entityNode, List<TsKvEntry> timeseries) throws Exception {
+        if (timeseries != null && !timeseries.isEmpty()) {
+            ArrayNode result = entityNode.putArray("timeseries");
+            Map<Long, List<TsKvEntry>> groupedTelemetry = timeseries.stream()
+                    .collect(Collectors.groupingBy(TsKvEntry::getTs));
+            for (Map.Entry<Long, List<TsKvEntry>> entry : groupedTelemetry.entrySet()) {
+                ObjectNode element = json.createObjectNode();
+                element.put("ts", entry.getKey());
+                ObjectNode values = element.putObject("values");
+                for (TsKvEntry tsKvEntry : entry.getValue()) {
+                    addKvEntry(values, tsKvEntry);
+                }
+                result.add(element);
+            }
+        }
+    }
+
+    private void addKvEntry(ObjectNode entityNode, KvEntry kvEntry) throws Exception {
+        if (kvEntry.getDataType() == DataType.BOOLEAN) {
+            kvEntry.getBooleanValue().ifPresent(value -> entityNode.put(kvEntry.getKey(), value));
+        } else if (kvEntry.getDataType() == DataType.DOUBLE) {
+            kvEntry.getDoubleValue().ifPresent(value -> entityNode.put(kvEntry.getKey(), value));
+        } else if (kvEntry.getDataType() == DataType.LONG) {
+            kvEntry.getLongValue().ifPresent(value -> entityNode.put(kvEntry.getKey(), value));
+        } else if (kvEntry.getDataType() == DataType.JSON) {
+            if (kvEntry.getJsonValue().isPresent()) {
+                entityNode.set(kvEntry.getKey(), json.readTree(kvEntry.getJsonValue().get()));
+            }
+        } else {
+            entityNode.put(kvEntry.getKey(), kvEntry.getValueAsString());
+        }
+    }
+}

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.service.firmware;
+package org.thingsboard.server.service.ota;
 
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.FutureCallback;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -23,12 +23,9 @@ import org.thingsboard.rule.engine.api.msg.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.FirmwareInfo;
-import org.thingsboard.server.common.data.firmware.FirmwareType;
-import org.thingsboard.server.common.data.firmware.FirmwareUpdateStatus;
-import org.thingsboard.server.common.data.firmware.FirmwareUtil;
+import org.thingsboard.server.common.data.OtaPackageInfo;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.FirmwareId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.AttributeKey;
 import org.thingsboard.server.common.data.kv.AttributeKey;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
@@ -37,13 +34,16 @@ import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
 import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.common.data.ota.OtaPackageType;
+import org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus;
+import org.thingsboard.server.common.data.ota.OtaPackageUtil;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
 import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.device.DeviceService;
-import org.thingsboard.server.dao.firmware.FirmwareService;
-import org.thingsboard.server.gen.transport.TransportProtos.ToFirmwareStateServiceMsg;
+import org.thingsboard.server.dao.ota.OtaPackageService;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
 import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
@@ -58,44 +58,43 @@ import java.util.List;
 import java.util.Set;
 import java.util.Set;
 import java.util.UUID;
 import java.util.UUID;
 import java.util.function.Consumer;
 import java.util.function.Consumer;
-import java.util.function.Function;
-
-import static org.thingsboard.server.common.data.firmware.FirmwareKey.CHECKSUM;
-import static org.thingsboard.server.common.data.firmware.FirmwareKey.CHECKSUM_ALGORITHM;
-import static org.thingsboard.server.common.data.firmware.FirmwareKey.SIZE;
-import static org.thingsboard.server.common.data.firmware.FirmwareKey.STATE;
-import static org.thingsboard.server.common.data.firmware.FirmwareKey.TITLE;
-import static org.thingsboard.server.common.data.firmware.FirmwareKey.TS;
-import static org.thingsboard.server.common.data.firmware.FirmwareKey.VERSION;
-import static org.thingsboard.server.common.data.firmware.FirmwareType.FIRMWARE;
-import static org.thingsboard.server.common.data.firmware.FirmwareType.SOFTWARE;
-import static org.thingsboard.server.common.data.firmware.FirmwareUtil.getAttributeKey;
-import static org.thingsboard.server.common.data.firmware.FirmwareUtil.getTargetTelemetryKey;
-import static org.thingsboard.server.common.data.firmware.FirmwareUtil.getTelemetryKey;
+
+import static org.thingsboard.server.common.data.ota.OtaPackageKey.CHECKSUM;
+import static org.thingsboard.server.common.data.ota.OtaPackageKey.CHECKSUM_ALGORITHM;
+import static org.thingsboard.server.common.data.ota.OtaPackageKey.SIZE;
+import static org.thingsboard.server.common.data.ota.OtaPackageKey.STATE;
+import static org.thingsboard.server.common.data.ota.OtaPackageKey.TITLE;
+import static org.thingsboard.server.common.data.ota.OtaPackageKey.TS;
+import static org.thingsboard.server.common.data.ota.OtaPackageKey.VERSION;
+import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE;
+import static org.thingsboard.server.common.data.ota.OtaPackageType.SOFTWARE;
+import static org.thingsboard.server.common.data.ota.OtaPackageUtil.getAttributeKey;
+import static org.thingsboard.server.common.data.ota.OtaPackageUtil.getTargetTelemetryKey;
+import static org.thingsboard.server.common.data.ota.OtaPackageUtil.getTelemetryKey;
 
 
 @Slf4j
 @Slf4j
 @Service
 @Service
 @TbCoreComponent
 @TbCoreComponent
-public class DefaultFirmwareStateService implements FirmwareStateService {
+public class DefaultOtaPackageStateService implements OtaPackageStateService {
 
 
     private final TbClusterService tbClusterService;
     private final TbClusterService tbClusterService;
-    private final FirmwareService firmwareService;
+    private final OtaPackageService otaPackageService;
     private final DeviceService deviceService;
     private final DeviceService deviceService;
     private final DeviceProfileService deviceProfileService;
     private final DeviceProfileService deviceProfileService;
     private final RuleEngineTelemetryService telemetryService;
     private final RuleEngineTelemetryService telemetryService;
-    private final TbQueueProducer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> fwStateMsgProducer;
+    private final TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> otaPackageStateMsgProducer;
 
 
-    public DefaultFirmwareStateService(TbClusterService tbClusterService, FirmwareService firmwareService,
-                                       DeviceService deviceService,
-                                       DeviceProfileService deviceProfileService,
-                                       RuleEngineTelemetryService telemetryService,
-                                       TbCoreQueueFactory coreQueueFactory) {
+    public DefaultOtaPackageStateService(TbClusterService tbClusterService, OtaPackageService otaPackageService,
+                                         DeviceService deviceService,
+                                         DeviceProfileService deviceProfileService,
+                                         RuleEngineTelemetryService telemetryService,
+                                         TbCoreQueueFactory coreQueueFactory) {
         this.tbClusterService = tbClusterService;
         this.tbClusterService = tbClusterService;
-        this.firmwareService = firmwareService;
+        this.otaPackageService = otaPackageService;
         this.deviceService = deviceService;
         this.deviceService = deviceService;
         this.deviceProfileService = deviceProfileService;
         this.deviceProfileService = deviceProfileService;
         this.telemetryService = telemetryService;
         this.telemetryService = telemetryService;
-        this.fwStateMsgProducer = coreQueueFactory.createToFirmwareStateServiceMsgProducer();
+        this.otaPackageStateMsgProducer = coreQueueFactory.createToOtaPackageStateServiceMsgProducer();
     }
     }
 
 
     @Override
     @Override
@@ -105,14 +104,14 @@ public class DefaultFirmwareStateService implements FirmwareStateService {
     }
     }
 
 
     private void updateFirmware(Device device, Device oldDevice) {
     private void updateFirmware(Device device, Device oldDevice) {
-        FirmwareId newFirmwareId = device.getFirmwareId();
+        OtaPackageId newFirmwareId = device.getFirmwareId();
         if (newFirmwareId == null) {
         if (newFirmwareId == null) {
             DeviceProfile newDeviceProfile = deviceProfileService.findDeviceProfileById(device.getTenantId(), device.getDeviceProfileId());
             DeviceProfile newDeviceProfile = deviceProfileService.findDeviceProfileById(device.getTenantId(), device.getDeviceProfileId());
             newFirmwareId = newDeviceProfile.getFirmwareId();
             newFirmwareId = newDeviceProfile.getFirmwareId();
         }
         }
         if (oldDevice != null) {
         if (oldDevice != null) {
             if (newFirmwareId != null) {
             if (newFirmwareId != null) {
-                FirmwareId oldFirmwareId = oldDevice.getFirmwareId();
+                OtaPackageId oldFirmwareId = oldDevice.getFirmwareId();
                 if (oldFirmwareId == null) {
                 if (oldFirmwareId == null) {
                     DeviceProfile oldDeviceProfile = deviceProfileService.findDeviceProfileById(oldDevice.getTenantId(), oldDevice.getDeviceProfileId());
                     DeviceProfile oldDeviceProfile = deviceProfileService.findDeviceProfileById(oldDevice.getTenantId(), oldDevice.getDeviceProfileId());
                     oldFirmwareId = oldDeviceProfile.getFirmwareId();
                     oldFirmwareId = oldDeviceProfile.getFirmwareId();
@@ -132,14 +131,14 @@ public class DefaultFirmwareStateService implements FirmwareStateService {
     }
     }
 
 
     private void updateSoftware(Device device, Device oldDevice) {
     private void updateSoftware(Device device, Device oldDevice) {
-        FirmwareId newSoftwareId = device.getSoftwareId();
+        OtaPackageId newSoftwareId = device.getSoftwareId();
         if (newSoftwareId == null) {
         if (newSoftwareId == null) {
             DeviceProfile newDeviceProfile = deviceProfileService.findDeviceProfileById(device.getTenantId(), device.getDeviceProfileId());
             DeviceProfile newDeviceProfile = deviceProfileService.findDeviceProfileById(device.getTenantId(), device.getDeviceProfileId());
             newSoftwareId = newDeviceProfile.getSoftwareId();
             newSoftwareId = newDeviceProfile.getSoftwareId();
         }
         }
         if (oldDevice != null) {
         if (oldDevice != null) {
             if (newSoftwareId != null) {
             if (newSoftwareId != null) {
-                FirmwareId oldSoftwareId = oldDevice.getSoftwareId();
+                OtaPackageId oldSoftwareId = oldDevice.getSoftwareId();
                 if (oldSoftwareId == null) {
                 if (oldSoftwareId == null) {
                     DeviceProfile oldDeviceProfile = deviceProfileService.findDeviceProfileById(oldDevice.getTenantId(), oldDevice.getDeviceProfileId());
                     DeviceProfile oldDeviceProfile = deviceProfileService.findDeviceProfileById(oldDevice.getTenantId(), oldDevice.getDeviceProfileId());
                     oldSoftwareId = oldDeviceProfile.getSoftwareId();
                     oldSoftwareId = oldDeviceProfile.getSoftwareId();
@@ -170,33 +169,20 @@ public class DefaultFirmwareStateService implements FirmwareStateService {
         }
         }
     }
     }
 
 
-    private void update(TenantId tenantId, DeviceProfile deviceProfile, FirmwareType firmwareType) {
-        Function<PageLink, PageData<Device>> getDevicesFunction;
+    private void update(TenantId tenantId, DeviceProfile deviceProfile, OtaPackageType otaPackageType) {
         Consumer<Device> updateConsumer;
         Consumer<Device> updateConsumer;
 
 
-        switch (firmwareType) {
-            case FIRMWARE:
-                getDevicesFunction = pl -> deviceService.findDevicesByTenantIdAndTypeAndEmptyFirmware(tenantId, deviceProfile.getName(), pl);
-                break;
-            case SOFTWARE:
-                getDevicesFunction = pl -> deviceService.findDevicesByTenantIdAndTypeAndEmptySoftware(tenantId, deviceProfile.getName(), pl);
-                break;
-            default:
-                log.warn("Unsupported firmware type: [{}]", firmwareType);
-                return;
-        }
-
         if (deviceProfile.getFirmwareId() != null) {
         if (deviceProfile.getFirmwareId() != null) {
             long ts = System.currentTimeMillis();
             long ts = System.currentTimeMillis();
-            updateConsumer = d -> send(d.getTenantId(), d.getId(), deviceProfile.getFirmwareId(), ts, firmwareType);
+            updateConsumer = d -> send(d.getTenantId(), d.getId(), deviceProfile.getFirmwareId(), ts, otaPackageType);
         } else {
         } else {
-            updateConsumer = d -> remove(d, firmwareType);
+            updateConsumer = d -> remove(d, otaPackageType);
         }
         }
 
 
         PageLink pageLink = new PageLink(100);
         PageLink pageLink = new PageLink(100);
         PageData<Device> pageData;
         PageData<Device> pageData;
         do {
         do {
-            pageData = getDevicesFunction.apply(pageLink);
+            pageData = deviceService.findDevicesByTenantIdAndTypeAndEmptyOtaPackage(tenantId, deviceProfile.getId(), otaPackageType, pageLink);
             pageData.getData().forEach(updateConsumer);
             pageData.getData().forEach(updateConsumer);
 
 
             if (pageData.hasNext()) {
             if (pageData.hasNext()) {
@@ -206,60 +192,60 @@ public class DefaultFirmwareStateService implements FirmwareStateService {
     }
     }
 
 
     @Override
     @Override
-    public boolean process(ToFirmwareStateServiceMsg msg) {
+    public boolean process(ToOtaPackageStateServiceMsg msg) {
         boolean isSuccess = false;
         boolean isSuccess = false;
-        FirmwareId targetFirmwareId = new FirmwareId(new UUID(msg.getFirmwareIdMSB(), msg.getFirmwareIdLSB()));
+        OtaPackageId targetOtaPackageId = new OtaPackageId(new UUID(msg.getOtaPackageIdMSB(), msg.getOtaPackageIdLSB()));
         DeviceId deviceId = new DeviceId(new UUID(msg.getDeviceIdMSB(), msg.getDeviceIdLSB()));
         DeviceId deviceId = new DeviceId(new UUID(msg.getDeviceIdMSB(), msg.getDeviceIdLSB()));
         TenantId tenantId = new TenantId(new UUID(msg.getTenantIdMSB(), msg.getTenantIdLSB()));
         TenantId tenantId = new TenantId(new UUID(msg.getTenantIdMSB(), msg.getTenantIdLSB()));
-        FirmwareType firmwareType = FirmwareType.valueOf(msg.getType());
+        OtaPackageType firmwareType = OtaPackageType.valueOf(msg.getType());
         long ts = msg.getTs();
         long ts = msg.getTs();
 
 
         Device device = deviceService.findDeviceById(tenantId, deviceId);
         Device device = deviceService.findDeviceById(tenantId, deviceId);
         if (device == null) {
         if (device == null) {
             log.warn("[{}] [{}] Device was removed during firmware update msg was queued!", tenantId, deviceId);
             log.warn("[{}] [{}] Device was removed during firmware update msg was queued!", tenantId, deviceId);
         } else {
         } else {
-            FirmwareId currentFirmwareId = FirmwareUtil.getFirmwareId(device, firmwareType);
-            if (currentFirmwareId == null) {
+            OtaPackageId currentOtaPackageId = OtaPackageUtil.getOtaPackageId(device, firmwareType);
+            if (currentOtaPackageId == null) {
                 DeviceProfile deviceProfile = deviceProfileService.findDeviceProfileById(tenantId, device.getDeviceProfileId());
                 DeviceProfile deviceProfile = deviceProfileService.findDeviceProfileById(tenantId, device.getDeviceProfileId());
-                currentFirmwareId = FirmwareUtil.getFirmwareId(deviceProfile, firmwareType);
+                currentOtaPackageId = OtaPackageUtil.getOtaPackageId(deviceProfile, firmwareType);
             }
             }
 
 
-            if (targetFirmwareId.equals(currentFirmwareId)) {
-                update(device, firmwareService.findFirmwareInfoById(device.getTenantId(), targetFirmwareId), ts);
+            if (targetOtaPackageId.equals(currentOtaPackageId)) {
+                update(device, otaPackageService.findOtaPackageInfoById(device.getTenantId(), targetOtaPackageId), ts);
                 isSuccess = true;
                 isSuccess = true;
             } else {
             } else {
-                log.warn("[{}] [{}] Can`t update firmware for the device, target firmwareId: [{}], current firmwareId: [{}]!", tenantId, deviceId, targetFirmwareId, currentFirmwareId);
+                log.warn("[{}] [{}] Can`t update firmware for the device, target firmwareId: [{}], current firmwareId: [{}]!", tenantId, deviceId, targetOtaPackageId, currentOtaPackageId);
             }
             }
         }
         }
         return isSuccess;
         return isSuccess;
     }
     }
 
 
-    private void send(TenantId tenantId, DeviceId deviceId, FirmwareId firmwareId, long ts, FirmwareType firmwareType) {
-        ToFirmwareStateServiceMsg msg = ToFirmwareStateServiceMsg.newBuilder()
+    private void send(TenantId tenantId, DeviceId deviceId, OtaPackageId firmwareId, long ts, OtaPackageType firmwareType) {
+        ToOtaPackageStateServiceMsg msg = ToOtaPackageStateServiceMsg.newBuilder()
                 .setTenantIdMSB(tenantId.getId().getMostSignificantBits())
                 .setTenantIdMSB(tenantId.getId().getMostSignificantBits())
                 .setTenantIdLSB(tenantId.getId().getLeastSignificantBits())
                 .setTenantIdLSB(tenantId.getId().getLeastSignificantBits())
                 .setDeviceIdMSB(deviceId.getId().getMostSignificantBits())
                 .setDeviceIdMSB(deviceId.getId().getMostSignificantBits())
                 .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits())
                 .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits())
-                .setFirmwareIdMSB(firmwareId.getId().getMostSignificantBits())
-                .setFirmwareIdLSB(firmwareId.getId().getLeastSignificantBits())
+                .setOtaPackageIdMSB(firmwareId.getId().getMostSignificantBits())
+                .setOtaPackageIdLSB(firmwareId.getId().getLeastSignificantBits())
                 .setType(firmwareType.name())
                 .setType(firmwareType.name())
                 .setTs(ts)
                 .setTs(ts)
                 .build();
                 .build();
 
 
-        FirmwareInfo firmware = firmwareService.findFirmwareInfoById(tenantId, firmwareId);
+        OtaPackageInfo firmware = otaPackageService.findOtaPackageInfoById(tenantId, firmwareId);
         if (firmware == null) {
         if (firmware == null) {
             log.warn("[{}] Failed to send firmware update because firmware was already deleted", firmwareId);
             log.warn("[{}] Failed to send firmware update because firmware was already deleted", firmwareId);
             return;
             return;
         }
         }
 
 
-        TopicPartitionInfo tpi = new TopicPartitionInfo(fwStateMsgProducer.getDefaultTopic(), null, null, false);
-        fwStateMsgProducer.send(tpi, new TbProtoQueueMsg<>(UUID.randomUUID(), msg), null);
+        TopicPartitionInfo tpi = new TopicPartitionInfo(otaPackageStateMsgProducer.getDefaultTopic(), null, null, false);
+        otaPackageStateMsgProducer.send(tpi, new TbProtoQueueMsg<>(UUID.randomUUID(), msg), null);
 
 
         List<TsKvEntry> telemetry = new ArrayList<>();
         List<TsKvEntry> telemetry = new ArrayList<>();
         telemetry.add(new BasicTsKvEntry(ts, new StringDataEntry(getTargetTelemetryKey(firmware.getType(), TITLE), firmware.getTitle())));
         telemetry.add(new BasicTsKvEntry(ts, new StringDataEntry(getTargetTelemetryKey(firmware.getType(), TITLE), firmware.getTitle())));
         telemetry.add(new BasicTsKvEntry(ts, new StringDataEntry(getTargetTelemetryKey(firmware.getType(), VERSION), firmware.getVersion())));
         telemetry.add(new BasicTsKvEntry(ts, new StringDataEntry(getTargetTelemetryKey(firmware.getType(), VERSION), firmware.getVersion())));
         telemetry.add(new BasicTsKvEntry(ts, new LongDataEntry(getTargetTelemetryKey(firmware.getType(), TS), ts)));
         telemetry.add(new BasicTsKvEntry(ts, new LongDataEntry(getTargetTelemetryKey(firmware.getType(), TS), ts)));
-        telemetry.add(new BasicTsKvEntry(ts, new StringDataEntry(getTelemetryKey(firmware.getType(), STATE), FirmwareUpdateStatus.QUEUED.name())));
+        telemetry.add(new BasicTsKvEntry(ts, new StringDataEntry(getTelemetryKey(firmware.getType(), STATE), OtaPackageUpdateStatus.QUEUED.name())));
 
 
         telemetryService.saveAndNotify(tenantId, deviceId, telemetry, new FutureCallback<>() {
         telemetryService.saveAndNotify(tenantId, deviceId, telemetry, new FutureCallback<>() {
             @Override
             @Override
@@ -275,11 +261,11 @@ public class DefaultFirmwareStateService implements FirmwareStateService {
     }
     }
 
 
 
 
-    private void update(Device device, FirmwareInfo firmware, long ts) {
+    private void update(Device device, OtaPackageInfo firmware, long ts) {
         TenantId tenantId = device.getTenantId();
         TenantId tenantId = device.getTenantId();
         DeviceId deviceId = device.getId();
         DeviceId deviceId = device.getId();
 
 
-        BasicTsKvEntry status = new BasicTsKvEntry(System.currentTimeMillis(), new StringDataEntry(getTelemetryKey(firmware.getType(), STATE), FirmwareUpdateStatus.INITIATED.name()));
+        BasicTsKvEntry status = new BasicTsKvEntry(System.currentTimeMillis(), new StringDataEntry(getTelemetryKey(firmware.getType(), STATE), OtaPackageUpdateStatus.INITIATED.name()));
 
 
         telemetryService.saveAndNotify(tenantId, deviceId, Collections.singletonList(status), new FutureCallback<>() {
         telemetryService.saveAndNotify(tenantId, deviceId, Collections.singletonList(status), new FutureCallback<>() {
             @Override
             @Override
@@ -313,14 +299,14 @@ public class DefaultFirmwareStateService implements FirmwareStateService {
         });
         });
     }
     }
 
 
-    private void remove(Device device, FirmwareType firmwareType) {
-        telemetryService.deleteAndNotify(device.getTenantId(), device.getId(), DataConstants.SHARED_SCOPE, FirmwareUtil.getAttributeKeys(firmwareType),
+    private void remove(Device device, OtaPackageType firmwareType) {
+        telemetryService.deleteAndNotify(device.getTenantId(), device.getId(), DataConstants.SHARED_SCOPE, OtaPackageUtil.getAttributeKeys(firmwareType),
                 new FutureCallback<>() {
                 new FutureCallback<>() {
                     @Override
                     @Override
                     public void onSuccess(@Nullable Void tmp) {
                     public void onSuccess(@Nullable Void tmp) {
                         log.trace("[{}] Success remove target firmware attributes!", device.getId());
                         log.trace("[{}] Success remove target firmware attributes!", device.getId());
                         Set<AttributeKey> keysToNotify = new HashSet<>();
                         Set<AttributeKey> keysToNotify = new HashSet<>();
-                        FirmwareUtil.ALL_FW_ATTRIBUTE_KEYS.forEach(key -> keysToNotify.add(new AttributeKey(DataConstants.SHARED_SCOPE, key)));
+                        OtaPackageUtil.ALL_FW_ATTRIBUTE_KEYS.forEach(key -> keysToNotify.add(new AttributeKey(DataConstants.SHARED_SCOPE, key)));
                         tbClusterService.pushMsgToCore(DeviceAttributesEventNotificationMsg.onDelete(device.getTenantId(), device.getId(), keysToNotify), null);
                         tbClusterService.pushMsgToCore(DeviceAttributesEventNotificationMsg.onDelete(device.getTenantId(), device.getId(), keysToNotify), null);
                     }
                     }
 
 

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.service.firmware;
+package org.thingsboard.server.service.ota;
 
 
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.gen.transport.TransportProtos.ToFirmwareStateServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 
 
-public interface FirmwareStateService {
+public interface OtaPackageStateService {
 
 
     void update(Device device, Device oldDevice);
     void update(Device device, Device oldDevice);
 
 
     void update(DeviceProfile deviceProfile, boolean isFirmwareChanged, boolean isSoftwareChanged);
     void update(DeviceProfile deviceProfile, boolean isFirmwareChanged, boolean isSoftwareChanged);
 
 
-    boolean process(ToFirmwareStateServiceMsg msg);
+    boolean process(ToOtaPackageStateServiceMsg msg);
 
 
 }
 }

@@ -50,7 +50,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.TbSubscriptionCloseP
 import org.thingsboard.server.gen.transport.TransportProtos.TbTimeSeriesUpdateProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TbTimeSeriesUpdateProto;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToFirmwareStateServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.TransportToDeviceActorMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.TransportToDeviceActorMsg;
 import org.thingsboard.server.queue.TbQueueConsumer;
 import org.thingsboard.server.queue.TbQueueConsumer;
@@ -60,7 +60,7 @@ import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.edge.EdgeNotificationService;
 import org.thingsboard.server.service.edge.EdgeNotificationService;
-import org.thingsboard.server.service.firmware.FirmwareStateService;
+import org.thingsboard.server.service.ota.OtaPackageStateService;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 import org.thingsboard.server.service.queue.processing.AbstractConsumerService;
 import org.thingsboard.server.service.queue.processing.AbstractConsumerService;
 import org.thingsboard.server.service.queue.processing.IdMsgPair;
 import org.thingsboard.server.service.queue.processing.IdMsgPair;
@@ -75,7 +75,6 @@ import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWra
 
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.PreDestroy;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.UUID;
@@ -101,9 +100,9 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
     @Value("${queue.core.stats.enabled:false}")
     @Value("${queue.core.stats.enabled:false}")
     private boolean statsEnabled;
     private boolean statsEnabled;
 
 
-    @Value("${queue.core.firmware.pack-interval-ms:60000}")
+    @Value("${queue.core.ota.pack-interval-ms:60000}")
     private long firmwarePackInterval;
     private long firmwarePackInterval;
-    @Value("${queue.core.firmware.pack-size:100}")
+    @Value("${queue.core.ota.pack-size:100}")
     private int firmwarePackSize;
     private int firmwarePackSize;
 
 
     private final TbQueueConsumer<TbProtoQueueMsg<ToCoreMsg>> mainConsumer;
     private final TbQueueConsumer<TbProtoQueueMsg<ToCoreMsg>> mainConsumer;
@@ -113,10 +112,10 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
     private final SubscriptionManagerService subscriptionManagerService;
     private final SubscriptionManagerService subscriptionManagerService;
     private final TbCoreDeviceRpcService tbCoreDeviceRpcService;
     private final TbCoreDeviceRpcService tbCoreDeviceRpcService;
     private final EdgeNotificationService edgeNotificationService;
     private final EdgeNotificationService edgeNotificationService;
-    private final FirmwareStateService firmwareStateService;
+    private final OtaPackageStateService firmwareStateService;
     private final TbCoreConsumerStats stats;
     private final TbCoreConsumerStats stats;
     protected final TbQueueConsumer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> usageStatsConsumer;
     protected final TbQueueConsumer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> usageStatsConsumer;
-    private final TbQueueConsumer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> firmwareStatesConsumer;
+    private final TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> firmwareStatesConsumer;
 
 
     protected volatile ExecutorService usageStatsExecutor;
     protected volatile ExecutorService usageStatsExecutor;
 
 
@@ -135,11 +134,11 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
                                         TbTenantProfileCache tenantProfileCache,
                                         TbTenantProfileCache tenantProfileCache,
                                         TbApiUsageStateService apiUsageStateService,
                                         TbApiUsageStateService apiUsageStateService,
                                         EdgeNotificationService edgeNotificationService,
                                         EdgeNotificationService edgeNotificationService,
-                                        FirmwareStateService firmwareStateService) {
+                                        OtaPackageStateService firmwareStateService) {
         super(actorContext, encodingService, tenantProfileCache, deviceProfileCache, apiUsageStateService, tbCoreQueueFactory.createToCoreNotificationsMsgConsumer());
         super(actorContext, encodingService, tenantProfileCache, deviceProfileCache, apiUsageStateService, tbCoreQueueFactory.createToCoreNotificationsMsgConsumer());
         this.mainConsumer = tbCoreQueueFactory.createToCoreMsgConsumer();
         this.mainConsumer = tbCoreQueueFactory.createToCoreMsgConsumer();
         this.usageStatsConsumer = tbCoreQueueFactory.createToUsageStatsServiceMsgConsumer();
         this.usageStatsConsumer = tbCoreQueueFactory.createToUsageStatsServiceMsgConsumer();
-        this.firmwareStatesConsumer = tbCoreQueueFactory.createToFirmwareStateServiceMsgConsumer();
+        this.firmwareStatesConsumer = tbCoreQueueFactory.createToOtaPackageStateServiceMsgConsumer();
         this.stateService = stateService;
         this.stateService = stateService;
         this.localSubscriptionService = localSubscriptionService;
         this.localSubscriptionService = localSubscriptionService;
         this.subscriptionManagerService = subscriptionManagerService;
         this.subscriptionManagerService = subscriptionManagerService;
@@ -173,7 +172,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
     public void onApplicationEvent(ApplicationReadyEvent event) {
     public void onApplicationEvent(ApplicationReadyEvent event) {
         super.onApplicationEvent(event);
         super.onApplicationEvent(event);
         launchUsageStatsConsumer();
         launchUsageStatsConsumer();
-        launchFirmwareUpdateNotificationConsumer();
+        launchOtaPackageUpdateNotificationConsumer();
     }
     }
 
 
     @Override
     @Override
@@ -361,20 +360,20 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
         });
         });
     }
     }
 
 
-    private void launchFirmwareUpdateNotificationConsumer() {
+    private void launchOtaPackageUpdateNotificationConsumer() {
         long maxProcessingTimeoutPerRecord = firmwarePackInterval / firmwarePackSize;
         long maxProcessingTimeoutPerRecord = firmwarePackInterval / firmwarePackSize;
         firmwareStatesExecutor.submit(() -> {
         firmwareStatesExecutor.submit(() -> {
             while (!stopped) {
             while (!stopped) {
                 try {
                 try {
-                    List<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> msgs = firmwareStatesConsumer.poll(getNotificationPollDuration());
+                    List<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> msgs = firmwareStatesConsumer.poll(getNotificationPollDuration());
                     if (msgs.isEmpty()) {
                     if (msgs.isEmpty()) {
                         continue;
                         continue;
                     }
                     }
                     long timeToSleep = maxProcessingTimeoutPerRecord;
                     long timeToSleep = maxProcessingTimeoutPerRecord;
-                    for (TbProtoQueueMsg<ToFirmwareStateServiceMsg> msg : msgs) {
+                    for (TbProtoQueueMsg<ToOtaPackageStateServiceMsg> msg : msgs) {
                         try {
                         try {
                             long startTime = System.currentTimeMillis();
                             long startTime = System.currentTimeMillis();
-                            boolean isSuccessUpdate = handleFirmwareUpdates(msg);
+                            boolean isSuccessUpdate = handleOtaPackageUpdates(msg);
                             long endTime = System.currentTimeMillis();
                             long endTime = System.currentTimeMillis();
                             long spentTime = endTime - startTime;
                             long spentTime = endTime - startTime;
                             timeToSleep = timeToSleep - spentTime;
                             timeToSleep = timeToSleep - spentTime;
@@ -402,7 +401,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
                     }
                     }
                 }
                 }
             }
             }
-            log.info("TB Firmware States Consumer stopped.");
+            log.info("TB Ota Package States Consumer stopped.");
         });
         });
     }
     }
 
 
@@ -410,7 +409,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
         statsService.process(msg, callback);
         statsService.process(msg, callback);
     }
     }
 
 
-    private boolean handleFirmwareUpdates(TbProtoQueueMsg<ToFirmwareStateServiceMsg> msg) {
+    private boolean handleOtaPackageUpdates(TbProtoQueueMsg<ToOtaPackageStateServiceMsg> msg) {
         return firmwareStateService.process(msg.getValue());
         return firmwareStateService.process(msg.getValue());
     }
     }
 
 

@@ -89,7 +89,7 @@ public class DefaultTbResourceService implements TbResourceService {
             } catch (InvalidDDFFileException | IOException e) {
             } catch (InvalidDDFFileException | IOException e) {
                 throw new ThingsboardException(e, ThingsboardErrorCode.GENERAL);
                 throw new ThingsboardException(e, ThingsboardErrorCode.GENERAL);
             }
             }
-            if (resource.getResourceType().equals(ResourceType.LWM2M_MODEL) && toLwM2mObject(resource) == null) {
+            if (resource.getResourceType().equals(ResourceType.LWM2M_MODEL) && toLwM2mObject(resource, true) == null) {
                 throw new DataValidationException(String.format("Could not parse the XML of objectModel with name %s", resource.getSearchText()));
                 throw new DataValidationException(String.format("Could not parse the XML of objectModel with name %s", resource.getSearchText()));
             }
             }
         } else {
         } else {
@@ -131,7 +131,7 @@ public class DefaultTbResourceService implements TbResourceService {
         List<TbResource> resources = resourceService.findTenantResourcesByResourceTypeAndObjectIds(tenantId, ResourceType.LWM2M_MODEL,
         List<TbResource> resources = resourceService.findTenantResourcesByResourceTypeAndObjectIds(tenantId, ResourceType.LWM2M_MODEL,
                 objectIds);
                 objectIds);
         return resources.stream()
         return resources.stream()
-                .flatMap(s -> Stream.ofNullable(toLwM2mObject(s)))
+                .flatMap(s -> Stream.ofNullable(toLwM2mObject(s, false)))
                 .sorted(getComparator(sortProperty, sortOrder))
                 .sorted(getComparator(sortProperty, sortOrder))
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
     }
     }
@@ -142,7 +142,7 @@ public class DefaultTbResourceService implements TbResourceService {
         validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
         validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
         PageData<TbResource> resourcePageData = resourceService.findTenantResourcesByResourceTypeAndPageLink(tenantId, ResourceType.LWM2M_MODEL, pageLink);
         PageData<TbResource> resourcePageData = resourceService.findTenantResourcesByResourceTypeAndPageLink(tenantId, ResourceType.LWM2M_MODEL, pageLink);
         return resourcePageData.getData().stream()
         return resourcePageData.getData().stream()
-                .flatMap(s -> Stream.ofNullable(toLwM2mObject(s)))
+                .flatMap(s -> Stream.ofNullable(toLwM2mObject(s, false)))
                 .sorted(getComparator(sortProperty, sortOrder))
                 .sorted(getComparator(sortProperty, sortOrder))
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
     }
     }
@@ -167,7 +167,7 @@ public class DefaultTbResourceService implements TbResourceService {
         return "DESC".equals(sortOrder) ? comparator.reversed() : comparator;
         return "DESC".equals(sortOrder) ? comparator.reversed() : comparator;
     }
     }
 
 
-    private LwM2mObject toLwM2mObject(TbResource resource) {
+    private LwM2mObject toLwM2mObject(TbResource resource, boolean isSave) {
         try {
         try {
             DDFFileParser ddfFileParser = new DDFFileParser(new DefaultDDFFileValidator());
             DDFFileParser ddfFileParser = new DDFFileParser(new DefaultDDFFileValidator());
             List<ObjectModel> objectModels =
             List<ObjectModel> objectModels =
@@ -186,12 +186,16 @@ public class DefaultTbResourceService implements TbResourceService {
                 instance.setId(0);
                 instance.setId(0);
                 List<LwM2mResourceObserve> resources = new ArrayList<>();
                 List<LwM2mResourceObserve> resources = new ArrayList<>();
                 obj.resources.forEach((k, v) -> {
                 obj.resources.forEach((k, v) -> {
-                    if (v.operations.isReadable()) {
+                    if (isSave) {
+                        LwM2mResourceObserve lwM2MResourceObserve = new LwM2mResourceObserve(k, v.name, false, false, false);
+                        resources.add(lwM2MResourceObserve);
+                    }
+                    else if (v.operations.isReadable()) {
                         LwM2mResourceObserve lwM2MResourceObserve = new LwM2mResourceObserve(k, v.name, false, false, false);
                         LwM2mResourceObserve lwM2MResourceObserve = new LwM2mResourceObserve(k, v.name, false, false, false);
                         resources.add(lwM2MResourceObserve);
                         resources.add(lwM2MResourceObserve);
                     }
                     }
                 });
                 });
-                if (resources.size() > 0) {
+                if (isSave || resources.size() > 0) {
                     instance.setResources(resources.toArray(LwM2mResourceObserve[]::new));
                     instance.setResources(resources.toArray(LwM2mResourceObserve[]::new));
                     lwM2mObject.setInstances(new LwM2mInstance[]{instance});
                     lwM2mObject.setInstances(new LwM2mInstance[]{instance});
                     return lwM2mObject;
                     return lwM2mObject;

@@ -30,7 +30,7 @@ import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.EntityView;
-import org.thingsboard.server.common.data.FirmwareInfo;
+import org.thingsboard.server.common.data.OtaPackageInfo;
 import org.thingsboard.server.common.data.TbResourceInfo;
 import org.thingsboard.server.common.data.TbResourceInfo;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.User;
@@ -46,7 +46,7 @@ import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.EntityViewId;
 import org.thingsboard.server.common.data.id.EntityViewId;
-import org.thingsboard.server.common.data.id.FirmwareId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TbResourceId;
@@ -63,7 +63,7 @@ import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
-import org.thingsboard.server.dao.firmware.FirmwareService;
+import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -135,7 +135,7 @@ public class AccessValidator {
     protected ResourceService resourceService;
     protected ResourceService resourceService;
 
 
     @Autowired
     @Autowired
-    protected FirmwareService firmwareService;
+    protected OtaPackageService otaPackageService;
 
 
     private ExecutorService executor;
     private ExecutorService executor;
 
 
@@ -232,8 +232,8 @@ public class AccessValidator {
             case TB_RESOURCE:
             case TB_RESOURCE:
                 validateResource(currentUser, operation, entityId, callback);
                 validateResource(currentUser, operation, entityId, callback);
                 return;
                 return;
-            case FIRMWARE:
-                validateFirmware(currentUser, operation, entityId, callback);
+            case OTA_PACKAGE:
+                validateOtaPackage(currentUser, operation, entityId, callback);
                 return;
                 return;
             default:
             default:
                 //TODO: add support of other entities
                 //TODO: add support of other entities
@@ -300,20 +300,20 @@ public class AccessValidator {
         }
         }
     }
     }
 
 
-    private void validateFirmware(final SecurityUser currentUser, Operation operation, EntityId entityId, FutureCallback<ValidationResult> callback) {
+    private void validateOtaPackage(final SecurityUser currentUser, Operation operation, EntityId entityId, FutureCallback<ValidationResult> callback) {
         if (currentUser.isSystemAdmin()) {
         if (currentUser.isSystemAdmin()) {
             callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION));
             callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION));
         } else {
         } else {
-            FirmwareInfo firmware = firmwareService.findFirmwareInfoById(currentUser.getTenantId(), new FirmwareId(entityId.getId()));
-            if (firmware == null) {
-                callback.onSuccess(ValidationResult.entityNotFound("Firmware with requested id wasn't found!"));
+            OtaPackageInfo otaPackage = otaPackageService.findOtaPackageInfoById(currentUser.getTenantId(), new OtaPackageId(entityId.getId()));
+            if (otaPackage == null) {
+                callback.onSuccess(ValidationResult.entityNotFound("OtaPackage with requested id wasn't found!"));
             } else {
             } else {
                 try {
                 try {
-                    accessControlService.checkPermission(currentUser, Resource.FIRMWARE, operation, entityId, firmware);
+                    accessControlService.checkPermission(currentUser, Resource.OTA_PACKAGE, operation, entityId, otaPackage);
                 } catch (ThingsboardException e) {
                 } catch (ThingsboardException e) {
                     callback.onSuccess(ValidationResult.accessDenied(e.getMessage()));
                     callback.onSuccess(ValidationResult.accessDenied(e.getMessage()));
                 }
                 }
-                callback.onSuccess(ValidationResult.ok(firmware));
+                callback.onSuccess(ValidationResult.ok(otaPackage));
             }
             }
         }
         }
     }
     }

@@ -38,7 +38,7 @@ public enum Resource {
     DEVICE_PROFILE(EntityType.DEVICE_PROFILE),
     DEVICE_PROFILE(EntityType.DEVICE_PROFILE),
     API_USAGE_STATE(EntityType.API_USAGE_STATE),
     API_USAGE_STATE(EntityType.API_USAGE_STATE),
     TB_RESOURCE(EntityType.TB_RESOURCE),
     TB_RESOURCE(EntityType.TB_RESOURCE),
-    FIRMWARE(EntityType.FIRMWARE),
+    OTA_PACKAGE(EntityType.OTA_PACKAGE),
     EDGE(EntityType.EDGE);
     EDGE(EntityType.EDGE);
 
 
     private final EntityType entityType;
     private final EntityType entityType;

@@ -42,7 +42,7 @@ public class TenantAdminPermissions extends AbstractPermissions {
         put(Resource.DEVICE_PROFILE, tenantEntityPermissionChecker);
         put(Resource.DEVICE_PROFILE, tenantEntityPermissionChecker);
         put(Resource.API_USAGE_STATE, tenantEntityPermissionChecker);
         put(Resource.API_USAGE_STATE, tenantEntityPermissionChecker);
         put(Resource.TB_RESOURCE, tbResourcePermissionChecker);
         put(Resource.TB_RESOURCE, tbResourcePermissionChecker);
-        put(Resource.FIRMWARE, tenantEntityPermissionChecker);
+        put(Resource.OTA_PACKAGE, tenantEntityPermissionChecker);
         put(Resource.EDGE, tenantEntityPermissionChecker);
         put(Resource.EDGE, tenantEntityPermissionChecker);
     }
     }
 
 

@@ -26,27 +26,27 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.cache.firmware.FirmwareDataCache;
+import org.thingsboard.server.cache.ota.OtaPackageDataCache;
 import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.Firmware;
-import org.thingsboard.server.common.data.FirmwareInfo;
+import org.thingsboard.server.common.data.OtaPackage;
+import org.thingsboard.server.common.data.OtaPackageInfo;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.device.credentials.BasicMqttCredentials;
 import org.thingsboard.server.common.data.device.credentials.BasicMqttCredentials;
 import org.thingsboard.server.common.data.device.credentials.ProvisionDeviceCredentialsData;
 import org.thingsboard.server.common.data.device.credentials.ProvisionDeviceCredentialsData;
 import org.thingsboard.server.common.data.device.profile.ProvisionDeviceProfileCredentials;
 import org.thingsboard.server.common.data.device.profile.ProvisionDeviceProfileCredentials;
-import org.thingsboard.server.common.data.firmware.FirmwareType;
-import org.thingsboard.server.common.data.firmware.FirmwareUtil;
+import org.thingsboard.server.common.data.ota.OtaPackageType;
+import org.thingsboard.server.common.data.ota.OtaPackageUtil;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.FirmwareId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -64,7 +64,7 @@ import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.device.provision.ProvisionFailedException;
 import org.thingsboard.server.dao.device.provision.ProvisionFailedException;
 import org.thingsboard.server.dao.device.provision.ProvisionRequest;
 import org.thingsboard.server.dao.device.provision.ProvisionRequest;
 import org.thingsboard.server.dao.device.provision.ProvisionResponse;
 import org.thingsboard.server.dao.device.provision.ProvisionResponse;
-import org.thingsboard.server.dao.firmware.FirmwareService;
+import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
@@ -124,8 +124,8 @@ public class DefaultTransportApiService implements TransportApiService {
     private final DataDecodingEncodingService dataDecodingEncodingService;
     private final DataDecodingEncodingService dataDecodingEncodingService;
     private final DeviceProvisionService deviceProvisionService;
     private final DeviceProvisionService deviceProvisionService;
     private final TbResourceService resourceService;
     private final TbResourceService resourceService;
-    private final FirmwareService firmwareService;
-    private final FirmwareDataCache firmwareDataCache;
+    private final OtaPackageService otaPackageService;
+    private final OtaPackageDataCache otaPackageDataCache;
 
 
     private final ConcurrentMap<String, ReentrantLock> deviceCreationLocks = new ConcurrentHashMap<>();
     private final ConcurrentMap<String, ReentrantLock> deviceCreationLocks = new ConcurrentHashMap<>();
 
 
@@ -134,7 +134,7 @@ public class DefaultTransportApiService implements TransportApiService {
                                       RelationService relationService, DeviceCredentialsService deviceCredentialsService,
                                       RelationService relationService, DeviceCredentialsService deviceCredentialsService,
                                       DeviceStateService deviceStateService, DbCallbackExecutorService dbCallbackExecutorService,
                                       DeviceStateService deviceStateService, DbCallbackExecutorService dbCallbackExecutorService,
                                       TbClusterService tbClusterService, DataDecodingEncodingService dataDecodingEncodingService,
                                       TbClusterService tbClusterService, DataDecodingEncodingService dataDecodingEncodingService,
-                                      DeviceProvisionService deviceProvisionService, TbResourceService resourceService, FirmwareService firmwareService, FirmwareDataCache firmwareDataCache) {
+                                      DeviceProvisionService deviceProvisionService, TbResourceService resourceService, OtaPackageService otaPackageService, OtaPackageDataCache otaPackageDataCache) {
         this.deviceProfileCache = deviceProfileCache;
         this.deviceProfileCache = deviceProfileCache;
         this.tenantProfileCache = tenantProfileCache;
         this.tenantProfileCache = tenantProfileCache;
         this.apiUsageStateService = apiUsageStateService;
         this.apiUsageStateService = apiUsageStateService;
@@ -147,8 +147,8 @@ public class DefaultTransportApiService implements TransportApiService {
         this.dataDecodingEncodingService = dataDecodingEncodingService;
         this.dataDecodingEncodingService = dataDecodingEncodingService;
         this.deviceProvisionService = deviceProvisionService;
         this.deviceProvisionService = deviceProvisionService;
         this.resourceService = resourceService;
         this.resourceService = resourceService;
-        this.firmwareService = firmwareService;
-        this.firmwareDataCache = firmwareDataCache;
+        this.otaPackageService = otaPackageService;
+        this.otaPackageDataCache = otaPackageDataCache;
     }
     }
 
 
     @Override
     @Override
@@ -184,8 +184,8 @@ public class DefaultTransportApiService implements TransportApiService {
             result = handle(transportApiRequestMsg.getDeviceRequestMsg());
             result = handle(transportApiRequestMsg.getDeviceRequestMsg());
         } else if (transportApiRequestMsg.hasDeviceCredentialsRequestMsg()) {
         } else if (transportApiRequestMsg.hasDeviceCredentialsRequestMsg()) {
             result = handle(transportApiRequestMsg.getDeviceCredentialsRequestMsg());
             result = handle(transportApiRequestMsg.getDeviceCredentialsRequestMsg());
-        } else if (transportApiRequestMsg.hasFirmwareRequestMsg()) {
-            result = handle(transportApiRequestMsg.getFirmwareRequestMsg());
+        } else if (transportApiRequestMsg.hasOtaPackageRequestMsg()) {
+            result = handle(transportApiRequestMsg.getOtaPackageRequestMsg());
         }
         }
 
 
         return Futures.transform(Optional.ofNullable(result).orElseGet(this::getEmptyTransportApiResponseFuture),
         return Futures.transform(Optional.ofNullable(result).orElseGet(this::getEmptyTransportApiResponseFuture),
@@ -511,50 +511,50 @@ public class DefaultTransportApiService implements TransportApiService {
         }
         }
     }
     }
 
 
-    private ListenableFuture<TransportApiResponseMsg> handle(TransportProtos.GetFirmwareRequestMsg requestMsg) {
+    private ListenableFuture<TransportApiResponseMsg> handle(TransportProtos.GetOtaPackageRequestMsg requestMsg) {
         TenantId tenantId = new TenantId(new UUID(requestMsg.getTenantIdMSB(), requestMsg.getTenantIdLSB()));
         TenantId tenantId = new TenantId(new UUID(requestMsg.getTenantIdMSB(), requestMsg.getTenantIdLSB()));
         DeviceId deviceId = new DeviceId(new UUID(requestMsg.getDeviceIdMSB(), requestMsg.getDeviceIdLSB()));
         DeviceId deviceId = new DeviceId(new UUID(requestMsg.getDeviceIdMSB(), requestMsg.getDeviceIdLSB()));
-        FirmwareType firmwareType = FirmwareType.valueOf(requestMsg.getType());
+        OtaPackageType otaPackageType = OtaPackageType.valueOf(requestMsg.getType());
         Device device = deviceService.findDeviceById(tenantId, deviceId);
         Device device = deviceService.findDeviceById(tenantId, deviceId);
 
 
         if (device == null) {
         if (device == null) {
             return getEmptyTransportApiResponseFuture();
             return getEmptyTransportApiResponseFuture();
         }
         }
 
 
-        FirmwareId firmwareId = FirmwareUtil.getFirmwareId(device, firmwareType);
-        if (firmwareId == null) {
+        OtaPackageId otaPackageId = OtaPackageUtil.getOtaPackageId(device, otaPackageType);
+        if (otaPackageId == null) {
             DeviceProfile deviceProfile = deviceProfileCache.find(device.getDeviceProfileId());
             DeviceProfile deviceProfile = deviceProfileCache.find(device.getDeviceProfileId());
-            firmwareId = FirmwareUtil.getFirmwareId(deviceProfile, firmwareType);
+            otaPackageId = OtaPackageUtil.getOtaPackageId(deviceProfile, otaPackageType);
         }
         }
 
 
-        TransportProtos.GetFirmwareResponseMsg.Builder builder = TransportProtos.GetFirmwareResponseMsg.newBuilder();
+        TransportProtos.GetOtaPackageResponseMsg.Builder builder = TransportProtos.GetOtaPackageResponseMsg.newBuilder();
 
 
-        if (firmwareId == null) {
+        if (otaPackageId == null) {
             builder.setResponseStatus(TransportProtos.ResponseStatus.NOT_FOUND);
             builder.setResponseStatus(TransportProtos.ResponseStatus.NOT_FOUND);
         } else {
         } else {
-            FirmwareInfo firmwareInfo = firmwareService.findFirmwareInfoById(tenantId, firmwareId);
+            OtaPackageInfo otaPackageInfo = otaPackageService.findOtaPackageInfoById(tenantId, otaPackageId);
 
 
-            if (firmwareInfo == null) {
+            if (otaPackageInfo == null) {
                 builder.setResponseStatus(TransportProtos.ResponseStatus.NOT_FOUND);
                 builder.setResponseStatus(TransportProtos.ResponseStatus.NOT_FOUND);
             } else {
             } else {
                 builder.setResponseStatus(TransportProtos.ResponseStatus.SUCCESS);
                 builder.setResponseStatus(TransportProtos.ResponseStatus.SUCCESS);
-                builder.setFirmwareIdMSB(firmwareId.getId().getMostSignificantBits());
-                builder.setFirmwareIdLSB(firmwareId.getId().getLeastSignificantBits());
-                builder.setType(firmwareInfo.getType().name());
-                builder.setTitle(firmwareInfo.getTitle());
-                builder.setVersion(firmwareInfo.getVersion());
-                builder.setFileName(firmwareInfo.getFileName());
-                builder.setContentType(firmwareInfo.getContentType());
-                if (!firmwareDataCache.has(firmwareId.toString())) {
-                    Firmware firmware = firmwareService.findFirmwareById(tenantId, firmwareId);
-                    firmwareDataCache.put(firmwareId.toString(), firmware.getData().array());
+                builder.setOtaPackageIdMSB(otaPackageId.getId().getMostSignificantBits());
+                builder.setOtaPackageIdLSB(otaPackageId.getId().getLeastSignificantBits());
+                builder.setType(otaPackageInfo.getType().name());
+                builder.setTitle(otaPackageInfo.getTitle());
+                builder.setVersion(otaPackageInfo.getVersion());
+                builder.setFileName(otaPackageInfo.getFileName());
+                builder.setContentType(otaPackageInfo.getContentType());
+                if (!otaPackageDataCache.has(otaPackageId.toString())) {
+                    OtaPackage otaPackage = otaPackageService.findOtaPackageById(tenantId, otaPackageId);
+                    otaPackageDataCache.put(otaPackageId.toString(), otaPackage.getData().array());
                 }
                 }
             }
             }
         }
         }
 
 
         return Futures.immediateFuture(
         return Futures.immediateFuture(
                 TransportApiResponseMsg.newBuilder()
                 TransportApiResponseMsg.newBuilder()
-                        .setFirmwareResponseMsg(builder.build())
+                        .setOtaPackageResponseMsg(builder.build())
                         .build());
                         .build());
     }
     }
 
 

@@ -17,9 +17,9 @@ package org.thingsboard.server.service.ttl;
 
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
-import org.thingsboard.server.dao.util.PsqlDao;
 
 
 import java.sql.Connection;
 import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.SQLWarning;
@@ -62,4 +62,8 @@ public abstract class AbstractCleanUpService {
 
 
     protected abstract void doCleanUp(Connection connection) throws SQLException;
     protected abstract void doCleanUp(Connection connection) throws SQLException;
 
 
+    protected Connection getConnection() throws SQLException {
+        return DriverManager.getConnection(dbUrl, dbUserName, dbPassword);
+    }
+
 }
 }

+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.ttl.alarms;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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.audit.ActionType;
+import org.thingsboard.server.common.data.id.AlarmId;
+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.tenant.profile.DefaultTenantProfileConfiguration;
+import org.thingsboard.server.common.msg.queue.ServiceType;
+import org.thingsboard.server.dao.alarm.AlarmDao;
+import org.thingsboard.server.dao.alarm.AlarmService;
+import org.thingsboard.server.dao.relation.RelationService;
+import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
+import org.thingsboard.server.dao.tenant.TenantDao;
+import org.thingsboard.server.dao.util.PsqlDao;
+import org.thingsboard.server.queue.discovery.PartitionService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.action.RuleEngineEntityActionService;
+import org.thingsboard.server.service.ttl.AbstractCleanUpService;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+@TbCoreComponent
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class AlarmsCleanUpService {
+    @Value("${sql.ttl.alarms.removal_batch_size}")
+    private Integer removalBatchSize;
+
+    private final TenantDao tenantDao;
+    private final AlarmDao alarmDao;
+    private final AlarmService alarmService;
+    private final RelationService relationService;
+    private final RuleEngineEntityActionService ruleEngineEntityActionService;
+    private final PartitionService partitionService;
+    private final TbTenantProfileCache tenantProfileCache;
+
+    @Scheduled(initialDelayString = "#{T(org.apache.commons.lang3.RandomUtils).nextLong(0, ${sql.ttl.alarms.checking_interval})}", fixedDelayString = "${sql.ttl.alarms.checking_interval}")
+    public void cleanUp() {
+        PageLink tenantsBatchRequest = new PageLink(10_000, 0);
+        PageLink removalBatchRequest = new PageLink(removalBatchSize, 0 );
+        PageData<TenantId> tenantsIds;
+        do {
+            tenantsIds = tenantDao.findTenantsIds(tenantsBatchRequest);
+            for (TenantId tenantId : tenantsIds.getData()) {
+                if (!partitionService.resolve(ServiceType.TB_CORE, tenantId, tenantId).isMyPartition()) {
+                    continue;
+                }
+
+                Optional<DefaultTenantProfileConfiguration> tenantProfileConfiguration = tenantProfileCache.get(tenantId).getProfileConfiguration();
+                if (tenantProfileConfiguration.isEmpty() || tenantProfileConfiguration.get().getAlarmsTtlDays() == 0) {
+                    continue;
+                }
+
+                long ttl = TimeUnit.DAYS.toMillis(tenantProfileConfiguration.get().getAlarmsTtlDays());
+                long expirationTime = System.currentTimeMillis() - ttl;
+
+                long totalRemoved = 0;
+                while (true) {
+                    PageData<AlarmId> toRemove = alarmDao.findAlarmsIdsByEndTsBeforeAndTenantId(expirationTime, tenantId, removalBatchRequest);
+                    toRemove.getData().forEach(alarmId -> {
+                        relationService.deleteEntityRelations(tenantId, alarmId);
+                        Alarm alarm = alarmService.deleteAlarm(tenantId, alarmId).getAlarm();
+                        ruleEngineEntityActionService.pushEntityActionToRuleEngine(alarm.getOriginator(), alarm, tenantId, null, ActionType.ALARM_DELETE, null);
+                    });
+
+                    totalRemoved += toRemove.getTotalElements();
+                    if (!toRemove.hasNext()) {
+                        break;
+                    }
+                }
+
+                if (totalRemoved > 0) {
+                    log.info("Removed {} outdated alarm(s) for tenant {} older than {}", totalRemoved, tenantId, new Date(expirationTime));
+                }
+            }
+
+            tenantsBatchRequest = tenantsBatchRequest.nextPageLink();
+        } while (tenantsIds.hasNext());
+    }
+
+}

@@ -40,7 +40,7 @@ public class EdgeEventsCleanUpService extends AbstractCleanUpService {
     @Scheduled(initialDelayString = "${sql.ttl.edge_events.execution_interval_ms}", fixedDelayString = "${sql.ttl.edge_events.execution_interval_ms}")
     @Scheduled(initialDelayString = "${sql.ttl.edge_events.execution_interval_ms}", fixedDelayString = "${sql.ttl.edge_events.execution_interval_ms}")
     public void cleanUp() {
     public void cleanUp() {
         if (ttlTaskExecutionEnabled) {
         if (ttlTaskExecutionEnabled) {
-            try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
+            try (Connection conn = getConnection()) {
                 doCleanUp(conn);
                 doCleanUp(conn);
             } catch (SQLException e) {
             } catch (SQLException e) {
                 log.error("SQLException occurred during TTL task execution ", e);
                 log.error("SQLException occurred during TTL task execution ", e);

@@ -43,7 +43,7 @@ public class EventsCleanUpService extends AbstractCleanUpService {
     @Scheduled(initialDelayString = "${sql.ttl.events.execution_interval_ms}", fixedDelayString = "${sql.ttl.events.execution_interval_ms}")
     @Scheduled(initialDelayString = "${sql.ttl.events.execution_interval_ms}", fixedDelayString = "${sql.ttl.events.execution_interval_ms}")
     public void cleanUp() {
     public void cleanUp() {
         if (ttlTaskExecutionEnabled) {
         if (ttlTaskExecutionEnabled) {
-            try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
+            try (Connection conn = getConnection()) {
                 doCleanUp(conn);
                 doCleanUp(conn);
             } catch (SQLException e) {
             } catch (SQLException e) {
                 log.error("SQLException occurred during TTL task execution ", e);
                 log.error("SQLException occurred during TTL task execution ", e);

@@ -36,7 +36,7 @@ public abstract class AbstractTimeseriesCleanUpService extends AbstractCleanUpSe
     @Scheduled(initialDelayString = "${sql.ttl.ts.execution_interval_ms}", fixedDelayString = "${sql.ttl.ts.execution_interval_ms}")
     @Scheduled(initialDelayString = "${sql.ttl.ts.execution_interval_ms}", fixedDelayString = "${sql.ttl.ts.execution_interval_ms}")
     public void cleanUp() {
     public void cleanUp() {
         if (ttlTaskExecutionEnabled) {
         if (ttlTaskExecutionEnabled) {
-            try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
+            try (Connection conn = getConnection()) {
                 doCleanUp(conn);
                 doCleanUp(conn);
             } catch (SQLException e) {
             } catch (SQLException e) {
                 log.error("SQLException occurred during TTL task execution ", e);
                 log.error("SQLException occurred during TTL task execution ", e);

@@ -273,6 +273,9 @@ sql:
         enabled: "${SQL_TTL_EDGE_EVENTS_ENABLED:true}"
         enabled: "${SQL_TTL_EDGE_EVENTS_ENABLED:true}"
         execution_interval_ms: "${SQL_TTL_EDGE_EVENTS_EXECUTION_INTERVAL:86400000}" # Number of milliseconds. The current value corresponds to one day
         execution_interval_ms: "${SQL_TTL_EDGE_EVENTS_EXECUTION_INTERVAL:86400000}" # Number of milliseconds. The current value corresponds to one day
         edge_events_ttl: "${SQL_TTL_EDGE_EVENTS_TTL:2628000}" # Number of seconds. The current value corresponds to one month
         edge_events_ttl: "${SQL_TTL_EDGE_EVENTS_TTL:2628000}" # Number of seconds. The current value corresponds to one month
+      alarms:
+        checking_interval: "${SQL_ALARMS_TTL_CHECKING_INTERVAL:7200000}" # Number of milliseconds. The current value corresponds to two hours
+        removal_batch_size: "${SQL_ALARMS_TTL_REMOVAL_BATCH_SIZE:3000}" # To delete outdated alarms not all at once but in batches
 
 
 # Actor system parameters
 # Actor system parameters
 actors:
 actors:
@@ -371,7 +374,10 @@ caffeine:
     tokensOutdatageTime:
     tokensOutdatageTime:
       timeToLiveInMinutes: 20000
       timeToLiveInMinutes: 20000
       maxSize: 10000
       maxSize: 10000
-    firmwares:
+    otaPackages:
+      timeToLiveInMinutes: 60
+      maxSize: 10
+    otaPackagesData:
       timeToLiveInMinutes: 60
       timeToLiveInMinutes: 60
       maxSize: 10
       maxSize: 10
     edges:
     edges:
@@ -497,7 +503,7 @@ audit-log:
       "device_profile": "${AUDIT_LOG_MASK_DEVICE_PROFILE:W}"
       "device_profile": "${AUDIT_LOG_MASK_DEVICE_PROFILE:W}"
       "edge": "${AUDIT_LOG_MASK_EDGE:W}"
       "edge": "${AUDIT_LOG_MASK_EDGE:W}"
       "tb_resource": "${AUDIT_LOG_MASK_RESOURCE:W}"
       "tb_resource": "${AUDIT_LOG_MASK_RESOURCE:W}"
-      "firmware": "${AUDIT_LOG_MASK_FIRMWARE:W}"
+      "ota_package": "${AUDIT_LOG_MASK_OTA_PACKAGE:W}"
   sink:
   sink:
     # Type of external sink. possible options: none, elasticsearch
     # Type of external sink. possible options: none, elasticsearch
     type: "${AUDIT_LOG_SINK_TYPE:none}"
     type: "${AUDIT_LOG_SINK_TYPE:none}"
@@ -749,7 +755,7 @@ queue:
       sasl.config: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_JAAS_CONFIG:org.apache.kafka.common.security.plain.PlainLoginModule required username=\"CLUSTER_API_KEY\" password=\"CLUSTER_API_SECRET\";}"
       sasl.config: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_JAAS_CONFIG:org.apache.kafka.common.security.plain.PlainLoginModule required username=\"CLUSTER_API_KEY\" password=\"CLUSTER_API_SECRET\";}"
       security.protocol: "${TB_QUEUE_KAFKA_CONFLUENT_SECURITY_PROTOCOL:SASL_SSL}"
       security.protocol: "${TB_QUEUE_KAFKA_CONFLUENT_SECURITY_PROTOCOL:SASL_SSL}"
     consumer-properties-per-topic:
     consumer-properties-per-topic:
-      tb_firmware:
+      tb_ota_package:
         - key: max.poll.records
         - key: max.poll.records
           value: 10
           value: 10
     other:
     other:
@@ -759,7 +765,7 @@ queue:
       transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
       transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
       js-executor: "${TB_QUEUE_KAFKA_JE_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:104857600;partitions:100;min.insync.replicas:1}"
       js-executor: "${TB_QUEUE_KAFKA_JE_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:104857600;partitions:100;min.insync.replicas:1}"
-      fw-updates: "${TB_QUEUE_KAFKA_FW_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
+      ota-updates: "${TB_QUEUE_KAFKA_OTA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
     consumer-stats:
     consumer-stats:
       enabled: "${TB_QUEUE_KAFKA_CONSUMER_STATS_ENABLED:true}"
       enabled: "${TB_QUEUE_KAFKA_CONSUMER_STATS_ENABLED:true}"
       print-interval-ms: "${TB_QUEUE_KAFKA_CONSUMER_STATS_MIN_PRINT_INTERVAL_MS:60000}"
       print-interval-ms: "${TB_QUEUE_KAFKA_CONSUMER_STATS_MIN_PRINT_INTERVAL_MS:60000}"
@@ -830,10 +836,10 @@ queue:
     poll-interval: "${TB_QUEUE_CORE_POLL_INTERVAL_MS:25}"
     poll-interval: "${TB_QUEUE_CORE_POLL_INTERVAL_MS:25}"
     partitions: "${TB_QUEUE_CORE_PARTITIONS:10}"
     partitions: "${TB_QUEUE_CORE_PARTITIONS:10}"
     pack-processing-timeout: "${TB_QUEUE_CORE_PACK_PROCESSING_TIMEOUT_MS:2000}"
     pack-processing-timeout: "${TB_QUEUE_CORE_PACK_PROCESSING_TIMEOUT_MS:2000}"
-    firmware:
-      topic: "${TB_QUEUE_CORE_FW_TOPIC:tb_firmware}"
-      pack-interval-ms: "${TB_QUEUE_CORE_FW_PACK_INTERVAL_MS:60000}"
-      pack-size: "${TB_QUEUE_CORE_FW_PACK_SIZE:100}"
+    ota:
+      topic: "${TB_QUEUE_CORE_OTA_TOPIC:tb_ota_package}"
+      pack-interval-ms: "${TB_QUEUE_CORE_OTA_PACK_INTERVAL_MS:60000}"
+      pack-size: "${TB_QUEUE_CORE_OTA_PACK_SIZE:100}"
     usage-stats-topic: "${TB_QUEUE_US_TOPIC:tb_usage_stats}"
     usage-stats-topic: "${TB_QUEUE_US_TOPIC:tb_usage_stats}"
     stats:
     stats:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:true}"
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:true}"

@@ -25,11 +25,10 @@ import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequ
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.Firmware;
-import org.thingsboard.server.common.data.FirmwareInfo;
+import org.thingsboard.server.common.data.OtaPackage;
+import org.thingsboard.server.common.data.OtaPackageInfo;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.firmware.FirmwareType;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -41,11 +40,11 @@ import java.util.Collections;
 import java.util.List;
 import java.util.List;
 
 
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.thingsboard.server.common.data.firmware.FirmwareType.FIRMWARE;
+import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE;
 
 
-public abstract class BaseFirmwareControllerTest extends AbstractControllerTest {
+public abstract class BaseOtaPackageControllerTest extends AbstractControllerTest {
 
 
-    private IdComparator<FirmwareInfo> idComparator = new IdComparator<>();
+    private IdComparator<OtaPackageInfo> idComparator = new IdComparator<>();
 
 
     public static final String TITLE = "My firmware";
     public static final String TITLE = "My firmware";
     private static final String FILE_NAME = "filename.txt";
     private static final String FILE_NAME = "filename.txt";
@@ -93,13 +92,13 @@ public abstract class BaseFirmwareControllerTest extends AbstractControllerTest
 
 
     @Test
     @Test
     public void testSaveFirmware() throws Exception {
     public void testSaveFirmware() throws Exception {
-        FirmwareInfo firmwareInfo = new FirmwareInfo();
+        OtaPackageInfo firmwareInfo = new OtaPackageInfo();
         firmwareInfo.setDeviceProfileId(deviceProfileId);
         firmwareInfo.setDeviceProfileId(deviceProfileId);
         firmwareInfo.setType(FIRMWARE);
         firmwareInfo.setType(FIRMWARE);
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setVersion(VERSION);
         firmwareInfo.setVersion(VERSION);
 
 
-        FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+        OtaPackageInfo savedFirmwareInfo = save(firmwareInfo);
 
 
         Assert.assertNotNull(savedFirmwareInfo);
         Assert.assertNotNull(savedFirmwareInfo);
         Assert.assertNotNull(savedFirmwareInfo.getId());
         Assert.assertNotNull(savedFirmwareInfo.getId());
@@ -112,19 +111,19 @@ public abstract class BaseFirmwareControllerTest extends AbstractControllerTest
 
 
         save(savedFirmwareInfo);
         save(savedFirmwareInfo);
 
 
-        FirmwareInfo foundFirmwareInfo = doGet("/api/firmware/info/" + savedFirmwareInfo.getId().getId().toString(), FirmwareInfo.class);
+        OtaPackageInfo foundFirmwareInfo = doGet("/api/otaPackage/info/" + savedFirmwareInfo.getId().getId().toString(), OtaPackageInfo.class);
         Assert.assertEquals(foundFirmwareInfo.getTitle(), savedFirmwareInfo.getTitle());
         Assert.assertEquals(foundFirmwareInfo.getTitle(), savedFirmwareInfo.getTitle());
     }
     }
 
 
     @Test
     @Test
     public void testSaveFirmwareData() throws Exception {
     public void testSaveFirmwareData() throws Exception {
-        FirmwareInfo firmwareInfo = new FirmwareInfo();
+        OtaPackageInfo firmwareInfo = new OtaPackageInfo();
         firmwareInfo.setDeviceProfileId(deviceProfileId);
         firmwareInfo.setDeviceProfileId(deviceProfileId);
         firmwareInfo.setType(FIRMWARE);
         firmwareInfo.setType(FIRMWARE);
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setVersion(VERSION);
         firmwareInfo.setVersion(VERSION);
 
 
-        FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+        OtaPackageInfo savedFirmwareInfo = save(firmwareInfo);
 
 
         Assert.assertNotNull(savedFirmwareInfo);
         Assert.assertNotNull(savedFirmwareInfo);
         Assert.assertNotNull(savedFirmwareInfo.getId());
         Assert.assertNotNull(savedFirmwareInfo.getId());
@@ -137,12 +136,12 @@ public abstract class BaseFirmwareControllerTest extends AbstractControllerTest
 
 
         save(savedFirmwareInfo);
         save(savedFirmwareInfo);
 
 
-        FirmwareInfo foundFirmwareInfo = doGet("/api/firmware/info/" + savedFirmwareInfo.getId().getId().toString(), FirmwareInfo.class);
+        OtaPackageInfo foundFirmwareInfo = doGet("/api/otaPackage/info/" + savedFirmwareInfo.getId().getId().toString(), OtaPackageInfo.class);
         Assert.assertEquals(foundFirmwareInfo.getTitle(), savedFirmwareInfo.getTitle());
         Assert.assertEquals(foundFirmwareInfo.getTitle(), savedFirmwareInfo.getTitle());
 
 
         MockMultipartFile testData = new MockMultipartFile("file", FILE_NAME, CONTENT_TYPE, DATA.array());
         MockMultipartFile testData = new MockMultipartFile("file", FILE_NAME, CONTENT_TYPE, DATA.array());
 
 
-        Firmware savedFirmware = savaData("/api/firmware/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, CHECKSUM_ALGORITHM);
+        OtaPackage savedFirmware = savaData("/api/otaPackage/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, CHECKSUM_ALGORITHM);
 
 
         Assert.assertEquals(FILE_NAME, savedFirmware.getFileName());
         Assert.assertEquals(FILE_NAME, savedFirmware.getFileName());
         Assert.assertEquals(CONTENT_TYPE, savedFirmware.getContentType());
         Assert.assertEquals(CONTENT_TYPE, savedFirmware.getContentType());
@@ -150,97 +149,97 @@ public abstract class BaseFirmwareControllerTest extends AbstractControllerTest
 
 
     @Test
     @Test
     public void testUpdateFirmwareFromDifferentTenant() throws Exception {
     public void testUpdateFirmwareFromDifferentTenant() throws Exception {
-        FirmwareInfo firmwareInfo = new FirmwareInfo();
+        OtaPackageInfo firmwareInfo = new OtaPackageInfo();
         firmwareInfo.setDeviceProfileId(deviceProfileId);
         firmwareInfo.setDeviceProfileId(deviceProfileId);
         firmwareInfo.setType(FIRMWARE);
         firmwareInfo.setType(FIRMWARE);
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setVersion(VERSION);
         firmwareInfo.setVersion(VERSION);
 
 
-        FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+        OtaPackageInfo savedFirmwareInfo = save(firmwareInfo);
 
 
         loginDifferentTenant();
         loginDifferentTenant();
-        doPost("/api/firmware", savedFirmwareInfo, FirmwareInfo.class, status().isForbidden());
+        doPost("/api/otaPackage", savedFirmwareInfo, OtaPackageInfo.class, status().isForbidden());
         deleteDifferentTenant();
         deleteDifferentTenant();
     }
     }
 
 
     @Test
     @Test
     public void testFindFirmwareInfoById() throws Exception {
     public void testFindFirmwareInfoById() throws Exception {
-        FirmwareInfo firmwareInfo = new FirmwareInfo();
+        OtaPackageInfo firmwareInfo = new OtaPackageInfo();
         firmwareInfo.setDeviceProfileId(deviceProfileId);
         firmwareInfo.setDeviceProfileId(deviceProfileId);
         firmwareInfo.setType(FIRMWARE);
         firmwareInfo.setType(FIRMWARE);
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setVersion(VERSION);
         firmwareInfo.setVersion(VERSION);
 
 
-        FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+        OtaPackageInfo savedFirmwareInfo = save(firmwareInfo);
 
 
-        FirmwareInfo foundFirmware = doGet("/api/firmware/info/" + savedFirmwareInfo.getId().getId().toString(), FirmwareInfo.class);
+        OtaPackageInfo foundFirmware = doGet("/api/otaPackage/info/" + savedFirmwareInfo.getId().getId().toString(), OtaPackageInfo.class);
         Assert.assertNotNull(foundFirmware);
         Assert.assertNotNull(foundFirmware);
         Assert.assertEquals(savedFirmwareInfo, foundFirmware);
         Assert.assertEquals(savedFirmwareInfo, foundFirmware);
     }
     }
 
 
     @Test
     @Test
     public void testFindFirmwareById() throws Exception {
     public void testFindFirmwareById() throws Exception {
-        FirmwareInfo firmwareInfo = new FirmwareInfo();
+        OtaPackageInfo firmwareInfo = new OtaPackageInfo();
         firmwareInfo.setDeviceProfileId(deviceProfileId);
         firmwareInfo.setDeviceProfileId(deviceProfileId);
         firmwareInfo.setType(FIRMWARE);
         firmwareInfo.setType(FIRMWARE);
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setVersion(VERSION);
         firmwareInfo.setVersion(VERSION);
 
 
-        FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+        OtaPackageInfo savedFirmwareInfo = save(firmwareInfo);
 
 
         MockMultipartFile testData = new MockMultipartFile("file", FILE_NAME, CONTENT_TYPE, DATA.array());
         MockMultipartFile testData = new MockMultipartFile("file", FILE_NAME, CONTENT_TYPE, DATA.array());
 
 
-        Firmware savedFirmware = savaData("/api/firmware/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, CHECKSUM_ALGORITHM);
+        OtaPackage savedFirmware = savaData("/api/otaPackage/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, CHECKSUM_ALGORITHM);
 
 
-        Firmware foundFirmware = doGet("/api/firmware/" + savedFirmwareInfo.getId().getId().toString(), Firmware.class);
+        OtaPackage foundFirmware = doGet("/api/otaPackage/" + savedFirmwareInfo.getId().getId().toString(), OtaPackage.class);
         Assert.assertNotNull(foundFirmware);
         Assert.assertNotNull(foundFirmware);
         Assert.assertEquals(savedFirmware, foundFirmware);
         Assert.assertEquals(savedFirmware, foundFirmware);
     }
     }
 
 
     @Test
     @Test
     public void testDeleteFirmware() throws Exception {
     public void testDeleteFirmware() throws Exception {
-        FirmwareInfo firmwareInfo = new FirmwareInfo();
+        OtaPackageInfo firmwareInfo = new OtaPackageInfo();
         firmwareInfo.setDeviceProfileId(deviceProfileId);
         firmwareInfo.setDeviceProfileId(deviceProfileId);
         firmwareInfo.setType(FIRMWARE);
         firmwareInfo.setType(FIRMWARE);
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setVersion(VERSION);
         firmwareInfo.setVersion(VERSION);
 
 
-        FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+        OtaPackageInfo savedFirmwareInfo = save(firmwareInfo);
 
 
-        doDelete("/api/firmware/" + savedFirmwareInfo.getId().getId().toString())
+        doDelete("/api/otaPackage/" + savedFirmwareInfo.getId().getId().toString())
                 .andExpect(status().isOk());
                 .andExpect(status().isOk());
 
 
-        doGet("/api/firmware/info/" + savedFirmwareInfo.getId().getId().toString())
+        doGet("/api/otaPackage/info/" + savedFirmwareInfo.getId().getId().toString())
                 .andExpect(status().isNotFound());
                 .andExpect(status().isNotFound());
     }
     }
 
 
     @Test
     @Test
     public void testFindTenantFirmwares() throws Exception {
     public void testFindTenantFirmwares() throws Exception {
-        List<FirmwareInfo> firmwares = new ArrayList<>();
+        List<OtaPackageInfo> otaPackages = new ArrayList<>();
         for (int i = 0; i < 165; i++) {
         for (int i = 0; i < 165; i++) {
-            FirmwareInfo firmwareInfo = new FirmwareInfo();
+            OtaPackageInfo firmwareInfo = new OtaPackageInfo();
             firmwareInfo.setDeviceProfileId(deviceProfileId);
             firmwareInfo.setDeviceProfileId(deviceProfileId);
             firmwareInfo.setType(FIRMWARE);
             firmwareInfo.setType(FIRMWARE);
             firmwareInfo.setTitle(TITLE);
             firmwareInfo.setTitle(TITLE);
             firmwareInfo.setVersion(VERSION + i);
             firmwareInfo.setVersion(VERSION + i);
 
 
-            FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+            OtaPackageInfo savedFirmwareInfo = save(firmwareInfo);
 
 
             if (i > 100) {
             if (i > 100) {
                 MockMultipartFile testData = new MockMultipartFile("file", FILE_NAME, CONTENT_TYPE, DATA.array());
                 MockMultipartFile testData = new MockMultipartFile("file", FILE_NAME, CONTENT_TYPE, DATA.array());
 
 
-                Firmware savedFirmware = savaData("/api/firmware/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, CHECKSUM_ALGORITHM);
-                firmwares.add(new FirmwareInfo(savedFirmware));
+                OtaPackage savedFirmware = savaData("/api/otaPackage/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, CHECKSUM_ALGORITHM);
+                otaPackages.add(new OtaPackageInfo(savedFirmware));
             } else {
             } else {
-                firmwares.add(savedFirmwareInfo);
+                otaPackages.add(savedFirmwareInfo);
             }
             }
         }
         }
 
 
-        List<FirmwareInfo> loadedFirmwares = new ArrayList<>();
+        List<OtaPackageInfo> loadedFirmwares = new ArrayList<>();
         PageLink pageLink = new PageLink(24);
         PageLink pageLink = new PageLink(24);
-        PageData<FirmwareInfo> pageData;
+        PageData<OtaPackageInfo> pageData;
         do {
         do {
-            pageData = doGetTypedWithPageLink("/api/firmwares?",
+            pageData = doGetTypedWithPageLink("/api/otaPackages?",
                     new TypeReference<>() {
                     new TypeReference<>() {
                     }, pageLink);
                     }, pageLink);
             loadedFirmwares.addAll(pageData.getData());
             loadedFirmwares.addAll(pageData.getData());
@@ -249,41 +248,41 @@ public abstract class BaseFirmwareControllerTest extends AbstractControllerTest
             }
             }
         } while (pageData.hasNext());
         } while (pageData.hasNext());
 
 
-        Collections.sort(firmwares, idComparator);
+        Collections.sort(otaPackages, idComparator);
         Collections.sort(loadedFirmwares, idComparator);
         Collections.sort(loadedFirmwares, idComparator);
 
 
-        Assert.assertEquals(firmwares, loadedFirmwares);
+        Assert.assertEquals(otaPackages, loadedFirmwares);
     }
     }
 
 
     @Test
     @Test
     public void testFindTenantFirmwaresByHasData() throws Exception {
     public void testFindTenantFirmwaresByHasData() throws Exception {
-        List<FirmwareInfo> firmwaresWithData = new ArrayList<>();
-        List<FirmwareInfo> firmwaresWithoutData = new ArrayList<>();
+        List<OtaPackageInfo> otaPackagesWithData = new ArrayList<>();
+        List<OtaPackageInfo> otaPackagesWithoutData = new ArrayList<>();
 
 
         for (int i = 0; i < 165; i++) {
         for (int i = 0; i < 165; i++) {
-            FirmwareInfo firmwareInfo = new FirmwareInfo();
+            OtaPackageInfo firmwareInfo = new OtaPackageInfo();
             firmwareInfo.setDeviceProfileId(deviceProfileId);
             firmwareInfo.setDeviceProfileId(deviceProfileId);
             firmwareInfo.setType(FIRMWARE);
             firmwareInfo.setType(FIRMWARE);
             firmwareInfo.setTitle(TITLE);
             firmwareInfo.setTitle(TITLE);
             firmwareInfo.setVersion(VERSION + i);
             firmwareInfo.setVersion(VERSION + i);
 
 
-            FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+            OtaPackageInfo savedFirmwareInfo = save(firmwareInfo);
 
 
             if (i > 100) {
             if (i > 100) {
                 MockMultipartFile testData = new MockMultipartFile("file", FILE_NAME, CONTENT_TYPE, DATA.array());
                 MockMultipartFile testData = new MockMultipartFile("file", FILE_NAME, CONTENT_TYPE, DATA.array());
 
 
-                Firmware savedFirmware = savaData("/api/firmware/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, CHECKSUM_ALGORITHM);
-                firmwaresWithData.add(new FirmwareInfo(savedFirmware));
+                OtaPackage savedFirmware = savaData("/api/otaPackage/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, CHECKSUM_ALGORITHM);
+                otaPackagesWithData.add(new OtaPackageInfo(savedFirmware));
             } else {
             } else {
-                firmwaresWithoutData.add(savedFirmwareInfo);
+                otaPackagesWithoutData.add(savedFirmwareInfo);
             }
             }
         }
         }
 
 
-        List<FirmwareInfo> loadedFirmwaresWithData = new ArrayList<>();
+        List<OtaPackageInfo> loadedFirmwaresWithData = new ArrayList<>();
         PageLink pageLink = new PageLink(24);
         PageLink pageLink = new PageLink(24);
-        PageData<FirmwareInfo> pageData;
+        PageData<OtaPackageInfo> pageData;
         do {
         do {
-            pageData = doGetTypedWithPageLink("/api/firmwares/" + deviceProfileId.toString() + "/FIRMWARE/true?",
+            pageData = doGetTypedWithPageLink("/api/otaPackages/" + deviceProfileId.toString() + "/FIRMWARE/true?",
                     new TypeReference<>() {
                     new TypeReference<>() {
                     }, pageLink);
                     }, pageLink);
             loadedFirmwaresWithData.addAll(pageData.getData());
             loadedFirmwaresWithData.addAll(pageData.getData());
@@ -292,10 +291,10 @@ public abstract class BaseFirmwareControllerTest extends AbstractControllerTest
             }
             }
         } while (pageData.hasNext());
         } while (pageData.hasNext());
 
 
-        List<FirmwareInfo> loadedFirmwaresWithoutData = new ArrayList<>();
+        List<OtaPackageInfo> loadedFirmwaresWithoutData = new ArrayList<>();
         pageLink = new PageLink(24);
         pageLink = new PageLink(24);
         do {
         do {
-            pageData = doGetTypedWithPageLink("/api/firmwares/" + deviceProfileId.toString() + "/FIRMWARE/false?",
+            pageData = doGetTypedWithPageLink("/api/otaPackages/" + deviceProfileId.toString() + "/FIRMWARE/false?",
                     new TypeReference<>() {
                     new TypeReference<>() {
                     }, pageLink);
                     }, pageLink);
             loadedFirmwaresWithoutData.addAll(pageData.getData());
             loadedFirmwaresWithoutData.addAll(pageData.getData());
@@ -304,25 +303,25 @@ public abstract class BaseFirmwareControllerTest extends AbstractControllerTest
             }
             }
         } while (pageData.hasNext());
         } while (pageData.hasNext());
 
 
-        Collections.sort(firmwaresWithData, idComparator);
-        Collections.sort(firmwaresWithoutData, idComparator);
+        Collections.sort(otaPackagesWithData, idComparator);
+        Collections.sort(otaPackagesWithoutData, idComparator);
         Collections.sort(loadedFirmwaresWithData, idComparator);
         Collections.sort(loadedFirmwaresWithData, idComparator);
         Collections.sort(loadedFirmwaresWithoutData, idComparator);
         Collections.sort(loadedFirmwaresWithoutData, idComparator);
 
 
-        Assert.assertEquals(firmwaresWithData, loadedFirmwaresWithData);
-        Assert.assertEquals(firmwaresWithoutData, loadedFirmwaresWithoutData);
+        Assert.assertEquals(otaPackagesWithData, loadedFirmwaresWithData);
+        Assert.assertEquals(otaPackagesWithoutData, loadedFirmwaresWithoutData);
     }
     }
 
 
 
 
-    private FirmwareInfo save(FirmwareInfo firmwareInfo) throws Exception {
-        return doPost("/api/firmware", firmwareInfo, FirmwareInfo.class);
+    private OtaPackageInfo save(OtaPackageInfo firmwareInfo) throws Exception {
+        return doPost("/api/otaPackage", firmwareInfo, OtaPackageInfo.class);
     }
     }
 
 
-    protected Firmware savaData(String urlTemplate, MockMultipartFile content, String... params) throws Exception {
+    protected OtaPackage savaData(String urlTemplate, MockMultipartFile content, String... params) throws Exception {
         MockMultipartHttpServletRequestBuilder postRequest = MockMvcRequestBuilders.multipart(urlTemplate, params);
         MockMultipartHttpServletRequestBuilder postRequest = MockMvcRequestBuilders.multipart(urlTemplate, params);
         postRequest.file(content);
         postRequest.file(content);
         setJwtToken(postRequest);
         setJwtToken(postRequest);
-        return readResponse(mockMvc.perform(postRequest).andExpect(status().isOk()), Firmware.class);
+        return readResponse(mockMvc.perform(postRequest).andExpect(status().isOk()), OtaPackage.class);
     }
     }
 
 
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.controller.sql;
 package org.thingsboard.server.controller.sql;
 
 
-import org.thingsboard.server.controller.BaseFirmwareControllerTest;
+import org.thingsboard.server.controller.BaseOtaPackageControllerTest;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 
 
 @DaoSqlTest
 @DaoSqlTest
-public class FirmwareControllerSqlTest extends BaseFirmwareControllerTest {
+public class OtaPackageControllerSqlTest extends BaseOtaPackageControllerTest {
 }
 }

@@ -44,6 +44,9 @@ public abstract class AbstractCoapAttributesUpdatesIntegrationTest extends Abstr
 
 
     private static final String RESPONSE_ATTRIBUTES_PAYLOAD_DELETED = "{\"deleted\":[\"attribute5\"]}";
     private static final String RESPONSE_ATTRIBUTES_PAYLOAD_DELETED = "{\"deleted\":[\"attribute5\"]}";
 
 
+    protected static final String POST_ATTRIBUTES_PAYLOAD_ON_CURRENT_STATE_NOTIFICATION = "{\"attribute1\":\"value\",\"attribute2\":false,\"attribute3\":41.0,\"attribute4\":72," +
+            "\"attribute5\":{\"someNumber\":41,\"someArray\":[],\"someNestedObject\":{\"key\":\"value\"}}}";
+
     @Before
     @Before
     public void beforeTest() throws Exception {
     public void beforeTest() throws Exception {
         processBeforeTest("Test Subscribe to attribute updates", null, null);
         processBeforeTest("Test Subscribe to attribute updates", null, null);
@@ -56,50 +59,85 @@ public abstract class AbstractCoapAttributesUpdatesIntegrationTest extends Abstr
 
 
     @Test
     @Test
     public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
     public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
-        processTestSubscribeToAttributesUpdates();
+        processTestSubscribeToAttributesUpdates(false);
     }
     }
 
 
-    protected void processTestSubscribeToAttributesUpdates() throws Exception {
+    @Test
+    public void testSubscribeToAttributesUpdatesFromTheServerWithEmptyCurrentStateNotification() throws Exception {
+        processTestSubscribeToAttributesUpdates(true);
+    }
 
 
+    protected void processTestSubscribeToAttributesUpdates(boolean emptyCurrentStateNotification) throws Exception {
+        if (!emptyCurrentStateNotification) {
+            doPostAsync("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/attributes/SHARED_SCOPE", POST_ATTRIBUTES_PAYLOAD_ON_CURRENT_STATE_NOTIFICATION, String.class, status().isOk());
+        }
         CoapClient client = getCoapClient(FeatureType.ATTRIBUTES);
         CoapClient client = getCoapClient(FeatureType.ATTRIBUTES);
 
 
         CountDownLatch latch = new CountDownLatch(1);
         CountDownLatch latch = new CountDownLatch(1);
-        TestCoapCallback testCoapCallback = new TestCoapCallback(latch);
+        TestCoapCallback callback = new TestCoapCallback(latch);
 
 
         Request request = Request.newGet().setObserve();
         Request request = Request.newGet().setObserve();
         request.setType(CoAP.Type.CON);
         request.setType(CoAP.Type.CON);
-        CoapObserveRelation observeRelation = client.observe(request, testCoapCallback);
+        CoapObserveRelation observeRelation = client.observe(request, callback);
 
 
-        Thread.sleep(1000);
+        latch.await(3, TimeUnit.SECONDS);
+
+        if (emptyCurrentStateNotification) {
+            validateEmptyCurrentStateAttributesResponse(callback);
+        } else {
+            validateCurrentStateAttributesResponse(callback);
+        }
+
+        latch = new CountDownLatch(1);
 
 
         doPostAsync("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/attributes/SHARED_SCOPE", POST_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
         doPostAsync("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/attributes/SHARED_SCOPE", POST_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
         latch.await(3, TimeUnit.SECONDS);
         latch.await(3, TimeUnit.SECONDS);
 
 
-        validateUpdateAttributesResponse(testCoapCallback);
+        validateUpdateAttributesResponse(callback);
 
 
         latch = new CountDownLatch(1);
         latch = new CountDownLatch(1);
 
 
         doDelete("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/SHARED_SCOPE?keys=attribute5", String.class);
         doDelete("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/SHARED_SCOPE?keys=attribute5", String.class);
         latch.await(3, TimeUnit.SECONDS);
         latch.await(3, TimeUnit.SECONDS);
 
 
-        validateDeleteAttributesResponse(testCoapCallback);
+        validateDeleteAttributesResponse(callback);
 
 
         observeRelation.proactiveCancel();
         observeRelation.proactiveCancel();
         assertTrue(observeRelation.isCanceled());
         assertTrue(observeRelation.isCanceled());
     }
     }
 
 
-    protected void validateUpdateAttributesResponse(TestCoapCallback callback) throws InvalidProtocolBufferException {
+    protected void validateCurrentStateAttributesResponse(TestCoapCallback callback) throws InvalidProtocolBufferException {
+        assertNotNull(callback.getPayloadBytes());
+        assertNotNull(callback.getObserve());
+        assertEquals(callback.getResponseCode(), CoAP.ResponseCode._UNKNOWN_SUCCESS_CODE);
+        assertEquals(0, callback.getObserve().intValue());
+        String response = new String(callback.getPayloadBytes(), StandardCharsets.UTF_8);
+        assertEquals(JacksonUtil.toJsonNode(POST_ATTRIBUTES_PAYLOAD_ON_CURRENT_STATE_NOTIFICATION), JacksonUtil.toJsonNode(response));
+    }
+
+    protected void validateEmptyCurrentStateAttributesResponse(TestCoapCallback callback) throws InvalidProtocolBufferException {
         assertNotNull(callback.getPayloadBytes());
         assertNotNull(callback.getPayloadBytes());
         assertNotNull(callback.getObserve());
         assertNotNull(callback.getObserve());
+        assertEquals(callback.getResponseCode(), CoAP.ResponseCode._UNKNOWN_SUCCESS_CODE);
         assertEquals(0, callback.getObserve().intValue());
         assertEquals(0, callback.getObserve().intValue());
         String response = new String(callback.getPayloadBytes(), StandardCharsets.UTF_8);
         String response = new String(callback.getPayloadBytes(), StandardCharsets.UTF_8);
+        assertEquals("{}", response);
+    }
+
+    protected void validateUpdateAttributesResponse(TestCoapCallback callback) throws InvalidProtocolBufferException {
+        assertNotNull(callback.getPayloadBytes());
+        assertNotNull(callback.getObserve());
+        assertEquals(callback.getResponseCode(), CoAP.ResponseCode._UNKNOWN_SUCCESS_CODE);
+        assertEquals(1, callback.getObserve().intValue());
+        String response = new String(callback.getPayloadBytes(), StandardCharsets.UTF_8);
         assertEquals(JacksonUtil.toJsonNode(POST_ATTRIBUTES_PAYLOAD), JacksonUtil.toJsonNode(response));
         assertEquals(JacksonUtil.toJsonNode(POST_ATTRIBUTES_PAYLOAD), JacksonUtil.toJsonNode(response));
     }
     }
 
 
     protected void validateDeleteAttributesResponse(TestCoapCallback callback) throws InvalidProtocolBufferException {
     protected void validateDeleteAttributesResponse(TestCoapCallback callback) throws InvalidProtocolBufferException {
         assertNotNull(callback.getPayloadBytes());
         assertNotNull(callback.getPayloadBytes());
         assertNotNull(callback.getObserve());
         assertNotNull(callback.getObserve());
-        assertEquals(1, callback.getObserve().intValue());
+        assertEquals(callback.getResponseCode(), CoAP.ResponseCode._UNKNOWN_SUCCESS_CODE);
+        assertEquals(2, callback.getObserve().intValue());
         String response = new String(callback.getPayloadBytes(), StandardCharsets.UTF_8);
         String response = new String(callback.getPayloadBytes(), StandardCharsets.UTF_8);
         assertEquals(JacksonUtil.toJsonNode(RESPONSE_ATTRIBUTES_PAYLOAD_DELETED), JacksonUtil.toJsonNode(response));
         assertEquals(JacksonUtil.toJsonNode(RESPONSE_ATTRIBUTES_PAYLOAD_DELETED), JacksonUtil.toJsonNode(response));
     }
     }
@@ -110,13 +148,18 @@ public abstract class AbstractCoapAttributesUpdatesIntegrationTest extends Abstr
 
 
         private Integer observe;
         private Integer observe;
         private byte[] payloadBytes;
         private byte[] payloadBytes;
+        private CoAP.ResponseCode responseCode;
+
+        public Integer getObserve() {
+            return observe;
+        }
 
 
         public byte[] getPayloadBytes() {
         public byte[] getPayloadBytes() {
             return payloadBytes;
             return payloadBytes;
         }
         }
 
 
-        public Integer getObserve() {
-            return observe;
+        public CoAP.ResponseCode getResponseCode() {
+            return responseCode;
         }
         }
 
 
         private TestCoapCallback(CountDownLatch latch) {
         private TestCoapCallback(CountDownLatch latch) {
@@ -125,10 +168,9 @@ public abstract class AbstractCoapAttributesUpdatesIntegrationTest extends Abstr
 
 
         @Override
         @Override
         public void onLoad(CoapResponse response) {
         public void onLoad(CoapResponse response) {
-            assertNotNull(response.getPayload());
-            assertEquals(response.getCode(), CoAP.ResponseCode.CONTENT);
             observe = response.getOptions().getObserve();
             observe = response.getOptions().getObserve();
             payloadBytes = response.getPayload();
             payloadBytes = response.getPayload();
+            responseCode = response.getCode();
             latch.countDown();
             latch.countDown();
         }
         }
 
 

@@ -39,4 +39,9 @@ public abstract class AbstractCoapAttributesUpdatesJsonIntegrationTest extends A
     public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
     public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
         super.testSubscribeToAttributesUpdatesFromTheServer();
         super.testSubscribeToAttributesUpdatesFromTheServer();
     }
     }
+
+    @Test
+    public void testSubscribeToAttributesUpdatesFromTheServerWithEmptyCurrentStateNotification() throws Exception {
+        super.testSubscribeToAttributesUpdatesFromTheServerWithEmptyCurrentStateNotification();
+    }
 }
 }

@@ -17,6 +17,7 @@ package org.thingsboard.server.transport.coap.attributes.updates;
 
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.InvalidProtocolBufferException;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.core.coap.CoAP;
 import org.junit.After;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.Test;
@@ -24,11 +25,15 @@ import org.thingsboard.server.common.data.CoapDeviceType;
 import org.thingsboard.server.common.data.TransportPayloadType;
 import org.thingsboard.server.common.data.TransportPayloadType;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 
 
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertTrue;
 
 
 @Slf4j
 @Slf4j
@@ -46,11 +51,54 @@ public abstract class AbstractCoapAttributesUpdatesProtoIntegrationTest extends
 
 
     @Test
     @Test
     public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
     public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
-        processTestSubscribeToAttributesUpdates();
+        processTestSubscribeToAttributesUpdates(false);
+    }
+
+    @Test
+    public void testSubscribeToAttributesUpdatesFromTheServerWithEmptyCurrentStateNotification() throws Exception {
+        processTestSubscribeToAttributesUpdates(true);
+    }
+
+    protected void validateCurrentStateAttributesResponse(TestCoapCallback callback) throws InvalidProtocolBufferException {
+        assertNotNull(callback.getPayloadBytes());
+        assertNotNull(callback.getObserve());
+        assertEquals(callback.getResponseCode(), CoAP.ResponseCode._UNKNOWN_SUCCESS_CODE);
+        assertEquals(0, callback.getObserve().intValue());
+        TransportProtos.AttributeUpdateNotificationMsg.Builder expectedCurrentStateNotificationMsgBuilder = TransportProtos.AttributeUpdateNotificationMsg.newBuilder();
+        TransportProtos.TsKvProto tsKvProtoAttribute1 = getTsKvProto("attribute1", "value", TransportProtos.KeyValueType.STRING_V);
+        TransportProtos.TsKvProto tsKvProtoAttribute2 = getTsKvProto("attribute2", "false", TransportProtos.KeyValueType.BOOLEAN_V);
+        TransportProtos.TsKvProto tsKvProtoAttribute3 = getTsKvProto("attribute3", "41.0", TransportProtos.KeyValueType.DOUBLE_V);
+        TransportProtos.TsKvProto tsKvProtoAttribute4 = getTsKvProto("attribute4", "72", TransportProtos.KeyValueType.LONG_V);
+        TransportProtos.TsKvProto tsKvProtoAttribute5 = getTsKvProto("attribute5", "{\"someNumber\":41,\"someArray\":[],\"someNestedObject\":{\"key\":\"value\"}}", TransportProtos.KeyValueType.JSON_V);
+        List<TransportProtos.TsKvProto> tsKvProtoList = new ArrayList<>();
+        tsKvProtoList.add(tsKvProtoAttribute1);
+        tsKvProtoList.add(tsKvProtoAttribute2);
+        tsKvProtoList.add(tsKvProtoAttribute3);
+        tsKvProtoList.add(tsKvProtoAttribute4);
+        tsKvProtoList.add(tsKvProtoAttribute5);
+        TransportProtos.AttributeUpdateNotificationMsg expectedCurrentStateNotificationMsg = expectedCurrentStateNotificationMsgBuilder.addAllSharedUpdated(tsKvProtoList).build();
+        TransportProtos.AttributeUpdateNotificationMsg actualCurrentStateNotificationMsg = TransportProtos.AttributeUpdateNotificationMsg.parseFrom(callback.getPayloadBytes());
+
+        List<TransportProtos.KeyValueProto> expectedSharedUpdatedList = expectedCurrentStateNotificationMsg.getSharedUpdatedList().stream().map(TransportProtos.TsKvProto::getKv).collect(Collectors.toList());
+        List<TransportProtos.KeyValueProto> actualSharedUpdatedList = actualCurrentStateNotificationMsg.getSharedUpdatedList().stream().map(TransportProtos.TsKvProto::getKv).collect(Collectors.toList());
+
+        assertEquals(expectedSharedUpdatedList.size(), actualSharedUpdatedList.size());
+        assertTrue(actualSharedUpdatedList.containsAll(expectedSharedUpdatedList));
+
+    }
+
+    protected void validateEmptyCurrentStateAttributesResponse(TestCoapCallback callback) throws InvalidProtocolBufferException {
+        assertNull(callback.getPayloadBytes());
+        assertNotNull(callback.getObserve());
+        assertEquals(callback.getResponseCode(), CoAP.ResponseCode._UNKNOWN_SUCCESS_CODE);
+        assertEquals(0, callback.getObserve().intValue());
     }
     }
 
 
     protected void validateUpdateAttributesResponse(TestCoapCallback callback) throws InvalidProtocolBufferException {
     protected void validateUpdateAttributesResponse(TestCoapCallback callback) throws InvalidProtocolBufferException {
         assertNotNull(callback.getPayloadBytes());
         assertNotNull(callback.getPayloadBytes());
+        assertNotNull(callback.getObserve());
+        assertEquals(callback.getResponseCode(), CoAP.ResponseCode._UNKNOWN_SUCCESS_CODE);
+        assertEquals(1, callback.getObserve().intValue());
         TransportProtos.AttributeUpdateNotificationMsg.Builder attributeUpdateNotificationMsgBuilder = TransportProtos.AttributeUpdateNotificationMsg.newBuilder();
         TransportProtos.AttributeUpdateNotificationMsg.Builder attributeUpdateNotificationMsgBuilder = TransportProtos.AttributeUpdateNotificationMsg.newBuilder();
         List<TransportProtos.TsKvProto> tsKvProtoList = getTsKvProtoList();
         List<TransportProtos.TsKvProto> tsKvProtoList = getTsKvProtoList();
         attributeUpdateNotificationMsgBuilder.addAllSharedUpdated(tsKvProtoList);
         attributeUpdateNotificationMsgBuilder.addAllSharedUpdated(tsKvProtoList);
@@ -68,6 +116,9 @@ public abstract class AbstractCoapAttributesUpdatesProtoIntegrationTest extends
 
 
     protected void validateDeleteAttributesResponse(TestCoapCallback callback) throws InvalidProtocolBufferException {
     protected void validateDeleteAttributesResponse(TestCoapCallback callback) throws InvalidProtocolBufferException {
         assertNotNull(callback.getPayloadBytes());
         assertNotNull(callback.getPayloadBytes());
+        assertNotNull(callback.getObserve());
+        assertEquals(callback.getResponseCode(), CoAP.ResponseCode._UNKNOWN_SUCCESS_CODE);
+        assertEquals(2, callback.getObserve().intValue());
         TransportProtos.AttributeUpdateNotificationMsg.Builder attributeUpdateNotificationMsgBuilder = TransportProtos.AttributeUpdateNotificationMsg.newBuilder();
         TransportProtos.AttributeUpdateNotificationMsg.Builder attributeUpdateNotificationMsgBuilder = TransportProtos.AttributeUpdateNotificationMsg.newBuilder();
         attributeUpdateNotificationMsgBuilder.addSharedDeleted("attribute5");
         attributeUpdateNotificationMsgBuilder.addSharedDeleted("attribute5");
 
 

@@ -83,7 +83,7 @@ public abstract class AbstractCoapServerSideRpcDefaultIntegrationTest extends Ab
 
 
     @Test
     @Test
     public void testServerCoapTwoWayRpc() throws Exception {
     public void testServerCoapTwoWayRpc() throws Exception {
-        processTwoWayRpcTest();
+        processTwoWayRpcTest("{\"value1\":\"A\",\"value2\":\"B\"}");
     }
     }
 
 
 }
 }

@@ -15,6 +15,7 @@
  */
  */
 package org.thingsboard.server.transport.coap.rpc;
 package org.thingsboard.server.transport.coap.rpc;
 
 
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.californium.core.CoapClient;
 import org.eclipse.californium.core.CoapClient;
@@ -24,17 +25,18 @@ import org.eclipse.californium.core.CoapResponse;
 import org.eclipse.californium.core.coap.CoAP;
 import org.eclipse.californium.core.coap.CoAP;
 import org.eclipse.californium.core.coap.MediaTypeRegistry;
 import org.eclipse.californium.core.coap.MediaTypeRegistry;
 import org.eclipse.californium.core.coap.Request;
 import org.eclipse.californium.core.coap.Request;
-import org.junit.Assert;
-import org.thingsboard.server.transport.coap.AbstractCoapIntegrationTest;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.CoapDeviceType;
 import org.thingsboard.server.common.data.CoapDeviceType;
 import org.thingsboard.server.common.data.TransportPayloadType;
 import org.thingsboard.server.common.data.TransportPayloadType;
 import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.common.msg.session.FeatureType;
+import org.thingsboard.server.transport.coap.AbstractCoapIntegrationTest;
 
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 
@@ -55,57 +57,66 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
         client.useCONs();
         client.useCONs();
 
 
         CountDownLatch latch = new CountDownLatch(1);
         CountDownLatch latch = new CountDownLatch(1);
-        TestCoapCallback testCoapCallback = new TestCoapCallback(client, latch, true);
+        TestCoapCallback callback = new TestCoapCallback(client, latch, true);
 
 
         Request request = Request.newGet().setObserve();
         Request request = Request.newGet().setObserve();
-        CoapObserveRelation observeRelation = client.observe(request, testCoapCallback);
+        CoapObserveRelation observeRelation = client.observe(request, callback);
+
+        latch.await(3, TimeUnit.SECONDS);
+
+        validateCurrentStateNotification(callback);
+
+        latch = new CountDownLatch(1);
 
 
         String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}";
         String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}";
         String deviceId = savedDevice.getId().getId().toString();
         String deviceId = savedDevice.getId().getId().toString();
         String result = doPostAsync("/api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class, status().isOk());
         String result = doPostAsync("/api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class, status().isOk());
-        Assert.assertTrue(StringUtils.isEmpty(result));
+
         latch.await(3, TimeUnit.SECONDS);
         latch.await(3, TimeUnit.SECONDS);
-        assertEquals(0, testCoapCallback.getObserve().intValue());
+
+        validateOneWayStateChangedNotification(callback, result);
+
         observeRelation.proactiveCancel();
         observeRelation.proactiveCancel();
         assertTrue(observeRelation.isCanceled());
         assertTrue(observeRelation.isCanceled());
     }
     }
 
 
-    protected void processTwoWayRpcTest() throws Exception {
+    protected void processTwoWayRpcTest(String expectedResponseResult) throws Exception {
         CoapClient client = getCoapClient(FeatureType.RPC);
         CoapClient client = getCoapClient(FeatureType.RPC);
         client.useCONs();
         client.useCONs();
 
 
         CountDownLatch latch = new CountDownLatch(1);
         CountDownLatch latch = new CountDownLatch(1);
-        TestCoapCallback testCoapCallback = new TestCoapCallback(client, latch, false);
+        TestCoapCallback callback = new TestCoapCallback(client, latch, false);
 
 
         Request request = Request.newGet().setObserve();
         Request request = Request.newGet().setObserve();
         request.setType(CoAP.Type.CON);
         request.setType(CoAP.Type.CON);
-        CoapObserveRelation observeRelation = client.observe(request, testCoapCallback);
+        CoapObserveRelation observeRelation = client.observe(request, callback);
+
+        latch.await(3, TimeUnit.SECONDS);
+
+        validateCurrentStateNotification(callback);
 
 
         String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"26\",\"value\": 1}}";
         String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"26\",\"value\": 1}}";
         String deviceId = savedDevice.getId().getId().toString();
         String deviceId = savedDevice.getId().getId().toString();
 
 
-        String expected = "{\"value1\":\"A\",\"value2\":\"B\"}";
+        String actualResult = doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().isOk());
+        latch.await(3, TimeUnit.SECONDS);
+
+        validateTwoWayStateChangedNotification(callback, 1, expectedResponseResult, actualResult);
 
 
-        String result = doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().isOk());
+        latch = new CountDownLatch(1);
+
+        actualResult = doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().isOk());
         latch.await(3, TimeUnit.SECONDS);
         latch.await(3, TimeUnit.SECONDS);
 
 
-        assertEquals(expected, result);
-        assertEquals(0, testCoapCallback.getObserve().intValue());
+        validateTwoWayStateChangedNotification(callback, 2, expectedResponseResult, actualResult);
+
         observeRelation.proactiveCancel();
         observeRelation.proactiveCancel();
         assertTrue(observeRelation.isCanceled());
         assertTrue(observeRelation.isCanceled());
-
-//        // TODO: 3/11/21 Fix test to validate next RPC
-//        latch = new CountDownLatch(1);
-//
-//        result = doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().isOk());
-//        latch.await(3, TimeUnit.SECONDS);
-//
-//        assertEquals(expected, result);
-//        assertEquals(1, testCoapCallback.getObserve().intValue());
     }
     }
 
 
     protected void processOnLoadResponse(CoapResponse response, CoapClient client, Integer observe, CountDownLatch latch) {
     protected void processOnLoadResponse(CoapResponse response, CoapClient client, Integer observe, CountDownLatch latch) {
-        client.setURI(getRpcResponseFeatureTokenUrl(accessToken, observe));
+        JsonNode responseJson = JacksonUtil.fromBytes(response.getPayload());
+        client.setURI(getRpcResponseFeatureTokenUrl(accessToken, responseJson.get("id").asInt()));
         client.post(new CoapHandler() {
         client.post(new CoapHandler() {
             @Override
             @Override
             public void onLoad(CoapResponse response) {
             public void onLoad(CoapResponse response) {
@@ -130,11 +141,21 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
         private final CountDownLatch latch;
         private final CountDownLatch latch;
         private final boolean isOneWayRpc;
         private final boolean isOneWayRpc;
 
 
+        private Integer observe;
+        private byte[] payloadBytes;
+        private CoAP.ResponseCode responseCode;
+
         public Integer getObserve() {
         public Integer getObserve() {
             return observe;
             return observe;
         }
         }
 
 
-        private Integer observe;
+        public byte[] getPayloadBytes() {
+            return payloadBytes;
+        }
+
+        public CoAP.ResponseCode getResponseCode() {
+            return responseCode;
+        }
 
 
         TestCoapCallback(CoapClient client, CountDownLatch latch, boolean isOneWayRpc) {
         TestCoapCallback(CoapClient client, CountDownLatch latch, boolean isOneWayRpc) {
             this.client = client;
             this.client = client;
@@ -144,14 +165,15 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
 
 
         @Override
         @Override
         public void onLoad(CoapResponse response) {
         public void onLoad(CoapResponse response) {
-            log.warn("coap response: {}, {}", response.getResponseText(), response.getCode());
-            assertNotNull(response.getPayload());
-            assertEquals(response.getCode(), CoAP.ResponseCode.CONTENT);
+            payloadBytes = response.getPayload();
+            responseCode = response.getCode();
             observe = response.getOptions().getObserve();
             observe = response.getOptions().getObserve();
-            if (!isOneWayRpc) {
-                processOnLoadResponse(response, client, observe, latch);
-            } else {
-                latch.countDown();
+            if (observe != null) {
+                if (!isOneWayRpc && observe > 0) {
+                    processOnLoadResponse(response, client, observe, latch);
+                } else {
+                    latch.countDown();
+                }
             }
             }
         }
         }
 
 
@@ -162,4 +184,28 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
 
 
     }
     }
 
 
+    private void validateCurrentStateNotification(TestCoapCallback callback) {
+        assertNull(callback.getPayloadBytes());
+        assertNotNull(callback.getObserve());
+        assertEquals(callback.getResponseCode(), CoAP.ResponseCode.VALID);
+        assertEquals(0, callback.getObserve().intValue());
+    }
+
+    private void validateOneWayStateChangedNotification(TestCoapCallback callback, String result) {
+        assertTrue(StringUtils.isEmpty(result));
+        assertNotNull(callback.getPayloadBytes());
+        assertNotNull(callback.getObserve());
+        assertEquals(callback.getResponseCode(), CoAP.ResponseCode._UNKNOWN_SUCCESS_CODE);
+        assertEquals(1, callback.getObserve().intValue());
+    }
+
+    private void validateTwoWayStateChangedNotification(TestCoapCallback callback, int expectedObserveNumber, String expectedResult, String actualResult) {
+        assertEquals(expectedResult, actualResult);
+        assertNotNull(callback.getPayloadBytes());
+        assertNotNull(callback.getObserve());
+        assertEquals(callback.getResponseCode(), CoAP.ResponseCode._UNKNOWN_SUCCESS_CODE);
+        assertEquals(expectedObserveNumber, callback.getObserve().intValue());
+    }
+
+
 }
 }

@@ -42,7 +42,7 @@ public abstract class AbstractCoapServerSideRpcJsonIntegrationTest extends Abstr
 
 
     @Test
     @Test
     public void testServerCoapTwoWayRpc() throws Exception {
     public void testServerCoapTwoWayRpc() throws Exception {
-        processTwoWayRpcTest();
+        processTwoWayRpcTest("{\"value1\":\"A\",\"value2\":\"B\"}");
     }
     }
 
 
 }
 }

@@ -85,37 +85,11 @@ public abstract class AbstractCoapServerSideRpcProtoIntegrationTest extends Abst
 
 
     @Test
     @Test
     public void testServerCoapTwoWayRpc() throws Exception {
     public void testServerCoapTwoWayRpc() throws Exception {
-        processTwoWayRpcTest();
-    }
-
-    protected void processTwoWayRpcTest() throws Exception {
-        CoapClient client = getCoapClient(FeatureType.RPC);
-        client.useCONs();
-
-        CountDownLatch latch = new CountDownLatch(1);
-        TestCoapCallback testCoapCallback = new TestCoapCallback(client, latch, false);
-
-        Request request = Request.newGet().setObserve();
-        request.setType(CoAP.Type.CON);
-        CoapObserveRelation observeRelation = client.observe(request, testCoapCallback);
-
-        String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"26\",\"value\": 1}}";
-        String deviceId = savedDevice.getId().getId().toString();
-
-        String expected = "{\"payload\":\"{\\\"value1\\\":\\\"A\\\",\\\"value2\\\":\\\"B\\\"}\"}";
-
-        String result = doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().isOk());
-        latch.await(3, TimeUnit.SECONDS);
-
-        assertEquals(expected, result);
-        assertEquals(0, testCoapCallback.getObserve().intValue());
-        observeRelation.proactiveCancel();
-        assertTrue(observeRelation.isCanceled());
+        processTwoWayRpcTest("{\"payload\":\"{\\\"value1\\\":\\\"A\\\",\\\"value2\\\":\\\"B\\\"}\"}");
     }
     }
 
 
     @Override
     @Override
     protected void processOnLoadResponse(CoapResponse response, CoapClient client, Integer observe, CountDownLatch latch) {
     protected void processOnLoadResponse(CoapResponse response, CoapClient client, Integer observe, CountDownLatch latch) {
-        client.setURI(getRpcResponseFeatureTokenUrl(accessToken, observe));
         ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration = getProtoTransportPayloadConfiguration();
         ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration = getProtoTransportPayloadConfiguration();
         ProtoFileElement rpcRequestProtoSchemaFile = protoTransportPayloadConfiguration.getTransportProtoSchema(RPC_REQUEST_PROTO_SCHEMA);
         ProtoFileElement rpcRequestProtoSchemaFile = protoTransportPayloadConfiguration.getTransportProtoSchema(RPC_REQUEST_PROTO_SCHEMA);
         DynamicSchema rpcRequestProtoSchema = protoTransportPayloadConfiguration.getDynamicSchema(rpcRequestProtoSchemaFile, ProtoTransportPayloadConfiguration.RPC_REQUEST_PROTO_SCHEMA);
         DynamicSchema rpcRequestProtoSchema = protoTransportPayloadConfiguration.getDynamicSchema(rpcRequestProtoSchemaFile, ProtoTransportPayloadConfiguration.RPC_REQUEST_PROTO_SCHEMA);
@@ -123,25 +97,22 @@ public abstract class AbstractCoapServerSideRpcProtoIntegrationTest extends Abst
         byte[] requestPayload = response.getPayload();
         byte[] requestPayload = response.getPayload();
         DynamicMessage.Builder rpcRequestMsg = rpcRequestProtoSchema.newMessageBuilder("RpcRequestMsg");
         DynamicMessage.Builder rpcRequestMsg = rpcRequestProtoSchema.newMessageBuilder("RpcRequestMsg");
         Descriptors.Descriptor rpcRequestMsgDescriptor = rpcRequestMsg.getDescriptorForType();
         Descriptors.Descriptor rpcRequestMsgDescriptor = rpcRequestMsg.getDescriptorForType();
-        assertNotNull(rpcRequestMsgDescriptor);
         try {
         try {
             DynamicMessage dynamicMessage = DynamicMessage.parseFrom(rpcRequestMsgDescriptor, requestPayload);
             DynamicMessage dynamicMessage = DynamicMessage.parseFrom(rpcRequestMsgDescriptor, requestPayload);
-            List<Descriptors.FieldDescriptor> fields = rpcRequestMsgDescriptor.getFields();
-            for (Descriptors.FieldDescriptor fieldDescriptor: fields) {
-                assertTrue(dynamicMessage.hasField(fieldDescriptor));
-            }
+            Descriptors.FieldDescriptor requestIdDescriptor = rpcRequestMsgDescriptor.findFieldByName("requestId");
+            int requestId = (int) dynamicMessage.getField(requestIdDescriptor);
             ProtoFileElement rpcResponseProtoSchemaFile = protoTransportPayloadConfiguration.getTransportProtoSchema(DEVICE_RPC_RESPONSE_PROTO_SCHEMA);
             ProtoFileElement rpcResponseProtoSchemaFile = protoTransportPayloadConfiguration.getTransportProtoSchema(DEVICE_RPC_RESPONSE_PROTO_SCHEMA);
             DynamicSchema rpcResponseProtoSchema = protoTransportPayloadConfiguration.getDynamicSchema(rpcResponseProtoSchemaFile, ProtoTransportPayloadConfiguration.RPC_RESPONSE_PROTO_SCHEMA);
             DynamicSchema rpcResponseProtoSchema = protoTransportPayloadConfiguration.getDynamicSchema(rpcResponseProtoSchemaFile, ProtoTransportPayloadConfiguration.RPC_RESPONSE_PROTO_SCHEMA);
             DynamicMessage.Builder rpcResponseBuilder = rpcResponseProtoSchema.newMessageBuilder("RpcResponseMsg");
             DynamicMessage.Builder rpcResponseBuilder = rpcResponseProtoSchema.newMessageBuilder("RpcResponseMsg");
             Descriptors.Descriptor rpcResponseMsgDescriptor = rpcResponseBuilder.getDescriptorForType();
             Descriptors.Descriptor rpcResponseMsgDescriptor = rpcResponseBuilder.getDescriptorForType();
-            assertNotNull(rpcResponseMsgDescriptor);
             DynamicMessage rpcResponseMsg = rpcResponseBuilder
             DynamicMessage rpcResponseMsg = rpcResponseBuilder
                     .setField(rpcResponseMsgDescriptor.findFieldByName("payload"), DEVICE_RESPONSE)
                     .setField(rpcResponseMsgDescriptor.findFieldByName("payload"), DEVICE_RESPONSE)
                     .build();
                     .build();
+            client.setURI(getRpcResponseFeatureTokenUrl(accessToken, requestId));
             client.post(new CoapHandler() {
             client.post(new CoapHandler() {
                 @Override
                 @Override
                 public void onLoad(CoapResponse response) {
                 public void onLoad(CoapResponse response) {
-                    log.warn("Command Response Ack: {}, {}", response.getCode(), response.getResponseText());
+                    log.warn("Command Response Ack: {}", response.getCode());
                     latch.countDown();
                     latch.countDown();
                 }
                 }
 
 

@@ -13,19 +13,20 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.cache.firmware;
+package org.thingsboard.server.cache.ota;
 
 
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import static org.thingsboard.server.common.data.CacheConstants.FIRMWARE_CACHE;
+import static org.thingsboard.server.common.data.CacheConstants.OTA_PACKAGE_CACHE;
+import static org.thingsboard.server.common.data.CacheConstants.OTA_PACKAGE_DATA_CACHE;
 
 
 @Service
 @Service
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "caffeine", matchIfMissing = true)
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "caffeine", matchIfMissing = true)
 @RequiredArgsConstructor
 @RequiredArgsConstructor
-public class CaffeineFirmwareCache implements FirmwareDataCache {
+public class CaffeineOtaPackageCache implements OtaPackageDataCache {
 
 
     private final CacheManager cacheManager;
     private final CacheManager cacheManager;
 
 
@@ -36,7 +37,7 @@ public class CaffeineFirmwareCache implements FirmwareDataCache {
 
 
     @Override
     @Override
     public byte[] get(String key, int chunkSize, int chunk) {
     public byte[] get(String key, int chunkSize, int chunk) {
-        byte[] data = cacheManager.getCache(FIRMWARE_CACHE).get(key, byte[].class);
+        byte[] data = cacheManager.getCache(OTA_PACKAGE_DATA_CACHE).get(key, byte[].class);
 
 
         if (chunkSize < 1) {
         if (chunkSize < 1) {
             return data;
             return data;
@@ -58,11 +59,11 @@ public class CaffeineFirmwareCache implements FirmwareDataCache {
 
 
     @Override
     @Override
     public void put(String key, byte[] value) {
     public void put(String key, byte[] value) {
-        cacheManager.getCache(FIRMWARE_CACHE).putIfAbsent(key, value);
+        cacheManager.getCache(OTA_PACKAGE_DATA_CACHE).putIfAbsent(key, value);
     }
     }
 
 
     @Override
     @Override
     public void evict(String key) {
     public void evict(String key) {
-        cacheManager.getCache(FIRMWARE_CACHE).evict(key);
+        cacheManager.getCache(OTA_PACKAGE_DATA_CACHE).evict(key);
     }
     }
 }
 }

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.cache.firmware;
+package org.thingsboard.server.cache.ota;
 
 
-public interface FirmwareDataCache {
+public interface OtaPackageDataCache {
 
 
     byte[] get(String key);
     byte[] get(String key);
 
 
@@ -25,8 +25,8 @@ public interface FirmwareDataCache {
 
 
     void evict(String key);
     void evict(String key);
 
 
-    default boolean has(String firmwareId) {
-        byte[] data = get(firmwareId, 1, 0);
+    default boolean has(String otaPackageId) {
+        byte[] data = get(otaPackageId, 1, 0);
         return data != null && data.length > 0;
         return data != null && data.length > 0;
     }
     }
 }
 }

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.cache.firmware;
+package org.thingsboard.server.cache.ota;
 
 
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -21,12 +21,13 @@ import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import static org.thingsboard.server.common.data.CacheConstants.FIRMWARE_CACHE;
+import static org.thingsboard.server.common.data.CacheConstants.OTA_PACKAGE_CACHE;
+import static org.thingsboard.server.common.data.CacheConstants.OTA_PACKAGE_DATA_CACHE;
 
 
 @Service
 @Service
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "redis")
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "redis")
 @RequiredArgsConstructor
 @RequiredArgsConstructor
-public class RedisFirmwareDataCache implements FirmwareDataCache {
+public class RedisOtaPackageDataCache implements OtaPackageDataCache {
 
 
     private final RedisConnectionFactory redisConnectionFactory;
     private final RedisConnectionFactory redisConnectionFactory;
 
 
@@ -39,30 +40,30 @@ public class RedisFirmwareDataCache implements FirmwareDataCache {
     public byte[] get(String key, int chunkSize, int chunk) {
     public byte[] get(String key, int chunkSize, int chunk) {
         try (RedisConnection connection = redisConnectionFactory.getConnection()) {
         try (RedisConnection connection = redisConnectionFactory.getConnection()) {
             if (chunkSize == 0) {
             if (chunkSize == 0) {
-                return connection.get(toFirmwareCacheKey(key));
+                return connection.get(toOtaPackageCacheKey(key));
             }
             }
 
 
             int startIndex = chunkSize * chunk;
             int startIndex = chunkSize * chunk;
             int endIndex = startIndex + chunkSize - 1;
             int endIndex = startIndex + chunkSize - 1;
-            return connection.getRange(toFirmwareCacheKey(key), startIndex, endIndex);
+            return connection.getRange(toOtaPackageCacheKey(key), startIndex, endIndex);
         }
         }
     }
     }
 
 
     @Override
     @Override
     public void put(String key, byte[] value) {
     public void put(String key, byte[] value) {
         try (RedisConnection connection = redisConnectionFactory.getConnection()) {
         try (RedisConnection connection = redisConnectionFactory.getConnection()) {
-            connection.set(toFirmwareCacheKey(key), value);
+            connection.set(toOtaPackageCacheKey(key), value);
         }
         }
     }
     }
 
 
     @Override
     @Override
     public void evict(String key) {
     public void evict(String key) {
         try (RedisConnection connection = redisConnectionFactory.getConnection()) {
         try (RedisConnection connection = redisConnectionFactory.getConnection()) {
-            connection.del(toFirmwareCacheKey(key));
+            connection.del(toOtaPackageCacheKey(key));
         }
         }
     }
     }
 
 
-    private byte[] toFirmwareCacheKey(String key) {
-        return String.format("%s::%s", FIRMWARE_CACHE, key).getBytes();
+    private byte[] toOtaPackageCacheKey(String key) {
+        return String.format("%s::%s", OTA_PACKAGE_DATA_CACHE, key).getBytes();
     }
     }
 }
 }

@@ -27,6 +27,7 @@ import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
@@ -63,9 +64,9 @@ public interface DeviceService {
 
 
     PageData<Device> findDevicesByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink);
     PageData<Device> findDevicesByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink);
 
 
-    PageData<Device> findDevicesByTenantIdAndTypeAndEmptyFirmware(TenantId tenantId, String type, PageLink pageLink);
+    PageData<Device> findDevicesByTenantIdAndTypeAndEmptyOtaPackage(TenantId tenantId, DeviceProfileId deviceProfileId, OtaPackageType type, PageLink pageLink);
 
 
-    PageData<Device> findDevicesByTenantIdAndTypeAndEmptySoftware(TenantId tenantId, String type, PageLink pageLink);
+    Long countDevicesByTenantIdAndDeviceProfileIdAndEmptyOtaPackage(TenantId tenantId, DeviceProfileId deviceProfileId, OtaPackageType otaPackageType);
 
 
     PageData<DeviceInfo> findDeviceInfosByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink);
     PageData<DeviceInfo> findDeviceInfosByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink);
 
 

@@ -13,40 +13,40 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.dao.firmware;
+package org.thingsboard.server.dao.ota;
 
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.thingsboard.server.common.data.Firmware;
-import org.thingsboard.server.common.data.FirmwareInfo;
-import org.thingsboard.server.common.data.firmware.ChecksumAlgorithm;
-import org.thingsboard.server.common.data.firmware.FirmwareType;
+import org.thingsboard.server.common.data.OtaPackage;
+import org.thingsboard.server.common.data.OtaPackageInfo;
+import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
+import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.FirmwareId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.PageLink;
 
 
 import java.nio.ByteBuffer;
 import java.nio.ByteBuffer;
 
 
-public interface FirmwareService {
+public interface OtaPackageService {
 
 
-    FirmwareInfo saveFirmwareInfo(FirmwareInfo firmwareInfo);
+    OtaPackageInfo saveOtaPackageInfo(OtaPackageInfo otaPackageInfo);
 
 
-    Firmware saveFirmware(Firmware firmware);
+    OtaPackage saveOtaPackage(OtaPackage otaPackage);
 
 
     String generateChecksum(ChecksumAlgorithm checksumAlgorithm, ByteBuffer data);
     String generateChecksum(ChecksumAlgorithm checksumAlgorithm, ByteBuffer data);
 
 
-    Firmware findFirmwareById(TenantId tenantId, FirmwareId firmwareId);
+    OtaPackage findOtaPackageById(TenantId tenantId, OtaPackageId otaPackageId);
 
 
-    FirmwareInfo findFirmwareInfoById(TenantId tenantId, FirmwareId firmwareId);
+    OtaPackageInfo findOtaPackageInfoById(TenantId tenantId, OtaPackageId otaPackageId);
 
 
-    ListenableFuture<FirmwareInfo> findFirmwareInfoByIdAsync(TenantId tenantId, FirmwareId firmwareId);
+    ListenableFuture<OtaPackageInfo> findOtaPackageInfoByIdAsync(TenantId tenantId, OtaPackageId otaPackageId);
 
 
-    PageData<FirmwareInfo> findTenantFirmwaresByTenantId(TenantId tenantId, PageLink pageLink);
+    PageData<OtaPackageInfo> findTenantOtaPackagesByTenantId(TenantId tenantId, PageLink pageLink);
 
 
-    PageData<FirmwareInfo> findTenantFirmwaresByTenantIdAndDeviceProfileIdAndTypeAndHasData(TenantId tenantId, DeviceProfileId deviceProfileId, FirmwareType firmwareType, boolean hasData, PageLink pageLink);
+    PageData<OtaPackageInfo> findTenantOtaPackagesByTenantIdAndDeviceProfileIdAndTypeAndHasData(TenantId tenantId, DeviceProfileId deviceProfileId, OtaPackageType otaPackageType, boolean hasData, PageLink pageLink);
 
 
-    void deleteFirmware(TenantId tenantId, FirmwareId firmwareId);
+    void deleteOtaPackage(TenantId tenantId, OtaPackageId otaPackageId);
 
 
-    void deleteFirmwaresByTenantId(TenantId tenantId);
+    void deleteOtaPackagesByTenantId(TenantId tenantId);
 }
 }

@@ -29,5 +29,6 @@ public class CacheConstants {
     public static final String DEVICE_PROFILE_CACHE = "deviceProfiles";
     public static final String DEVICE_PROFILE_CACHE = "deviceProfiles";
     public static final String ATTRIBUTES_CACHE = "attributes";
     public static final String ATTRIBUTES_CACHE = "attributes";
     public static final String TOKEN_OUTDATAGE_TIME_CACHE = "tokensOutdatageTime";
     public static final String TOKEN_OUTDATAGE_TIME_CACHE = "tokensOutdatageTime";
-    public static final String FIRMWARE_CACHE = "firmwares";
+    public static final String OTA_PACKAGE_CACHE = "otaPackages";
+    public static final String OTA_PACKAGE_DATA_CACHE = "otaPackagesData";
 }
 }

@@ -66,6 +66,7 @@ public class DataConstants {
     public static final String TIMESERIES_DELETED = "TIMESERIES_DELETED";
     public static final String TIMESERIES_DELETED = "TIMESERIES_DELETED";
     public static final String ALARM_ACK = "ALARM_ACK";
     public static final String ALARM_ACK = "ALARM_ACK";
     public static final String ALARM_CLEAR = "ALARM_CLEAR";
     public static final String ALARM_CLEAR = "ALARM_CLEAR";
+    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_FROM_TENANT = "ENTITY_ASSIGNED_FROM_TENANT";
     public static final String ENTITY_ASSIGNED_TO_TENANT = "ENTITY_ASSIGNED_TO_TENANT";
     public static final String ENTITY_ASSIGNED_TO_TENANT = "ENTITY_ASSIGNED_TO_TENANT";
     public static final String PROVISION_SUCCESS = "PROVISION_SUCCESS";
     public static final String PROVISION_SUCCESS = "PROVISION_SUCCESS";

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.device.data.DeviceData;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.FirmwareId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.validation.NoXss;
 import org.thingsboard.server.common.data.validation.NoXss;
 
 
@@ -32,7 +32,7 @@ import java.io.IOException;
 
 
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
 @Slf4j
-public class Device extends SearchTextBasedWithAdditionalInfo<DeviceId> implements HasName, HasTenantId, HasCustomerId, HasFirmware {
+public class Device extends SearchTextBasedWithAdditionalInfo<DeviceId> implements HasName, HasTenantId, HasCustomerId, HasOtaPackage {
 
 
     private static final long serialVersionUID = 2807343040519543363L;
     private static final long serialVersionUID = 2807343040519543363L;
 
 
@@ -49,8 +49,8 @@ public class Device extends SearchTextBasedWithAdditionalInfo<DeviceId> implemen
     @JsonIgnore
     @JsonIgnore
     private byte[] deviceDataBytes;
     private byte[] deviceDataBytes;
 
 
-    private FirmwareId firmwareId;
-    private FirmwareId softwareId;
+    private OtaPackageId firmwareId;
+    private OtaPackageId softwareId;
 
 
     public Device() {
     public Device() {
         super();
         super();
@@ -167,19 +167,19 @@ public class Device extends SearchTextBasedWithAdditionalInfo<DeviceId> implemen
         return getName();
         return getName();
     }
     }
 
 
-    public FirmwareId getFirmwareId() {
+    public OtaPackageId getFirmwareId() {
         return firmwareId;
         return firmwareId;
     }
     }
 
 
-    public void setFirmwareId(FirmwareId firmwareId) {
+    public void setFirmwareId(OtaPackageId firmwareId) {
         this.firmwareId = firmwareId;
         this.firmwareId = firmwareId;
     }
     }
 
 
-    public FirmwareId getSoftwareId() {
+    public OtaPackageId getSoftwareId() {
         return softwareId;
         return softwareId;
     }
     }
 
 
-    public void setSoftwareId(FirmwareId softwareId) {
+    public void setSoftwareId(OtaPackageId softwareId) {
         this.softwareId = softwareId;
         this.softwareId = softwareId;
     }
     }
 
 

@@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.FirmwareId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.validation.NoXss;
 import org.thingsboard.server.common.data.validation.NoXss;
@@ -37,7 +37,7 @@ import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalIn
 @Data
 @Data
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
 @Slf4j
-public class DeviceProfile extends SearchTextBased<DeviceProfileId> implements HasName, HasTenantId, HasFirmware {
+public class DeviceProfile extends SearchTextBased<DeviceProfileId> implements HasName, HasTenantId, HasOtaPackage {
 
 
     private TenantId tenantId;
     private TenantId tenantId;
     @NoXss
     @NoXss
@@ -60,9 +60,9 @@ public class DeviceProfile extends SearchTextBased<DeviceProfileId> implements H
     @NoXss
     @NoXss
     private String provisionDeviceKey;
     private String provisionDeviceKey;
 
 
-    private FirmwareId firmwareId;
+    private OtaPackageId firmwareId;
 
 
-    private FirmwareId softwareId;
+    private OtaPackageId softwareId;
 
 
     public DeviceProfile() {
     public DeviceProfile() {
         super();
         super();

@@ -19,5 +19,5 @@ package org.thingsboard.server.common.data;
  * @author Andrew Shvayka
  * @author Andrew Shvayka
  */
  */
 public enum EntityType {
 public enum EntityType {
-    TENANT, CUSTOMER, USER, DASHBOARD, ASSET, DEVICE, ALARM, RULE_CHAIN, RULE_NODE, ENTITY_VIEW, WIDGETS_BUNDLE, WIDGET_TYPE, TENANT_PROFILE, DEVICE_PROFILE, API_USAGE_STATE, TB_RESOURCE, FIRMWARE, EDGE;
+    TENANT, CUSTOMER, USER, DASHBOARD, ASSET, DEVICE, ALARM, RULE_CHAIN, RULE_NODE, ENTITY_VIEW, WIDGETS_BUNDLE, WIDGET_TYPE, TENANT_PROFILE, DEVICE_PROFILE, API_USAGE_STATE, TB_RESOURCE, OTA_PACKAGE, EDGE;
 }
 }

@@ -15,11 +15,11 @@
  */
  */
 package org.thingsboard.server.common.data;
 package org.thingsboard.server.common.data;
 
 
-import org.thingsboard.server.common.data.id.FirmwareId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 
 
-public interface HasFirmware {
+public interface HasOtaPackage {
 
 
-    FirmwareId getFirmwareId();
+    OtaPackageId getFirmwareId();
 
 
-    FirmwareId getSoftwareId();
+    OtaPackageId getSoftwareId();
 }
 }

@@ -17,27 +17,27 @@ package org.thingsboard.server.common.data;
 
 
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.id.FirmwareId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 
 
 import java.nio.ByteBuffer;
 import java.nio.ByteBuffer;
 
 
 @Data
 @Data
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-public class Firmware extends FirmwareInfo {
+public class OtaPackage extends OtaPackageInfo {
 
 
     private static final long serialVersionUID = 3091601761339422546L;
     private static final long serialVersionUID = 3091601761339422546L;
 
 
     private transient ByteBuffer data;
     private transient ByteBuffer data;
 
 
-    public Firmware() {
+    public OtaPackage() {
         super();
         super();
     }
     }
 
 
-    public Firmware(FirmwareId id) {
+    public OtaPackage(OtaPackageId id) {
         super(id);
         super(id);
     }
     }
 
 
-    public Firmware(Firmware firmware) {
+    public OtaPackage(OtaPackage firmware) {
         super(firmware);
         super(firmware);
         this.data = firmware.getData();
         this.data = firmware.getData();
     }
     }

@@ -19,22 +19,22 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.server.common.data.firmware.ChecksumAlgorithm;
-import org.thingsboard.server.common.data.firmware.FirmwareType;
+import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
+import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.FirmwareId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 
 
 @Slf4j
 @Slf4j
 @Data
 @Data
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-public class FirmwareInfo extends SearchTextBasedWithAdditionalInfo<FirmwareId> implements HasName, HasTenantId {
+public class OtaPackageInfo extends SearchTextBasedWithAdditionalInfo<OtaPackageId> implements HasName, HasTenantId {
 
 
     private static final long serialVersionUID = 3168391583570815419L;
     private static final long serialVersionUID = 3168391583570815419L;
 
 
     private TenantId tenantId;
     private TenantId tenantId;
     private DeviceProfileId deviceProfileId;
     private DeviceProfileId deviceProfileId;
-    private FirmwareType type;
+    private OtaPackageType type;
     private String title;
     private String title;
     private String version;
     private String version;
     private boolean hasData;
     private boolean hasData;
@@ -45,27 +45,27 @@ public class FirmwareInfo extends SearchTextBasedWithAdditionalInfo<FirmwareId>
     private Long dataSize;
     private Long dataSize;
 
 
 
 
-    public FirmwareInfo() {
+    public OtaPackageInfo() {
         super();
         super();
     }
     }
 
 
-    public FirmwareInfo(FirmwareId id) {
+    public OtaPackageInfo(OtaPackageId id) {
         super(id);
         super(id);
     }
     }
 
 
-    public FirmwareInfo(FirmwareInfo firmwareInfo) {
-        super(firmwareInfo);
-        this.tenantId = firmwareInfo.getTenantId();
-        this.deviceProfileId = firmwareInfo.getDeviceProfileId();
-        this.type = firmwareInfo.getType();
-        this.title = firmwareInfo.getTitle();
-        this.version = firmwareInfo.getVersion();
-        this.hasData = firmwareInfo.isHasData();
-        this.fileName = firmwareInfo.getFileName();
-        this.contentType = firmwareInfo.getContentType();
-        this.checksumAlgorithm = firmwareInfo.getChecksumAlgorithm();
-        this.checksum = firmwareInfo.getChecksum();
-        this.dataSize = firmwareInfo.getDataSize();
+    public OtaPackageInfo(OtaPackageInfo otaPackageInfo) {
+        super(otaPackageInfo);
+        this.tenantId = otaPackageInfo.getTenantId();
+        this.deviceProfileId = otaPackageInfo.getDeviceProfileId();
+        this.type = otaPackageInfo.getType();
+        this.title = otaPackageInfo.getTitle();
+        this.version = otaPackageInfo.getVersion();
+        this.hasData = otaPackageInfo.isHasData();
+        this.fileName = otaPackageInfo.getFileName();
+        this.contentType = otaPackageInfo.getContentType();
+        this.checksumAlgorithm = otaPackageInfo.getChecksumAlgorithm();
+        this.checksum = otaPackageInfo.getChecksum();
+        this.dataSize = otaPackageInfo.getDataSize();
     }
     }
 
 
     @Override
     @Override

@@ -27,6 +27,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.IOException;
+import java.util.Optional;
 
 
 import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo.mapper;
 import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo.mapper;
 
 
@@ -92,6 +93,13 @@ public class TenantProfile extends SearchTextBased<TenantProfileId> implements H
         }
         }
     }
     }
 
 
+    @JsonIgnore
+    public Optional<DefaultTenantProfileConfiguration> getProfileConfiguration() {
+        return Optional.ofNullable(getProfileData().getConfiguration())
+                .filter(profileConfiguration -> profileConfiguration instanceof DefaultTenantProfileConfiguration)
+                .map(profileConfiguration -> (DefaultTenantProfileConfiguration) profileConfiguration);
+    }
+
     public TenantProfileData createDefaultTenantProfileData() {
     public TenantProfileData createDefaultTenantProfileData() {
         TenantProfileData tpd = new TenantProfileData();
         TenantProfileData tpd = new TenantProfileData();
         tpd.setConfiguration(new DefaultTenantProfileConfiguration());
         tpd.setConfiguration(new DefaultTenantProfileConfiguration());

@@ -39,6 +39,7 @@ public enum ActionType {
     RELATIONS_DELETED(false),
     RELATIONS_DELETED(false),
     ALARM_ACK(false),
     ALARM_ACK(false),
     ALARM_CLEAR(false),
     ALARM_CLEAR(false),
+    ALARM_DELETE(false),
     LOGIN(false),
     LOGIN(false),
     LOGOUT(false),
     LOGOUT(false),
     LOCKOUT(false),
     LOCKOUT(false),

+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.exception;
+
+public class ApiUsageLimitsExceededException extends RuntimeException {
+    public ApiUsageLimitsExceededException(String message) {
+        super(message);
+    }
+
+    public ApiUsageLimitsExceededException() {
+    }
+}

@@ -71,8 +71,8 @@ public class EntityIdFactory {
                 return new ApiUsageStateId(uuid);
                 return new ApiUsageStateId(uuid);
             case TB_RESOURCE:
             case TB_RESOURCE:
                 return new TbResourceId(uuid);
                 return new TbResourceId(uuid);
-            case FIRMWARE:
-                return new FirmwareId(uuid);
+            case OTA_PACKAGE:
+                return new OtaPackageId(uuid);
             case EDGE:
             case EDGE:
                 return new EdgeId(uuid);
                 return new EdgeId(uuid);
         }
         }

@@ -22,23 +22,23 @@ import org.thingsboard.server.common.data.EntityType;
 
 
 import java.util.UUID;
 import java.util.UUID;
 
 
-public class FirmwareId extends UUIDBased implements EntityId {
+public class OtaPackageId extends UUIDBased implements EntityId {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @JsonCreator
     @JsonCreator
-    public FirmwareId(@JsonProperty("id") UUID id) {
+    public OtaPackageId(@JsonProperty("id") UUID id) {
         super(id);
         super(id);
     }
     }
 
 
-    public static FirmwareId fromString(String firmwareId) {
-        return new FirmwareId(UUID.fromString(firmwareId));
+    public static OtaPackageId fromString(String firmwareId) {
+        return new OtaPackageId(UUID.fromString(firmwareId));
     }
     }
 
 
     @JsonIgnore
     @JsonIgnore
     @Override
     @Override
     public EntityType getEntityType() {
     public EntityType getEntityType() {
-        return EntityType.FIRMWARE;
+        return EntityType.OTA_PACKAGE;
     }
     }
 
 
 }
 }

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.common.data.firmware;
+package org.thingsboard.server.common.data.ota;
 
 
 public enum ChecksumAlgorithm {
 public enum ChecksumAlgorithm {
     MD5,
     MD5,

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.common.data.firmware;
+package org.thingsboard.server.common.data.ota;
 
 
 import lombok.Getter;
 import lombok.Getter;
 
 
-public enum FirmwareKey {
+public enum OtaPackageKey {
 
 
     TITLE("title"), VERSION("version"), TS("ts"), STATE("state"), SIZE("size"), CHECKSUM("checksum"), CHECKSUM_ALGORITHM("checksum_algorithm");
     TITLE("title"), VERSION("version"), TS("ts"), STATE("state"), SIZE("size"), CHECKSUM("checksum"), CHECKSUM_ALGORITHM("checksum_algorithm");
 
 
     @Getter
     @Getter
     private final String value;
     private final String value;
 
 
-    FirmwareKey(String value) {
+    OtaPackageKey(String value) {
         this.value = value;
         this.value = value;
     }
     }
 }
 }

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.common.data.firmware;
+package org.thingsboard.server.common.data.ota;
 
 
 import lombok.Getter;
 import lombok.Getter;
 
 
-public enum FirmwareType {
+public enum OtaPackageType {
 
 
     FIRMWARE("fw"), SOFTWARE("sw");
     FIRMWARE("fw"), SOFTWARE("sw");
 
 
     @Getter
     @Getter
     private final String keyPrefix;
     private final String keyPrefix;
 
 
-    FirmwareType(String keyPrefix) {
+    OtaPackageType(String keyPrefix) {
         this.keyPrefix = keyPrefix;
         this.keyPrefix = keyPrefix;
     }
     }
 }
 }

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.common.data.firmware;
+package org.thingsboard.server.common.data.ota;
 
 
-public enum FirmwareUpdateStatus {
+public enum OtaPackageUpdateStatus {
     QUEUED, INITIATED, DOWNLOADING, DOWNLOADED, VERIFIED, UPDATING, UPDATED, FAILED
     QUEUED, INITIATED, DOWNLOADING, DOWNLOADED, VERIFIED, UPDATING, UPDATED, FAILED
 }
 }

@@ -13,21 +13,19 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.common.data.firmware;
+package org.thingsboard.server.common.data.ota;
 
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.server.common.data.HasFirmware;
-import org.thingsboard.server.common.data.id.FirmwareId;
+import org.thingsboard.server.common.data.HasOtaPackage;
+import org.thingsboard.server.common.data.id.OtaPackageId;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.List;
 import java.util.List;
-
-import static org.thingsboard.server.common.data.firmware.FirmwareType.FIRMWARE;
-import static org.thingsboard.server.common.data.firmware.FirmwareType.SOFTWARE;
+import java.util.function.Supplier;
 
 
 @Slf4j
 @Slf4j
-public class FirmwareUtil {
+public class OtaPackageUtil {
 
 
     public static final List<String> ALL_FW_ATTRIBUTE_KEYS;
     public static final List<String> ALL_FW_ATTRIBUTE_KEYS;
 
 
@@ -35,19 +33,19 @@ public class FirmwareUtil {
 
 
     static {
     static {
         ALL_FW_ATTRIBUTE_KEYS = new ArrayList<>();
         ALL_FW_ATTRIBUTE_KEYS = new ArrayList<>();
-        for (FirmwareKey key : FirmwareKey.values()) {
-            ALL_FW_ATTRIBUTE_KEYS.add(getAttributeKey(FIRMWARE, key));
+        for (OtaPackageKey key : OtaPackageKey.values()) {
+            ALL_FW_ATTRIBUTE_KEYS.add(getAttributeKey(OtaPackageType.FIRMWARE, key));
 
 
         }
         }
 
 
         ALL_SW_ATTRIBUTE_KEYS = new ArrayList<>();
         ALL_SW_ATTRIBUTE_KEYS = new ArrayList<>();
-        for (FirmwareKey key : FirmwareKey.values()) {
-            ALL_SW_ATTRIBUTE_KEYS.add(getAttributeKey(SOFTWARE, key));
+        for (OtaPackageKey key : OtaPackageKey.values()) {
+            ALL_SW_ATTRIBUTE_KEYS.add(getAttributeKey(OtaPackageType.SOFTWARE, key));
 
 
         }
         }
     }
     }
 
 
-    public static List<String> getAttributeKeys(FirmwareType firmwareType) {
+    public static List<String> getAttributeKeys(OtaPackageType firmwareType) {
         switch (firmwareType) {
         switch (firmwareType) {
             case FIRMWARE:
             case FIRMWARE:
                 return ALL_FW_ATTRIBUTE_KEYS;
                 return ALL_FW_ATTRIBUTE_KEYS;
@@ -57,35 +55,46 @@ public class FirmwareUtil {
         return Collections.emptyList();
         return Collections.emptyList();
     }
     }
 
 
-    public static String getAttributeKey(FirmwareType type, FirmwareKey key) {
+    public static String getAttributeKey(OtaPackageType type, OtaPackageKey key) {
         return type.getKeyPrefix() + "_" + key.getValue();
         return type.getKeyPrefix() + "_" + key.getValue();
     }
     }
 
 
-    public static String getTargetTelemetryKey(FirmwareType type, FirmwareKey key) {
+    public static String getTargetTelemetryKey(OtaPackageType type, OtaPackageKey key) {
         return getTelemetryKey("target_", type, key);
         return getTelemetryKey("target_", type, key);
     }
     }
 
 
-    public static String getCurrentTelemetryKey(FirmwareType type, FirmwareKey key) {
+    public static String getCurrentTelemetryKey(OtaPackageType type, OtaPackageKey key) {
         return getTelemetryKey("current_", type, key);
         return getTelemetryKey("current_", type, key);
     }
     }
 
 
-    private static String getTelemetryKey(String prefix, FirmwareType type, FirmwareKey key) {
+    private static String getTelemetryKey(String prefix, OtaPackageType type, OtaPackageKey key) {
         return prefix + type.getKeyPrefix() + "_" + key.getValue();
         return prefix + type.getKeyPrefix() + "_" + key.getValue();
     }
     }
 
 
-    public static String getTelemetryKey(FirmwareType type, FirmwareKey key) {
+    public static String getTelemetryKey(OtaPackageType type, OtaPackageKey key) {
         return type.getKeyPrefix() + "_" + key.getValue();
         return type.getKeyPrefix() + "_" + key.getValue();
     }
     }
 
 
-    public static FirmwareId getFirmwareId(HasFirmware entity, FirmwareType firmwareType) {
-        switch (firmwareType) {
+    public static OtaPackageId getOtaPackageId(HasOtaPackage entity, OtaPackageType type) {
+        switch (type) {
             case FIRMWARE:
             case FIRMWARE:
                 return entity.getFirmwareId();
                 return entity.getFirmwareId();
             case SOFTWARE:
             case SOFTWARE:
                 return entity.getSoftwareId();
                 return entity.getSoftwareId();
             default:
             default:
-                log.warn("Unsupported firmware type: [{}]", firmwareType);
+                log.warn("Unsupported ota package type: [{}]", type);
                 return null;
                 return null;
         }
         }
     }
     }
+
+    public static <T> T getByOtaPackageType(Supplier<T> firmwareSupplier, Supplier<T> softwareSupplier, OtaPackageType type) {
+        switch (type) {
+            case FIRMWARE:
+                return firmwareSupplier.get();
+            case SOFTWARE:
+                return softwareSupplier.get();
+            default:
+                throw new RuntimeException("Unsupported OtaPackage type: " + type);
+        }
+    }
 }
 }

@@ -17,10 +17,11 @@ package org.thingsboard.server.common.data.page;
 
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.thingsboard.server.common.data.BaseData;
 
 
 import java.util.Collections;
 import java.util.Collections;
 import java.util.List;
 import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 
 public class PageData<T> {
 public class PageData<T> {
 
 
@@ -61,4 +62,8 @@ public class PageData<T> {
         return hasNext;
         return hasNext;
     }
     }
 
 
+    public <D> PageData<D> mapData(Function<T, D> mapper) {
+        return new PageData<>(getData().stream().map(mapper).collect(Collectors.toList()), getTotalPages(), getTotalElements(), hasNext());
+    }
+
 }
 }

@@ -53,6 +53,7 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
     private long maxCreatedAlarms;
     private long maxCreatedAlarms;
 
 
     private int defaultStorageTtlDays;
     private int defaultStorageTtlDays;
+    private int alarmsTtlDays;
 
 
     private double warnThreshold;
     private double warnThreshold;
 
 

@@ -38,7 +38,7 @@ public class TbKafkaTopicConfigs {
     private String notificationsProperties;
     private String notificationsProperties;
     @Value("${queue.kafka.topic-properties.js-executor}")
     @Value("${queue.kafka.topic-properties.js-executor}")
     private String jsExecutorProperties;
     private String jsExecutorProperties;
-    @Value("${queue.kafka.topic-properties.fw-updates:}")
+    @Value("${queue.kafka.topic-properties.ota-updates:}")
     private String fwUpdatesProperties;
     private String fwUpdatesProperties;
 
 
     @Getter
     @Getter

@@ -187,14 +187,14 @@ public class AwsSqsMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEng
     }
     }
 
 
     @Override
     @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(transportApiAdmin, sqsSettings, coreSettings.getFirmwareTopic(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToFirmwareStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
+        return new TbAwsSqsConsumerTemplate<>(transportApiAdmin, sqsSettings, coreSettings.getOtaPackageTopic(),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
     }
 
 
     @Override
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, coreSettings.getFirmwareTopic());
+    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, coreSettings.getOtaPackageTopic());
     }
     }
 
 
     @PreDestroy
     @PreDestroy

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToFirmwareStateServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -177,14 +177,14 @@ public class AwsSqsTbCoreQueueFactory implements TbCoreQueueFactory {
     }
     }
 
 
     @Override
     @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgConsumer() {
-        return new TbAwsSqsConsumerTemplate<>(transportApiAdmin, sqsSettings, coreSettings.getFirmwareTopic(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToFirmwareStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
+        return new TbAwsSqsConsumerTemplate<>(transportApiAdmin, sqsSettings, coreSettings.getOtaPackageTopic(),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
     }
 
 
     @Override
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgProducer() {
-        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, coreSettings.getFirmwareTopic());
+    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, coreSettings.getOtaPackageTopic());
     }
     }
 
 
     @PreDestroy
     @PreDestroy

@@ -131,13 +131,13 @@ public class InMemoryMonolithQueueFactory implements TbCoreQueueFactory, TbRuleE
     }
     }
 
 
     @Override
     @Override
-    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgConsumer() {
-        return new InMemoryTbQueueConsumer<>(coreSettings.getFirmwareTopic());
+    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
+        return new InMemoryTbQueueConsumer<>(coreSettings.getOtaPackageTopic());
     }
     }
 
 
     @Override
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgProducer() {
-        return new InMemoryTbQueueProducer<>(coreSettings.getFirmwareTopic());
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+        return new InMemoryTbQueueProducer<>(coreSettings.getOtaPackageTopic());
     }
     }
 
 
     @Override
     @Override

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToFirmwareStateServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -277,24 +277,24 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
     }
     }
 
 
     @Override
     @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgConsumer() {
-        TbKafkaConsumerTemplate.TbKafkaConsumerTemplateBuilder<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> consumerBuilder = TbKafkaConsumerTemplate.builder();
+    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
+        TbKafkaConsumerTemplate.TbKafkaConsumerTemplateBuilder<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> consumerBuilder = TbKafkaConsumerTemplate.builder();
         consumerBuilder.settings(kafkaSettings);
         consumerBuilder.settings(kafkaSettings);
-        consumerBuilder.topic(coreSettings.getFirmwareTopic());
-        consumerBuilder.clientId("monolith-fw-consumer-" + serviceInfoProvider.getServiceId());
-        consumerBuilder.groupId("monolith-fw-consumer");
-        consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToFirmwareStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+        consumerBuilder.topic(coreSettings.getOtaPackageTopic());
+        consumerBuilder.clientId("monolith-ota-consumer-" + serviceInfoProvider.getServiceId());
+        consumerBuilder.groupId("monolith-ota-consumer");
+        consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
         consumerBuilder.admin(fwUpdatesAdmin);
         consumerBuilder.admin(fwUpdatesAdmin);
         consumerBuilder.statsService(consumerStatsService);
         consumerBuilder.statsService(consumerStatsService);
         return consumerBuilder.build();
         return consumerBuilder.build();
     }
     }
 
 
     @Override
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgProducer() {
-        TbKafkaProducerTemplate.TbKafkaProducerTemplateBuilder<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> requestBuilder = TbKafkaProducerTemplate.builder();
+    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+        TbKafkaProducerTemplate.TbKafkaProducerTemplateBuilder<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> requestBuilder = TbKafkaProducerTemplate.builder();
         requestBuilder.settings(kafkaSettings);
         requestBuilder.settings(kafkaSettings);
-        requestBuilder.clientId("monolith-fw-producer-" + serviceInfoProvider.getServiceId());
-        requestBuilder.defaultTopic(coreSettings.getFirmwareTopic());
+        requestBuilder.clientId("monolith-ota-producer-" + serviceInfoProvider.getServiceId());
+        requestBuilder.defaultTopic(coreSettings.getOtaPackageTopic());
         requestBuilder.admin(fwUpdatesAdmin);
         requestBuilder.admin(fwUpdatesAdmin);
         return requestBuilder.build();
         return requestBuilder.build();
     }
     }

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToFirmwareStateServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -245,24 +245,24 @@ public class KafkaTbCoreQueueFactory implements TbCoreQueueFactory {
     }
     }
 
 
     @Override
     @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgConsumer() {
-        TbKafkaConsumerTemplate.TbKafkaConsumerTemplateBuilder<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> consumerBuilder = TbKafkaConsumerTemplate.builder();
+    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
+        TbKafkaConsumerTemplate.TbKafkaConsumerTemplateBuilder<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> consumerBuilder = TbKafkaConsumerTemplate.builder();
         consumerBuilder.settings(kafkaSettings);
         consumerBuilder.settings(kafkaSettings);
-        consumerBuilder.topic(coreSettings.getFirmwareTopic());
-        consumerBuilder.clientId("tb-core-fw-consumer-" + serviceInfoProvider.getServiceId());
-        consumerBuilder.groupId("tb-core-fw-consumer");
-        consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToFirmwareStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+        consumerBuilder.topic(coreSettings.getOtaPackageTopic());
+        consumerBuilder.clientId("tb-core-ota-consumer-" + serviceInfoProvider.getServiceId());
+        consumerBuilder.groupId("tb-core-ota-consumer");
+        consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
         consumerBuilder.admin(fwUpdatesAdmin);
         consumerBuilder.admin(fwUpdatesAdmin);
         consumerBuilder.statsService(consumerStatsService);
         consumerBuilder.statsService(consumerStatsService);
         return consumerBuilder.build();
         return consumerBuilder.build();
     }
     }
 
 
     @Override
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgProducer() {
-        TbKafkaProducerTemplate.TbKafkaProducerTemplateBuilder<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> requestBuilder = TbKafkaProducerTemplate.builder();
+    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+        TbKafkaProducerTemplate.TbKafkaProducerTemplateBuilder<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> requestBuilder = TbKafkaProducerTemplate.builder();
         requestBuilder.settings(kafkaSettings);
         requestBuilder.settings(kafkaSettings);
-        requestBuilder.clientId("tb-core-fw-producer-" + serviceInfoProvider.getServiceId());
-        requestBuilder.defaultTopic(coreSettings.getFirmwareTopic());
+        requestBuilder.clientId("tb-core-ota-producer-" + serviceInfoProvider.getServiceId());
+        requestBuilder.defaultTopic(coreSettings.getOtaPackageTopic());
         requestBuilder.admin(fwUpdatesAdmin);
         requestBuilder.admin(fwUpdatesAdmin);
         return requestBuilder.build();
         return requestBuilder.build();
     }
     }

@@ -22,9 +22,9 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsRequest;
 import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsRequest;
 import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
 import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
-import org.thingsboard.server.gen.transport.TransportProtos.*;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -192,14 +192,14 @@ public class PubSubMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEng
     }
     }
 
 
     @Override
     @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getFirmwareTopic(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToFirmwareStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getOtaPackageTopic(),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
     }
 
 
     @Override
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getFirmwareTopic());
+    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getOtaPackageTopic());
     }
     }
 
 
     @Override
     @Override

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToFirmwareStateServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -166,14 +166,14 @@ public class PubSubTbCoreQueueFactory implements TbCoreQueueFactory {
     }
     }
 
 
     @Override
     @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getFirmwareTopic(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToFirmwareStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getOtaPackageTopic(),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
     }
 
 
     @Override
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getFirmwareTopic());
+    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getOtaPackageTopic());
     }
     }
 
 
     @Override
     @Override

@@ -24,7 +24,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsRequest;
 import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
 import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToFirmwareStateServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -190,14 +190,14 @@ public class RabbitMqMonolithQueueFactory implements TbCoreQueueFactory, TbRuleE
     }
     }
 
 
     @Override
     @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, coreSettings.getFirmwareTopic(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToFirmwareStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
+        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, coreSettings.getOtaPackageTopic(),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
     }
 
 
     @Override
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, coreSettings.getFirmwareTopic());
+    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, coreSettings.getOtaPackageTopic());
     }
     }
 
 
     @Override
     @Override

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToFirmwareStateServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -172,14 +172,14 @@ public class RabbitMqTbCoreQueueFactory implements TbCoreQueueFactory {
     }
     }
 
 
     @Override
     @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgConsumer() {
-        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, coreSettings.getFirmwareTopic(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToFirmwareStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
+        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, coreSettings.getOtaPackageTopic(),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
     }
 
 
     @Override
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgProducer() {
-        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, coreSettings.getFirmwareTopic());
+    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, coreSettings.getOtaPackageTopic());
     }
     }
 
 
     @Override
     @Override

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToFirmwareStateServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -189,14 +189,14 @@ public class ServiceBusMonolithQueueFactory implements TbCoreQueueFactory, TbRul
     }
     }
 
 
     @Override
     @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, coreSettings.getFirmwareTopic(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToFirmwareStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
+        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, coreSettings.getOtaPackageTopic(),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
     }
 
 
     @Override
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, coreSettings.getFirmwareTopic());
+    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, coreSettings.getOtaPackageTopic());
     }
     }
 
 
     @Override
     @Override

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToFirmwareStateServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -172,14 +172,14 @@ public class ServiceBusTbCoreQueueFactory implements TbCoreQueueFactory {
     }
     }
 
 
     @Override
     @Override
-    public TbQueueConsumer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgConsumer() {
-        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, coreSettings.getFirmwareTopic(),
-                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToFirmwareStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
+        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, coreSettings.getOtaPackageTopic(),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
     }
 
 
     @Override
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgProducer() {
-        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, coreSettings.getFirmwareTopic());
+    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, coreSettings.getOtaPackageTopic());
     }
     }
 
 
     @Override
     @Override

@@ -16,7 +16,7 @@
 package org.thingsboard.server.queue.provider;
 package org.thingsboard.server.queue.provider;
 
 
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
-import org.thingsboard.server.gen.transport.TransportProtos.ToFirmwareStateServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
@@ -91,14 +91,14 @@ public interface TbCoreQueueFactory extends TbUsageStatsClientQueueFactory {
      *
      *
      * @return
      * @return
      */
      */
-    TbQueueConsumer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgConsumer();
+    TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer();
 
 
     /**
     /**
      * Used to consume messages about firmware update notifications by TB Core Service
      * Used to consume messages about firmware update notifications by TB Core Service
      *
      *
      * @return
      * @return
      */
      */
-    TbQueueProducer<TbProtoQueueMsg<ToFirmwareStateServiceMsg>> createToFirmwareStateServiceMsgProducer();
+    TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer();
 
 
     /**
     /**
      * Used to consume high priority messages by TB Core Service
      * Used to consume high priority messages by TB Core Service

@@ -15,7 +15,6 @@
  */
  */
 package org.thingsboard.server.queue.provider;
 package org.thingsboard.server.queue.provider;
 
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
@@ -25,11 +24,12 @@ import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
 import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PostConstruct;
 
 
 @Service
 @Service
-@ConditionalOnExpression("'${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core'")
+@TbCoreComponent
 public class TbCoreQueueProducerProvider implements TbQueueProducerProvider {
 public class TbCoreQueueProducerProvider implements TbQueueProducerProvider {
 
 
     private final TbCoreQueueFactory tbQueueProvider;
     private final TbCoreQueueFactory tbQueueProvider;

@@ -26,8 +26,8 @@ public class TbQueueCoreSettings {
     @Value("${queue.core.topic}")
     @Value("${queue.core.topic}")
     private String topic;
     private String topic;
 
 
-    @Value("${queue.core.firmware.topic:tb_firmware}")
-    private String firmwareTopic;
+    @Value("${queue.core.ota.topic:tb_ota_package}")
+    private String otaPackageTopic;
 
 
     @Value("${queue.core.usage-stats-topic:tb_usage_stats}")
     @Value("${queue.core.usage-stats-topic:tb_usage_stats}")
     private String usageStatsTopic;
     private String usageStatsTopic;

@@ -137,6 +137,7 @@ message GetAttributeRequestMsg {
   int32 requestId = 1;
   int32 requestId = 1;
   repeated string clientAttributeNames = 2;
   repeated string clientAttributeNames = 2;
   repeated string sharedAttributeNames = 3;
   repeated string sharedAttributeNames = 3;
+  bool onlyShared = 4;
 }
 }
 
 
 message GetAttributeResponseMsg {
 message GetAttributeResponseMsg {
@@ -144,6 +145,7 @@ message GetAttributeResponseMsg {
   repeated TsKvProto clientAttributeList = 2;
   repeated TsKvProto clientAttributeList = 2;
   repeated TsKvProto sharedAttributeList = 3;
   repeated TsKvProto sharedAttributeList = 3;
   string error = 5;
   string error = 5;
+  bool sharedStateMsg = 6;
 }
 }
 
 
 message AttributeUpdateNotificationMsg {
 message AttributeUpdateNotificationMsg {
@@ -386,7 +388,7 @@ enum ResponseStatus {
   FAILURE = 3;
   FAILURE = 3;
 }
 }
 
 
-message GetFirmwareRequestMsg {
+message GetOtaPackageRequestMsg {
   int64 deviceIdMSB = 1;
   int64 deviceIdMSB = 1;
   int64 deviceIdLSB = 2;
   int64 deviceIdLSB = 2;
   int64 tenantIdMSB = 3;
   int64 tenantIdMSB = 3;
@@ -394,10 +396,10 @@ message GetFirmwareRequestMsg {
   string type = 5;
   string type = 5;
 }
 }
 
 
-message GetFirmwareResponseMsg {
+message GetOtaPackageResponseMsg {
   ResponseStatus responseStatus = 1;
   ResponseStatus responseStatus = 1;
-  int64 firmwareIdMSB = 2;
-  int64 firmwareIdLSB = 3;
+  int64 otaPackageIdMSB = 2;
+  int64 otaPackageIdLSB = 3;
   string type = 4;
   string type = 4;
   string title = 5;
   string title = 5;
   string version = 6;
   string version = 6;
@@ -625,7 +627,7 @@ message TransportApiRequestMsg {
   ProvisionDeviceRequestMsg provisionDeviceRequestMsg = 7;
   ProvisionDeviceRequestMsg provisionDeviceRequestMsg = 7;
   ValidateDeviceLwM2MCredentialsRequestMsg validateDeviceLwM2MCredentialsRequestMsg = 8;
   ValidateDeviceLwM2MCredentialsRequestMsg validateDeviceLwM2MCredentialsRequestMsg = 8;
   GetResourceRequestMsg resourceRequestMsg = 9;
   GetResourceRequestMsg resourceRequestMsg = 9;
-  GetFirmwareRequestMsg firmwareRequestMsg = 10;
+  GetOtaPackageRequestMsg otaPackageRequestMsg = 10;
   GetSnmpDevicesRequestMsg snmpDevicesRequestMsg = 11;
   GetSnmpDevicesRequestMsg snmpDevicesRequestMsg = 11;
   GetDeviceRequestMsg deviceRequestMsg = 12;
   GetDeviceRequestMsg deviceRequestMsg = 12;
   GetDeviceCredentialsRequestMsg deviceCredentialsRequestMsg = 13;
   GetDeviceCredentialsRequestMsg deviceCredentialsRequestMsg = 13;
@@ -640,7 +642,7 @@ message TransportApiResponseMsg {
   GetSnmpDevicesResponseMsg snmpDevicesResponseMsg = 5;
   GetSnmpDevicesResponseMsg snmpDevicesResponseMsg = 5;
   LwM2MResponseMsg lwM2MResponseMsg = 6;
   LwM2MResponseMsg lwM2MResponseMsg = 6;
   GetResourceResponseMsg resourceResponseMsg = 7;
   GetResourceResponseMsg resourceResponseMsg = 7;
-  GetFirmwareResponseMsg firmwareResponseMsg = 8;
+  GetOtaPackageResponseMsg otaPackageResponseMsg = 8;
   GetDeviceResponseMsg deviceResponseMsg = 9;
   GetDeviceResponseMsg deviceResponseMsg = 9;
   GetDeviceCredentialsResponseMsg deviceCredentialsResponseMsg = 10;
   GetDeviceCredentialsResponseMsg deviceCredentialsResponseMsg = 10;
 }
 }
@@ -708,13 +710,13 @@ message ToUsageStatsServiceMsg {
   int64 customerIdLSB = 7;
   int64 customerIdLSB = 7;
 }
 }
 
 
-message ToFirmwareStateServiceMsg {
+message ToOtaPackageStateServiceMsg {
   int64 ts = 1;
   int64 ts = 1;
   int64 tenantIdMSB = 2;
   int64 tenantIdMSB = 2;
   int64 tenantIdLSB = 3;
   int64 tenantIdLSB = 3;
   int64 deviceIdMSB = 4;
   int64 deviceIdMSB = 4;
   int64 deviceIdLSB = 5;
   int64 deviceIdLSB = 5;
-  int64 firmwareIdMSB = 6;
-  int64 firmwareIdLSB = 7;
+  int64 otaPackageIdMSB = 6;
+  int64 otaPackageIdLSB = 7;
   string type = 8;
   string type = 8;
 }
 }

@@ -18,6 +18,7 @@ package org.thingsboard.server.transport.coap;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.californium.core.CoapResource;
 import org.eclipse.californium.core.CoapResource;
 import org.eclipse.californium.core.coap.CoAP;
 import org.eclipse.californium.core.coap.CoAP;
+import org.eclipse.californium.core.coap.Response;
 import org.eclipse.californium.core.server.resources.CoapExchange;
 import org.eclipse.californium.core.server.resources.CoapExchange;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.transport.TransportContext;
 import org.thingsboard.server.common.transport.TransportContext;
@@ -56,7 +57,7 @@ public abstract class AbstractCoapTransportResource extends CoapResource {
 
 
     protected abstract void processHandlePost(CoapExchange exchange);
     protected abstract void processHandlePost(CoapExchange exchange);
 
 
-    protected void reportActivity(TransportProtos.SessionInfoProto sessionInfo, boolean hasAttributeSubscription, boolean hasRpcSubscription) {
+    protected void reportSubscriptionInfo(TransportProtos.SessionInfoProto sessionInfo, boolean hasAttributeSubscription, boolean hasRpcSubscription) {
         transportContext.getTransportService().process(sessionInfo, TransportProtos.SubscriptionInfoProto.newBuilder()
         transportContext.getTransportService().process(sessionInfo, TransportProtos.SubscriptionInfoProto.newBuilder()
                 .setAttributeSubscription(hasAttributeSubscription)
                 .setAttributeSubscription(hasAttributeSubscription)
                 .setRpcSubscription(hasRpcSubscription)
                 .setRpcSubscription(hasRpcSubscription)
@@ -64,6 +65,10 @@ public abstract class AbstractCoapTransportResource extends CoapResource {
                 .build(), TransportServiceCallback.EMPTY);
                 .build(), TransportServiceCallback.EMPTY);
     }
     }
 
 
+    protected void reportActivity(TransportProtos.SessionInfoProto sessionInfo) {
+        transportService.reportActivity(sessionInfo);
+    }
+
     protected static TransportProtos.SessionEventMsg getSessionEventMsg(TransportProtos.SessionEvent event) {
     protected static TransportProtos.SessionEventMsg getSessionEventMsg(TransportProtos.SessionEvent event) {
         return TransportProtos.SessionEventMsg.newBuilder()
         return TransportProtos.SessionEventMsg.newBuilder()
                 .setSessionType(TransportProtos.SessionType.ASYNC)
                 .setSessionType(TransportProtos.SessionType.ASYNC)
@@ -112,13 +117,19 @@ public abstract class AbstractCoapTransportResource extends CoapResource {
 
 
         @Override
         @Override
         public void onSuccess(Void msg) {
         public void onSuccess(Void msg) {
-            exchange.respond(onSuccessResponse);
+            Response response = new Response(onSuccessResponse);
+            response.setAcknowledged(isConRequest());
+            exchange.respond(response);
         }
         }
 
 
         @Override
         @Override
         public void onError(Throwable e) {
         public void onError(Throwable e) {
             exchange.respond(onFailureResponse);
             exchange.respond(onFailureResponse);
         }
         }
+
+        private boolean isConRequest() {
+            return exchange.advanced().getRequest().isConfirmable();
+        }
     }
     }
 
 
     public static class CoapNoOpCallback implements TransportServiceCallback<Void> {
     public static class CoapNoOpCallback implements TransportServiceCallback<Void> {

@@ -18,6 +18,7 @@ package org.thingsboard.server.transport.coap;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.transport.TransportContext;
 import org.thingsboard.server.common.transport.TransportContext;
@@ -35,6 +36,10 @@ import org.thingsboard.server.transport.coap.efento.adaptor.EfentoCoapAdaptor;
 public class CoapTransportContext extends TransportContext {
 public class CoapTransportContext extends TransportContext {
 
 
     @Getter
     @Getter
+    @Value("${transport.sessions.report_timeout}")
+    private long sessionReportTimeout;
+
+    @Getter
     @Autowired
     @Autowired
     private JsonCoapAdaptor jsonCoapAdaptor;
     private JsonCoapAdaptor jsonCoapAdaptor;
 
 

@@ -28,6 +28,7 @@ import org.eclipse.californium.core.observe.ObserveRelation;
 import org.eclipse.californium.core.server.resources.CoapExchange;
 import org.eclipse.californium.core.server.resources.CoapExchange;
 import org.eclipse.californium.core.server.resources.Resource;
 import org.eclipse.californium.core.server.resources.Resource;
 import org.eclipse.californium.core.server.resources.ResourceObserver;
 import org.eclipse.californium.core.server.resources.ResourceObserver;
+import org.springframework.util.CollectionUtils;
 import org.thingsboard.server.coapserver.CoapServerService;
 import org.thingsboard.server.coapserver.CoapServerService;
 import org.thingsboard.server.coapserver.TbCoapDtlsSessionInfo;
 import org.thingsboard.server.coapserver.TbCoapDtlsSessionInfo;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
@@ -43,7 +44,7 @@ import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportC
 import org.thingsboard.server.common.data.device.profile.JsonTransportPayloadConfiguration;
 import org.thingsboard.server.common.data.device.profile.JsonTransportPayloadConfiguration;
 import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
 import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
 import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
 import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
-import org.thingsboard.server.common.data.firmware.FirmwareType;
+import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.security.DeviceTokenCredentials;
 import org.thingsboard.server.common.data.security.DeviceTokenCredentials;
 import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.common.msg.session.SessionMsgType;
 import org.thingsboard.server.common.msg.session.SessionMsgType;
@@ -55,11 +56,14 @@ import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.transport.coap.adaptors.CoapTransportAdaptor;
 import org.thingsboard.server.transport.coap.adaptors.CoapTransportAdaptor;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Optional;
+import java.util.Random;
 import java.util.Set;
 import java.util.Set;
 import java.util.UUID;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
 @Slf4j
 @Slf4j
@@ -72,25 +76,30 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
     private static final int REQUEST_ID_POSITION_CERTIFICATE_REQUEST = 4;
     private static final int REQUEST_ID_POSITION_CERTIFICATE_REQUEST = 4;
     private static final String DTLS_SESSION_ID_KEY = "DTLS_SESSION_ID";
     private static final String DTLS_SESSION_ID_KEY = "DTLS_SESSION_ID";
 
 
-    private final ConcurrentMap<String, TransportProtos.SessionInfoProto> tokenToSessionIdMap = new ConcurrentHashMap<>();
-    private final ConcurrentMap<String, AtomicInteger> tokenToNotificationCounterMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<String, TransportProtos.SessionInfoProto> tokenToSessionInfoMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<String, AtomicInteger> tokenToObserveNotificationSeqMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<TransportProtos.SessionInfoProto, ObserveRelation> sessionInfoToObserveRelationMap = new ConcurrentHashMap<>();
     private final Set<UUID> rpcSubscriptions = ConcurrentHashMap.newKeySet();
     private final Set<UUID> rpcSubscriptions = ConcurrentHashMap.newKeySet();
     private final Set<UUID> attributeSubscriptions = ConcurrentHashMap.newKeySet();
     private final Set<UUID> attributeSubscriptions = ConcurrentHashMap.newKeySet();
 
 
     private ConcurrentMap<String, TbCoapDtlsSessionInfo> dtlsSessionIdMap;
     private ConcurrentMap<String, TbCoapDtlsSessionInfo> dtlsSessionIdMap;
     private long timeout;
     private long timeout;
+    private long sessionReportTimeout;
 
 
-    public CoapTransportResource(CoapTransportContext coapTransportContext, CoapServerService coapServerService, String name) {
-        super(coapTransportContext, name);
+    public CoapTransportResource(CoapTransportContext ctx, CoapServerService coapServerService, String name) {
+        super(ctx, name);
         this.setObservable(true); // enable observing
         this.setObservable(true); // enable observing
         this.addObserver(new CoapResourceObserver());
         this.addObserver(new CoapResourceObserver());
         this.dtlsSessionIdMap = coapServerService.getDtlsSessionsMap();
         this.dtlsSessionIdMap = coapServerService.getDtlsSessionsMap();
         this.timeout = coapServerService.getTimeout();
         this.timeout = coapServerService.getTimeout();
-//        this.setObservable(false); // disable observing
-//        this.setObserveType(CoAP.Type.CON); // configure the notification type to CONs
-//        this.getAttributes().setObservable(); // mark observable in the Link-Format
+        this.sessionReportTimeout = ctx.getSessionReportTimeout();
+        ctx.getScheduler().scheduleAtFixedRate(() -> {
+            Set<TransportProtos.SessionInfoProto> observeSessions = sessionInfoToObserveRelationMap.keySet();
+            observeSessions.forEach(this::reportActivity);
+        }, new Random().nextInt((int) sessionReportTimeout), sessionReportTimeout, TimeUnit.MILLISECONDS);
     }
     }
 
 
+    @Override
     public void checkObserveRelation(Exchange exchange, Response response) {
     public void checkObserveRelation(Exchange exchange, Response response) {
         String token = getTokenFromRequest(exchange.getRequest());
         String token = getTokenFromRequest(exchange.getRequest());
         final ObserveRelation relation = exchange.getRelation();
         final ObserveRelation relation = exchange.getRelation();
@@ -103,11 +112,20 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
                 relation.setEstablished();
                 relation.setEstablished();
                 addObserveRelation(relation);
                 addObserveRelation(relation);
             }
             }
-            AtomicInteger notificationCounter = tokenToNotificationCounterMap.computeIfAbsent(token, s -> new AtomicInteger(0));
+            AtomicInteger notificationCounter = tokenToObserveNotificationSeqMap.computeIfAbsent(token, s -> new AtomicInteger(0));
             response.getOptions().setObserve(notificationCounter.getAndIncrement());
             response.getOptions().setObserve(notificationCounter.getAndIncrement());
         } // ObserveLayer takes care of the else case
         } // ObserveLayer takes care of the else case
     }
     }
 
 
+    public void clearAndNotifyObserveRelation(ObserveRelation relation, CoAP.ResponseCode code) {
+        relation.cancel();
+        relation.getExchange().sendResponse(new Response(code));
+    }
+
+    public Map<TransportProtos.SessionInfoProto, ObserveRelation> getSessionInfoToObserveRelationMap() {
+        return sessionInfoToObserveRelationMap;
+    }
+
     @Override
     @Override
     protected void processHandleGet(CoapExchange exchange) {
     protected void processHandleGet(CoapExchange exchange) {
         Optional<FeatureType> featureType = getFeatureType(exchange.advanced().getRequest());
         Optional<FeatureType> featureType = getFeatureType(exchange.advanced().getRequest());
@@ -239,7 +257,7 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
     }
     }
 
 
     private void processRequest(CoapExchange exchange, SessionMsgType type, Request request, TransportProtos.SessionInfoProto sessionInfo, DeviceProfile deviceProfile) {
     private void processRequest(CoapExchange exchange, SessionMsgType type, Request request, TransportProtos.SessionInfoProto sessionInfo, DeviceProfile deviceProfile) {
-        UUID sessionId = new UUID(sessionInfo.getSessionIdMSB(), sessionInfo.getSessionIdLSB());
+        UUID sessionId = toSessionId(sessionInfo);
         try {
         try {
             TransportConfigurationContainer transportConfigurationContainer = getTransportConfigurationContainer(deviceProfile);
             TransportConfigurationContainer transportConfigurationContainer = getTransportConfigurationContainer(deviceProfile);
             CoapTransportAdaptor coapTransportAdaptor = getCoapTransportAdaptor(transportConfigurationContainer.isJsonPayload());
             CoapTransportAdaptor coapTransportAdaptor = getCoapTransportAdaptor(transportConfigurationContainer.isJsonPayload());
@@ -249,14 +267,14 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
                             coapTransportAdaptor.convertToPostAttributes(sessionId, request,
                             coapTransportAdaptor.convertToPostAttributes(sessionId, request,
                                     transportConfigurationContainer.getAttributesMsgDescriptor()),
                                     transportConfigurationContainer.getAttributesMsgDescriptor()),
                             new CoapOkCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
                             new CoapOkCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
-                    reportActivity(sessionInfo, attributeSubscriptions.contains(sessionId), rpcSubscriptions.contains(sessionId));
+                    reportSubscriptionInfo(sessionInfo, attributeSubscriptions.contains(sessionId), rpcSubscriptions.contains(sessionId));
                     break;
                     break;
                 case POST_TELEMETRY_REQUEST:
                 case POST_TELEMETRY_REQUEST:
                     transportService.process(sessionInfo,
                     transportService.process(sessionInfo,
                             coapTransportAdaptor.convertToPostTelemetry(sessionId, request,
                             coapTransportAdaptor.convertToPostTelemetry(sessionId, request,
                                     transportConfigurationContainer.getTelemetryMsgDescriptor()),
                                     transportConfigurationContainer.getTelemetryMsgDescriptor()),
                             new CoapOkCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
                             new CoapOkCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
-                    reportActivity(sessionInfo, attributeSubscriptions.contains(sessionId), rpcSubscriptions.contains(sessionId));
+                    reportSubscriptionInfo(sessionInfo, attributeSubscriptions.contains(sessionId), rpcSubscriptions.contains(sessionId));
                     break;
                     break;
                 case CLAIM_REQUEST:
                 case CLAIM_REQUEST:
                     transportService.process(sessionInfo,
                     transportService.process(sessionInfo,
@@ -264,49 +282,52 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
                             new CoapOkCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
                             new CoapOkCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
                     break;
                     break;
                 case SUBSCRIBE_ATTRIBUTES_REQUEST:
                 case SUBSCRIBE_ATTRIBUTES_REQUEST:
-                    TransportProtos.SessionInfoProto currentAttrSession = tokenToSessionIdMap.get(getTokenFromRequest(request));
+                    TransportProtos.SessionInfoProto currentAttrSession = tokenToSessionInfoMap.get(getTokenFromRequest(request));
                     if (currentAttrSession == null) {
                     if (currentAttrSession == null) {
                         attributeSubscriptions.add(sessionId);
                         attributeSubscriptions.add(sessionId);
                         registerAsyncCoapSession(exchange, sessionInfo, coapTransportAdaptor,
                         registerAsyncCoapSession(exchange, sessionInfo, coapTransportAdaptor,
                                 transportConfigurationContainer.getRpcRequestDynamicMessageBuilder(), getTokenFromRequest(request));
                                 transportConfigurationContainer.getRpcRequestDynamicMessageBuilder(), getTokenFromRequest(request));
                         transportService.process(sessionInfo,
                         transportService.process(sessionInfo,
                                 TransportProtos.SubscribeToAttributeUpdatesMsg.getDefaultInstance(), new CoapNoOpCallback(exchange));
                                 TransportProtos.SubscribeToAttributeUpdatesMsg.getDefaultInstance(), new CoapNoOpCallback(exchange));
+                        transportService.process(sessionInfo,
+                                TransportProtos.GetAttributeRequestMsg.newBuilder().setOnlyShared(true).build(),
+                                new CoapNoOpCallback(exchange));
                     }
                     }
                     break;
                     break;
                 case UNSUBSCRIBE_ATTRIBUTES_REQUEST:
                 case UNSUBSCRIBE_ATTRIBUTES_REQUEST:
                     TransportProtos.SessionInfoProto attrSession = lookupAsyncSessionInfo(getTokenFromRequest(request));
                     TransportProtos.SessionInfoProto attrSession = lookupAsyncSessionInfo(getTokenFromRequest(request));
                     if (attrSession != null) {
                     if (attrSession != null) {
-                        UUID attrSessionId = new UUID(attrSession.getSessionIdMSB(), attrSession.getSessionIdLSB());
+                        UUID attrSessionId = toSessionId(attrSession);
                         attributeSubscriptions.remove(attrSessionId);
                         attributeSubscriptions.remove(attrSessionId);
+                        sessionInfoToObserveRelationMap.remove(attrSession);
                         transportService.process(attrSession,
                         transportService.process(attrSession,
                                 TransportProtos.SubscribeToAttributeUpdatesMsg.newBuilder().setUnsubscribe(true).build(),
                                 TransportProtos.SubscribeToAttributeUpdatesMsg.newBuilder().setUnsubscribe(true).build(),
                                 new CoapOkCallback(exchange, CoAP.ResponseCode.DELETED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
                                 new CoapOkCallback(exchange, CoAP.ResponseCode.DELETED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
-                        closeAndDeregister(sessionInfo, sessionId);
+                        closeAndDeregister(sessionInfo);
                     }
                     }
                     break;
                     break;
                 case SUBSCRIBE_RPC_COMMANDS_REQUEST:
                 case SUBSCRIBE_RPC_COMMANDS_REQUEST:
-                    TransportProtos.SessionInfoProto currentRpcSession = tokenToSessionIdMap.get(getTokenFromRequest(request));
+                    TransportProtos.SessionInfoProto currentRpcSession = tokenToSessionInfoMap.get(getTokenFromRequest(request));
                     if (currentRpcSession == null) {
                     if (currentRpcSession == null) {
                         rpcSubscriptions.add(sessionId);
                         rpcSubscriptions.add(sessionId);
                         registerAsyncCoapSession(exchange, sessionInfo, coapTransportAdaptor,
                         registerAsyncCoapSession(exchange, sessionInfo, coapTransportAdaptor,
                                 transportConfigurationContainer.getRpcRequestDynamicMessageBuilder(), getTokenFromRequest(request));
                                 transportConfigurationContainer.getRpcRequestDynamicMessageBuilder(), getTokenFromRequest(request));
                         transportService.process(sessionInfo,
                         transportService.process(sessionInfo,
                                 TransportProtos.SubscribeToRPCMsg.getDefaultInstance(),
                                 TransportProtos.SubscribeToRPCMsg.getDefaultInstance(),
-                                new CoapNoOpCallback(exchange));
-                    } else {
-                        UUID rpcSessionId = new UUID(currentRpcSession.getSessionIdMSB(), currentRpcSession.getSessionIdLSB());
-                        reportActivity(currentRpcSession, attributeSubscriptions.contains(rpcSessionId), rpcSubscriptions.contains(rpcSessionId));
+                                new CoapOkCallback(exchange, CoAP.ResponseCode.VALID, CoAP.ResponseCode.INTERNAL_SERVER_ERROR)
+                        );
                     }
                     }
                     break;
                     break;
                 case UNSUBSCRIBE_RPC_COMMANDS_REQUEST:
                 case UNSUBSCRIBE_RPC_COMMANDS_REQUEST:
                     TransportProtos.SessionInfoProto rpcSession = lookupAsyncSessionInfo(getTokenFromRequest(request));
                     TransportProtos.SessionInfoProto rpcSession = lookupAsyncSessionInfo(getTokenFromRequest(request));
                     if (rpcSession != null) {
                     if (rpcSession != null) {
-                        UUID rpcSessionId = new UUID(rpcSession.getSessionIdMSB(), rpcSession.getSessionIdLSB());
+                        UUID rpcSessionId = toSessionId(rpcSession);
                         rpcSubscriptions.remove(rpcSessionId);
                         rpcSubscriptions.remove(rpcSessionId);
+                        sessionInfoToObserveRelationMap.remove(rpcSession);
                         transportService.process(rpcSession,
                         transportService.process(rpcSession,
                                 TransportProtos.SubscribeToRPCMsg.newBuilder().setUnsubscribe(true).build(),
                                 TransportProtos.SubscribeToRPCMsg.newBuilder().setUnsubscribe(true).build(),
                                 new CoapOkCallback(exchange, CoAP.ResponseCode.DELETED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
                                 new CoapOkCallback(exchange, CoAP.ResponseCode.DELETED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
-                        closeAndDeregister(sessionInfo, sessionId);
+                        closeAndDeregister(sessionInfo);
                     }
                     }
                     break;
                     break;
                 case TO_DEVICE_RPC_RESPONSE:
                 case TO_DEVICE_RPC_RESPONSE:
@@ -329,10 +350,10 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
                             new CoapNoOpCallback(exchange));
                             new CoapNoOpCallback(exchange));
                     break;
                     break;
                 case GET_FIRMWARE_REQUEST:
                 case GET_FIRMWARE_REQUEST:
-                    getFirmwareCallback(sessionInfo, exchange, FirmwareType.FIRMWARE);
+                    getOtaPackageCallback(sessionInfo, exchange, OtaPackageType.FIRMWARE);
                     break;
                     break;
                 case GET_SOFTWARE_REQUEST:
                 case GET_SOFTWARE_REQUEST:
-                    getFirmwareCallback(sessionInfo, exchange, FirmwareType.SOFTWARE);
+                    getOtaPackageCallback(sessionInfo, exchange, OtaPackageType.SOFTWARE);
                     break;
                     break;
             }
             }
         } catch (AdaptorException e) {
         } catch (AdaptorException e) {
@@ -341,29 +362,33 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         }
         }
     }
     }
 
 
-    private void getFirmwareCallback(TransportProtos.SessionInfoProto sessionInfo, CoapExchange exchange, FirmwareType firmwareType) {
-        TransportProtos.GetFirmwareRequestMsg requestMsg = TransportProtos.GetFirmwareRequestMsg.newBuilder()
+    private UUID toSessionId(TransportProtos.SessionInfoProto sessionInfoProto) {
+        return new UUID(sessionInfoProto.getSessionIdMSB(), sessionInfoProto.getSessionIdLSB());
+    }
+
+    private void getOtaPackageCallback(TransportProtos.SessionInfoProto sessionInfo, CoapExchange exchange, OtaPackageType firmwareType) {
+        TransportProtos.GetOtaPackageRequestMsg requestMsg = TransportProtos.GetOtaPackageRequestMsg.newBuilder()
                 .setTenantIdMSB(sessionInfo.getTenantIdMSB())
                 .setTenantIdMSB(sessionInfo.getTenantIdMSB())
                 .setTenantIdLSB(sessionInfo.getTenantIdLSB())
                 .setTenantIdLSB(sessionInfo.getTenantIdLSB())
                 .setDeviceIdMSB(sessionInfo.getDeviceIdMSB())
                 .setDeviceIdMSB(sessionInfo.getDeviceIdMSB())
                 .setDeviceIdLSB(sessionInfo.getDeviceIdLSB())
                 .setDeviceIdLSB(sessionInfo.getDeviceIdLSB())
                 .setType(firmwareType.name()).build();
                 .setType(firmwareType.name()).build();
-        transportContext.getTransportService().process(sessionInfo, requestMsg, new FirmwareCallback(exchange));
+        transportContext.getTransportService().process(sessionInfo, requestMsg, new OtaPackageCallback(exchange));
     }
     }
 
 
     private TransportProtos.SessionInfoProto lookupAsyncSessionInfo(String token) {
     private TransportProtos.SessionInfoProto lookupAsyncSessionInfo(String token) {
-        tokenToNotificationCounterMap.remove(token);
-        return tokenToSessionIdMap.remove(token);
+        tokenToObserveNotificationSeqMap.remove(token);
+        return tokenToSessionInfoMap.remove(token);
     }
     }
 
 
     private void registerAsyncCoapSession(CoapExchange exchange, TransportProtos.SessionInfoProto sessionInfo, CoapTransportAdaptor coapTransportAdaptor, DynamicMessage.Builder rpcRequestDynamicMessageBuilder, String token) {
     private void registerAsyncCoapSession(CoapExchange exchange, TransportProtos.SessionInfoProto sessionInfo, CoapTransportAdaptor coapTransportAdaptor, DynamicMessage.Builder rpcRequestDynamicMessageBuilder, String token) {
-        tokenToSessionIdMap.putIfAbsent(token, sessionInfo);
+        tokenToSessionInfoMap.putIfAbsent(token, sessionInfo);
         transportService.registerAsyncSession(sessionInfo, getCoapSessionListener(exchange, coapTransportAdaptor, rpcRequestDynamicMessageBuilder));
         transportService.registerAsyncSession(sessionInfo, getCoapSessionListener(exchange, coapTransportAdaptor, rpcRequestDynamicMessageBuilder));
         transportService.process(sessionInfo, getSessionEventMsg(TransportProtos.SessionEvent.OPEN), null);
         transportService.process(sessionInfo, getSessionEventMsg(TransportProtos.SessionEvent.OPEN), null);
     }
     }
 
 
     private CoapSessionListener getCoapSessionListener(CoapExchange exchange, CoapTransportAdaptor coapTransportAdaptor, DynamicMessage.Builder rpcRequestDynamicMessageBuilder) {
     private CoapSessionListener getCoapSessionListener(CoapExchange exchange, CoapTransportAdaptor coapTransportAdaptor, DynamicMessage.Builder rpcRequestDynamicMessageBuilder) {
-        return new CoapSessionListener(exchange, coapTransportAdaptor, rpcRequestDynamicMessageBuilder);
+        return new CoapSessionListener(this, exchange, coapTransportAdaptor, rpcRequestDynamicMessageBuilder);
     }
     }
 
 
     private String getTokenFromRequest(Request request) {
     private String getTokenFromRequest(Request request) {
@@ -445,25 +470,25 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         }
         }
     }
     }
 
 
-    private class FirmwareCallback implements TransportServiceCallback<TransportProtos.GetFirmwareResponseMsg> {
+    private class OtaPackageCallback implements TransportServiceCallback<TransportProtos.GetOtaPackageResponseMsg> {
         private final CoapExchange exchange;
         private final CoapExchange exchange;
 
 
-        FirmwareCallback(CoapExchange exchange) {
+        OtaPackageCallback(CoapExchange exchange) {
             this.exchange = exchange;
             this.exchange = exchange;
         }
         }
 
 
         @Override
         @Override
-        public void onSuccess(TransportProtos.GetFirmwareResponseMsg msg) {
+        public void onSuccess(TransportProtos.GetOtaPackageResponseMsg msg) {
             String title = exchange.getQueryParameter("title");
             String title = exchange.getQueryParameter("title");
             String version = exchange.getQueryParameter("version");
             String version = exchange.getQueryParameter("version");
             if (msg.getResponseStatus().equals(TransportProtos.ResponseStatus.SUCCESS)) {
             if (msg.getResponseStatus().equals(TransportProtos.ResponseStatus.SUCCESS)) {
                 if (msg.getTitle().equals(title) && msg.getVersion().equals(version)) {
                 if (msg.getTitle().equals(title) && msg.getVersion().equals(version)) {
-                    String firmwareId = new UUID(msg.getFirmwareIdMSB(), msg.getFirmwareIdLSB()).toString();
+                    String firmwareId = new UUID(msg.getOtaPackageIdMSB(), msg.getOtaPackageIdLSB()).toString();
                     String strChunkSize = exchange.getQueryParameter("size");
                     String strChunkSize = exchange.getQueryParameter("size");
                     String strChunk = exchange.getQueryParameter("chunk");
                     String strChunk = exchange.getQueryParameter("chunk");
                     int chunkSize = StringUtils.isEmpty(strChunkSize) ? 0 : Integer.parseInt(strChunkSize);
                     int chunkSize = StringUtils.isEmpty(strChunkSize) ? 0 : Integer.parseInt(strChunkSize);
                     int chunk = StringUtils.isEmpty(strChunk) ? 0 : Integer.parseInt(strChunk);
                     int chunk = StringUtils.isEmpty(strChunk) ? 0 : Integer.parseInt(strChunk);
-                    exchange.respond(CoAP.ResponseCode.CONTENT, transportContext.getFirmwareDataCache().get(firmwareId, chunkSize, chunk));
+                    exchange.respond(CoAP.ResponseCode.CONTENT, transportContext.getOtaPackageDataCache().get(firmwareId, chunkSize, chunk));
                 } else {
                 } else {
                     exchange.respond(CoAP.ResponseCode.BAD_REQUEST);
                     exchange.respond(CoAP.ResponseCode.BAD_REQUEST);
                 }
                 }
@@ -481,11 +506,13 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
 
 
     private static class CoapSessionListener implements SessionMsgListener {
     private static class CoapSessionListener implements SessionMsgListener {
 
 
+        private final CoapTransportResource coapTransportResource;
         private final CoapExchange exchange;
         private final CoapExchange exchange;
         private final CoapTransportAdaptor coapTransportAdaptor;
         private final CoapTransportAdaptor coapTransportAdaptor;
         private final DynamicMessage.Builder rpcRequestDynamicMessageBuilder;
         private final DynamicMessage.Builder rpcRequestDynamicMessageBuilder;
 
 
-        CoapSessionListener(CoapExchange exchange, CoapTransportAdaptor coapTransportAdaptor, DynamicMessage.Builder rpcRequestDynamicMessageBuilder) {
+        CoapSessionListener(CoapTransportResource coapTransportResource, CoapExchange exchange, CoapTransportAdaptor coapTransportAdaptor, DynamicMessage.Builder rpcRequestDynamicMessageBuilder) {
+            this.coapTransportResource = coapTransportResource;
             this.exchange = exchange;
             this.exchange = exchange;
             this.coapTransportAdaptor = coapTransportAdaptor;
             this.coapTransportAdaptor = coapTransportAdaptor;
             this.rpcRequestDynamicMessageBuilder = rpcRequestDynamicMessageBuilder;
             this.rpcRequestDynamicMessageBuilder = rpcRequestDynamicMessageBuilder;
@@ -494,7 +521,7 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         @Override
         @Override
         public void onGetAttributesResponse(TransportProtos.GetAttributeResponseMsg msg) {
         public void onGetAttributesResponse(TransportProtos.GetAttributeResponseMsg msg) {
             try {
             try {
-                exchange.respond(coapTransportAdaptor.convertToPublish(msg));
+                exchange.respond(coapTransportAdaptor.convertToPublish(isConRequest(), msg));
             } catch (AdaptorException e) {
             } catch (AdaptorException e) {
                 log.trace("Failed to reply due to error", e);
                 log.trace("Failed to reply due to error", e);
                 exchange.respond(CoAP.ResponseCode.INTERNAL_SERVER_ERROR);
                 exchange.respond(CoAP.ResponseCode.INTERNAL_SERVER_ERROR);
@@ -512,8 +539,21 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         }
         }
 
 
         @Override
         @Override
-        public void onRemoteSessionCloseCommand(TransportProtos.SessionCloseNotificationProto sessionCloseNotification) {
-            exchange.respond(CoAP.ResponseCode.SERVICE_UNAVAILABLE);
+        public void onRemoteSessionCloseCommand(UUID sessionId, TransportProtos.SessionCloseNotificationProto sessionCloseNotification) {
+            log.trace("[{}] Received the remote command to close the session: {}", sessionId, sessionCloseNotification.getMessage());
+            Map<TransportProtos.SessionInfoProto, ObserveRelation> sessionToObserveRelationMap = coapTransportResource.getSessionInfoToObserveRelationMap();
+            if (coapTransportResource.getObserverCount() > 0 && !CollectionUtils.isEmpty(sessionToObserveRelationMap)) {
+                Set<TransportProtos.SessionInfoProto> observeSessions = sessionToObserveRelationMap.keySet();
+                Optional<TransportProtos.SessionInfoProto> observeSessionToClose = observeSessions.stream().filter(sessionInfoProto -> {
+                    UUID observeSessionId = new UUID(sessionInfoProto.getSessionIdMSB(), sessionInfoProto.getSessionIdLSB());
+                    return observeSessionId.equals(sessionId);
+                }).findFirst();
+                if (observeSessionToClose.isPresent()) {
+                    TransportProtos.SessionInfoProto sessionInfoProto = observeSessionToClose.get();
+                    ObserveRelation observeRelation = sessionToObserveRelationMap.get(sessionInfoProto);
+                    coapTransportResource.clearAndNotifyObserveRelation(observeRelation, CoAP.ResponseCode.SERVICE_UNAVAILABLE);
+                }
+            }
         }
         }
 
 
         @Override
         @Override
@@ -529,7 +569,7 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         @Override
         @Override
         public void onToServerRpcResponse(TransportProtos.ToServerRpcResponseMsg msg) {
         public void onToServerRpcResponse(TransportProtos.ToServerRpcResponseMsg msg) {
             try {
             try {
-                exchange.respond(coapTransportAdaptor.convertToPublish(msg));
+                exchange.respond(coapTransportAdaptor.convertToPublish(isConRequest(), msg));
             } catch (AdaptorException e) {
             } catch (AdaptorException e) {
                 log.trace("Failed to reply due to error", e);
                 log.trace("Failed to reply due to error", e);
                 exchange.respond(CoAP.ResponseCode.INTERNAL_SERVER_ERROR);
                 exchange.respond(CoAP.ResponseCode.INTERNAL_SERVER_ERROR);
@@ -561,29 +601,29 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
 
 
         @Override
         @Override
         public void addedObserveRelation(ObserveRelation relation) {
         public void addedObserveRelation(ObserveRelation relation) {
-            if (log.isTraceEnabled()) {
-                Request request = relation.getExchange().getRequest();
-                log.trace("Added Observe relation for token: {}", getTokenFromRequest(request));
-            }
+            Request request = relation.getExchange().getRequest();
+            String token = getTokenFromRequest(request);
+            sessionInfoToObserveRelationMap.putIfAbsent(tokenToSessionInfoMap.get(token), relation);
+            log.trace("Added Observe relation for token: {}", token);
         }
         }
 
 
         @Override
         @Override
         public void removedObserveRelation(ObserveRelation relation) {
         public void removedObserveRelation(ObserveRelation relation) {
             Request request = relation.getExchange().getRequest();
             Request request = relation.getExchange().getRequest();
-            String tokenFromRequest = getTokenFromRequest(request);
-            log.trace("Relation removed for token: {}", tokenFromRequest);
-            TransportProtos.SessionInfoProto sessionInfoToRemove = lookupAsyncSessionInfo(tokenFromRequest);
-            if (sessionInfoToRemove != null) {
-                closeAndDeregister(sessionInfoToRemove, new UUID(sessionInfoToRemove.getSessionIdMSB(), sessionInfoToRemove.getDeviceIdLSB()));
-            }
+            String token = getTokenFromRequest(request);
+            TransportProtos.SessionInfoProto session = tokenToSessionInfoMap.get(token);
+            sessionInfoToObserveRelationMap.remove(session);
+            log.trace("Relation removed for token: {}", token);
         }
         }
     }
     }
 
 
-    private void closeAndDeregister(TransportProtos.SessionInfoProto session, UUID sessionId) {
+    private void closeAndDeregister(TransportProtos.SessionInfoProto session) {
+        UUID sessionId = toSessionId(session);
         transportService.process(session, getSessionEventMsg(TransportProtos.SessionEvent.CLOSED), null);
         transportService.process(session, getSessionEventMsg(TransportProtos.SessionEvent.CLOSED), null);
         transportService.deregisterSession(session);
         transportService.deregisterSession(session);
         rpcSubscriptions.remove(sessionId);
         rpcSubscriptions.remove(sessionId);
         attributeSubscriptions.remove(sessionId);
         attributeSubscriptions.remove(sessionId);
+        sessionInfoToObserveRelationMap.remove(session);
     }
     }
 
 
     private TransportConfigurationContainer getTransportConfigurationContainer(DeviceProfile deviceProfile) throws AdaptorException {
     private TransportConfigurationContainer getTransportConfigurationContainer(DeviceProfile deviceProfile) throws AdaptorException {

@@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.eclipse.californium.core.CoapResource;
 import org.eclipse.californium.core.CoapResource;
 import org.eclipse.californium.core.CoapServer;
 import org.eclipse.californium.core.CoapServer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.TbTransportService;
 import org.thingsboard.server.common.data.TbTransportService;
 import org.thingsboard.server.coapserver.CoapServerService;
 import org.thingsboard.server.coapserver.CoapServerService;

@@ -40,6 +40,7 @@ public class CoapAdaptorUtils {
                 result.addAllSharedAttributeNames(sharedKeys);
                 result.addAllSharedAttributeNames(sharedKeys);
             }
             }
         }
         }
+        result.setOnlyShared(false);
         return result.build();
         return result.build();
     }
     }
 
 

@@ -39,13 +39,13 @@ public interface CoapTransportAdaptor {
 
 
     TransportProtos.ClaimDeviceMsg convertToClaimDevice(UUID sessionId, Request inbound, TransportProtos.SessionInfoProto sessionInfo) throws AdaptorException;
     TransportProtos.ClaimDeviceMsg convertToClaimDevice(UUID sessionId, Request inbound, TransportProtos.SessionInfoProto sessionInfo) throws AdaptorException;
 
 
-    Response convertToPublish(TransportProtos.GetAttributeResponseMsg responseMsg) throws AdaptorException;
+    Response convertToPublish(boolean isConfirmable, TransportProtos.GetAttributeResponseMsg responseMsg) throws AdaptorException;
 
 
     Response convertToPublish(boolean isConfirmable, TransportProtos.AttributeUpdateNotificationMsg notificationMsg) throws AdaptorException;
     Response convertToPublish(boolean isConfirmable, TransportProtos.AttributeUpdateNotificationMsg notificationMsg) throws AdaptorException;
 
 
     Response convertToPublish(boolean isConfirmable, TransportProtos.ToDeviceRpcRequestMsg rpcRequest, DynamicMessage.Builder rpcRequestDynamicMessageBuilder) throws AdaptorException;
     Response convertToPublish(boolean isConfirmable, TransportProtos.ToDeviceRpcRequestMsg rpcRequest, DynamicMessage.Builder rpcRequestDynamicMessageBuilder) throws AdaptorException;
 
 
-    Response convertToPublish(TransportProtos.ToServerRpcResponseMsg msg) throws AdaptorException;
+    Response convertToPublish(boolean isConfirmable, TransportProtos.ToServerRpcResponseMsg msg) throws AdaptorException;
 
 
     ProvisionDeviceRequestMsg convertToProvisionRequestMsg(UUID sessionId, Request inbound) throws AdaptorException;
     ProvisionDeviceRequestMsg convertToProvisionRequestMsg(UUID sessionId, Request inbound) throws AdaptorException;
 
 

@@ -26,12 +26,14 @@ import org.eclipse.californium.core.coap.CoAP;
 import org.eclipse.californium.core.coap.Request;
 import org.eclipse.californium.core.coap.Request;
 import org.eclipse.californium.core.coap.Response;
 import org.eclipse.californium.core.coap.Response;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.transport.coap.CoapTransportResource;
 import org.thingsboard.server.transport.coap.CoapTransportResource;
 
 
+import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.UUID;
 
 
@@ -101,10 +103,11 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor {
     }
     }
 
 
     @Override
     @Override
-    public Response convertToPublish(TransportProtos.ToServerRpcResponseMsg msg) throws AdaptorException {
+    public Response convertToPublish(boolean isConfirmable, TransportProtos.ToServerRpcResponseMsg msg) throws AdaptorException {
         Response response = new Response(CoAP.ResponseCode.CONTENT);
         Response response = new Response(CoAP.ResponseCode.CONTENT);
         JsonElement result = JsonConverter.toJson(msg);
         JsonElement result = JsonConverter.toJson(msg);
         response.setPayload(result.toString());
         response.setPayload(result.toString());
+        response.setAcknowledged(isConfirmable);
         return response;
         return response;
     }
     }
 
 
@@ -119,21 +122,35 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor {
     }
     }
 
 
     @Override
     @Override
-    public Response convertToPublish(TransportProtos.GetAttributeResponseMsg msg) throws AdaptorException {
-        if (msg.getClientAttributeListCount() == 0 && msg.getSharedAttributeListCount() == 0) {
-            return new Response(CoAP.ResponseCode.NOT_FOUND);
+    public Response convertToPublish(boolean isConfirmable, TransportProtos.GetAttributeResponseMsg msg) throws AdaptorException {
+        if (msg.getSharedStateMsg()) {
+            if (StringUtils.isEmpty(msg.getError())) {
+                Response response = new Response(CoAP.ResponseCode._UNKNOWN_SUCCESS_CODE);
+                response.setAcknowledged(isConfirmable);
+                TransportProtos.AttributeUpdateNotificationMsg notificationMsg = TransportProtos.AttributeUpdateNotificationMsg.newBuilder().addAllSharedUpdated(msg.getSharedAttributeListList()).build();
+                JsonObject result = JsonConverter.toJson(notificationMsg);
+                response.setPayload(result.toString());
+                return response;
+            } else {
+                return new Response(CoAP.ResponseCode.INTERNAL_SERVER_ERROR);
+            }
         } else {
         } else {
-            Response response = new Response(CoAP.ResponseCode.CONTENT);
-            JsonObject result = JsonConverter.toJson(msg);
-            response.setPayload(result.toString());
-            return response;
+            if (msg.getClientAttributeListCount() == 0 && msg.getSharedAttributeListCount() == 0) {
+                return new Response(CoAP.ResponseCode.NOT_FOUND);
+            } else {
+                Response response = new Response(CoAP.ResponseCode.CONTENT);
+                response.setAcknowledged(isConfirmable);
+                JsonObject result = JsonConverter.toJson(msg);
+                response.setPayload(result.toString());
+                return response;
+            }
         }
         }
     }
     }
 
 
     private Response getObserveNotification(boolean confirmable, JsonElement json) {
     private Response getObserveNotification(boolean confirmable, JsonElement json) {
-        Response response = new Response(CoAP.ResponseCode.CONTENT);
+        Response response = new Response(CoAP.ResponseCode._UNKNOWN_SUCCESS_CODE);
         response.setPayload(json.toString());
         response.setPayload(json.toString());
-        response.setConfirmable(confirmable);
+        response.setAcknowledged(confirmable);
         return response;
         return response;
     }
     }