diff --git a/application/src/main/data/json/system/widget_bundles/charts.json b/application/src/main/data/json/system/widget_bundles/charts.json
index b7b1d643e3..01e575ea9b 100644
--- a/application/src/main/data/json/system/widget_bundles/charts.json
+++ b/application/src/main/data/json/system/widget_bundles/charts.json
@@ -15,18 +15,20 @@
     "state_chart",
     "bar_chart_with_labels",
     "range_chart",
+    "cards.aggregated_value_card",
+    "bars",
+    "pie",
+    "doughnut",
+    "horizontal_doughnut",
+    "polar_area",
+    "charts.radar_chart_js",
     "charts.basic_timeseries",
     "charts.state_chart",
     "charts.timeseries_bars_flot",
-    "cards.aggregated_value_card",
     "charts.bars",
-    "pie",
     "charts.pie",
     "charts.pie_chart_js",
-    "doughnut",
-    "horizontal_doughnut",
-    "charts.polar_area_chart_js",
-    "charts.radar_chart_js",
-    "charts.doughnut_chart_js"
+    "charts.doughnut_chart_js",
+    "charts.polar_area_chart_js"
   ]
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/bars.json b/application/src/main/data/json/system/widget_types/bars.json
index b3c991f968..69c9ae208a 100644
--- a/application/src/main/data/json/system/widget_types/bars.json
+++ b/application/src/main/data/json/system/widget_types/bars.json
@@ -1,28 +1,26 @@
 {
-  "fqn": "charts.bars",
+  "fqn": "bars",
   "name": "Bars",
   "deprecated": false,
-  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAA8FBMVEUhlvNMr1Bqamp5eXl7e3t8fHx9fX1+fn5/f3+AgICCgoKDg4OEhISGhoaHh4eKioqMjIyNjY2Ojo6QkJCRkZGSkpKWlpaXl5ebm5udnZ2enp6goKChoaGkpKSnp6epqamsrKyurq6xsbGzs7O1tbW2tra3t7e4uLi7u7u9vb3BwcHCwsLDw8PGxsbKysrNzc3Ozs7R0dHS0tLT09PZ2dna2trc3Nzd3d3e3t7g4ODh4eHj4+Pk5OTm5ubn5+fo6Ojp6enu7u7w8PDz8/P0Qzb09PT29vb39/f5+fn6+vr7+/v8/Pz9/f3+/v7/wQf///+dc+aLAAAAAWJLR0RPbmZBSQAAAcFJREFUeNrt3ds2AgEYhuHsaSOZbAvZi0r2YYjCJOW7/7txZhkcDNbM6h/vdwfPmlX/ybtmEorJErGCeJLadz3rkKPpZamaLTp925DHdFvSpKelU9uQ/cLKhtcdk7YqtiHruevtojch7ZZtQ0o1dcdfRqXNqm1IbVU3OaVamm/YhvQW5zIXOknnC5JUt7qEpE5fUv/5HVePy2UHAgQIECBAgAABAgQIECBxgrwGHBAgQIAAAQIECBAgQIAAAQIECJC/QRIBN0iQ+66voDMLuRp2fQWdVUhvNun6CjqrkJ0Dx/UVdEYhzXzfcX0FnVFIrlSZ2mx/LOiMQuqHh6k972NBZ/fv13G/KeiCQkIu4358EL8UdBafSGwuOxAgQIAAAQIECJDYQB4CDggQIECAAAECBAgQIECAAAECBAgQIECA/BrSufn0DjqjkEZmLXkWaUEXEmThXMeFSAu68H4j5b1IC7rQILfZTqQFXViQ1nRTL1EWdCFBnmYuJUVZ0IUEWR1xHKcXZUEXFDLwBR2XHQgQIECAAAEC5H9ChgIOCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgxiBmv+L6Bl9pkxYph15gAAAAAElFTkSuQmCC",
-  "description": "Displays latest values of the attributes or time-series data for multiple entities as separate bars.",
+  "image": "tb-image:YmFycy5zdmc=:IkJhcnMiIHN5c3RlbSB3aWRnZXQgaW1hZ2U=;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_4624_38022)">
<path d="M2.84766 1.28125V7H2.125V2.18359L0.667969 2.71484V2.0625L2.73438 1.28125H2.84766ZM8.67517 3.70312V4.57031C8.67517 5.03646 8.63351 5.42969 8.55017 5.75C8.46684 6.07031 8.34705 6.32812 8.1908 6.52344C8.03455 6.71875 7.84575 6.86068 7.62439 6.94922C7.40564 7.03516 7.15825 7.07812 6.8822 7.07812C6.66345 7.07812 6.46163 7.05078 6.27673 6.99609C6.09184 6.94141 5.92517 6.85417 5.77673 6.73438C5.6309 6.61198 5.5059 6.45312 5.40173 6.25781C5.29757 6.0625 5.21814 5.82552 5.16345 5.54688C5.10877 5.26823 5.08142 4.94271 5.08142 4.57031V3.70312C5.08142 3.23698 5.12309 2.84635 5.20642 2.53125C5.29236 2.21615 5.41345 1.96354 5.5697 1.77344C5.72595 1.58073 5.91345 1.44271 6.1322 1.35938C6.35356 1.27604 6.60095 1.23438 6.87439 1.23438C7.09575 1.23438 7.29887 1.26172 7.48377 1.31641C7.67127 1.36849 7.83793 1.45312 7.98377 1.57031C8.1296 1.6849 8.2533 1.83854 8.35486 2.03125C8.45903 2.22135 8.53845 2.45443 8.59314 2.73047C8.64783 3.00651 8.67517 3.33073 8.67517 3.70312ZM7.94861 4.6875V3.58203C7.94861 3.32682 7.93298 3.10286 7.90173 2.91016C7.87309 2.71484 7.83012 2.54818 7.77283 2.41016C7.71554 2.27214 7.64262 2.16016 7.55408 2.07422C7.46814 1.98828 7.36788 1.92578 7.2533 1.88672C7.14132 1.84505 7.01502 1.82422 6.87439 1.82422C6.70252 1.82422 6.55017 1.85677 6.41736 1.92188C6.28455 1.98438 6.17257 2.08464 6.08142 2.22266C5.99288 2.36068 5.92517 2.54167 5.8783 2.76562C5.83142 2.98958 5.80798 3.26172 5.80798 3.58203V4.6875C5.80798 4.94271 5.82231 5.16797 5.85095 5.36328C5.8822 5.55859 5.92778 5.72786 5.98767 5.87109C6.04757 6.01172 6.12048 6.1276 6.20642 6.21875C6.29236 6.3099 6.39132 6.3776 6.5033 6.42188C6.61788 6.46354 6.74418 6.48438 6.8822 6.48438C7.05929 6.48438 7.21423 6.45052 7.34705 6.38281C7.47986 6.3151 7.59054 6.20964 7.67908 6.06641C7.77022 5.92057 7.83793 5.73438 7.8822 5.50781C7.92647 5.27865 7.94861 5.00521 7.94861 4.6875ZM13.3074 3.70312V4.57031C13.3074 5.03646 13.2657 5.42969 13.1824 5.75C13.099 6.07031 12.9793 6.32812 12.823 6.52344C12.6668 6.71875 12.4779 6.86068 12.2566 6.94922C12.0378 7.03516 11.7904 7.07812 11.5144 7.07812C11.2957 7.07812 11.0938 7.05078 10.9089 6.99609C10.724 6.94141 10.5574 6.85417 10.4089 6.73438C10.2631 6.61198 10.1381 6.45312 10.0339 6.25781C9.92977 6.0625 9.85034 5.82552 9.79566 5.54688C9.74097 5.26823 9.71363 4.94271 9.71363 4.57031V3.70312C9.71363 3.23698 9.75529 2.84635 9.83863 2.53125C9.92456 2.21615 10.0457 1.96354 10.2019 1.77344C10.3582 1.58073 10.5457 1.44271 10.7644 1.35938C10.9858 1.27604 11.2332 1.23438 11.5066 1.23438C11.7279 1.23438 11.9311 1.26172 12.116 1.31641C12.3035 1.36849 12.4701 1.45312 12.616 1.57031C12.7618 1.6849 12.8855 1.83854 12.9871 2.03125C13.0912 2.22135 13.1707 2.45443 13.2253 2.73047C13.28 3.00651 13.3074 3.33073 13.3074 3.70312ZM12.5808 4.6875V3.58203C12.5808 3.32682 12.5652 3.10286 12.5339 2.91016C12.5053 2.71484 12.4623 2.54818 12.405 2.41016C12.3477 2.27214 12.2748 2.16016 12.1863 2.07422C12.1003 1.98828 12.0001 1.92578 11.8855 1.88672C11.7735 1.84505 11.6472 1.82422 11.5066 1.82422C11.3347 1.82422 11.1824 1.85677 11.0496 1.92188C10.9168 1.98438 10.8048 2.08464 10.7136 2.22266C10.6251 2.36068 10.5574 2.54167 10.5105 2.76562C10.4636 2.98958 10.4402 3.26172 10.4402 3.58203V4.6875C10.4402 4.94271 10.4545 5.16797 10.4832 5.36328C10.5144 5.55859 10.56 5.72786 10.6199 5.87109C10.6798 6.01172 10.7527 6.1276 10.8386 6.21875C10.9246 6.3099 11.0235 6.3776 11.1355 6.42188C11.2501 6.46354 11.3764 6.48438 11.5144 6.48438C11.6915 6.48438 11.8464 6.45052 11.9793 6.38281C12.1121 6.3151 12.2227 6.20964 12.3113 6.06641C12.4024 5.92057 12.4701 5.73438 12.5144 5.50781C12.5587 5.27865 12.5808 5.00521 12.5808 4.6875Z" fill="black" fill-opacity="0.76"/>
<path d="M8.05859 33.6677C8.05859 34.0141 7.97786 34.3083 7.81641 34.5505C7.65755 34.7901 7.44141 34.9724 7.16797 35.0974C6.89714 35.2224 6.59115 35.2849 6.25 35.2849C5.90885 35.2849 5.60156 35.2224 5.32812 35.0974C5.05469 34.9724 4.83854 34.7901 4.67969 34.5505C4.52083 34.3083 4.44141 34.0141 4.44141 33.6677C4.44141 33.4412 4.48438 33.2341 4.57031 33.0466C4.65885 32.8565 4.78255 32.6912 4.94141 32.5505C5.10286 32.4099 5.29297 32.3018 5.51172 32.2263C5.73307 32.1482 5.97656 32.1091 6.24219 32.1091C6.59115 32.1091 6.90234 32.1768 7.17578 32.3123C7.44922 32.4451 7.66406 32.6287 7.82031 32.863C7.97917 33.0974 8.05859 33.3656 8.05859 33.6677ZM7.33203 33.6521C7.33203 33.4412 7.28646 33.255 7.19531 33.0935C7.10417 32.9294 6.97656 32.8018 6.8125 32.7107C6.64844 32.6195 6.45833 32.574 6.24219 32.574C6.02083 32.574 5.82943 32.6195 5.66797 32.7107C5.50911 32.8018 5.38542 32.9294 5.29688 33.0935C5.20833 33.255 5.16406 33.4412 5.16406 33.6521C5.16406 33.8708 5.20703 34.0583 5.29297 34.2146C5.38151 34.3682 5.50651 34.4867 5.66797 34.5701C5.83203 34.6508 6.02604 34.6912 6.25 34.6912C6.47396 34.6912 6.66667 34.6508 6.82812 34.5701C6.98958 34.4867 7.11328 34.3682 7.19922 34.2146C7.28776 34.0583 7.33203 33.8708 7.33203 33.6521ZM7.92578 30.9998C7.92578 31.2758 7.85286 31.5245 7.70703 31.7458C7.5612 31.9672 7.36198 32.1417 7.10938 32.2693C6.85677 32.3969 6.57031 32.4607 6.25 32.4607C5.92448 32.4607 5.63411 32.3969 5.37891 32.2693C5.1263 32.1417 4.92839 31.9672 4.78516 31.7458C4.64193 31.5245 4.57031 31.2758 4.57031 30.9998C4.57031 30.669 4.64193 30.3878 4.78516 30.156C4.93099 29.9242 5.13021 29.7472 5.38281 29.6248C5.63542 29.5024 5.92318 29.4412 6.24609 29.4412C6.57161 29.4412 6.86068 29.5024 7.11328 29.6248C7.36589 29.7472 7.5638 29.9242 7.70703 30.156C7.85286 30.3878 7.92578 30.669 7.92578 30.9998ZM7.20312 31.0115C7.20312 30.8214 7.16276 30.6534 7.08203 30.5076C7.0013 30.3617 6.88932 30.2472 6.74609 30.1638C6.60286 30.0779 6.4362 30.0349 6.24609 30.0349C6.05599 30.0349 5.88932 30.0753 5.74609 30.156C5.60547 30.2341 5.49479 30.3461 5.41406 30.4919C5.33594 30.6378 5.29688 30.811 5.29688 31.0115C5.29688 31.2068 5.33594 31.3774 5.41406 31.5232C5.49479 31.669 5.60677 31.7823 5.75 31.863C5.89323 31.9438 6.0599 31.9841 6.25 31.9841C6.4401 31.9841 6.60547 31.9438 6.74609 31.863C6.88932 31.7823 7.0013 31.669 7.08203 31.5232C7.16276 31.3774 7.20312 31.2068 7.20312 31.0115ZM12.6752 31.9099V32.7771C12.6752 33.2432 12.6335 33.6365 12.5502 33.9568C12.4668 34.2771 12.347 34.5349 12.1908 34.7302C12.0345 34.9255 11.8457 35.0675 11.6244 35.156C11.4056 35.2419 11.1582 35.2849 10.8822 35.2849C10.6635 35.2849 10.4616 35.2576 10.2767 35.2029C10.0918 35.1482 9.92517 35.061 9.77673 34.9412C9.6309 34.8188 9.5059 34.6599 9.40173 34.4646C9.29757 34.2693 9.21814 34.0323 9.16345 33.7537C9.10877 33.475 9.08142 33.1495 9.08142 32.7771V31.9099C9.08142 31.4438 9.12309 31.0531 9.20642 30.738C9.29236 30.4229 9.41345 30.1703 9.5697 29.9802C9.72595 29.7875 9.91345 29.6495 10.1322 29.5662C10.3536 29.4828 10.601 29.4412 10.8744 29.4412C11.0957 29.4412 11.2989 29.4685 11.4838 29.5232C11.6713 29.5753 11.8379 29.6599 11.9838 29.7771C12.1296 29.8917 12.2533 30.0453 12.3549 30.238C12.459 30.4281 12.5385 30.6612 12.5931 30.9373C12.6478 31.2133 12.6752 31.5375 12.6752 31.9099ZM11.9486 32.8943V31.7888C11.9486 31.5336 11.933 31.3097 11.9017 31.1169C11.8731 30.9216 11.8301 30.755 11.7728 30.6169C11.7155 30.4789 11.6426 30.3669 11.5541 30.281C11.4681 30.1951 11.3679 30.1326 11.2533 30.0935C11.1413 30.0518 11.015 30.031 10.8744 30.031C10.7025 30.031 10.5502 30.0636 10.4174 30.1287C10.2845 30.1912 10.1726 30.2914 10.0814 30.4294C9.99288 30.5675 9.92517 30.7485 9.8783 30.9724C9.83142 31.1964 9.80798 31.4685 9.80798 31.7888V32.8943C9.80798 33.1495 9.82231 33.3748 9.85095 33.5701C9.8822 33.7654 9.92778 33.9347 9.98767 34.0779C10.0476 34.2185 10.1205 34.3344 10.2064 34.4255C10.2924 34.5167 10.3913 34.5844 10.5033 34.6287C10.6179 34.6703 10.7442 34.6912 10.8822 34.6912C11.0593 34.6912 11.2142 34.6573 11.347 34.5896C11.4799 34.5219 11.5905 34.4164 11.6791 34.2732C11.7702 34.1274 11.8379 33.9412 11.8822 33.7146C11.9265 33.4854 11.9486 33.212 11.9486 32.8943Z" fill="black" fill-opacity="0.76"/>
<path d="M7.24609 57.7183H7.30859V58.3315H7.24609C6.86328 58.3315 6.54297 58.394 6.28516 58.519C6.02734 58.6414 5.82292 58.8068 5.67188 59.0151C5.52083 59.2209 5.41146 59.4526 5.34375 59.7104C5.27865 59.9683 5.24609 60.23 5.24609 60.4956V61.3315C5.24609 61.5841 5.27604 61.8081 5.33594 62.0034C5.39583 62.1961 5.47786 62.3589 5.58203 62.4917C5.6862 62.6245 5.80339 62.7248 5.93359 62.7925C6.06641 62.8602 6.20443 62.894 6.34766 62.894C6.51432 62.894 6.66276 62.8628 6.79297 62.8003C6.92318 62.7352 7.03255 62.6453 7.12109 62.5308C7.21224 62.4136 7.28125 62.2756 7.32812 62.1167C7.375 61.9578 7.39844 61.7834 7.39844 61.5933C7.39844 61.424 7.3776 61.2612 7.33594 61.105C7.29427 60.9461 7.23047 60.8055 7.14453 60.6831C7.05859 60.5581 6.95052 60.4604 6.82031 60.3901C6.69271 60.3172 6.54036 60.2808 6.36328 60.2808C6.16276 60.2808 5.97526 60.3302 5.80078 60.4292C5.62891 60.5256 5.48698 60.6532 5.375 60.812C5.26562 60.9683 5.20312 61.1388 5.1875 61.3237L4.80469 61.3198C4.84115 61.0282 4.90885 60.7795 5.00781 60.5737C5.10938 60.3654 5.23438 60.1961 5.38281 60.0659C5.53385 59.9331 5.70182 59.8368 5.88672 59.7769C6.07422 59.7144 6.27214 59.6831 6.48047 59.6831C6.76432 59.6831 7.00911 59.7365 7.21484 59.8433C7.42057 59.95 7.58984 60.0933 7.72266 60.2729C7.85547 60.45 7.95312 60.6506 8.01562 60.8745C8.08073 61.0959 8.11328 61.3237 8.11328 61.5581C8.11328 61.8263 8.07552 62.0776 8 62.312C7.92448 62.5464 7.8112 62.7521 7.66016 62.9292C7.51172 63.1063 7.32812 63.2443 7.10938 63.3433C6.89062 63.4422 6.63672 63.4917 6.34766 63.4917C6.04036 63.4917 5.77214 63.4292 5.54297 63.3042C5.3138 63.1766 5.1237 63.0073 4.97266 62.7964C4.82161 62.5854 4.70833 62.3511 4.63281 62.0933C4.55729 61.8354 4.51953 61.5737 4.51953 61.3081V60.9683C4.51953 60.5672 4.5599 60.174 4.64062 59.7886C4.72135 59.4032 4.86068 59.0542 5.05859 58.7417C5.25911 58.4292 5.53646 58.1805 5.89062 57.9956C6.24479 57.8107 6.69661 57.7183 7.24609 57.7183ZM12.6752 60.1167V60.9839C12.6752 61.45 12.6335 61.8433 12.5502 62.1636C12.4668 62.4839 12.347 62.7417 12.1908 62.937C12.0345 63.1323 11.8457 63.2743 11.6244 63.3628C11.4056 63.4487 11.1582 63.4917 10.8822 63.4917C10.6635 63.4917 10.4616 63.4644 10.2767 63.4097C10.0918 63.355 9.92517 63.2677 9.77673 63.1479C9.6309 63.0256 9.5059 62.8667 9.40173 62.6714C9.29757 62.4761 9.21814 62.2391 9.16345 61.9604C9.10877 61.6818 9.08142 61.3563 9.08142 60.9839V60.1167C9.08142 59.6506 9.12309 59.2599 9.20642 58.9448C9.29236 58.6297 9.41345 58.3771 9.5697 58.187C9.72595 57.9943 9.91345 57.8563 10.1322 57.7729C10.3536 57.6896 10.601 57.6479 10.8744 57.6479C11.0957 57.6479 11.2989 57.6753 11.4838 57.73C11.6713 57.7821 11.8379 57.8667 11.9838 57.9839C12.1296 58.0985 12.2533 58.2521 12.3549 58.4448C12.459 58.6349 12.5385 58.868 12.5931 59.144C12.6478 59.4201 12.6752 59.7443 12.6752 60.1167ZM11.9486 61.1011V59.9956C11.9486 59.7404 11.933 59.5164 11.9017 59.3237C11.8731 59.1284 11.8301 58.9618 11.7728 58.8237C11.7155 58.6857 11.6426 58.5737 11.5541 58.4878C11.4681 58.4019 11.3679 58.3394 11.2533 58.3003C11.1413 58.2586 11.015 58.2378 10.8744 58.2378C10.7025 58.2378 10.5502 58.2703 10.4174 58.3354C10.2845 58.3979 10.1726 58.4982 10.0814 58.6362C9.99288 58.7743 9.92517 58.9552 9.8783 59.1792C9.83142 59.4032 9.80798 59.6753 9.80798 59.9956V61.1011C9.80798 61.3563 9.82231 61.5815 9.85095 61.7769C9.8822 61.9722 9.92778 62.1414 9.98767 62.2847C10.0476 62.4253 10.1205 62.5412 10.2064 62.6323C10.2924 62.7235 10.3913 62.7912 10.5033 62.8354C10.6179 62.8771 10.7442 62.8979 10.8822 62.8979C11.0593 62.8979 11.2142 62.8641 11.347 62.7964C11.4799 62.7287 11.5905 62.6232 11.6791 62.48C11.7702 62.3341 11.8379 62.1479 11.8822 61.9214C11.9265 61.6922 11.9486 61.4188 11.9486 61.1011Z" fill="black" fill-opacity="0.76"/>
<path d="M8.31641 89.7063V90.3H4.20703V89.8743L6.75391 85.9329H7.34375L6.71094 87.0735L5.02734 89.7063H8.31641ZM7.52344 85.9329V91.6204H6.80078V85.9329H7.52344ZM12.6752 88.3235V89.1907C12.6752 89.6568 12.6335 90.05 12.5502 90.3704C12.4668 90.6907 12.347 90.9485 12.1908 91.1438C12.0345 91.3391 11.8457 91.481 11.6244 91.5696C11.4056 91.6555 11.1582 91.6985 10.8822 91.6985C10.6635 91.6985 10.4616 91.6711 10.2767 91.6165C10.0918 91.5618 9.92517 91.4745 9.77673 91.3547C9.6309 91.2323 9.5059 91.0735 9.40173 90.8782C9.29757 90.6829 9.21814 90.4459 9.16345 90.1672C9.10877 89.8886 9.08142 89.5631 9.08142 89.1907V88.3235C9.08142 87.8573 9.12309 87.4667 9.20642 87.1516C9.29236 86.8365 9.41345 86.5839 9.5697 86.3938C9.72595 86.2011 9.91345 86.0631 10.1322 85.9797C10.3536 85.8964 10.601 85.8547 10.8744 85.8547C11.0957 85.8547 11.2989 85.8821 11.4838 85.9368C11.6713 85.9889 11.8379 86.0735 11.9838 86.1907C12.1296 86.3053 12.2533 86.4589 12.3549 86.6516C12.459 86.8417 12.5385 87.0748 12.5931 87.3508C12.6478 87.6269 12.6752 87.9511 12.6752 88.3235ZM11.9486 89.3079V88.2024C11.9486 87.9472 11.933 87.7232 11.9017 87.5305C11.8731 87.3352 11.8301 87.1685 11.7728 87.0305C11.7155 86.8925 11.6426 86.7805 11.5541 86.6946C11.4681 86.6086 11.3679 86.5461 11.2533 86.5071C11.1413 86.4654 11.015 86.4446 10.8744 86.4446C10.7025 86.4446 10.5502 86.4771 10.4174 86.5422C10.2845 86.6047 10.1726 86.705 10.0814 86.843C9.99288 86.981 9.92517 87.162 9.8783 87.386C9.83142 87.6099 9.80798 87.8821 9.80798 88.2024V89.3079C9.80798 89.5631 9.82231 89.7883 9.85095 89.9836C9.8822 90.179 9.92778 90.3482 9.98767 90.4915C10.0476 90.6321 10.1205 90.748 10.2064 90.8391C10.2924 90.9303 10.3913 90.998 10.5033 91.0422C10.6179 91.0839 10.7442 91.1047 10.8822 91.1047C11.0593 91.1047 11.2142 91.0709 11.347 91.0032C11.4799 90.9355 11.5905 90.83 11.6791 90.6868C11.7702 90.5409 11.8379 90.3547 11.8822 90.1282C11.9265 89.899 11.9486 89.6256 11.9486 89.3079Z" fill="black" fill-opacity="0.76"/>
<path d="M8.19922 119.233V119.827H4.47656V119.308L6.33984 117.233C6.56901 116.978 6.74609 116.762 6.87109 116.585C6.9987 116.405 7.08724 116.245 7.13672 116.104C7.1888 115.961 7.21484 115.815 7.21484 115.667C7.21484 115.479 7.17578 115.31 7.09766 115.159C7.02214 115.006 6.91016 114.883 6.76172 114.792C6.61328 114.701 6.43359 114.655 6.22266 114.655C5.97005 114.655 5.75911 114.705 5.58984 114.804C5.42318 114.9 5.29818 115.035 5.21484 115.21C5.13151 115.384 5.08984 115.585 5.08984 115.812H4.36719C4.36719 115.491 4.4375 115.198 4.57812 114.933C4.71875 114.667 4.92708 114.456 5.20312 114.3C5.47917 114.141 5.81901 114.062 6.22266 114.062C6.58203 114.062 6.88932 114.125 7.14453 114.253C7.39974 114.378 7.59505 114.555 7.73047 114.784C7.86849 115.011 7.9375 115.276 7.9375 115.581C7.9375 115.748 7.90885 115.917 7.85156 116.089C7.79688 116.258 7.72005 116.427 7.62109 116.597C7.52474 116.766 7.41146 116.933 7.28125 117.097C7.15365 117.261 7.01693 117.422 6.87109 117.581L5.34766 119.233H8.19922ZM12.6752 116.53V117.397C12.6752 117.864 12.6335 118.257 12.5502 118.577C12.4668 118.897 12.347 119.155 12.1908 119.351C12.0345 119.546 11.8457 119.688 11.6244 119.776C11.4056 119.862 11.1582 119.905 10.8822 119.905C10.6635 119.905 10.4616 119.878 10.2767 119.823C10.0918 119.769 9.92517 119.681 9.77673 119.562C9.6309 119.439 9.5059 119.28 9.40173 119.085C9.29757 118.89 9.21814 118.653 9.16345 118.374C9.10877 118.095 9.08142 117.77 9.08142 117.397V116.53C9.08142 116.064 9.12309 115.674 9.20642 115.358C9.29236 115.043 9.41345 114.791 9.5697 114.601C9.72595 114.408 9.91345 114.27 10.1322 114.187C10.3536 114.103 10.601 114.062 10.8744 114.062C11.0957 114.062 11.2989 114.089 11.4838 114.144C11.6713 114.196 11.8379 114.28 11.9838 114.397C12.1296 114.512 12.2533 114.666 12.3549 114.858C12.459 115.049 12.5385 115.282 12.5931 115.558C12.6478 115.834 12.6752 116.158 12.6752 116.53ZM11.9486 117.515V116.409C11.9486 116.154 11.933 115.93 11.9017 115.737C11.8731 115.542 11.8301 115.375 11.7728 115.237C11.7155 115.099 11.6426 114.987 11.5541 114.901C11.4681 114.815 11.3679 114.753 11.2533 114.714C11.1413 114.672 11.015 114.651 10.8744 114.651C10.7025 114.651 10.5502 114.684 10.4174 114.749C10.2845 114.812 10.1726 114.912 10.0814 115.05C9.99288 115.188 9.92517 115.369 9.8783 115.593C9.83142 115.817 9.80798 116.089 9.80798 116.409V117.515C9.80798 117.77 9.82231 117.995 9.85095 118.19C9.8822 118.386 9.92778 118.555 9.98767 118.698C10.0476 118.839 10.1205 118.955 10.2064 119.046C10.2924 119.137 10.3913 119.205 10.5033 119.249C10.6179 119.291 10.7442 119.312 10.8822 119.312C11.0593 119.312 11.2142 119.278 11.347 119.21C11.4799 119.142 11.5905 119.037 11.6791 118.894C11.7702 118.748 11.8379 118.562 11.8822 118.335C11.9265 118.106 11.9486 117.832 11.9486 117.515Z" fill="black" fill-opacity="0.76"/>
<path d="M13.043 144.737V145.604C13.043 146.07 13.0013 146.464 12.918 146.784C12.8346 147.104 12.7148 147.362 12.5586 147.557C12.4023 147.753 12.2135 147.895 11.9922 147.983C11.7734 148.069 11.526 148.112 11.25 148.112C11.0312 148.112 10.8294 148.085 10.6445 148.03C10.4596 147.975 10.293 147.888 10.1445 147.768C9.9987 147.646 9.8737 147.487 9.76953 147.292C9.66536 147.096 9.58594 146.859 9.53125 146.581C9.47656 146.302 9.44922 145.977 9.44922 145.604V144.737C9.44922 144.271 9.49089 143.88 9.57422 143.565C9.66016 143.25 9.78125 142.997 9.9375 142.807C10.0938 142.615 10.2812 142.477 10.5 142.393C10.7214 142.31 10.9688 142.268 11.2422 142.268C11.4635 142.268 11.6667 142.296 11.8516 142.35C12.0391 142.402 12.2057 142.487 12.3516 142.604C12.4974 142.719 12.6211 142.872 12.7227 143.065C12.8268 143.255 12.9062 143.488 12.9609 143.764C13.0156 144.04 13.043 144.365 13.043 144.737ZM12.3164 145.721V144.616C12.3164 144.361 12.3008 144.137 12.2695 143.944C12.2409 143.749 12.1979 143.582 12.1406 143.444C12.0833 143.306 12.0104 143.194 11.9219 143.108C11.8359 143.022 11.7357 142.96 11.6211 142.921C11.5091 142.879 11.3828 142.858 11.2422 142.858C11.0703 142.858 10.918 142.891 10.7852 142.956C10.6523 143.018 10.5404 143.119 10.4492 143.257C10.3607 143.395 10.293 143.576 10.2461 143.8C10.1992 144.024 10.1758 144.296 10.1758 144.616V145.721C10.1758 145.977 10.1901 146.202 10.2188 146.397C10.25 146.593 10.2956 146.762 10.3555 146.905C10.4154 147.046 10.4883 147.162 10.5742 147.253C10.6602 147.344 10.7591 147.412 10.8711 147.456C10.9857 147.497 11.112 147.518 11.25 147.518C11.4271 147.518 11.582 147.484 11.7148 147.417C11.8477 147.349 11.9583 147.244 12.0469 147.1C12.138 146.955 12.2057 146.768 12.25 146.542C12.2943 146.313 12.3164 146.039 12.3164 145.721Z" fill="black" fill-opacity="0.76"/>
<path d="M19 4.16113L194 4.16116" stroke="black" stroke-opacity="0.12"/>
<path d="M19 33.1611L194 33.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M19 61.1611L194 61.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M19 89.1611L194 89.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M19 118.161L194 118.161" stroke="black" stroke-opacity="0.12"/>
<path d="M28 27C28 25.8954 28.8954 25 30 25H56C57.1046 25 58 25.8954 58 27V146H28V27Z" fill="#08872B"/>
<path d="M70 69C70 67.8954 70.8954 67 72 67H98C99.1046 67 100 67.8954 100 69V146H70V69Z" fill="#4B93FF"/>
<path d="M112 92C112 90.8954 112.895 90 114 90H140C141.105 90 142 90.8954 142 92V146H112V92Z" fill="#FF4D5A"/>
<path d="M154 79C154 77.8954 154.895 77 156 77H182C183.105 77 184 77.8954 184 79V146H154V79Z" fill="#FFC107"/>
<line x1="17.2" y1="145.961" x2="196.8" y2="145.961" stroke="black" stroke-opacity="0.7" stroke-width="0.4" stroke-linecap="square"/>
<path d="M43.1328 14.1758L41.5117 19H40.375L42.5 13.3125H43.2266L43.1328 14.1758ZM44.4883 19L42.8594 14.1758L42.7617 13.3125H43.4922L45.6289 19H44.4883ZM44.4141 16.8867V17.7344H41.3633V16.8867H44.4141Z" fill="black" fill-opacity="0.76"/>
<path d="M85.1836 58.4648H83.7305L83.7227 57.707H84.9688C85.1823 57.707 85.3607 57.6771 85.5039 57.6172C85.6471 57.5573 85.7552 57.4701 85.8281 57.3555C85.9036 57.2409 85.9414 57.1016 85.9414 56.9375C85.9414 56.7552 85.9062 56.6068 85.8359 56.4922C85.7682 56.3776 85.6615 56.2943 85.5156 56.2422C85.3698 56.1875 85.1849 56.1602 84.9609 56.1602H84.0781V61H83.0039V55.3125H84.9609C85.2839 55.3125 85.5716 55.3438 85.8242 55.4062C86.0794 55.4661 86.2956 55.5599 86.4727 55.6875C86.6497 55.8151 86.7839 55.9753 86.875 56.168C86.9688 56.3607 87.0156 56.5898 87.0156 56.8555C87.0156 57.0898 86.9609 57.306 86.8516 57.5039C86.7448 57.6992 86.5794 57.8581 86.3555 57.9805C86.1341 58.1029 85.8529 58.1732 85.5117 58.1914L85.1836 58.4648ZM85.1367 61H83.4141L83.8633 60.1562H85.1367C85.3503 60.1562 85.526 60.1211 85.6641 60.0508C85.8047 59.9805 85.9089 59.8841 85.9766 59.7617C86.0469 59.6367 86.082 59.4935 86.082 59.332C86.082 59.1549 86.0508 59.0013 85.9883 58.8711C85.9284 58.7409 85.832 58.6406 85.6992 58.5703C85.569 58.5 85.3971 58.4648 85.1836 58.4648H84.0664L84.0742 57.707H85.4961L85.7422 58C86.0703 58.0026 86.3372 58.0677 86.543 58.1953C86.7513 58.3229 86.9049 58.487 87.0039 58.6875C87.1029 58.888 87.1523 59.1042 87.1523 59.3359C87.1523 59.7005 87.0729 60.0065 86.9141 60.2539C86.7578 60.5013 86.5286 60.6875 86.2266 60.8125C85.9271 60.9375 85.5638 61 85.1367 61Z" fill="black" fill-opacity="0.76"/>
<path d="M168.637 72H167.41L167.418 71.1562H168.637C168.967 71.1562 169.245 71.0833 169.469 70.9375C169.693 70.7891 169.862 70.5768 169.977 70.3008C170.091 70.0221 170.148 69.6888 170.148 69.3008V69.0078C170.148 68.7083 170.116 68.444 170.051 68.2148C169.986 67.9857 169.889 67.793 169.762 67.6367C169.637 67.4805 169.482 67.362 169.297 67.2812C169.112 67.2005 168.9 67.1602 168.66 67.1602H167.387V66.3125H168.66C169.04 66.3125 169.387 66.3763 169.699 66.5039C170.014 66.6315 170.286 66.8151 170.516 67.0547C170.747 67.2917 170.924 67.5755 171.047 67.9062C171.172 68.237 171.234 68.6068 171.234 69.0156V69.3008C171.234 69.707 171.172 70.0768 171.047 70.4102C170.924 70.7409 170.747 71.0247 170.516 71.2617C170.286 71.4987 170.013 71.681 169.695 71.8086C169.378 71.9362 169.025 72 168.637 72ZM168.012 66.3125V72H166.938V66.3125H168.012Z" fill="black" fill-opacity="0.76"/>
<path d="M128.254 82.1289H129.328C129.299 82.5091 129.194 82.8464 129.012 83.1406C128.829 83.4323 128.576 83.6615 128.25 83.8281C127.924 83.9948 127.53 84.0781 127.066 84.0781C126.71 84.0781 126.388 84.0156 126.102 83.8906C125.818 83.763 125.574 83.582 125.371 83.3477C125.171 83.1107 125.017 82.8268 124.91 82.4961C124.803 82.1628 124.75 81.7891 124.75 81.375V80.9414C124.75 80.5273 124.805 80.1536 124.914 79.8203C125.023 79.487 125.18 79.2031 125.383 78.9688C125.589 78.7318 125.835 78.5495 126.121 78.4219C126.41 78.2943 126.733 78.2305 127.09 78.2305C127.553 78.2305 127.945 78.3164 128.266 78.4883C128.586 78.6576 128.835 78.8906 129.012 79.1875C129.189 79.4844 129.296 79.8255 129.332 80.2109H128.258C128.237 79.9714 128.185 79.7682 128.102 79.6016C128.021 79.4349 127.898 79.3086 127.734 79.2227C127.573 79.1341 127.358 79.0898 127.09 79.0898C126.882 79.0898 126.698 79.1289 126.539 79.207C126.383 79.2852 126.253 79.4023 126.148 79.5586C126.044 79.7122 125.966 79.9049 125.914 80.1367C125.862 80.3659 125.836 80.6315 125.836 80.9336V81.375C125.836 81.6641 125.859 81.9232 125.906 82.1523C125.953 82.3815 126.026 82.5755 126.125 82.7344C126.224 82.8932 126.352 83.0143 126.508 83.0977C126.664 83.181 126.85 83.2227 127.066 83.2227C127.329 83.2227 127.543 83.181 127.707 83.0977C127.874 83.0143 128 82.8919 128.086 82.7305C128.174 82.569 128.23 82.3685 128.254 82.1289Z" fill="black" fill-opacity="0.76"/>
</g>
<defs>
<clipPath id="clip0_4624_38022">
<rect width="200" height="160" fill="white"/>
</clipPath>
</defs>
</svg>
",
+  "description": "Displays the latest values of the attributes or time-series data in a bar chart. Supports numeric values only.",
   "descriptor": {
     "type": "latest",
-    "sizeX": 7,
-    "sizeY": 5,
-    "resources": [
-      {
-        "url": "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"
-      }
-    ],
-    "templateHtml": "<canvas id=\"barChart\"></canvas>\n",
+    "sizeX": 5,
+    "sizeY": 4,
+    "resources": [],
+    "templateHtml": "<tb-bar-chart-widget \n    [ctx]=\"ctx\"\n    [widgetTitlePanel]=\"widgetTitlePanel\">\n</tb-bar-chart-widget>",
     "templateCss": "",
-    "controllerScript": "self.onInit = function() {\n    $scope = self.ctx.$scope;\n    utils = $scope.$injector.get(self.ctx.servicesMap.get('utils'));\n    settings = utils.deepClone(self.ctx.settings) || {};\n    settings.showTooltip = utils.defaultValue(settings.showTooltip, true);\n    \n    Chart.defaults.global.tooltips.enabled = settings.showTooltip;\n    \n    var barData = {\n        labels: [],\n        datasets: []\n    };\n    \n    for (var i = 0; i < self.ctx.datasources.length; i++) {\n        var datasource = self.ctx.datasources[i];\n        for (var d = 0; d < datasource.dataKeys.length; d++) {\n            var dataKey = datasource.dataKeys[d];\n            var units = dataKey.units && dataKey.units.length ? dataKey.units : self.ctx.units;\n            units = units ? (' (' + units + ')') : '';\n            var dataset = {\n                label: dataKey.label + units,\n                data: [0],\n                backgroundColor: [dataKey.color],\n                borderColor: [dataKey.color],\n                borderWidth: 1\n            }\n            barData.datasets.push(dataset);\n        }\n    }\n\n    var ctx = $('#barChart', self.ctx.$container);\n    self.ctx.chart = new Chart(ctx, {\n        type: 'bar',\n        data: barData,\n        options: {\n            responsive: false,\n            maintainAspectRatio: false,\n            scales: {\n                yAxes: [{\n                    ticks: {\n                        beginAtZero:true\n                    }\n                }]\n            }\n        }\n    });\n    \n    self.onResize();\n}\n\nself.onDataUpdated = function() {\n    var c = 0;\n    for (var i = 0; i < self.ctx.chart.data.datasets.length; i++) {\n        var dataset = self.ctx.chart.data.datasets[i];\n        var cellData = self.ctx.data[i]; \n        if (cellData.data.length > 0) {\n            var decimals;\n            if (typeof cellData.dataKey.decimals !== 'undefined' \n                && cellData.dataKey.decimals !== null ) {\n                decimals = cellData.dataKey.decimals; \n            } else {\n                decimals = self.ctx.decimals;\n            }\n            var tvPair = cellData.data[cellData.data.length - 1];\n            var value = self.ctx.utils.formatValue(tvPair[1], decimals);\n            dataset.data[0] = parseFloat(value);\n        }\n    }\n    self.ctx.chart.update();\n}\n\nself.onResize = function() {\n    self.ctx.chart.resize();\n}\n\nself.onDestroy = function() {\n    self.ctx.chart.destroy();\n    self.ctx.chart = null;\n}\n",
+    "controllerScript": "self.onInit = function() {\n    self.ctx.$scope.barChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.barChartWidget.onDataUpdated();\n};\n\nself.typeParameters = function() {\n    return {\n        previewWidth: '500px',\n        previewHeight: '380px',\n        embedTitlePanel: true,\n        defaultDataKeysFunction: function() {\n            return [{ name: 'windPower', label: 'Wind', type: 'timeseries', color: '#08872B' },\n                    { name: 'solarPower', label: 'Solar', type: 'timeseries', color: '#FF4D5A' },\n                    { name: 'hydroelectricPower', label: 'Hydroelectric', type: 'timeseries', color: '#FFDE30' }];\n        }\n    };\n};\n\nself.onDestroy = function() {\n};\n\n",
     "settingsSchema": "",
-    "dataKeySettingsSchema": "{}\n",
-    "settingsDirective": "tb-chart-widget-settings",
-    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Bars\"}"
+    "dataKeySettingsSchema": "",
+    "settingsDirective": "tb-bar-chart-widget-settings",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-bar-chart-basic-config",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Wind\",\"color\":\"#08872B\",\"settings\":{},\"_hash\":0.7227918773301678,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Solar\",\"color\":\"#FF4D5A\",\"settings\":{},\"_hash\":0.2392660816082064,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Hydroelectric\",\"color\":\"#FFDE30\",\"settings\":{},\"_hash\":0.7051898468567794,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"decimals\":0,\"aggregationType\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":null,\"padding\":\"0px\",\"settings\":{},\"title\":\"Bars\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"units\":null,\"decimals\":0,\"useDashboardTimewindow\":true,\"showLegend\":false,\"widgetStyle\":{},\"actions\":{\"headerButton\":[]},\"configMode\":\"basic\",\"displayTimewindow\":true,\"margin\":\"0px\",\"borderRadius\":\"\",\"widgetCss\":\"\",\"pageSize\":1024,\"noDataDisplayMessage\":\"\",\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleIcon\":\"bar_chart\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true}}"
   },
-  "externalId": null,
   "tags": [
+    "bars",
     "bar",
     "bar chart"
   ]
diff --git a/application/src/main/data/json/system/widget_types/bars_deprecated.json b/application/src/main/data/json/system/widget_types/bars_deprecated.json
new file mode 100644
index 0000000000..6324f9d7b2
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/bars_deprecated.json
@@ -0,0 +1,29 @@
+{
+  "fqn": "charts.bars",
+  "name": "Bars",
+  "deprecated": true,
+  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAA8FBMVEUhlvNMr1Bqamp5eXl7e3t8fHx9fX1+fn5/f3+AgICCgoKDg4OEhISGhoaHh4eKioqMjIyNjY2Ojo6QkJCRkZGSkpKWlpaXl5ebm5udnZ2enp6goKChoaGkpKSnp6epqamsrKyurq6xsbGzs7O1tbW2tra3t7e4uLi7u7u9vb3BwcHCwsLDw8PGxsbKysrNzc3Ozs7R0dHS0tLT09PZ2dna2trc3Nzd3d3e3t7g4ODh4eHj4+Pk5OTm5ubn5+fo6Ojp6enu7u7w8PDz8/P0Qzb09PT29vb39/f5+fn6+vr7+/v8/Pz9/f3+/v7/wQf///+dc+aLAAAAAWJLR0RPbmZBSQAAAcFJREFUeNrt3ds2AgEYhuHsaSOZbAvZi0r2YYjCJOW7/7txZhkcDNbM6h/vdwfPmlX/ybtmEorJErGCeJLadz3rkKPpZamaLTp925DHdFvSpKelU9uQ/cLKhtcdk7YqtiHruevtojch7ZZtQ0o1dcdfRqXNqm1IbVU3OaVamm/YhvQW5zIXOknnC5JUt7qEpE5fUv/5HVePy2UHAgQIECBAgAABAgQIECBxgrwGHBAgQIAAAQIECBAgQIAAAQIECJC/QRIBN0iQ+66voDMLuRp2fQWdVUhvNun6CjqrkJ0Dx/UVdEYhzXzfcX0FnVFIrlSZ2mx/LOiMQuqHh6k972NBZ/fv13G/KeiCQkIu4358EL8UdBafSGwuOxAgQIAAAQIECJDYQB4CDggQIECAAAECBAgQIECAAAECBAgQIECA/BrSufn0DjqjkEZmLXkWaUEXEmThXMeFSAu68H4j5b1IC7rQILfZTqQFXViQ1nRTL1EWdCFBnmYuJUVZ0IUEWR1xHKcXZUEXFDLwBR2XHQgQIECAAAEC5H9ChgIOCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgxiBmv+L6Bl9pkxYph15gAAAAAElFTkSuQmCC",
+  "description": "Displays latest values of the attributes or time-series data for multiple entities as separate bars.",
+  "descriptor": {
+    "type": "latest",
+    "sizeX": 7,
+    "sizeY": 5,
+    "resources": [
+      {
+        "url": "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"
+      }
+    ],
+    "templateHtml": "<canvas id=\"barChart\"></canvas>\n",
+    "templateCss": "",
+    "controllerScript": "self.onInit = function() {\n    $scope = self.ctx.$scope;\n    utils = $scope.$injector.get(self.ctx.servicesMap.get('utils'));\n    settings = utils.deepClone(self.ctx.settings) || {};\n    settings.showTooltip = utils.defaultValue(settings.showTooltip, true);\n    \n    Chart.defaults.global.tooltips.enabled = settings.showTooltip;\n    \n    var barData = {\n        labels: [],\n        datasets: []\n    };\n    \n    for (var i = 0; i < self.ctx.datasources.length; i++) {\n        var datasource = self.ctx.datasources[i];\n        for (var d = 0; d < datasource.dataKeys.length; d++) {\n            var dataKey = datasource.dataKeys[d];\n            var units = dataKey.units && dataKey.units.length ? dataKey.units : self.ctx.units;\n            units = units ? (' (' + units + ')') : '';\n            var dataset = {\n                label: dataKey.label + units,\n                data: [0],\n                backgroundColor: [dataKey.color],\n                borderColor: [dataKey.color],\n                borderWidth: 1\n            }\n            barData.datasets.push(dataset);\n        }\n    }\n\n    var ctx = $('#barChart', self.ctx.$container);\n    self.ctx.chart = new Chart(ctx, {\n        type: 'bar',\n        data: barData,\n        options: {\n            responsive: false,\n            maintainAspectRatio: false,\n            scales: {\n                yAxes: [{\n                    ticks: {\n                        beginAtZero:true\n                    }\n                }]\n            }\n        }\n    });\n    \n    self.onResize();\n}\n\nself.onDataUpdated = function() {\n    var c = 0;\n    for (var i = 0; i < self.ctx.chart.data.datasets.length; i++) {\n        var dataset = self.ctx.chart.data.datasets[i];\n        var cellData = self.ctx.data[i]; \n        if (cellData.data.length > 0) {\n            var decimals;\n            if (typeof cellData.dataKey.decimals !== 'undefined' \n                && cellData.dataKey.decimals !== null ) {\n                decimals = cellData.dataKey.decimals; \n            } else {\n                decimals = self.ctx.decimals;\n            }\n            var tvPair = cellData.data[cellData.data.length - 1];\n            var value = self.ctx.utils.formatValue(tvPair[1], decimals);\n            dataset.data[0] = parseFloat(value);\n        }\n    }\n    self.ctx.chart.update();\n}\n\nself.onResize = function() {\n    self.ctx.chart.resize();\n}\n\nself.onDestroy = function() {\n    self.ctx.chart.destroy();\n    self.ctx.chart = null;\n}\n",
+    "settingsSchema": "",
+    "dataKeySettingsSchema": "{}\n",
+    "settingsDirective": "tb-chart-widget-settings",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Bars\"}"
+  },
+  "externalId": null,
+  "tags": [
+    "bar",
+    "bar chart"
+  ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/polar_area.json b/application/src/main/data/json/system/widget_types/polar_area.json
index 4cc516321c..8d4a0b24a6 100644
--- a/application/src/main/data/json/system/widget_types/polar_area.json
+++ b/application/src/main/data/json/system/widget_types/polar_area.json
@@ -1,25 +1,28 @@
 {
-  "fqn": "charts.polar_area_chart_js",
-  "name": "Polar Area",
+  "fqn": "polar_area",
+  "name": "Polar area",
   "deprecated": false,
-  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAYvUlEQVR42u2deXAU15nA+W+zm73/yV7Zqq09aje7SeXY2kocZ7cSH7GdxCG+cJxybHw7Xt/4WB+AY8CAMeEGc4MNAgcMxhgB5r4RkpAAHYCEDoRu0DX31fuTejyaEWjm9fTr7tejefWKksRMT/f3fvO+733He6O0fMs3C9qovAgytlgs5vf7Ez+3tbX19fXlxZIHK/sWjUYLCgqmTZtWVFSkUzVr1qxVq1ZNnz79yJEjefnkwcqy7d+/f8OGDfCk/1pdXb18+XJ+8Pl8EydOzMsnD1aWberUqZ9//jlTVElJCb8ePHhw27Zt+n+98cYbkUgkL6I8WNm0cePGbd++vbm5+Z133jl//vzu3bt37Nih/9f48eMThle+5cEa1jwPBAI9PT0dHR2XLl1K/P2VV17Rf9i3b19hYeGhQ4e2bt2amLGwwPSfeQtv7O3t5SIJvZkHa4SS5PF4WN/V19djOZWVlVVUVDAnNTQ0tLS0JF6Gqc5f+AFL6+jRoxcuXFiwYAG/guCkSZMSL+MtvIy3cxEuxQX5lYvzESOWs1EjDSb02rlz5xj+qqqqxsbGzs5Or9ebmHuGtKampilTpsydO3fevHnhcJi/rFy5cvbs2ZMnTz59+vRwC0k+hctycT6CD+Lj+NCRBlnug8VIX7lypa6urry8nJFGbaGzDNndKLjkX0OhkDgifBDTGx/KR3MD3AY3MxzHebDcMT91dXWhvBjOmpoaphCAcPaWuAFug5vRCeP2cngOy0GwmGCYIU6dOoUOYiAVdAqgVbkxbg99yq0OmRHzYCnX0HHMByCFbeSK0eImuVVumNvm5vNgKaf1Ll++jBFTWVnJTOA6/cINc9vcPI+ABZYHS4nGSDAkqBVsZLc/C49w9uxZHgfzKw+Wk4qPrzgjkWNKBLzwhPFors6hcCVYmCa1tbV4I3Pgmz1c49HOnDnDqjYYDObBssMcwc2Ntdva2prz/kbcXTwmD8sju+5h3QQWzmvsDxZQVnyJGbjO7p6K2oY9RWUFhXsXrN8yfeVHExeufmnm4t9MnpP8ytf3BaYdDS4qDa6rDBXWhsvaIt0BC0cd7xfzFg/O4+fBkj9RsSzH6yNX93X19p2oOAtGk5aseey3v3vwzXeH68nv+ocFfVf3by/33LnR99KewMpToVPt0Yhs1zprFN3p5ZapywVgkZ2CMcu3Vo/WmWzhSOT0+boPtu5iKkpDklGwhvSvLe4bs9k343iwpDUSlUQCj49liVFPmmEeLLMNBw9GBv+aHpXI8dPV89dteXLSbHGesgYruf/nCs/LewI7LoT9Er4XGvk5CAS/XR6s7NUfCQLYFibz6S61d360c//TU+dnwZMUsBL960s9r+0LFLeYDTEhEFbEFy9eVFktKgoWFisOKtRf1pE+hM4U9daiD8zwJBesRL9tvXf16ZDPxASGWBAOIpJiHowUsPhG4sJhpZ21FXWg5NSrs5ZKQcoKsPT+nRWeecXBHhMrStwQCErNDGnlwMKNjg2RXcgsGo3tKy5/YcYiiUhZB1ZCP04/FuzKFi+WyYhLwXCWWmDpYsoulFF5oWH8/FXSkbIaLL1/c5lnYWkwlJWTAnEhNNWCEAqBpbtqslhLt1/pnr1mk0VI2QOW3m8q8O5tyMamRBsiOqWWiqqAhUMhC3OBVdHeE+WPvz3LUqpsA0vvD33mb/XEsmALAZr3y+QUWHzVEIrR1LzOrp7pK9ZbjZT9YOma8eOzhpd7CBAxKpLR5TxYGAdM40bnqiNlFdm5Ol0Blt6f3uk3GoWELYSpAlsOg6WvAQ3ZVcT8cXjahpSDYNG/v9pT3mbMpEeYWS+AcgQsZimjIrjS00fA2GaqHASL/q/v931UZay+SF8nOhtSdAwsfOsYBIYWMrUXm5+ZNt9+qpwFS+8TDgQiRrQi2hDxOuiXdwYs4i2EI5KL2TM2UhJsWP0pCxb98UJ/wIgvAvEiZKfiic6ARXSZDBDx1xdXnHvkrZlOUaUIWHRScXqDBkAhnkiseqSApZc6iUeXdx0rHTt+hoNUqQOWHsBu9xoo8CcPwhHHqd1g6Qa7uHPh0MkzY8e/6yxVSoFFv2Gtt8MXMyRw+8t3bQULfU8uqLh3mLzhhybMcJwq1cCi/+z3XnGdSG4gYrfZ2LIVLPLW0fri1vojE2eqQJWCYNFJsfeGRFnBok3eUC6nwKLIBKew4AL4QlNL+uqGPFj0sVt9gj4IxI7w2Qks18BiHhavHO/u8zz/7iJ1qFIWLPo7R0Qr4fBsUYhhm0K0CSy2tBP0L1D1MGnxGqWoUhks+ibhcDVDkHVeropgsSRhYSK479myTdtVo0pxsIj5UDQrIlsKfRkIe2r27QBL/ItypLxSQaoUB4v+vdUewTwI3PHi6yelwSJ/AR+diGq/0tP71JS5ebCy6y/uFnINkhtCDNGG3AfLwcJgFLHZIW/q8nVqUuUKsOjbaoSMLYYDt5a7wWIlIvgMhYeKlKXKLWCxf4RgTjOD0t3d7VawdBeDyK5ol7t7HcxcyBmw6E/tEFKIlIsxNG4Fi9gnOziKvHLeuk9UpspFYNH3NwqtEMmosTSD2UKwsK5ECikraxsUp8pdYN1c4A1HhSYtSy0tq8BCA4pMtpFI9LU5y/Ngye1Ly4RchgyQdctDq8Bi3z2RNCAq4tWnynVgfWOpR2RLCP2YDDeBpbvaM/qumK4M7X6WB0u8zzqR2b2OT8u6VC1LwLo00DK+jD1hXEGVG8ESnLRIZLIonUY+WExUZGhk/B6wM4zcnYbyYA3pc4uDIrqFwbIi5UE+WDh2RbwMR1UNC+YMWN9a5hHJBGSwrHCWygeLGKdI8vHkpWvzYFndRSpdSVzmjDvVwcIe5DC+jBU4zR2XVSiRyHmwRm/IXAxNcilDJv1sTslg4cwVWcGu2bbbRVS5Fyz66fbMxHCatfR92ySDxaSaUQ+GwmFl02NyDyzO0XBEG8oEi8WFSKZofxFY3UUmLSs2C82DlejXrfb89lCgtDVz6JAhY+DUBYs6HOKDxjxe7Z2b9xx+dfayPFiy+vUf9PPEbvKGXAiEd+TW8MgEi4qJrL1t9c1tG3cdVDZuqD5Y7F/63vFgRUeWNjieUkN7tNgKFh4R82dSslPtzqMlOCOUWjYqC9bN67xEb0Qs9IzJDpjwKoKF5VRWVpZ5q4+eI1rpD7SOzVooQ4i6o0shwlQDS+eptkuaj4CBw+kg0QUvDSxRA6thirb/D+K96D+05qVaqC39O8gvhTBOD3xownsjGax/XNi/ZQM81XfLPrTui/w5iWaWNLDa2trY9Srz607dOgjWIGH/rrWu1ELt6d/a5/UdLquY9eHHD098b+SA9U8L++7e5FtxKpTFHt2GGsPX3t6uHFj19fWZIzmxoHboL68BVqIf/xetabbmz1D45vH5dcJs2zXEfrASPInvhmWy4c1qaGhQDiyhibT7cDqqkvuRv9MaZ2oBnjOdWL3+QNGZ6iUbt1ldi2EbWJQ1P7LNzybvIkkv7NYnsawZY0ZisrIcsHTLPXO8qWm+KFiJfvgr/WZZ/xyWTtDBULisugbCLNr83Wqw/m1xnKc+IztBisQ5DNnvDKIs+10OWKT1UO4s4JB4yjBYiX7wT7Tzz2h95Vosmj5eBGErP9lh8uRLe8C6/gMv+ekNPbFQJJvhhCq5oZgszgexFixRL0jZD7MHa5CwP9Vqx2meM+kJI5HwXEMTgaNnpy1QDawfrvGurwp1+szODehB0vRU80TKBEvU7jv81xLAGuxf7p/Deo5rsZAIYc9NX+gsWD9a6y2oCHX4ZBrjOJ8kbubOIMrSrXLAIpKTOSAQbJFKVXL/klZ5f7/rNS1hWA91l1oJTb78uyV2gjV6o3f7hXBXwJLFHXWnGN2yrsYgEpdTCCx8DZmLvXpPWAZWUj9zl9a9X4sG5Aa/swDr3s2+XfVhT8haZ4GQl8eI0cYFFQKL5L7MRc+dW+0AK9HLbuoPHEV6RQibuHC1LLAe+NS/tyHsC2fg6UJ33YeVa2cUzzQpeTYek1hmQ/K7oYMdLAcL/0dmJ1bLclvBSvTym/qZjmQo+U0f/M4I1qOF/mOXIsFMkdLG3sa1Veue2PXUTzeNpt+5ZYzJ5T2Zn7JQ0F1Z6FaFwMLXkHmZWj/JGbASvfR6keA352teTdhwYOk8pT/LGXTOd9XA02OfP6nzlNybPc2KoGDAbWQbWOQfZl6b1LzgMFiJfuJbWusHWiiDacIOg5wLTOCI4Hfy3/95Ud+bB/ozM9PvvRGNRSs7qxafWvpA4cNX85ToR5uPmZE8Z8cZTa5M5wUMhWT5L+SAJVKZo537X1XASg5+t2QOfrM9eCox6V4cjoaLW0vnlM6/77Nfp+Ep0bfUbDXpysKrKdH5zlAqBJZQPOfsE8qBlRz8vrRAC2R/UFYwEjrWfPy94lljtv5KhKdE33DuYzOSR1FITFdnEBlKhcA6efJkZiO0+mF1wRoMTf6VSGgyiadgUcuJmcWz7/n0PkM8JXpB1XozkkfsCF8WWBKvZiNYVQ+4AKzk4HfjNM1fd03CPCHvnsZ9k49NvWPLPdnxlOgrK1bnwTKnCqsedBNYid53DdVQ23XBJE+JvqaqIK8KzRnvxPVcR1XdxOGepqB6nRSwdtTvzBvv5twNF95wGVXF3+E7PKgmWi7Rk7XGM3ueNw8WS8i8u8Gcg7RhqqvA+nKKKzUS8T39sO83D2pJ3x9PyDP6k7tMglXfYyobOMcdpEIx9ksL3QTWlRQNFVw633PDf9GDyxYk/724rcQMVXdsuRs/RT6kM7xTXSQI3bHRNVThGUm2PMpLPDd9VwfLc+N3IyXHk/937sn5WYP12sE3TUo+x4PQQmkzfaXuoOro3yfndcW6u7z33BanaqB777oldmXwYSOxSPqgTZpOANG85HM5bUYo0S/c5Q6w+n1Xgya6/80Xk6nSu///ntOS/HbtvvbswDrdYXZBl+OJfsKpyV9RnaqWFSmrpI3rrqZK76GPUyabHfWfG6Xqwe2PRGNma5pzPDVZtJii5HtKU1V+W7KfPVpX47ntB8OB5bnl+uj5lCq88YffMhbMqV5vUuy5X0whukw9+7i6VB38Cy2SpFP8Pt/Ye4alaqD7fn1nLCm9MRAJ3P3pLwWp+vnmOzv9ZucGiSaR3vC1yqqAtbdgtXmxwqGbFEdlYMak9FTpPfDe5JTgQleNIFjTimaYF7sVBauyriatxJ7s5MxWZF+JqqGbCSnLjP27RajSe3j3jtRQz/qMVOFWNZk4qjf0oNwSe4m+VmlgYfdhwmea2ULawT9TjqoT30yufY21t3pH3ygOlvf2Hw0J9Ty95zlLMxriutrvlxgl1JTdFER0G6OT/6MYWH+khTpSQjfPPCJOVdzYempscqinN9h7+yd3DEfV/YUP+sI+8wLHNcCmIBLBUnQbI6p0hKKhjpdUDOmXt6ess5YvNEpVPNSzfFHydU60Fl+Tqp9t/kVpm5yEJ1ZLcrejlbu/re1bRdpTtioauhmbGropHQzdGO2EekqLkq825+S8q8FaV/2RLHtIVrQ42XJXcatIYS9ItH/vK1VCN4OWb6y31/vL27OkSje2xvyE+M/gUEWHhnreOvq2rJFDbREllDh26m5uq4lvx61IKunQ0M04M1TFQz2vpYR62ryDoZ6XDrzqDctRNPoBlhLXg5ri23GL7m/bucV5qpqXpYRuNq03T1U81LMpRdkV1m2HqlcOvCbFYE+skzhiTZPalD5AQPDIk34FdORvHA3d3JIauqlNF7ox2gn11KQc1/hhZQFOeYlCxn0lFwLVjzwx4As+/6wqoZtg0PfofdKo0r0PD43RAn7Nmoa3SfoJ4VxTbmhIc+pYOa23yDGweotTQjczp8ilKh7q+d07VlDFdIVTVGKeTPxrrv6xcvpBmEKJHPi77afqQkrGZvjgHiuoiod69uyUDhbWlfTpyh0HYRrQhpjPDodu2gyFbgx7H35+Q6ylWaJgdUtI1uazyXrQBUf3asKHjWtRv3b0qzaC9Ycpm3/Eov4XnrCOqrj34dlHtUhElmBZCcpK70xuBJ7dcdi4vmwhRJr5pQ2T7QOrc1tK6Gbl+1ZTFQ/1rFosRap4nnG1S1dYDBODJdHhbiFY2kAKPA43gcm9M8MJKBaFbk6dzD50k02o54R5MwibXVZu5xC/qBWzoFVgYQdgDQh9D0iEsjx089WhoZv7breJKt3YuvensR5TuoaSLIk1XkM8+NKNNgvB0gYqDYVMeDaftdrSSj3yyT/+JTup+iLU87yWrbphJYgZZIW2wmyXWOxqE1jM20QJxKbjeRZS1TQnRfd+8nv7qYqHerZsyC5KJjdNdEgYp6+vz2VgaQPngWUuj9YG0kqLvmZN6OZmC0M3RvutQ0M9IhYFVAnJ0HhjJSjxrC9bwcILL5pDTbad/NDNn6dswW1B6MZwqOfhe8VDPXitMNgl1kpc7WWQ7m23CSwDk5ZmwX5/vSlpd4FZU52lKu59mDVNRBik3SE6uRlXQ6YriZsfOQAW3wnR+RbXg8SUh9pXU8bp4F4VqIqHevbuzEgVHma5+exDGoNihVPUPrD0SUt0ym1bKyl0842hoZtf3KQOWP2hntaWNBoQiVlKFSaKpdaVTWCx7sBWEHUZS1CIhG7aUkI3Lz6pDlVx78Nzj2nXEoheUG6RxzLhu2I4rFsM2geWHuQSNRcwt5lvTIVuUvbjD61aohpVce/DqiXX9Cxk3g3KXINaK0LOzoCFG0YoszQu4NP9uXjZUVX5qxRKT5fZF7rJItRzcjAzDP+n0OZ1MgbCIq+YA2BpA9WVBhKJsjsnbEjops/u0I3JUI8VvvWrQ0PWrTSdAQupYZNiNgqHhMYZBsuXAm7g7ddVpiqeaDrhFc2uhvAZAhvwtRWshA0hvEtYzJghnxq6CW/ZqD5Vce/Dpx/bIHzELr0EQxWwtIF0GgNRTzIBBU+95zDV5INJKBKc8LJbwOJWNVuUoKWLTYfBYh7Gg5J5U5rBRd1lrfjbGag68Mea7xolvOF9u4ZsSqucjTXmJ9ykDWJnqw/EbpsSdAAs7YtULaH80jggV7TS69KB1fjusBx7PcH35zgZeB6u3/bfwcVzY7YoJo6usC7pSiGwaLhqcANGxJPB2W6ZU3evrQRv1GIZrhPrvhJcMo/kAiWQ+vF1FJzFOjvsETVCRtQG1kyuBotGyMJYitk12Tryt1pQdLsBoijBRbO9o29wTPGNviH4/uxYW4udcsY1LZQjnjNgoe9J2zC2CwXlyxX3JIH1Je3yNsMf7PeFt27yPX6/rdkyT9wf/myTdbXRaZzsBLNtNq0cBktfADNLG4xgxLT6t/uRAiwcXWbIbmlmo3aG3EKeHhpD3CbaWOeIeFF/iFfiFvCuAUsbqD3CrjRcfNK+Xiv9fr8zQsrc2dwU/mxzYNLrHGQiQd/dfWtg8htckMs6KFhizHit7DfYVQFLFwFssXIxiEPEipshwSZy7FBozQrg8D/zaP8+bD++Lo0ZTsiIklReHFq7MnLsMG/XFGh4QRGpDfkLSoOlDWQziha4OmAMRikXQ29Gmy5Gz1b196aL/MoftVhUwfvV0+QtzTl2DVi6A4IkIWen7hxoOlWOOBcUBUsbOL0DthSdt9zQ9GJ564ov3AqWvpDBOLAzUJozDaHZkCToVrC0geILFQxPdzWW1QjN6uIId4Ol2ZWhmzMNQan5VRyloLD0U2Lk7g6dkw3fOl5QNRc9o9QUGS5jYj7EEyORSB6gqxtiQThEbBz0rbsSLG0gnkismm9kfqk4pOFPRiwIx6k4oLvBSrYhDOQG5npDFAhEEWeVi8HSBoqWUIsU+YgWkOVoQ+uh/sgFdYUneZQrZMqcT768Om5l+xsPzuNjraus/twHVsK24PvK1GVPyaUijXmaiYrKLXe5jke5S8p8Xym5xMjAGSF9C2HVGg/IY/KwPLJbJiq3gpWwuki6xdelQhjfOt3HA7LPgkun51HuFT3u5uqBZvWWBzY3fVc0nsvVoa1Rbh8GJi2GgWVjDuAFUjwIj6Na4G8kgpVQHHzF2QaYvBHXmSPYUtw2N88j5IxyzxGwEsqRNSPWLjVPrvDXc5PcKjfMbedYTkdOgaU3/Ie604tQGn5qBaNp3BI3htbjJrnVnEydzUGwEo4JLBVWVRzGx0GPDKTjyytugNvgZrglbozbc53WzoOVYsFguDCQaBzsGFQPZr5tSRN8EB/Hh/LR3AC3wc3kvAduRICV3HBe43JkzigrK2Px1djYyBRCaqFEzrgUF+SyXByY+CA+jg8daSnXIwusZEXJSLO/T0NDA2sxhh9vJDYZvwIBKRXoKfjA+sEeigy0BDc0/sh/8QJexot5C2/k7VyES3FBfuXifEQOK7s8WKImP8njLPsJ9HKkO+E5jGvSntBfmETgUjrQ+IFf+SP/paci8mLewht5e76CLdH+H5nMNBUt+3p0AAAAAElFTkSuQmCC",
-  "description": "Displays the latest values of the attributes or time series data for multiple entities in a polar area chart. Supports numeric values only.",
+  "image": "tb-image:cG9sYXItYXJlYS5zdmc=:IlBvbGFyIGFyZWEiIHN5c3RlbSB3aWRnZXQgaW1hZ2U=;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="200" height="160" rx="4" fill="white"/>
<circle cx="99.4776" cy="80" r="69.7388" stroke="black" stroke-opacity="0.38" stroke-width="0.522388"/>
<circle cx="99.4776" cy="80" r="53.0224" stroke="black" stroke-opacity="0.12" stroke-width="0.522388"/>
<circle cx="99.4776" cy="80" r="36.306" stroke="black" stroke-opacity="0.12" stroke-width="0.522388"/>
<circle cx="99.4776" cy="80" r="19.5896" stroke="black" stroke-opacity="0.12" stroke-width="0.522388"/>
<circle cx="99.4776" cy="80.0001" r="2.87313" stroke="black" stroke-opacity="0.12" stroke-width="0.522388"/>
<path d="M99.4776 10.5223V80" stroke="#9E9E9E" stroke-width="0.522388"/>
<path d="M99.4776 26.7164H97.3881" stroke="#9E9E9E" stroke-width="0.522388"/>
<path d="M99.4776 43.4329H97.3881" stroke="#9E9E9E" stroke-width="0.522388"/>
<path d="M99.4776 60.1493H97.3881" stroke="#9E9E9E" stroke-width="0.522388"/>
<rect width="15" height="8.35821" transform="translate(82.7612 39.2538)" fill="white"/>
<path d="M85.9229 39.958V45.9329H85.1679V40.9008L83.6456 41.4558V40.7743L85.8046 39.958H85.9229ZM92.1345 42.4884V43.3944C92.1345 43.8814 92.0909 44.2922 92.0039 44.6269C91.9168 44.9615 91.7916 45.2309 91.6284 45.435C91.4651 45.639 91.2679 45.7873 91.0366 45.8798C90.8081 45.9696 90.5496 46.0145 90.2612 46.0145C90.0327 46.0145 89.8218 45.9859 89.6286 45.9288C89.4354 45.8716 89.2613 45.7805 89.1062 45.6553C88.9539 45.5275 88.8233 45.3615 88.7144 45.1574C88.6056 44.9534 88.5226 44.7058 88.4655 44.4147C88.4084 44.1235 88.3798 43.7835 88.3798 43.3944V42.4884C88.3798 42.0013 88.4233 41.5932 88.5104 41.264C88.6002 40.9348 88.7267 40.6709 88.8899 40.4723C89.0532 40.2709 89.2491 40.1267 89.4776 40.0397C89.7089 39.9526 89.9674 39.9091 90.253 39.9091C90.4843 39.9091 90.6965 39.9376 90.8897 39.9948C91.0856 40.0492 91.2597 40.1376 91.4121 40.2601C91.5644 40.3798 91.6937 40.5403 91.7998 40.7416C91.9086 40.9402 91.9916 41.1838 92.0487 41.4722C92.1059 41.7606 92.1345 42.0993 92.1345 42.4884ZM91.3754 43.5168V42.3618C91.3754 42.0952 91.359 41.8612 91.3264 41.6599C91.2965 41.4558 91.2516 41.2817 91.1917 41.1375C91.1318 40.9933 91.0557 40.8763 90.9632 40.7865C90.8734 40.6967 90.7686 40.6314 90.6489 40.5906C90.5319 40.5471 90.4 40.5253 90.253 40.5253C90.0735 40.5253 89.9143 40.5593 89.7755 40.6274C89.6368 40.6927 89.5198 40.7974 89.4246 40.9416C89.3321 41.0858 89.2613 41.2749 89.2123 41.5089C89.1634 41.7429 89.1389 42.0272 89.1389 42.3618V43.5168C89.1389 43.7835 89.1538 44.0188 89.1838 44.2229C89.2164 44.4269 89.264 44.6038 89.3266 44.7534C89.3892 44.9003 89.4654 45.0214 89.5552 45.1166C89.6449 45.2119 89.7483 45.2826 89.8653 45.3289C89.985 45.3724 90.117 45.3941 90.2612 45.3941C90.4462 45.3941 90.6081 45.3588 90.7469 45.288C90.8856 45.2173 91.0012 45.1071 91.0938 44.9575C91.189 44.8051 91.2597 44.6106 91.306 44.3739C91.3522 44.1344 91.3754 43.8488 91.3754 43.5168ZM97.0971 42.4884V43.3944C97.0971 43.8814 97.0536 44.2922 96.9665 44.6269C96.8795 44.9615 96.7543 45.2309 96.5911 45.435C96.4278 45.639 96.2306 45.7873 95.9993 45.8798C95.7708 45.9696 95.5123 46.0145 95.2239 46.0145C94.9953 46.0145 94.7845 45.9859 94.5913 45.9288C94.3981 45.8716 94.224 45.7805 94.0689 45.6553C93.9166 45.5275 93.786 45.3615 93.6771 45.1574C93.5683 44.9534 93.4853 44.7058 93.4282 44.4147C93.371 44.1235 93.3425 43.7835 93.3425 43.3944V42.4884C93.3425 42.0013 93.386 41.5932 93.4731 41.264C93.5629 40.9348 93.6894 40.6709 93.8526 40.4723C94.0159 40.2709 94.2118 40.1267 94.4403 40.0397C94.6716 39.9526 94.93 39.9091 95.2157 39.9091C95.447 39.9091 95.6592 39.9376 95.8524 39.9948C96.0483 40.0492 96.2224 40.1376 96.3748 40.2601C96.5271 40.3798 96.6564 40.5403 96.7625 40.7416C96.8713 40.9402 96.9543 41.1838 97.0114 41.4722C97.0686 41.7606 97.0971 42.0993 97.0971 42.4884ZM96.338 43.5168V42.3618C96.338 42.0952 96.3217 41.8612 96.2891 41.6599C96.2591 41.4558 96.2142 41.2817 96.1544 41.1375C96.0945 40.9933 96.0184 40.8763 95.9258 40.7865C95.8361 40.6967 95.7313 40.6314 95.6116 40.5906C95.4946 40.5471 95.3626 40.5253 95.2157 40.5253C95.0362 40.5253 94.877 40.5593 94.7382 40.6274C94.5995 40.6927 94.4825 40.7974 94.3872 40.9416C94.2947 41.0858 94.224 41.2749 94.175 41.5089C94.1261 41.7429 94.1016 42.0272 94.1016 42.3618V43.5168C94.1016 43.7835 94.1165 44.0188 94.1465 44.2229C94.1791 44.4269 94.2267 44.6038 94.2893 44.7534C94.3519 44.9003 94.4281 45.0214 94.5178 45.1166C94.6076 45.2119 94.711 45.2826 94.828 45.3289C94.9477 45.3724 95.0797 45.3941 95.2239 45.3941C95.4089 45.3941 95.5708 45.3588 95.7095 45.288C95.8483 45.2173 95.9639 45.1071 96.0564 44.9575C96.1517 44.8051 96.2224 44.6106 96.2687 44.3739C96.3149 44.1344 96.338 43.8488 96.338 43.5168Z" fill="black" fill-opacity="0.76"/>
<rect width="10" height="8.35821" transform="translate(86.9403 55.9701)" fill="white"/>
<path d="M88.557 59.8209L87.953 59.6658L88.2509 56.707H91.2996V57.4049H88.8917L88.7121 59.021C88.8209 58.9584 88.9583 58.8999 89.1243 58.8455C89.293 58.7911 89.4862 58.7639 89.7038 58.7639C89.9786 58.7639 90.2249 58.8115 90.4425 58.9067C90.6602 58.9993 90.8452 59.1326 90.9976 59.3067C91.1526 59.4808 91.271 59.6903 91.3526 59.9352C91.4342 60.1801 91.4751 60.4535 91.4751 60.7555C91.4751 61.0412 91.4356 61.3037 91.3567 61.5432C91.2805 61.7826 91.1649 61.9921 91.0098 62.1717C90.8547 62.3485 90.6588 62.4859 90.4221 62.5839C90.1881 62.6818 89.912 62.7308 89.5936 62.7308C89.3542 62.7308 89.127 62.6981 88.9121 62.6328C88.6999 62.5648 88.5094 62.4628 88.3407 62.3268C88.1748 62.188 88.0387 62.0166 87.9326 61.8125C87.8292 61.6058 87.7639 61.3636 87.7367 61.0861H88.455C88.4876 61.3092 88.5529 61.4969 88.6509 61.6493C88.7488 61.8016 88.8767 61.9173 89.0345 61.9962C89.195 62.0724 89.3814 62.1105 89.5936 62.1105C89.7732 62.1105 89.9324 62.0792 90.0711 62.0166C90.2099 61.954 90.3269 61.8642 90.4221 61.7472C90.5173 61.6302 90.5894 61.4888 90.6384 61.3228C90.6901 61.1568 90.716 60.9705 90.716 60.7637C90.716 60.5759 90.6901 60.4018 90.6384 60.2413C90.5867 60.0808 90.5092 59.9406 90.4058 59.8209C90.3051 59.7012 90.1813 59.6087 90.0344 59.5434C89.8875 59.4754 89.7188 59.4414 89.5283 59.4414C89.2753 59.4414 89.0835 59.4754 88.9529 59.5434C88.825 59.6114 88.6931 59.7039 88.557 59.8209ZM96.2949 59.2047V60.1107C96.2949 60.5977 96.2514 61.0085 96.1643 61.3432C96.0772 61.6779 95.9521 61.9472 95.7888 62.1513C95.6256 62.3553 95.4283 62.5036 95.1971 62.5961C94.9685 62.6859 94.7101 62.7308 94.4217 62.7308C94.1931 62.7308 93.9822 62.7022 93.7891 62.6451C93.5959 62.588 93.4218 62.4968 93.2667 62.3717C93.1143 62.2438 92.9837 62.0778 92.8749 61.8738C92.7661 61.6697 92.6831 61.4221 92.6259 61.131C92.5688 60.8399 92.5402 60.4998 92.5402 60.1107V59.2047C92.5402 58.7177 92.5838 58.3095 92.6708 57.9803C92.7606 57.6511 92.8871 57.3872 93.0504 57.1886C93.2136 56.9872 93.4095 56.843 93.6381 56.756C93.8693 56.6689 94.1278 56.6254 94.4135 56.6254C94.6448 56.6254 94.857 56.654 95.0501 56.7111C95.246 56.7655 95.4202 56.8539 95.5725 56.9764C95.7249 57.0961 95.8541 57.2566 95.9602 57.4579C96.0691 57.6566 96.1521 57.9001 96.2092 58.1885C96.2663 58.4769 96.2949 58.8156 96.2949 59.2047ZM95.5358 60.2331V59.0782C95.5358 58.8115 95.5195 58.5775 95.4868 58.3762C95.4569 58.1721 95.412 57.998 95.3522 57.8538C95.2923 57.7096 95.2161 57.5926 95.1236 57.5028C95.0338 57.413 94.9291 57.3477 94.8094 57.3069C94.6924 57.2634 94.5604 57.2416 94.4135 57.2416C94.2339 57.2416 94.0748 57.2756 93.936 57.3437C93.7972 57.409 93.6802 57.5137 93.585 57.6579C93.4925 57.8021 93.4218 57.9912 93.3728 58.2252C93.3238 58.4592 93.2993 58.7435 93.2993 59.0782V60.2331C93.2993 60.4998 93.3143 60.7351 93.3442 60.9392C93.3769 61.1432 93.4245 61.3201 93.4871 61.4697C93.5496 61.6166 93.6258 61.7377 93.7156 61.8329C93.8054 61.9282 93.9088 61.9989 94.0258 62.0452C94.1455 62.0887 94.2775 62.1105 94.4217 62.1105C94.6067 62.1105 94.7685 62.0751 94.9073 62.0043C95.0461 61.9336 95.1617 61.8234 95.2542 61.6738C95.3494 61.5214 95.4202 61.3269 95.4664 61.0902C95.5127 60.8507 95.5358 60.5651 95.5358 60.2331Z" fill="black" fill-opacity="0.76"/>
<rect width="5" height="8.35821" transform="translate(92.1642 72.6865)" fill="white"/>
<path d="M96.6867 75.9211V76.8271C96.6867 77.3141 96.6432 77.725 96.5561 78.0596C96.469 78.3943 96.3439 78.6636 96.1806 78.8677C96.0174 79.0718 95.8201 79.22 95.5889 79.3125C95.3603 79.4023 95.1018 79.4472 94.8134 79.4472C94.5849 79.4472 94.374 79.4187 94.1809 79.3615C93.9877 79.3044 93.8136 79.2132 93.6585 79.0881C93.5061 78.9602 93.3755 78.7942 93.2667 78.5902C93.1578 78.3861 93.0749 78.1385 93.0177 77.8474C92.9606 77.5563 92.932 77.2162 92.932 76.8271V75.9211C92.932 75.4341 92.9756 75.026 93.0626 74.6968C93.1524 74.3675 93.2789 74.1036 93.4422 73.905C93.6054 73.7037 93.8013 73.5595 94.0299 73.4724C94.2611 73.3853 94.5196 73.3418 94.8053 73.3418C95.0365 73.3418 95.2488 73.3704 95.4419 73.4275C95.6378 73.4819 95.812 73.5704 95.9643 73.6928C96.1167 73.8125 96.2459 73.973 96.352 74.1744C96.4609 74.373 96.5438 74.6165 96.601 74.9049C96.6581 75.1933 96.6867 75.532 96.6867 75.9211ZM95.9276 76.9496V75.7946C95.9276 75.528 95.9113 75.294 95.8786 75.0926C95.8487 74.8886 95.8038 74.7144 95.7439 74.5702C95.6841 74.426 95.6079 74.309 95.5154 74.2193C95.4256 74.1295 95.3209 74.0642 95.2011 74.0234C95.0842 73.9798 94.9522 73.9581 94.8053 73.9581C94.6257 73.9581 94.4665 73.9921 94.3278 74.0601C94.189 74.1254 94.072 74.2301 93.9768 74.3743C93.8843 74.5185 93.8136 74.7076 93.7646 74.9416C93.7156 75.1756 93.6911 75.4599 93.6911 75.7946V76.9496C93.6911 77.2162 93.7061 77.4515 93.736 77.6556C93.7687 77.8597 93.8163 78.0365 93.8789 78.1861C93.9414 78.3331 94.0176 78.4541 94.1074 78.5494C94.1972 78.6446 94.3006 78.7153 94.4176 78.7616C94.5373 78.8051 94.6692 78.8269 94.8134 78.8269C94.9985 78.8269 95.1603 78.7915 95.2991 78.7208C95.4379 78.65 95.5535 78.5398 95.646 78.3902C95.7412 78.2378 95.812 78.0433 95.8582 77.8066C95.9045 77.5672 95.9276 77.2815 95.9276 76.9496Z" fill="black" fill-opacity="0.76"/>
<rect width="15" height="8.35821" transform="translate(82.7612 22.5374)" fill="white"/>
<path d="M85.9229 23.2416V29.2164H85.1679V24.1844L83.6456 24.7394V24.0578L85.8046 23.2416H85.9229ZM89.3593 26.3882L88.7553 26.2331L89.0532 23.2743H92.1018V23.9721H89.6939L89.5143 25.5883C89.6232 25.5257 89.7606 25.4672 89.9265 25.4128C90.0952 25.3584 90.2884 25.3312 90.5061 25.3312C90.7809 25.3312 91.0271 25.3788 91.2448 25.474C91.4624 25.5665 91.6474 25.6998 91.7998 25.874C91.9549 26.0481 92.0732 26.2576 92.1549 26.5025C92.2365 26.7473 92.2773 27.0208 92.2773 27.3228C92.2773 27.6085 92.2378 27.871 92.1589 28.1104C92.0828 28.3499 91.9671 28.5594 91.812 28.7389C91.657 28.9158 91.4611 29.0532 91.2244 29.1511C90.9904 29.2491 90.7142 29.2981 90.3959 29.2981C90.1565 29.2981 89.9293 29.2654 89.7143 29.2001C89.5021 29.1321 89.3117 29.0301 89.143 28.894C88.977 28.7553 88.841 28.5839 88.7348 28.3798C88.6315 28.173 88.5662 27.9309 88.539 27.6533H89.2572C89.2899 27.8765 89.3552 28.0642 89.4531 28.2165C89.5511 28.3689 89.679 28.4845 89.8368 28.5634C89.9973 28.6396 90.1837 28.6777 90.3959 28.6777C90.5754 28.6777 90.7346 28.6464 90.8734 28.5839C91.0121 28.5213 91.1291 28.4315 91.2244 28.3145C91.3196 28.1975 91.3917 28.056 91.4407 27.8901C91.4923 27.7241 91.5182 27.5377 91.5182 27.3309C91.5182 27.1432 91.4923 26.9691 91.4407 26.8085C91.389 26.648 91.3114 26.5079 91.208 26.3882C91.1074 26.2685 90.9836 26.176 90.8366 26.1107C90.6897 26.0427 90.521 26.0086 90.3306 26.0086C90.0775 26.0086 89.8857 26.0427 89.7551 26.1107C89.6273 26.1787 89.4953 26.2712 89.3593 26.3882ZM97.0971 25.7719V26.678C97.0971 27.165 97.0536 27.5758 96.9665 27.9105C96.8795 28.2451 96.7543 28.5145 96.5911 28.7185C96.4278 28.9226 96.2306 29.0709 95.9993 29.1634C95.7708 29.2532 95.5123 29.2981 95.2239 29.2981C94.9953 29.2981 94.7845 29.2695 94.5913 29.2123C94.3981 29.1552 94.224 29.0641 94.0689 28.9389C93.9166 28.811 93.786 28.6451 93.6771 28.441C93.5683 28.237 93.4853 27.9894 93.4282 27.6982C93.371 27.4071 93.3425 27.067 93.3425 26.678V25.7719C93.3425 25.2849 93.386 24.8768 93.4731 24.5476C93.5629 24.2184 93.6894 23.9545 93.8526 23.7558C94.0159 23.5545 94.2118 23.4103 94.4403 23.3232C94.6716 23.2362 94.93 23.1926 95.2157 23.1926C95.447 23.1926 95.6592 23.2212 95.8524 23.2783C96.0483 23.3328 96.2224 23.4212 96.3748 23.5436C96.5271 23.6633 96.6564 23.8239 96.7625 24.0252C96.8713 24.2238 96.9543 24.4673 97.0114 24.7557C97.0686 25.0441 97.0971 25.3829 97.0971 25.7719ZM96.338 26.8004V25.6454C96.338 25.3788 96.3217 25.1448 96.2891 24.9435C96.2591 24.7394 96.2142 24.5653 96.1544 24.4211C96.0945 24.2769 96.0184 24.1599 95.9258 24.0701C95.8361 23.9803 95.7313 23.915 95.6116 23.8742C95.4946 23.8307 95.3626 23.8089 95.2157 23.8089C95.0362 23.8089 94.877 23.8429 94.7382 23.9109C94.5995 23.9762 94.4825 24.081 94.3872 24.2252C94.2947 24.3694 94.224 24.5585 94.175 24.7925C94.1261 25.0264 94.1016 25.3108 94.1016 25.6454V26.8004C94.1016 27.067 94.1165 27.3024 94.1465 27.5064C94.1791 27.7105 94.2267 27.8873 94.2893 28.037C94.3519 28.1839 94.4281 28.305 94.5178 28.4002C94.6076 28.4954 94.711 28.5662 94.828 28.6124C94.9477 28.656 95.0797 28.6777 95.2239 28.6777C95.4089 28.6777 95.5708 28.6423 95.7095 28.5716C95.8483 28.5009 95.9639 28.3907 96.0564 28.241C96.1517 28.0887 96.2224 27.8941 96.2687 27.6574C96.3149 27.418 96.338 27.1323 96.338 26.8004Z" fill="black" fill-opacity="0.76"/>
<rect width="15" height="8.35821" transform="translate(82.7612 5.82092)" fill="white"/>
<path d="M87.335 11.8797V12.5H83.4457V11.9572L85.3924 9.79011C85.6318 9.52348 85.8168 9.29765 85.9474 9.11264C86.0807 8.92491 86.1732 8.75758 86.2249 8.61066C86.2794 8.46102 86.3066 8.30865 86.3066 8.15357C86.3066 7.95767 86.2657 7.78082 86.1841 7.62302C86.1052 7.46249 85.9882 7.33462 85.8331 7.23939C85.6781 7.14416 85.4903 7.09655 85.2699 7.09655C85.006 7.09655 84.7856 7.14824 84.6088 7.25163C84.4347 7.3523 84.3041 7.49378 84.217 7.67607C84.1299 7.85836 84.0864 8.06786 84.0864 8.30457H83.3314C83.3314 7.96992 83.4049 7.66383 83.5518 7.38631C83.6987 7.10879 83.9164 6.88841 84.2048 6.72516C84.4932 6.5592 84.8482 6.47621 85.2699 6.47621C85.6454 6.47621 85.9665 6.54287 86.2331 6.67619C86.4997 6.80679 86.7038 6.9918 86.8453 7.23123C86.9895 7.46793 87.0616 7.74545 87.0616 8.06378C87.0616 8.23791 87.0316 8.41476 86.9718 8.59433C86.9147 8.77118 86.8344 8.94803 86.731 9.12488C86.6303 9.30173 86.512 9.47586 86.3759 9.64727C86.2426 9.81868 86.0998 9.98737 85.9474 10.1533L84.3558 11.8797H87.335ZM92.1345 9.0555V9.96152C92.1345 10.4485 92.0909 10.8594 92.0039 11.194C91.9168 11.5287 91.7916 11.798 91.6284 12.0021C91.4651 12.2062 91.2679 12.3544 91.0366 12.4469C90.8081 12.5367 90.5496 12.5816 90.2612 12.5816C90.0327 12.5816 89.8218 12.5531 89.6286 12.4959C89.4354 12.4388 89.2613 12.3476 89.1062 12.2225C88.9539 12.0946 88.8233 11.9286 88.7144 11.7246C88.6056 11.5205 88.5226 11.2729 88.4655 10.9818C88.4084 10.6907 88.3798 10.3506 88.3798 9.96152V9.0555C88.3798 8.56849 88.4233 8.16037 88.5104 7.83116C88.6002 7.50194 88.7267 7.23803 88.8899 7.03941C89.0532 6.83808 89.2491 6.69387 89.4776 6.60681C89.7089 6.51975 89.9674 6.47621 90.253 6.47621C90.4843 6.47621 90.6965 6.50478 90.8897 6.56192C91.0856 6.61633 91.2597 6.70476 91.4121 6.82719C91.5644 6.94691 91.6937 7.10743 91.7998 7.30877C91.9086 7.50739 91.9916 7.75089 92.0487 8.0393C92.1059 8.3277 92.1345 8.66643 92.1345 9.0555ZM91.3754 10.084V8.92899C91.3754 8.66235 91.359 8.42837 91.3264 8.22703C91.2965 8.02297 91.2516 7.84884 91.1917 7.70464C91.1318 7.56044 91.0557 7.44345 90.9632 7.35366C90.8734 7.26388 90.7686 7.19858 90.6489 7.15777C90.5319 7.11423 90.4 7.09247 90.253 7.09247C90.0735 7.09247 89.9143 7.12648 89.7755 7.1945C89.6368 7.25979 89.5198 7.36454 89.4246 7.50875C89.3321 7.65295 89.2613 7.84204 89.2123 8.07603C89.1634 8.31001 89.1389 8.59433 89.1389 8.92899V10.084C89.1389 10.3506 89.1538 10.5859 89.1838 10.79C89.2164 10.9941 89.264 11.1709 89.3266 11.3205C89.3892 11.4675 89.4654 11.5885 89.5552 11.6838C89.6449 11.779 89.7483 11.8497 89.8653 11.896C89.985 11.9395 90.117 11.9613 90.2612 11.9613C90.4462 11.9613 90.6081 11.9259 90.7469 11.8552C90.8856 11.7844 91.0012 11.6742 91.0938 11.5246C91.189 11.3722 91.2597 11.1777 91.306 10.941C91.3522 10.7016 91.3754 10.4159 91.3754 10.084ZM97.0971 9.0555V9.96152C97.0971 10.4485 97.0536 10.8594 96.9665 11.194C96.8795 11.5287 96.7543 11.798 96.5911 12.0021C96.4278 12.2062 96.2306 12.3544 95.9993 12.4469C95.7708 12.5367 95.5123 12.5816 95.2239 12.5816C94.9953 12.5816 94.7845 12.5531 94.5913 12.4959C94.3981 12.4388 94.224 12.3476 94.0689 12.2225C93.9166 12.0946 93.786 11.9286 93.6771 11.7246C93.5683 11.5205 93.4853 11.2729 93.4282 10.9818C93.371 10.6907 93.3425 10.3506 93.3425 9.96152V9.0555C93.3425 8.56849 93.386 8.16037 93.4731 7.83116C93.5629 7.50194 93.6894 7.23803 93.8526 7.03941C94.0159 6.83808 94.2118 6.69387 94.4403 6.60681C94.6716 6.51975 94.93 6.47621 95.2157 6.47621C95.447 6.47621 95.6592 6.50478 95.8524 6.56192C96.0483 6.61633 96.2224 6.70476 96.3748 6.82719C96.5271 6.94691 96.6564 7.10743 96.7625 7.30877C96.8713 7.50739 96.9543 7.75089 97.0114 8.0393C97.0686 8.3277 97.0971 8.66643 97.0971 9.0555ZM96.338 10.084V8.92899C96.338 8.66235 96.3217 8.42837 96.2891 8.22703C96.2591 8.02297 96.2142 7.84884 96.1544 7.70464C96.0945 7.56044 96.0184 7.44345 95.9258 7.35366C95.8361 7.26388 95.7313 7.19858 95.6116 7.15777C95.4946 7.11423 95.3626 7.09247 95.2157 7.09247C95.0362 7.09247 94.877 7.12648 94.7382 7.1945C94.5995 7.25979 94.4825 7.36454 94.3872 7.50875C94.2947 7.65295 94.224 7.84204 94.175 8.07603C94.1261 8.31001 94.1016 8.59433 94.1016 8.92899V10.084C94.1016 10.3506 94.1165 10.5859 94.1465 10.79C94.1791 10.9941 94.2267 11.1709 94.2893 11.3205C94.3519 11.4675 94.4281 11.5885 94.5178 11.6838C94.6076 11.779 94.711 11.8497 94.828 11.896C94.9477 11.9395 95.0797 11.9613 95.2239 11.9613C95.4089 11.9613 95.5708 11.9259 95.7095 11.8552C95.8483 11.7844 95.9639 11.6742 96.0564 11.5246C96.1517 11.3722 96.2224 11.1777 96.2687 10.941C96.3149 10.7016 96.338 10.4159 96.338 10.084Z" fill="black" fill-opacity="0.76"/>
<path d="M76.2765 92.264C78.561 96.4205 81.919 99.8876 86.0003 102.304C90.0816 104.72 94.7365 105.996 99.4794 106C104.222 106.004 108.879 104.734 112.964 102.325C117.049 99.9149 120.413 96.453 122.704 92.3002L99.5 79.5L76.2765 92.264Z" fill="#4B93FF" stroke="white" stroke-width="1.04478"/>
<path d="M135.011 99.3446C138.377 93.2537 140.095 86.3903 139.996 79.4323C139.897 72.4742 137.985 65.6623 134.448 59.6695C130.911 53.6766 125.872 48.7101 119.829 45.2606C113.785 41.811 106.946 39.9978 99.9873 40L100 80L135.011 99.3446Z" fill="#FF4D5A" stroke="white" stroke-width="1.04478"/>
<g filter="url(#filter0_di_4617_43499)">
<path d="M99.4776 27.7612C90.3981 27.7612 81.4753 30.1277 73.5891 34.6274C65.703 39.127 59.1258 45.6044 54.5061 53.4208C49.8864 61.2373 47.3837 70.1228 47.2449 79.2013C47.1061 88.2798 49.3359 97.2377 53.7144 105.192L99.4776 80V27.7612Z" fill="#08872B"/>
<path d="M99.4776 27.7612C90.3981 27.7612 81.4753 30.1277 73.5891 34.6274C65.703 39.127 59.1258 45.6044 54.5061 53.4208C49.8864 61.2373 47.3837 70.1228 47.2449 79.2013C47.1061 88.2798 49.3359 97.2377 53.7144 105.192L99.4776 80V27.7612Z" stroke="white" stroke-width="1.04478"/>
</g>
<path d="M75.1388 67.9598L73.4451 73H72.2575L74.4776 67.0578H75.2367L75.1388 67.9598ZM76.5549 73L74.8531 67.9598L74.751 67.0578H75.5142L77.7466 73H76.5549ZM76.4774 70.7921V71.6777H73.29V70.7921H76.4774Z" fill="white"/>
<path d="M100.31 94.0451H101.432C101.402 94.4424 101.292 94.7947 101.102 95.1021C100.911 95.4069 100.646 95.6463 100.306 95.8204C99.9659 95.9946 99.5537 96.0816 99.0694 96.0816C98.6966 96.0816 98.3606 96.0163 98.0613 95.8857C97.7648 95.7524 97.5104 95.5633 97.2982 95.3184C97.0887 95.0709 96.9281 94.7743 96.8166 94.4288C96.705 94.0805 96.6493 93.6901 96.6493 93.2575V92.8045C96.6493 92.3719 96.7064 91.9814 96.8207 91.6332C96.9349 91.2849 97.0982 90.9883 97.3104 90.7435C97.5253 90.4959 97.7825 90.3054 98.0817 90.1721C98.3837 90.0388 98.7211 89.9721 99.0939 89.9721C99.5782 89.9721 99.9876 90.0619 100.322 90.2415C100.657 90.4183 100.917 90.6618 101.102 90.972C101.287 91.2822 101.398 91.6386 101.436 92.0413H100.314C100.292 91.791 100.238 91.5787 100.151 91.4046C100.067 91.2305 99.9387 91.0985 99.7673 91.0087C99.5986 90.9162 99.3741 90.87 99.0939 90.87C98.8762 90.87 98.6844 90.9108 98.5184 90.9924C98.3552 91.074 98.2191 91.1965 98.1103 91.3597C98.0015 91.5203 97.9199 91.7216 97.8654 91.9637C97.811 92.2032 97.7838 92.4807 97.7838 92.7963V93.2575C97.7838 93.5595 97.8083 93.8302 97.8573 94.0696C97.9062 94.309 97.9824 94.5117 98.0858 94.6777C98.1892 94.8437 98.3225 94.9702 98.4858 95.0573C98.649 95.1443 98.8436 95.1878 99.0694 95.1878C99.3442 95.1878 99.5673 95.1443 99.7387 95.0573C99.9128 94.9702 100.045 94.8423 100.135 94.6736C100.227 94.5049 100.286 94.2954 100.31 94.0451Z" fill="white"/>
<path d="M117.192 70.3513H115.674L115.665 69.5596H116.967C117.19 69.5596 117.377 69.5283 117.526 69.4657C117.676 69.4031 117.789 69.312 117.865 69.1923C117.944 69.0726 117.984 68.927 117.984 68.7556C117.984 68.5651 117.947 68.4101 117.873 68.2903C117.803 68.1706 117.691 68.0836 117.539 68.0292C117.386 67.972 117.193 67.9434 116.959 67.9434H116.037V73H114.915V67.0578H116.959C117.297 67.0578 117.597 67.0905 117.861 67.1558C118.128 67.2184 118.354 67.3163 118.539 67.4496C118.724 67.5829 118.864 67.7503 118.959 67.9516C119.057 68.1529 119.106 68.3924 119.106 68.6699C119.106 68.9148 119.049 69.1406 118.934 69.3474C118.823 69.5514 118.65 69.7174 118.416 69.8453C118.185 69.9731 117.891 70.0466 117.535 70.0656L117.192 70.3513ZM117.143 73H115.343L115.812 72.1185H117.143C117.366 72.1185 117.55 72.0817 117.694 72.0083C117.841 71.9348 117.95 71.8341 118.02 71.7063C118.094 71.5757 118.13 71.426 118.13 71.2573C118.13 71.0723 118.098 70.9118 118.033 70.7758C117.97 70.6397 117.869 70.535 117.731 70.4615C117.594 70.3881 117.415 70.3513 117.192 70.3513H116.025L116.033 69.5596H117.518L117.775 69.8657C118.118 69.8684 118.397 69.9364 118.612 70.0697C118.83 70.203 118.99 70.3745 119.094 70.584C119.197 70.7935 119.249 71.0193 119.249 71.2614C119.249 71.6423 119.166 71.962 119 72.2205C118.837 72.479 118.597 72.6735 118.281 72.8041C117.969 72.9347 117.589 73 117.143 73Z" fill="white"/>
<defs>
<filter id="filter0_di_4617_43499" x="34.1791" y="14.7016" width="78.3582" height="103.737" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset/>
<feGaussianBlur stdDeviation="6.26866"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.36 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4617_43499"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4617_43499" result="shape"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset/>
<feGaussianBlur stdDeviation="3.13433"/>
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/>
<feBlend mode="normal" in2="shape" result="effect2_innerShadow_4617_43499"/>
</filter>
</defs>
</svg>
",
+  "description": "Displays the latest values of the attributes or time-series data in a polar area chart. Supports numeric values only.",
   "descriptor": {
     "type": "latest",
-    "sizeX": 7,
-    "sizeY": 5,
-    "resources": [
-      {
-        "url": "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"
-      }
-    ],
-    "templateHtml": "<canvas id=\"pieChart\"></canvas>\n",
+    "sizeX": 5,
+    "sizeY": 4,
+    "resources": [],
+    "templateHtml": "<tb-polar-area-chart-widget \n    [ctx]=\"ctx\"\n    [widgetTitlePanel]=\"widgetTitlePanel\">\n</tb-polar-area-chart-widget>",
     "templateCss": "",
-    "controllerScript": "self.onInit = function() {\n    $scope = self.ctx.$scope;\n    utils = $scope.$injector.get(self.ctx.servicesMap.get('utils'));\n    settings = utils.deepClone(self.ctx.settings) || {};\n    settings.showTooltip = utils.defaultValue(settings.showTooltip, true);\n    \n    Chart.defaults.global.tooltips.enabled = settings.showTooltip;\n    \n    var pieData = {\n        labels: [],\n        datasets: []\n    };\n\n    var dataset = {\n        data: [],\n        backgroundColor: [],\n        borderColor: [],\n        borderWidth: [],\n        hoverBackgroundColor: []\n    }\n\n    pieData.datasets.push(dataset);\n    \n    for (var i = 0; i < self.ctx.data.length; i++) {\n        var dataKey = self.ctx.data[i].dataKey;\n        var units = dataKey.units && dataKey.units.length ? dataKey.units : self.ctx.units;\n        units = units ? (' (' + units + ')') : '';\n        pieData.labels.push(dataKey.label + units);\n        dataset.data.push(0);\n        var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n        var borderColor = tinycolor(dataKey.color).darken();\n        dataset.backgroundColor.push(dataKey.color);\n        dataset.borderColor.push('#fff');\n        dataset.borderWidth.push(5);\n        dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n    }\n    \n    var floatingPoint;\n    if (typeof self.ctx.decimals !== 'undefined' && self.ctx.decimals !== null) {\n        floatingPoint = self.ctx.widget.config.decimals;\n    } else {\n        floatingPoint = 2;\n    }\n\n\n    var ctx = $('#pieChart', self.ctx.$container);\n    self.ctx.chart = new Chart(ctx, {\n        type: 'polarArea',\n        data: pieData,\n        options: {\n            responsive: false,\n            maintainAspectRatio: false,\n            scale: {\n                ticks: {\n                    callback: function(tick) {\n                    \treturn tick.toFixed(floatingPoint);\n                    }\n                }\n            }\n        }\n    });\n    \n    self.onResize();\n}\n\nself.onDataUpdated = function() {\n    for (var i = 0; i < self.ctx.data.length; i++) {\n        var cellData = self.ctx.data[i];\n        if (cellData.data.length > 0) {\n            var decimals;\n            if (typeof cellData.dataKey.decimals !== 'undefined' \n                && cellData.dataKey.decimals !== null ) {\n                decimals = cellData.dataKey.decimals; \n            } else {\n                decimals = self.ctx.decimals;\n            }\n            var tvPair = cellData.data[cellData.data.length - 1];\n            var value = self.ctx.utils.formatValue(tvPair[1], decimals);\n            self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n        }\n    }\n    self.ctx.chart.update();\n}\n\nself.onResize = function() {\n    if (self.ctx.height >= 70) {\n        try {\n            self.ctx.chart.resize();\n        } catch (e) {}\n    }\n}\n\nself.onDestroy = function() {\n    self.ctx.chart.destroy();\n    self.ctx.chart = null;\n}\n",
+    "controllerScript": "self.onInit = function() {\n    self.ctx.$scope.polarAreaChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.polarAreaChartWidget.onDataUpdated();\n};\n\nself.typeParameters = function() {\n    return {\n        previewWidth: '500px',\n        previewHeight: '380px',\n        embedTitlePanel: true,\n        defaultDataKeysFunction: function() {\n            return [{ name: 'windPower', label: 'Wind', type: 'timeseries', color: '#08872B' },\n                    { name: 'solarPower', label: 'Solar', type: 'timeseries', color: '#FF4D5A' },\n                    { name: 'hydroelectricPower', label: 'Hydroelectric', type: 'timeseries', color: '#FFDE30' }];\n        }\n    };\n};\n\nself.onDestroy = function() {\n};\n\n",
     "settingsSchema": "",
-    "dataKeySettingsSchema": "{}\n",
-    "settingsDirective": "tb-chart-widget-settings",
-    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fifth\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.2074391823443591,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Polar Area\"}"
+    "dataKeySettingsSchema": "",
+    "settingsDirective": "tb-polar-area-chart-widget-settings",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-polar-area-chart-basic-config",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Wind\",\"color\":\"#08872B\",\"settings\":{},\"_hash\":0.7227918773301678,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Solar\",\"color\":\"#FF4D5A\",\"settings\":{},\"_hash\":0.2392660816082064,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Hydroelectric\",\"color\":\"#FFDE30\",\"settings\":{},\"_hash\":0.7051898468567794,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"decimals\":0,\"aggregationType\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":null,\"padding\":\"0px\",\"settings\":{},\"title\":\"Polar area\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"units\":null,\"decimals\":0,\"useDashboardTimewindow\":true,\"showLegend\":false,\"widgetStyle\":{},\"actions\":{\"headerButton\":[]},\"configMode\":\"basic\",\"displayTimewindow\":true,\"margin\":\"0px\",\"borderRadius\":\"\",\"widgetCss\":\"\",\"pageSize\":1024,\"noDataDisplayMessage\":\"\",\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleIcon\":\"bar_chart\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true}}"
   },
-  "externalId": null
+  "tags": [
+    "polar",
+    "polar area",
+    "bars",
+    "polar area chart"
+  ]
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/polar_area_deprecated.json b/application/src/main/data/json/system/widget_types/polar_area_deprecated.json
new file mode 100644
index 0000000000..b37392c867
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/polar_area_deprecated.json
@@ -0,0 +1,25 @@
+{
+  "fqn": "charts.polar_area_chart_js",
+  "name": "Polar Area",
+  "deprecated": true,
+  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAYvUlEQVR42u2deXAU15nA+W+zm73/yV7Zqq09aje7SeXY2kocZ7cSH7GdxCG+cJxybHw7Xt/4WB+AY8CAMeEGc4MNAgcMxhgB5r4RkpAAHYCEDoRu0DX31fuTejyaEWjm9fTr7tejefWKksRMT/f3fvO+733He6O0fMs3C9qovAgytlgs5vf7Ez+3tbX19fXlxZIHK/sWjUYLCgqmTZtWVFSkUzVr1qxVq1ZNnz79yJEjefnkwcqy7d+/f8OGDfCk/1pdXb18+XJ+8Pl8EydOzMsnD1aWberUqZ9//jlTVElJCb8ePHhw27Zt+n+98cYbkUgkL6I8WNm0cePGbd++vbm5+Z133jl//vzu3bt37Nih/9f48eMThle+5cEa1jwPBAI9PT0dHR2XLl1K/P2VV17Rf9i3b19hYeGhQ4e2bt2amLGwwPSfeQtv7O3t5SIJvZkHa4SS5PF4WN/V19djOZWVlVVUVDAnNTQ0tLS0JF6Gqc5f+AFL6+jRoxcuXFiwYAG/guCkSZMSL+MtvIy3cxEuxQX5lYvzESOWs1EjDSb02rlz5xj+qqqqxsbGzs5Or9ebmHuGtKampilTpsydO3fevHnhcJi/rFy5cvbs2ZMnTz59+vRwC0k+hctycT6CD+Lj+NCRBlnug8VIX7lypa6urry8nJFGbaGzDNndKLjkX0OhkDgifBDTGx/KR3MD3AY3MxzHebDcMT91dXWhvBjOmpoaphCAcPaWuAFug5vRCeP2cngOy0GwmGCYIU6dOoUOYiAVdAqgVbkxbg99yq0OmRHzYCnX0HHMByCFbeSK0eImuVVumNvm5vNgKaf1Ll++jBFTWVnJTOA6/cINc9vcPI+ABZYHS4nGSDAkqBVsZLc/C49w9uxZHgfzKw+Wk4qPrzgjkWNKBLzwhPFors6hcCVYmCa1tbV4I3Pgmz1c49HOnDnDqjYYDObBssMcwc2Ntdva2prz/kbcXTwmD8sju+5h3QQWzmvsDxZQVnyJGbjO7p6K2oY9RWUFhXsXrN8yfeVHExeufmnm4t9MnpP8ytf3BaYdDS4qDa6rDBXWhsvaIt0BC0cd7xfzFg/O4+fBkj9RsSzH6yNX93X19p2oOAtGk5aseey3v3vwzXeH68nv+ocFfVf3by/33LnR99KewMpToVPt0Yhs1zprFN3p5ZapywVgkZ2CMcu3Vo/WmWzhSOT0+boPtu5iKkpDklGwhvSvLe4bs9k343iwpDUSlUQCj49liVFPmmEeLLMNBw9GBv+aHpXI8dPV89dteXLSbHGesgYruf/nCs/LewI7LoT9Er4XGvk5CAS/XR6s7NUfCQLYFibz6S61d360c//TU+dnwZMUsBL960s9r+0LFLeYDTEhEFbEFy9eVFktKgoWFisOKtRf1pE+hM4U9daiD8zwJBesRL9tvXf16ZDPxASGWBAOIpJiHowUsPhG4sJhpZ21FXWg5NSrs5ZKQcoKsPT+nRWeecXBHhMrStwQCErNDGnlwMKNjg2RXcgsGo3tKy5/YcYiiUhZB1ZCP04/FuzKFi+WyYhLwXCWWmDpYsoulFF5oWH8/FXSkbIaLL1/c5lnYWkwlJWTAnEhNNWCEAqBpbtqslhLt1/pnr1mk0VI2QOW3m8q8O5tyMamRBsiOqWWiqqAhUMhC3OBVdHeE+WPvz3LUqpsA0vvD33mb/XEsmALAZr3y+QUWHzVEIrR1LzOrp7pK9ZbjZT9YOma8eOzhpd7CBAxKpLR5TxYGAdM40bnqiNlFdm5Ol0Blt6f3uk3GoWELYSpAlsOg6WvAQ3ZVcT8cXjahpSDYNG/v9pT3mbMpEeYWS+AcgQsZimjIrjS00fA2GaqHASL/q/v931UZay+SF8nOhtSdAwsfOsYBIYWMrUXm5+ZNt9+qpwFS+8TDgQiRrQi2hDxOuiXdwYs4i2EI5KL2TM2UhJsWP0pCxb98UJ/wIgvAvEiZKfiic6ARXSZDBDx1xdXnHvkrZlOUaUIWHRScXqDBkAhnkiseqSApZc6iUeXdx0rHTt+hoNUqQOWHsBu9xoo8CcPwhHHqd1g6Qa7uHPh0MkzY8e/6yxVSoFFv2Gtt8MXMyRw+8t3bQULfU8uqLh3mLzhhybMcJwq1cCi/+z3XnGdSG4gYrfZ2LIVLPLW0fri1vojE2eqQJWCYNFJsfeGRFnBok3eUC6nwKLIBKew4AL4QlNL+uqGPFj0sVt9gj4IxI7w2Qks18BiHhavHO/u8zz/7iJ1qFIWLPo7R0Qr4fBsUYhhm0K0CSy2tBP0L1D1MGnxGqWoUhks+ibhcDVDkHVeropgsSRhYSK479myTdtVo0pxsIj5UDQrIlsKfRkIe2r27QBL/ItypLxSQaoUB4v+vdUewTwI3PHi6yelwSJ/AR+diGq/0tP71JS5ebCy6y/uFnINkhtCDNGG3AfLwcJgFLHZIW/q8nVqUuUKsOjbaoSMLYYDt5a7wWIlIvgMhYeKlKXKLWCxf4RgTjOD0t3d7VawdBeDyK5ol7t7HcxcyBmw6E/tEFKIlIsxNG4Fi9gnOziKvHLeuk9UpspFYNH3NwqtEMmosTSD2UKwsK5ECikraxsUp8pdYN1c4A1HhSYtSy0tq8BCA4pMtpFI9LU5y/Ngye1Ly4RchgyQdctDq8Bi3z2RNCAq4tWnynVgfWOpR2RLCP2YDDeBpbvaM/qumK4M7X6WB0u8zzqR2b2OT8u6VC1LwLo00DK+jD1hXEGVG8ESnLRIZLIonUY+WExUZGhk/B6wM4zcnYbyYA3pc4uDIrqFwbIi5UE+WDh2RbwMR1UNC+YMWN9a5hHJBGSwrHCWygeLGKdI8vHkpWvzYFndRSpdSVzmjDvVwcIe5DC+jBU4zR2XVSiRyHmwRm/IXAxNcilDJv1sTslg4cwVWcGu2bbbRVS5Fyz66fbMxHCatfR92ySDxaSaUQ+GwmFl02NyDyzO0XBEG8oEi8WFSKZofxFY3UUmLSs2C82DlejXrfb89lCgtDVz6JAhY+DUBYs6HOKDxjxe7Z2b9xx+dfayPFiy+vUf9PPEbvKGXAiEd+TW8MgEi4qJrL1t9c1tG3cdVDZuqD5Y7F/63vFgRUeWNjieUkN7tNgKFh4R82dSslPtzqMlOCOUWjYqC9bN67xEb0Qs9IzJDpjwKoKF5VRWVpZ5q4+eI1rpD7SOzVooQ4i6o0shwlQDS+eptkuaj4CBw+kg0QUvDSxRA6thirb/D+K96D+05qVaqC39O8gvhTBOD3xownsjGax/XNi/ZQM81XfLPrTui/w5iWaWNLDa2trY9Srz607dOgjWIGH/rrWu1ELt6d/a5/UdLquY9eHHD098b+SA9U8L++7e5FtxKpTFHt2GGsPX3t6uHFj19fWZIzmxoHboL68BVqIf/xetabbmz1D45vH5dcJs2zXEfrASPInvhmWy4c1qaGhQDiyhibT7cDqqkvuRv9MaZ2oBnjOdWL3+QNGZ6iUbt1ldi2EbWJQ1P7LNzybvIkkv7NYnsawZY0ZisrIcsHTLPXO8qWm+KFiJfvgr/WZZ/xyWTtDBULisugbCLNr83Wqw/m1xnKc+IztBisQ5DNnvDKIs+10OWKT1UO4s4JB4yjBYiX7wT7Tzz2h95Vosmj5eBGErP9lh8uRLe8C6/gMv+ekNPbFQJJvhhCq5oZgszgexFixRL0jZD7MHa5CwP9Vqx2meM+kJI5HwXEMTgaNnpy1QDawfrvGurwp1+szODehB0vRU80TKBEvU7jv81xLAGuxf7p/Deo5rsZAIYc9NX+gsWD9a6y2oCHX4ZBrjOJ8kbubOIMrSrXLAIpKTOSAQbJFKVXL/klZ5f7/rNS1hWA91l1oJTb78uyV2gjV6o3f7hXBXwJLFHXWnGN2yrsYgEpdTCCx8DZmLvXpPWAZWUj9zl9a9X4sG5Aa/swDr3s2+XfVhT8haZ4GQl8eI0cYFFQKL5L7MRc+dW+0AK9HLbuoPHEV6RQibuHC1LLAe+NS/tyHsC2fg6UJ33YeVa2cUzzQpeTYek1hmQ/K7oYMdLAcL/0dmJ1bLclvBSvTym/qZjmQo+U0f/M4I1qOF/mOXIsFMkdLG3sa1Veue2PXUTzeNpt+5ZYzJ5T2Zn7JQ0F1Z6FaFwMLXkHmZWj/JGbASvfR6keA352teTdhwYOk8pT/LGXTOd9XA02OfP6nzlNybPc2KoGDAbWQbWOQfZl6b1LzgMFiJfuJbWusHWiiDacIOg5wLTOCI4Hfy3/95Ud+bB/ozM9PvvRGNRSs7qxafWvpA4cNX85ToR5uPmZE8Z8cZTa5M5wUMhWT5L+SAJVKZo537X1XASg5+t2QOfrM9eCox6V4cjoaLW0vnlM6/77Nfp+Ep0bfUbDXpysKrKdH5zlAqBJZQPOfsE8qBlRz8vrRAC2R/UFYwEjrWfPy94lljtv5KhKdE33DuYzOSR1FITFdnEBlKhcA6efJkZiO0+mF1wRoMTf6VSGgyiadgUcuJmcWz7/n0PkM8JXpB1XozkkfsCF8WWBKvZiNYVQ+4AKzk4HfjNM1fd03CPCHvnsZ9k49NvWPLPdnxlOgrK1bnwTKnCqsedBNYid53DdVQ23XBJE+JvqaqIK8KzRnvxPVcR1XdxOGepqB6nRSwdtTvzBvv5twNF95wGVXF3+E7PKgmWi7Rk7XGM3ueNw8WS8i8u8Gcg7RhqqvA+nKKKzUS8T39sO83D2pJ3x9PyDP6k7tMglXfYyobOMcdpEIx9ksL3QTWlRQNFVw633PDf9GDyxYk/724rcQMVXdsuRs/RT6kM7xTXSQI3bHRNVThGUm2PMpLPDd9VwfLc+N3IyXHk/937sn5WYP12sE3TUo+x4PQQmkzfaXuoOro3yfndcW6u7z33BanaqB777oldmXwYSOxSPqgTZpOANG85HM5bUYo0S/c5Q6w+n1Xgya6/80Xk6nSu///ntOS/HbtvvbswDrdYXZBl+OJfsKpyV9RnaqWFSmrpI3rrqZK76GPUyabHfWfG6Xqwe2PRGNma5pzPDVZtJii5HtKU1V+W7KfPVpX47ntB8OB5bnl+uj5lCq88YffMhbMqV5vUuy5X0whukw9+7i6VB38Cy2SpFP8Pt/Ye4alaqD7fn1nLCm9MRAJ3P3pLwWp+vnmOzv9ZucGiSaR3vC1yqqAtbdgtXmxwqGbFEdlYMak9FTpPfDe5JTgQleNIFjTimaYF7sVBauyriatxJ7s5MxWZF+JqqGbCSnLjP27RajSe3j3jtRQz/qMVOFWNZk4qjf0oNwSe4m+VmlgYfdhwmea2ULawT9TjqoT30yufY21t3pH3ygOlvf2Hw0J9Ty95zlLMxriutrvlxgl1JTdFER0G6OT/6MYWH+khTpSQjfPPCJOVdzYempscqinN9h7+yd3DEfV/YUP+sI+8wLHNcCmIBLBUnQbI6p0hKKhjpdUDOmXt6ess5YvNEpVPNSzfFHydU60Fl+Tqp9t/kVpm5yEJ1ZLcrejlbu/re1bRdpTtioauhmbGropHQzdGO2EekqLkq825+S8q8FaV/2RLHtIVrQ42XJXcatIYS9ItH/vK1VCN4OWb6y31/vL27OkSje2xvyE+M/gUEWHhnreOvq2rJFDbREllDh26m5uq4lvx61IKunQ0M04M1TFQz2vpYR62ryDoZ6XDrzqDctRNPoBlhLXg5ri23GL7m/bucV5qpqXpYRuNq03T1U81LMpRdkV1m2HqlcOvCbFYE+skzhiTZPalD5AQPDIk34FdORvHA3d3JIauqlNF7ox2gn11KQc1/hhZQFOeYlCxn0lFwLVjzwx4As+/6wqoZtg0PfofdKo0r0PD43RAn7Nmoa3SfoJ4VxTbmhIc+pYOa23yDGweotTQjczp8ilKh7q+d07VlDFdIVTVGKeTPxrrv6xcvpBmEKJHPi77afqQkrGZvjgHiuoiod69uyUDhbWlfTpyh0HYRrQhpjPDodu2gyFbgx7H35+Q6ylWaJgdUtI1uazyXrQBUf3asKHjWtRv3b0qzaC9Ycpm3/Eov4XnrCOqrj34dlHtUhElmBZCcpK70xuBJ7dcdi4vmwhRJr5pQ2T7QOrc1tK6Gbl+1ZTFQ/1rFosRap4nnG1S1dYDBODJdHhbiFY2kAKPA43gcm9M8MJKBaFbk6dzD50k02o54R5MwibXVZu5xC/qBWzoFVgYQdgDQh9D0iEsjx089WhoZv7breJKt3YuvensR5TuoaSLIk1XkM8+NKNNgvB0gYqDYVMeDaftdrSSj3yyT/+JTup+iLU87yWrbphJYgZZIW2wmyXWOxqE1jM20QJxKbjeRZS1TQnRfd+8nv7qYqHerZsyC5KJjdNdEgYp6+vz2VgaQPngWUuj9YG0kqLvmZN6OZmC0M3RvutQ0M9IhYFVAnJ0HhjJSjxrC9bwcILL5pDTbad/NDNn6dswW1B6MZwqOfhe8VDPXitMNgl1kpc7WWQ7m23CSwDk5ZmwX5/vSlpd4FZU52lKu59mDVNRBik3SE6uRlXQ6YriZsfOQAW3wnR+RbXg8SUh9pXU8bp4F4VqIqHevbuzEgVHma5+exDGoNihVPUPrD0SUt0ym1bKyl0842hoZtf3KQOWP2hntaWNBoQiVlKFSaKpdaVTWCx7sBWEHUZS1CIhG7aUkI3Lz6pDlVx78Nzj2nXEoheUG6RxzLhu2I4rFsM2geWHuQSNRcwt5lvTIVuUvbjD61aohpVce/DqiXX9Cxk3g3KXINaK0LOzoCFG0YoszQu4NP9uXjZUVX5qxRKT5fZF7rJItRzcjAzDP+n0OZ1MgbCIq+YA2BpA9WVBhKJsjsnbEjops/u0I3JUI8VvvWrQ0PWrTSdAQupYZNiNgqHhMYZBsuXAm7g7ddVpiqeaDrhFc2uhvAZAhvwtRWshA0hvEtYzJghnxq6CW/ZqD5Vce/Dpx/bIHzELr0EQxWwtIF0GgNRTzIBBU+95zDV5INJKBKc8LJbwOJWNVuUoKWLTYfBYh7Gg5J5U5rBRd1lrfjbGag68Mea7xolvOF9u4ZsSqucjTXmJ9ykDWJnqw/EbpsSdAAs7YtULaH80jggV7TS69KB1fjusBx7PcH35zgZeB6u3/bfwcVzY7YoJo6usC7pSiGwaLhqcANGxJPB2W6ZU3evrQRv1GIZrhPrvhJcMo/kAiWQ+vF1FJzFOjvsETVCRtQG1kyuBotGyMJYitk12Tryt1pQdLsBoijBRbO9o29wTPGNviH4/uxYW4udcsY1LZQjnjNgoe9J2zC2CwXlyxX3JIH1Je3yNsMf7PeFt27yPX6/rdkyT9wf/myTdbXRaZzsBLNtNq0cBktfADNLG4xgxLT6t/uRAiwcXWbIbmlmo3aG3EKeHhpD3CbaWOeIeFF/iFfiFvCuAUsbqD3CrjRcfNK+Xiv9fr8zQsrc2dwU/mxzYNLrHGQiQd/dfWtg8htckMs6KFhizHit7DfYVQFLFwFssXIxiEPEipshwSZy7FBozQrg8D/zaP8+bD++Lo0ZTsiIklReHFq7MnLsMG/XFGh4QRGpDfkLSoOlDWQziha4OmAMRikXQ29Gmy5Gz1b196aL/MoftVhUwfvV0+QtzTl2DVi6A4IkIWen7hxoOlWOOBcUBUsbOL0DthSdt9zQ9GJ564ov3AqWvpDBOLAzUJozDaHZkCToVrC0geILFQxPdzWW1QjN6uIId4Ol2ZWhmzMNQan5VRyloLD0U2Lk7g6dkw3fOl5QNRc9o9QUGS5jYj7EEyORSB6gqxtiQThEbBz0rbsSLG0gnkismm9kfqk4pOFPRiwIx6k4oLvBSrYhDOQG5npDFAhEEWeVi8HSBoqWUIsU+YgWkOVoQ+uh/sgFdYUneZQrZMqcT768Om5l+xsPzuNjraus/twHVsK24PvK1GVPyaUijXmaiYrKLXe5jke5S8p8Xym5xMjAGSF9C2HVGg/IY/KwPLJbJiq3gpWwuki6xdelQhjfOt3HA7LPgkun51HuFT3u5uqBZvWWBzY3fVc0nsvVoa1Rbh8GJi2GgWVjDuAFUjwIj6Na4G8kgpVQHHzF2QaYvBHXmSPYUtw2N88j5IxyzxGwEsqRNSPWLjVPrvDXc5PcKjfMbedYTkdOgaU3/Ie604tQGn5qBaNp3BI3htbjJrnVnEydzUGwEo4JLBVWVRzGx0GPDKTjyytugNvgZrglbozbc53WzoOVYsFguDCQaBzsGFQPZr5tSRN8EB/Hh/LR3AC3wc3kvAduRICV3HBe43JkzigrK2Px1djYyBRCaqFEzrgUF+SyXByY+CA+jg8daSnXIwusZEXJSLO/T0NDA2sxhh9vJDYZvwIBKRXoKfjA+sEeigy0BDc0/sh/8QJexot5C2/k7VyES3FBfuXifEQOK7s8WKImP8njLPsJ9HKkO+E5jGvSntBfmETgUjrQ+IFf+SP/paci8mLewht5e76CLdH+H5nMNBUt+3p0AAAAAElFTkSuQmCC",
+  "description": "Displays the latest values of the attributes or time series data for multiple entities in a polar area chart. Supports numeric values only.",
+  "descriptor": {
+    "type": "latest",
+    "sizeX": 7,
+    "sizeY": 5,
+    "resources": [
+      {
+        "url": "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"
+      }
+    ],
+    "templateHtml": "<canvas id=\"pieChart\"></canvas>\n",
+    "templateCss": "",
+    "controllerScript": "self.onInit = function() {\n    $scope = self.ctx.$scope;\n    utils = $scope.$injector.get(self.ctx.servicesMap.get('utils'));\n    settings = utils.deepClone(self.ctx.settings) || {};\n    settings.showTooltip = utils.defaultValue(settings.showTooltip, true);\n    \n    Chart.defaults.global.tooltips.enabled = settings.showTooltip;\n    \n    var pieData = {\n        labels: [],\n        datasets: []\n    };\n\n    var dataset = {\n        data: [],\n        backgroundColor: [],\n        borderColor: [],\n        borderWidth: [],\n        hoverBackgroundColor: []\n    }\n\n    pieData.datasets.push(dataset);\n    \n    for (var i = 0; i < self.ctx.data.length; i++) {\n        var dataKey = self.ctx.data[i].dataKey;\n        var units = dataKey.units && dataKey.units.length ? dataKey.units : self.ctx.units;\n        units = units ? (' (' + units + ')') : '';\n        pieData.labels.push(dataKey.label + units);\n        dataset.data.push(0);\n        var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n        var borderColor = tinycolor(dataKey.color).darken();\n        dataset.backgroundColor.push(dataKey.color);\n        dataset.borderColor.push('#fff');\n        dataset.borderWidth.push(5);\n        dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n    }\n    \n    var floatingPoint;\n    if (typeof self.ctx.decimals !== 'undefined' && self.ctx.decimals !== null) {\n        floatingPoint = self.ctx.widget.config.decimals;\n    } else {\n        floatingPoint = 2;\n    }\n\n\n    var ctx = $('#pieChart', self.ctx.$container);\n    self.ctx.chart = new Chart(ctx, {\n        type: 'polarArea',\n        data: pieData,\n        options: {\n            responsive: false,\n            maintainAspectRatio: false,\n            scale: {\n                ticks: {\n                    callback: function(tick) {\n                    \treturn tick.toFixed(floatingPoint);\n                    }\n                }\n            }\n        }\n    });\n    \n    self.onResize();\n}\n\nself.onDataUpdated = function() {\n    for (var i = 0; i < self.ctx.data.length; i++) {\n        var cellData = self.ctx.data[i];\n        if (cellData.data.length > 0) {\n            var decimals;\n            if (typeof cellData.dataKey.decimals !== 'undefined' \n                && cellData.dataKey.decimals !== null ) {\n                decimals = cellData.dataKey.decimals; \n            } else {\n                decimals = self.ctx.decimals;\n            }\n            var tvPair = cellData.data[cellData.data.length - 1];\n            var value = self.ctx.utils.formatValue(tvPair[1], decimals);\n            self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n        }\n    }\n    self.ctx.chart.update();\n}\n\nself.onResize = function() {\n    if (self.ctx.height >= 70) {\n        try {\n            self.ctx.chart.resize();\n        } catch (e) {}\n    }\n}\n\nself.onDestroy = function() {\n    self.ctx.chart.destroy();\n    self.ctx.chart = null;\n}\n",
+    "settingsSchema": "",
+    "dataKeySettingsSchema": "{}\n",
+    "settingsDirective": "tb-chart-widget-settings",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fifth\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.2074391823443591,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Polar Area\"}"
+  },
+  "externalId": null
+}
\ No newline at end of file
diff --git a/application/src/main/java/org/thingsboard/server/config/TbRuleEngineSecurityConfiguration.java b/application/src/main/java/org/thingsboard/server/config/TbRuleEngineSecurityConfiguration.java
index e1ab755036..15171ba0c7 100644
--- a/application/src/main/java/org/thingsboard/server/config/TbRuleEngineSecurityConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/TbRuleEngineSecurityConfiguration.java
@@ -40,9 +40,9 @@ public class TbRuleEngineSecurityConfiguration {
                         .frameOptions(config -> {}).disable())
                 .cors(cors -> {})
                 .csrf(AbstractHttpConfigurer::disable)
-                .authorizeRequests()
-                .requestMatchers("/actuator/prometheus").permitAll()
-                .anyRequest().authenticated();
+                .authorizeHttpRequests(config -> config
+                        .requestMatchers("/actuator/prometheus").permitAll()
+                        .anyRequest().authenticated());
         return http.build();
     }
 }
diff --git a/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java b/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java
index c27ca35313..eda8d3e89d 100644
--- a/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java
@@ -209,7 +209,7 @@ public class ThingsboardSecurityConfiguration {
                 .csrf(AbstractHttpConfigurer::disable)
                 .exceptionHandling(config -> {})
                 .sessionManagement(config -> config.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
-                .authorizeRequests(config -> config
+                .authorizeHttpRequests(config -> config
                         .requestMatchers(WEBJARS_ENTRY_POINT).permitAll() // Webjars
                         .requestMatchers(DEVICE_API_ENTRY_POINT).permitAll() // Device HTTP Transport API
                         .requestMatchers(FORM_BASED_LOGIN_ENTRY_POINT).permitAll() // Login end-point
@@ -217,10 +217,11 @@ public class ThingsboardSecurityConfiguration {
                         .requestMatchers(TOKEN_REFRESH_ENTRY_POINT).permitAll() // Token refresh end-point
                         .requestMatchers(MAIL_OAUTH2_PROCESSING_ENTRY_POINT).permitAll() // Mail oauth2 code processing url
                         .requestMatchers(DEVICE_CONNECTIVITY_CERTIFICATE_DOWNLOAD_ENTRY_POINT).permitAll() // Device connectivity certificate (public)
-                        .requestMatchers(NON_TOKEN_BASED_AUTH_ENTRY_POINTS).permitAll()) // static resources, user activation and password reset end-points
-                .authorizeRequests(config -> config
+                        .requestMatchers(NON_TOKEN_BASED_AUTH_ENTRY_POINTS).permitAll() // static resources, user activation and password reset end-points
                         .requestMatchers(WS_ENTRY_POINT).permitAll() // Protected WebSocket API End-points
                         .requestMatchers(TOKEN_BASED_AUTH_ENTRY_POINT).authenticated()) // Protected API End-points
+                .formLogin(form -> form
+                        .loginPage("/login").permitAll())
                 .exceptionHandling(config -> config.accessDeniedHandler(restAccessDeniedHandler))
                 .addFilterBefore(buildRestLoginProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
                 .addFilterBefore(buildRestPublicLoginProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
@@ -243,7 +244,7 @@ public class ThingsboardSecurityConfiguration {
     @Bean
     @ConditionalOnMissingBean(CorsFilter.class)
     public CorsFilter corsFilter(@Autowired MvcCorsProperties mvcCorsProperties) {
-        if (mvcCorsProperties.getMappings().size() == 0) {
+        if (mvcCorsProperties.getMappings().isEmpty()) {
             return new CorsFilter(new UrlBasedCorsConfigurationSource());
         } else {
             UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
index 680633e103..63a435e6f1 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
@@ -21,14 +21,11 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -48,7 +45,6 @@ import org.thingsboard.server.common.data.EventInfo;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.id.AssetProfileId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
@@ -56,7 +52,6 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageDataIterableByTenant;
 import org.thingsboard.server.common.data.page.PageLink;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.rule.DefaultRuleChainCreateRequest;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainData;
diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
index eb9d908bab..2eecd61798 100644
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -110,7 +110,7 @@ public class ThingsboardInstallService {
                             log.info("Upgrading ThingsBoard from version 3.5.1 to 3.6.0 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.5.1");
                             dataUpdateService.updateData("3.5.1");
-                            systemDataLoaderService.updateDefaultNotificationConfigs();
+                            systemDataLoaderService.updateDefaultNotificationConfigs(true);
                         case "3.6.0":
                             log.info("Upgrading ThingsBoard from version 3.6.0 to 3.6.1 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.0");
@@ -126,13 +126,14 @@ public class ThingsboardInstallService {
                         case "3.6.2":
                             log.info("Upgrading ThingsBoard from version 3.6.2 to 3.6.3 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.2");
-                            systemDataLoaderService.updateDefaultNotificationConfigs();
+                            systemDataLoaderService.updateDefaultNotificationConfigs(true);
                         case "3.6.3":
                             log.info("Upgrading ThingsBoard from version 3.6.3 to 3.6.4 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.3");
                         case "3.6.4":
                             log.info("Upgrading ThingsBoard from version 3.6.4 to 3.7.0 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.4");
+                            systemDataLoaderService.updateDefaultNotificationConfigs(false);
                             //TODO DON'T FORGET to update switch statement in the CacheCleanupService if you need to clear the cache
                             break;
                         default:
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java b/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
index d975217e1f..651339e3a4 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
@@ -33,6 +33,7 @@ import org.thingsboard.server.common.data.alarm.AlarmComment;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.oauth2.OAuth2Info;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
@@ -44,6 +45,7 @@ import org.thingsboard.server.dao.eventsourcing.ActionEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.RelationActionEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
+import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.user.UserServiceImpl;
 
 import javax.annotation.PostConstruct;
@@ -69,6 +71,7 @@ public class EdgeEventSourcingListener {
 
     private final TbClusterService tbClusterService;
     private final EdgeSynchronizationManager edgeSynchronizationManager;
+    private final TenantService tenantService;
 
     @PostConstruct
     public void init() {
@@ -95,19 +98,24 @@ public class EdgeEventSourcingListener {
 
     @TransactionalEventListener(fallbackExecution = true)
     public void handleEvent(DeleteEntityEvent<?> event) {
+        TenantId tenantId = event.getTenantId();
         EntityType entityType = event.getEntityId().getEntityType();
+        if (!tenantId.isSysTenantId() && !tenantService.tenantExists(tenantId)) {
+            log.debug("[{}] Ignoring DeleteEntityEvent because tenant does not exist: {}", tenantId, event);
+            return;
+        }
         try {
             if (EntityType.EDGE.equals(entityType) || EntityType.TENANT.equals(entityType)) {
                 return;
             }
-            log.trace("[{}] DeleteEntityEvent called: {}", event.getTenantId(), event);
+            log.trace("[{}] DeleteEntityEvent called: {}", tenantId, event);
             EdgeEventType type = getEdgeEventTypeForEntityEvent(event.getEntity());
             EdgeEventActionType actionType = getEdgeEventActionTypeForEntityEvent(event.getEntity());
-            tbClusterService.sendNotificationMsgToEdge(event.getTenantId(), null, event.getEntityId(),
+            tbClusterService.sendNotificationMsgToEdge(tenantId, null, event.getEntityId(),
                     JacksonUtil.toString(event.getEntity()), type, actionType,
                     edgeSynchronizationManager.getEdgeId().get());
         } catch (Exception e) {
-            log.error("[{}] failed to process DeleteEntityEvent: {}", event.getTenantId(), event, e);
+            log.error("[{}] failed to process DeleteEntityEvent: {}", tenantId, event, e);
         }
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
index 4d4d0170bf..0c91d72ea5 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
@@ -27,12 +27,8 @@ import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.page.PageData;
-import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.edge.EdgeService;
@@ -71,13 +67,6 @@ public abstract class AbstractTbEntityService {
     @Lazy
     private EntitiesVersionControlService vcService;
 
-    protected void removeAlarmsByOriginatorId(TenantId tenantId, EntityId entityId) {
-        PageData<AlarmId> alarms =
-                alarmService.findAlarmIdsByOriginatorId(tenantId, entityId, new TimePageLink(Integer.MAX_VALUE));
-
-        alarms.getData().forEach(alarmId -> alarmService.delAlarm(tenantId, alarmId));
-    }
-
     protected <T> T checkNotNull(T reference) throws ThingsboardException {
         return checkNotNull(reference, "Requested item wasn't found!");
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java b/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
index bc7dc62e78..4a7c1e1e87 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
@@ -51,6 +51,7 @@ import org.thingsboard.server.common.msg.rule.engine.DeviceCredentialsUpdateNoti
 import org.thingsboard.server.dao.eventsourcing.ActionEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
+import org.thingsboard.server.dao.tenant.TenantService;
 
 import javax.annotation.PostConstruct;
 import java.util.Set;
@@ -61,6 +62,7 @@ import java.util.Set;
 public class EntityStateSourcingListener {
 
     private final TbClusterService tbClusterService;
+    private final TenantService tenantService;
 
     @PostConstruct
     public void init() {
@@ -71,6 +73,9 @@ public class EntityStateSourcingListener {
     public void handleEvent(SaveEntityEvent<?> event) {
         TenantId tenantId = event.getTenantId();
         EntityId entityId = event.getEntityId();
+        if (entityId == null) {
+            return;
+        }
         EntityType entityType = entityId.getEntityType();
         log.debug("[{}][{}][{}] Handling entity save event: {}", tenantId, entityType, entityId, event);
         boolean isCreated = event.getCreated() != null && event.getCreated();
@@ -120,7 +125,14 @@ public class EntityStateSourcingListener {
     public void handleEvent(DeleteEntityEvent<?> event) {
         TenantId tenantId = event.getTenantId();
         EntityId entityId = event.getEntityId();
+        if (entityId == null) {
+            return;
+        }
         EntityType entityType = entityId.getEntityType();
+        if (!tenantId.isSysTenantId() && entityType != EntityType.TENANT  && !tenantService.tenantExists(tenantId)) {
+            log.debug("[{}] Ignoring DeleteEntityEvent because tenant does not exist: {}", tenantId, event);
+            return;
+        }
         log.debug("[{}][{}][{}] Handling entity deletion event: {}", tenantId, entityType, entityId, event);
 
         switch (entityType) {
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
index 2fa108d182..89e0bc944f 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
@@ -176,16 +176,16 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
     }
 
     @Override
-    public List<AlarmId> unassignDeletedUserAlarms(TenantId tenantId, User user, long unassignTs) {
+    public List<AlarmId> unassignDeletedUserAlarms(TenantId tenantId, UserId userId, String userTitle, long unassignTs) {
         List<AlarmId> totalAlarmIds = new ArrayList<>();
         PageLink pageLink = new PageLink(100, 0, null, new SortOrder("id", SortOrder.Direction.ASC));
         while (true) {
-            PageData<AlarmId> pageData = alarmService.findAlarmIdsByAssigneeId(user.getTenantId(), user.getId(), pageLink);
+            PageData<AlarmId> pageData = alarmService.findAlarmIdsByAssigneeId(tenantId, userId, pageLink);
             List<AlarmId> alarmIds = pageData.getData();
             if (alarmIds.isEmpty()) {
                 break;
             }
-            processAlarmsUnassignment(tenantId, user, alarmIds, unassignTs);
+            processAlarmsUnassignment(tenantId, userId, userTitle, alarmIds, unassignTs);
             totalAlarmIds.addAll(alarmIds);
             pageLink = pageLink.nextPageLink();
         }
@@ -204,16 +204,16 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
         return ts > 0 ? ts : System.currentTimeMillis();
     }
 
-    private void processAlarmsUnassignment(TenantId tenantId, User user, List<AlarmId> alarmIds, long unassignTs) {
+    private void processAlarmsUnassignment(TenantId tenantId, UserId userId, String userTitle, List<AlarmId> alarmIds, long unassignTs) {
         for (AlarmId alarmId : alarmIds) {
-            log.trace("[{}] Unassigning alarm {} userId {}", tenantId, alarmId, user.getId());
-            AlarmApiCallResult result = alarmSubscriptionService.unassignAlarm(user.getTenantId(), alarmId, unassignTs);
+            log.trace("[{}] Unassigning alarm {} userId {}", tenantId, alarmId, userId);
+            AlarmApiCallResult result = alarmSubscriptionService.unassignAlarm(tenantId, alarmId, unassignTs);
             if (!result.isSuccessful()) {
-                log.error("[{}] Cannot unassign alarm {} userId {}", tenantId, alarmId, user.getId());
+                log.error("[{}] Cannot unassign alarm {} userId {}", tenantId, alarmId, userId);
                 continue;
             }
             if (result.isModified()) {
-                String comment = String.format("Alarm was unassigned because user %s - was deleted", user.getTitle());
+                String comment = String.format("Alarm was unassigned because user %s - was deleted", userTitle);
                 addSystemAlarmComment(result.getAlarm(), null, "ASSIGN", comment);
                 logEntityActionService.logEntityAction(result.getAlarm().getTenantId(), result.getAlarm().getOriginator(), result.getAlarm(), result.getAlarm().getCustomerId(), ActionType.ALARM_UNASSIGNED, null);
             }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java
index 34dc3d11f2..c975291b58 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java
@@ -41,7 +41,7 @@ public interface TbAlarmService {
 
     AlarmInfo unassign(Alarm alarm, long unassignTs, User user) throws ThingsboardException;
 
-    List<AlarmId> unassignDeletedUserAlarms(TenantId tenantId, User user, long unassignTs);
+    List<AlarmId> unassignDeletedUserAlarms(TenantId tenantId, UserId userId, String userTitle, long unassignTs);
 
     Boolean delete(Alarm alarm, User user);
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java
index ddc9164575..671d58a789 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java
@@ -61,7 +61,6 @@ public class DefaultTbAssetService extends AbstractTbEntityService implements Tb
         TenantId tenantId = asset.getTenantId();
         AssetId assetId = asset.getId();
         try {
-            removeAlarmsByOriginatorId(tenantId, assetId);
             assetService.deleteAsset(tenantId, assetId);
             logEntityActionService.logEntityAction(tenantId, assetId, asset, asset.getCustomerId(), actionType, user, assetId.toString());
         } catch (Exception e) {
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
index de9e757166..b05ece9c61 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
@@ -94,7 +94,6 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
         TenantId tenantId = device.getTenantId();
         DeviceId deviceId = device.getId();
         try {
-            removeAlarmsByOriginatorId(tenantId, deviceId);
             deviceService.deleteDevice(tenantId, deviceId);
             logEntityActionService.logEntityAction(tenantId, deviceId, device, device.getCustomerId(), actionType,
                     user, deviceId.toString());
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperReprocessingService.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperReprocessingService.java
new file mode 100644
index 0000000000..ae16f925a0
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperReprocessingService.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
+import org.thingsboard.server.gen.transport.TransportProtos.HousekeeperTaskProto;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+import org.thingsboard.server.queue.TbQueueConsumer;
+import org.thingsboard.server.queue.TbQueueProducer;
+import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+import org.thingsboard.server.queue.housekeeper.HousekeeperConfig;
+import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
+import org.thingsboard.server.queue.util.AfterStartUp;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.queue.consumer.QueueConsumerManager;
+
+import javax.annotation.PreDestroy;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+@TbCoreComponent
+@Service
+@Slf4j
+public class HousekeeperReprocessingService {
+
+    private final HousekeeperConfig config;
+    private final HousekeeperService housekeeperService;
+    private final QueueConsumerManager<TbProtoQueueMsg<ToHousekeeperServiceMsg>> consumer;
+    private final TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> producer;
+    private final TopicPartitionInfo submitTpi;
+
+    private final ExecutorService consumerExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("housekeeper-reprocessing-consumer"));
+
+    public HousekeeperReprocessingService(HousekeeperConfig config,
+                                          @Lazy HousekeeperService housekeeperService,
+                                          TbCoreQueueFactory queueFactory) {
+        this.config = config;
+        this.housekeeperService = housekeeperService;
+        this.consumer = QueueConsumerManager.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .name("Housekeeper reprocessing")
+                .msgPackProcessor(this::processMsgs)
+                .pollInterval(config.getPollInterval())
+                .consumerCreator(queueFactory::createHousekeeperReprocessingMsgConsumer)
+                .consumerExecutor(consumerExecutor)
+                .build();
+        this.producer = queueFactory.createHousekeeperReprocessingMsgProducer();
+        this.submitTpi = TopicPartitionInfo.builder().topic(producer.getDefaultTopic()).build();
+    }
+
+    @AfterStartUp(order = AfterStartUp.REGULAR_SERVICE)
+    public void afterStartUp() {
+        consumer.subscribe(); // Kafka topic for tasks reprocessing has only 1 partition, so only one TB Core will reprocess tasks
+        consumer.launch();
+    }
+
+    private void processMsgs(List<TbProtoQueueMsg<ToHousekeeperServiceMsg>> msgs, TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> consumer) throws Exception {
+        Thread.sleep(config.getTaskReprocessingDelay());
+
+        for (TbProtoQueueMsg<ToHousekeeperServiceMsg> msg : msgs) {
+            log.trace("Reprocessing task: {}", msg);
+            try {
+                housekeeperService.processTask(msg.getValue());
+            } catch (InterruptedException e) {
+                return;
+            } catch (Throwable e) {
+                log.error("Unexpected error during message reprocessing [{}]", msg, e);
+                submitForReprocessing(msg.getValue(), e);
+            }
+        }
+        consumer.commit();
+    }
+
+    public void submitForReprocessing(ToHousekeeperServiceMsg msg, Throwable error) {
+        HousekeeperTaskProto task = msg.getTask();
+        Set<String> errors = new LinkedHashSet<>(task.getErrorsList());
+        errors.add(StringUtils.truncate(ExceptionUtils.getStackTrace(error), 1024));
+        msg = msg.toBuilder()
+                .setTask(task.toBuilder()
+                        .setAttempt(task.getAttempt() + 1)
+                        .clearErrors().addAllErrors(errors)
+                        .build())
+                .build();
+
+        log.trace("Submitting for reprocessing: {}", msg);
+        producer.send(submitTpi, new TbProtoQueueMsg<>(UUID.randomUUID(), msg), null);
+    }
+
+    @PreDestroy
+    private void stop() {
+        consumer.stop();
+        consumerExecutor.shutdownNow();
+        log.info("Stopped Housekeeper reprocessing service");
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperService.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperService.java
new file mode 100644
index 0000000000..06e38d0160
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperService.java
@@ -0,0 +1,166 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.notification.rule.trigger.TaskProcessingFailureTrigger;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+import org.thingsboard.server.queue.TbQueueConsumer;
+import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+import org.thingsboard.server.queue.housekeeper.HousekeeperConfig;
+import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
+import org.thingsboard.server.queue.util.AfterStartUp;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.housekeeper.processor.HousekeeperTaskProcessor;
+import org.thingsboard.server.service.housekeeper.stats.HousekeeperStatsService;
+import org.thingsboard.server.service.queue.consumer.QueueConsumerManager;
+
+import javax.annotation.PreDestroy;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
+
+@TbCoreComponent
+@Service
+@Slf4j
+public class HousekeeperService {
+
+    private final Map<HousekeeperTaskType, HousekeeperTaskProcessor<?>> taskProcessors;
+
+    private final HousekeeperConfig config;
+    private final HousekeeperReprocessingService reprocessingService;
+    private final Optional<HousekeeperStatsService> statsService;
+    private final NotificationRuleProcessor notificationRuleProcessor;
+    private final QueueConsumerManager<TbProtoQueueMsg<ToHousekeeperServiceMsg>> consumer;
+
+    private final ExecutorService consumerExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("housekeeper-consumer"));
+    private final ExecutorService taskExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("housekeeper-task-processor"));
+
+    public HousekeeperService(HousekeeperConfig config,
+                              HousekeeperReprocessingService reprocessingService,
+                              TbCoreQueueFactory queueFactory,
+                              Optional<HousekeeperStatsService> statsService,
+                              NotificationRuleProcessor notificationRuleProcessor,
+                              @Lazy List<HousekeeperTaskProcessor<?>> taskProcessors) {
+        this.config = config;
+        this.reprocessingService = reprocessingService;
+        this.statsService = statsService;
+        this.notificationRuleProcessor = notificationRuleProcessor;
+        this.consumer = QueueConsumerManager.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .name("Housekeeper")
+                .msgPackProcessor(this::processMsgs)
+                .pollInterval(config.getPollInterval())
+                .consumerCreator(queueFactory::createHousekeeperMsgConsumer)
+                .consumerExecutor(consumerExecutor)
+                .build();
+        this.taskProcessors = taskProcessors.stream().collect(Collectors.toMap(HousekeeperTaskProcessor::getTaskType, p -> p));
+    }
+
+    @AfterStartUp(order = AfterStartUp.REGULAR_SERVICE)
+    public void afterStartUp() {
+        consumer.subscribe();
+        consumer.launch();
+    }
+
+    private void processMsgs(List<TbProtoQueueMsg<ToHousekeeperServiceMsg>> msgs, TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> consumer) {
+        for (TbProtoQueueMsg<ToHousekeeperServiceMsg> msg : msgs) {
+            log.trace("Processing task: {}", msg);
+            try {
+                processTask(msg.getValue());
+            } catch (InterruptedException e) {
+                return;
+            } catch (Throwable e) {
+                log.error("Unexpected error during message processing [{}]", msg, e);
+                reprocessingService.submitForReprocessing(msg.getValue(), e);
+            }
+        }
+        consumer.commit();
+    }
+
+    @SuppressWarnings("unchecked")
+    protected <T extends HousekeeperTask> void processTask(ToHousekeeperServiceMsg msg) throws Exception {
+        HousekeeperTask task = JacksonUtil.fromString(msg.getTask().getValue(), HousekeeperTask.class);
+        HousekeeperTaskType taskType = task.getTaskType();
+        if (config.getDisabledTaskTypes().contains(taskType)) {
+            log.debug("Task type {} is disabled, ignoring {}", taskType, task);
+            return;
+        }
+        HousekeeperTaskProcessor<T> taskProcessor = (HousekeeperTaskProcessor<T>) taskProcessors.get(taskType);
+        if (taskProcessor == null) {
+            throw new IllegalArgumentException("Unsupported task type " + taskType);
+        }
+
+        try {
+            long startTs = System.currentTimeMillis();
+            Future<Object> future = taskExecutor.submit(() -> {
+                taskProcessor.process((T) task);
+                return null;
+            });
+            future.get(config.getTaskProcessingTimeout(), TimeUnit.MILLISECONDS);
+
+            long timing = System.currentTimeMillis() - startTs;
+            if (log.isDebugEnabled()) {
+                log.debug("[{}] Processed {} in {} ms (attempt {})", task.getTenantId(), task.getDescription(), timing, msg.getTask().getAttempt());
+            }
+            statsService.ifPresent(statsService -> statsService.reportProcessed(taskType, msg, timing));
+        } catch (InterruptedException e) {
+            throw e;
+        } catch (Throwable e) {
+            Throwable error = e;
+            if (e instanceof ExecutionException) {
+                error = e.getCause();
+            } else if (e instanceof TimeoutException) {
+                error = new TimeoutException("Timeout after " + config.getTaskProcessingTimeout() + " seconds");
+            }
+
+            if (msg.getTask().getAttempt() < config.getMaxReprocessingAttempts()) {
+                log.warn("[{}] Failed to process {} (attempt {}), submitting for reprocessing",
+                        task.getTenantId(), task.getDescription(), msg.getTask().getAttempt(), error);
+                reprocessingService.submitForReprocessing(msg, error);
+            } else {
+                log.error("[{}] Failed to process task in {} attempts: {}", task.getTenantId(), msg.getTask().getAttempt(), msg, e);
+                notificationRuleProcessor.process(TaskProcessingFailureTrigger.builder()
+                        .task(task)
+                        .error(error)
+                        .attempt(msg.getTask().getAttempt())
+                        .build());
+            }
+            statsService.ifPresent(statsService -> statsService.reportFailure(taskType, msg));
+        }
+    }
+
+    @PreDestroy
+    private void stop() {
+        consumer.stop();
+        consumerExecutor.shutdownNow();
+        log.info("Stopped Housekeeper service");
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/InMemoryHouseKeeperServiceService.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/InMemoryHouseKeeperServiceService.java
deleted file mode 100644
index 4870990606..0000000000
--- a/application/src/main/java/org/thingsboard/server/service/housekeeper/InMemoryHouseKeeperServiceService.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright © 2016-2024 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.service.housekeeper;
-
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.event.TransactionalEventListener;
-import org.thingsboard.common.util.ThingsBoardThreadFactory;
-import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.id.AlarmId;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
-import org.thingsboard.server.dao.housekeeper.HouseKeeperService;
-import org.thingsboard.server.service.entitiy.alarm.TbAlarmService;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicInteger;
-
-@Component
-@RequiredArgsConstructor
-@Slf4j
-public class InMemoryHouseKeeperServiceService implements HouseKeeperService {
-
-    final TbAlarmService alarmService;
-
-    ListeningExecutorService executor;
-
-    AtomicInteger queueSize = new AtomicInteger();
-    AtomicInteger totalProcessedCounter = new AtomicInteger();
-
-    @PostConstruct
-    public void init() {
-        log.debug("Starting HouseKeeper service");
-        executor = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("housekeeper")));
-    }
-
-    @PreDestroy
-    public void destroy() {
-        if (executor != null) {
-            log.debug("Stopping HouseKeeper service");
-            executor.shutdown();
-        }
-    }
-
-    @TransactionalEventListener(fallbackExecution = true)
-    public void handleEvent(DeleteEntityEvent<?> event) {
-        log.trace("[{}] DeleteEntityEvent handler: {}", event.getTenantId(), event);
-        EntityId entityId = event.getEntityId();
-        if (EntityType.USER.equals(entityId.getEntityType())) {
-            unassignDeletedUserAlarms(event.getTenantId(), (User) event.getEntity(), event.getTs());
-        }
-    }
-
-    @Override
-    public ListenableFuture<List<AlarmId>> unassignDeletedUserAlarms(TenantId tenantId, User user, long unassignTs) {
-        log.debug("[{}][{}] unassignDeletedUserAlarms submitting, pending queue size: {} ", tenantId, user.getId().getId(), queueSize.get());
-        queueSize.incrementAndGet();
-        ListenableFuture<List<AlarmId>> future = executor.submit(() -> alarmService.unassignDeletedUserAlarms(tenantId, user, unassignTs));
-        Futures.addCallback(future, new FutureCallback<>() {
-            @Override
-            public void onSuccess(List<AlarmId> alarmIds) {
-                queueSize.decrementAndGet();
-                totalProcessedCounter.incrementAndGet();
-                log.debug("[{}][{}] unassignDeletedUserAlarms finished, pending queue size: {}, total processed count: {} ",
-                        tenantId, user.getId().getId(), queueSize.get(), totalProcessedCounter.get());
-            }
-
-            @Override
-            public void onFailure(Throwable throwable) {
-                queueSize.decrementAndGet();
-                totalProcessedCounter.incrementAndGet();
-                log.error("[{}][{}] unassignDeletedUserAlarms failed, pending queue size: {}, total processed count: {}",
-                        tenantId, user.getId().getId(), queueSize.get(), totalProcessedCounter.get(), throwable);
-            }
-        }, MoreExecutors.directExecutor());
-        return future;
-    }
-
-}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsDeletionTaskProcessor.java
new file mode 100644
index 0000000000..cc6cb9bbab
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsDeletionTaskProcessor.java
@@ -0,0 +1,80 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.housekeeper.AlarmsDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.id.AlarmId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.util.TbPair;
+import org.thingsboard.server.dao.alarm.AlarmService;
+
+import java.util.List;
+import java.util.UUID;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class AlarmsDeletionTaskProcessor extends HousekeeperTaskProcessor<AlarmsDeletionHousekeeperTask> {
+
+    private final AlarmService alarmService;
+
+    @Override
+    public void process(AlarmsDeletionHousekeeperTask task) throws Exception {
+        EntityId entityId = task.getEntityId();
+        EntityType entityType = entityId.getEntityType();
+        TenantId tenantId = task.getTenantId();
+
+        if (entityType == EntityType.DEVICE || entityType == EntityType.ASSET) {
+            if (task.getAlarms() == null) {
+                AlarmId lastId = null;
+                long lastCreatedTime = 0;
+                while (true) {
+                    List<TbPair<UUID, Long>> alarms = alarmService.findAlarmIdsByOriginatorId(tenantId, entityId, lastCreatedTime, lastId, 128);
+                    if (alarms.isEmpty()) {
+                        break;
+                    }
+
+                    housekeeperClient.submitTask(new AlarmsDeletionHousekeeperTask(tenantId, entityId, alarms.stream().map(TbPair::getFirst).toList()));
+
+                    TbPair<UUID, Long> last = alarms.get(alarms.size() - 1);
+                    lastId = new AlarmId(last.getFirst());
+                    lastCreatedTime = last.getSecond();
+                    log.debug("[{}][{}][{}] Submitted task for deleting {} alarms", tenantId, entityType, entityId, alarms.size());
+                }
+            } else {
+                for (UUID alarmId : task.getAlarms()) {
+                    alarmService.delAlarm(tenantId, new AlarmId(alarmId));
+                }
+                log.debug("[{}][{}][{}] Deleted {} alarms", tenantId, entityType, entityId, task.getAlarms().size());
+            }
+        }
+
+        int count = alarmService.deleteEntityAlarmRecords(tenantId, entityId);
+        log.debug("[{}][{}][{}] Deleted {} entity alarms", tenantId, entityType, entityId, count);
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_ALARMS;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsUnassignTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsUnassignTaskProcessor.java
new file mode 100644
index 0000000000..3ba6ecde52
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsUnassignTaskProcessor.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.id.AlarmId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.AlarmsUnassignHousekeeperTask;
+import org.thingsboard.server.service.entitiy.alarm.TbAlarmService;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class AlarmsUnassignTaskProcessor extends HousekeeperTaskProcessor<AlarmsUnassignHousekeeperTask> {
+
+    private final TbAlarmService alarmService;
+
+    @Override
+    public void process(AlarmsUnassignHousekeeperTask task) throws Exception {
+        List<AlarmId> alarms = alarmService.unassignDeletedUserAlarms(task.getTenantId(), (UserId) task.getEntityId(), task.getUserTitle(), task.getTs());
+        log.debug("[{}][{}] Unassigned {} alarms", task.getTenantId(), task.getEntityId(), alarms.size());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.UNASSIGN_ALARMS;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AttributesDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AttributesDeletionTaskProcessor.java
new file mode 100644
index 0000000000..5514921e2e
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AttributesDeletionTaskProcessor.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class AttributesDeletionTaskProcessor extends HousekeeperTaskProcessor<HousekeeperTask> {
+
+    private final AttributesService attributesService;
+
+    @Override
+    public void process(HousekeeperTask task) throws Exception {
+        int deletedCount = attributesService.removeAllByEntityId(task.getTenantId(), task.getEntityId());
+        log.debug("[{}][{}][{}] Deleted {} attributes", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), deletedCount);
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_ATTRIBUTES;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EntitiesDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EntitiesDeletionTaskProcessor.java
new file mode 100644
index 0000000000..186a290528
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EntitiesDeletionTaskProcessor.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.housekeeper.EntitiesDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.EntityIdFactory;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.entity.EntityDaoService;
+import org.thingsboard.server.dao.entity.EntityServiceRegistry;
+
+import java.util.UUID;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class EntitiesDeletionTaskProcessor extends HousekeeperTaskProcessor<EntitiesDeletionHousekeeperTask> {
+
+    private final EntityServiceRegistry entityServiceRegistry;
+
+    @Override
+    public void process(EntitiesDeletionHousekeeperTask task) throws Exception {
+        EntityType entityType = task.getEntityType();
+        TenantId tenantId = task.getTenantId();
+        EntityDaoService entityService = entityServiceRegistry.getServiceByEntityType(entityType);
+
+        for (UUID entityUuid : task.getEntities()) {
+            EntityId entityId = EntityIdFactory.getByTypeAndUuid(entityType, entityUuid);
+            entityService.deleteEntity(tenantId, entityId, true);
+        }
+        log.debug("[{}] Deleted {} {}s", tenantId, task.getEntities().size(), entityType.getNormalName().toLowerCase());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_ENTITIES;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EventsDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EventsDeletionTaskProcessor.java
new file mode 100644
index 0000000000..bf9c528eb7
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EventsDeletionTaskProcessor.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.dao.event.EventService;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+
+@Component
+@RequiredArgsConstructor
+public class EventsDeletionTaskProcessor extends HousekeeperTaskProcessor<HousekeeperTask> {
+
+    private final EventService eventService;
+
+    @Override
+    public void process(HousekeeperTask task) throws Exception {
+        eventService.removeEvents(task.getTenantId(), task.getEntityId(), null, 0L, System.currentTimeMillis());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_EVENTS;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/HousekeeperTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/HousekeeperTaskProcessor.java
new file mode 100644
index 0000000000..f193b154db
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/HousekeeperTaskProcessor.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.msg.housekeeper.HousekeeperClient;
+
+public abstract class HousekeeperTaskProcessor<T extends HousekeeperTask> {
+
+    @Autowired
+    protected HousekeeperClient housekeeperClient;
+
+    public abstract void process(T task) throws Exception;
+
+    public abstract HousekeeperTaskType getTaskType();
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/LatestTsDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/LatestTsDeletionTaskProcessor.java
new file mode 100644
index 0000000000..1f4b6b57ae
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/LatestTsDeletionTaskProcessor.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.LatestTsDeletionHousekeeperTask;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LatestTsDeletionTaskProcessor extends HousekeeperTaskProcessor<LatestTsDeletionHousekeeperTask> {
+
+    private final TimeseriesService timeseriesService;
+
+    @Override
+    public void process(LatestTsDeletionHousekeeperTask task) throws Exception {
+        timeseriesService.removeLatest(task.getTenantId(), task.getEntityId(), List.of(task.getKey())).get();
+        log.debug("[{}][{}][{}] Deleted latest telemetry for key '{}'", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), task.getKey());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_LATEST_TS;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TelemetryDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TelemetryDeletionTaskProcessor.java
new file mode 100644
index 0000000000..5271e77c87
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TelemetryDeletionTaskProcessor.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.LatestTsDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.TsHistoryDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class TelemetryDeletionTaskProcessor extends HousekeeperTaskProcessor<HousekeeperTask> {
+
+    private final TimeseriesService timeseriesService;
+
+    @Override
+    public void process(HousekeeperTask task) throws Exception {
+        TenantId tenantId = task.getTenantId();
+        EntityId entityId = task.getEntityId();
+        List<String> keys = timeseriesService.findAllKeysByEntityIds(tenantId, List.of(entityId));
+
+        for (String key : keys) {
+            var latestTsDeletionTask = new LatestTsDeletionHousekeeperTask(tenantId, entityId, key);
+            housekeeperClient.submitTask(latestTsDeletionTask);
+
+            var tsHistoryDeletionTask = new TsHistoryDeletionHousekeeperTask(tenantId, entityId, key);
+            housekeeperClient.submitTask(tsHistoryDeletionTask);
+        }
+
+        log.trace("[{}][{}][{}] Submitted latest and ts history deletion tasks for {} keys", tenantId, entityId.getEntityType(), entityId, keys.size());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_TELEMETRY;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TenantEntitiesDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TenantEntitiesDeletionTaskProcessor.java
new file mode 100644
index 0000000000..386afb1517
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TenantEntitiesDeletionTaskProcessor.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.housekeeper.EntitiesDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.TenantEntitiesDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.entity.EntityDaoRegistry;
+
+import java.util.List;
+import java.util.UUID;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class TenantEntitiesDeletionTaskProcessor extends HousekeeperTaskProcessor<TenantEntitiesDeletionHousekeeperTask> {
+
+    private final EntityDaoRegistry entityDaoRegistry;
+
+    @Override
+    public void process(TenantEntitiesDeletionHousekeeperTask task) throws Exception {
+        EntityType entityType = task.getEntityType();
+        TenantId tenantId = task.getTenantId();
+        Dao<?> entityDao = entityDaoRegistry.getDao(entityType);
+
+        UUID last = null;
+        while (true) {
+            List<UUID> entities = entityDao.findIdsByTenantIdAndIdOffset(tenantId, last, 128);
+            if (entities.isEmpty()) {
+                break;
+            }
+
+            housekeeperClient.submitTask(new EntitiesDeletionHousekeeperTask(tenantId, entityType, entities));
+            last = entities.get(entities.size() - 1);
+            log.debug("[{}] Submitted task for deleting {} {}s", tenantId, entities.size(), entityType.getNormalName().toLowerCase());
+        }
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_TENANT_ENTITIES;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TsHistoryDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TsHistoryDeletionTaskProcessor.java
new file mode 100644
index 0000000000..cee99ae93e
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TsHistoryDeletionTaskProcessor.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.TsHistoryDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.kv.BaseDeleteTsKvQuery;
+import org.thingsboard.server.common.data.kv.DeleteTsKvQuery;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class TsHistoryDeletionTaskProcessor extends HousekeeperTaskProcessor<TsHistoryDeletionHousekeeperTask> {
+
+    private final TimeseriesService timeseriesService;
+
+    @Override
+    public void process(TsHistoryDeletionHousekeeperTask task) throws Exception {
+        DeleteTsKvQuery deleteQuery = new BaseDeleteTsKvQuery(task.getKey(), 0, System.currentTimeMillis(), false, false);
+        timeseriesService.remove(task.getTenantId(), task.getEntityId(), List.of(deleteQuery)).get();
+        log.debug("[{}][{}][{}] Deleted timeseries history for key '{}'", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), task.getKey());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_TS_HISTORY;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/stats/HousekeeperStatsService.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/stats/HousekeeperStatsService.java
new file mode 100644
index 0000000000..6723d51625
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/stats/HousekeeperStatsService.java
@@ -0,0 +1,125 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.stats;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.stats.DefaultCounter;
+import org.thingsboard.server.common.stats.StatsCounter;
+import org.thingsboard.server.common.stats.StatsFactory;
+import org.thingsboard.server.common.stats.StatsTimer;
+import org.thingsboard.server.common.stats.StatsType;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+@ConditionalOnProperty(name = "queue.core.housekeeper.stats.enabled", havingValue = "true", matchIfMissing = true)
+public class HousekeeperStatsService {
+
+    private final Map<HousekeeperTaskType, HousekeeperStats> stats = new EnumMap<>(HousekeeperTaskType.class);
+
+    public HousekeeperStatsService(StatsFactory statsFactory) {
+        for (HousekeeperTaskType taskType : HousekeeperTaskType.values()) {
+            stats.put(taskType, new HousekeeperStats(taskType, statsFactory));
+        }
+    }
+
+    @Scheduled(initialDelayString = "${queue.core.housekeeper.stats.print-interval-ms:60000}",
+            fixedDelayString = "${queue.core.housekeeper.stats.print-interval-ms:60000}")
+    private void reportStats() {
+        String statsStr = stats.values().stream().map(stats -> {
+            String countersStr = stats.getCounters().stream()
+                    .filter(counter -> counter.get() > 0)
+                    .map(counter -> counter.getName() + " = [" + counter.get() + "]")
+                    .collect(Collectors.joining(" "));
+            if (countersStr.isEmpty()) {
+                return null;
+            } else {
+                return stats.getTaskType() + " " + countersStr + " avgProcessingTime [" + stats.getProcessingTimer().getAvg() + " ms]";
+            }
+        }).filter(Objects::nonNull).collect(Collectors.joining(", "));
+
+        if (!statsStr.isEmpty()) {
+            stats.values().forEach(HousekeeperStats::reset);
+            log.info("Housekeeper stats: {}", statsStr);
+        }
+    }
+
+    public void reportProcessed(HousekeeperTaskType taskType, ToHousekeeperServiceMsg msg, long timing) {
+        HousekeeperStats stats = this.stats.get(taskType);
+        if (msg.getTask().getErrorsCount() == 0) {
+            stats.getProcessedCounter().increment();
+        } else {
+            stats.getReprocessedCounter().increment();
+        }
+        stats.getProcessingTimer().record(timing);
+    }
+
+    public void reportFailure(HousekeeperTaskType taskType, ToHousekeeperServiceMsg msg) {
+        HousekeeperStats stats = this.stats.get(taskType);
+        if (msg.getTask().getErrorsCount() == 0) {
+            stats.getFailedProcessingCounter().increment();
+        } else {
+            stats.getFailedReprocessingCounter().increment();
+        }
+    }
+
+    @Getter
+    static class HousekeeperStats {
+        private final HousekeeperTaskType taskType;
+        private final List<StatsCounter> counters = new ArrayList<>();
+
+        private final StatsCounter processedCounter;
+        private final StatsCounter failedProcessingCounter;
+        private final StatsCounter reprocessedCounter;
+        private final StatsCounter failedReprocessingCounter;
+
+        private final StatsTimer processingTimer;
+
+        public HousekeeperStats(HousekeeperTaskType taskType, StatsFactory statsFactory) {
+            this.taskType = taskType;
+            this.processedCounter = register("processed", statsFactory);
+            this.failedProcessingCounter = register("failedProcessing", statsFactory);
+            this.reprocessedCounter = register("reprocessed", statsFactory);
+            this.failedReprocessingCounter = register("failedReprocessing", statsFactory);
+            this.processingTimer = statsFactory.createTimer(StatsType.HOUSEKEEPER, "processingTime", "taskType", taskType.name());
+        }
+
+        private StatsCounter register(String statsName, StatsFactory statsFactory) {
+            StatsCounter counter = statsFactory.createStatsCounter(StatsType.HOUSEKEEPER.getName(), statsName, "taskType", taskType.name());
+            counters.add(counter);
+            return counter;
+        }
+
+        public void reset() {
+            counters.forEach(DefaultCounter::clear);
+            processingTimer.reset();
+        }
+
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
index 4da6a383e8..8c86c16edb 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
@@ -549,7 +549,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
         } else {
             ListenableFuture<List<String>> saveFuture = attributesService.save(TenantId.SYS_TENANT_ID, deviceId, AttributeScope.SERVER_SCOPE,
                     Collections.singletonList(new BaseAttributeKvEntry(new BooleanDataEntry(key, value)
-                    , System.currentTimeMillis())));
+                            , System.currentTimeMillis())));
             addTsCallback(saveFuture, new TelemetrySaveCallback<>(deviceId, key, value));
         }
     }
@@ -693,23 +693,26 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
 
     @Override
     @SneakyThrows
-    public void updateDefaultNotificationConfigs() {
-        PageDataIterable<TenantId> tenants = new PageDataIterable<>(tenantService::findTenantsIds, 500);
-        ExecutorService executor = Executors.newFixedThreadPool(Math.max(Runtime.getRuntime().availableProcessors(), 4));
-        log.info("Updating default edge failure notification configs for all tenants");
-        AtomicInteger count = new AtomicInteger();
-        for (TenantId tenantId : tenants) {
-            executor.submit(() -> {
-                notificationSettingsService.updateDefaultNotificationConfigs(tenantId);
-                int n = count.incrementAndGet();
-                if (n % 500 == 0) {
-                    log.info("{} tenants processed", n);
-                }
-            });
-        }
-        executor.shutdown();
-        executor.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);
+    public void updateDefaultNotificationConfigs(boolean updateTenants) {
+        log.info("Updating notification configs...");
         notificationSettingsService.updateDefaultNotificationConfigs(TenantId.SYS_TENANT_ID);
+
+        if (updateTenants) {
+            PageDataIterable<TenantId> tenants = new PageDataIterable<>(tenantService::findTenantsIds, 500);
+            ExecutorService executor = Executors.newFixedThreadPool(Math.max(Runtime.getRuntime().availableProcessors(), 4));
+            AtomicInteger count = new AtomicInteger();
+            for (TenantId tenantId : tenants) {
+                executor.submit(() -> {
+                    notificationSettingsService.updateDefaultNotificationConfigs(tenantId);
+                    int n = count.incrementAndGet();
+                    if (n % 500 == 0) {
+                        log.info("{} tenants processed", n);
+                    }
+                });
+            }
+            executor.shutdown();
+            executor.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);
+        }
     }
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/install/SystemDataLoaderService.java b/application/src/main/java/org/thingsboard/server/service/install/SystemDataLoaderService.java
index eeac1b6aa4..7c05ff620f 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/SystemDataLoaderService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/SystemDataLoaderService.java
@@ -35,6 +35,6 @@ public interface SystemDataLoaderService {
 
     void createDefaultNotificationConfigs();
 
-    void updateDefaultNotificationConfigs();
+    void updateDefaultNotificationConfigs(boolean updateTenants);
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java
index 42e1cb2cbf..5a1d2fe38d 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java
@@ -55,7 +55,11 @@ public class DefaultCacheCleanupService implements CacheCleanupService {
                 clearCacheByName(RESOURCE_INFO_CACHE);
                 break;
             case "3.6.3":
-                log.info("Clearing cache to upgrade from version 3.6.3 to 3.7.0");
+                log.info("Clearing cache to upgrade from version 3.6.3 to 3.6.4");
+                clearAll();
+                break;
+            case "3.6.4":
+                log.info("Clearing cache to upgrade from version 3.6.4 to 3.7.0");
                 clearAll();
                 break;
             default:
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/RuleEngineComponentLifecycleEventTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/RuleEngineComponentLifecycleEventTriggerProcessor.java
index c17805e1b6..a009841897 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/RuleEngineComponentLifecycleEventTriggerProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/RuleEngineComponentLifecycleEventTriggerProcessor.java
@@ -47,7 +47,7 @@ public class RuleEngineComponentLifecycleEventTriggerProcessor implements Notifi
                 return false;
             }
         }
-        if (!partitionService.resolve(ServiceType.TB_RULE_ENGINE, trigger.getTenantId(), trigger.getComponentId()).isMyPartition()) {
+        if (!partitionService.isMyPartition(ServiceType.TB_RULE_ENGINE, trigger.getTenantId(), trigger.getComponentId())) {
             return false;
         }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/TaskProcessingFailureTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/TaskProcessingFailureTriggerProcessor.java
new file mode 100644
index 0000000000..7754690215
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/TaskProcessingFailureTriggerProcessor.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.notification.rule.trigger;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.notification.info.TaskProcessingFailureNotificationInfo;
+import org.thingsboard.server.common.data.notification.rule.trigger.TaskProcessingFailureTrigger;
+import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
+import org.thingsboard.server.common.data.notification.rule.trigger.config.TaskProcessingFailureNotificationRuleTriggerConfig;
+
+@Service
+public class TaskProcessingFailureTriggerProcessor implements NotificationRuleTriggerProcessor<TaskProcessingFailureTrigger, TaskProcessingFailureNotificationRuleTriggerConfig> {
+
+    @Override
+    public boolean matchesFilter(TaskProcessingFailureTrigger trigger, TaskProcessingFailureNotificationRuleTriggerConfig triggerConfig) {
+        return true;
+    }
+
+    @Override
+    public TaskProcessingFailureNotificationInfo constructNotificationInfo(TaskProcessingFailureTrigger trigger) {
+        HousekeeperTask task = trigger.getTask();
+        return TaskProcessingFailureNotificationInfo.builder()
+                .tenantId(task.getTenantId())
+                .entityId(task.getEntityId())
+                .taskType(task.getTaskType())
+                .taskDescription(task.getDescription())
+                .error(StringUtils.truncate(ExceptionUtils.getStackTrace(trigger.getError()), 1024))
+                .attempt(trigger.getAttempt())
+                .build();
+    }
+
+    @Override
+    public NotificationRuleTriggerType getTriggerType() {
+        return NotificationRuleTriggerType.TASK_PROCESSING_FAILURE;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/consumer/QueueConsumerManager.java b/application/src/main/java/org/thingsboard/server/service/queue/consumer/QueueConsumerManager.java
new file mode 100644
index 0000000000..e7b3a2f2b7
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/queue/consumer/QueueConsumerManager.java
@@ -0,0 +1,109 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.queue.consumer;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
+import org.thingsboard.server.queue.TbQueueConsumer;
+import org.thingsboard.server.queue.TbQueueMsg;
+
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
+
+@Slf4j
+public class QueueConsumerManager<M extends TbQueueMsg> {
+
+    private final String name;
+    private final MsgPackProcessor<M> msgPackProcessor;
+    private final long pollInterval;
+    private final ExecutorService consumerExecutor;
+    private final String threadPrefix;
+
+    @Getter
+    private final TbQueueConsumer<M> consumer;
+    private volatile boolean stopped;
+
+    @Builder
+    public QueueConsumerManager(String name, MsgPackProcessor<M> msgPackProcessor,
+                                long pollInterval, Supplier<TbQueueConsumer<M>> consumerCreator,
+                                ExecutorService consumerExecutor, String threadPrefix) {
+        this.name = name;
+        this.pollInterval = pollInterval;
+        this.msgPackProcessor = msgPackProcessor;
+        this.consumerExecutor = consumerExecutor;
+        this.threadPrefix = threadPrefix;
+        this.consumer = consumerCreator.get();
+    }
+
+    public void subscribe() {
+        consumer.subscribe();
+    }
+
+    public void subscribe(Set<TopicPartitionInfo> partitions) {
+        consumer.subscribe(partitions);
+    }
+
+    public void launch() {
+        log.info("[{}] Launching consumer", name);
+        consumerExecutor.submit(() -> {
+            if (threadPrefix != null) {
+                ThingsBoardThreadFactory.addThreadNamePrefix(threadPrefix);
+            }
+            try {
+                consumerLoop(consumer);
+            } catch (Throwable e) {
+                log.error("Failure in consumer loop", e);
+            }
+            log.info("[{}] Consumer stopped", name);
+        });
+    }
+
+    private void consumerLoop(TbQueueConsumer<M> consumer) {
+        while (!stopped && !consumer.isStopped()) {
+            try {
+                List<M> msgs = consumer.poll(pollInterval);
+                if (msgs.isEmpty()) {
+                    continue;
+                }
+                msgPackProcessor.process(msgs, consumer);
+            } catch (Exception e) {
+                if (!consumer.isStopped()) {
+                    log.warn("Failed to process messages from queue", e);
+                    try {
+                        Thread.sleep(pollInterval);
+                    } catch (InterruptedException interruptedException) {
+                        log.trace("Failed to wait until the server has capacity to handle new requests", interruptedException);
+                    }
+                }
+            }
+        }
+    }
+
+    public void stop() {
+        log.debug("[{}] Stopping consumer", name);
+        stopped = true;
+        consumer.unsubscribe();
+    }
+
+    public interface MsgPackProcessor<M extends TbQueueMsg> {
+        void process(List<M> msgs, TbQueueConsumer<M> consumer) throws Exception;
+    }
+}
\ No newline at end of file
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/DefaultExportableEntitiesService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/DefaultExportableEntitiesService.java
index 95cbc06b27..49314e62fd 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/DefaultExportableEntitiesService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/DefaultExportableEntitiesService.java
@@ -147,10 +147,7 @@ public class DefaultExportableEntitiesService implements ExportableEntitiesServi
     public <I extends EntityId> void removeById(TenantId tenantId, I id) {
         EntityType entityType = id.getEntityType();
         EntityDaoService entityService = entityServiceRegistry.getServiceByEntityType(entityType);
-        if (entityService == null) {
-            throw new IllegalArgumentException("Unsupported entity type " + entityType);
-        }
-        entityService.deleteEntity(tenantId, id);
+        entityService.deleteEntity(tenantId, id, false);
     }
 
     private <I extends EntityId, E extends ExportableEntity<I>> ExportableEntityDao<I, E> getExportableEntityDao(EntityType entityType) {
diff --git a/application/src/main/java/org/thingsboard/server/service/ttl/AlarmsCleanUpService.java b/application/src/main/java/org/thingsboard/server/service/ttl/AlarmsCleanUpService.java
index 76de56cf13..c0f3158c61 100644
--- a/application/src/main/java/org/thingsboard/server/service/ttl/AlarmsCleanUpService.java
+++ b/application/src/main/java/org/thingsboard/server/service/ttl/AlarmsCleanUpService.java
@@ -56,7 +56,6 @@ public class AlarmsCleanUpService {
     private final TenantService tenantService;
     private final AlarmDao alarmDao;
     private final AlarmService alarmService;
-    private final RelationService relationService;
     private final EntityActionService entityActionService;
     private final PartitionService partitionService;
     private final TbTenantProfileCache tenantProfileCache;
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 608bdaf9ea..c7486c4cf3 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -1445,6 +1445,16 @@ queue:
     #      tb_rule_engine.sq:
     #        - key: max.poll.records
     #          value: "${TB_QUEUE_KAFKA_SQ_MAX_POLL_RECORDS:1024}"
+      tb_housekeeper:
+        # Consumer properties for Housekeeper tasks topic
+        - key: max.poll.records
+          # Amount of records to be returned in a single poll. For Housekeeper tasks topic, we should consume messages (tasks) one by one
+          value: "${TB_QUEUE_KAFKA_HOUSEKEEPER_MAX_POLL_RECORDS:1}"
+      tb_housekeeper.reprocessing:
+        # Consumer properties for Housekeeper reprocessing topic
+        - key: max.poll.records
+          # Amount of records to be returned in a single poll. For Housekeeper reprocessing topic, we should consume messages (tasks) one by one
+          value: "${TB_QUEUE_KAFKA_HOUSEKEEPER_REPROCESSING_MAX_POLL_RECORDS:1}"
     other-inline: "${TB_QUEUE_KAFKA_OTHER_PROPERTIES:}" # In this section you can specify custom parameters (semicolon separated) for Kafka consumer/producer/admin # Example "metrics.recording.level:INFO;metrics.sample.window.ms:30000"
     other: # DEPRECATED. In this section, you can specify custom parameters for Kafka consumer/producer and expose the env variables to configure outside
     #  - key: "request.timeout.ms" # refer to https://docs.confluent.io/platform/current/installation/configuration/producer-configs.html#producerconfigs_request.timeout.ms
@@ -1466,6 +1476,10 @@ queue:
       ota-updates: "${TB_QUEUE_KAFKA_OTA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
       # Kafka properties for Version Control topic
       version-control: "${TB_QUEUE_KAFKA_VC_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper reprocessing topic; retention.ms is set to 90 days; partitions is set to 1 since only one reprocessing service is running at a time
+      housekeeper-reprocessing: "${TB_QUEUE_KAFKA_HOUSEKEEPER_REPROCESSING_TOPIC_PROPERTIES:retention.ms:7776000000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
     consumer-stats:
       # Prints lag between consumer group offset and last messages offset in Kafka topics
       enabled: "${TB_QUEUE_KAFKA_CONSUMER_STATS_ENABLED:true}"
@@ -1621,6 +1635,29 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:true}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:60000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
+      # Topic name for Housekeeper tasks to be reprocessed
+      reprocessing-topic: "${TB_HOUSEKEEPER_REPROCESSING_TOPIC:tb_housekeeper.reprocessing}"
+      # Poll interval for topics related to Housekeeper
+      poll-interval-ms: "${TB_HOUSEKEEPER_POLL_INTERVAL_MS:500}"
+      # Timeout in milliseconds for task processing. Tasks that fail to finish on time will be submitted for reprocessing
+      task-processing-timeout-ms: "${TB_HOUSEKEEPER_TASK_PROCESSING_TIMEOUT_MS:120000}"
+      # Comma-separated list of task types that shouldn't be processed. Available task types:
+      # DELETE_ATTRIBUTES, DELETE_TELEMETRY (both DELETE_LATEST_TS and DELETE_TS_HISTORY will be disabled),
+      # DELETE_LATEST_TS, DELETE_TS_HISTORY, DELETE_EVENTS, DELETE_ALARMS, UNASSIGN_ALARMS
+      disabled-task-types: "${TB_HOUSEKEEPER_DISABLED_TASK_TYPES:}"
+      # Delay in milliseconds between tasks reprocessing
+      task-reprocessing-delay-ms: "${TB_HOUSEKEEPER_TASK_REPROCESSING_DELAY_MS:3000}"
+      # Maximum amount of task reprocessing attempts. After exceeding, the task will be dropped
+      max-reprocessing-attempts: "${TB_HOUSEKEEPER_MAX_REPROCESSING_ATTEMPTS:10}"
+      stats:
+        # Enable/disable statistics for Housekeeper
+        enabled: "${TB_HOUSEKEEPER_STATS_ENABLED:true}"
+        # Statistics printing interval for Housekeeper
+        print-interval-ms: "${TB_HOUSEKEEPER_STATS_PRINT_INTERVAL_MS:60000}"
+
   vc:
     # Default topic name for Kafka, RabbitMQ, etc.
     topic: "${TB_QUEUE_VC_TOPIC:tb_version_control}"
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
index e14b041e62..96e52d6c12 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -25,7 +25,6 @@ import io.jsonwebtoken.Header;
 import io.jsonwebtoken.Jwt;
 import io.jsonwebtoken.Jwts;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpStatus;
 import org.awaitility.Awaitility;
 import org.hamcrest.Matcher;
 import org.hibernate.exception.ConstraintViolationException;
@@ -114,9 +113,11 @@ import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.config.ThingsboardSecurityConfiguration;
 import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.device.ClaimDevicesService;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.queue.memory.InMemoryStorage;
 import org.thingsboard.server.service.entitiy.tenant.profile.TbTenantProfileService;
 import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRequest;
 import org.thingsboard.server.service.security.auth.rest.LoginRequest;
@@ -229,7 +230,10 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     private TbTenantProfileService tbTenantProfileService;
 
     @Autowired
-    public TimeseriesService tsService;
+    protected TimeseriesService tsService;
+
+    @Autowired
+    protected AttributesService attributesService;
 
     @Autowired
     protected DefaultActorService actorService;
@@ -240,6 +244,9 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     @SpyBean
     protected MailService mailService;
 
+    @Autowired
+    protected InMemoryStorage storage;
+
     @Rule
     public TestRule watcher = new TestWatcher() {
         protected void starting(Description description) {
@@ -282,7 +289,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle(TEST_TENANT_NAME);
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
         tenantId = savedTenant.getId();
         tenantProfileId = savedTenant.getTenantProfileId();
@@ -360,22 +367,14 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         assertThat(loadedTenants).as("All tenants expected to be deleted, but some tenants left in the database").isEmpty();
     }
 
-    private void deleteTenant(TenantId tenantId) {
-        int status = 0;
-        int retries = 0;
-        while (status != HttpStatus.SC_OK && retries < CLEANUP_TENANT_RETRIES_COUNT) {
-            retries++;
-            try {
-                status = doDelete("/api/tenant/" + tenantId.getId().toString())
-                        .andReturn().getResponse().getStatus();
-                if (status != HttpStatus.SC_OK) {
-                    log.warn("Tenant deletion failed, tenantId: {}", tenantId.getId().toString());
-                    Thread.sleep(1000L);
-                }
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
+    protected void deleteTenant(TenantId tenantId) {
+        try {
+            doDelete("/api/tenant/" + tenantId.getId()).andExpect(status().isOk());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
+        Awaitility.await("all tasks processed").atMost(60, TimeUnit.SECONDS).during(300, TimeUnit.MILLISECONDS)
+                .until(() -> storage.getLag("tb_housekeeper") == 0);
     }
 
     private List<Tenant> getAllTenants() throws Exception {
@@ -428,7 +427,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle(TEST_DIFFERENT_TENANT_NAME);
-        savedDifferentTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedDifferentTenant = saveTenant(tenant);
         differentTenantId = savedDifferentTenant.getId();
         Assert.assertNotNull(savedDifferentTenant);
         User differentTenantAdmin = new User();
@@ -438,6 +437,10 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         savedDifferentTenantUser = createUserAndLogin(differentTenantAdmin, DIFFERENT_TENANT_ADMIN_PASSWORD);
     }
 
+    protected Tenant saveTenant(Tenant tenant) throws Exception {
+        return doPost("/api/tenant", tenant, Tenant.class);
+    }
+
     protected void loginDifferentCustomer() throws Exception {
         if (savedDifferentCustomer != null) {
             login(savedDifferentCustomer.getEmail(), CUSTOMER_USER_PASSWORD);
diff --git a/application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java
index 5290b429c0..7ae283cd46 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java
@@ -53,9 +53,8 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -584,7 +583,7 @@ public class AlarmControllerTest extends AbstractControllerTest {
         Assert.assertEquals(savedUser.getId(), foundAlarm.getAssigneeId());
         Assert.assertTrue(foundAlarm.getAssignTs() >= beforeAssignmentTs);
 
-        beforeAssignmentTs = System.currentTimeMillis();
+        long afterAssignmentTs = System.currentTimeMillis();
 
         loginSysAdmin();
 
@@ -592,12 +591,12 @@ public class AlarmControllerTest extends AbstractControllerTest {
 
         loginDifferentTenant();
 
-        foundAlarm = Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS)
-                .until(() -> doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class), Objects::nonNull);
-
-        Assert.assertNotNull(foundAlarm);
-        Assert.assertNull(foundAlarm.getAssigneeId());
-        Assert.assertTrue(foundAlarm.getAssignTs() >= beforeAssignmentTs);
+        Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            AlarmInfo alarmInfo = doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class);
+            Assert.assertNotNull(alarmInfo);
+            Assert.assertNull(alarmInfo.getAssigneeId());
+            Assert.assertTrue(alarmInfo.getAssignTs() >= afterAssignmentTs);
+        });
     }
 
     @Test
@@ -631,71 +630,16 @@ public class AlarmControllerTest extends AbstractControllerTest {
         Assert.assertEquals(savedUser.getId(), foundAlarm.getAssigneeId());
         Assert.assertTrue(foundAlarm.getAssignTs() >= beforeAssignmentTs);
 
-        beforeAssignmentTs = System.currentTimeMillis();
+        long afterAssignmentTs = System.currentTimeMillis();
 
         doDelete("/api/user/" + savedUser.getId().getId()).andExpect(status().isOk());
 
-        foundAlarm = Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS)
-                .until(() -> doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class), Objects::nonNull);
-
-        Assert.assertNotNull(foundAlarm);
-        Assert.assertNull(foundAlarm.getAssigneeId());
-        Assert.assertTrue(foundAlarm.getAssignTs() >= beforeAssignmentTs);
-    }
-
-    @Test
-    public void testUnassignAlarmOnCustomerRemoving() throws Exception {
-        createDifferentTenantCustomer();
-        loginDifferentTenant();
-
-        User user = new User();
-        user.setAuthority(Authority.CUSTOMER_USER);
-        user.setTenantId(tenantId);
-        user.setCustomerId(differentTenantCustomerId);
-        user.setEmail("customerForAssign@thingsboard.org");
-        User savedUser = createUser(user, "password");
-
-        Device device = createDevice("Different customer device", "default", "differentTenantTest");
-
-        Device assignedDevice = doPost("/api/customer/" + differentTenantCustomerId.getId()
-                + "/device/" + device.getId().getId(), Device.class);
-        Assert.assertEquals(differentTenantCustomerId, assignedDevice.getCustomerId());
-
-        Alarm alarm = Alarm.builder()
-                .type(TEST_ALARM_TYPE)
-                .tenantId(savedDifferentTenant.getId())
-                .customerId(differentTenantCustomerId)
-                .originator(device.getId())
-                .severity(AlarmSeverity.MAJOR)
-                .build();
-        alarm = doPost("/api/alarm", alarm, Alarm.class);
-        Assert.assertNotNull(alarm);
-        AlarmId alarmId = alarm.getId();
-
-        alarm = doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class);
-        Assert.assertNotNull(alarm);
-
-        Mockito.reset(tbClusterService, auditLogService);
-        long beforeAssignmentTs = System.currentTimeMillis();
-
-        doPost("/api/alarm/" + alarmId.getId() + "/assign/" + savedUser.getId().getId()).andExpect(status().isOk());
-        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class);
-        Assert.assertNotNull(foundAlarm);
-        Assert.assertEquals(savedUser.getId(), foundAlarm.getAssigneeId());
-        Assert.assertTrue(foundAlarm.getAssignTs() >= beforeAssignmentTs);
-
-        beforeAssignmentTs = System.currentTimeMillis();
-
-        Mockito.reset(tbClusterService, auditLogService);
-
-        doDelete("/api/customer/" + differentTenantCustomerId.getId()).andExpect(status().isOk());
-
-        foundAlarm = Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS)
-                .until(() -> doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class), Objects::nonNull);
-
-        Assert.assertNotNull(foundAlarm);
-        Assert.assertNull(foundAlarm.getAssigneeId());
-        Assert.assertTrue(foundAlarm.getAssignTs() >= beforeAssignmentTs);
+         Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+             AlarmInfo alarmInfo = doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class);
+             Assert.assertNotNull(alarmInfo);
+             Assert.assertNull(alarmInfo.getAssigneeId());
+             Assert.assertTrue(alarmInfo.getAssignTs() >= afterAssignmentTs);
+         });
     }
 
     @Test
@@ -1003,27 +947,20 @@ public class AlarmControllerTest extends AbstractControllerTest {
             types.remove(0);
         }
 
-        foundTypes = doGetTyped("/api/alarm/types?pageSize=1024&page=0", new TypeReference<PageData<EntitySubtype>>() {
-        })
-                .getData()
-                .stream()
-                .map(EntitySubtype::getType)
-                .collect(Collectors.toList());
-
-        Assert.assertEquals(types.size(), foundTypes.size());
-        Assert.assertEquals(types, foundTypes);
+        Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            List<String> actualTypes = doGetTyped("/api/alarm/types?pageSize=1024&page=0", new TypeReference<PageData<EntitySubtype>>() {})
+                    .getData().stream().map(EntitySubtype::getType).toList();
+            Assert.assertEquals(types.size(), actualTypes.size());
+            Assert.assertEquals(types, actualTypes);
+        });
 
         doDelete("/api/device/" + devices.get(0).getId()).andExpect(status().isOk());
 
-        foundTypes = doGetTyped("/api/alarm/types?pageSize=1024&page=0", new TypeReference<PageData<EntitySubtype>>() {
-        })
-                .getData()
-                .stream()
-                .map(EntitySubtype::getType)
-                .sorted()
-                .collect(Collectors.toList());
-
-        Assert.assertTrue(foundTypes.isEmpty());
+        Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            List<String> actualTypes = doGetTyped("/api/alarm/types?pageSize=1024&page=0", new TypeReference<PageData<EntitySubtype>>() {})
+                    .getData().stream().map(EntitySubtype::getType).sorted().toList();
+            Assert.assertTrue(actualTypes.isEmpty());
+        });
     }
 
 }
diff --git a/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java
index 06d15ddb44..123696ce3d 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java
@@ -42,6 +42,7 @@ import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.asset.AssetProfile;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.page.PageData;
@@ -55,8 +56,10 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 import static org.hamcrest.Matchers.containsString;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
@@ -87,7 +90,7 @@ public class AssetControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -104,8 +107,7 @@ public class AssetControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -312,8 +314,9 @@ public class AssetControllerTest extends AbstractControllerTest {
 
         alarm = doPost("/api/alarm", alarm, Alarm.class);
         Assert.assertNotNull(alarm);
+        AlarmId alarmId = alarm.getId();
 
-        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
+        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarmId, AlarmInfo.class);
         Assert.assertNotNull(foundAlarm);
 
         doDelete("/api/asset/" + savedAsset.getId().getId().toString())
@@ -324,9 +327,11 @@ public class AssetControllerTest extends AbstractControllerTest {
                 .andExpect(status().isNotFound())
                 .andExpect(statusReason(containsString(msgErrorNoFound("Asset", assetIdStr))));
 
-        doGet("/api/alarm/info/" + alarm.getId())
-                .andExpect(status().isNotFound())
-                .andExpect(statusReason(containsString(msgErrorNoFound("Alarm", alarm.getId().getId().toString()))));
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+            doGet("/api/alarm/info/" + alarmId)
+                    .andExpect(status().isNotFound())
+                    .andExpect(statusReason(containsString(msgErrorNoFound("Alarm", alarmId.getId().toString()))));
+        });
     }
 
     @Test
@@ -548,7 +553,7 @@ public class AssetControllerTest extends AbstractControllerTest {
 
         Tenant tenant2 = new Tenant();
         tenant2.setTitle("Different tenant");
-        Tenant savedTenant2 = doPost("/api/tenant", tenant2, Tenant.class);
+        Tenant savedTenant2 = saveTenant(tenant2);
         Assert.assertNotNull(savedTenant2);
 
         User tenantAdmin2 = new User();
@@ -582,8 +587,7 @@ public class AssetControllerTest extends AbstractControllerTest {
 
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant2.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant2.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java
index 432c309a4e..c408daaab3 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java
@@ -82,7 +82,7 @@ public class AssetProfileControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -99,8 +99,7 @@ public class AssetProfileControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
index bd2fe2e3f4..3150edeb37 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
@@ -49,7 +49,6 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @DaoSqlTest
 public class AuditLogControllerTest extends AbstractControllerTest {
@@ -75,7 +74,7 @@ public class AuditLogControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -92,8 +91,7 @@ public class AuditLogControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/ComponentDescriptorControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/ComponentDescriptorControllerTest.java
index dd9eea7ea3..bfaecc803e 100644
--- a/application/src/test/java/org/thingsboard/server/controller/ComponentDescriptorControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/ComponentDescriptorControllerTest.java
@@ -47,7 +47,7 @@ public class ComponentDescriptorControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -64,8 +64,7 @@ public class ComponentDescriptorControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java
index 370ba41422..f431f9ac57 100644
--- a/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java
@@ -85,7 +85,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -104,8 +104,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
 
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -154,7 +153,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(statusReason(containsString(msgError)));
 
         customer.setTenantId(savedTenant.getId());
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
         Mockito.reset(tbClusterService, auditLogService);
 
@@ -165,7 +164,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString(msgError)));
 
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
         Mockito.reset(tbClusterService, auditLogService);
 
@@ -176,7 +175,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString(msgError)));
 
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
         Mockito.reset(tbClusterService, auditLogService);
 
@@ -187,7 +186,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString(msgError)));
 
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
         Mockito.reset(tbClusterService, auditLogService);
 
@@ -198,7 +197,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString(msgError)));
 
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
         Mockito.reset(tbClusterService, auditLogService);
 
@@ -209,7 +208,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString(msgError)));
 
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
     }
 
@@ -293,7 +292,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString(msgError)));
 
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java
index 71c758c1e1..7e1b9b30c9 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java
@@ -77,7 +77,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -94,8 +94,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -166,7 +165,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
     @Test
     public void testSaveDashboardWithEmptyTitle() throws Exception {
         Dashboard dashboard = new Dashboard();
-        String msgError = "Dashboard title " + msgErrorShouldBeSpecified;;
+        String msgError = "Dashboard title " + msgErrorShouldBeSpecified;
 
         Mockito.reset(tbClusterService, auditLogService);
 
@@ -196,7 +195,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
         Assert.assertTrue(assignedDashboard.getAssignedCustomers().contains(savedCustomer.toShortCustomerInfo()));
 
         testNotifyEntityAllOneTimeLogEntityActionEntityEqClass(assignedDashboard, assignedDashboard.getId(), assignedDashboard.getId(),
-                savedTenant.getId(),  savedCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ASSIGNED_TO_CUSTOMER,
+                savedTenant.getId(), savedCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ASSIGNED_TO_CUSTOMER,
                 ActionType.UPDATED, assignedDashboard.getId().getId().toString(), savedCustomer.getId().getId().toString(), savedCustomer.getTitle());
 
         Dashboard foundDashboard = doGet("/api/dashboard/" + savedDashboard.getId().getId().toString(), Dashboard.class);
@@ -239,8 +238,8 @@ public class DashboardControllerTest extends AbstractControllerTest {
         Assert.assertTrue(publicCustomer.isPublic());
 
         testNotifyEntityAllOneTimeLogEntityActionEntityEqClass(assignedDashboard, assignedDashboard.getId(), assignedDashboard.getId(),
-                savedTenant.getId(),  publicCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ASSIGNED_TO_CUSTOMER,
-                ActionType.UPDATED, assignedDashboard .getId().getId().toString(), publicCustomer.getId().getId().toString(), publicCustomer.getTitle());
+                savedTenant.getId(), publicCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ASSIGNED_TO_CUSTOMER,
+                ActionType.UPDATED, assignedDashboard.getId().getId().toString(), publicCustomer.getId().getId().toString(), publicCustomer.getTitle());
 
         Dashboard foundDashboard = doGet("/api/dashboard/" + savedDashboard.getId().getId().toString(), Dashboard.class);
         Assert.assertTrue(foundDashboard.getAssignedCustomers().contains(publicCustomer.toShortCustomerInfo()));
@@ -283,7 +282,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
 
         Tenant tenant2 = new Tenant();
         tenant2.setTitle("Different tenant");
-        Tenant savedTenant2 = doPost("/api/tenant", tenant2, Tenant.class);
+        Tenant savedTenant2 = saveTenant(tenant2);
         Assert.assertNotNull(savedTenant2);
 
         User tenantAdmin2 = new User();
@@ -321,8 +320,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
 
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant2.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant2.getId());
     }
 
     @Test
@@ -482,7 +480,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
 
         testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAny(new Dashboard(), new Dashboard(),
                 savedTenant.getId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(),
-                ActionType.ADDED, cntEntity, cntEntity, cntEntity*2);
+                ActionType.ADDED, cntEntity, cntEntity, cntEntity * 2);
 
         List<DashboardInfo> loadedDashboards = new ArrayList<>();
         PageLink pageLink = new PageLink(21);
diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java
index 8a67fcf396..38e537340f 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java
@@ -142,7 +142,7 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -187,8 +187,7 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
index e59595e9c7..7e62d9d326 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
@@ -132,7 +132,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -151,8 +151,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
 
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -687,7 +686,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
 
         Tenant tenant2 = new Tenant();
         tenant2.setTitle("Different tenant");
-        Tenant savedTenant2 = doPost("/api/tenant", tenant2, Tenant.class);
+        Tenant savedTenant2 = saveTenant(tenant2);
         Assert.assertNotNull(savedTenant2);
 
         User tenantAdmin2 = new User();
@@ -721,9 +720,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
         testNotificationUpdateGatewayNever();
 
         loginSysAdmin();
-
-        doDelete("/api/tenant/" + savedTenant2.getId().getId())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant2.getId());
     }
 
     @Test
@@ -914,7 +911,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
 
         testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAnyAdditionalInfoAny(new Device(), new Device(),
                 savedTenant.getId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(),
-                ActionType.DELETED, ActionType.DELETED, cntEntity, cntEntity,1);
+                ActionType.DELETED, ActionType.DELETED, cntEntity, cntEntity, 1);
         testNotificationUpdateGatewayNever();
     }
 
@@ -1319,7 +1316,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle("Different tenant");
-        Tenant savedDifferentTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedDifferentTenant = saveTenant(tenant);
         Assert.assertNotNull(savedDifferentTenant);
 
         User user = new User();
@@ -1380,8 +1377,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
                 .andExpect(statusReason(containsString(msgErrorNoFound("Device", savedAnotherDevice.getId().getId().toString()))));
 
         loginSysAdmin();
-        doDelete("/api/tenant/" + savedDifferentTenant.getId().getId())
-                .andExpect(status().isOk());
+        deleteTenant(savedDifferentTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java
index 4a93e9c0ac..b549d2af2a 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java
@@ -93,7 +93,7 @@ public class DeviceProfileControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -110,8 +110,7 @@ public class DeviceProfileControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
index 73a3a2e25e..49dfa71223 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
@@ -361,7 +361,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
         Tenant tenant2 = new Tenant();
         tenant2.setTitle("Different tenant");
-        Tenant savedTenant2 = doPost("/api/tenant", tenant2, Tenant.class);
+        Tenant savedTenant2 = saveTenant(tenant2);
         Assert.assertNotNull(savedTenant2);
 
         User tenantAdmin2 = new User();
@@ -394,8 +394,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant2.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant2.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
index cc5e5d5057..a87ab737e8 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.edge.Edge;
@@ -39,6 +39,7 @@ import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.dao.edge.EdgeEventDao;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.sqlts.insert.sql.SqlPartitioningRepository;
@@ -89,21 +90,22 @@ public class EdgeEventControllerTest extends AbstractControllerTest {
         Edge edge = constructEdge("TestEdge", "default");
         edge = doPost("/api/edge", edge, Edge.class);
 
+        final EdgeId edgeId = edge.getId();
+
+        awaitForEdgeTemplateRootRuleChainToAssignToEdge(edgeId);
+
         // simulate edge activation
         ObjectNode attributes = JacksonUtil.newObjectNode();
         attributes.put("active", true);
-        doPost("/api/plugins/telemetry/EDGE/" + edge.getId() + "/attributes/" + DataConstants.SERVER_SCOPE, attributes);
+        doPost("/api/plugins/telemetry/EDGE/" + edge.getId() + "/attributes/" + AttributeScope.SERVER_SCOPE, attributes);
 
         Device device = constructDevice("TestDevice", "default");
         Device savedDevice = doPost("/api/device", device, Device.class);
-
-        final EdgeId edgeId = edge.getId();
-        doPost("/api/edge/" + edgeId.toString() + "/device/" + savedDevice.getId().toString(), Device.class);
+        doPost("/api/edge/" + edgeId + "/device/" + savedDevice.getId(), Device.class);
 
         Asset asset = constructAsset("TestAsset", "default");
         Asset savedAsset = doPost("/api/asset", asset, Asset.class);
-
-        doPost("/api/edge/" + edgeId.toString() + "/asset/" + savedAsset.getId().toString(), Asset.class);
+        doPost("/api/edge/" + edgeId + "/asset/" + savedAsset.getId(), Asset.class);
 
         EntityRelation relation = new EntityRelation(savedAsset.getId(), savedDevice.getId(), EntityRelation.CONTAINS_TYPE);
 
@@ -114,31 +116,12 @@ public class EdgeEventControllerTest extends AbstractControllerTest {
         awaitForNumberOfEdgeEvents(edgeId, 3);
 
         List<EdgeEvent> edgeEvents = findEdgeEvents(edgeId);
-        Assert.assertTrue(popEdgeEvent(edgeEvents, EdgeEventType.DEVICE)); // TestDevice
-        Assert.assertTrue(popEdgeEvent(edgeEvents, EdgeEventType.ASSET)); // TestAsset
+        Assert.assertTrue(popEdgeEvent(edgeEvents, EdgeEventType.DEVICE));
+        Assert.assertTrue(popEdgeEvent(edgeEvents, EdgeEventType.ASSET));
         Assert.assertTrue(popEdgeEvent(edgeEvents, EdgeEventType.RELATION));
         Assert.assertTrue(edgeEvents.isEmpty());
     }
 
-    private boolean popEdgeEvent(List<EdgeEvent> edgeEvents, EdgeEventType edgeEventType) {
-        for (EdgeEvent edgeEvent : edgeEvents) {
-            if (edgeEventType.equals(edgeEvent.getType())) {
-                edgeEvents.remove(edgeEvent);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void awaitForNumberOfEdgeEvents(EdgeId edgeId, int expectedNumber) {
-        Awaitility.await()
-                .atMost(30, TimeUnit.SECONDS)
-                .until(() -> {
-                    List<EdgeEvent> edgeEvents = findEdgeEvents(edgeId);
-                    return edgeEvents.size() == expectedNumber;
-                });
-    }
-
     @Test
     public void saveEdgeEvent_thenCreatePartitionIfNotExist() {
         reset(partitioningRepository);
@@ -167,12 +150,46 @@ public class EdgeEventControllerTest extends AbstractControllerTest {
         });
     }
 
+    private boolean popEdgeEvent(List<EdgeEvent> edgeEvents, EdgeEventType edgeEventType) {
+        for (EdgeEvent edgeEvent : edgeEvents) {
+            if (edgeEventType.equals(edgeEvent.getType())) {
+                edgeEvents.remove(edgeEvent);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void awaitForNumberOfEdgeEvents(EdgeId edgeId, int expectedNumber) {
+        Awaitility.await()
+                .atMost(TIMEOUT, TimeUnit.SECONDS)
+                .until(() -> {
+                    List<EdgeEvent> edgeEvents = findEdgeEvents(edgeId);
+                    return edgeEvents.size() == expectedNumber;
+                });
+    }
+
     private List<EdgeEvent> findEdgeEvents(EdgeId edgeId) throws Exception {
-        return doGetTypedWithTimePageLink("/api/edge/" + edgeId.toString() + "/events?",
+        return doGetTypedWithTimePageLink("/api/edge/" + edgeId + "/events?",
                 new TypeReference<PageData<EdgeEvent>>() {
                 }, new TimePageLink(10)).getData();
     }
 
+    private void awaitForEdgeTemplateRootRuleChainToAssignToEdge(EdgeId edgeId) {
+        Awaitility.await()
+                .atMost(TIMEOUT, TimeUnit.SECONDS)
+                .until(() -> {
+                    List<RuleChain> ruleChains = getEdgeRuleChains(edgeId);
+                    return ruleChains.size() == 1;
+                });
+    }
+
+    private List<RuleChain> getEdgeRuleChains(EdgeId edgeId) throws Exception {
+        return doGetTypedWithTimePageLink("/api/edge/" + edgeId + "/ruleChains?",
+                new TypeReference<PageData<RuleChain>>() {
+                }, new TimePageLink(10)).getData();
+    }
+
     private Device constructDevice(String name, String type) {
         Device device = new Device();
         device.setName(name);
diff --git a/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java
index 8de8514e5b..e67707b0c8 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java
@@ -83,7 +83,7 @@ public class EntityQueryControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -99,9 +99,7 @@ public class EntityQueryControllerTest extends AbstractControllerTest {
     @After
     public void afterTest() throws Exception {
         loginSysAdmin();
-
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/EntityRelationControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EntityRelationControllerTest.java
index 6c613ada60..48e0fb6196 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EntityRelationControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EntityRelationControllerTest.java
@@ -72,7 +72,7 @@ public class EntityRelationControllerTest extends AbstractControllerTest {
         Tenant tenant = new Tenant();
         tenant.setTitle("Test tenant");
 
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -93,8 +93,7 @@ public class EntityRelationControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java
index 3287af19b6..e525f0efd5 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java
@@ -370,7 +370,7 @@ public class EntityViewControllerTest extends AbstractControllerTest {
         loginSysAdmin();
 
         Tenant tenant2 = getNewTenant("Different tenant");
-        Tenant savedTenant2 = doPost("/api/tenant", tenant2, Tenant.class);
+        Tenant savedTenant2 = saveTenant(tenant2);
         Assert.assertNotNull(savedTenant2);
 
         User tenantAdmin2 = new User();
@@ -398,8 +398,7 @@ public class EntityViewControllerTest extends AbstractControllerTest {
 
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant2.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant2.getId());
     }
 
     @Test
@@ -431,7 +430,7 @@ public class EntityViewControllerTest extends AbstractControllerTest {
         testNotifyEntityBroadcastEntityStateChangeEventMany(new EntityView(), new EntityView(),
                 tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL,
                 ActionType.ASSIGNED_TO_CUSTOMER, ActionType.UPDATED, cntEntity, cntEntity,
-                cntEntity*2, 3);
+                cntEntity * 2, 3);
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java b/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
index 717c17d437..31c82408c1 100644
--- a/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
@@ -103,7 +103,7 @@ public class HomePageApiTest extends AbstractControllerTest {
         for (int i = 0; i < 100; i++) {
             Tenant tenant = new Tenant();
             tenant.setTitle("tenant" + i);
-            tenants.add(doPost("/api/tenant", tenant, Tenant.class));
+            tenants.add(saveTenant(tenant));
         }
 
         EntityTypeFilter ef = new EntityTypeFilter();
@@ -115,7 +115,7 @@ public class HomePageApiTest extends AbstractControllerTest {
         Assert.assertEquals(initialCount + 100, update.getCount());
 
         for (Tenant tenant : tenants) {
-            doDelete("/api/tenant/" + tenant.getId().toString());
+            deleteTenant(tenant.getId());
         }
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java
index 9b5e0a65f8..4031045095 100644
--- a/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java
@@ -72,7 +72,7 @@ public class OtaPackageControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -94,8 +94,7 @@ public class OtaPackageControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -339,7 +338,7 @@ public class OtaPackageControllerTest extends AbstractControllerTest {
 
         testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAny(new OtaPackageInfo(), new OtaPackageInfo(),
                 savedTenant.getId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(),
-                ActionType.ADDED, cntEntity, 0, (cntEntity*2 - startIndexSaveData));
+                ActionType.ADDED, cntEntity, 0, (cntEntity * 2 - startIndexSaveData));
 
         List<OtaPackageInfo> loadedFirmwares = new ArrayList<>();
         PageLink pageLink = new PageLink(24);
diff --git a/application/src/test/java/org/thingsboard/server/controller/RpcControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/RpcControllerTest.java
index 4d1f3d6407..d0f6426ab1 100644
--- a/application/src/test/java/org/thingsboard/server/controller/RpcControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/RpcControllerTest.java
@@ -49,7 +49,7 @@ public class RpcControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -66,8 +66,7 @@ public class RpcControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     private Device createDefaultDevice() {
diff --git a/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java
index 7595a69931..a990f55224 100644
--- a/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java
@@ -82,7 +82,7 @@ public class RuleChainControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -99,8 +99,7 @@ public class RuleChainControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -147,9 +146,9 @@ public class RuleChainControllerTest extends AbstractControllerTest {
         int currentVersion = annotation.version();
 
         String oldConfig = "{\"attrMapping\":{\"serialNumber\":\"sn\"}," +
-                        "\"relationsQuery\":{\"direction\":\"FROM\",\"maxLevel\":1," +
-                        "\"filters\":[{\"relationType\":\"Contains\",\"entityTypes\":[]}]," +
-                        "\"fetchLastLevelOnly\":false},\"telemetry\":false}";
+                "\"relationsQuery\":{\"direction\":\"FROM\",\"maxLevel\":1," +
+                "\"filters\":[{\"relationType\":\"Contains\",\"entityTypes\":[]}]," +
+                "\"fetchLastLevelOnly\":false},\"telemetry\":false}";
 
         TbGetRelatedDataNodeConfiguration defaultConfiguration = new TbGetRelatedDataNodeConfiguration().defaultConfiguration();
         String newConfig = JacksonUtil.toString(defaultConfiguration);
diff --git a/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java
index 1d875d2ccc..0745761c25 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java
@@ -73,7 +73,7 @@ public class TbResourceControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -90,8 +90,7 @@ public class TbResourceControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
index 63747d2c19..3160d542f1 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
@@ -140,7 +140,7 @@ public class TenantControllerTest extends AbstractControllerTest {
 
         Mockito.reset(tbClusterService);
 
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
         Assert.assertNotNull(savedTenant.getId());
         Assert.assertTrue(savedTenant.getCreatedTime() > 0);
@@ -149,14 +149,13 @@ public class TenantControllerTest extends AbstractControllerTest {
         testBroadcastEntityStateChangeEventTimeManyTimeTenant(savedTenant, ComponentLifecycleEvent.CREATED, 1);
 
         savedTenant.setTitle("My new tenant");
-        doPost("/api/tenant", savedTenant, Tenant.class);
+        saveTenant(savedTenant);
         Tenant foundTenant = doGet("/api/tenant/" + savedTenant.getId().getId().toString(), Tenant.class);
         Assert.assertEquals(foundTenant.getTitle(), savedTenant.getTitle());
 
         testBroadcastEntityStateChangeEventTimeManyTimeTenant(savedTenant, ComponentLifecycleEvent.UPDATED, 1);
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
 
         testBroadcastEntityStateChangeEventTimeManyTimeTenant(savedTenant, ComponentLifecycleEvent.DELETED, 1);
     }
@@ -181,12 +180,11 @@ public class TenantControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
         Tenant foundTenant = doGet("/api/tenant/" + savedTenant.getId().getId().toString(), Tenant.class);
         Assert.assertNotNull(foundTenant);
         Assert.assertEquals(savedTenant, foundTenant);
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -194,12 +192,11 @@ public class TenantControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
         TenantInfo foundTenant = doGet("/api/tenant/info/" + savedTenant.getId().getId().toString(), TenantInfo.class);
         Assert.assertNotNull(foundTenant);
         Assert.assertEquals(new TenantInfo(savedTenant, "Default"), foundTenant);
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -237,11 +234,10 @@ public class TenantControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
 
         String tenantIdStr = savedTenant.getId().getId().toString();
-        doDelete("/api/tenant/" + tenantIdStr)
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
         doGet("/api/tenant/" + tenantIdStr)
                 .andExpect(status().isNotFound())
                 .andExpect(statusReason(containsString(msgErrorNoFound("Tenant", tenantIdStr))));
@@ -264,8 +260,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         for (int i = 0; i < cntEntity; i++) {
             Tenant tenant = new Tenant();
             tenant.setTitle("Tenant" + i);
-            createFutures.add(executor.submit(() ->
-                    doPost("/api/tenant", tenant, Tenant.class)));
+            createFutures.add(executor.submit(() -> saveTenant(tenant)));
         }
         tenants.addAll(Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS));
 
@@ -308,8 +303,7 @@ public class TenantControllerTest extends AbstractControllerTest {
             String title = title1 + suffix;
             title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
             tenant.setTitle(title);
-            createFutures.add(executor.submit(() ->
-                    doPost("/api/tenant", tenant, Tenant.class)));
+            createFutures.add(executor.submit(() -> saveTenant(tenant)));
         }
 
         List<Tenant> tenantsTitle1 = Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS);
@@ -323,8 +317,7 @@ public class TenantControllerTest extends AbstractControllerTest {
             String title = title2 + suffix;
             title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
             tenant.setTitle(title);
-            createFutures.add(executor.submit(() ->
-                    doPost("/api/tenant", tenant, Tenant.class)));
+            createFutures.add(executor.submit(() -> saveTenant(tenant)));
         }
 
         List<Tenant> tenantsTitle2 = Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS);
@@ -396,7 +389,7 @@ public class TenantControllerTest extends AbstractControllerTest {
             Tenant tenant = new Tenant();
             tenant.setTitle("Tenant" + i);
             createFutures.add(executor.submit(() ->
-                    new TenantInfo(doPost("/api/tenant", tenant, Tenant.class), "Default")));
+                    new TenantInfo(saveTenant(tenant), "Default")));
         }
         tenants.addAll(Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS));
 
@@ -448,7 +441,7 @@ public class TenantControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("Isolated tenant");
-        tenant = doPost("/api/tenant", tenant, Tenant.class);
+        tenant = saveTenant(tenant);
 
         User tenantUser = new User();
         tenantUser.setAuthority(Authority.TENANT_ADMIN);
@@ -477,7 +470,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         tenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
 
         tenant.setTenantProfileId(tenantProfile.getId());
-        doPost("/api/tenant", tenant, Tenant.class);
+        saveTenant(tenant);
 
         login(username, password);
 
@@ -507,7 +500,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         tenantProfile2 = doPost("/api/tenantProfile", tenantProfile2, TenantProfile.class);
 
         tenant.setTenantProfileId(tenantProfile2.getId());
-        doPost("/api/tenant", tenant, Tenant.class);
+        saveTenant(tenant);
 
         login(username, password);
 
@@ -549,7 +542,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         loginSysAdmin();
 
         tenant.setTenantProfileId(null);
-        doPost("/api/tenant", tenant, Tenant.class);
+        saveTenant(tenant);
 
         login(username, password);
         for (Queue queue : foundTenantQueues) {
@@ -559,7 +552,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         }
 
         loginSysAdmin();
-        doDelete("/api/tenant/" + tenant.getId().getId().toString()).andExpect(status().isOk());
+        deleteTenant(tenant.getId());
     }
 
     @Test
@@ -576,7 +569,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         createDifferentTenant();
         loginSysAdmin();
         savedDifferentTenant.setTenantProfileId(tenantProfile.getId());
-        savedDifferentTenant = doPost("/api/tenant", savedDifferentTenant, Tenant.class);
+        savedDifferentTenant = saveTenant(savedDifferentTenant);
         TenantId tenantId = differentTenantId;
 
         loginDifferentTenant();
@@ -661,7 +654,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         createDifferentTenant();
         loginSysAdmin();
         savedDifferentTenant.setTenantProfileId(tenantProfile.getId());
-        savedDifferentTenant = doPost("/api/tenant", savedDifferentTenant, Tenant.class);
+        savedDifferentTenant = saveTenant(savedDifferentTenant);
         TenantId tenantId = differentTenantId;
         await().atMost(30, TimeUnit.SECONDS)
                 .until(() -> {
@@ -716,7 +709,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         createDifferentTenant();
         loginSysAdmin();
         savedDifferentTenant.setTenantProfileId(tenantProfile.getId());
-        savedDifferentTenant = doPost("/api/tenant", savedDifferentTenant, Tenant.class);
+        savedDifferentTenant = saveTenant(savedDifferentTenant);
         TenantId tenantId = differentTenantId;
         await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(partitionService.getMyPartitions(new QueueKey(ServiceType.TB_RULE_ENGINE, tenantId))).isNotNull();
diff --git a/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java
index f25cfe2228..989e80e6e5 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java
@@ -75,7 +75,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
 
         savedTenantProfile.setName("New tenant profile");
         doPost("/api/tenantProfile", savedTenantProfile, TenantProfile.class);
-        TenantProfile foundTenantProfile = doGet("/api/tenantProfile/"+savedTenantProfile.getId().getId().toString(), TenantProfile.class);
+        TenantProfile foundTenantProfile = doGet("/api/tenantProfile/" + savedTenantProfile.getId().getId().toString(), TenantProfile.class);
         Assert.assertEquals(foundTenantProfile.getName(), savedTenantProfile.getName());
 
         testBroadcastEntityStateChangeEventTimeManyTimeTenantProfile(savedTenantProfile, ComponentLifecycleEvent.UPDATED, 1);
@@ -100,7 +100,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile");
         TenantProfile savedTenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
-        TenantProfile foundTenantProfile = doGet("/api/tenantProfile/"+savedTenantProfile.getId().getId().toString(), TenantProfile.class);
+        TenantProfile foundTenantProfile = doGet("/api/tenantProfile/" + savedTenantProfile.getId().getId().toString(), TenantProfile.class);
         Assert.assertNotNull(foundTenantProfile);
         Assert.assertEquals(savedTenantProfile, foundTenantProfile);
     }
@@ -110,7 +110,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile");
         TenantProfile savedTenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
-        EntityInfo foundTenantProfileInfo = doGet("/api/tenantProfileInfo/"+savedTenantProfile.getId().getId().toString(), EntityInfo.class);
+        EntityInfo foundTenantProfileInfo = doGet("/api/tenantProfileInfo/" + savedTenantProfile.getId().getId().toString(), EntityInfo.class);
         Assert.assertNotNull(foundTenantProfileInfo);
         Assert.assertEquals(savedTenantProfile.getId(), foundTenantProfileInfo.getId());
         Assert.assertEquals(savedTenantProfile.getName(), foundTenantProfileInfo.getName());
@@ -129,7 +129,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile 1");
         TenantProfile savedTenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
-        TenantProfile defaultTenantProfile = doPost("/api/tenantProfile/"+savedTenantProfile.getId().getId().toString()+"/default", TenantProfile.class);
+        TenantProfile defaultTenantProfile = doPost("/api/tenantProfile/" + savedTenantProfile.getId().getId().toString() + "/default", TenantProfile.class);
         Assert.assertNotNull(defaultTenantProfile);
         EntityInfo foundDefaultTenantProfile = doGet("/api/tenantProfileInfo/default", EntityInfo.class);
         Assert.assertNotNull(foundDefaultTenantProfile);
@@ -176,7 +176,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant with tenant profile");
         tenant.setTenantProfileId(savedTenantProfile.getId());
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
 
         Mockito.reset(tbClusterService);
 
@@ -186,8 +186,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
 
         testBroadcastEntityStateChangeEventNeverTenantProfile();
 
-        doDelete("/api/tenant/"+savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -214,7 +213,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         List<TenantProfile> tenantProfiles = new ArrayList<>();
         PageLink pageLink = new PageLink(17);
         PageData<TenantProfile> pageData = doGetTypedWithPageLink("/api/tenantProfiles?",
-                new TypeReference<>(){}, pageLink);
+                new TypeReference<>() {}, pageLink);
         Assert.assertFalse(pageData.hasNext());
         Assert.assertEquals(1, pageData.getTotalElements());
         tenantProfiles.addAll(pageData.getData());
@@ -222,8 +221,8 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         Mockito.reset(tbClusterService);
 
         int cntEntity = 28;
-        for (int i=0;i<28;i++) {
-            TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile"+i);
+        for (int i = 0; i < 28; i++) {
+            TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile" + i);
             tenantProfiles.add(doPost("/api/tenantProfile", tenantProfile, TenantProfile.class));
         }
 
@@ -233,7 +232,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         pageLink = new PageLink(17);
         do {
             pageData = doGetTypedWithPageLink("/api/tenantProfiles?",
-                    new TypeReference<>(){}, pageLink);
+                    new TypeReference<>() {}, pageLink);
             loadedTenantProfiles.addAll(pageData.getData());
             if (pageData.hasNext()) {
                 pageLink = pageLink.nextPageLink();
@@ -256,7 +255,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
 
         pageLink = new PageLink(17);
         pageData = doGetTypedWithPageLink("/api/tenantProfiles?",
-                new TypeReference<PageData<TenantProfile>>(){}, pageLink);
+                new TypeReference<PageData<TenantProfile>>() {}, pageLink);
         Assert.assertFalse(pageData.hasNext());
         Assert.assertEquals(1, pageData.getTotalElements());
 
@@ -269,13 +268,13 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         List<TenantProfile> tenantProfiles = new ArrayList<>();
         PageLink pageLink = new PageLink(17);
         PageData<TenantProfile> tenantProfilePageData = doGetTypedWithPageLink("/api/tenantProfiles?",
-                new TypeReference<>(){}, pageLink);
+                new TypeReference<>() {}, pageLink);
         Assert.assertFalse(tenantProfilePageData.hasNext());
         Assert.assertEquals(1, tenantProfilePageData.getTotalElements());
         tenantProfiles.addAll(tenantProfilePageData.getData());
 
-        for (int i=0;i<28;i++) {
-            TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile"+i);
+        for (int i = 0; i < 28; i++) {
+            TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile" + i);
             tenantProfiles.add(doPost("/api/tenantProfile", tenantProfile, TenantProfile.class));
         }
 
@@ -284,7 +283,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         PageData<EntityInfo> pageData;
         do {
             pageData = doGetTypedWithPageLink("/api/tenantProfileInfos?",
-                    new TypeReference<PageData<EntityInfo>>(){}, pageLink);
+                    new TypeReference<PageData<EntityInfo>>() {}, pageLink);
             loadedTenantProfileInfos.addAll(pageData.getData());
             if (pageData.hasNext()) {
                 pageLink = pageLink.nextPageLink();
@@ -308,7 +307,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
 
         pageLink = new PageLink(17);
         pageData = doGetTypedWithPageLink("/api/tenantProfileInfos?",
-                new TypeReference<PageData<EntityInfo>>(){}, pageLink);
+                new TypeReference<PageData<EntityInfo>>() {}, pageLink);
         Assert.assertFalse(pageData.hasNext());
         Assert.assertEquals(1, pageData.getTotalElements());
     }
@@ -354,14 +353,14 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         ArgumentMatcher<TenantProfile> matcherTenantProfile = cntTime == 1 ? argument -> argument.equals(tenantProfile) :
                 argument -> argument.getClass().equals(TenantProfile.class);
         if (ComponentLifecycleEvent.DELETED.equals(event)) {
-            Mockito.verify(tbClusterService, times( cntTime)).onTenantProfileDelete(Mockito.argThat( matcherTenantProfile),
+            Mockito.verify(tbClusterService, times(cntTime)).onTenantProfileDelete(Mockito.argThat(matcherTenantProfile),
                     Mockito.isNull());
             testBroadcastEntityStateChangeEventNever(createEntityId_NULL_UUID(new Tenant()));
         } else {
-            Mockito.verify(tbClusterService, times( cntTime)).onTenantProfileChange(Mockito.argThat(matcherTenantProfile),
+            Mockito.verify(tbClusterService, times(cntTime)).onTenantProfileChange(Mockito.argThat(matcherTenantProfile),
                     Mockito.isNull());
             TenantProfileId tenantProfileIdId = cntTime == 1 ? tenantProfile.getId() : (TenantProfileId) createEntityId_NULL_UUID(tenantProfile);
-            testBroadcastEntityStateChangeEventTime(tenantProfileIdId, null,  cntTime);
+            testBroadcastEntityStateChangeEventTime(tenantProfileIdId, null, cntTime);
         }
         Mockito.reset(tbClusterService);
     }
diff --git a/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
index 72930e0327..c1f3a90529 100644
--- a/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
@@ -380,7 +380,7 @@ public class UserControllerTest extends AbstractControllerTest {
         //here created a new tenant despite already created on AbstractWebTest and then delete the tenant properly on the last line
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant with many admins");
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         TenantId tenantId = savedTenant.getId();
@@ -422,8 +422,7 @@ public class UserControllerTest extends AbstractControllerTest {
         assertThat(tenantAdmins).as("admins list size").hasSameSizeAs(loadedTenantAdmins);
         assertThat(tenantAdmins).as("admins list content").isEqualTo(loadedTenantAdmins);
 
-        doDelete("/api/tenant/" + tenantId.getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(tenantId);
 
         pageLink = new PageLink(33);
         pageData = doGetTypedWithPageLink("/api/tenant/" + tenantId.getId().toString() + "/users?",
@@ -669,7 +668,7 @@ public class UserControllerTest extends AbstractControllerTest {
         List<UserId> expectedCustomerUserIds = new ArrayList<>();
         expectedCustomerUserIds.add(customerUserId);
         for (int i = 0; i < 45; i++) {
-            User customerUser = createCustomerUser( customerId);
+            User customerUser = createCustomerUser(customerId);
             customerUser.setEmail(email + StringUtils.randomAlphanumeric((int) (5 + Math.random() * 10)) + "@thingsboard.org");
             User user = doPost("/api/user", customerUser, User.class);
             expectedCustomerUserIds.add(user.getId());
@@ -750,7 +749,7 @@ public class UserControllerTest extends AbstractControllerTest {
 
         String email = "testEmail1";
         for (int i = 0; i < 45; i++) {
-            User customerUser = createCustomerUser( customerId);
+            User customerUser = createCustomerUser(customerId);
             customerUser.setEmail(email + StringUtils.randomAlphanumeric((int) (5 + Math.random() * 10)) + "@thingsboard.org");
             doPost("/api/user", customerUser, User.class);
         }
@@ -993,8 +992,8 @@ public class UserControllerTest extends AbstractControllerTest {
         List<UserEmailInfo> usersInfo = getUsersInfo(pageLink);
 
         List<UserEmailInfo> expectedUserInfos = customerUsersContainingWord.stream().map(customerUser -> new UserEmailInfo(customerUser.getId(),
-                customerUser.getEmail(), customerUser.getFirstName() == null ? "" : customerUser.getFirstName(),
-                customerUser.getLastName() == null ? "" : customerUser.getLastName()))
+                        customerUser.getEmail(), customerUser.getFirstName() == null ? "" : customerUser.getFirstName(),
+                        customerUser.getLastName() == null ? "" : customerUser.getLastName()))
                 .sorted(userDataIdComparator).collect(Collectors.toList());
         usersInfo.sort(userDataIdComparator);
 
@@ -1046,8 +1045,8 @@ public class UserControllerTest extends AbstractControllerTest {
         List<UserEmailInfo> usersInfo = getUsersInfo(pageLink);
 
         List<UserEmailInfo> expectedUserInfos = usersContainingWord.stream().map(customerUser -> new UserEmailInfo(customerUser.getId(),
-                customerUser.getEmail(), customerUser.getFirstName() == null ? "" : customerUser.getFirstName(),
-                customerUser.getLastName() == null ? "" : customerUser.getLastName()))
+                        customerUser.getEmail(), customerUser.getFirstName() == null ? "" : customerUser.getFirstName(),
+                        customerUser.getLastName() == null ? "" : customerUser.getLastName()))
                 .sorted(userDataIdComparator).collect(Collectors.toList());
         usersInfo.sort(userDataIdComparator);
 
diff --git a/application/src/test/java/org/thingsboard/server/controller/WidgetTypeControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/WidgetTypeControllerTest.java
index c689b12b43..5c4e2afde5 100644
--- a/application/src/test/java/org/thingsboard/server/controller/WidgetTypeControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/WidgetTypeControllerTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.id.WidgetTypeId;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.widget.WidgetType;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
@@ -53,7 +52,7 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -70,8 +69,7 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/"+savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -127,10 +125,10 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
         widgetType.setDescriptor(JacksonUtil.fromString("{ \"someKey\": \"someValue\" }", JsonNode.class));
         WidgetTypeDetails savedWidgetType = doPost("/api/widgetType", widgetType, WidgetTypeDetails.class);
 
-        doDelete("/api/widgetType/"+savedWidgetType.getId().getId().toString())
+        doDelete("/api/widgetType/" + savedWidgetType.getId().getId().toString())
                 .andExpect(status().isOk());
 
-        doGet("/api/widgetType/"+savedWidgetType.getId().getId().toString())
+        doGet("/api/widgetType/" + savedWidgetType.getId().getId().toString())
                 .andExpect(status().isNotFound());
     }
 
@@ -173,7 +171,7 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
         widgetsBundle = doPost("/api/widgetsBundle", widgetsBundle, WidgetsBundle.class);
 
         List<WidgetType> widgetTypes = new ArrayList<>();
-        for (int i=0;i<89;i++) {
+        for (int i = 0; i < 89; i++) {
             WidgetTypeDetails widgetType = new WidgetTypeDetails();
             widgetType.setName("Widget Type " + i);
             widgetType.setDescriptor(JacksonUtil.fromString("{ \"someKey\": \"someValue\" }", JsonNode.class));
@@ -184,7 +182,7 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
         doPost("/api/widgetsBundle/" + widgetsBundle.getId().getId().toString() + "/widgetTypes", widgetTypeIds);
 
         List<WidgetType> loadedWidgetTypes = doGetTyped("/api/widgetTypes?widgetsBundleId={widgetsBundleId}",
-                new TypeReference<>(){}, widgetsBundle.getId().getId().toString());
+                new TypeReference<>() {}, widgetsBundle.getId().getId().toString());
 
         Collections.sort(widgetTypes, idComparator);
         Collections.sort(loadedWidgetTypes, idComparator);
@@ -194,12 +192,12 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
         loginCustomerUser();
 
         List<WidgetType> loadedWidgetTypesCustomer = doGetTyped("/api/widgetTypes?widgetsBundleId={widgetsBundleId}",
-                new TypeReference<>(){}, widgetsBundle.getId().getId().toString());
+                new TypeReference<>() {}, widgetsBundle.getId().getId().toString());
         Collections.sort(loadedWidgetTypesCustomer, idComparator);
         Assert.assertEquals(widgetTypes, loadedWidgetTypesCustomer);
 
         List<WidgetTypeDetails> customerLoadedWidgetTypesDetails = doGetTyped("/api/widgetTypesDetails?widgetsBundleId={widgetsBundleId}",
-                new TypeReference<>(){}, widgetsBundle.getId().getId().toString());
+                new TypeReference<>() {}, widgetsBundle.getId().getId().toString());
         List<WidgetType> widgetTypesFromDetailsListCustomer = customerLoadedWidgetTypesDetails.stream().map(WidgetType::new).collect(Collectors.toList());
         Collections.sort(widgetTypesFromDetailsListCustomer, idComparator);
         Assert.assertEquals(widgetTypesFromDetailsListCustomer, loadedWidgetTypes);
@@ -207,12 +205,12 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
         loginSysAdmin();
 
         List<WidgetType> sysAdminLoadedWidgetTypes = doGetTyped("/api/widgetTypes?widgetsBundleId={widgetsBundleId}",
-                new TypeReference<>(){}, widgetsBundle.getId().getId().toString());
+                new TypeReference<>() {}, widgetsBundle.getId().getId().toString());
         Collections.sort(sysAdminLoadedWidgetTypes, idComparator);
         Assert.assertEquals(widgetTypes, sysAdminLoadedWidgetTypes);
 
         List<WidgetTypeDetails> sysAdminLoadedWidgetTypesDetails = doGetTyped("/api/widgetTypesDetails?widgetsBundleId={widgetsBundleId}",
-                new TypeReference<>(){}, widgetsBundle.getId().getId().toString());
+                new TypeReference<>() {}, widgetsBundle.getId().getId().toString());
         List<WidgetType> widgetTypesFromDetailsListSysAdmin = sysAdminLoadedWidgetTypesDetails.stream().map(WidgetType::new).collect(Collectors.toList());
         Collections.sort(widgetTypesFromDetailsListSysAdmin, idComparator);
         Assert.assertEquals(widgetTypesFromDetailsListSysAdmin, loadedWidgetTypes);
@@ -225,7 +223,7 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
         widgetType.setDescriptor(JacksonUtil.fromString("{ \"someKey\": \"someValue\" }", JsonNode.class));
         WidgetTypeDetails savedWidgetType = doPost("/api/widgetType", widgetType, WidgetTypeDetails.class);
         WidgetType foundWidgetType = doGet("/api/widgetType?fqn={fqn}",
-                WidgetType.class, "tenant."+savedWidgetType.getFqn());
+                WidgetType.class, "tenant." + savedWidgetType.getFqn());
         Assert.assertNotNull(foundWidgetType);
         Assert.assertEquals(new WidgetType(savedWidgetType), foundWidgetType);
     }
diff --git a/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java
index bb7bab22f3..03506af95c 100644
--- a/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java
@@ -53,7 +53,7 @@ public class WidgetsBundleControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -70,8 +70,7 @@ public class WidgetsBundleControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/edge/TenantEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/TenantEdgeTest.java
index 7d740ca472..2611aa433c 100644
--- a/application/src/test/java/org/thingsboard/server/edge/TenantEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/TenantEdgeTest.java
@@ -40,7 +40,7 @@ public class TenantEdgeTest extends AbstractEdgeTest {
         // updated edge tenant
         savedTenant.setTitle("Updated Title for Tenant Edge Test");
         edgeImitator.expectMessageAmount(2); // expect tenant and tenant profile update msg
-        savedTenant = doPost("/api/tenant", savedTenant, Tenant.class);
+        savedTenant = saveTenant(savedTenant);
         Assert.assertTrue(edgeImitator.waitForMessages());
         Optional<TenantUpdateMsg> tenantUpdateMsgOpt = edgeImitator.findMessageByType(TenantUpdateMsg.class);
         Assert.assertTrue(tenantUpdateMsgOpt.isPresent());
@@ -61,7 +61,7 @@ public class TenantEdgeTest extends AbstractEdgeTest {
         TenantProfile tenantProfile = createTenantProfile();
         savedTenant.setTenantProfileId(tenantProfile.getId());
         edgeImitator.expectMessageAmount(2); // expect tenant and tenant profile update msg
-        savedTenant = doPost("/api/tenant", savedTenant, Tenant.class);
+        savedTenant = saveTenant(savedTenant);
         Assert.assertTrue(edgeImitator.waitForMessages());
         tenantUpdateMsgOpt = edgeImitator.findMessageByType(TenantUpdateMsg.class);
         Assert.assertTrue(tenantUpdateMsgOpt.isPresent());
diff --git a/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java b/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java
index 1a172be8dd..9e36fed677 100644
--- a/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java
@@ -27,9 +27,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.flow.TbRuleChainInputNodeConfiguration;
-import org.thingsboard.rule.engine.util.TbMsgSource;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNode;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
+import org.thingsboard.rule.engine.util.TbMsgSource;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
@@ -62,7 +62,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.mockito.Mockito.spy;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
  * @author Valerii Sosliuk
@@ -103,7 +102,7 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
         ruleChainService.deleteRuleChainsByTenantId(savedTenant.getId());
 
@@ -121,7 +120,7 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule
     public void afterTest() throws Exception {
         loginSysAdmin();
         if (savedTenant != null) {
-            doDelete("/api/tenant/" + savedTenant.getId().getId().toString()).andExpect(status().isOk());
+            deleteTenant(savedTenant.getId());
         }
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
index 39651b8b27..eb20210938 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
@@ -173,7 +173,7 @@ public class DefaultTbAlarmServiceTest {
         User user = new User();
         user.setEmail("testEmail@gmail.com");
         user.setId(new UserId(UUID.randomUUID()));
-        service.unassignDeletedUserAlarms(new TenantId(UUID.randomUUID()), user, System.currentTimeMillis());
+        service.unassignDeletedUserAlarms(new TenantId(UUID.randomUUID()), user.getId(), user.getTitle(), System.currentTimeMillis());
 
         ObjectNode commentNode = JacksonUtil.newObjectNode();
         commentNode.put("subtype", "ASSIGN");
diff --git a/application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java b/application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java
new file mode 100644
index 0000000000..e8f1a43ad1
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java
@@ -0,0 +1,478 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.TestPropertySource;
+import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.metadata.TbGetAttributesNode;
+import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
+import org.thingsboard.server.common.data.ApiUsageState;
+import org.thingsboard.server.common.data.AttributeScope;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.EventInfo;
+import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.alarm.EntityAlarm;
+import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.event.EventType;
+import org.thingsboard.server.common.data.event.LifecycleEvent;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.id.AlarmId;
+import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.RuleChainId;
+import org.thingsboard.server.common.data.id.RuleNodeId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
+import org.thingsboard.server.common.data.kv.BaseReadTsKvQuery;
+import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.StringDataEntry;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.common.data.msg.TbNodeConnectionType;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.common.data.relation.RelationTypeGroup;
+import org.thingsboard.server.common.data.rule.RuleChain;
+import org.thingsboard.server.common.data.rule.RuleChainMetaData;
+import org.thingsboard.server.common.data.rule.RuleChainType;
+import org.thingsboard.server.common.data.rule.RuleNode;
+import org.thingsboard.server.controller.AbstractControllerTest;
+import org.thingsboard.server.dao.alarm.AlarmDao;
+import org.thingsboard.server.dao.alarm.AlarmService;
+import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.dao.entity.EntityServiceRegistry;
+import org.thingsboard.server.dao.event.EventService;
+import org.thingsboard.server.dao.relation.RelationService;
+import org.thingsboard.server.dao.rule.RuleChainService;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.dao.usagerecord.ApiUsageStateDao;
+import org.thingsboard.server.gen.transport.TransportProtos.HousekeeperTaskProto;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+import org.thingsboard.server.service.housekeeper.processor.TsHistoryDeletionTaskProcessor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@DaoSqlTest
+@TestPropertySource(properties = {
+        "transport.http.enabled=true",
+        "queue.core.housekeeper.task-reprocessing-delay-ms=2000",
+        "queue.core.housekeeper.poll-interval-ms=1000",
+        "queue.core.housekeeper.max-reprocessing-attempts=5"
+})
+public class HousekeeperServiceTest extends AbstractControllerTest {
+
+    @SpyBean
+    private HousekeeperService housekeeperService;
+    @SpyBean
+    private HousekeeperReprocessingService housekeeperReprocessingService;
+    @Autowired
+    private EventService eventService;
+    @Autowired
+    private TimeseriesService timeseriesService;
+    @Autowired
+    private AttributesService attributesService;
+    @Autowired
+    private RuleChainService ruleChainService;
+    @Autowired
+    private AlarmService alarmService;
+    @Autowired
+    private AlarmDao alarmDao;
+    @Autowired
+    private RelationService relationService;
+    @Autowired
+    private ApiUsageStateDao apiUsageStateDao;
+    @Autowired
+    private EntityServiceRegistry entityServiceRegistry;
+    @SpyBean
+    private TsHistoryDeletionTaskProcessor tsHistoryDeletionTaskProcessor;
+
+    private TenantId tenantId;
+
+    private static final String TELEMETRY_KEY = "telemetry1";
+    private static final String ATTRIBUTE_KEY = "_attribute1";
+    private static final String KV_VALUE = "ewfewfwef";
+
+    @Before
+    public void setUp() throws Exception {
+        loginTenantAdmin();
+        this.tenantId = super.tenantId;
+    }
+
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    @Test
+    public void whenDeviceIsDeleted_thenCleanUpRelatedData() throws Exception {
+        Device device = createDevice("test", "test");
+        createRelatedData(device.getId());
+
+        doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
+
+        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+            verifyNoRelatedData(device.getId());
+        });
+    }
+
+    @Test
+    public void whenRuleChainIsDeleted_thenCleanUpRelatedData() throws Exception {
+        RuleChainMetaData ruleChainMetaData = createRuleChain();
+        RuleChainId ruleChainId = ruleChainMetaData.getRuleChainId();
+        RuleNodeId ruleNode1Id = ruleChainMetaData.getNodes().get(0).getId();
+        RuleNodeId ruleNode2Id = ruleChainMetaData.getNodes().get(1).getId();
+        createRelatedData(ruleChainId);
+        createRelatedData(ruleNode1Id);
+        createRelatedData(ruleNode2Id);
+
+        doDelete("/api/ruleChain/" + ruleChainId).andExpect(status().isOk());
+
+        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+            verifyNoRelatedData(ruleNode1Id);
+            verifyNoRelatedData(ruleNode2Id);
+            verifyNoRelatedData(ruleChainId);
+        });
+    }
+
+    @Test
+    public void whenUserIsDeleted_thenCleanUpRelatedData() throws Exception {
+        Device device = createDevice("test", "test");
+        UserId userId = customerUserId;
+        createRelatedData(userId);
+        Alarm alarm = Alarm.builder()
+                .type("test")
+                .tenantId(tenantId)
+                .originator(device.getId())
+                .severity(AlarmSeverity.MAJOR)
+                .build();
+        alarm = doPost("/api/alarm", alarm, Alarm.class);
+        AlarmId alarmId = alarm.getId();
+        alarm = doPost("/api/alarm/" + alarmId + "/assign/" + userId, "", Alarm.class);
+        assertThat(alarm.getAssigneeId()).isEqualTo(userId);
+        assertThat(alarmService.findAlarmIdsByAssigneeId(tenantId, userId, new PageLink(100)).getData()).isNotEmpty();
+
+        doDelete("/api/user/" + userId).andExpect(status().isOk());
+
+        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+            verifyNoRelatedData(userId);
+            assertThat(alarmService.findAlarmById(tenantId, alarmId).getAssigneeId()).isNull();
+        });
+    }
+
+    @Test
+    public void whenDeviceIsDeleted_thenDeleteAllAlarms() throws Exception {
+        Device device = createDevice("test", "test");
+        for (int i = 1; i <= 1000; i++) {
+            createAlarm(device.getId());
+        }
+
+        doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
+
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+            verifyNoAlarms(device.getId());
+        });
+    }
+
+    @Test
+    public void whenTenantIsDeleted_thenDeleteAllEntitiesAndCleanUpRelatedData() throws Exception {
+        loginDifferentTenant();
+        tenantId = differentTenantId;
+
+        createRelatedData(tenantId);
+        createDifferentTenantCustomer();
+        createRelatedData(differentTenantCustomerId);
+        loginDifferentTenant();
+
+        List<DeviceId> devices = new ArrayList<>();
+        for (int i = 1; i <= 300; i++) {
+            Device device = createDevice("test" + i, "test" + i);
+            devices.add(device.getId());
+        }
+        DeviceId firstDevice = devices.get(0);
+        createRelatedData(firstDevice);
+        DeviceId lastDevice = devices.get(devices.size() - 1);
+        createRelatedData(lastDevice);
+
+        Asset asset = createAsset();
+        createRelatedData(asset.getId());
+        createRelation(firstDevice, asset.getId());
+        createAlarm(firstDevice, asset.getId());
+
+        RuleChainMetaData ruleChainMetaData = createRuleChain();
+        RuleChainId ruleChainId = ruleChainMetaData.getRuleChainId();
+        RuleNodeId ruleNode1Id = ruleChainMetaData.getNodes().get(0).getId();
+        RuleNodeId ruleNode2Id = ruleChainMetaData.getNodes().get(1).getId();
+        createRelatedData(ruleChainId);
+        createRelatedData(ruleNode1Id);
+        createRelatedData(ruleNode2Id);
+
+        UserId userId = savedDifferentTenantUser.getId();
+        createRelatedData(userId);
+
+        ApiUsageState tenantApiUsageState = apiUsageStateDao.findApiUsageStateByEntityId(differentTenantId);
+
+        loginSysAdmin();
+        deleteDifferentTenant();
+
+        await().atMost(60, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).untilAsserted(() -> {
+            for (DeviceId deviceId : devices) {
+                verifyNoRelatedData(deviceId);
+            }
+            verifyNoRelatedData(asset.getId());
+            verifyNoRelatedData(ruleNode1Id);
+            verifyNoRelatedData(ruleNode2Id);
+            verifyNoRelatedData(ruleChainId);
+            verifyNoRelatedData(userId);
+            verifyNoRelatedData(differentTenantCustomerId);
+            verifyNoRelatedData(tenantApiUsageState.getId());
+            verifyNoRelatedData(tenantId);
+        });
+    }
+
+    @Test
+    public void whenTaskProcessingFails_thenReprocess() throws Exception {
+        TimeoutException error = new TimeoutException("Test timeout");
+        doThrow(error).when(tsHistoryDeletionTaskProcessor).process(any());
+
+        Device device = createDevice("test", "test");
+        createRelatedData(device.getId());
+
+        doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
+
+        int attempts = 2;
+        await().atMost(30, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).untilAsserted(() -> {
+            for (int i = 0; i <= attempts; i++) {
+                int attempt = i;
+                verify(housekeeperReprocessingService).submitForReprocessing(argThat(getTaskMatcher(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY,
+                        task -> task.getAttempt() == attempt)), argThat(e -> e.getMessage().equals(error.getMessage())));
+            }
+        });
+
+        assertThat(getTimeseriesHistory(device.getId())).isNotEmpty();
+        doCallRealMethod().when(tsHistoryDeletionTaskProcessor).process(any());
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+            assertThat(getTimeseriesHistory(device.getId())).isEmpty();
+        });
+    }
+
+    @Test
+    public void whenReprocessingAttemptsExceeded_thenDropTheTask() throws Exception {
+        TimeoutException error = new TimeoutException("Test timeout");
+        doThrow(error).when(tsHistoryDeletionTaskProcessor).process(any());
+
+        Device device = createDevice("test", "test");
+        createRelatedData(device.getId());
+
+        doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
+
+        int maxAttempts = 5;
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+            for (int i = 1; i <= maxAttempts; i++) {
+                verifyTaskProcessing(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY, i);
+            }
+        });
+
+        Mockito.clearInvocations(housekeeperService);
+        doCallRealMethod().when(tsHistoryDeletionTaskProcessor).process(any());
+        TimeUnit.SECONDS.sleep(2);
+        verify(housekeeperService, never()).processTask(argThat(getTaskMatcher(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY, null)));
+    }
+
+    private void verifyTaskProcessing(EntityId entityId, HousekeeperTaskType taskType, int expectedAttempt) throws Exception {
+        verify(housekeeperService).processTask(argThat(getTaskMatcher(entityId, taskType, task -> task.getAttempt() == expectedAttempt)));
+    }
+
+    private ArgumentMatcher<ToHousekeeperServiceMsg> getTaskMatcher(EntityId entityId, HousekeeperTaskType taskType,
+                                                                    Predicate<HousekeeperTaskProto> additionalCheck) {
+        return msg -> {
+            HousekeeperTask task = JacksonUtil.fromString(msg.getTask().getValue(), HousekeeperTask.class);
+            return task.getEntityId().equals(entityId) && task.getTaskType() == taskType && (additionalCheck == null || additionalCheck.test(msg.getTask()));
+        };
+    }
+
+    private void createRelatedData(EntityId entityId) throws Exception {
+        createTelemetry(entityId);
+        for (AttributeScope scope : AttributeScope.values()) {
+            createAttribute(entityId, scope, scope + ATTRIBUTE_KEY);
+        }
+        createEvent(entityId);
+    }
+
+    private void verifyNoRelatedData(EntityId entityId) throws Exception {
+        assertThat(entityServiceRegistry.getServiceByEntityType(entityId.getEntityType()).findEntity(tenantId, entityId)).isEmpty();
+
+        assertThat(getLatestTelemetry(entityId)).isNull();
+        assertThat(getTimeseriesHistory(entityId)).isEmpty();
+        for (AttributeScope scope : AttributeScope.values()) {
+            assertThat(attributesService.findAll(tenantId, entityId, scope).get()).isEmpty();
+        }
+        assertThat(getEvents(entityId)).isEmpty();
+        assertThat(alarmDao.findEntityAlarmRecordsByEntityId(tenantId, entityId)).isEmpty();
+        verifyNoAlarms(entityId);
+        assertThat(relationService.findByTo(tenantId, entityId, RelationTypeGroup.COMMON)).isEmpty();
+        assertThat(relationService.findByFrom(tenantId, entityId, RelationTypeGroup.COMMON)).isEmpty();
+    }
+
+    private void verifyNoAlarms(EntityId entityId) {
+        assertThat(alarmService.findAlarmIdsByOriginatorId(tenantId, entityId, 0, null, 10)).isEmpty();
+    }
+
+    private void createAttribute(EntityId entityId, AttributeScope scope, String key) throws Exception {
+        attributesService.save(tenantId, entityId, scope, new BaseAttributeKvEntry(System.currentTimeMillis(), new StringDataEntry(key, KV_VALUE))).get();
+    }
+
+    private void createTelemetry(EntityId entityId) throws Exception {
+        timeseriesService.save(tenantId, entityId, new BasicTsKvEntry(System.currentTimeMillis(), new StringDataEntry(TELEMETRY_KEY, KV_VALUE))).get();
+    }
+
+    private void createEvent(EntityId entityId) {
+        LifecycleEvent event = LifecycleEvent.builder()
+                .tenantId(tenantId)
+                .entityId(entityId.getId())
+                .serviceId("test")
+                .lcEventType("test")
+                .success(true)
+                .build();
+        eventService.saveAsync(event);
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> !getEvents(entityId).isEmpty());
+
+    }
+
+    private void createRelation(DeviceId to, AssetId from) {
+        EntityRelation relation = new EntityRelation(from, to, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON);
+        relationService.saveRelation(tenantId, relation);
+    }
+
+    private void createAlarm(DeviceId deviceId, EntityId propagatedEntityId) {
+        Alarm alarm = doPost("/api/alarm", Alarm.builder()
+                .tenantId(tenantId)
+                .originator(deviceId)
+                .severity(AlarmSeverity.CRITICAL)
+                .type("test alarm for " + deviceId)
+                .propagate(true)
+                .build(), Alarm.class);
+
+        List<EntityAlarm> entityAlarms = alarmDao.findEntityAlarmRecords(tenantId, alarm.getId());
+        assertThat(entityAlarms).anyMatch(entityAlarm -> entityAlarm.getEntityId().equals(deviceId) && entityAlarm.getAlarmType().equals(alarm.getType()));
+        assertThat(entityAlarms).anyMatch(entityAlarm -> entityAlarm.getEntityId().equals(propagatedEntityId) && entityAlarm.getAlarmType().equals(alarm.getType()));
+        assertThat(alarmService.findAlarmIdsByOriginatorId(tenantId, deviceId, 0, null, 10)).isNotEmpty();
+    }
+
+    private void createAlarm(DeviceId deviceId) {
+        Alarm alarm = doPost("/api/alarm", Alarm.builder()
+                .tenantId(tenantId)
+                .originator(deviceId)
+                .severity(AlarmSeverity.CRITICAL)
+                .type("test alarm for " + deviceId + " " + RandomStringUtils.randomAlphabetic(10))
+                .build(), Alarm.class);
+        assertThat(alarmService.findAlarmIdsByOriginatorId(tenantId, deviceId, 0, null, 10)).isNotEmpty();
+    }
+
+    private TsKvEntry getLatestTelemetry(EntityId entityId) throws Exception {
+        return timeseriesService.findLatest(tenantId, entityId, HousekeeperServiceTest.TELEMETRY_KEY).get().orElse(null);
+    }
+
+    private List<TsKvEntry> getTimeseriesHistory(EntityId entityId) throws Exception {
+        return timeseriesService.findAll(tenantId, entityId, List.of(new BaseReadTsKvQuery(HousekeeperServiceTest.TELEMETRY_KEY, 0, System.currentTimeMillis(), 10, "DESC"))).get();
+    }
+
+    private List<EventInfo> getEvents(EntityId entityId) {
+        return eventService.findEvents(tenantId, entityId, EventType.LC_EVENT, new TimePageLink(100)).getData()
+                .stream().filter(event -> Optional.ofNullable(event.getBody()).map(body -> body.get("event"))
+                        .map(JsonNode::asText).orElse("").equals("test"))
+                .collect(Collectors.toList());
+    }
+
+    private Asset createAsset() {
+        Asset asset = new Asset();
+        asset.setName("test");
+        asset.setType("test");
+        return doPost("/api/asset", asset, Asset.class);
+    }
+
+    private RuleChainMetaData createRuleChain() {
+        RuleChain ruleChain = new RuleChain();
+        ruleChain.setTenantId(tenantId);
+        ruleChain.setName("Test");
+        ruleChain.setType(RuleChainType.CORE);
+        ruleChain.setDebugMode(true);
+        ruleChain.setConfiguration(JacksonUtil.newObjectNode().set("a", new TextNode("b")));
+        ruleChain = ruleChainService.saveRuleChain(ruleChain);
+        RuleChainId ruleChainId = ruleChain.getId();
+
+        RuleChainMetaData metaData = new RuleChainMetaData();
+        metaData.setRuleChainId(ruleChainId);
+
+        RuleNode ruleNode1 = new RuleNode();
+        ruleNode1.setName("Simple Rule Node 1");
+        ruleNode1.setType(org.thingsboard.rule.engine.metadata.TbGetAttributesNode.class.getName());
+        ruleNode1.setConfigurationVersion(TbGetAttributesNode.class.getAnnotation(org.thingsboard.rule.engine.api.RuleNode.class).version());
+        ruleNode1.setDebugMode(true);
+        TbGetAttributesNodeConfiguration configuration1 = new TbGetAttributesNodeConfiguration();
+        configuration1.setServerAttributeNames(Collections.singletonList("serverAttributeKey1"));
+        ruleNode1.setConfiguration(JacksonUtil.valueToTree(configuration1));
+
+        RuleNode ruleNode2 = new RuleNode();
+        ruleNode2.setName("Simple Rule Node 2");
+        ruleNode2.setType(org.thingsboard.rule.engine.metadata.TbGetAttributesNode.class.getName());
+        ruleNode2.setConfigurationVersion(TbGetAttributesNode.class.getAnnotation(org.thingsboard.rule.engine.api.RuleNode.class).version());
+        ruleNode2.setDebugMode(true);
+        TbGetAttributesNodeConfiguration configuration2 = new TbGetAttributesNodeConfiguration();
+        configuration2.setServerAttributeNames(Collections.singletonList("serverAttributeKey2"));
+        ruleNode2.setConfiguration(JacksonUtil.valueToTree(configuration2));
+
+        metaData.setNodes(Arrays.asList(ruleNode1, ruleNode2));
+        metaData.setFirstNodeIndex(0);
+        metaData.addConnectionInfo(0, 1, TbNodeConnectionType.SUCCESS);
+        ruleChainService.saveRuleChainMetaData(tenantId, metaData, Function.identity());
+        return ruleChainService.loadRuleChainMetaData(tenantId, ruleChainId);
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
index 4bb8058e7f..1a788d437b 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
@@ -323,8 +323,10 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
 
         deleteDifferentTenant();
 
-        assertThat(notificationRequestService.findNotificationRequestsByTenantIdAndOriginatorType(tenantId, EntityType.USER, new PageLink(1)).getTotalElements())
-                .isZero();
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            assertThat(notificationRequestService.findNotificationRequestsByTenantIdAndOriginatorType(tenantId, EntityType.USER, new PageLink(1)).getTotalElements())
+                    .isZero();
+        });
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationTargetApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationTargetApiTest.java
index c7ef9a5836..a5bdc6c2e4 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationTargetApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationTargetApiTest.java
@@ -38,8 +38,10 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @DaoSqlTest
@@ -148,7 +150,9 @@ public class NotificationTargetApiTest extends AbstractNotificationApiTest {
         assertThat(notificationTargetDao.findByTenantIdAndSupportedNotificationTypeAndPageLink(differentTenantId, NotificationType.GENERAL, new PageLink(10)).getData()).isNotEmpty();
 
         deleteDifferentTenant();
-        assertThat(notificationTargetDao.findByTenantIdAndPageLink(differentTenantId, new PageLink(10)).getData()).isEmpty();
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            assertThat(notificationTargetDao.findByTenantIdAndPageLink(differentTenantId, new PageLink(10)).getData()).isEmpty();
+        });
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java b/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
index d9b33edba2..566d272a2f 100644
--- a/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
@@ -51,7 +51,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @DaoSqlTest
 public class BaseTbResourceServiceTest extends AbstractControllerTest {
@@ -129,7 +128,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         tenantId = savedTenant.getId();
         Assert.assertNotNull(savedTenant);
 
@@ -147,8 +146,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -397,7 +395,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle("Test tenant");
-        tenant = doPost("/api/tenant", tenant, Tenant.class);
+        tenant = saveTenant(tenant);
 
         TenantId tenantId = tenant.getId();
 
@@ -441,8 +439,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         Assert.assertFalse(pageData.hasNext());
         Assert.assertTrue(pageData.getData().isEmpty());
 
-        doDelete("/api/tenant/" + tenantId.getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(tenantId);
     }
 
     @Test
@@ -451,7 +448,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("Test tenant");
-        tenant = doPost("/api/tenant", tenant, Tenant.class);
+        tenant = saveTenant(tenant);
 
         TenantId tenantId = tenant.getId();
 
@@ -518,8 +515,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         Assert.assertFalse(pageData.hasNext());
         Assert.assertTrue(pageData.getData().isEmpty());
 
-        doDelete("/api/tenant/" + tenantId.getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(tenantId);
     }
 
 }
diff --git a/application/src/test/java/org/thingsboard/server/service/sql/SequentialTimeseriesPersistenceTest.java b/application/src/test/java/org/thingsboard/server/service/sql/SequentialTimeseriesPersistenceTest.java
index 5cae75ef0d..02281abac3 100644
--- a/application/src/test/java/org/thingsboard/server/service/sql/SequentialTimeseriesPersistenceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/sql/SequentialTimeseriesPersistenceTest.java
@@ -50,8 +50,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 @DaoSqlTest
 public class SequentialTimeseriesPersistenceTest extends AbstractControllerTest {
 
@@ -77,7 +75,7 @@ public class SequentialTimeseriesPersistenceTest extends AbstractControllerTest
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -93,7 +91,7 @@ public class SequentialTimeseriesPersistenceTest extends AbstractControllerTest
     @After
     public void afterTest() throws Exception {
         loginSysAdmin();
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString()).andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManagerTest.java b/application/src/test/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManagerTest.java
index c97305c170..1fae187a15 100644
--- a/application/src/test/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManagerTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManagerTest.java
@@ -40,6 +40,8 @@ import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 
 import java.util.Optional;
 import java.util.UUID;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.stream.Stream;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -53,13 +55,13 @@ import static org.mockito.Mockito.never;
 public class DefaultRuleEngineDeviceStateManagerTest {
 
     @Mock
-    private static DeviceStateService deviceStateServiceMock;
+    private DeviceStateService deviceStateServiceMock;
     @Mock
-    private static TbCallback tbCallbackMock;
+    private TbCallback tbCallbackMock;
     @Mock
-    private static TbClusterService clusterServiceMock;
+    private TbClusterService clusterServiceMock;
     @Mock
-    private static TbQueueMsgMetadata metadataMock;
+    private TbQueueMsgMetadata metadataMock;
 
     @Mock
     private TbServiceInfoProvider serviceInfoProviderMock;
@@ -67,9 +69,9 @@ public class DefaultRuleEngineDeviceStateManagerTest {
     private PartitionService partitionServiceMock;
 
     @Captor
-    private static ArgumentCaptor<TbQueueCallback> queueCallbackCaptor;
+    private ArgumentCaptor<TbQueueCallback> queueCallbackCaptor;
 
-    private static DefaultRuleEngineDeviceStateManager deviceStateManager;
+    private DefaultRuleEngineDeviceStateManager deviceStateManager;
 
     private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("57ab2e6c-bc4c-11ee-a506-0242ac120002"));
     private static final DeviceId DEVICE_ID = DeviceId.fromString("74a9053e-bc4c-11ee-a506-0242ac120002");
@@ -87,15 +89,17 @@ public class DefaultRuleEngineDeviceStateManagerTest {
     @DisplayName("Given event should be routed to local service and event processed has succeeded, " +
             "when onDeviceX() is called, then should route event to local service and call onSuccess() callback.")
     @MethodSource
-    public void givenRoutedToLocalAndProcessingSuccess_whenOnDeviceAction_thenShouldCallLocalServiceAndSuccessCallback(Runnable onDeviceAction, Runnable actionVerification) {
+    public void givenRoutedToLocalAndProcessingSuccess_whenOnDeviceAction_thenShouldCallLocalServiceAndSuccessCallback(
+            BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback> onDeviceAction, Consumer<DeviceStateService> actionVerification
+    ) {
         // GIVEN
         given(serviceInfoProviderMock.isService(ServiceType.TB_CORE)).willReturn(true);
         given(partitionServiceMock.resolve(ServiceType.TB_CORE, TENANT_ID, DEVICE_ID)).willReturn(MY_TPI);
 
-        onDeviceAction.run();
+        onDeviceAction.accept(deviceStateManager, tbCallbackMock);
 
         // THEN
-        actionVerification.run();
+        actionVerification.accept(deviceStateServiceMock);
 
         then(clusterServiceMock).shouldHaveNoInteractions();
         then(tbCallbackMock).should().onSuccess();
@@ -105,20 +109,20 @@ public class DefaultRuleEngineDeviceStateManagerTest {
     private static Stream<Arguments> givenRoutedToLocalAndProcessingSuccess_whenOnDeviceAction_thenShouldCallLocalServiceAndSuccessCallback() {
         return Stream.of(
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS)
                 ),
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS)
                 ),
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS)
                 ),
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS)
                 )
         );
     }
@@ -128,19 +132,19 @@ public class DefaultRuleEngineDeviceStateManagerTest {
             "when onDeviceX() is called, then should route event to local service and call onFailure() callback.")
     @MethodSource
     public void givenRoutedToLocalAndProcessingFailure_whenOnDeviceAction_thenShouldCallLocalServiceAndFailureCallback(
-            Runnable exceptionThrowSetup, Runnable onDeviceAction, Runnable actionVerification
+            Consumer<DeviceStateService> exceptionThrowSetup, BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback> onDeviceAction, Consumer<DeviceStateService> actionVerification
     ) {
         // GIVEN
         given(serviceInfoProviderMock.isService(ServiceType.TB_CORE)).willReturn(true);
         given(partitionServiceMock.resolve(ServiceType.TB_CORE, TENANT_ID, DEVICE_ID)).willReturn(MY_TPI);
 
-        exceptionThrowSetup.run();
+        exceptionThrowSetup.accept(deviceStateServiceMock);
 
         // WHEN
-        onDeviceAction.run();
+        onDeviceAction.accept(deviceStateManager, tbCallbackMock);
 
         // THEN
-        actionVerification.run();
+        actionVerification.accept(deviceStateServiceMock);
 
         then(clusterServiceMock).shouldHaveNoInteractions();
         then(tbCallbackMock).should(never()).onSuccess();
@@ -150,24 +154,24 @@ public class DefaultRuleEngineDeviceStateManagerTest {
     private static Stream<Arguments> givenRoutedToLocalAndProcessingFailure_whenOnDeviceAction_thenShouldCallLocalServiceAndFailureCallback() {
         return Stream.of(
                 Arguments.of(
-                        (Runnable) () -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS),
-                        (Runnable) () -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS),
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS)
                 ),
                 Arguments.of(
-                        (Runnable) () -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS),
-                        (Runnable) () -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS),
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS)
                 ),
                 Arguments.of(
-                        (Runnable) () -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS),
-                        (Runnable) () -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS),
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS)
                 ),
                 Arguments.of(
-                        (Runnable) () -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS),
-                        (Runnable) () -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS),
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS)
                 )
         );
     }
@@ -176,16 +180,18 @@ public class DefaultRuleEngineDeviceStateManagerTest {
     @DisplayName("Given event should be routed to external service, " +
             "when onDeviceX() is called, then should send correct queue message to external service with correct callback object.")
     @MethodSource
-    public void givenRoutedToExternal_whenOnDeviceAction_thenShouldSendQueueMsgToExternalServiceWithCorrectCallback(Runnable onDeviceAction, Runnable actionVerification) {
+    public void givenRoutedToExternal_whenOnDeviceAction_thenShouldSendQueueMsgToExternalServiceWithCorrectCallback(
+            BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback> onDeviceAction, BiConsumer<TbClusterService, ArgumentCaptor<TbQueueCallback>> actionVerification
+    ) {
         // WHEN
         ReflectionTestUtils.setField(deviceStateManager, "deviceStateService", Optional.empty());
         given(serviceInfoProviderMock.isService(ServiceType.TB_CORE)).willReturn(false);
         given(partitionServiceMock.resolve(ServiceType.TB_CORE, TENANT_ID, DEVICE_ID)).willReturn(EXTERNAL_TPI);
 
-        onDeviceAction.run();
+        onDeviceAction.accept(deviceStateManager, tbCallbackMock);
 
         // THEN
-        actionVerification.run();
+        actionVerification.accept(clusterServiceMock, queueCallbackCaptor);
 
         TbQueueCallback callback = queueCallbackCaptor.getValue();
         callback.onSuccess(metadataMock);
@@ -197,8 +203,8 @@ public class DefaultRuleEngineDeviceStateManagerTest {
     private static Stream<Arguments> givenRoutedToExternal_whenOnDeviceAction_thenShouldSendQueueMsgToExternalServiceWithCorrectCallback() {
         return Stream.of(
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> {
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (BiConsumer<TbClusterService, ArgumentCaptor<TbQueueCallback>>) (clusterServiceMock, queueCallbackCaptor) -> {
                             var deviceConnectMsg = TransportProtos.DeviceConnectProto.newBuilder()
                                     .setTenantIdMSB(TENANT_ID.getId().getMostSignificantBits())
                                     .setTenantIdLSB(TENANT_ID.getId().getLeastSignificantBits())
@@ -213,8 +219,8 @@ public class DefaultRuleEngineDeviceStateManagerTest {
                         }
                 ),
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> {
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (BiConsumer<TbClusterService, ArgumentCaptor<TbQueueCallback>>) (clusterServiceMock, queueCallbackCaptor) -> {
                             var deviceActivityMsg = TransportProtos.DeviceActivityProto.newBuilder()
                                     .setTenantIdMSB(TENANT_ID.getId().getMostSignificantBits())
                                     .setTenantIdLSB(TENANT_ID.getId().getLeastSignificantBits())
@@ -229,8 +235,8 @@ public class DefaultRuleEngineDeviceStateManagerTest {
                         }
                 ),
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> {
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (BiConsumer<TbClusterService, ArgumentCaptor<TbQueueCallback>>) (clusterServiceMock, queueCallbackCaptor) -> {
                             var deviceDisconnectMsg = TransportProtos.DeviceDisconnectProto.newBuilder()
                                     .setTenantIdMSB(TENANT_ID.getId().getMostSignificantBits())
                                     .setTenantIdLSB(TENANT_ID.getId().getLeastSignificantBits())
@@ -245,8 +251,8 @@ public class DefaultRuleEngineDeviceStateManagerTest {
                         }
                 ),
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> {
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (BiConsumer<TbClusterService, ArgumentCaptor<TbQueueCallback>>) (clusterServiceMock, queueCallbackCaptor) -> {
                             var deviceInactivityMsg = TransportProtos.DeviceInactivityProto.newBuilder()
                                     .setTenantIdMSB(TENANT_ID.getId().getMostSignificantBits())
                                     .setTenantIdLSB(TENANT_ID.getId().getLeastSignificantBits())
diff --git a/application/src/test/resources/logback-test.xml b/application/src/test/resources/logback-test.xml
index 8b20a2817a..f43144a24e 100644
--- a/application/src/test/resources/logback-test.xml
+++ b/application/src/test/resources/logback-test.xml
@@ -31,6 +31,7 @@
     <!--    To reduce logs -->
     <logger name="org.apache.catalina.loader.WebappClassLoaderBase" level="ERROR" />
     <logger name="org.thingsboard.server.service.queue.DefaultTbClusterService" level="ERROR" />
+    <logger name="org.thingsboard.server.service.security.auth.jwt.settings.DefaultJwtSettingsService" level="ERROR" />
 
     <!-- Coap client context debug for the test scope -->
     <!--    <logger name="org.thingsboard.server.transport.coap.client.DefaultCoapClientContext" level="TRACE" />-->
diff --git a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java
index f27131b7ab..9c6e606af5 100644
--- a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java
+++ b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java
@@ -61,7 +61,7 @@ public class TbCoapDtlsSettings {
     @Value("${transport.coap.dtls.retransmission_timeout:9000}")
     private int dtlsRetransmissionTimeout;
 
-    @Value("${transport.coap.dtls.connection_id_length}")
+    @Value("${transport.coap.dtls.connection_id_length:}")
     private Integer cIdLength;
 
     @Bean
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java
index a6e6e2390b..5bf6b95853 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java
@@ -38,10 +38,13 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.query.AlarmCountQuery;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.dao.entity.EntityDaoService;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 
 
 public interface AlarmService extends EntityDaoService {
@@ -106,9 +109,9 @@ public interface AlarmService extends EntityDaoService {
 
     PageData<AlarmId> findAlarmIdsByAssigneeId(TenantId tenantId, UserId userId, PageLink pageLink);
 
-    PageData<AlarmId> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, PageLink pageLink);
+    List<TbPair<UUID, Long>> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, long createdTimeOffset, AlarmId idOffset, int limit);
 
-    void deleteEntityAlarmRelations(TenantId tenantId, EntityId entityId);
+    int deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId);
 
     void deleteEntityAlarmRecordsByTenantId(TenantId tenantId);
 
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java
index 57c15580f6..d869471fa3 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java
@@ -71,4 +71,6 @@ public interface AttributesService {
 
     List<String> findAllKeysByEntityIds(TenantId tenantId, List<EntityId> entityIds, String scope);
 
+    int removeAllByEntityId(TenantId tenantId, EntityId entityId);
+
 }
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityDaoService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityDaoService.java
index b1f6ab9cdb..cf55cf1054 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityDaoService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityDaoService.java
@@ -30,10 +30,14 @@ public interface EntityDaoService {
         throw new IllegalArgumentException("Not implemented for " + getEntityType());
     }
 
-    default void deleteEntity(TenantId tenantId, EntityId id) {
+    default void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
         throw new IllegalArgumentException(getEntityType().getNormalName() + " deletion not supported");
     }
 
+    default void deleteByTenantId(TenantId tenantId) {
+        throw new IllegalArgumentException("Deletion by tenant id not supported for " + getEntityType().getNormalName());
+    }
+
     EntityType getEntityType();
 
 }
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateService.java
index 1f4019063b..664f976904 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateService.java
@@ -32,6 +32,8 @@ public interface NotificationTemplateService {
 
     PageData<NotificationTemplate> findNotificationTemplatesByTenantIdAndNotificationTypes(TenantId tenantId, List<NotificationType> notificationTypes, PageLink pageLink);
 
+    int countNotificationTemplatesByTenantIdAndNotificationTypes(TenantId tenantId, List<NotificationType> notificationTypes);
+
     void deleteNotificationTemplateById(TenantId tenantId, NotificationTemplateId id);
 
     void deleteNotificationTemplatesByTenantId(TenantId tenantId);
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/queue/QueueStatsService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/queue/QueueStatsService.java
index 9ab67c73a7..c9e3f605c6 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/queue/QueueStatsService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/queue/QueueStatsService.java
@@ -32,6 +32,4 @@ public interface QueueStatsService extends EntityDaoService {
 
     List<QueueStats> findByTenantId(TenantId tenantId);
 
-    void deleteByTenantId(TenantId tenantId);
-
-}
\ No newline at end of file
+}
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateService.java
index 2ed877dabd..3d09247c7e 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateService.java
@@ -31,8 +31,6 @@ public interface ApiUsageStateService extends EntityDaoService {
 
     ApiUsageState findApiUsageStateByEntityId(EntityId entityId);
 
-    void deleteApiUsageStateByTenantId(TenantId tenantId);
-
     void deleteApiUsageStateByEntityId(EntityId entityId);
 
     ApiUsageState findApiUsageStateById(TenantId tenantId, ApiUsageStateId id);
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/user/UserService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/user/UserService.java
index f137bcc334..0cad776e78 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/user/UserService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/user/UserService.java
@@ -77,6 +77,8 @@ public interface UserService extends EntityDaoService {
 
     void deleteTenantAdmins(TenantId tenantId);
 
+    void deleteAllByTenantId(TenantId tenantId);
+
     PageData<User> findCustomerUsers(TenantId tenantId, CustomerId customerId, PageLink pageLink);
 
     PageData<User> findUsersByCustomerIds(TenantId tenantId, List<CustomerId> customerIds, PageLink pageLink);
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/AttributeScope.java b/common/data/src/main/java/org/thingsboard/server/common/data/AttributeScope.java
index 0e8335c7cb..3c58dd3b72 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/AttributeScope.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/AttributeScope.java
@@ -17,6 +17,10 @@ package org.thingsboard.server.common.data;
 
 import lombok.Getter;
 
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 public enum AttributeScope {
 
     CLIENT_SCOPE(1),
@@ -25,8 +29,15 @@ public enum AttributeScope {
     @Getter
     private final int id;
 
+    private static final Map<Integer, AttributeScope> values = Arrays.stream(values())
+            .collect(Collectors.toMap(AttributeScope::getId, scope -> scope));
+
     AttributeScope(int id) {
         this.id = id;
     }
 
+    public static AttributeScope valueOf(int id) {
+        return values.get(id);
+    }
+
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
index 53b5d2ec63..b529edeb0c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
@@ -44,6 +44,8 @@ public class DataConstants {
     public static final String EDGE_ID = "edgeId";
     public static final String DEVICE_ID = "deviceId";
     public static final String GATEWAY_PARAMETER = "gateway";
+
+    public static final String OVERWRITE_ACTIVITY_TIME_PARAMETER = "overwriteActivityTime";
     public static final String COAP_TRANSPORT_NAME = "COAP";
     public static final String LWM2M_TRANSPORT_NAME = "LWM2M";
     public static final String MQTT_TRANSPORT_NAME = "MQTT";
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
index bb43bf4d11..6748aebb50 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
@@ -20,7 +20,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.util.EnumSet;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author Andrew Shvayka
@@ -28,51 +27,57 @@ import java.util.stream.Collectors;
 public enum EntityType {
     TENANT(1),
     CUSTOMER(2),
-    USER(3),
+    USER(3, "tb_user"),
     DASHBOARD(4),
     ASSET(5),
     DEVICE(6),
-    ALARM (7),
-    RULE_CHAIN (11),
-    RULE_NODE (12),
-
-    ENTITY_VIEW (15) {
+    ALARM(7),
+    RULE_CHAIN(11),
+    RULE_NODE(12),
+    ENTITY_VIEW(15) {
         // backward compatibility for TbOriginatorTypeSwitchNode to return correct rule node connection.
         @Override
-        public String getNormalName () {
+        public String getNormalName() {
             return "Entity View";
         }
     },
-    WIDGETS_BUNDLE (16),
-    WIDGET_TYPE (17),
-    TENANT_PROFILE (20),
-    DEVICE_PROFILE (21),
-    ASSET_PROFILE (22),
-    API_USAGE_STATE (23),
-    TB_RESOURCE (24),
-    OTA_PACKAGE (25),
-    EDGE (26),
-    RPC (27),
-    QUEUE (28),
-    NOTIFICATION_TARGET (29),
-    NOTIFICATION_TEMPLATE (30),
-    NOTIFICATION_REQUEST (31),
-    NOTIFICATION (32),
-    NOTIFICATION_RULE (33),
+    WIDGETS_BUNDLE(16),
+    WIDGET_TYPE(17),
+    TENANT_PROFILE(20),
+    DEVICE_PROFILE(21),
+    ASSET_PROFILE(22),
+    API_USAGE_STATE(23),
+    TB_RESOURCE(24, "resource"),
+    OTA_PACKAGE(25),
+    EDGE(26),
+    RPC(27),
+    QUEUE(28),
+    NOTIFICATION_TARGET(29),
+    NOTIFICATION_TEMPLATE(30),
+    NOTIFICATION_REQUEST(31),
+    NOTIFICATION(32),
+    NOTIFICATION_RULE(33),
     QUEUE_STATS(34);
 
     @Getter
     private final int protoNumber; // Corresponds to EntityTypeProto
+    @Getter
+    private final String tableName;
+    @Getter
+    private final String normalName = StringUtils.capitalize(StringUtils.removeStart(name(), "TB_")
+            .toLowerCase().replaceAll("_", " "));
+
+    public static final List<String> NORMAL_NAMES = EnumSet.allOf(EntityType.class).stream()
+            .map(EntityType::getNormalName).toList();
 
-    private EntityType(int protoNumber) {
+    EntityType(int protoNumber) {
         this.protoNumber = protoNumber;
+        this.tableName = name().toLowerCase();
     }
 
-    public static final List<String> NORMAL_NAMES = EnumSet.allOf(EntityType.class).stream()
-            .map(EntityType::getNormalName).collect(Collectors.toUnmodifiableList());
-
-    @Getter
-    private final String normalName = StringUtils.capitalize(StringUtils.removeStart(name(), "TB_")
-            .toLowerCase().replaceAll("_", " "));
+    EntityType(int protoNumber, String tableName) {
+        this.protoNumber = protoNumber;
+        this.tableName = tableName;
+    }
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java b/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java
index 7cb7e15395..b7fade3e09 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java
@@ -152,7 +152,7 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId, HasTi
         return super.getPhone();
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Email", example = "example@company.com")
+    @Schema(description = "Email", example = "example@company.com")
     @Override
     public String getEmail() {
         return super.getEmail();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/AlarmsDeletionHousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/AlarmsDeletionHousekeeperTask.java
new file mode 100644
index 0000000000..60a50916ef
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/AlarmsDeletionHousekeeperTask.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.housekeeper;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+import java.util.List;
+import java.util.UUID;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class AlarmsDeletionHousekeeperTask extends HousekeeperTask {
+
+    private List<UUID> alarms;
+
+    public AlarmsDeletionHousekeeperTask(TenantId tenantId, EntityId entityId) {
+        this(tenantId, entityId, null);
+    }
+
+    public AlarmsDeletionHousekeeperTask(TenantId tenantId, EntityId entityId, List<UUID> alarms) {
+        super(tenantId, entityId, HousekeeperTaskType.DELETE_ALARMS);
+        this.alarms = alarms;
+    }
+
+    @Override
+    public String getDescription() {
+        return super.getDescription() + (alarms != null ? " (" + alarms + ")" : "");
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/AlarmsUnassignHousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/AlarmsUnassignHousekeeperTask.java
new file mode 100644
index 0000000000..5911418dc3
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/AlarmsUnassignHousekeeperTask.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.housekeeper;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.thingsboard.server.common.data.User;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class AlarmsUnassignHousekeeperTask extends HousekeeperTask {
+
+    private String userTitle;
+
+    protected AlarmsUnassignHousekeeperTask(User user) {
+        super(user.getTenantId(), user.getId(), HousekeeperTaskType.UNASSIGN_ALARMS);
+        this.userTitle = user.getTitle();
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/EntitiesDeletionHousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/EntitiesDeletionHousekeeperTask.java
new file mode 100644
index 0000000000..b98af48d42
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/EntitiesDeletionHousekeeperTask.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.housekeeper;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.id.TenantId;
+
+import java.util.List;
+import java.util.UUID;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+public class EntitiesDeletionHousekeeperTask extends HousekeeperTask {
+
+    private EntityType entityType;
+    private List<UUID> entities;
+
+    public EntitiesDeletionHousekeeperTask(TenantId tenantId, EntityType entityType, List<UUID> entities) {
+        super(tenantId, tenantId, HousekeeperTaskType.DELETE_ENTITIES);
+        this.entityType = entityType;
+        this.entities = entities;
+    }
+
+    @JsonIgnore
+    @Override
+    public String getDescription() {
+        return entityType.getNormalName().toLowerCase() + "s deletion (" + entities + ")";
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTask.java
new file mode 100644
index 0000000000..8757b1121e
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTask.java
@@ -0,0 +1,89 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.housekeeper;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+import java.io.Serializable;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "taskType", visible = true, include = JsonTypeInfo.As.EXISTING_PROPERTY, defaultImpl = HousekeeperTask.class)
+@JsonSubTypes({
+        @Type(name = "DELETE_TS_HISTORY", value = TsHistoryDeletionHousekeeperTask.class),
+        @Type(name = "DELETE_LATEST_TS", value = LatestTsDeletionHousekeeperTask.class),
+        @Type(name = "DELETE_TENANT_ENTITIES", value = TenantEntitiesDeletionHousekeeperTask.class),
+        @Type(name = "DELETE_ENTITIES", value = EntitiesDeletionHousekeeperTask.class),
+        @Type(name = "DELETE_ALARMS", value = AlarmsDeletionHousekeeperTask.class),
+        @Type(name = "UNASSIGN_ALARMS", value = AlarmsUnassignHousekeeperTask.class)
+})
+@Data
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class HousekeeperTask implements Serializable {
+
+    private TenantId tenantId;
+    private EntityId entityId;
+    private HousekeeperTaskType taskType;
+    private long ts;
+
+    protected HousekeeperTask(@NonNull TenantId tenantId, @NonNull EntityId entityId, @NonNull HousekeeperTaskType taskType) {
+        this.tenantId = tenantId;
+        this.entityId = entityId;
+        this.taskType = taskType;
+        this.ts = System.currentTimeMillis();
+    }
+
+    public static HousekeeperTask deleteAttributes(TenantId tenantId, EntityId entityId) {
+        return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_ATTRIBUTES);
+    }
+
+    public static HousekeeperTask deleteTelemetry(TenantId tenantId, EntityId entityId) {
+        return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_TELEMETRY);
+    }
+
+    public static HousekeeperTask deleteEvents(TenantId tenantId, EntityId entityId) {
+        return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_EVENTS);
+    }
+
+    public static HousekeeperTask unassignAlarms(User user) {
+        return new AlarmsUnassignHousekeeperTask(user);
+    }
+
+    public static HousekeeperTask deleteAlarms(TenantId tenantId, EntityId entityId) {
+        return new AlarmsDeletionHousekeeperTask(tenantId, entityId);
+    }
+
+    public static HousekeeperTask deleteTenantEntities(TenantId tenantId, EntityType entityType) {
+        return new TenantEntitiesDeletionHousekeeperTask(tenantId, entityType);
+    }
+
+    @JsonIgnore
+    public String getDescription() {
+        return taskType.getDescription() + " for " + entityId.getEntityType().getNormalName().toLowerCase() + " " + entityId.getId();
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.java
new file mode 100644
index 0000000000..edd13b3d5d
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.housekeeper;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum HousekeeperTaskType {
+
+    DELETE_ATTRIBUTES("attributes deletion"),
+    DELETE_TELEMETRY("telemetry deletion"),
+    DELETE_LATEST_TS("latest telemetry deletion"),
+    DELETE_TS_HISTORY("timeseries history deletion"),
+    DELETE_EVENTS("events deletion"),
+    DELETE_ALARMS("alarms deletion"),
+    UNASSIGN_ALARMS("alarms unassigning"),
+    DELETE_TENANT_ENTITIES("tenant entities deletion"),
+    DELETE_ENTITIES("entities deletion");
+
+    private final String description;
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/LatestTsDeletionHousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/LatestTsDeletionHousekeeperTask.java
new file mode 100644
index 0000000000..4f0f56479e
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/LatestTsDeletionHousekeeperTask.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.housekeeper;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class LatestTsDeletionHousekeeperTask extends HousekeeperTask {
+
+    private String key;
+
+    public LatestTsDeletionHousekeeperTask(TenantId tenantId, EntityId entityId, String key) {
+        super(tenantId, entityId, HousekeeperTaskType.DELETE_LATEST_TS);
+        this.key = key;
+    }
+
+    @Override
+    public String getDescription() {
+        return super.getDescription() + (key != null ? " for key '" + key + "'" : "");
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TenantEntitiesDeletionHousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TenantEntitiesDeletionHousekeeperTask.java
new file mode 100644
index 0000000000..f6c6d5030c
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TenantEntitiesDeletionHousekeeperTask.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.housekeeper;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.id.TenantId;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+public class TenantEntitiesDeletionHousekeeperTask extends HousekeeperTask {
+
+    private EntityType entityType;
+
+    public TenantEntitiesDeletionHousekeeperTask(TenantId tenantId, EntityType entityType) {
+        super(tenantId, tenantId, HousekeeperTaskType.DELETE_TENANT_ENTITIES);
+        this.entityType = entityType;
+    }
+
+    @JsonIgnore
+    @Override
+    public String getDescription() {
+        return entityType.getNormalName().toLowerCase() + "s deletion";
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TsHistoryDeletionHousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TsHistoryDeletionHousekeeperTask.java
new file mode 100644
index 0000000000..8f462f2dff
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TsHistoryDeletionHousekeeperTask.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.housekeeper;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class TsHistoryDeletionHousekeeperTask extends HousekeeperTask {
+
+    private String key;
+
+    public TsHistoryDeletionHousekeeperTask(TenantId tenantId, EntityId entityId, String key) {
+        super(tenantId, entityId, HousekeeperTaskType.DELETE_TS_HISTORY);
+        this.key = key;
+    }
+
+    @Override
+    public String getDescription() {
+        return super.getDescription() + (key != null ? " for key '" + key + "'" : "");
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java
index 5a8fd87933..5f91725b40 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java
@@ -30,6 +30,6 @@ public enum NotificationType {
     RULE_NODE,
     RATE_LIMITS,
     EDGE_CONNECTION,
-    EDGE_COMMUNICATION_FAILURE
-
+    EDGE_COMMUNICATION_FAILURE,
+    TASK_PROCESSING_FAILURE
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/TaskProcessingFailureNotificationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/TaskProcessingFailureNotificationInfo.java
new file mode 100644
index 0000000000..cbee861c04
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/TaskProcessingFailureNotificationInfo.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.notification.info;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+import java.util.Map;
+
+import static org.thingsboard.server.common.data.util.CollectionsUtil.mapOf;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class TaskProcessingFailureNotificationInfo implements RuleOriginatedNotificationInfo {
+
+    private TenantId tenantId;
+    private EntityId entityId;
+    private HousekeeperTaskType taskType;
+    private String taskDescription;
+    private String error;
+    private int attempt;
+
+    @Override
+    public Map<String, String> getTemplateData() {
+        return mapOf(
+                "tenantId", tenantId.toString(),
+                "entityType", entityId.getEntityType().getNormalName(),
+                "entityId", entityId.getId().toString(),
+                "taskType", taskType.getDescription(),
+                "taskDescription", taskDescription,
+                "error", error,
+                "attempt", String.valueOf(attempt)
+        );
+    }
+
+    @Override
+    public TenantId getAffectedTenantId() {
+        return tenantId;
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/TaskProcessingFailureTrigger.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/TaskProcessingFailureTrigger.java
new file mode 100644
index 0000000000..3626e09c0b
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/TaskProcessingFailureTrigger.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.notification.rule.trigger;
+
+import lombok.Builder;
+import lombok.Data;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
+
+@Data
+@Builder
+public class TaskProcessingFailureTrigger implements NotificationRuleTrigger {
+
+    private final HousekeeperTask task;
+    private final int attempt;
+    private final Throwable error;
+
+    @Override
+    public NotificationRuleTriggerType getType() {
+        return NotificationRuleTriggerType.TASK_PROCESSING_FAILURE;
+    }
+
+    @Override
+    public TenantId getTenantId() {
+        return task.getTenantId();
+    }
+
+    @Override
+    public EntityId getOriginatorEntityId() {
+        return task.getEntityId();
+    }
+
+    @Override
+    public boolean deduplicate() {
+        return false;
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java
index 15a5e59255..1621ec8120 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java
@@ -38,6 +38,7 @@ import java.io.Serializable;
         @Type(value = RateLimitsNotificationRuleTriggerConfig.class, name = "RATE_LIMITS"),
         @Type(value = EdgeConnectionNotificationRuleTriggerConfig.class, name = "EDGE_CONNECTION"),
         @Type(value = EdgeCommunicationFailureNotificationRuleTriggerConfig.class, name = "EDGE_COMMUNICATION_FAILURE"),
+        @Type(value = TaskProcessingFailureNotificationRuleTriggerConfig.class, name = "TASK_PROCESSING_FAILURE")
 })
 public interface NotificationRuleTriggerConfig extends Serializable {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java
index 8469fac752..8846ae284d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java
@@ -31,7 +31,8 @@ public enum NotificationRuleTriggerType {
     NEW_PLATFORM_VERSION(false),
     ENTITIES_LIMIT(false),
     API_USAGE_LIMIT(false),
-    RATE_LIMITS(false);
+    RATE_LIMITS(false),
+    TASK_PROCESSING_FAILURE(false);
 
     private final boolean tenantLevel;
 
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/housekeeper/HouseKeeperService.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java
similarity index 58%
rename from common/dao-api/src/main/java/org/thingsboard/server/dao/housekeeper/HouseKeeperService.java
rename to common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java
index 55b164df52..73f0517238 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/housekeeper/HouseKeeperService.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java
@@ -13,17 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.dao.housekeeper;
+package org.thingsboard.server.common.data.notification.rule.trigger.config;
 
-import com.google.common.util.concurrent.ListenableFuture;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.id.AlarmId;
-import org.thingsboard.server.common.data.id.TenantId;
+import lombok.Builder;
+import lombok.Data;
 
-import java.util.List;
+@Data
+@Builder
+public class TaskProcessingFailureNotificationRuleTriggerConfig implements NotificationRuleTriggerConfig {
 
-public interface HouseKeeperService {
-
-    ListenableFuture<List<AlarmId>> unassignDeletedUserAlarms(TenantId tenantId, User user, long unassignTs);
+    @Override
+    public NotificationRuleTriggerType getTriggerType() {
+        return NotificationRuleTriggerType.TASK_PROCESSING_FAILURE;
+    }
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/page/PageData.java b/common/data/src/main/java/org/thingsboard/server/common/data/page/PageData.java
index 49824c524d..3df123d870 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/page/PageData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/page/PageData.java
@@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -28,6 +29,7 @@ import java.util.stream.Collectors;
 
 @Schema
 @EqualsAndHashCode
+@ToString
 public class PageData<T> implements Serializable {
 
     public static final PageData EMPTY_PAGE_DATA = new PageData<>();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java b/common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java
index 042a9b1896..d6a3b5ad7d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java
@@ -63,10 +63,10 @@ public class PageLink {
 
     @JsonIgnore
     public PageLink nextPageLink() {
-        return new PageLink(this.pageSize, this.page+1, this.textSearch, this.sortOrder);
+        return new PageLink(this.pageSize, this.page + 1, this.textSearch, this.sortOrder);
     }
 
-    public Sort toSort(SortOrder sortOrder, Map<String,String> columnMap, boolean addDefaultSorting) {
+    public Sort toSort(SortOrder sortOrder, Map<String, String> columnMap, boolean addDefaultSorting) {
         if (sortOrder == null) {
             return DEFAULT_SORT;
         } else {
@@ -74,7 +74,7 @@ public class PageLink {
         }
     }
 
-    public Sort toSort(List<SortOrder> sortOrders, Map<String,String> columnMap, boolean addDefaultSorting) {
+    public Sort toSort(List<SortOrder> sortOrders, Map<String, String> columnMap, boolean addDefaultSorting) {
         if (addDefaultSorting && !isDefaultSortOrderAvailable(sortOrders)) {
             sortOrders = new ArrayList<>(sortOrders);
             sortOrders.add(new SortOrder(DEFAULT_SORT_PROPERTY, SortOrder.Direction.ASC));
@@ -82,7 +82,7 @@ public class PageLink {
         return Sort.by(sortOrders.stream().map(s -> toSortOrder(s, columnMap)).collect(Collectors.toList()));
     }
 
-    private Sort.Order toSortOrder(SortOrder sortOrder, Map<String,String> columnMap) {
+    private Sort.Order toSortOrder(SortOrder sortOrder, Map<String, String> columnMap) {
         String property = sortOrder.getProperty();
         if (columnMap.containsKey(property)) {
             property = columnMap.get(property);
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/page/SortOrder.java b/common/data/src/main/java/org/thingsboard/server/common/data/page/SortOrder.java
index 5cafed6df2..539dd1cb40 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/page/SortOrder.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/page/SortOrder.java
@@ -32,6 +32,10 @@ public class SortOrder {
         this.direction = direction;
     }
 
+    public static SortOrder of(String property, Direction direction) {
+        return new SortOrder(property, direction);
+    }
+
     public static enum Direction {
         ASC, DESC
     }
diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/housekeeper/HousekeeperClient.java b/common/message/src/main/java/org/thingsboard/server/common/msg/housekeeper/HousekeeperClient.java
new file mode 100644
index 0000000000..e2a3af9242
--- /dev/null
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/housekeeper/HousekeeperClient.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.msg.housekeeper;
+
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+
+public interface HousekeeperClient {
+
+    void submitTask(HousekeeperTask task);
+
+}
diff --git a/common/proto/src/main/proto/queue.proto b/common/proto/src/main/proto/queue.proto
index 44f0b0caf0..7b2aa2fe1b 100644
--- a/common/proto/src/main/proto/queue.proto
+++ b/common/proto/src/main/proto/queue.proto
@@ -1562,3 +1562,16 @@ message LifecycleEventProto {
   bool success = 7;
   string error = 8;
 }
+
+message ToHousekeeperServiceMsg {
+  HousekeeperTaskProto task = 1;
+}
+
+message HousekeeperTaskProto {
+  string value = 1;
+  int64 ts = 2;
+
+  // reprocessing
+  int32 attempt = 50;
+  repeated string errors = 51;
+}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/housekeeper/DefaultHousekeeperClient.java b/common/queue/src/main/java/org/thingsboard/server/queue/housekeeper/DefaultHousekeeperClient.java
new file mode 100644
index 0000000000..ce5311b0e7
--- /dev/null
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/housekeeper/DefaultHousekeeperClient.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.queue.housekeeper;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.msg.housekeeper.HousekeeperClient;
+import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+import org.thingsboard.server.queue.TbQueueCallback;
+import org.thingsboard.server.queue.TbQueueMsgMetadata;
+import org.thingsboard.server.queue.TbQueueProducer;
+import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
+
+@Service
+@Slf4j
+public class DefaultHousekeeperClient implements HousekeeperClient {
+
+    private final HousekeeperConfig config;
+    private final TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> producer;
+    private final TopicPartitionInfo submitTpi;
+    private final TbQueueCallback submitCallback;
+
+    public DefaultHousekeeperClient(HousekeeperConfig config,
+                                    TbQueueProducerProvider producerProvider) {
+        this.config = config;
+        this.producer = producerProvider.getHousekeeperMsgProducer();
+        this.submitTpi = TopicPartitionInfo.builder().topic(producer.getDefaultTopic()).build();
+        this.submitCallback = new TbQueueCallback() {
+            @Override
+            public void onSuccess(TbQueueMsgMetadata metadata) {
+                log.trace("Submitted Housekeeper task");
+            }
+
+            @Override
+            public void onFailure(Throwable t) {
+                log.error("Failed to submit Housekeeper task", t);
+            }
+        };
+    }
+
+    @Override
+    public void submitTask(HousekeeperTask task) {
+        HousekeeperTaskType taskType = task.getTaskType();
+        if (config.getDisabledTaskTypes().contains(taskType)) {
+            log.trace("Task type {} is disabled, ignoring {}", taskType, task);
+            return;
+        }
+
+        log.debug("[{}][{}][{}] Submitting task: {}", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), task);
+        /*
+         * using msg key as entity id so that msgs related to certain entity are pushed to same partition,
+         * e.g. on tenant deletion (entity id is tenant id), we need to clean up tenant entities in certain order
+         * */
+        try {
+            producer.send(submitTpi, new TbProtoQueueMsg<>(task.getEntityId().getId(), ToHousekeeperServiceMsg.newBuilder()
+                    .setTask(TransportProtos.HousekeeperTaskProto.newBuilder()
+                            .setValue(JacksonUtil.toString(task))
+                            .setTs(task.getTs())
+                            .setAttempt(0)
+                            .build())
+                    .build()), submitCallback);
+        } catch (Throwable t) {
+            log.error("Failed to submit Housekeeper task {}", task, t);
+        }
+    }
+
+}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/housekeeper/HousekeeperConfig.java b/common/queue/src/main/java/org/thingsboard/server/queue/housekeeper/HousekeeperConfig.java
new file mode 100644
index 0000000000..4ca3776d4d
--- /dev/null
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/housekeeper/HousekeeperConfig.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.queue.housekeeper;
+
+import lombok.Getter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+
+import java.util.Set;
+
+@Component
+@Getter
+public class HousekeeperConfig {
+
+    @Value("${queue.core.housekeeper.disabled-task-types:}")
+    private Set<HousekeeperTaskType> disabledTaskTypes;
+    @Value("${queue.core.housekeeper.task-processing-timeout-ms:120000}")
+    private int taskProcessingTimeout;
+    @Value("${queue.core.housekeeper.poll-interval-ms:500}")
+    private int pollInterval;
+    @Value("${queue.core.housekeeper.task-reprocessing-delay-ms:3000}")
+    private int taskReprocessingDelay;
+    @Value("${queue.core.housekeeper.max-reprocessing-attempts:10}")
+    private int maxReprocessingAttempts;
+
+}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaTopicConfigs.java b/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaTopicConfigs.java
index dbc6d3dd82..c55d8a5b8a 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaTopicConfigs.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaTopicConfigs.java
@@ -43,6 +43,10 @@ public class TbKafkaTopicConfigs {
     private String fwUpdatesProperties;
     @Value("${queue.kafka.topic-properties.version-control:}")
     private String vcProperties;
+    @Value("${queue.kafka.topic-properties.housekeeper:}")
+    private String housekeeperProperties;
+    @Value("${queue.kafka.topic-properties.housekeeper-reprocessing:}")
+    private String housekeeperReprocessingProperties;
 
     @Getter
     private Map<String, String> coreConfigs;
@@ -62,6 +66,10 @@ public class TbKafkaTopicConfigs {
     private Map<String, String> fwUpdatesConfigs;
     @Getter
     private Map<String, String> vcConfigs;
+    @Getter
+    private Map<String, String> housekeeperConfigs;
+    @Getter
+    private Map<String, String> housekeeperReprocessingConfigs;
 
     @PostConstruct
     private void init() {
@@ -76,6 +84,8 @@ public class TbKafkaTopicConfigs {
         jsExecutorResponseConfigs.put(NUM_PARTITIONS_SETTING, "1");
         fwUpdatesConfigs = PropertyUtils.getProps(fwUpdatesProperties);
         vcConfigs = PropertyUtils.getProps(vcProperties);
+        housekeeperConfigs = PropertyUtils.getProps(housekeeperProperties);
+        housekeeperReprocessingConfigs = PropertyUtils.getProps(housekeeperReprocessingProperties);
     }
 
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/memory/DefaultInMemoryStorage.java b/common/queue/src/main/java/org/thingsboard/server/queue/memory/DefaultInMemoryStorage.java
index 9c7dc02b4f..f46a05ca26 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/memory/DefaultInMemoryStorage.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/memory/DefaultInMemoryStorage.java
@@ -20,8 +20,10 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.queue.TbQueueMsg;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -47,6 +49,11 @@ public final class DefaultInMemoryStorage implements InMemoryStorage {
         return storage.values().stream().map(BlockingQueue::size).reduce(0, Integer::sum);
     }
 
+    @Override
+    public int getLag(String topic) {
+        return Optional.ofNullable(storage.get(topic)).map(Collection::size).orElse(0);
+    }
+
     @Override
     public boolean put(String topic, TbQueueMsg msg) {
         return storage.computeIfAbsent(topic, (t) -> new LinkedBlockingQueue<>()).add(msg);
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryStorage.java b/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryStorage.java
index 0e753d1a81..81b174a0d3 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryStorage.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryStorage.java
@@ -25,6 +25,8 @@ public interface InMemoryStorage {
 
     int getLagTotal();
 
+    int getLag(String topic);
+
     boolean put(String topic, TbQueueMsg msg);
 
     <T extends TbQueueMsg> List<T> get(String topic) throws InterruptedException;
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsMonolithQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsMonolithQueueFactory.java
index ed6f6c2192..26ec51097f 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsMonolithQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsMonolithQueueFactory.java
@@ -26,6 +26,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -226,6 +227,28 @@ public class AwsSqsMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEng
         return new TbAwsSqsProducerTemplate<>(vcAdmin, sqsSettings, topicService.buildTopicName(vcSettings.getTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbAwsSqsConsumerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbAwsSqsConsumerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbCoreQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbCoreQueueFactory.java
index 73d91c0272..0c4fe824fa 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbCoreQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbCoreQueueFactory.java
@@ -24,6 +24,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -205,6 +206,28 @@ public class AwsSqsTbCoreQueueFactory implements TbCoreQueueFactory {
         return new TbAwsSqsProducerTemplate<>(vcAdmin, sqsSettings, topicService.buildTopicName(vcSettings.getTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbAwsSqsConsumerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbAwsSqsConsumerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbRuleEngineQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbRuleEngineQueueFactory.java
index 5477f6981f..000578333a 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbRuleEngineQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbRuleEngineQueueFactory.java
@@ -33,8 +33,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
 import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
 import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
@@ -159,6 +159,10 @@ public class AwsSqsTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory
         return new TbAwsSqsProducerTemplate<>(otaAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
 
     @PreDestroy
     private void destroy() {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbVersionControlQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbVersionControlQueueFactory.java
index 73f2142718..aa79349dac 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbVersionControlQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbVersionControlQueueFactory.java
@@ -80,6 +80,11 @@ public class AwsSqsTbVersionControlQueueFactory implements TbVersionControlQueue
         );
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTransportQueueFactory.java
index 582c6a7796..ec07847631 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTransportQueueFactory.java
@@ -131,6 +131,11 @@ public class AwsSqsTransportQueueFactory implements TbTransportQueueFactory {
         return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/HousekeeperClientQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/HousekeeperClientQueueFactory.java
new file mode 100644
index 0000000000..79c38a04e9
--- /dev/null
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/HousekeeperClientQueueFactory.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.queue.provider;
+
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+import org.thingsboard.server.queue.TbQueueProducer;
+import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+
+public interface HousekeeperClientQueueFactory {
+
+    TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer();
+
+}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryMonolithQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryMonolithQueueFactory.java
index a681038aa9..310bc75fe4 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryMonolithQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryMonolithQueueFactory.java
@@ -160,6 +160,26 @@ public class InMemoryMonolithQueueFactory implements TbCoreQueueFactory, TbRuleE
         return new InMemoryTbQueueProducer<>(storage, topicService.buildTopicName(vcSettings.getTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new InMemoryTbQueueProducer<>(storage, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new InMemoryTbQueueConsumer<>(storage, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new InMemoryTbQueueProducer<>(storage, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new InMemoryTbQueueConsumer<>(storage, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
     @Scheduled(fixedRateString = "${queue.in_memory.stats.print-interval-ms:60000}")
     private void printInMemoryStats() {
         storage.printStats();
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryTbTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryTbTransportQueueFactory.java
index f08a822466..4ee79aef60 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryTbTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryTbTransportQueueFactory.java
@@ -120,4 +120,9 @@ public class InMemoryTbTransportQueueFactory implements TbTransportQueueFactory
         return new InMemoryTbQueueProducer<>(storage, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new InMemoryTbQueueProducer<>(storage, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaMonolithQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaMonolithQueueFactory.java
index b6602abe63..cd09f682c6 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaMonolithQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaMonolithQueueFactory.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -39,8 +40,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.kafka.TbKafkaAdmin;
 import org.thingsboard.server.queue.kafka.TbKafkaConsumerStatsService;
 import org.thingsboard.server.queue.kafka.TbKafkaConsumerTemplate;
@@ -82,6 +83,8 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
     private final TbQueueAdmin notificationAdmin;
     private final TbQueueAdmin fwUpdatesAdmin;
     private final TbQueueAdmin vcAdmin;
+    private final TbQueueAdmin housekeeperAdmin;
+    private final TbQueueAdmin housekeeperReprocessingAdmin;
 
     private final AtomicLong consumerCount = new AtomicLong();
 
@@ -115,6 +118,8 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
         this.notificationAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getNotificationsConfigs());
         this.fwUpdatesAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getFwUpdatesConfigs());
         this.vcAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getVcConfigs());
+        this.housekeeperAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperConfigs());
+        this.housekeeperReprocessingAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperReprocessingConfigs());
     }
 
     @Override
@@ -346,6 +351,52 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
         return requestBuilder.build();
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("monolith-housekeeper-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .admin(housekeeperAdmin)
+                .build();
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return TbKafkaConsumerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .topic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .clientId("monolith-housekeeper-consumer-" + serviceInfoProvider.getServiceId())
+                .groupId(topicService.buildTopicName("monolith-housekeeper-consumer"))
+                .decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()))
+                .admin(housekeeperAdmin)
+                .statsService(consumerStatsService)
+                .build();
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("monolith-housekeeper-reprocessing-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()))
+                .admin(housekeeperReprocessingAdmin)
+                .build();
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return TbKafkaConsumerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .topic(topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()))
+                .clientId("monolith-housekeeper-reprocessing-consumer-" + serviceInfoProvider.getServiceId())
+                .groupId(topicService.buildTopicName("monolith-housekeeper-reprocessing-consumer"))
+                .decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()))
+                .admin(housekeeperReprocessingAdmin)
+                .statsService(consumerStatsService)
+                .build();
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbCoreQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbCoreQueueFactory.java
index a6c2b648e5..95fea30d7b 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbCoreQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbCoreQueueFactory.java
@@ -23,6 +23,7 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -38,8 +39,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.kafka.TbKafkaAdmin;
 import org.thingsboard.server.queue.kafka.TbKafkaConsumerStatsService;
 import org.thingsboard.server.queue.kafka.TbKafkaConsumerTemplate;
@@ -80,6 +81,8 @@ public class KafkaTbCoreQueueFactory implements TbCoreQueueFactory {
     private final TbQueueAdmin notificationAdmin;
     private final TbQueueAdmin fwUpdatesAdmin;
     private final TbQueueAdmin vcAdmin;
+    private final TbQueueAdmin housekeeperAdmin;
+    private final TbQueueAdmin housekeeperReprocessingAdmin;
 
     public KafkaTbCoreQueueFactory(TopicService topicService,
                                    TbKafkaSettings kafkaSettings,
@@ -112,6 +115,8 @@ public class KafkaTbCoreQueueFactory implements TbCoreQueueFactory {
         this.notificationAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getNotificationsConfigs());
         this.fwUpdatesAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getFwUpdatesConfigs());
         this.vcAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getVcConfigs());
+        this.housekeeperAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperConfigs());
+        this.housekeeperReprocessingAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperReprocessingConfigs());
     }
 
     @Override
@@ -303,6 +308,53 @@ public class KafkaTbCoreQueueFactory implements TbCoreQueueFactory {
         return requestBuilder.build();
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("tb-core-housekeeper-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .admin(housekeeperAdmin)
+                .build();
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return TbKafkaConsumerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .topic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .clientId("tb-core-housekeeper-consumer-" + serviceInfoProvider.getServiceId())
+                .groupId(topicService.buildTopicName("tb-core-housekeeper-consumer"))
+                .decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()))
+                .admin(housekeeperAdmin)
+                .statsService(consumerStatsService)
+                .build();
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("tb-core-housekeeper-reprocessing-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()))
+                .admin(housekeeperReprocessingAdmin)
+                .build();
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return TbKafkaConsumerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .topic(topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()))
+                .clientId("tb-core-housekeeper-reprocessing-consumer-" + serviceInfoProvider.getServiceId())
+                .groupId(topicService.buildTopicName("tb-core-housekeeper-reprocessing-consumer"))
+                .decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()))
+                .admin(housekeeperReprocessingAdmin)
+                .statsService(consumerStatsService)
+                .build();
+    }
+
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbRuleEngineQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbRuleEngineQueueFactory.java
index 798e39ca65..568380d7b5 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbRuleEngineQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbRuleEngineQueueFactory.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -72,6 +73,7 @@ public class KafkaTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
     private final TbQueueAdmin jsExecutorResponseAdmin;
     private final TbQueueAdmin notificationAdmin;
     private final TbQueueAdmin fwUpdatesAdmin;
+    private final TbQueueAdmin housekeeperAdmin;
     private final AtomicLong consumerCount = new AtomicLong();
 
     public KafkaTbRuleEngineQueueFactory(TopicService topicService, TbKafkaSettings kafkaSettings,
@@ -97,6 +99,7 @@ public class KafkaTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
         this.jsExecutorResponseAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getJsExecutorResponseConfigs());
         this.notificationAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getNotificationsConfigs());
         this.fwUpdatesAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getFwUpdatesConfigs());
+        this.housekeeperAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperConfigs());
     }
 
     @Override
@@ -230,6 +233,16 @@ public class KafkaTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
         return requestBuilder.build();
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("tb-rule-engine-housekeeper-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .admin(housekeeperAdmin)
+                .build();
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbTransportQueueFactory.java
index 8102b16dbd..40904c7c65 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbTransportQueueFactory.java
@@ -21,6 +21,7 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
@@ -66,6 +67,7 @@ public class KafkaTbTransportQueueFactory implements TbTransportQueueFactory {
     private final TbQueueAdmin transportApiRequestAdmin;
     private final TbQueueAdmin transportApiResponseAdmin;
     private final TbQueueAdmin notificationAdmin;
+    private final TbQueueAdmin housekeeperAdmin;
 
     public KafkaTbTransportQueueFactory(TbKafkaSettings kafkaSettings,
                                         TbServiceInfoProvider serviceInfoProvider,
@@ -90,6 +92,7 @@ public class KafkaTbTransportQueueFactory implements TbTransportQueueFactory {
         this.transportApiRequestAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getTransportApiRequestConfigs());
         this.transportApiResponseAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getTransportApiResponseConfigs());
         this.notificationAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getNotificationsConfigs());
+        this.housekeeperAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperConfigs());
     }
 
     @Override
@@ -173,6 +176,16 @@ public class KafkaTbTransportQueueFactory implements TbTransportQueueFactory {
         return requestBuilder.build();
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("tb-transport-housekeeper-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .admin(housekeeperAdmin)
+                .build();
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbVersionControlQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbVersionControlQueueFactory.java
index 31ded1f3e3..c6633b030c 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbVersionControlQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbVersionControlQueueFactory.java
@@ -17,7 +17,9 @@ package org.thingsboard.server.queue.provider;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
+import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToVersionControlServiceMsg;
 import org.thingsboard.server.queue.TbQueueAdmin;
@@ -51,6 +53,7 @@ public class KafkaTbVersionControlQueueFactory implements TbVersionControlQueueF
     private final TbQueueAdmin coreAdmin;
     private final TbQueueAdmin vcAdmin;
     private final TbQueueAdmin notificationAdmin;
+    private final TbQueueAdmin housekeeperAdmin;
 
     public KafkaTbVersionControlQueueFactory(TbKafkaSettings kafkaSettings,
                                              TbServiceInfoProvider serviceInfoProvider,
@@ -69,6 +72,7 @@ public class KafkaTbVersionControlQueueFactory implements TbVersionControlQueueF
         this.coreAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getCoreConfigs());
         this.vcAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getVcConfigs());
         this.notificationAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getNotificationsConfigs());
+        this.housekeeperAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperConfigs());
     }
 
 
@@ -105,6 +109,16 @@ public class KafkaTbVersionControlQueueFactory implements TbVersionControlQueueF
         return requestBuilder.build();
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("tb-vc-housekeeper-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .admin(housekeeperAdmin)
+                .build();
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubMonolithQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubMonolithQueueFactory.java
index 61c2614fc7..a3734daa91 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubMonolithQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubMonolithQueueFactory.java
@@ -26,6 +26,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -40,8 +41,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.pubsub.TbPubSubAdmin;
 import org.thingsboard.server.queue.pubsub.TbPubSubConsumerTemplate;
 import org.thingsboard.server.queue.pubsub.TbPubSubProducerTemplate;
@@ -227,6 +228,28 @@ public class PubSubMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEng
         return new TbPubSubProducerTemplate<>(vcAdmin, pubSubSettings, topicService.buildTopicName(vcSettings.getTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbCoreQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbCoreQueueFactory.java
index 63975e3116..c48559467d 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbCoreQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbCoreQueueFactory.java
@@ -24,6 +24,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -38,8 +39,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.pubsub.TbPubSubAdmin;
 import org.thingsboard.server.queue.pubsub.TbPubSubConsumerTemplate;
 import org.thingsboard.server.queue.pubsub.TbPubSubProducerTemplate;
@@ -198,6 +199,28 @@ public class PubSubTbCoreQueueFactory implements TbCoreQueueFactory {
         return null;
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbRuleEngineQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbRuleEngineQueueFactory.java
index 9cf474a0e0..3895971655 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbRuleEngineQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbRuleEngineQueueFactory.java
@@ -25,6 +25,8 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -36,8 +38,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.pubsub.TbPubSubAdmin;
 import org.thingsboard.server.queue.pubsub.TbPubSubConsumerTemplate;
 import org.thingsboard.server.queue.pubsub.TbPubSubProducerTemplate;
@@ -157,10 +159,15 @@ public class PubSubTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory
     }
 
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
         return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbVersionControlQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbVersionControlQueueFactory.java
index b970490893..3faf35bbc7 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbVersionControlQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbVersionControlQueueFactory.java
@@ -79,6 +79,11 @@ public class PubSubTbVersionControlQueueFactory implements TbVersionControlQueue
         );
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTransportQueueFactory.java
index 1f4d838c1e..9f993a553d 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTransportQueueFactory.java
@@ -21,6 +21,7 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
@@ -131,6 +132,11 @@ public class PubSubTransportQueueFactory implements TbTransportQueueFactory {
         return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqMonolithQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqMonolithQueueFactory.java
index a3fbc5a360..40f4fdc2e5 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqMonolithQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqMonolithQueueFactory.java
@@ -26,6 +26,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -40,8 +41,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.rabbitmq.TbRabbitMqAdmin;
 import org.thingsboard.server.queue.rabbitmq.TbRabbitMqConsumerTemplate;
 import org.thingsboard.server.queue.rabbitmq.TbRabbitMqProducerTemplate;
@@ -224,6 +225,28 @@ public class RabbitMqMonolithQueueFactory implements TbCoreQueueFactory, TbRuleE
         return new TbRabbitMqProducerTemplate<>(vcAdmin, rabbitMqSettings, topicService.buildTopicName(vcSettings.getTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbCoreQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbCoreQueueFactory.java
index af4d46c487..06fe34c458 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbCoreQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbCoreQueueFactory.java
@@ -38,8 +38,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.rabbitmq.TbRabbitMqAdmin;
 import org.thingsboard.server.queue.rabbitmq.TbRabbitMqConsumerTemplate;
 import org.thingsboard.server.queue.rabbitmq.TbRabbitMqProducerTemplate;
@@ -198,6 +198,28 @@ public class RabbitMqTbCoreQueueFactory implements TbCoreQueueFactory {
         return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportProtos.ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportProtos.ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbRuleEngineQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbRuleEngineQueueFactory.java
index 5e76baaec9..8d7016404a 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbRuleEngineQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbRuleEngineQueueFactory.java
@@ -160,6 +160,11 @@ public class RabbitMqTbRuleEngineQueueFactory implements TbRuleEngineQueueFactor
         return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbVersionControlQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbVersionControlQueueFactory.java
index 2be1531334..d2842a3492 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbVersionControlQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbVersionControlQueueFactory.java
@@ -79,6 +79,11 @@ public class RabbitMqTbVersionControlQueueFactory implements TbVersionControlQue
         );
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTransportQueueFactory.java
index 0d4a37f437..13df3414d8 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTransportQueueFactory.java
@@ -132,6 +132,11 @@ public class RabbitMqTransportQueueFactory implements TbTransportQueueFactory {
         return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusMonolithQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusMonolithQueueFactory.java
index e2d11a6d62..c52ec7f7b2 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusMonolithQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusMonolithQueueFactory.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -44,8 +45,8 @@ import org.thingsboard.server.queue.azure.servicebus.TbServiceBusSettings;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
 import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
 import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
@@ -223,6 +224,28 @@ public class ServiceBusMonolithQueueFactory implements TbCoreQueueFactory, TbRul
         return new TbServiceBusProducerTemplate<>(vcAdmin, serviceBusSettings, topicService.buildTopicName(vcSettings.getTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbCoreQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbCoreQueueFactory.java
index dd68cb57a5..37fcfad1bd 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbCoreQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbCoreQueueFactory.java
@@ -24,6 +24,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -43,8 +44,8 @@ import org.thingsboard.server.queue.azure.servicebus.TbServiceBusSettings;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
 import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
 import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
@@ -198,6 +199,28 @@ public class ServiceBusTbCoreQueueFactory implements TbCoreQueueFactory {
         return null;
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbRuleEngineQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbRuleEngineQueueFactory.java
index 2a23383e13..cd2c52c21d 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbRuleEngineQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbRuleEngineQueueFactory.java
@@ -41,8 +41,8 @@ import org.thingsboard.server.queue.azure.servicebus.TbServiceBusSettings;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
 import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
 import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
@@ -160,6 +160,11 @@ public class ServiceBusTbRuleEngineQueueFactory implements TbRuleEngineQueueFact
         return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbVersionControlQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbVersionControlQueueFactory.java
index 8762a906a3..c3447a1012 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbVersionControlQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbVersionControlQueueFactory.java
@@ -79,6 +79,11 @@ public class ServiceBusTbVersionControlQueueFactory implements TbVersionControlQ
         );
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTransportQueueFactory.java
index d6cae4a682..f2ed799905 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTransportQueueFactory.java
@@ -133,6 +133,11 @@ public class ServiceBusTransportQueueFactory implements TbTransportQueueFactory
         return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueFactory.java
index 5aa7866033..20a67c2e09 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueFactory.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.queue.provider;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -36,7 +37,7 @@ import org.thingsboard.server.queue.common.TbProtoQueueMsg;
  * Responsible for initialization of various Producers and Consumers used by TB Core Node.
  * Implementation Depends on the queue queue.type from yml or TB_QUEUE_TYPE environment variable
  */
-public interface TbCoreQueueFactory extends TbUsageStatsClientQueueFactory {
+public interface TbCoreQueueFactory extends TbUsageStatsClientQueueFactory, HousekeeperClientQueueFactory {
 
     /**
      * Used to push messages to instances of TB Transport Service
@@ -130,4 +131,11 @@ public interface TbCoreQueueFactory extends TbUsageStatsClientQueueFactory {
      * @return
      */
     TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createVersionControlMsgProducer();
+
+    TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer();
+
+    TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer();
+
+    TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer();
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueProducerProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueProducerProvider.java
index 8379fc48be..3dcd716a96 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueProducerProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueProducerProvider.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.queue.provider;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -41,6 +42,7 @@ public class TbCoreQueueProducerProvider implements TbQueueProducerProvider {
     private TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> toTbCoreNotifications;
     private TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> toUsageStats;
     private TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> toVersionControl;
+    private TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> toHousekeeper;
 
     public TbCoreQueueProducerProvider(TbCoreQueueFactory tbQueueProvider) {
         this.tbQueueProvider = tbQueueProvider;
@@ -55,6 +57,7 @@ public class TbCoreQueueProducerProvider implements TbQueueProducerProvider {
         this.toTbCoreNotifications = tbQueueProvider.createTbCoreNotificationsMsgProducer();
         this.toUsageStats = tbQueueProvider.createToUsageStatsServiceMsgProducer();
         this.toVersionControl = tbQueueProvider.createVersionControlMsgProducer();
+        this.toHousekeeper = tbQueueProvider.createHousekeeperMsgProducer();
     }
 
     @Override
@@ -91,4 +94,10 @@ public class TbCoreQueueProducerProvider implements TbQueueProducerProvider {
     public TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> getTbVersionControlMsgProducer() {
         return toVersionControl;
     }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> getHousekeeperMsgProducer() {
+        return toHousekeeper;
+    }
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbQueueProducerProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbQueueProducerProvider.java
index 4dbdca4375..a752301cd8 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbQueueProducerProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbQueueProducerProvider.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.queue.provider;
 
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -78,4 +79,7 @@ public interface TbQueueProducerProvider {
      * @return
      */
     TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> getTbVersionControlMsgProducer();
+
+    TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> getHousekeeperMsgProducer();
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineProducerProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineProducerProvider.java
index 1e1ccf3b76..768d6b9c24 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineProducerProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineProducerProvider.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -40,6 +41,7 @@ public class TbRuleEngineProducerProvider implements TbQueueProducerProvider {
     private TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> toRuleEngineNotifications;
     private TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> toTbCoreNotifications;
     private TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> toUsageStats;
+    private TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> toHousekeeper;
 
     public TbRuleEngineProducerProvider(TbRuleEngineQueueFactory tbQueueProvider) {
         this.tbQueueProvider = tbQueueProvider;
@@ -53,6 +55,7 @@ public class TbRuleEngineProducerProvider implements TbQueueProducerProvider {
         this.toRuleEngineNotifications = tbQueueProvider.createRuleEngineNotificationsMsgProducer();
         this.toTbCoreNotifications = tbQueueProvider.createTbCoreNotificationsMsgProducer();
         this.toUsageStats = tbQueueProvider.createToUsageStatsServiceMsgProducer();
+        this.toHousekeeper = tbQueueProvider.createHousekeeperMsgProducer();
     }
 
     @Override
@@ -89,4 +92,10 @@ public class TbRuleEngineProducerProvider implements TbQueueProducerProvider {
     public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToVersionControlServiceMsg>> getTbVersionControlMsgProducer() {
         throw new RuntimeException("Not Implemented! Should not be used by Rule Engine!");
     }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> getHousekeeperMsgProducer() {
+        return toHousekeeper;
+    }
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineQueueFactory.java
index cd4575af6a..f23c7e47f3 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineQueueFactory.java
@@ -32,7 +32,7 @@ import org.thingsboard.server.queue.common.TbProtoQueueMsg;
  * Responsible for initialization of various Producers and Consumers used by TB Core Node.
  * Implementation Depends on the queue queue.type from yml or TB_QUEUE_TYPE environment variable
  */
-public interface TbRuleEngineQueueFactory extends TbUsageStatsClientQueueFactory {
+public interface TbRuleEngineQueueFactory extends TbUsageStatsClientQueueFactory, HousekeeperClientQueueFactory {
 
     /**
      * Used to push messages to instances of TB Transport Service
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueFactory.java
index 909089f175..c1a0a0fd24 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueFactory.java
@@ -26,7 +26,7 @@ import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 
-public interface TbTransportQueueFactory extends TbUsageStatsClientQueueFactory {
+public interface TbTransportQueueFactory extends TbUsageStatsClientQueueFactory, HousekeeperClientQueueFactory {
 
     TbQueueRequestTemplate<TbProtoQueueMsg<TransportApiRequestMsg>, TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiRequestTemplate();
 
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueProducerProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueProducerProvider.java
index 3096265e0f..010eaf404f 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueProducerProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueProducerProvider.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -38,6 +39,7 @@ public class TbTransportQueueProducerProvider implements TbQueueProducerProvider
     private TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> toTbCore;
     private TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> toTbCoreNotifications;
     private TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> toUsageStats;
+    private TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> toHousekeeper;
 
     public TbTransportQueueProducerProvider(TbTransportQueueFactory tbQueueProvider) {
         this.tbQueueProvider = tbQueueProvider;
@@ -49,6 +51,7 @@ public class TbTransportQueueProducerProvider implements TbQueueProducerProvider
         this.toRuleEngine = tbQueueProvider.createRuleEngineMsgProducer();
         this.toUsageStats = tbQueueProvider.createToUsageStatsServiceMsgProducer();
         this.toTbCoreNotifications = tbQueueProvider.createTbCoreNotificationsMsgProducer();
+        this.toHousekeeper = tbQueueProvider.createHousekeeperMsgProducer();
     }
 
     @Override
@@ -85,4 +88,10 @@ public class TbTransportQueueProducerProvider implements TbQueueProducerProvider
     public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> getTbUsageStatsMsgProducer() {
         return toUsageStats;
     }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> getHousekeeperMsgProducer() {
+        return toHousekeeper;
+    }
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlProducerProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlProducerProvider.java
index 0f1703f3d3..1e697c644a 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlProducerProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlProducerProvider.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -36,6 +37,7 @@ public class TbVersionControlProducerProvider implements TbQueueProducerProvider
     private final TbVersionControlQueueFactory tbQueueProvider;
     private TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> toTbCoreNotifications;
     private TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> toUsageStats;
+    private TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> toHousekeeper;
 
     public TbVersionControlProducerProvider(TbVersionControlQueueFactory tbQueueProvider) {
         this.tbQueueProvider = tbQueueProvider;
@@ -45,6 +47,7 @@ public class TbVersionControlProducerProvider implements TbQueueProducerProvider
     public void init() {
         this.toTbCoreNotifications = tbQueueProvider.createTbCoreNotificationsMsgProducer();
         this.toUsageStats = tbQueueProvider.createToUsageStatsServiceMsgProducer();
+        this.toHousekeeper = tbQueueProvider.createHousekeeperMsgProducer();
     }
 
     @Override
@@ -54,7 +57,7 @@ public class TbVersionControlProducerProvider implements TbQueueProducerProvider
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> getRuleEngineMsgProducer() {
-         throw new RuntimeException("Not Implemented! Should not be used by Version Control Service!");
+        throw new RuntimeException("Not Implemented! Should not be used by Version Control Service!");
     }
 
     @Override
@@ -81,4 +84,10 @@ public class TbVersionControlProducerProvider implements TbQueueProducerProvider
     public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> getTbUsageStatsMsgProducer() {
         return toUsageStats;
     }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> getHousekeeperMsgProducer() {
+        return toHousekeeper;
+    }
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlQueueFactory.java
index 168a466015..3917df24cd 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlQueueFactory.java
@@ -25,7 +25,7 @@ import org.thingsboard.server.queue.common.TbProtoQueueMsg;
  * Responsible for initialization of various Producers and Consumers used by TB Version Control Node.
  * Implementation Depends on the queue queue.type from yml or TB_QUEUE_TYPE environment variable
  */
-public interface TbVersionControlQueueFactory extends TbUsageStatsClientQueueFactory {
+public interface TbVersionControlQueueFactory extends TbUsageStatsClientQueueFactory, HousekeeperClientQueueFactory {
 
     /**
      * Used to push notifications to other instances of TB Core Service
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/settings/TbQueueCoreSettings.java b/common/queue/src/main/java/org/thingsboard/server/queue/settings/TbQueueCoreSettings.java
index 0a8c12eb8d..2aa01193b0 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/settings/TbQueueCoreSettings.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/settings/TbQueueCoreSettings.java
@@ -34,6 +34,12 @@ public class TbQueueCoreSettings {
     @Value("${queue.core.usage-stats-topic:tb_usage_stats}")
     private String usageStatsTopic;
 
+    @Value("${queue.core.housekeeper.topic:tb_housekeeper}")
+    private String housekeeperTopic;
+
+    @Value("${queue.core.housekeeper.reprocessing-topic:tb_housekeeper.reprocessing}")
+    private String housekeeperReprocessingTopic;
+
     @Value("${queue.core.partitions}")
     private int partitions;
 }
diff --git a/common/stats/src/main/java/org/thingsboard/server/common/stats/DefaultStatsFactory.java b/common/stats/src/main/java/org/thingsboard/server/common/stats/DefaultStatsFactory.java
index be0c4fe19f..ca97792186 100644
--- a/common/stats/src/main/java/org/thingsboard/server/common/stats/DefaultStatsFactory.java
+++ b/common/stats/src/main/java/org/thingsboard/server/common/stats/DefaultStatsFactory.java
@@ -19,13 +19,13 @@ import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.Timer;
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.StringUtils;
 
-import jakarta.annotation.PostConstruct;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Service
@@ -63,13 +63,7 @@ public class DefaultStatsFactory implements StatsFactory {
 
     @Override
     public StatsCounter createStatsCounter(String key, String statsName, String... otherTags) {
-        String[] tags = new String[]{STATS_NAME_TAG, statsName};
-        if (otherTags.length > 0) {
-            if (otherTags.length % 2 != 0) {
-                throw new IllegalArgumentException("Invalid tags array size");
-            }
-            tags = ArrayUtils.addAll(tags, otherTags);
-        }
+        String[] tags = getTags(statsName, otherTags);
         return new StatsCounter(
                 new AtomicInteger(0),
                 metricsEnabled ? meterRegistry.counter(key, tags) : STUB_COUNTER,
@@ -111,6 +105,24 @@ public class DefaultStatsFactory implements StatsFactory {
         return timerBuilder.register(meterRegistry);
     }
 
+    @Override
+    public StatsTimer createTimer(StatsType type, String name, String... tags) {
+        return new StatsTimer(name, Timer.builder(type.getName())
+                .tags(getTags(name, tags))
+                .register(meterRegistry));
+    }
+
+    private static String[] getTags(String statsName, String[] otherTags) {
+        String[] tags = new String[]{STATS_NAME_TAG, statsName};
+        if (otherTags.length > 0) {
+            if (otherTags.length % 2 != 0) {
+                throw new IllegalArgumentException("Invalid tags array size");
+            }
+            tags = ArrayUtils.addAll(tags, otherTags);
+        }
+        return tags;
+    }
+
     private static class StubCounter implements Counter {
         @Override
         public void increment(double amount) {
diff --git a/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsFactory.java b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsFactory.java
index b9bf0b97fb..a6cc4aa1d4 100644
--- a/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsFactory.java
+++ b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsFactory.java
@@ -29,4 +29,6 @@ public interface StatsFactory {
 
     Timer createTimer(String key, String... tags);
 
+    StatsTimer createTimer(StatsType type, String name, String... tags);
+
 }
diff --git a/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsTimer.java b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsTimer.java
new file mode 100644
index 0000000000..ca74444619
--- /dev/null
+++ b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsTimer.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.stats;
+
+import io.micrometer.core.instrument.Timer;
+import lombok.Getter;
+
+import java.util.concurrent.TimeUnit;
+
+public class StatsTimer {
+
+    @Getter
+    private final String name;
+    private final Timer timer;
+
+    private int count;
+    private long totalTime;
+
+    public StatsTimer(String name, Timer micrometerTimer) {
+        this.name = name;
+        this.timer = micrometerTimer;
+    }
+
+    public  void record(long timeMs) {
+        count++;
+        totalTime += timeMs;
+        timer.record(timeMs, TimeUnit.MILLISECONDS);
+    }
+
+    public double getAvg() {
+        if (count == 0) {
+            return 0.0;
+        }
+        return (double) totalTime / count;
+    }
+
+    public  void reset() {
+        count = 0;
+        totalTime = 0;
+    }
+
+}
diff --git a/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsType.java b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsType.java
index 318f0418de..6c854ac8d6 100644
--- a/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsType.java
+++ b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsType.java
@@ -16,7 +16,12 @@
 package org.thingsboard.server.common.stats;
 
 public enum StatsType {
-    RULE_ENGINE("ruleEngine"), CORE("core"), TRANSPORT("transport"), JS_INVOKE("jsInvoke"), RATE_EXECUTOR("rateExecutor");
+    RULE_ENGINE("ruleEngine"),
+    CORE("core"),
+    TRANSPORT("transport"),
+    JS_INVOKE("jsInvoke"),
+    RATE_EXECUTOR("rateExecutor"),
+    HOUSEKEEPER("housekeeper");
 
     private String name;
 
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
index 8360111a54..b48cb39ca0 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
@@ -45,6 +45,7 @@ import io.netty.util.concurrent.GenericFutureListener;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.core.ResponseCode;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.adaptor.AdaptorException;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -64,7 +65,6 @@ import org.thingsboard.server.common.msg.tools.TbRateLimitsException;
 import org.thingsboard.server.common.transport.SessionMsgListener;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
-import org.thingsboard.server.common.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.auth.SessionInfoCreator;
 import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
 import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
@@ -323,6 +323,9 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
                 if (checkConnected(ctx, msg)) {
                     ctx.writeAndFlush(new MqttMessage(new MqttFixedHeader(PINGRESP, false, AT_MOST_ONCE, false, 0)));
                     transportService.recordActivity(deviceSessionCtx.getSessionInfo());
+                    if (gatewaySessionHandler != null) {
+                        gatewaySessionHandler.onGatewayPing();
+                    }
                 }
                 break;
             case DISCONNECT:
@@ -1080,12 +1083,15 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
         try {
             JsonNode infoNode = context.getMapper().readTree(device.getAdditionalInfo());
             if (infoNode != null) {
-                JsonNode gatewayNode = infoNode.get("gateway");
+                JsonNode gatewayNode = infoNode.get(DataConstants.GATEWAY_PARAMETER);
                 if (gatewayNode != null && gatewayNode.asBoolean()) {
-                    gatewaySessionHandler = new GatewaySessionHandler(deviceSessionCtx, sessionId);
-                    if (infoNode.has(DefaultTransportService.OVERWRITE_ACTIVITY_TIME) && infoNode.get(DefaultTransportService.OVERWRITE_ACTIVITY_TIME).isBoolean()) {
-                        sessionMetaData.setOverwriteActivityTime(infoNode.get(DefaultTransportService.OVERWRITE_ACTIVITY_TIME).asBoolean());
+                    boolean overwriteDevicesActivity = false;
+                    if (infoNode.has(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER)
+                            && infoNode.get(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER).isBoolean()) {
+                        overwriteDevicesActivity = infoNode.get(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER).asBoolean();
+                        sessionMetaData.setOverwriteActivityTime(overwriteDevicesActivity);
                     }
+                    gatewaySessionHandler = new GatewaySessionHandler(deviceSessionCtx, sessionId, overwriteDevicesActivity);
                 }
             }
         } catch (IOException e) {
@@ -1099,7 +1105,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
                 SparkplugTopic sparkplugTopicNode = validatedSparkplugTopicConnectedNode(connectMessage);
                 if (sparkplugTopicNode != null) {
                     SparkplugBProto.Payload sparkplugBProtoNode = SparkplugBProto.Payload.parseFrom(connectMessage.payload().willMessageInBytes());
-                    sparkplugSessionHandler = new SparkplugNodeSessionHandler(this, deviceSessionCtx, sessionId, sparkplugTopicNode);
+                    sparkplugSessionHandler = new SparkplugNodeSessionHandler(this, deviceSessionCtx, sessionId, true, sparkplugTopicNode);
                     sparkplugSessionHandler.onAttributesTelemetryProto(0, sparkplugBProtoNode, sparkplugTopicNode);
                     sessionMetaData.setOverwriteActivityTime(true);
                 } else {
@@ -1354,6 +1360,9 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     @Override
     public void onDeviceUpdate(TransportProtos.SessionInfoProto sessionInfo, Device device, Optional<DeviceProfile> deviceProfileOpt) {
         deviceSessionCtx.onDeviceUpdate(sessionInfo, device, deviceProfileOpt);
+        if (gatewaySessionHandler != null) {
+            gatewaySessionHandler.onDeviceUpdate(sessionInfo, device, deviceProfileOpt);
+        }
     }
 
     @Override
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
index 11f983ee3d..d033774e93 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.transport.mqtt.session;
 
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -32,17 +33,21 @@ import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.mqtt.MqttMessage;
 import io.netty.handler.codec.mqtt.MqttPublishMessage;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
+import org.thingsboard.server.common.adaptor.AdaptorException;
+import org.thingsboard.server.common.adaptor.JsonConverter;
+import org.thingsboard.server.common.adaptor.ProtoConverter;
 import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
-import org.thingsboard.server.common.adaptor.AdaptorException;
-import org.thingsboard.server.common.adaptor.JsonConverter;
-import org.thingsboard.server.common.adaptor.ProtoConverter;
 import org.thingsboard.server.common.transport.auth.GetOrCreateDeviceFromGatewayResponse;
 import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
 import org.thingsboard.server.gen.transport.TransportApiProtos;
@@ -64,6 +69,7 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -101,7 +107,11 @@ public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDev
     protected final ChannelHandlerContext channel;
     protected final DeviceSessionCtx deviceSessionCtx;
 
-    public AbstractGatewaySessionHandler(DeviceSessionCtx deviceSessionCtx, UUID sessionId) {
+    @Getter
+    @Setter
+    private boolean overwriteDevicesActivity = false;
+
+    public AbstractGatewaySessionHandler(DeviceSessionCtx deviceSessionCtx, UUID sessionId, boolean overwriteDevicesActivity) {
         this.context = deviceSessionCtx.getContext();
         this.transportService = context.getTransportService();
         this.deviceSessionCtx = deviceSessionCtx;
@@ -112,6 +122,7 @@ public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDev
         this.deviceCreationLockMap = createWeakMap();
         this.mqttQoSMap = deviceSessionCtx.getMqttQoSMap();
         this.channel = deviceSessionCtx.getChannel();
+        this.overwriteDevicesActivity = overwriteDevicesActivity;
     }
 
     ConcurrentReferenceHashMap<String, Lock> createWeakMap() {
@@ -164,6 +175,12 @@ public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDev
         }
     }
 
+    public void onGatewayPing() {
+        if (overwriteDevicesActivity) {
+            devices.forEach((deviceName, deviceSessionCtx) -> transportService.recordActivity(deviceSessionCtx.getSessionInfo()));
+        }
+    }
+
     public void onDevicesDisconnect() {
         devices.forEach(this::deregisterSession);
     }
@@ -221,6 +238,14 @@ public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDev
         }, context.getExecutor());
     }
 
+    public void onDeviceUpdate(TransportProtos.SessionInfoProto sessionInfo, Device device, Optional<DeviceProfile> deviceProfileOpt) {
+        log.trace("[{}][{}] onDeviceUpdate: [{}]", gateway.getTenantId(), gateway.getDeviceId(), device);
+        JsonNode deviceAdditionalInfo = device.getAdditionalInfo();
+        if (deviceAdditionalInfo.has(DataConstants.GATEWAY_PARAMETER) && deviceAdditionalInfo.has(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER)) {
+            overwriteDevicesActivity = deviceAdditionalInfo.get(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER).asBoolean();
+        }
+    }
+
     ListenableFuture<T> onDeviceConnect(String deviceName, String deviceType) {
         T result = devices.get(deviceName);
         if (result == null) {
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java
index 9ccc88aa82..9aa228afff 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java
@@ -25,10 +25,10 @@ import java.util.UUID;
 /**
  * Created by nickAS21 on 26.12.22
  */
-public class GatewaySessionHandler extends AbstractGatewaySessionHandler {
+public class GatewaySessionHandler extends AbstractGatewaySessionHandler<GatewayDeviceSessionContext> {
 
-    public GatewaySessionHandler(DeviceSessionCtx deviceSessionCtx, UUID sessionId) {
-        super(deviceSessionCtx, sessionId);
+    public GatewaySessionHandler(DeviceSessionCtx deviceSessionCtx, UUID sessionId, boolean overwriteDevicesActivity) {
+        super(deviceSessionCtx, sessionId, overwriteDevicesActivity);
     }
 
     public void onDeviceConnect(MqttPublishMessage mqttMsg) throws AdaptorException {
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java
index 05658fe97a..1f389fced1 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java
@@ -73,8 +73,8 @@ public class SparkplugNodeSessionHandler extends AbstractGatewaySessionHandler<S
     private final MqttTransportHandler parent;
 
     public SparkplugNodeSessionHandler(MqttTransportHandler parent, DeviceSessionCtx deviceSessionCtx, UUID sessionId,
-                                       SparkplugTopic sparkplugTopicNode) {
-        super(deviceSessionCtx, sessionId);
+                                       boolean overwriteDevicesActivity, SparkplugTopic sparkplugTopicNode) {
+        super(deviceSessionCtx, sessionId, overwriteDevicesActivity);
         this.parent = parent;
         this.sparkplugTopicNode = sparkplugTopicNode;
         this.nodeBirthMetrics = new ConcurrentHashMap<>();
diff --git a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
index bd1ddd2d54..158acc2ce2 100644
--- a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
+++ b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
@@ -15,15 +15,101 @@
  */
 package org.thingsboard.server.transport.mqtt.session;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.util.ConcurrentReferenceHashMap;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.transport.TransportService;
+import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
+import org.thingsboard.server.transport.mqtt.MqttTransportContext;
+
+import java.lang.reflect.Field;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.willCallRealMethod;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doNothing;
 
+@ExtendWith(MockitoExtension.class)
 public class GatewaySessionHandlerTest {
 
+    @Mock
+    private TransportService transportService;
+
+    @Mock
+    private DeviceSessionCtx deviceSessionCtx;
+
+    @Mock
+    private MqttTransportContext transportContext;
+
+    private GatewaySessionHandler handler;
+
+    @BeforeEach
+    public void setup() {
+        lenient().when(deviceSessionCtx.getSessionId()).thenReturn(UUID.randomUUID());
+        lenient().doNothing().when(transportService).recordActivity(any());
+        lenient().when(transportContext.getTransportService()).thenReturn(transportService);
+        lenient().when(deviceSessionCtx.getContext()).thenReturn(transportContext);
+        handler = new GatewaySessionHandler(deviceSessionCtx, UUID.randomUUID(), true);
+        lenient().when(handler.getNodeId()).thenReturn("nodeId");
+    }
+
+    @Test
+    public void shouldRecordActivityWhenOnGatewayPing() throws Exception {
+        // Given
+        ConcurrentHashMap<String, GatewayDeviceSessionContext> devices = new ConcurrentHashMap<>();
+        TransportDeviceInfo deviceInfo = new TransportDeviceInfo();
+        deviceInfo.setDeviceId(new DeviceId(UUID.randomUUID()));
+        deviceInfo.setTenantId(new TenantId(UUID.randomUUID()));
+        deviceInfo.setCustomerId(new CustomerId(UUID.randomUUID()));
+        deviceInfo.setDeviceName("device1");
+        deviceInfo.setDeviceType("default");
+        deviceInfo.setDeviceProfileId(new DeviceProfileId(UUID.randomUUID()));
+        deviceInfo.setAdditionalInfo("{\"gateway\": true, \"overwriteDeviceActivity\": true}");
+        lenient().when(deviceSessionCtx.getDeviceInfo()).thenReturn(deviceInfo);
+        GatewayDeviceSessionContext gatewayDeviceSessionContext = new GatewayDeviceSessionContext(handler, deviceInfo, null, null, transportService);
+        devices.put("device1", gatewayDeviceSessionContext);
+        lenient().when(handler.getNodeId()).thenReturn("nodeId");
+        Field devicesField = AbstractGatewaySessionHandler.class.getDeclaredField("devices");
+        devicesField.setAccessible(true);
+        devicesField.set(handler, devices);
+
+        // When
+        handler.onGatewayPing();
+
+        // Then
+        verify(transportService).recordActivity(gatewayDeviceSessionContext.getSessionInfo());
+    }
+
+    @Test
+    public void shouldNotRecordActivityWhenNoDevicesOnGatewayPing() throws Exception {
+        // Given
+        ConcurrentHashMap<String, GatewayDeviceSessionContext> devices = new ConcurrentHashMap<>();
+        Field devicesField = AbstractGatewaySessionHandler.class.getDeclaredField("devices");
+        devicesField.setAccessible(true);
+        devicesField.set(handler, devices);
+
+        // When
+        handler.onGatewayPing();
+
+        // Then
+        verify(transportService, never()).recordActivity(any());
+    }
+
     @Test
     public void givenGatewaySessionHandler_WhenCreateWeakMap_thenConcurrentReferenceHashMapClass() {
         GatewaySessionHandler gsh = mock(GatewaySessionHandler.class);
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
index 8854ad3a7d..41886bd88a 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.transport.service;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -131,7 +132,6 @@ import java.util.stream.Collectors;
 @TbTransportComponent
 public class DefaultTransportService extends TransportActivityManager implements TransportService {
 
-    public static final String OVERWRITE_ACTIVITY_TIME = "overwriteActivityTime";
     public static final TransportProtos.SessionEventMsg SESSION_EVENT_MSG_OPEN = TransportProtos.SessionEventMsg.newBuilder()
             .setSessionType(TransportProtos.SessionType.ASYNC)
             .setEvent(TransportProtos.SessionEvent.OPEN).build();
@@ -1001,7 +1001,6 @@ public class DefaultTransportService extends TransportActivityManager implements
                 break;
             case TENANT:
                 Tenant tenant = ProtoUtils.fromProto(msg.getTenant());
-                partitionService.removeTenant(tenant.getId());
                 boolean updated = tenantProfileCache.put(tenant.getId(), tenant.getTenantProfileId());
                 partitionService.evictTenantInfo(tenant.getId());
                 if (updated) {
@@ -1042,11 +1041,12 @@ public class DefaultTransportService extends TransportActivityManager implements
                         .setDeviceProfileIdLSB(deviceProfileIdLSB)
                         .setDeviceName(device.getName())
                         .setDeviceType(device.getType()).build();
-                if (device.getAdditionalInfo().has("gateway")
-                        && device.getAdditionalInfo().get("gateway").asBoolean()
-                        && device.getAdditionalInfo().has(OVERWRITE_ACTIVITY_TIME)
-                        && device.getAdditionalInfo().get(OVERWRITE_ACTIVITY_TIME).isBoolean()) {
-                    md.setOverwriteActivityTime(device.getAdditionalInfo().get(OVERWRITE_ACTIVITY_TIME).asBoolean());
+                JsonNode deviceAdditionalInfo = device.getAdditionalInfo();
+                if (deviceAdditionalInfo.has(DataConstants.GATEWAY_PARAMETER)
+                        && deviceAdditionalInfo.get(DataConstants.GATEWAY_PARAMETER).asBoolean()
+                        && deviceAdditionalInfo.has(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER)
+                        && deviceAdditionalInfo.get(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER).isBoolean()) {
+                    md.setOverwriteActivityTime(deviceAdditionalInfo.get(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER).asBoolean());
                 }
                 md.setSessionInfo(newSessionInfo);
                 transportCallbackExecutor.submit(() -> md.getListener().onDeviceUpdate(newSessionInfo, device, Optional.ofNullable(newDeviceProfile)));
diff --git a/common/util/src/main/java/org/thingsboard/common/util/ThingsBoardThreadFactory.java b/common/util/src/main/java/org/thingsboard/common/util/ThingsBoardThreadFactory.java
index de097cfd6c..4d0876bf8e 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/ThingsBoardThreadFactory.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/ThingsBoardThreadFactory.java
@@ -51,6 +51,11 @@ public class ThingsBoardThreadFactory implements ThreadFactory {
         Thread.currentThread().setName(name);
     }
 
+    public static void addThreadNamePrefix(String prefix) {
+        String name = Thread.currentThread().getName();
+        name = prefix + "-" + name;
+        Thread.currentThread().setName(name);
+    }
 
     @Override
     public Thread newThread(Runnable r) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/Dao.java b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
index 8d408945fa..e7290cdced 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/Dao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
@@ -43,6 +43,8 @@ public interface Dao<T> {
 
     void removeAllByIds(Collection<UUID> ids);
 
+    List<UUID> findIdsByTenantIdAndIdOffset(TenantId tenantId, UUID idOffset, int limit);
+
     default EntityType getEntityType() { return null; }
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
index 865306c73b..01a72ea58c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.util.CollectionUtils;
 import org.thingsboard.server.common.data.EntityInfo;
 import org.thingsboard.server.common.data.EntitySubtype;
@@ -51,8 +52,17 @@ public abstract class DaoUtil {
         return new PageData<>(data, page.getTotalPages(), page.getTotalElements(), page.hasNext());
     }
 
-    public static <T> PageData<T> pageToPageData(Page<T> page) {
-        return new PageData<>(page.getContent(), page.getTotalPages(), page.getTotalElements(), page.hasNext());
+    public static <T> PageData<T> pageToPageData(Slice<T> slice) {
+        int totalPages;
+        long totalElements;
+        if (slice instanceof Page<T> page) {
+            totalPages = page.getTotalPages();
+            totalElements = page.getTotalElements();
+        } else {
+            totalPages = 0;
+            totalElements = 0;
+        }
+        return new PageData<>(slice.getContent(), totalPages, totalElements, slice.hasNext());
     }
 
     public static Pageable toPageable(PageLink pageLink) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java
index 19b02fc932..570256e98c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java
@@ -38,6 +38,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.query.AlarmCountQuery;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.dao.Dao;
 
 import java.util.Collection;
@@ -80,13 +81,15 @@ public interface AlarmDao extends Dao<Alarm> {
 
     PageData<AlarmId> findAlarmIdsByAssigneeId(TenantId tenantId, UUID userId, PageLink pageLink);
 
-    PageData<AlarmId> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, PageLink pageLink);
+    PageData<TbPair<UUID, Long>> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, long createdTimeOffset, AlarmId idOffset, int limit);
 
     void createEntityAlarmRecord(EntityAlarm entityAlarm);
 
     List<EntityAlarm> findEntityAlarmRecords(TenantId tenantId, AlarmId id);
 
-    void deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId);
+    List<EntityAlarm> findEntityAlarmRecordsByEntityId(TenantId tenantId, EntityId entityId);
+
+    int deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId);
 
     void deleteEntityAlarmRecordsByTenantId(TenantId tenantId);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
index d49cef22b7..f0fc18c827 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
@@ -58,6 +58,7 @@ import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.EntityRelationsQuery;
 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationsSearchParameters;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
 import org.thingsboard.server.dao.entity.EntityService;
 import org.thingsboard.server.dao.eventsourcing.ActionEntityEvent;
@@ -75,6 +76,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -183,17 +185,23 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
     @Override
     @Transactional
     public AlarmApiCallResult delAlarm(TenantId tenantId, AlarmId alarmId, boolean checkAndDeleteAlarmType) {
-        log.debug("Deleting Alarm Id: {}", alarmId);
         AlarmInfo alarm = alarmDao.findAlarmInfoById(tenantId, alarmId.getId());
+        return deleteAlarm(tenantId, alarm, checkAndDeleteAlarmType);
+    }
+
+    private AlarmApiCallResult deleteAlarm(TenantId tenantId, AlarmInfo alarm, boolean deleteAlarmTypes) {
         if (alarm == null) {
             return AlarmApiCallResult.builder().successful(false).build();
         } else {
+            log.debug("[{}][{}] Executing deleteAlarm [{}]", tenantId, alarm.getOriginator(), alarm.getId());
             var propagationIds = getPropagationEntityIdsList(alarm);
-            deleteEntityRelations(tenantId, alarm.getId());
             alarmDao.removeById(tenantId, alarm.getUuidId());
-            eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId)
-                    .entityId(alarmId).entity(alarm).build());
-            if (checkAndDeleteAlarmType) {
+            eventPublisher.publishEvent(DeleteEntityEvent.builder()
+                    .tenantId(tenantId)
+                    .entityId(alarm.getId())
+                    .entity(alarm)
+                    .build());
+            if (deleteAlarmTypes) {
                 delAlarmTypes(tenantId, Collections.singleton(alarm.getType()));
             }
             return AlarmApiCallResult.builder().alarm(alarm).deleted(true).successful(true).propagatedEntitiesList(propagationIds).build();
@@ -307,9 +315,9 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
     }
 
     @Override
-    public PageData<AlarmId> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, PageLink pageLink) {
-        log.trace("[{}] Executing findAlarmsByOriginatorId [{}]", tenantId, originatorId);
-        return alarmDao.findAlarmIdsByOriginatorId(tenantId, originatorId, pageLink);
+    public List<TbPair<UUID, Long>> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, long createdTimeOffset, AlarmId idOffset, int limit) {
+        log.trace("[{}] Executing findAlarmIdsByOriginatorIdAndIdOffset [{}][{}]", tenantId, originatorId, idOffset);
+        return alarmDao.findAlarmIdsByOriginatorId(tenantId, originatorId, createdTimeOffset, idOffset, limit).getData();
     }
 
     @Override
@@ -329,9 +337,9 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
     }
 
     @Override
-    public void deleteEntityAlarmRelations(TenantId tenantId, EntityId entityId) {
+    public int deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId) {
         log.trace("Executing deleteEntityAlarms [{}]", entityId);
-        alarmDao.deleteEntityAlarmRecords(tenantId, entityId);
+        return alarmDao.deleteEntityAlarmRecords(tenantId, entityId);
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
index fb5b799ae7..6848c58d5c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
@@ -180,17 +180,25 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     public void deleteAssetProfile(TenantId tenantId, AssetProfileId assetProfileId) {
         log.trace("Executing deleteAssetProfile [{}]", assetProfileId);
         Validator.validateId(assetProfileId, id -> INCORRECT_ASSET_PROFILE_ID + id);
-        AssetProfile assetProfile = assetProfileDao.findById(tenantId, assetProfileId.getId());
-        if (assetProfile != null && assetProfile.isDefault()) {
+        deleteEntity(tenantId, assetProfileId, false);
+    }
+
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        AssetProfile assetProfile = assetProfileDao.findById(tenantId, id.getId());
+        if (assetProfile == null) {
+            return;
+        }
+        if (!force && assetProfile.isDefault()) {
             throw new DataValidationException("Deletion of Default Asset Profile is prohibited!");
         }
-        this.removeAssetProfile(tenantId, assetProfile);
+        removeAssetProfile(tenantId, assetProfile);
     }
 
     private void removeAssetProfile(TenantId tenantId, AssetProfile assetProfile) {
         AssetProfileId assetProfileId = assetProfile.getId();
         try {
-            deleteEntityRelations(tenantId, assetProfileId);
             assetProfileDao.removeById(tenantId, assetProfileId.getId());
             publishEvictEvent(new AssetProfileEvictEvent(assetProfile.getTenantId(), assetProfile.getName(),
                     null, assetProfile.getId(), assetProfile.isDefault()));
@@ -304,14 +312,13 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     }
 
     @Override
-    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.ofNullable(findAssetProfileById(tenantId, new AssetProfileId(entityId.getId())));
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteAssetProfilesByTenantId(tenantId);
     }
 
     @Override
-    @Transactional
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteAssetProfile(tenantId, (AssetProfileId) id);
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findAssetProfileById(tenantId, new AssetProfileId(entityId.getId())));
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
index f7342e7634..d491956b25 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
@@ -199,19 +199,25 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Transactional
     public void deleteAsset(TenantId tenantId, AssetId assetId) {
         validateId(assetId, id -> INCORRECT_ASSET_ID + id);
-        if (entityViewService.existsByTenantIdAndEntityId(tenantId, assetId)) {
+        deleteEntity(tenantId, assetId, false);
+    }
+
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        if (!force && entityViewService.existsByTenantIdAndEntityId(tenantId, id)) {
             throw new DataValidationException("Can't delete asset that has entity views!");
         }
 
-        Asset asset = assetDao.findById(tenantId, assetId.getId());
-        alarmService.deleteEntityAlarmRelations(tenantId, assetId);
+        Asset asset = assetDao.findById(tenantId, id.getId());
+        if (asset == null) {
+            return;
+        }
         deleteAsset(tenantId, asset);
     }
 
     private void deleteAsset(TenantId tenantId, Asset asset) {
         log.trace("Executing deleteAsset [{}]", asset.getId());
-        relationService.deleteEntityRelations(tenantId, asset.getId());
-
         assetDao.removeById(tenantId, asset.getUuidId());
 
         publishEvictEvent(new AssetCacheEvictEvent(asset.getTenantId(), asset.getName(), null));
@@ -277,6 +283,11 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
         tenantAssetsRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteAssetsByTenantId(tenantId);
+    }
+
     @Override
     public PageData<Asset> findAssetsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findAssetsByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
@@ -471,12 +482,6 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
         return assetDao.countByTenantId(tenantId);
     }
 
-    @Override
-    @Transactional
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteAsset(tenantId, (AssetId) id);
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.ASSET;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java
index 45a7a95440..64ca5d9dd9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.dao.attributes;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.commons.lang3.tuple.Pair;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -46,4 +47,7 @@ public interface AttributesDao {
     List<String> findAllKeysByEntityIds(TenantId tenantId, List<EntityId> entityIds);
 
     List<String> findAllKeysByEntityIdsAndAttributeType(TenantId tenantId, List<EntityId> entityIds, String attributeType);
+
+    List<Pair<AttributeScope, String>> removeAllByEntityId(TenantId tenantId, EntityId entityId);
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java
index 5869ad9261..1b1f2d005d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.attributes;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Primary;
@@ -160,4 +161,11 @@ public class BaseAttributesService implements AttributesService {
         validate(entityId, scope);
         return Futures.allAsList(attributesDao.removeAll(tenantId, entityId, scope, attributeKeys));
     }
+
+    @Override
+    public int removeAllByEntityId(TenantId tenantId, EntityId entityId) {
+        List<Pair<AttributeScope, String>> deleted = attributesDao.removeAllByEntityId(tenantId, entityId);
+        return deleted.size();
+    }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java
index dcd13fb168..f51bc6f0b8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java
@@ -19,7 +19,9 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Primary;
@@ -39,7 +41,6 @@ import org.thingsboard.server.dao.cache.CacheExecutorService;
 import org.thingsboard.server.dao.service.Validator;
 import org.thingsboard.server.dao.sql.JpaExecutorService;
 
-import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -158,47 +159,47 @@ public class CachedAttributesService implements AttributesService {
         return Futures.transformAsync(cacheExecutor.submit(() -> findCachedAttributes(entityId, scope, attributeKeys)),
                 wrappedCachedAttributes -> {
 
-        List<AttributeKvEntry> cachedAttributes = wrappedCachedAttributes.values().stream()
-                .map(TbCacheValueWrapper::get)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-        if (wrappedCachedAttributes.size() == attributeKeys.size()) {
-            log.trace("[{}][{}] Found all attributes from cache: {}", entityId, scope, attributeKeys);
-            return Futures.immediateFuture(cachedAttributes);
-        }
-
-        Set<String> notFoundAttributeKeys = new HashSet<>(attributeKeys);
-        notFoundAttributeKeys.removeAll(wrappedCachedAttributes.keySet());
-
-        List<AttributeCacheKey> notFoundKeys = notFoundAttributeKeys.stream().map(k -> new AttributeCacheKey(scope, entityId, k)).collect(Collectors.toList());
-
-        // DB call should run in DB executor, not in cache-related executor
-        return jpaExecutorService.submit(() -> {
-            var cacheTransaction = cache.newTransactionForKeys(notFoundKeys);
-            try {
-                log.trace("[{}][{}] Lookup attributes from db: {}", entityId, scope, notFoundAttributeKeys);
-                List<AttributeKvEntry> result = attributesDao.find(tenantId, entityId, scope, notFoundAttributeKeys);
-                for (AttributeKvEntry foundInDbAttribute : result) {
-                    AttributeCacheKey attributeCacheKey = new AttributeCacheKey(scope, entityId, foundInDbAttribute.getKey());
-                    cacheTransaction.putIfAbsent(attributeCacheKey, foundInDbAttribute);
-                    notFoundAttributeKeys.remove(foundInDbAttribute.getKey());
-                }
-                for (String key : notFoundAttributeKeys) {
-                    cacheTransaction.putIfAbsent(new AttributeCacheKey(scope, entityId, key), null);
-                }
-                List<AttributeKvEntry> mergedAttributes = new ArrayList<>(cachedAttributes);
-                mergedAttributes.addAll(result);
-                cacheTransaction.commit();
-                log.trace("[{}][{}] Commit cache transaction: {}", entityId, scope, notFoundAttributeKeys);
-                return mergedAttributes;
-            } catch (Throwable e) {
-                cacheTransaction.rollback();
-                log.debug("Could not find attributes from cache: [{}] [{}] [{}]", entityId, scope, notFoundAttributeKeys, e);
-                throw e;
-            }
-        });
-
-        }, MoreExecutors.directExecutor()); // cacheExecutor analyse and returns results or submit to DB executor
+                    List<AttributeKvEntry> cachedAttributes = wrappedCachedAttributes.values().stream()
+                            .map(TbCacheValueWrapper::get)
+                            .filter(Objects::nonNull)
+                            .collect(Collectors.toList());
+                    if (wrappedCachedAttributes.size() == attributeKeys.size()) {
+                        log.trace("[{}][{}] Found all attributes from cache: {}", entityId, scope, attributeKeys);
+                        return Futures.immediateFuture(cachedAttributes);
+                    }
+
+                    Set<String> notFoundAttributeKeys = new HashSet<>(attributeKeys);
+                    notFoundAttributeKeys.removeAll(wrappedCachedAttributes.keySet());
+
+                    List<AttributeCacheKey> notFoundKeys = notFoundAttributeKeys.stream().map(k -> new AttributeCacheKey(scope, entityId, k)).collect(Collectors.toList());
+
+                    // DB call should run in DB executor, not in cache-related executor
+                    return jpaExecutorService.submit(() -> {
+                        var cacheTransaction = cache.newTransactionForKeys(notFoundKeys);
+                        try {
+                            log.trace("[{}][{}] Lookup attributes from db: {}", entityId, scope, notFoundAttributeKeys);
+                            List<AttributeKvEntry> result = attributesDao.find(tenantId, entityId, scope, notFoundAttributeKeys);
+                            for (AttributeKvEntry foundInDbAttribute : result) {
+                                AttributeCacheKey attributeCacheKey = new AttributeCacheKey(scope, entityId, foundInDbAttribute.getKey());
+                                cacheTransaction.putIfAbsent(attributeCacheKey, foundInDbAttribute);
+                                notFoundAttributeKeys.remove(foundInDbAttribute.getKey());
+                            }
+                            for (String key : notFoundAttributeKeys) {
+                                cacheTransaction.putIfAbsent(new AttributeCacheKey(scope, entityId, key), null);
+                            }
+                            List<AttributeKvEntry> mergedAttributes = new ArrayList<>(cachedAttributes);
+                            mergedAttributes.addAll(result);
+                            cacheTransaction.commit();
+                            log.trace("[{}][{}] Commit cache transaction: {}", entityId, scope, notFoundAttributeKeys);
+                            return mergedAttributes;
+                        } catch (Throwable e) {
+                            cacheTransaction.rollback();
+                            log.debug("Could not find attributes from cache: [{}] [{}] [{}]", entityId, scope, notFoundAttributeKeys, e);
+                            throw e;
+                        }
+                    });
+
+                }, MoreExecutors.directExecutor()); // cacheExecutor analyse and returns results or submit to DB executor
     }
 
     private Map<String, TbCacheValueWrapper<AttributeKvEntry>> findCachedAttributes(EntityId entityId, AttributeScope scope, Collection<String> attributeKeys) {
@@ -305,4 +306,17 @@ public class CachedAttributesService implements AttributesService {
         }, cacheExecutor)).collect(Collectors.toList()));
     }
 
+    @Override
+    public int removeAllByEntityId(TenantId tenantId, EntityId entityId) {
+        List<Pair<AttributeScope, String>> result = attributesDao.removeAllByEntityId(tenantId, entityId);
+        result.forEach(deleted -> {
+            AttributeScope scope = deleted.getKey();
+            String key = deleted.getValue();
+            if (scope != null && key != null) {
+                cache.evict(new AttributeCacheKey(scope, entityId, key));
+            }
+        });
+        return result.size();
+    }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
index 04308cbb2e..e5f84b5e2c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
@@ -127,9 +127,20 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
     public void deleteCustomer(TenantId tenantId, CustomerId customerId) {
         log.trace("Executing deleteCustomer [{}]", customerId);
         Validator.validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
+        deleteEntity(tenantId, customerId, false);
+    }
+
+    @Transactional
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        CustomerId customerId = (CustomerId) id;
         Customer customer = findCustomerById(tenantId, customerId);
         if (customer == null) {
-            throw new IncorrectParameterException("Unable to delete non-existent customer.");
+            if (force) {
+                return;
+            } else {
+                throw new IncorrectParameterException("Unable to delete non-existent customer.");
+            }
         }
         dashboardService.unassignCustomerDashboards(tenantId, customerId);
         entityViewService.unassignCustomerEntityViews(customer.getTenantId(), customerId);
@@ -137,7 +148,6 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
         deviceService.unassignCustomerDevices(customer.getTenantId(), customerId);
         edgeService.unassignCustomerEdges(customer.getTenantId(), customerId);
         userService.deleteCustomerUsers(customer.getTenantId(), customerId);
-        deleteEntityRelations(tenantId, customerId);
         apiUsageStateService.deleteApiUsageStateByEntityId(customerId);
         customerDao.removeById(tenantId, customerId.getId());
         countService.publishCountEntityEvictEvent(tenantId, EntityType.CUSTOMER);
@@ -181,6 +191,11 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
         customersByTenantRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteCustomersByTenantId(tenantId);
+    }
+
     private PaginatedRemover<TenantId, Customer> customersByTenantRemover =
             new PaginatedRemover<TenantId, Customer>() {
 
@@ -200,12 +215,6 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
         return Optional.ofNullable(findCustomerById(tenantId, new CustomerId(entityId.getId())));
     }
 
-    @Transactional
-    @Override
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteCustomer(tenantId, (CustomerId) id);
-    }
-
     @Override
     public long countByTenantId(TenantId tenantId) {
         return customerDao.countByTenantId(tenantId);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
index 7f90d82af7..167ae51fc3 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
@@ -230,7 +230,6 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
     public void deleteDashboard(TenantId tenantId, DashboardId dashboardId) {
         log.trace("Executing deleteDashboard [{}]", dashboardId);
         Validator.validateId(dashboardId, id -> INCORRECT_DASHBOARD_ID + id);
-        deleteEntityRelations(tenantId, dashboardId);
         try {
             dashboardDao.removeById(tenantId, dashboardId.getId());
             publishEvictEvent(new DashboardTitleEvictEvent(dashboardId));
@@ -246,6 +245,12 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
         }
     }
 
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteDashboard(tenantId, (DashboardId) id);
+    }
+
     @Override
     public PageData<DashboardInfo> findDashboardsByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findDashboardsByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
@@ -269,6 +274,11 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
         tenantDashboardsRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteDashboardsByTenantId(tenantId);
+    }
+
     @Override
     public PageData<DashboardInfo> findDashboardsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findDashboardsByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
@@ -390,12 +400,6 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
         return dashboardDao.countByTenantId(tenantId);
     }
 
-    @Override
-    @Transactional
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteDashboard(tenantId, (DashboardId) id);
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.DASHBOARD;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
index 7e6d79d9a7..7a0f7a56c4 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
@@ -18,7 +18,6 @@ package org.thingsboard.server.dao.device;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.event.TransactionalEventListener;
@@ -47,7 +46,6 @@ import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
 import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.exception.DataValidationException;
-import org.thingsboard.server.dao.queue.QueueService;
 import org.thingsboard.server.dao.resource.ImageService;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
@@ -91,10 +89,6 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Autowired
     private DataValidator<DeviceProfile> deviceProfileValidator;
 
-    @Lazy
-    @Autowired
-    private QueueService queueService;
-
     @Autowired
     private ImageService imageService;
 
@@ -223,17 +217,25 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     public void deleteDeviceProfile(TenantId tenantId, DeviceProfileId deviceProfileId) {
         log.trace("Executing deleteDeviceProfile [{}]", deviceProfileId);
         validateId(deviceProfileId, id -> INCORRECT_DEVICE_PROFILE_ID + id);
-        DeviceProfile deviceProfile = deviceProfileDao.findById(tenantId, deviceProfileId.getId());
-        if (deviceProfile != null && deviceProfile.isDefault()) {
+        deleteEntity(tenantId, deviceProfileId, false);
+    }
+
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        DeviceProfile deviceProfile = deviceProfileDao.findById(tenantId, id.getId());
+        if (deviceProfile == null) {
+            return;
+        }
+        if (!force && deviceProfile.isDefault()) {
             throw new DataValidationException("Deletion of Default Device Profile is prohibited!");
         }
-        this.removeDeviceProfile(tenantId, deviceProfile);
+        removeDeviceProfile(tenantId, deviceProfile);
     }
 
     private void removeDeviceProfile(TenantId tenantId, DeviceProfile deviceProfile) {
         DeviceProfileId deviceProfileId = deviceProfile.getId();
         try {
-            deleteEntityRelations(tenantId, deviceProfileId);
             deviceProfileDao.removeById(tenantId, deviceProfileId.getId());
             publishEvictEvent(new DeviceProfileEvictEvent(deviceProfile.getTenantId(), deviceProfile.getName(),
                     null, deviceProfile.getId(), deviceProfile.isDefault(),
@@ -359,14 +361,13 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     }
 
     @Override
-    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.ofNullable(findDeviceProfileById(tenantId, new DeviceProfileId(entityId.getId())));
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteDeviceProfilesByTenantId(tenantId);
     }
 
     @Override
-    @Transactional
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteDeviceProfile(tenantId, (DeviceProfileId) id);
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findDeviceProfileById(tenantId, new DeviceProfileId(entityId.getId())));
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
index ff00db3564..a616c14a69 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
@@ -322,20 +322,26 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public void deleteDevice(final TenantId tenantId, final DeviceId deviceId) {
         validateId(deviceId, id -> INCORRECT_DEVICE_ID + id);
-        if (entityViewService.existsByTenantIdAndEntityId(tenantId, deviceId)) {
+        deleteEntity(tenantId, deviceId, false);
+    }
+
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        if (!force && entityViewService.existsByTenantIdAndEntityId(tenantId, id)) {
             throw new DataValidationException("Can't delete device that has entity views!");
         }
 
-        Device device = deviceDao.findById(tenantId, deviceId.getId());
-        alarmService.deleteEntityAlarmRelations(tenantId, deviceId);
+        Device device = deviceDao.findById(tenantId, id.getId());
+        if (device == null) {
+            return;
+        }
         deleteDevice(tenantId, device);
     }
 
     private void deleteDevice(TenantId tenantId, Device device) {
         log.trace("Executing deleteDevice [{}]", device.getId());
         deviceCredentialsService.deleteDeviceCredentialsByDeviceId(tenantId, device.getId());
-        relationService.deleteEntityRelations(tenantId, device.getId());
-
         deviceDao.removeById(tenantId, device.getUuidId());
 
         DeviceCacheEvictEvent deviceCacheEvictEvent = new DeviceCacheEvictEvent(device.getTenantId(), device.getId(), device.getName(), null);
@@ -347,12 +353,11 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public PageData<Device> findDevicesByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findDevicesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, id ->INCORRECT_TENANT_ID + id);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return deviceDao.findDevicesByTenantId(tenantId.getId(), pageLink);
     }
 
-
     @Override
     public PageData<DeviceInfo> findDeviceInfosByFilter(DeviceInfoFilter filter, PageLink pageLink) {
         log.trace("Executing findDeviceInfosByFilter, filter [{}], pageLink [{}]", filter, pageLink);
@@ -413,14 +418,14 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public List<Device> findDevicesByIds(List<DeviceId> deviceIds) {
         log.trace("Executing findDevicesByIdsAsync, deviceIds [{}]", deviceIds);
-        validateIds(deviceIds, ids-> "Incorrect deviceIds " + ids);
+        validateIds(deviceIds, ids -> "Incorrect deviceIds " + ids);
         return deviceDao.findDevicesByIds(toUUIDs(deviceIds));
     }
 
     @Override
     public ListenableFuture<List<Device>> findDevicesByIdsAsync(List<DeviceId> deviceIds) {
         log.trace("Executing findDevicesByIdsAsync, deviceIds [{}]", deviceIds);
-        validateIds(deviceIds, ids-> "Incorrect deviceIds " + ids);
+        validateIds(deviceIds, ids -> "Incorrect deviceIds " + ids);
         return deviceDao.findDevicesByIdsAsync(toUUIDs(deviceIds));
     }
 
@@ -432,6 +437,12 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
         tenantDevicesRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Transactional
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteDevicesByTenantId(tenantId);
+    }
+
     @Override
     public PageData<Device> findDevicesByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findDevicesByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
@@ -648,12 +659,6 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
         return deviceDao.countByTenantId(tenantId);
     }
 
-    @Override
-    @Transactional
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteDevice(tenantId, (DeviceId) id);
-    }
-
     private final PaginatedRemover<TenantId, Device> tenantDevicesRemover = new PaginatedRemover<>() {
 
         @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
index 94aa3380ee..66cf74ba9c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
@@ -224,15 +224,21 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
         validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
 
         Edge edge = edgeDao.findById(tenantId, edgeId.getId());
-
-        deleteEntityRelations(tenantId, edgeId);
-
+        if (edge == null) {
+            return;
+        }
         edgeDao.removeById(tenantId, edgeId.getId());
 
         eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(edgeId).build());
         publishEvictEvent(new EdgeCacheEvictEvent(edge.getTenantId(), edge.getName(), null));
     }
 
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteEdge(tenantId, (EdgeId) id);
+    }
+
     @Override
     public PageData<Edge> findEdgesByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findEdgesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
@@ -282,6 +288,11 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
         tenantEdgesRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteEdgesByTenantId(tenantId);
+    }
+
     @Override
     public PageData<Edge> findEdgesByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findEdgesByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/AbstractEntityService.java b/dao/src/main/java/org/thingsboard/server/dao/entity/AbstractEntityService.java
index 0baa497cbf..6b88f19699 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/AbstractEntityService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/AbstractEntityService.java
@@ -31,6 +31,7 @@ import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.housekeeper.CleanUpService;
 import org.thingsboard.server.dao.relation.RelationService;
 
 import java.util.Collections;
@@ -63,6 +64,10 @@ public abstract class AbstractEntityService {
     @Autowired(required = false)
     protected EdgeService edgeService;
 
+    @Autowired
+    @Lazy
+    protected CleanUpService cleanUpService;
+
     protected void createRelation(TenantId tenantId, EntityRelation relation) {
         log.debug("Creating relation: {}", relation);
         relationService.saveRelation(tenantId, relation);
@@ -73,11 +78,6 @@ public abstract class AbstractEntityService {
         relationService.deleteRelation(tenantId, relation);
     }
 
-    protected void deleteEntityRelations(TenantId tenantId, EntityId entityId) {
-        relationService.deleteEntityRelations(tenantId, entityId);
-        alarmService.deleteEntityAlarmRelations(tenantId, entityId);
-    }
-
     protected static Optional<ConstraintViolationException> extractConstraintViolationException(Exception t) {
         if (t instanceof ConstraintViolationException) {
             return Optional.of((ConstraintViolationException) t);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java b/dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java
index 8202d49db8..364d3a12f3 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java
@@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.EntityType;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
@@ -48,7 +49,8 @@ public class DefaultEntityServiceRegistry implements EntityServiceRegistry {
 
     @Override
     public EntityDaoService getServiceByEntityType(EntityType entityType) {
-        return entityDaoServicesMap.get(entityType);
+        return Optional.ofNullable(entityDaoServicesMap.get(entityType))
+                .orElseThrow(() -> new IllegalArgumentException("Unsupported entity type " + entityType));
     }
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/EntityDaoRegistry.java b/dao/src/main/java/org/thingsboard/server/dao/entity/EntityDaoRegistry.java
new file mode 100644
index 0000000000..7b2f2d42c1
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/EntityDaoRegistry.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.entity;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.dao.Dao;
+
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class EntityDaoRegistry {
+
+    private final Map<EntityType, Dao<?>> daos = new EnumMap<>(EntityType.class);
+
+    private EntityDaoRegistry(List<Dao<?>> daos) {
+        daos.forEach(dao -> {
+            EntityType entityType = dao.getEntityType();
+            if (entityType != null) {
+                this.daos.put(entityType, dao);
+            }
+        });
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> Dao<T> getDao(EntityType entityType) {
+        Dao<T> dao = (Dao<T>) daos.get(entityType);
+        if (dao == null) {
+            throw new IllegalArgumentException("Missing dao for entity type " + entityType);
+        }
+        return dao;
+    }
+
+}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
index 9d3c33dcc2..e56055b614 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
@@ -327,13 +327,21 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     public void deleteEntityView(TenantId tenantId, EntityViewId entityViewId) {
         log.trace("Executing deleteEntityView [{}]", entityViewId);
         validateId(entityViewId, id -> INCORRECT_ENTITY_VIEW_ID + id);
-        deleteEntityRelations(tenantId, entityViewId);
         EntityView entityView = entityViewDao.findById(tenantId, entityViewId.getId());
+        if (entityView == null) {
+            return;
+        }
         entityViewDao.removeById(tenantId, entityViewId.getId());
         publishEvictEvent(new EntityViewEvictEvent(entityView.getTenantId(), entityView.getId(), entityView.getEntityId(), null, entityView.getName(), null));
         eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(entityViewId).build());
     }
 
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteEntityView(tenantId, (EntityViewId) id);
+    }
+
     @Override
     public void deleteEntityViewsByTenantId(TenantId tenantId) {
         log.trace("Executing deleteEntityViewsByTenantId, tenantId [{}]", tenantId);
@@ -341,6 +349,11 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
         tenantEntityViewRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteEntityViewsByTenantId(tenantId);
+    }
+
     @Override
     public ListenableFuture<List<EntitySubtype>> findEntityViewTypesByTenantId(TenantId tenantId) {
         log.trace("Executing findEntityViewTypesByTenantId, tenantId [{}]", tenantId);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/housekeeper/CleanUpService.java b/dao/src/main/java/org/thingsboard/server/dao/housekeeper/CleanUpService.java
new file mode 100644
index 0000000000..d64e6ea536
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/housekeeper/CleanUpService.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.housekeeper;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionalEventListener;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.msg.housekeeper.HousekeeperClient;
+import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
+import org.thingsboard.server.dao.relation.RelationService;
+
+import java.util.EnumSet;
+import java.util.Optional;
+import java.util.Set;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class CleanUpService {
+
+    private final Optional<HousekeeperClient> housekeeperClient;
+    private final RelationService relationService;
+
+    private final Set<EntityType> skippedEntities = EnumSet.of(
+            EntityType.ALARM, EntityType.QUEUE, EntityType.TB_RESOURCE, EntityType.OTA_PACKAGE,
+            EntityType.NOTIFICATION_REQUEST, EntityType.NOTIFICATION_TEMPLATE,
+            EntityType.NOTIFICATION_TARGET, EntityType.NOTIFICATION_RULE
+    );
+
+    @TransactionalEventListener(fallbackExecution = true) // after transaction commit
+    @Transactional(propagation = Propagation.NOT_SUPPORTED)
+    public void handleEntityDeletionEvent(DeleteEntityEvent<?> event) {
+        TenantId tenantId = event.getTenantId();
+        EntityId entityId = event.getEntityId();
+        EntityType entityType = entityId.getEntityType();
+        try {
+            log.trace("[{}][{}][{}] Handling entity deletion event", tenantId, entityType, entityId.getId());
+            if (!skippedEntities.contains(entityType)) {
+                cleanUpRelatedData(tenantId, entityId);
+            }
+            if (entityType == EntityType.USER) {
+                submitTask(HousekeeperTask.unassignAlarms((User) event.getEntity()));
+            }
+        } catch (Throwable e) {
+            log.error("[{}][{}][{}] Failed to handle entity deletion event", tenantId, entityType, entityId.getId(), e);
+        }
+    }
+
+    public void cleanUpRelatedData(TenantId tenantId, EntityId entityId) {
+        log.debug("[{}][{}][{}] Cleaning up related data", tenantId, entityId.getEntityType(), entityId.getId());
+        relationService.deleteEntityRelations(tenantId, entityId);
+        submitTask(HousekeeperTask.deleteAttributes(tenantId, entityId));
+        submitTask(HousekeeperTask.deleteTelemetry(tenantId, entityId));
+        submitTask(HousekeeperTask.deleteEvents(tenantId, entityId));
+        submitTask(HousekeeperTask.deleteAlarms(tenantId, entityId));
+    }
+
+    public void removeTenantEntities(TenantId tenantId, EntityType... entityTypes) {
+        for (EntityType entityType : entityTypes) {
+            submitTask(HousekeeperTask.deleteTenantEntities(tenantId, entityType));
+        }
+    }
+
+    private void submitTask(HousekeeperTask task) {
+        housekeeperClient.ifPresent(housekeeperClient -> {
+            housekeeperClient.submitTask(task);
+        });
+    }
+
+}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRequestService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRequestService.java
index a77be093db..ebeb39ed91 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRequestService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRequestService.java
@@ -93,6 +93,16 @@ public class DefaultNotificationRequestService implements NotificationRequestSer
         eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entity(request).entityId(request.getId()).build());
     }
 
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        if (force) {
+            notificationRequestDao.removeById(tenantId, id.getId());
+        } else {
+            NotificationRequest notificationRequest = findNotificationRequestById(tenantId, (NotificationRequestId) id);
+            deleteNotificationRequest(tenantId, notificationRequest);
+        }
+    }
+
     @Override
     public PageData<NotificationRequest> findScheduledNotificationRequests(PageLink pageLink) {
         return notificationRequestDao.findAllByStatus(NotificationRequestStatus.SCHEDULED, pageLink);
@@ -109,6 +119,11 @@ public class DefaultNotificationRequestService implements NotificationRequestSer
         notificationRequestDao.removeByTenantId(tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteNotificationRequestsByTenantId(tenantId);
+    }
+
     @Override
     public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
         return Optional.ofNullable(findNotificationRequestById(tenantId, new NotificationRequestId(entityId.getId())));
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRuleService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRuleService.java
index 7dbecbb725..ccf8d83887 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRuleService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRuleService.java
@@ -94,19 +94,24 @@ public class DefaultNotificationRuleService extends AbstractEntityService implem
         eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(id).build());
     }
 
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteNotificationRuleById(tenantId, (NotificationRuleId) id);
+    }
+
     @Override
     public void deleteNotificationRulesByTenantId(TenantId tenantId) {
         notificationRuleDao.removeByTenantId(tenantId);
     }
 
     @Override
-    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.ofNullable(findNotificationRuleById(tenantId, new NotificationRuleId(entityId.getId())));
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteNotificationRulesByTenantId(tenantId);
     }
 
     @Override
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteNotificationRuleById(tenantId, (NotificationRuleId) id);
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findNotificationRuleById(tenantId, new NotificationRuleId(entityId.getId())));
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java
index 5b6f464ea6..10438c484a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java
@@ -172,17 +172,15 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS
 
             defaultNotifications.create(tenantId, DefaultNotifications.entitiesLimitForSysadmin, sysAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.entitiesLimitForTenant, affectedTenantAdmins.getId());
-
             defaultNotifications.create(tenantId, DefaultNotifications.apiFeatureWarningForSysadmin, sysAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.apiFeatureWarningForTenant, affectedTenantAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.apiFeatureDisabledForSysadmin, sysAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.apiFeatureDisabledForTenant, affectedTenantAdmins.getId());
-
             defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimits, affectedTenantAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.exceededPerEntityRateLimits, affectedTenantAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimitsForSysadmin, sysAdmins.getId());
-
             defaultNotifications.create(tenantId, DefaultNotifications.newPlatformVersion, sysAdmins.getId());
+            defaultNotifications.create(tenantId, DefaultNotifications.taskProcessingFailure, tenantAdmins.getId());
             return;
         }
 
@@ -205,19 +203,19 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS
     @Override
     public void updateDefaultNotificationConfigs(TenantId tenantId) {
         if (tenantId.isSysTenantId()) {
-            if (notificationTemplateService.findNotificationTemplatesByTenantIdAndNotificationTypes(tenantId,
-                    List.of(NotificationType.RATE_LIMITS), new PageLink(1)).getTotalElements() > 0) {
-                return;
-            }
-
             NotificationTarget sysAdmins = notificationTargetService.findNotificationTargetsByTenantIdAndUsersFilterType(tenantId, UsersFilterType.SYSTEM_ADMINISTRATORS).stream()
                     .findFirst().orElseGet(() -> createTarget(tenantId, "System administrators", new SystemAdministratorsFilter(), "All system administrators"));
             NotificationTarget affectedTenantAdmins = notificationTargetService.findNotificationTargetsByTenantIdAndUsersFilterType(tenantId, UsersFilterType.AFFECTED_TENANT_ADMINISTRATORS).stream()
                     .findFirst().orElseGet(() -> createTarget(tenantId, "Affected tenant's administrators", new AffectedTenantAdministratorsFilter(), ""));
 
-            defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimits, affectedTenantAdmins.getId());
-            defaultNotifications.create(tenantId, DefaultNotifications.exceededPerEntityRateLimits, affectedTenantAdmins.getId());
-            defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimitsForSysadmin, sysAdmins.getId());
+            if (!isNotificationConfigured(tenantId, NotificationType.RATE_LIMITS)) {
+                defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimits, affectedTenantAdmins.getId());
+                defaultNotifications.create(tenantId, DefaultNotifications.exceededPerEntityRateLimits, affectedTenantAdmins.getId());
+                defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimitsForSysadmin, sysAdmins.getId());
+            }
+            if (!isNotificationConfigured(tenantId, NotificationType.TASK_PROCESSING_FAILURE)) {
+                defaultNotifications.create(tenantId, DefaultNotifications.taskProcessingFailure, sysAdmins.getId());
+            }
         } else {
             var requiredNotificationTypes = List.of(NotificationType.EDGE_CONNECTION, NotificationType.EDGE_COMMUNICATION_FAILURE);
             var existingNotificationTypes = notificationTemplateService.findNotificationTemplatesByTenantIdAndNotificationTypes(
@@ -251,6 +249,10 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS
         }
     }
 
+    private boolean isNotificationConfigured(TenantId tenantId, NotificationType... notificationTypes) {
+        return notificationTemplateService.countNotificationTemplatesByTenantIdAndNotificationTypes(tenantId, List.of(notificationTypes)) > 0;
+    }
+
     private NotificationTarget createTarget(TenantId tenantId, String name, UsersFilter filter, String description) {
         NotificationTarget target = new NotificationTarget();
         target.setTenantId(tenantId);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTargetService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTargetService.java
index 94c339335b..a6ab6e08ff 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTargetService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTargetService.java
@@ -193,10 +193,16 @@ public class DefaultNotificationTargetService extends AbstractEntityService impl
 
     @Override
     public void deleteNotificationTargetById(TenantId tenantId, NotificationTargetId id) {
-        if (notificationRequestDao.existsByTenantIdAndStatusAndTargetId(tenantId, NotificationRequestStatus.SCHEDULED, id)) {
+        deleteEntity(tenantId, id, false);
+    }
+
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        NotificationTargetId targetId = (NotificationTargetId) id;
+        if (!force && notificationRequestDao.existsByTenantIdAndStatusAndTargetId(tenantId, NotificationRequestStatus.SCHEDULED, targetId)) {
             throw new IllegalArgumentException("Recipients group is referenced by scheduled notification request");
         }
-        if (notificationRuleDao.existsByTenantIdAndTargetId(tenantId, id)) {
+        if (!force && notificationRuleDao.existsByTenantIdAndTargetId(tenantId, targetId)) {
             throw new IllegalArgumentException("Recipients group is being used in notification rule");
         }
         notificationTargetDao.removeById(tenantId, id.getId());
@@ -208,6 +214,11 @@ public class DefaultNotificationTargetService extends AbstractEntityService impl
         notificationTargetDao.removeByTenantId(tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteNotificationTargetsByTenantId(tenantId);
+    }
+
     @Override
     public long countNotificationTargetsByTenantId(TenantId tenantId) {
         return notificationTargetDao.countByTenantId(tenantId);
@@ -218,11 +229,6 @@ public class DefaultNotificationTargetService extends AbstractEntityService impl
         return Optional.ofNullable(findNotificationTargetById(tenantId, new NotificationTargetId(entityId.getId())));
     }
 
-    @Override
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteNotificationTargetById(tenantId, (NotificationTargetId) id);
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_TARGET;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTemplateService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTemplateService.java
index 58ec572b7f..14b9d176df 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTemplateService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTemplateService.java
@@ -74,9 +74,19 @@ public class DefaultNotificationTemplateService extends AbstractEntityService im
         return notificationTemplateDao.findByTenantIdAndNotificationTypesAndPageLink(tenantId, notificationTypes, pageLink);
     }
 
+    @Override
+    public int countNotificationTemplatesByTenantIdAndNotificationTypes(TenantId tenantId, List<NotificationType> notificationTypes) {
+        return notificationTemplateDao.countByTenantIdAndNotificationTypes(tenantId, notificationTypes);
+    }
+
     @Override
     public void deleteNotificationTemplateById(TenantId tenantId, NotificationTemplateId id) {
-        if (notificationRequestDao.existsByTenantIdAndStatusAndTemplateId(tenantId, NotificationRequestStatus.SCHEDULED, id)) {
+        deleteEntity(tenantId, id, false);
+    }
+
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        if (!force && notificationRequestDao.existsByTenantIdAndStatusAndTemplateId(tenantId, NotificationRequestStatus.SCHEDULED, (NotificationTemplateId) id)) {
             throw new IllegalArgumentException("Notification template is referenced by scheduled notification request");
         }
         try {
@@ -96,13 +106,13 @@ public class DefaultNotificationTemplateService extends AbstractEntityService im
     }
 
     @Override
-    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.ofNullable(findNotificationTemplateById(tenantId, new NotificationTemplateId(entityId.getId())));
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteNotificationTemplatesByTenantId(tenantId);
     }
 
     @Override
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteNotificationTemplateById(tenantId, (NotificationTemplateId) id);
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findNotificationTemplateById(tenantId, new NotificationTemplateId(entityId.getId())));
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
index fd17618bd1..4f617c2b9d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
@@ -50,6 +50,7 @@ import org.thingsboard.server.common.data.notification.rule.trigger.config.Notif
 import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.RateLimitsNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig;
+import org.thingsboard.server.common.data.notification.rule.trigger.config.TaskProcessingFailureNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplateConfig;
 import org.thingsboard.server.common.data.notification.template.WebDeliveryMethodNotificationTemplate;
@@ -358,6 +359,19 @@ public class DefaultNotifications {
                     .build())
             .build();
 
+    public static final DefaultNotification taskProcessingFailure = DefaultNotification.builder()
+            .name("Task processing failure notification")
+            .type(NotificationType.TASK_PROCESSING_FAILURE)
+            .subject("Failed to process ${taskType}")
+            .text("Failed to process ${taskDescription} for tenant ${tenantId}: ${error}")
+            .icon("warning").color(YELLOW_COLOR)
+            .rule(DefaultRule.builder()
+                    .name("Task processing failure")
+                    .triggerConfig(TaskProcessingFailureNotificationRuleTriggerConfig.builder().build())
+                    .description("Send notification to system admins when task processing fails")
+                    .build())
+            .build();
+
     public static final DefaultNotification jwtSigningKeyIssue = DefaultNotification.builder()
             .name("JWT Signing Key issue notification")
             .type(NotificationType.GENERAL)
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateDao.java b/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateDao.java
index d9a80ce3f5..136bc4d472 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateDao.java
@@ -30,6 +30,8 @@ public interface NotificationTemplateDao extends Dao<NotificationTemplate>, Expo
 
     PageData<NotificationTemplate> findByTenantIdAndNotificationTypesAndPageLink(TenantId tenantId, List<NotificationType> notificationTypes, PageLink pageLink);
 
+    int countByTenantIdAndNotificationTypes(TenantId tenantId, List<NotificationType> notificationTypes);
+
     void removeByTenantId(TenantId tenantId);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java b/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java
index b2fa1a3788..06c449880d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java
@@ -218,6 +218,11 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
         }
     }
 
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteOtaPackage(tenantId, (OtaPackageId) id);
+    }
+
     @Override
     public long sumDataSizeByTenantId(TenantId tenantId) {
         return otaPackageDao.sumDataSizeByTenantId(tenantId);
@@ -230,6 +235,11 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
         tenantOtaPackageRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteOtaPackagesByTenantId(tenantId);
+    }
+
     private PaginatedRemover<TenantId, OtaPackageInfo> tenantOtaPackageRemover =
             new PaginatedRemover<>() {
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java
index d930ab7249..e3c1ef68aa 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java
@@ -83,6 +83,11 @@ public class BaseQueueService extends AbstractEntityService implements QueueServ
         }
     }
 
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteQueue(tenantId, (QueueId) id);
+    }
+
     @Override
     public List<Queue> findQueuesByTenantId(TenantId tenantId) {
         log.trace("Executing findQueues, tenantId: [{}]", tenantId);
@@ -126,6 +131,11 @@ public class BaseQueueService extends AbstractEntityService implements QueueServ
         tenantQueuesRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteQueuesByTenantId(tenantId);
+    }
+
     @Override
     public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
         return Optional.ofNullable(findQueueById(tenantId, new QueueId(entityId.getId())));
diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueStatsService.java b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueStatsService.java
index 2274a782bb..6352ac1a4c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueStatsService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueStatsService.java
@@ -78,6 +78,11 @@ public class BaseQueueStatsService extends AbstractEntityService implements Queu
         queueStatsDao.deleteByTenantId(tenantId);
     }
 
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        queueStatsDao.removeById(tenantId, id.getId());
+    }
+
     @Override
     public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
         return Optional.ofNullable(findQueueStatsById(tenantId, new QueueStatsId(entityId.getId())));
@@ -87,4 +92,5 @@ public class BaseQueueStatsService extends AbstractEntityService implements Queu
     public EntityType getEntityType() {
         return EntityType.QUEUE_STATS;
     }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
index 37b030996f..723d0e8861 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
@@ -159,6 +159,11 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
         eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entity(resource).entityId(resourceId).build());
     }
 
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteResource(tenantId, (TbResourceId) id, force);
+    }
+
     @Override
     public PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink) {
         TenantId tenantId = filter.getTenantId();
@@ -204,13 +209,13 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
     }
 
     @Override
-    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.ofNullable(findResourceInfoById(tenantId, new TbResourceId(entityId.getId())));
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteResourcesByTenantId(tenantId);
     }
 
     @Override
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteResource(tenantId, (TbResourceId) id);
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findResourceInfoById(tenantId, new TbResourceId(entityId.getId())));
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java b/dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java
index 2b314e82df..c79de9c6ac 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java
@@ -59,6 +59,11 @@ public class BaseRpcService implements RpcService {
         rpcDao.removeById(tenantId, rpcId.getId());
     }
 
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteRpc(tenantId, (RpcId) id);
+    }
+
     @Override
     public void deleteAllRpcByTenantId(TenantId tenantId) {
         log.trace("Executing deleteAllRpcByTenantId, tenantId [{}]", tenantId);
@@ -66,6 +71,11 @@ public class BaseRpcService implements RpcService {
         tenantRpcRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteAllRpcByTenantId(tenantId);
+    }
+
     @Override
     public Rpc findById(TenantId tenantId, RpcId rpcId) {
         log.trace("Executing findById, tenantId [{}], rpcId [{}]", tenantId, rpcId);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
index cb9e9efdee..bebb3891cb 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
@@ -197,7 +197,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         List<RuleNodeUpdateResult> updatedRuleNodes = new ArrayList<>();
         List<RuleNode> existingRuleNodes = getRuleChainNodes(tenantId, ruleChainMetaData.getRuleChainId());
         for (RuleNode existingNode : existingRuleNodes) {
-            deleteEntityRelations(tenantId, existingNode.getId());
             Integer index = ruleNodeIndexMap.get(existingNode.getId());
             RuleNode newRuleNode = null;
             if (index != null) {
@@ -452,12 +451,30 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         checkRuleNodesAndDelete(tenantId, ruleChain, referencingRuleChainIds);
     }
 
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        if (force) {
+            RuleChain ruleChain = findRuleChainById(tenantId, (RuleChainId) id);
+            checkRuleNodesAndDelete(tenantId, ruleChain, null);
+        } else {
+            deleteRuleChainById(tenantId, (RuleChainId) id);
+        }
+    }
+
+    @Transactional
     @Override
     public void deleteRuleChainsByTenantId(TenantId tenantId) {
         Validator.validateId(tenantId, "Incorrect tenant id for delete rule chains request.");
         tenantRuleChainsRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Transactional
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteRuleChainsByTenantId(tenantId);
+    }
+
     @Override
     public RuleChainData exportTenantRuleChains(TenantId tenantId, PageLink pageLink) {
         Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request.");
@@ -653,7 +670,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public RuleChain getEdgeTemplateRootRuleChain(TenantId tenantId) {
-        Validator.validateId(tenantId, "Incorrect tenant id for search request.");
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return ruleChainDao.findRootRuleChainByTenantIdAndType(tenantId.getId(), RuleChainType.EDGE);
     }
 
@@ -789,10 +806,10 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     private void deleteRuleNodes(TenantId tenantId, List<RuleNode> ruleNodes) {
         List<RuleNodeId> ruleNodeIds = ruleNodes.stream().map(RuleNode::getId).collect(Collectors.toList());
-        for (var node : ruleNodes) {
-            deleteEntityRelations(tenantId, node.getId());
-        }
         ruleNodeDao.deleteByIdIn(ruleNodeIds);
+        for (var nodeId : ruleNodeIds) {
+            cleanUpService.cleanUpRelatedData(tenantId, nodeId);
+        }
     }
 
     @Override
@@ -802,7 +819,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         for (EntityRelation relation : nodeRelations) {
             deleteRuleNode(tenantId, relation.getTo());
         }
-        deleteEntityRelations(tenantId, ruleChainId);
     }
 
 
@@ -819,12 +835,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         return ruleChainDao.countByTenantId(tenantId);
     }
 
-    @Override
-    @Transactional
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteRuleChainById(tenantId, (RuleChainId) id);
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.RULE_CHAIN;
@@ -839,8 +849,8 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     }
 
     private void deleteRuleNode(TenantId tenantId, EntityId entityId) {
-        deleteEntityRelations(tenantId, entityId);
         ruleNodeDao.removeById(tenantId, entityId.getId());
+        cleanUpService.cleanUpRelatedData(tenantId, entityId);
     }
 
     private final PaginatedRemover<TenantId, RuleChain> tenantRuleChainsRemover =
diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
index 13aaba8751..da0ca9c577 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
@@ -29,7 +29,7 @@ import org.thingsboard.server.dao.service.Validator;
 @Service
 @Slf4j
 public class AdminSettingsServiceImpl implements AdminSettingsService {
-    
+
     @Autowired
     private AdminSettingsDao adminSettingsDao;
 
@@ -40,7 +40,7 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
     public AdminSettings findAdminSettingsById(TenantId tenantId, AdminSettingsId adminSettingsId) {
         log.trace("Executing findAdminSettingsById [{}]", adminSettingsId);
         Validator.validateId(adminSettingsId, id -> "Incorrect adminSettingsId " + id);
-        return  adminSettingsDao.findById(tenantId, adminSettingsId.getId());
+        return adminSettingsDao.findById(tenantId, adminSettingsId.getId());
     }
 
     @Override
@@ -59,15 +59,15 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
     public AdminSettings saveAdminSettings(TenantId tenantId, AdminSettings adminSettings) {
         log.trace("Executing saveAdminSettings [{}]", adminSettings);
         adminSettingsValidator.validate(adminSettings, data -> tenantId);
-        if (adminSettings.getKey().equals("mail")){
+        if (adminSettings.getKey().equals("mail")) {
             AdminSettings mailSettings = findAdminSettingsByKey(tenantId, "mail");
             if (mailSettings != null) {
                 JsonNode newJsonValue = adminSettings.getJsonValue();
                 JsonNode oldJsonValue = mailSettings.getJsonValue();
-                if (!newJsonValue.has("password") && oldJsonValue.has("password")){
-                     ((ObjectNode) newJsonValue).put("password", oldJsonValue.get("password").asText());
+                if (!newJsonValue.has("password") && oldJsonValue.has("password")) {
+                    ((ObjectNode) newJsonValue).put("password", oldJsonValue.get("password").asText());
                 }
-                if (!newJsonValue.has("refreshToken") && oldJsonValue.has("refreshToken")){
+                if (!newJsonValue.has("refreshToken") && oldJsonValue.has("refreshToken")) {
                     ((ObjectNode) newJsonValue).put("refreshToken", oldJsonValue.get("refreshToken").asText());
                 }
                 dropTokenIfProviderInfoChanged(newJsonValue, oldJsonValue);
@@ -92,12 +92,12 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
     }
 
     private void dropTokenIfProviderInfoChanged(JsonNode newJsonValue, JsonNode oldJsonValue) {
-        if (newJsonValue.has("enableOauth2") && newJsonValue.get("enableOauth2").asBoolean()){
+        if (newJsonValue.has("enableOauth2") && newJsonValue.get("enableOauth2").asBoolean()) {
             if (!newJsonValue.get("providerId").equals(oldJsonValue.get("providerId")) ||
                     !newJsonValue.get("clientId").equals(oldJsonValue.get("clientId")) ||
                     !newJsonValue.get("clientSecret").equals(oldJsonValue.get("clientSecret")) ||
                     !newJsonValue.get("redirectUri").equals(oldJsonValue.get("redirectUri")) ||
-                    (newJsonValue.has("providerTenantId") && !newJsonValue.get("providerTenantId").equals(oldJsonValue.get("providerTenantId")))){
+                    (newJsonValue.has("providerTenantId") && !newJsonValue.get("providerTenantId").equals(oldJsonValue.get("providerTenantId")))) {
                 ((ObjectNode) newJsonValue).put("tokenGenerated", false);
                 ((ObjectNode) newJsonValue).remove("refreshToken");
                 ((ObjectNode) newJsonValue).remove("refreshTokenExpires");
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
index fdb96195fb..973cb4b5b2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
@@ -19,12 +19,15 @@ import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.Dao;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.BaseEntity;
+import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.Collection;
@@ -41,6 +44,9 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
         extends JpaAbstractDaoListeningExecutorService
         implements Dao<D> {
 
+    @Autowired
+    protected JdbcTemplate jdbcTemplate;
+
     protected abstract Class<E> getEntityClass();
 
     protected abstract JpaRepository<E, UUID> getRepository();
@@ -123,4 +129,23 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
         return DaoUtil.convertDataList(entities);
     }
 
+    @Override
+    public List<UUID> findIdsByTenantIdAndIdOffset(TenantId tenantId, UUID idOffset, int limit) {
+        String query = "SELECT id FROM " + getEntityType().getTableName() + " WHERE " + getTenantIdColumn() + " = ? ";
+        Object[] params;
+        if (idOffset == null) {
+            params = new Object[]{tenantId.getId(), limit};
+        } else {
+            query += " AND id > ? ";
+            params = new Object[]{tenantId.getId(), idOffset, limit};
+        }
+        query += " ORDER BY id LIMIT ?";
+
+        return jdbcTemplate.queryForList(query, UUID.class, params);
+    }
+
+    protected String getTenantIdColumn() {
+        return ModelConstants.TENANT_ID_COLUMN;
+    }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
index 735234ffaa..8353334017 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
@@ -17,13 +17,14 @@ package org.thingsboard.server.dao.sql.alarm;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
-import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.dao.model.sql.AlarmEntity;
 import org.thingsboard.server.dao.model.sql.AlarmInfoEntity;
 
@@ -333,8 +334,21 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
     @Query("SELECT a.id FROM AlarmEntity a WHERE a.tenantId = :tenantId AND a.assigneeId = :assigneeId")
     Page<UUID> findAlarmIdsByAssigneeId(@Param("tenantId") UUID tenantId, @Param("assigneeId") UUID assigneeId, Pageable pageable);
 
-    @Query("SELECT a.id FROM AlarmEntity a WHERE a.tenantId = :tenantId AND a.originatorId = :originatorId")
-    Page<UUID> findAlarmIdsByOriginatorId(@Param("tenantId") UUID tenantId, @Param("originatorId") UUID originatorId, Pageable pageable);
+    // using Slice so that count query is not executed
+    @Query("SELECT new org.thingsboard.server.common.data.util.TbPair(a.id, a.createdTime) " +
+            "FROM AlarmEntity a WHERE a.originatorId = :originatorId " +
+            "AND (a.createdTime > :createdTimeOffset OR " +
+            "(a.createdTime = :createdTimeOffset AND a.id > :idOffset))")
+    Slice<TbPair<UUID, Long>> findAlarmIdsByOriginatorId(@Param("originatorId") UUID originatorId,
+                                                         @Param("createdTimeOffset") long createdTimeOffset,
+                                                         @Param("idOffset") UUID idOffset,
+                                                         Pageable pageable);
+
+    // using Slice so that count query is not executed
+    @Query("SELECT new org.thingsboard.server.common.data.util.TbPair(a.id, a.createdTime) " +
+            "FROM AlarmEntity a WHERE a.originatorId = :originatorId")
+    Slice<TbPair<UUID, Long>> findAlarmIdsByOriginatorId(@Param("originatorId") UUID originatorId,
+                                                         Pageable pageable);
 
     @Query(value = "SELECT create_or_update_active_alarm(:t_id, :c_id, :a_id, :a_created_ts, :a_o_id, :a_o_type, :a_type, :a_severity, " +
             ":a_start_ts, :a_end_ts, :a_details, :a_propagate, :a_propagate_to_owner, " +
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/EntityAlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/EntityAlarmRepository.java
index 8373999758..ccf82e1b5b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/EntityAlarmRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/EntityAlarmRepository.java
@@ -33,11 +33,13 @@ public interface EntityAlarmRepository extends JpaRepository<EntityAlarmEntity,
     @Transactional
     @Modifying
     @Query("DELETE FROM EntityAlarmEntity e where e.entityId = :entityId")
-    void deleteByEntityId(@Param("entityId") UUID entityId);
+    int deleteByEntityId(@Param("entityId") UUID entityId);
 
     @Transactional
     @Modifying
     @Query("DELETE FROM EntityAlarmEntity a WHERE a.tenantId = :tenantId")
     void deleteByTenantId(@Param("tenantId") UUID tenantId);
 
+    List<EntityAlarmEntity> findAllByEntityId(UUID entityId);
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
index 90a5b1f8d4..b0bf2cc666 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
@@ -21,6 +21,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -48,9 +50,11 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.page.SortOrder;
 import org.thingsboard.server.common.data.query.AlarmCountQuery;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.alarm.AlarmDao;
 import org.thingsboard.server.dao.model.ModelConstants;
@@ -69,6 +73,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
+import static org.thingsboard.server.common.data.page.SortOrder.Direction.ASC;
 import static org.thingsboard.server.dao.DaoUtil.convertTenantEntityTypesToDto;
 import static org.thingsboard.server.dao.DaoUtil.toPageable;
 
@@ -297,9 +302,15 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
     }
 
     @Override
-    public PageData<AlarmId> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, PageLink pageLink) {
-        return DaoUtil.pageToPageData(alarmRepository.findAlarmIdsByOriginatorId(tenantId.getId(), originatorId.getId(), DaoUtil.toPageable(pageLink)))
-                .mapData(AlarmId::new);
+    public PageData<TbPair<UUID, Long>> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, long createdTimeOffset, AlarmId idOffset, int limit) {
+        Slice<TbPair<UUID, Long>> result;
+        Pageable pageRequest = toPageable(new PageLink(limit), List.of(SortOrder.of("createdTime", ASC), SortOrder.of("id", ASC)));
+        if (idOffset == null) {
+            result = alarmRepository.findAlarmIdsByOriginatorId(originatorId.getId(), pageRequest);
+        } else {
+            result = alarmRepository.findAlarmIdsByOriginatorId(originatorId.getId(), createdTimeOffset, idOffset.getId(), pageRequest);
+        }
+        return DaoUtil.pageToPageData(result);
     }
 
     @Override
@@ -315,8 +326,13 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
     }
 
     @Override
-    public void deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId) {
-        entityAlarmRepository.deleteByEntityId(entityId.getId());
+    public List<EntityAlarm> findEntityAlarmRecordsByEntityId(TenantId tenantId, EntityId entityId) {
+        return DaoUtil.convertDataList(entityAlarmRepository.findAllByEntityId(entityId.getId()));
+    }
+
+    @Override
+    public int deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId) {
+        return entityAlarmRepository.deleteByEntityId(entityId.getId());
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java
index 39358ab5fd..3bf8e43c70 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java
@@ -22,9 +22,11 @@ import com.google.common.util.concurrent.MoreExecutors;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -34,6 +36,7 @@ import org.thingsboard.server.common.stats.StatsFactory;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.attributes.AttributesDao;
 import org.thingsboard.server.dao.dictionary.KeyDictionaryDao;
+import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.model.sql.AttributeKvCompositeKey;
 import org.thingsboard.server.dao.model.sql.AttributeKvEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService;
@@ -146,8 +149,7 @@ public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService impl
                 entityId.getId(),
                 attributeScope.getId());
         attributes.forEach(attributeKvEntity -> attributeKvEntity.setStrKey(keyDictionaryDao.getKey(attributeKvEntity.getId().getAttributeKey())));
-        return DaoUtil.convertDataList(Lists.newArrayList(
-                attributes));
+        return DaoUtil.convertDataList(Lists.newArrayList(attributes));
     }
 
     @Override
@@ -204,6 +206,16 @@ public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService impl
         return futuresList;
     }
 
+    @Transactional
+    @Override
+    public List<Pair<AttributeScope, String>> removeAllByEntityId(TenantId tenantId, EntityId entityId) {
+        return jdbcTemplate.queryForList("DELETE FROM attribute_kv WHERE entity_id = ? " +
+                        "RETURNING attribute_type, attribute_key", entityId.getId()).stream()
+                .map(row -> Pair.of(AttributeScope.valueOf((Integer) row.get(ModelConstants.ATTRIBUTE_TYPE_COLUMN)),
+                        keyDictionaryDao.getKey((Integer) row.get(ModelConstants.ATTRIBUTE_KEY_COLUMN))))
+                .collect(Collectors.toList());
+    }
+
     private AttributeKvCompositeKey getAttributeKvCompositeKey(EntityId entityId, Integer attributeType, Integer attributeKey) {
         return new AttributeKvCompositeKey(
                 entityId.getId(),
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationTemplateDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationTemplateDao.java
index 8ee6c3df3a..8950ab1e35 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationTemplateDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationTemplateDao.java
@@ -53,6 +53,11 @@ public class JpaNotificationTemplateDao extends JpaAbstractDao<NotificationTempl
                 notificationTypes, pageLink.getTextSearch(), DaoUtil.toPageable(pageLink)));
     }
 
+    @Override
+    public int countByTenantIdAndNotificationTypes(TenantId tenantId, List<NotificationType> notificationTypes) {
+        return notificationTemplateRepository.countByTenantIdAndNotificationTypes(tenantId.getId(), notificationTypes);
+    }
+
     @Override
     public void removeByTenantId(TenantId tenantId) {
         notificationTemplateRepository.deleteByTenantId(tenantId.getId());
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTemplateRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTemplateRepository.java
index b3e416a491..bb45c10d06 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTemplateRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTemplateRepository.java
@@ -42,6 +42,11 @@ public interface NotificationTemplateRepository extends JpaRepository<Notificati
                                                                                      @Param("searchText") String searchText,
                                                                                      Pageable pageable);
 
+    @Query("SELECT count(t) FROM NotificationTemplateEntity t WHERE t.tenantId = :tenantId AND " +
+            "t.notificationType IN :notificationTypes")
+    int countByTenantIdAndNotificationTypes(@Param("tenantId") UUID tenantId,
+                                            @Param("notificationTypes") List<NotificationType> notificationTypes);
+
     @Transactional
     @Modifying
     @Query("DELETE FROM NotificationTemplateEntity t WHERE t.tenantId = :tenantId")
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java
index 9e0723d9fc..799d1ff521 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java
@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -86,4 +87,10 @@ public class JpaQueueDao extends JpaAbstractDao<QueueEntity, Queue> implements Q
         return DaoUtil.toPageData(queueRepository
                 .findByTenantId(tenantId.getId(), pageLink.getTextSearch(), DaoUtil.toPageable(pageLink)));
     }
-}
\ No newline at end of file
+
+    @Override
+    public EntityType getEntityType() {
+        return EntityType.QUEUE;
+    }
+
+}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueStatsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueStatsDao.java
index ac57d54e90..1cfdbf0b38 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueStatsDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueStatsDao.java
@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.queue.QueueStats;
 import org.thingsboard.server.dao.DaoUtil;
@@ -63,4 +64,9 @@ public class JpaQueueStatsDao extends JpaAbstractDao<QueueStatsEntity, QueueStat
         queueStatsRepository.deleteByTenantId(tenantId.getId());
     }
 
-}
\ No newline at end of file
+    @Override
+    public EntityType getEntityType() {
+        return EntityType.QUEUE_STATS;
+    }
+
+}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantProfileDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantProfileDao.java
index a757397911..372c5bc9b8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantProfileDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantProfileDao.java
@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.EntityInfo;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
@@ -31,7 +32,6 @@ import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 import java.util.UUID;
 
 @Component
@@ -87,4 +87,9 @@ public class JpaTenantProfileDao extends JpaAbstractDao<TenantProfileEntity, Ten
         return DaoUtil.convertDataList(tenantProfileRepository.findByIdIn(Arrays.asList(ids)));
     }
 
+    @Override
+    public EntityType getEntityType() {
+        return EntityType.TENANT_PROFILE;
+    }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDao.java
index 73b616e7ba..671304256e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDao.java
@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.settings.UserSettings;
 import org.thingsboard.server.common.data.settings.UserSettingsCompositeKey;
 import org.thingsboard.server.common.data.settings.UserSettingsType;
@@ -54,6 +55,11 @@ public class JpaUserSettingsDao extends JpaAbstractDaoListeningExecutorService i
         userSettingsRepository.deleteById(id);
     }
 
+    @Override
+    public void removeByUserId(TenantId tenantId, UserId userId) {
+        userSettingsRepository.deleteByUserId(userId.getId());
+    }
+
     @Override
     public List<UserSettings> findByTypeAndPath(TenantId tenantId, UserSettingsType type, String... path) {
         log.trace("findByTypeAndPath [{}][{}][{}]", tenantId, type, path);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserSettingsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserSettingsRepository.java
index 7f50b5ad5b..436062ef4c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserSettingsRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserSettingsRepository.java
@@ -16,15 +16,23 @@
 package org.thingsboard.server.dao.sql.user;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.settings.UserSettingsCompositeKey;
 import org.thingsboard.server.dao.model.sql.UserSettingsEntity;
 
 import java.util.List;
+import java.util.UUID;
 
 public interface UserSettingsRepository extends JpaRepository<UserSettingsEntity, UserSettingsCompositeKey> {
 
+    @Transactional
+    @Modifying
+    @Query("DELETE FROM UserSettingsEntity s WHERE s.userId = :userId")
+    void deleteByUserId(@Param("userId") UUID userId);
+
     @Query(value = "SELECT * FROM user_settings WHERE type = :type AND (settings #> :path) IS NOT NULL", nativeQuery = true)
     List<UserSettingsEntity> findByTypeAndPathExisting(@Param("type") String type, @Param("path") String[] path);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java
index 7a6f5cd8f8..acbc7041fb 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java
@@ -133,7 +133,6 @@ public class TenantProfileServiceImpl extends AbstractCachedEntityService<Tenant
                 throw t;
             }
         }
-        deleteEntityRelations(tenantId, tenantProfileId);
         publishEvictEvent(new TenantProfileEvictEvent(tenantProfileId, isDefault));
         eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entity(tenantProfile).entityId(tenantProfileId).build());
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
index 8b3e65c927..83f1a636c9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
@@ -34,33 +34,17 @@ import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.asset.AssetProfileService;
-import org.thingsboard.server.dao.asset.AssetService;
-import org.thingsboard.server.dao.customer.CustomerService;
-import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.device.DeviceProfileService;
-import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
 import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
-import org.thingsboard.server.dao.notification.NotificationRequestService;
-import org.thingsboard.server.dao.notification.NotificationRuleService;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
-import org.thingsboard.server.dao.notification.NotificationTargetService;
-import org.thingsboard.server.dao.notification.NotificationTemplateService;
-import org.thingsboard.server.dao.ota.OtaPackageService;
-import org.thingsboard.server.dao.queue.QueueService;
-import org.thingsboard.server.dao.queue.QueueStatsService;
-import org.thingsboard.server.dao.resource.ResourceService;
-import org.thingsboard.server.dao.rpc.RpcService;
-import org.thingsboard.server.dao.rule.RuleChainService;
-import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
 import org.thingsboard.server.dao.service.Validator;
+import org.thingsboard.server.dao.service.validator.TenantDataValidator;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.dao.user.UserService;
-import org.thingsboard.server.dao.widget.WidgetTypeService;
-import org.thingsboard.server.dao.widget.WidgetsBundleService;
 
 import java.util.List;
 import java.util.Optional;
@@ -77,84 +61,24 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
 
     @Autowired
     private TenantDao tenantDao;
-
     @Autowired
     private TenantProfileService tenantProfileService;
-
     @Autowired
     @Lazy
     private UserService userService;
-
-    @Autowired
-    private CustomerService customerService;
-
-    @Autowired
-    private AssetService assetService;
-
     @Autowired
     private AssetProfileService assetProfileService;
-
-    @Autowired
-    private DeviceService deviceService;
-
     @Autowired
     private DeviceProfileService deviceProfileService;
-
     @Lazy
     @Autowired
     private ApiUsageStateService apiUsageStateService;
-
-    @Autowired
-    private WidgetsBundleService widgetsBundleService;
-
-    @Autowired
-    private WidgetTypeService widgetTypeService;
-
-    @Autowired
-    private DashboardService dashboardService;
-
-    @Autowired
-    private RuleChainService ruleChainService;
-
-    @Autowired
-    private ResourceService resourceService;
-
-    @Autowired
-    @Lazy
-    private OtaPackageService otaPackageService;
-
-    @Autowired
-    private RpcService rpcService;
-
-    @Autowired
-    private DataValidator<Tenant> tenantValidator;
-
-    @Lazy
-    @Autowired
-    private QueueService queueService;
-
-    @Lazy
-    @Autowired
-    private QueueStatsService queueStatsService;
-
     @Autowired
     private AdminSettingsService adminSettingsService;
-
     @Autowired
     private NotificationSettingsService notificationSettingsService;
-
-    @Autowired
-    private NotificationRequestService notificationRequestService;
-
-    @Autowired
-    private NotificationRuleService notificationRuleService;
-
-    @Autowired
-    private NotificationTemplateService notificationTemplateService;
-
     @Autowired
-    private NotificationTargetService notificationTargetService;
-
+    private TenantDataValidator tenantValidator;
     @Autowired
     protected TbTransactionalCache<TenantId, Boolean> existsTenantCache;
 
@@ -226,46 +150,27 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
         return savedTenant;
     }
 
-    /**
-     * We intentionally leave this method without "Transactional" annotation due to complexity of the method.
-     * Ideally we should delete related entites without "paginatedRemover" logic. But in such a case we can't clear cache and send events.
-     * We will create separate task to make "deleteTenant" transactional.
-     */
     @Override
     public void deleteTenant(TenantId tenantId) {
         log.trace("Executing deleteTenant [{}]", tenantId);
         Tenant tenant = findTenantById(tenantId);
         Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
-        entityViewService.deleteEntityViewsByTenantId(tenantId);
-        widgetsBundleService.deleteWidgetsBundlesByTenantId(tenantId);
-        widgetTypeService.deleteWidgetTypesByTenantId(tenantId);
-        assetService.deleteAssetsByTenantId(tenantId);
-        assetProfileService.deleteAssetProfilesByTenantId(tenantId);
-        deviceService.deleteDevicesByTenantId(tenantId);
-        deviceProfileService.deleteDeviceProfilesByTenantId(tenantId);
-        dashboardService.deleteDashboardsByTenantId(tenantId);
-        customerService.deleteCustomersByTenantId(tenantId);
-        edgeService.deleteEdgesByTenantId(tenantId);
-        userService.deleteTenantAdmins(tenantId);
-        ruleChainService.deleteRuleChainsByTenantId(tenantId);
-        apiUsageStateService.deleteApiUsageStateByTenantId(tenantId);
-        resourceService.deleteResourcesByTenantId(tenantId);
-        otaPackageService.deleteOtaPackagesByTenantId(tenantId);
-        rpcService.deleteAllRpcByTenantId(tenantId);
-        queueService.deleteQueuesByTenantId(tenantId);
-        notificationRequestService.deleteNotificationRequestsByTenantId(tenantId);
-        notificationRuleService.deleteNotificationRulesByTenantId(tenantId);
-        notificationTemplateService.deleteNotificationTemplatesByTenantId(tenantId);
-        notificationTargetService.deleteNotificationTargetsByTenantId(tenantId);
-        notificationSettingsService.deleteNotificationSettings(tenantId);
+
+        userService.deleteAllByTenantId(tenantId);
         adminSettingsService.deleteAdminSettingsByTenantId(tenantId);
+        notificationSettingsService.deleteNotificationSettings(tenantId);
         tenantDao.removeById(tenantId, tenantId.getId());
         publishEvictEvent(new TenantEvictEvent(tenantId, true));
-        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId)
-                .entity(tenant).entityId(tenantId).build());
-        relationService.deleteEntityRelations(tenantId, tenantId);
-        alarmService.deleteEntityAlarmRecordsByTenantId(tenantId);
-        queueStatsService.deleteByTenantId(tenantId);
+
+        cleanUpService.removeTenantEntities(tenantId, // don't forget to implement deleteEntity from EntityDaoService when adding entity type to this list
+                EntityType.ENTITY_VIEW, EntityType.WIDGETS_BUNDLE, EntityType.WIDGET_TYPE,
+                EntityType.ASSET, EntityType.ASSET_PROFILE, EntityType.DEVICE, EntityType.DEVICE_PROFILE,
+                EntityType.DASHBOARD, EntityType.EDGE, EntityType.RULE_CHAIN, EntityType.API_USAGE_STATE,
+                EntityType.TB_RESOURCE, EntityType.OTA_PACKAGE, EntityType.RPC, EntityType.QUEUE,
+                EntityType.NOTIFICATION_REQUEST, EntityType.NOTIFICATION_RULE, EntityType.NOTIFICATION_TEMPLATE,
+                EntityType.NOTIFICATION_TARGET, EntityType.QUEUE_STATS, EntityType.CUSTOMER
+        );
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(tenantId).entity(tenant).build());
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java
index 52195cf8db..d901ae950e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.usagerecord;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.ApiFeature;
 import org.thingsboard.server.common.data.ApiUsageRecordKey;
 import org.thingsboard.server.common.data.ApiUsageState;
@@ -35,6 +36,7 @@ import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.tenant.profile.TenantProfileConfiguration;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
+import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.tenant.TenantProfileDao;
@@ -69,18 +71,26 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
         this.apiUsageStateValidator = apiUsageStateValidator;
     }
 
-    @Override
-    public void deleteApiUsageStateByTenantId(TenantId tenantId) {
-        log.trace("Executing deleteUsageRecordsByTenantId [{}]", tenantId);
-        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
-        apiUsageStateDao.deleteApiUsageStateByTenantId(tenantId);
-    }
-
+    @Transactional
     @Override
     public void deleteApiUsageStateByEntityId(EntityId entityId) {
         log.trace("Executing deleteApiUsageStateByEntityId [{}]", entityId);
         validateId(entityId.getId(), id -> "Invalid entity id " + id);
-        apiUsageStateDao.deleteApiUsageStateByEntityId(entityId);
+        ApiUsageState apiUsageState = findApiUsageStateByEntityId(entityId);
+        deleteApiUsageState(apiUsageState);
+    }
+
+    private void deleteApiUsageState(ApiUsageState apiUsageState) {
+        if (apiUsageState != null) {
+            apiUsageStateDao.removeById(apiUsageState.getTenantId(), apiUsageState.getUuidId());
+            eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(apiUsageState.getTenantId()).entityId(apiUsageState.getId()).build());
+        }
+    }
+
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        ApiUsageState apiUsageState = findApiUsageStateById(tenantId, (ApiUsageStateId) id);
+        deleteApiUsageState(apiUsageState);
     }
 
     @Override
@@ -176,6 +186,12 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
         return Optional.ofNullable(findApiUsageStateById(tenantId, new ApiUsageStateId(entityId.getId())));
     }
 
+    @Transactional
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteApiUsageStateByEntityId(tenantId);
+    }
+
     @Override
     public EntityType getEntityType() {
         return EntityType.API_USAGE_STATE;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
index 4b804353ad..90084e1a3f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
@@ -262,7 +262,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         validateId(userId, id -> INCORRECT_USER_ID + id);
         userCredentialsDao.removeByUserId(tenantId, userId);
         userAuthSettingsDao.removeByUserId(userId);
-        deleteEntityRelations(tenantId, userId);
+        userSettingsDao.removeByUserId(tenantId, userId);
 
         userDao.removeById(tenantId, userId.getId());
         eventPublisher.publishEvent(new UserCredentialsInvalidationEvent(userId));
@@ -321,6 +321,17 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         tenantAdminsRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Override
+    public void deleteAllByTenantId(TenantId tenantId) {
+        log.trace("Executing deleteByTenantId, tenantId [{}]", tenantId);
+        usersRemover.removeEntities(tenantId, tenantId);
+    }
+
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteAllByTenantId(tenantId);
+    }
+
     @Override
     public PageData<User> findCustomerUsers(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findCustomerUsers, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
@@ -508,6 +519,18 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         }
     };
 
+    private final PaginatedRemover<TenantId, User> usersRemover = new PaginatedRemover<>() {
+        @Override
+        protected PageData<User> findEntities(TenantId tenantId, TenantId id, PageLink pageLink) {
+            return findUsersByTenantId(tenantId, pageLink);
+        }
+
+        @Override
+        protected void removeEntity(TenantId tenantId, User user) {
+            deleteUser(tenantId, user);
+        }
+    };
+
     @Override
     public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
         return Optional.ofNullable(findUserById(tenantId, new UserId(entityId.getId())));
diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsDao.java
index 23734118a9..bc93a23568 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsDao.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.dao.user;
 
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.settings.UserSettings;
 import org.thingsboard.server.common.data.settings.UserSettingsCompositeKey;
 import org.thingsboard.server.common.data.settings.UserSettingsType;
@@ -30,6 +31,8 @@ public interface UserSettingsDao {
 
     void removeById(TenantId tenantId, UserSettingsCompositeKey key);
 
+    void removeByUserId(TenantId tenantId, UserId userId);
+
     List<UserSettings> findByTypeAndPath(TenantId tenantId, UserSettingsType type, String... path);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java
index 5321e4ba1c..f2506a2d9b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java
@@ -115,6 +115,11 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
         eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(widgetTypeId).build());
     }
 
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteWidgetType(tenantId, (WidgetTypeId) id);
+    }
+
     @Override
     public PageData<WidgetTypeInfo> findSystemWidgetTypesByPageLink(TenantId tenantId, boolean fullSearch, DeprecatedFilter deprecatedFilter, List<String> widgetTypes, PageLink pageLink) {
         log.trace("Executing findSystemWidgetTypesByPageLink, fullSearch [{}], deprecatedFilter [{}], widgetTypes [{}], pageLink [{}]", fullSearch, deprecatedFilter, widgetTypes, pageLink);
@@ -226,6 +231,11 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
         tenantWidgetTypeRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteWidgetTypesByTenantId(tenantId);
+    }
+
     @Override
     public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
         return Optional.ofNullable(findWidgetTypeById(tenantId, new WidgetTypeId(entityId.getId())));
diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java
index 2e67406df1..ae53c70ec8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java
@@ -92,12 +92,21 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
     public void deleteWidgetsBundle(TenantId tenantId, WidgetsBundleId widgetsBundleId) {
         log.trace("Executing deleteWidgetsBundle [{}]", widgetsBundleId);
         Validator.validateId(widgetsBundleId, id -> "Incorrect widgetsBundleId " + id);
-        WidgetsBundle widgetsBundle = findWidgetsBundleById(tenantId, widgetsBundleId);
+        deleteEntity(tenantId, widgetsBundleId, false);
+    }
+
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        WidgetsBundle widgetsBundle = findWidgetsBundleById(tenantId, (WidgetsBundleId) id);
         if (widgetsBundle == null) {
-            throw new IncorrectParameterException("Unable to delete non-existent widgets bundle.");
+            if (force) {
+                return;
+            } else {
+                throw new IncorrectParameterException("Unable to delete non-existent widgets bundle.");
+            }
         }
-        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(widgetsBundleId).build());
-        widgetsBundleDao.removeById(tenantId, widgetsBundleId.getId());
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(id).build());
+        widgetsBundleDao.removeById(tenantId, id.getId());
     }
 
     @Override
@@ -180,13 +189,13 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
     }
 
     @Override
-    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.ofNullable(findWidgetsBundleById(tenantId, new WidgetsBundleId(entityId.getId())));
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteWidgetsBundlesByTenantId(tenantId);
     }
 
     @Override
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteWidgetsBundle(tenantId, (WidgetsBundleId) id);
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findWidgetsBundleById(tenantId, new WidgetsBundleId(entityId.getId())));
     }
 
     @Override
diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java
index 0c0a1c8ef8..d1f3839cf5 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java
@@ -26,7 +26,7 @@ import java.util.List;
 public class AbstractRedisContainer {
 
     @ClassRule(order = 0)
-    public static GenericContainer redis = new GenericContainer("redis:7.0")
+    public static GenericContainer redis = new GenericContainer("redis:7.2")
             .withExposedPorts(6379);
 
     @ClassRule(order = 1)
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
index 5eddc78661..6127a4192a 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
@@ -42,6 +42,8 @@ import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileTra
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.event.RuleNodeDebugEvent;
+import org.thingsboard.server.common.data.housekeeper.TenantEntitiesDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
@@ -51,6 +53,9 @@ import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.dao.audit.AuditLogLevelFilter;
 import org.thingsboard.server.dao.audit.AuditLogLevelMask;
 import org.thingsboard.server.dao.audit.AuditLogLevelProperties;
+import org.thingsboard.server.dao.entity.EntityDaoService;
+import org.thingsboard.server.dao.entity.EntityServiceRegistry;
+import org.thingsboard.server.common.msg.housekeeper.HousekeeperClient;
 import org.thingsboard.server.dao.tenant.TenantService;
 
 import java.io.IOException;
@@ -77,6 +82,9 @@ public abstract class AbstractServiceTest {
     @Autowired
     protected TenantService tenantService;
 
+    @Autowired
+    protected EntityServiceRegistry entityServiceRegistry;
+
     protected TenantId tenantId;
 
     @Before
@@ -131,6 +139,16 @@ public abstract class AbstractServiceTest {
         return new AuditLogLevelFilter(props);
     }
 
+    @Bean
+    public HousekeeperClient housekeeperClient() {
+        return task -> {
+            if (task.getTaskType() == HousekeeperTaskType.DELETE_TENANT_ENTITIES) {
+                EntityDaoService entityService = entityServiceRegistry.getServiceByEntityType(((TenantEntitiesDeletionHousekeeperTask) task).getEntityType());
+                entityService.deleteByTenantId(task.getTenantId());
+            }
+        };
+    }
+
     protected DeviceProfile createDeviceProfile(TenantId tenantId, String name) {
         DeviceProfile deviceProfile = new DeviceProfile();
         deviceProfile.setTenantId(tenantId);
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/EntityDaoRegistryTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/EntityDaoRegistryTest.java
new file mode 100644
index 0000000000..8524efc4a0
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/EntityDaoRegistryTest.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.entity.EntityDaoRegistry;
+
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+@Slf4j
+@DaoSqlTest
+public class EntityDaoRegistryTest extends AbstractServiceTest {
+
+    @Autowired
+    EntityDaoRegistry entityDaoRegistry;
+
+    @Test
+    public void givenAllEntityTypes_whenGetDao_thenAllPresent() {
+        for (EntityType entityType : EntityType.values()) {
+            Dao<?> dao = assertDoesNotThrow(() -> entityDaoRegistry.getDao(entityType));
+            assertThat(dao).isNotNull();
+        }
+    }
+
+    @Test
+    public void givenAllDaos_whenFindById_thenOk() {
+        for (EntityType entityType : EntityType.values()) {
+            Dao<?> dao = entityDaoRegistry.getDao(entityType);
+            assertDoesNotThrow(() -> {
+                dao.findById(TenantId.SYS_TENANT_ID, UUID.randomUUID());
+            });
+        }
+    }
+
+    @Test
+    public void givenAllDaos_whenFindIdsByTenantIdAndIdOffset_thenOk() {
+        for (EntityType entityType : EntityType.values()) {
+            Dao<?> dao = entityDaoRegistry.getDao(entityType);
+            try {
+                dao.findIdsByTenantIdAndIdOffset(TenantId.SYS_TENANT_ID, null, 10);
+                dao.findIdsByTenantIdAndIdOffset(TenantId.SYS_TENANT_ID, UUID.randomUUID(), 10);
+            } catch (Exception e) {
+                String error = ExceptionUtils.getRootCauseMessage(e);
+                if (error.contains("tenant_id")) {
+                    log.debug("[{}] Ignoring not found tenant_id column", entityType);
+                } else {
+                    fail("findIdsByTenantIdAndIdOffset for " + entityType + " dao threw error: " + error);
+                }
+            }
+        }
+    }
+
+}
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceTest.java
index d9b94fb26b..1fc2ff2ce6 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceTest.java
@@ -18,18 +18,28 @@ package org.thingsboard.server.dao.service;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.ResultSetExtractor;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AttributeScope;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.alarm.AlarmApiCallResult;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -46,6 +56,7 @@ import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
 import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.query.ApiUsageStateFilter;
 import org.thingsboard.server.common.data.query.AssetSearchQueryFilter;
 import org.thingsboard.server.common.data.query.AssetTypeFilter;
 import org.thingsboard.server.common.data.query.DeviceSearchQueryFilter;
@@ -65,6 +76,7 @@ import org.thingsboard.server.common.data.query.FilterPredicateValue;
 import org.thingsboard.server.common.data.query.KeyFilter;
 import org.thingsboard.server.common.data.query.NumericFilterPredicate;
 import org.thingsboard.server.common.data.query.RelationsQueryFilter;
+import org.thingsboard.server.common.data.query.SingleEntityFilter;
 import org.thingsboard.server.common.data.query.StringFilterPredicate;
 import org.thingsboard.server.common.data.query.StringFilterPredicate.StringOperation;
 import org.thingsboard.server.common.data.relation.EntityRelation;
@@ -72,15 +84,20 @@ import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationEntityTypeFilter;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.dao.customer.CustomerService;
+import org.thingsboard.server.dao.dashboard.DashboardDao;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.entity.EntityService;
+import org.thingsboard.server.dao.entityview.EntityViewDao;
 import org.thingsboard.server.dao.model.sqlts.ts.TsKvEntity;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.sql.relation.RelationRepository;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.dao.user.UserService;
 
 import java.util.ArrayList;
@@ -91,12 +108,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.thingsboard.server.common.data.query.EntityKeyType.ATTRIBUTE;
 import static org.thingsboard.server.common.data.query.EntityKeyType.ENTITY_FIELD;
@@ -106,6 +124,7 @@ import static org.thingsboard.server.common.data.query.EntityKeyType.ENTITY_FIEL
 public class EntityServiceTest extends AbstractServiceTest {
 
     static final int ENTITY_COUNT = 5;
+    public static final String TEST_CUSTOMER_NAME = "Test";
 
     @Autowired
     AssetService assetService;
@@ -125,6 +144,27 @@ public class EntityServiceTest extends AbstractServiceTest {
     RelationService relationService;
     @Autowired
     TimeseriesService timeseriesService;
+    @Autowired
+    ApiUsageStateService apiUsageStateService;
+    @Autowired
+    CustomerService customerService;
+    @Autowired
+    DashboardDao dashboardDao;
+    @Autowired
+    EntityViewDao entityViewDao;
+    @Autowired
+    AlarmService alarmService;
+
+    private CustomerId customerId;
+
+    @Before
+    public void before() {
+        Customer customer = new Customer();
+        customer.setTenantId(tenantId);
+        customer.setTitle(TEST_CUSTOMER_NAME);
+        customer = customerService.saveCustomer(customer);
+        customerId = customer.getId();
+    }
 
     @Test
     public void testCountEntitiesByQuery() throws InterruptedException {
@@ -810,7 +850,7 @@ public class EntityServiceTest extends AbstractServiceTest {
     }
 
     void createLoopRelations(TenantId tenantId, String type, EntityId... ids) {
-        assertThat("ids lenght", ids.length, Matchers.greaterThanOrEqualTo(1));
+        assertThat(ids.length).isGreaterThanOrEqualTo(1);
         //chain all from the head to the tail
         for (int i = 1; i < ids.length; i++) {
             relationService.saveRelation(tenantId, new EntityRelation(ids[i - 1], ids[i], type, RelationTypeGroup.COMMON));
@@ -1179,6 +1219,117 @@ public class EntityServiceTest extends AbstractServiceTest {
         assertEquals(0, result.getTotalElements());
     }
 
+    @Test
+    public void testFindEntitiesBySingleEntityFilter() {
+        List<Device> devices = new ArrayList<>();
+
+        for (int i = 0; i < 3; i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            device.setName("Device test" + i);
+            device.setType("default");
+            devices.add(deviceService.saveDevice(device));
+        }
+
+        SingleEntityFilter singleEntityFilter = new SingleEntityFilter();
+        singleEntityFilter.setSingleEntity(devices.get(0).getId());
+
+        List<EntityKey> entityFields = List.of(
+                new EntityKey(EntityKeyType.ENTITY_FIELD, "name")
+        );
+
+        EntityDataPageLink pageLink = new EntityDataPageLink(1000, 0, null, null);
+
+        EntityDataQuery query = new EntityDataQuery(singleEntityFilter, pageLink, entityFields, null, null);
+
+        PageData<EntityData> result = searchEntities(query);
+        assertEquals(1, result.getTotalElements());
+
+        String deviceName = result.getData().get(0).getLatest().get(EntityKeyType.ENTITY_FIELD).get("name").getValue();
+        assertThat(deviceName).isEqualTo(devices.get(0).getName());
+    }
+
+    @Test
+    public void testFindEntitiesByApiUsageStateFilter() {
+        apiUsageStateService.createDefaultApiUsageState(tenantId, customerId);
+        ApiUsageStateFilter apiUsageStateFilter = new ApiUsageStateFilter();
+        apiUsageStateFilter.setCustomerId(customerId);
+
+        List<EntityKey> entityFields = List.of(
+                new EntityKey(EntityKeyType.ENTITY_FIELD, "name")
+        );
+
+        EntityDataPageLink pageLink = new EntityDataPageLink(1000, 0, null, null);
+        EntityDataQuery query = new EntityDataQuery(apiUsageStateFilter, pageLink, entityFields, null, null);
+        PageData<EntityData> result = searchEntities(query);
+        assertEquals(1, result.getTotalElements());
+        String name = result.getData().get(0).getLatest().get(EntityKeyType.ENTITY_FIELD).get("name").getValue();
+        assertThat(name).isEqualTo(TEST_CUSTOMER_NAME);
+    }
+
+    @Test
+    public void testFindEntitiesByRelationEntityTypeFilter() {
+        Customer customer = new Customer();
+        customer.setTenantId(tenantId);
+        customer.setTitle("Customer Relation Query");
+        customer = customerService.saveCustomer(customer);
+
+        final int assetCount = 2;
+        final int relationsCnt = 4;
+        final int deviceEntitiesCnt = assetCount * relationsCnt;
+
+        List<Asset> assets = new ArrayList<>();
+        for (int i = 0; i < assetCount; i++) {
+            Asset building = new Asset();
+            building.setTenantId(tenantId);
+            building.setCustomerId(customer.getId());
+            building.setName("Building _" + i);
+            building.setType("building");
+            building = assetService.saveAsset(building);
+            assets.add(building);
+        }
+
+        List<Device> devices = new ArrayList<>();
+        for (int i = 0; i < deviceEntitiesCnt; i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            device.setCustomerId(customer.getId());
+            device.setName("Test device " + i);
+            device.setType("default");
+            Device savedDevice = deviceService.saveDevice(device);
+            devices.add(savedDevice);
+        }
+
+        for (int i = 0; i < assetCount; i++) {
+            for (int j = 0; j < relationsCnt; j++) {
+                EntityRelation relationEntity = new EntityRelation();
+                relationEntity.setFrom(assets.get(i).getId());
+                relationEntity.setTo(devices.get(j + (i * relationsCnt)).getId());
+                relationEntity.setTypeGroup(RelationTypeGroup.COMMON);
+                relationEntity.setType("contains");
+                relationService.saveRelation(tenantId, relationEntity);
+            }
+        }
+
+        RelationEntityTypeFilter relationEntityTypeFilter = new RelationEntityTypeFilter("contains", Collections.singletonList(EntityType.DEVICE));
+        RelationsQueryFilter filter = new RelationsQueryFilter();
+        filter.setFilters(Collections.singletonList(relationEntityTypeFilter));
+        filter.setDirection(EntitySearchDirection.FROM);
+        EntityDataPageLink pageLink = new EntityDataPageLink(10, 0, null, null);
+        List<KeyFilter> keyFiltersEqualString = createStringKeyFilters("name", EntityKeyType.ENTITY_FIELD, StringOperation.STARTS_WITH, "Test device ");
+
+        for (Asset asset : assets) {
+            filter.setRootEntity(asset.getId());
+
+            EntityDataQuery query = new EntityDataQuery(filter, pageLink, Collections.emptyList(), Collections.emptyList(), keyFiltersEqualString);
+            PageData<EntityData> relationsResult = entityService.findEntityDataByQuery(tenantId, customer.getId(), query);
+            long relationsResultCnt = entityService.countEntitiesByQuery(tenantId, customer.getId(), query);
+
+            Assert.assertEquals(relationsCnt, relationsResult.getData().size());
+            Assert.assertEquals(relationsCnt, relationsResultCnt);
+        }
+    }
+
     @Test
     public void testFindEntityDataByQuery_filter_device_type_name_ends_with() {
         List<Device> devices = new ArrayList<>();
diff --git a/docker/docker-compose.hybrid.yml b/docker/docker-compose.hybrid.yml
index a68e77ed28..43f1e81cd1 100644
--- a/docker/docker-compose.hybrid.yml
+++ b/docker/docker-compose.hybrid.yml
@@ -29,7 +29,7 @@ services:
       - ./tb-node/postgres:/var/lib/postgresql/data
   cassandra:
     restart: always
-    image: "cassandra:4.0.4"
+    image: "cassandra:4.1"
     ports:
       - "9042"
     volumes:
diff --git a/docker/docker-compose.kafka.yml b/docker/docker-compose.kafka.yml
index 99af42965b..c842cc75af 100644
--- a/docker/docker-compose.kafka.yml
+++ b/docker/docker-compose.kafka.yml
@@ -19,7 +19,7 @@ version: '3.0'
 services:
   kafka:
     restart: always
-    image: "bitnami/kafka:3.2.0"
+    image: "bitnami/kafka:3.7.0"
     ports:
       - "9092:9092"
     env_file:
diff --git a/docker/docker-compose.redis-cluster.yml b/docker/docker-compose.redis-cluster.yml
index 6017f2d6df..7b5d6d6dde 100644
--- a/docker/docker-compose.redis-cluster.yml
+++ b/docker/docker-compose.redis-cluster.yml
@@ -19,7 +19,7 @@ version: '3.0'
 services:
 # Redis cluster
   redis-node-0:
-    image: bitnami/redis-cluster:7.0
+    image: bitnami/redis-cluster:7.2
     volumes:
       - ./tb-node/redis-cluster-data-0:/bitnami/redis/data
     environment:
@@ -28,7 +28,7 @@ services:
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-1:
-    image: bitnami/redis-cluster:7.0
+    image: bitnami/redis-cluster:7.2
     volumes:
       - ./tb-node/redis-cluster-data-1:/bitnami/redis/data
     depends_on:
@@ -39,7 +39,7 @@ services:
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-2:
-    image: bitnami/redis-cluster:7.0
+    image: bitnami/redis-cluster:7.2
     volumes:
       - ./tb-node/redis-cluster-data-2:/bitnami/redis/data
     depends_on:
@@ -50,7 +50,7 @@ services:
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-3:
-    image: bitnami/redis-cluster:7.0
+    image: bitnami/redis-cluster:7.2
     volumes:
       - ./tb-node/redis-cluster-data-3:/bitnami/redis/data
     depends_on:
@@ -61,7 +61,7 @@ services:
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-4:
-    image: bitnami/redis-cluster:7.0
+    image: bitnami/redis-cluster:7.2
     volumes:
       - ./tb-node/redis-cluster-data-4:/bitnami/redis/data
     depends_on:
@@ -72,7 +72,7 @@ services:
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-5:
-    image: bitnami/redis-cluster:7.0
+    image: bitnami/redis-cluster:7.2
     volumes:
       - ./tb-node/redis-cluster-data-5:/bitnami/redis/data
     depends_on:
diff --git a/docker/docker-compose.redis-sentinel.yml b/docker/docker-compose.redis-sentinel.yml
index 54a3789664..a131bc7df9 100644
--- a/docker/docker-compose.redis-sentinel.yml
+++ b/docker/docker-compose.redis-sentinel.yml
@@ -19,7 +19,7 @@ version: '3.0'
 services:
   # Redis sentinel
   redis-master:
-    image: 'bitnami/redis:7.0'
+    image: 'bitnami/redis:7.2'
     volumes:
       - ./tb-node/redis-sentinel-data-master:/bitnami/redis/data
     environment:
@@ -27,7 +27,7 @@ services:
       - 'REDIS_PASSWORD=thingsboard'
 
   redis-slave:
-    image: 'bitnami/redis:7.0'
+    image: 'bitnami/redis:7.2'
     volumes:
       - ./tb-node/redis-sentinel-data-slave:/bitnami/redis/data
     environment:
@@ -39,7 +39,7 @@ services:
       - redis-master
 
   redis-sentinel:
-    image: 'bitnami/redis-sentinel:7.0'
+    image: 'bitnami/redis-sentinel:7.2'
     volumes:
       - ./tb-node/redis-sentinel-data-sentinel:/bitnami/redis/data
     environment:
diff --git a/docker/docker-compose.redis.yml b/docker/docker-compose.redis.yml
index 60170d5eb6..16b16d4a8e 100644
--- a/docker/docker-compose.redis.yml
+++ b/docker/docker-compose.redis.yml
@@ -20,7 +20,7 @@ services:
 # Redis standalone
   redis:
     restart: always
-    image: bitnami/redis:7.0
+    image: bitnami/redis:7.2
     environment:
       # ALLOW_EMPTY_PASSWORD is recommended only for development.
       ALLOW_EMPTY_PASSWORD: "yes"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 18e80b425d..3205c62e57 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -301,7 +301,7 @@ services:
   haproxy:
     restart: always
     container_name: "${LOAD_BALANCER_NAME}"
-    image: thingsboard/haproxy-certbot:2.2.31-alpine3.18
+    image: thingsboard/haproxy-certbot:2.2.33-alpine
     volumes:
      - ./haproxy/config:/config
      - ./haproxy/letsencrypt:/etc/letsencrypt
diff --git a/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.yml b/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.yml
index e5444db329..0407aa3f8c 100644
--- a/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.yml
@@ -20,7 +20,7 @@ services:
 # Redis standalone
   redis:
     restart: always
-    image: bitnami/redis:7.0
+    image: bitnami/redis:7.2
     environment:
       # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - 'ALLOW_EMPTY_PASSWORD=yes'
diff --git a/msa/vc-executor/src/main/resources/tb-vc-executor.yml b/msa/vc-executor/src/main/resources/tb-vc-executor.yml
index 289baaa97a..a92a7eea2b 100644
--- a/msa/vc-executor/src/main/resources/tb-vc-executor.yml
+++ b/msa/vc-executor/src/main/resources/tb-vc-executor.yml
@@ -137,6 +137,8 @@ queue:
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
       # Kafka properties for Core topics
       version-control: "${TB_QUEUE_KAFKA_VC_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
     consumer-stats:
       # Prints lag between consumer group offset and last messages offset in Kafka topics
       enabled: "${TB_QUEUE_KAFKA_CONSUMER_STATS_ENABLED:true}"
@@ -250,6 +252,9 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:true}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:60000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   vc:
     # Default topic name for Kafka, RabbitMQ, etc.
     topic: "${TB_QUEUE_VC_TOPIC:tb_version_control}"
diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml
index 224aea3137..de48596d70 100644
--- a/rule-engine/rule-engine-components/pom.xml
+++ b/rule-engine/rule-engine-components/pom.xml
@@ -138,11 +138,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
index ec2b4a581f..5d7b92615d 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
@@ -17,12 +17,12 @@ package org.thingsboard.rule.engine.action;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.util.concurrent.Futures;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ListeningExecutor;
 import org.thingsboard.rule.engine.TestDbCallbackExecutor;
@@ -49,13 +49,13 @@ import org.thingsboard.server.dao.relation.RelationService;
 
 import java.util.Collections;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbCreateRelationNodeTest {
 
     private TbCreateRelationNode node;
@@ -74,7 +74,7 @@ public class TbCreateRelationNodeTest {
 
     private ListeningExecutor dbExecutor;
 
-    @Before
+    @BeforeEach
     public void before() {
         dbExecutor = new TestDbCallbackExecutor();
     }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java
index 9352d64809..9b3d2dc29b 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java
@@ -47,6 +47,7 @@ import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.tools.TbRateLimits;
 
 import java.util.UUID;
+import java.util.function.BiConsumer;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -65,9 +66,9 @@ public class TbDeviceStateNodeTest {
     @Mock
     private TbContext ctxMock;
     @Mock
-    private static RuleEngineDeviceStateManager deviceStateManagerMock;
+    private RuleEngineDeviceStateManager deviceStateManagerMock;
     @Captor
-    private static ArgumentCaptor<TbCallback> callbackCaptor;
+    private ArgumentCaptor<TbCallback> callbackCaptor;
     private TbDeviceStateNode node;
     private TbDeviceStateNodeConfiguration config;
 
@@ -246,7 +247,7 @@ public class TbDeviceStateNodeTest {
 
     @ParameterizedTest
     @MethodSource
-    public void givenSupportedEventAndDeviceOriginator_whenOnMsg_thenCorrectEventIsSentWithCorrectCallback(TbMsgType supportedEventType, Runnable actionVerification) {
+    public void givenSupportedEventAndDeviceOriginator_whenOnMsg_thenCorrectEventIsSentWithCorrectCallback(TbMsgType supportedEventType, BiConsumer<RuleEngineDeviceStateManager, ArgumentCaptor<TbCallback>> actionVerification) {
         // GIVEN
         given(ctxMock.getTenantId()).willReturn(TENANT_ID);
         given(ctxMock.getDeviceStateNodeRateLimitConfig()).willReturn("1:1");
@@ -262,7 +263,7 @@ public class TbDeviceStateNodeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        actionVerification.run();
+        actionVerification.accept(this.deviceStateManagerMock, this.callbackCaptor);
 
         TbCallback actualCallback = callbackCaptor.getValue();
 
@@ -280,10 +281,10 @@ public class TbDeviceStateNodeTest {
 
     private static Stream<Arguments> givenSupportedEventAndDeviceOriginator_whenOnMsg_thenCorrectEventIsSentWithCorrectCallback() {
         return Stream.of(
-                Arguments.of(TbMsgType.CONNECT_EVENT, (Runnable) () -> then(deviceStateManagerMock).should().onDeviceConnect(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())),
-                Arguments.of(TbMsgType.ACTIVITY_EVENT, (Runnable) () -> then(deviceStateManagerMock).should().onDeviceActivity(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())),
-                Arguments.of(TbMsgType.DISCONNECT_EVENT, (Runnable) () -> then(deviceStateManagerMock).should().onDeviceDisconnect(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())),
-                Arguments.of(TbMsgType.INACTIVITY_EVENT, (Runnable) () -> then(deviceStateManagerMock).should().onDeviceInactivity(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture()))
+                Arguments.of(TbMsgType.CONNECT_EVENT, (BiConsumer<RuleEngineDeviceStateManager, ArgumentCaptor<TbCallback>>) (deviceStateManagerMock, callbackCaptor) -> then(deviceStateManagerMock).should().onDeviceConnect(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())),
+                Arguments.of(TbMsgType.ACTIVITY_EVENT, (BiConsumer<RuleEngineDeviceStateManager, ArgumentCaptor<TbCallback>>) (deviceStateManagerMock, callbackCaptor) -> then(deviceStateManagerMock).should().onDeviceActivity(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())),
+                Arguments.of(TbMsgType.DISCONNECT_EVENT, (BiConsumer<RuleEngineDeviceStateManager, ArgumentCaptor<TbCallback>>) (deviceStateManagerMock, callbackCaptor) -> then(deviceStateManagerMock).should().onDeviceDisconnect(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())),
+                Arguments.of(TbMsgType.INACTIVITY_EVENT, (BiConsumer<RuleEngineDeviceStateManager, ArgumentCaptor<TbCallback>>) (deviceStateManagerMock, callbackCaptor) -> then(deviceStateManagerMock).should().onDeviceInactivity(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture()))
         );
     }
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java
index 6aa1b02fa9..cd191c3707 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java
@@ -16,8 +16,7 @@
 package org.thingsboard.rule.engine.credentials;
 
 import org.apache.commons.io.FileUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -49,14 +48,14 @@ public class CertPemCredentialsTest {
 
         List<X509Certificate> x509Certificates = SslUtil.readCertFile(fileContent);
 
-        Assert.assertEquals(4, x509Certificates.size());
-        Assert.assertEquals("CN=*.thingsboard.cloud, O=\"ThingsBoard, Inc.\", ST=New York, C=US",
+        Assertions.assertEquals(4, x509Certificates.size());
+        Assertions.assertEquals("CN=*.thingsboard.cloud, O=\"ThingsBoard, Inc.\", ST=New York, C=US",
                 x509Certificates.get(0).getSubjectDN().getName());
-        Assert.assertEquals("CN=Sectigo ECC Organization Validation Secure Server CA, O=Sectigo Limited, L=Salford, ST=Greater Manchester, C=GB",
+        Assertions.assertEquals("CN=Sectigo ECC Organization Validation Secure Server CA, O=Sectigo Limited, L=Salford, ST=Greater Manchester, C=GB",
                 x509Certificates.get(1).getSubjectDN().getName());
-        Assert.assertEquals("CN=USERTrust ECC Certification Authority, O=The USERTRUST Network, L=Jersey City, ST=New Jersey, C=US",
+        Assertions.assertEquals("CN=USERTrust ECC Certification Authority, O=The USERTRUST Network, L=Jersey City, ST=New Jersey, C=US",
                 x509Certificates.get(2).getSubjectDN().getName());
-        Assert.assertEquals("CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB",
+        Assertions.assertEquals("CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB",
                 x509Certificates.get(3).getSubjectDN().getName());
     }
 
@@ -66,8 +65,8 @@ public class CertPemCredentialsTest {
 
         List<X509Certificate> x509Certificates = SslUtil.readCertFile(fileContent);
 
-        Assert.assertEquals(1, x509Certificates.size());
-        Assert.assertEquals("CN=*.thingsboard.cloud, O=\"ThingsBoard, Inc.\", ST=New York, C=US",
+        Assertions.assertEquals(1, x509Certificates.size());
+        Assertions.assertEquals("CN=*.thingsboard.cloud, O=\"ThingsBoard, Inc.\", ST=New York, C=US",
                 x509Certificates.get(0).getSubjectDN().getName());
     }
 
@@ -77,7 +76,7 @@ public class CertPemCredentialsTest {
 
         List<X509Certificate> x509Certificates = SslUtil.readCertFile(fileContent);
 
-        Assert.assertEquals(0, x509Certificates.size());
+        Assertions.assertEquals(0, x509Certificates.size());
     }
 
     private static Stream<Arguments> testLoadKeyStore() {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java
index 5f57f7f5e3..b8a70991bc 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java
@@ -16,13 +16,13 @@
 package org.thingsboard.rule.engine.edge;
 
 import com.google.common.util.concurrent.SettableFuture;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ListeningExecutor;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -50,7 +50,7 @@ import java.util.UUID;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbMsgPushToEdgeNodeTest {
 
     private static final List<TbMsgType> MISC_EVENTS = List.of(TbMsgType.CONNECT_EVENT, TbMsgType.DISCONNECT_EVENT,
@@ -71,7 +71,7 @@ public class TbMsgPushToEdgeNodeTest {
     @Mock
     private ListeningExecutor dbCallbackExecutor;
 
-    @Before
+    @BeforeEach
     public void setUp() throws TbNodeException {
         node = new TbMsgPushToEdgeNode();
         TbMsgPushToEdgeNodeConfiguration config = new TbMsgPushToEdgeNodeConfiguration().defaultConfiguration();
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
index 903944025a..b991b7b220 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
@@ -17,11 +17,11 @@ package org.thingsboard.rule.engine.filter;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.util.concurrent.Futures;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.ScriptEngine;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -38,12 +38,12 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 
 import javax.script.ScriptException;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbJsFilterNodeTest {
 
     private TbJsFilterNode node;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
index d679e42ba0..ff7a40644b 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
@@ -18,10 +18,10 @@ package org.thingsboard.rule.engine.filter;
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.Futures;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.ScriptEngine;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -38,7 +38,7 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbJsSwitchNodeTest {
 
     private TbJsSwitchNode node;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GeoUtilTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GeoUtilTest.java
index 2172288236..8d39105d30 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GeoUtilTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GeoUtilTest.java
@@ -15,12 +15,12 @@
  */
 package org.thingsboard.rule.engine.geo;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class GeoUtilTest {
 
     public static final String SIMPLE_RECT = "[[51.903762928405555,23.642220786948297],[44.669801219635644,41.83345155830211]]";
@@ -47,117 +47,117 @@ public class GeoUtilTest {
 
     @Test
     public void testPointsInSimplePolygons() {
-        Assert.assertTrue("Polygon " + SIMPLE_RECT + " must contain the dot " + POINT_INSIDE_SIMPLE_RECT_CENTER,
-                GeoUtil.contains(SIMPLE_RECT, POINT_INSIDE_SIMPLE_RECT_CENTER)
-        );
-        Assert.assertTrue("Polygon " + SIMPLE_RECT + " must contain the dot " + POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER,
-                GeoUtil.contains(SIMPLE_RECT, POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER)
-        );
-        Assert.assertTrue("Polygon " + SIMPLE_RECT_WITH_HOLE_IN_CENTER + " must contain the dot "
-                        + POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER,
-                GeoUtil.contains(SIMPLE_RECT_WITH_HOLE_IN_CENTER, POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER)
-        );
+        Assertions.assertTrue(GeoUtil.contains(SIMPLE_RECT, POINT_INSIDE_SIMPLE_RECT_CENTER),
+                "Polygon " + SIMPLE_RECT + " must contain the dot " + POINT_INSIDE_SIMPLE_RECT_CENTER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SIMPLE_RECT, POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER),
+                "Polygon " + SIMPLE_RECT + " must contain the dot " + POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SIMPLE_RECT_WITH_HOLE_IN_CENTER, POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER),
+                "Polygon " + SIMPLE_RECT_WITH_HOLE_IN_CENTER + " must contain the dot "
+                                + POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER
+                );
 
-        Assert.assertFalse("Polygon " + SIMPLE_RECT + " must not contain the dot "
-                        + POINT_OUTSIDE_SIMPLE_RECT,
-                GeoUtil.contains(SIMPLE_RECT, POINT_OUTSIDE_SIMPLE_RECT)
-        );
-        Assert.assertFalse("Polygon " + SIMPLE_RECT_WITH_HOLE_IN_CENTER + " must not contain the dot "
-                        + POINT_OUTSIDE_SIMPLE_RECT,
-                GeoUtil.contains(SIMPLE_RECT_WITH_HOLE_IN_CENTER, POINT_OUTSIDE_SIMPLE_RECT)
-        );
-        Assert.assertFalse("Polygon " + SIMPLE_RECT_WITH_HOLE_IN_CENTER + " must not contain the dot "
-                        + POINT_INSIDE_SIMPLE_RECT_CENTER,
-                GeoUtil.contains(SIMPLE_RECT_WITH_HOLE_IN_CENTER, POINT_INSIDE_SIMPLE_RECT_CENTER)
-        );
+        Assertions.assertFalse(GeoUtil.contains(SIMPLE_RECT, POINT_OUTSIDE_SIMPLE_RECT),
+                "Polygon " + SIMPLE_RECT + " must not contain the dot "
+                                + POINT_OUTSIDE_SIMPLE_RECT
+                );
+        Assertions.assertFalse(GeoUtil.contains(SIMPLE_RECT_WITH_HOLE_IN_CENTER, POINT_OUTSIDE_SIMPLE_RECT),
+                "Polygon " + SIMPLE_RECT_WITH_HOLE_IN_CENTER + " must not contain the dot "
+                                + POINT_OUTSIDE_SIMPLE_RECT
+                );
+        Assertions.assertFalse(GeoUtil.contains(SIMPLE_RECT_WITH_HOLE_IN_CENTER, POINT_INSIDE_SIMPLE_RECT_CENTER),
+                "Polygon " + SIMPLE_RECT_WITH_HOLE_IN_CENTER + " must not contain the dot "
+                                + POINT_INSIDE_SIMPLE_RECT_CENTER
+                );
     }
 
     @Test
     public void testPointsInComplexPolygons() {
-        Assert.assertTrue("Polygon " + SAND_CLOCK + " must contain the dot " + POINT_INSIDE_SAND_CLOCK_CENTER,
-                GeoUtil.contains(SAND_CLOCK, POINT_INSIDE_SAND_CLOCK_CENTER)
-        );
-        Assert.assertTrue("Polygon " + SAND_CLOCK + " must contain the dot " + POINT_INSIDE_SAND_CLOCK_NEAR_BORDER,
-                GeoUtil.contains(SAND_CLOCK, POINT_INSIDE_SAND_CLOCK_NEAR_BORDER)
-        );
-        Assert.assertTrue("Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must contain the dot "
-                        + POINT_INSIDE_SAND_CLOCK_NEAR_BORDER,
-                GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_INSIDE_SAND_CLOCK_NEAR_BORDER)
-        );
+        Assertions.assertTrue(GeoUtil.contains(SAND_CLOCK, POINT_INSIDE_SAND_CLOCK_CENTER),
+                "Polygon " + SAND_CLOCK + " must contain the dot " + POINT_INSIDE_SAND_CLOCK_CENTER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SAND_CLOCK, POINT_INSIDE_SAND_CLOCK_NEAR_BORDER),
+                "Polygon " + SAND_CLOCK + " must contain the dot " + POINT_INSIDE_SAND_CLOCK_NEAR_BORDER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_INSIDE_SAND_CLOCK_NEAR_BORDER),
+                "Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must contain the dot "
+                                + POINT_INSIDE_SAND_CLOCK_NEAR_BORDER
+                );
 
-        Assert.assertFalse("Polygon " + SAND_CLOCK + " must not contain the dot "
-                        + POINT_OUTSIDE_SAND_CLOCK_1,
-                GeoUtil.contains(SAND_CLOCK, POINT_OUTSIDE_SAND_CLOCK_1)
-        );
-        Assert.assertFalse("Polygon " + SAND_CLOCK + " must not contain the dot "
-                        + POINT_OUTSIDE_SAND_CLOCK_2,
-                GeoUtil.contains(SAND_CLOCK, POINT_OUTSIDE_SAND_CLOCK_2)
-        );
-        Assert.assertFalse("Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must not contain the dot "
-                        + POINT_INSIDE_SAND_CLOCK_CENTER,
-                GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_INSIDE_SAND_CLOCK_CENTER)
-        );
-        Assert.assertFalse("Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must not contain the dot "
-                        + POINT_OUTSIDE_SAND_CLOCK_1,
-                GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_OUTSIDE_SAND_CLOCK_1)
-        );
-        Assert.assertFalse("Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must not contain the dot "
-                        + POINT_OUTSIDE_SAND_CLOCK_2,
-                GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_OUTSIDE_SAND_CLOCK_2)
-        );
+        Assertions.assertFalse(GeoUtil.contains(SAND_CLOCK, POINT_OUTSIDE_SAND_CLOCK_1),
+                "Polygon " + SAND_CLOCK + " must not contain the dot "
+                                + POINT_OUTSIDE_SAND_CLOCK_1
+                );
+        Assertions.assertFalse(GeoUtil.contains(SAND_CLOCK, POINT_OUTSIDE_SAND_CLOCK_2),
+                "Polygon " + SAND_CLOCK + " must not contain the dot "
+                                + POINT_OUTSIDE_SAND_CLOCK_2
+                );
+        Assertions.assertFalse(GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_INSIDE_SAND_CLOCK_CENTER),
+                "Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must not contain the dot "
+                                + POINT_INSIDE_SAND_CLOCK_CENTER
+                );
+        Assertions.assertFalse(GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_OUTSIDE_SAND_CLOCK_1),
+                "Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must not contain the dot "
+                                + POINT_OUTSIDE_SAND_CLOCK_1
+                );
+        Assertions.assertFalse(GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_OUTSIDE_SAND_CLOCK_2),
+                "Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must not contain the dot "
+                                + POINT_OUTSIDE_SAND_CLOCK_2
+                );
     }
 
     @Test
     public void testPointsInSelfIntersectingPolygons() {
-        Assert.assertTrue("Polygon " + SELF_INTERSECTING + " must contain the dot "
-                        + POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER,
-                GeoUtil.contains(SELF_INTERSECTING, POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER)
-        );
-        Assert.assertTrue("Polygon " + SELF_INTERSECTING + " must contain the dot "
-                        + POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER,
-                GeoUtil.contains(SELF_INTERSECTING, POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER)
-        );
-        Assert.assertTrue("Polygon " + SELF_INTERSECTING + " must contain the dot "
-                        + POINT_INSIDE_SELF_INTERSECTING_NEAR_BORDER,
-                GeoUtil.contains(SELF_INTERSECTING, POINT_INSIDE_SELF_INTERSECTING_NEAR_BORDER)
-        );
-        Assert.assertTrue("Polygon " + SELF_INTERSECTING_WITH_HOLES + " must contain the dot "
-                        + POINT_INSIDE_SAND_CLOCK_NEAR_BORDER,
-                GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_INSIDE_SELF_INTERSECTING_NEAR_BORDER)
-        );
+        Assertions.assertTrue(GeoUtil.contains(SELF_INTERSECTING, POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER),
+                "Polygon " + SELF_INTERSECTING + " must contain the dot "
+                                + POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SELF_INTERSECTING, POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER),
+                "Polygon " + SELF_INTERSECTING + " must contain the dot "
+                                + POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SELF_INTERSECTING, POINT_INSIDE_SELF_INTERSECTING_NEAR_BORDER),
+                "Polygon " + SELF_INTERSECTING + " must contain the dot "
+                                + POINT_INSIDE_SELF_INTERSECTING_NEAR_BORDER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_INSIDE_SELF_INTERSECTING_NEAR_BORDER),
+                "Polygon " + SELF_INTERSECTING_WITH_HOLES + " must contain the dot "
+                                + POINT_INSIDE_SAND_CLOCK_NEAR_BORDER
+                );
 
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING + " must not contain the dot "
-                        + POINT_OUTSIDE_SELF_INTERSECTING_1,
-                GeoUtil.contains(SELF_INTERSECTING, POINT_OUTSIDE_SELF_INTERSECTING_1)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING + " must not contain the dot "
-                        + POINT_OUTSIDE_SELF_INTERSECTING_2,
-                GeoUtil.contains(SELF_INTERSECTING, POINT_OUTSIDE_SELF_INTERSECTING_2)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING + " must not contain the dot "
-                        + POINT_OUTSIDE_SELF_INTERSECTING_3,
-                GeoUtil.contains(SELF_INTERSECTING, POINT_OUTSIDE_SELF_INTERSECTING_3)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
-                        + POINT_OUTSIDE_SELF_INTERSECTING_1,
-                GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_OUTSIDE_SELF_INTERSECTING_1)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
-                        + POINT_OUTSIDE_SELF_INTERSECTING_2,
-                GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_OUTSIDE_SELF_INTERSECTING_2)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
-                        + POINT_OUTSIDE_SELF_INTERSECTING_3,
-                GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_OUTSIDE_SELF_INTERSECTING_3)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
-                        + POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER,
-                GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
-                        + POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER,
-                GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER)
-        );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING, POINT_OUTSIDE_SELF_INTERSECTING_1),
+                "Polygon " + SELF_INTERSECTING + " must not contain the dot "
+                                + POINT_OUTSIDE_SELF_INTERSECTING_1
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING, POINT_OUTSIDE_SELF_INTERSECTING_2),
+                "Polygon " + SELF_INTERSECTING + " must not contain the dot "
+                                + POINT_OUTSIDE_SELF_INTERSECTING_2
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING, POINT_OUTSIDE_SELF_INTERSECTING_3),
+                "Polygon " + SELF_INTERSECTING + " must not contain the dot "
+                                + POINT_OUTSIDE_SELF_INTERSECTING_3
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_OUTSIDE_SELF_INTERSECTING_1),
+                "Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
+                                + POINT_OUTSIDE_SELF_INTERSECTING_1
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_OUTSIDE_SELF_INTERSECTING_2),
+                "Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
+                                + POINT_OUTSIDE_SELF_INTERSECTING_2
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_OUTSIDE_SELF_INTERSECTING_3),
+                "Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
+                                + POINT_OUTSIDE_SELF_INTERSECTING_3
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER),
+                "Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
+                                + POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER),
+                "Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
+                                + POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER
+                );
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathArgumentValueTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathArgumentValueTest.java
index 5a6fffbb18..073a9fb393 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathArgumentValueTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathArgumentValueTest.java
@@ -16,8 +16,8 @@
 package org.thingsboard.rule.engine.math;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 
@@ -32,7 +32,7 @@ public class TbMathArgumentValueTest {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");
         tbMathArgument.setDefaultValue(5.0);
         TbMathArgumentValue result = TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.ofNullable(JacksonUtil.newObjectNode()));
-        Assert.assertEquals(5.0, result.getValue(), 0d);
+        Assertions.assertEquals(5.0, result.getValue(), 0d);
     }
 
     @Test
@@ -41,14 +41,14 @@ public class TbMathArgumentValueTest {
         Throwable thrown = assertThrows(RuntimeException.class, () -> {
             TbMathArgumentValue result = TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.empty());
         });
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 
     @Test
     public void test_fromMessageBody_then_noKey() {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");
         Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.ofNullable(JacksonUtil.newObjectNode())));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 
     @Test
@@ -59,12 +59,12 @@ public class TbMathArgumentValueTest {
 
         //null value
         Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.of(msgData)));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
 
         //empty value
         msgData.put("TestKey", "");
         thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.of(msgData)));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 
     @Test
@@ -75,40 +75,40 @@ public class TbMathArgumentValueTest {
 
         //string value
         Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.of(msgData)));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
 
         //object value
         msgData.set("TestKey", JacksonUtil.newObjectNode());
         thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.of(msgData)));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 
     @Test
     public void test_fromMessageMetadata_then_noKey() {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");
         Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageMetadata(tbMathArgument, tbMathArgument.getKey(), new TbMsgMetaData()));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 
     @Test
     public void test_fromMessageMetadata_then_valueEmpty() {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");
         Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageMetadata(tbMathArgument, tbMathArgument.getKey(), null));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 
     @Test
     public void test_fromString_thenOK() {
         var value = "5.0";
         TbMathArgumentValue result = TbMathArgumentValue.fromString(value);
-        Assert.assertNotNull(result);
-        Assert.assertEquals(5.0, result.getValue(), 0d);
+        Assertions.assertNotNull(result);
+        Assertions.assertEquals(5.0, result.getValue(), 0d);
     }
 
     @Test
     public void test_fromString_then_failure() {
         var value = "Test";
         Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromString(value));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java
index 26b9c9a30d..9eb74b5627 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java
@@ -18,14 +18,14 @@ package org.thingsboard.rule.engine.metadata;
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.util.concurrent.Futures;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.AbstractListeningExecutor;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -33,7 +33,6 @@ import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.util.TbMsgSource;
 import org.thingsboard.server.common.data.AttributeScope;
-import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -55,17 +54,18 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbGetAttributesNodeTest {
 
     private static final EntityId ORIGINATOR = new DeviceId(Uuids.timeBased());
@@ -86,7 +86,7 @@ public class TbGetAttributesNodeTest {
     private long ts;
     private TbGetAttributesNode node;
 
-    @Before
+    @BeforeEach
     public void before() throws TbNodeException {
         dbExecutor = new AbstractListeningExecutor() {
             @Override
@@ -96,10 +96,10 @@ public class TbGetAttributesNodeTest {
         };
         dbExecutor.init();
 
-        when(ctxMock.getAttributesService()).thenReturn(attributesServiceMock);
-        when(ctxMock.getTimeseriesService()).thenReturn(timeseriesServiceMock);
-        when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
-        when(ctxMock.getDbCallbackExecutor()).thenReturn(dbExecutor);
+        lenient().when(ctxMock.getAttributesService()).thenReturn(attributesServiceMock);
+        lenient().when(ctxMock.getTimeseriesService()).thenReturn(timeseriesServiceMock);
+        lenient().when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
+        lenient().when(ctxMock.getDbCallbackExecutor()).thenReturn(dbExecutor);
 
         clientAttributes = getAttributeNames("client");
         serverAttributes = getAttributeNames("server");
@@ -107,20 +107,20 @@ public class TbGetAttributesNodeTest {
         tsKeys = List.of("temperature", "humidity", "unknown");
         ts = System.currentTimeMillis();
 
-        when(attributesServiceMock.find(TENANT_ID, ORIGINATOR, AttributeScope.CLIENT_SCOPE, clientAttributes))
+        lenient().when(attributesServiceMock.find(TENANT_ID, ORIGINATOR, AttributeScope.CLIENT_SCOPE, clientAttributes))
                 .thenReturn(Futures.immediateFuture(getListAttributeKvEntry(clientAttributes, ts)));
 
-        when(attributesServiceMock.find(TENANT_ID, ORIGINATOR, AttributeScope.SERVER_SCOPE, serverAttributes))
+        lenient().when(attributesServiceMock.find(TENANT_ID, ORIGINATOR, AttributeScope.SERVER_SCOPE, serverAttributes))
                 .thenReturn(Futures.immediateFuture(getListAttributeKvEntry(serverAttributes, ts)));
 
-        when(attributesServiceMock.find(TENANT_ID, ORIGINATOR, AttributeScope.SHARED_SCOPE, sharedAttributes))
+        lenient().when(attributesServiceMock.find(TENANT_ID, ORIGINATOR, AttributeScope.SHARED_SCOPE, sharedAttributes))
                 .thenReturn(Futures.immediateFuture(getListAttributeKvEntry(sharedAttributes, ts)));
 
-        when(timeseriesServiceMock.findLatest(TENANT_ID, ORIGINATOR, tsKeys))
+        lenient().when(timeseriesServiceMock.findLatest(TENANT_ID, ORIGINATOR, tsKeys))
                 .thenReturn(Futures.immediateFuture(getListTsKvEntry(tsKeys, ts)));
     }
 
-    @After
+    @AfterEach
     public void after() {
         dbExecutor.destroy();
     }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
index f40ab2bed8..ac6bb38be5 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
@@ -16,7 +16,7 @@
 package org.thingsboard.rule.engine.metadata;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.util.TbPair;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
index 990688611e..6ecd1b6eb9 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
@@ -15,8 +15,8 @@
  */
 package org.thingsboard.rule.engine.metadata;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -37,7 +37,7 @@ public class TbGetTelemetryNodeTest {
     TbNodeConfiguration nodeConfiguration;
     TbContext ctx;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         ctx = mock(TbContext.class);
         node = spy(new TbGetTelemetryNode());
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/AlarmStateTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/AlarmStateTest.java
index 7cc6781abb..08d445b89d 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/AlarmStateTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/AlarmStateTest.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.rule.engine.profile;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionSpec;
@@ -28,9 +28,9 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.Mockito.mock;
 
 public class AlarmStateTest {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java
index 0d2002661f..5cee1aa5b3 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java
@@ -16,8 +16,8 @@
 package org.thingsboard.rule.engine.profile;
 
 import com.google.common.util.concurrent.Futures;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
@@ -69,7 +69,7 @@ public class DeviceStateTest {
 
     private TbContext ctx;
 
-    @Before
+    @BeforeEach
     public void beforeEach() {
         ctx = mock(TbContext.class);
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java
index 645613f553..19eabf0bdc 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java
@@ -18,11 +18,11 @@ package org.thingsboard.rule.engine.profile;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
 import org.thingsboard.rule.engine.api.RuleEngineDeviceProfileCache;
@@ -86,7 +86,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbDeviceProfileNodeTest {
 
     private TbDeviceProfileNode node;
@@ -1700,10 +1700,10 @@ public class TbDeviceProfileNodeTest {
     private void init() throws TbNodeException {
         Mockito.when(ctx.getTenantId()).thenReturn(tenantId);
         Mockito.when(ctx.getDeviceProfileCache()).thenReturn(cache);
-        Mockito.when(ctx.getTimeseriesService()).thenReturn(timeseriesService);
-        Mockito.when(ctx.getAlarmService()).thenReturn(alarmService);
+        Mockito.lenient().when(ctx.getTimeseriesService()).thenReturn(timeseriesService);
+        Mockito.lenient().when(ctx.getAlarmService()).thenReturn(alarmService);
         Mockito.when(ctx.getDeviceService()).thenReturn(deviceService);
-        Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
+        Mockito.lenient().when(ctx.getAttributesService()).thenReturn(attributesService);
         TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.newObjectNode());
         node = new TbDeviceProfileNode();
         node.init(ctx, nodeConfiguration);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
index 78c68a24be..98695c1570 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
@@ -25,13 +25,13 @@ import org.apache.http.impl.bootstrap.HttpServer;
 import org.apache.http.impl.bootstrap.ServerBootstrap;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpRequestHandler;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
@@ -51,12 +51,12 @@ import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.verify;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbRestApiCallNodeTest {
 
     private TbRestApiCallNode restNode;
@@ -91,7 +91,7 @@ public class TbRestApiCallNodeTest {
         }
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         if (server != null) {
             server.stop();
@@ -108,9 +108,9 @@ public class TbRestApiCallNodeTest {
             public void handle(HttpRequest request, HttpResponse response, HttpContext context)
                     throws HttpException, IOException {
                 try {
-                    assertEquals("Request path matches", request.getRequestLine().getUri(), path);
-                    assertTrue("Custom header included", request.containsHeader("Foo"));
-                    assertEquals("Custom header value", "Bar", request.getFirstHeader("Foo").getValue());
+                    assertEquals(request.getRequestLine().getUri(), path, "Request path matches");
+                    assertTrue(request.containsHeader("Foo"), "Custom header included");
+                    assertEquals("Bar", request.getFirstHeader("Foo").getValue(), "Custom header value");
                     response.setStatusCode(200);
                     new Thread(new Runnable() {
                         @Override
@@ -142,7 +142,7 @@ public class TbRestApiCallNodeTest {
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, TbMsg.EMPTY_JSON_OBJECT, ruleChainId, ruleNodeId);
         restNode.onMsg(ctx, msg);
 
-        assertTrue("Server handled request", latch.await(10, TimeUnit.SECONDS));
+        assertTrue(latch.await(10, TimeUnit.SECONDS), "Server handled request");
 
         ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
@@ -163,15 +163,15 @@ public class TbRestApiCallNodeTest {
             public void handle(HttpRequest request, HttpResponse response, HttpContext context)
                     throws HttpException, IOException {
                 try {
-                    assertEquals("Request path matches", path, request.getRequestLine().getUri());
-                    assertTrue("Content-Type included", request.containsHeader("Content-Type"));
-                    assertEquals("Content-Type value", "text/plain;charset=UTF-8",
-                            request.getFirstHeader("Content-Type").getValue());
-                    assertTrue("Content-Length included", request.containsHeader("Content-Length"));
-                    assertEquals("Content-Length value", "2",
-                            request.getFirstHeader("Content-Length").getValue());
-                    assertTrue("Custom header included", request.containsHeader("Foo"));
-                    assertEquals("Custom header value", "Bar", request.getFirstHeader("Foo").getValue());
+                    assertEquals(path, request.getRequestLine().getUri(), "Request path matches");
+                    assertTrue(request.containsHeader("Content-Type"), "Content-Type included");
+                    assertEquals("text/plain;charset=UTF-8",
+                            request.getFirstHeader("Content-Type").getValue(), "Content-Type value");
+                    assertTrue(request.containsHeader("Content-Length"), "Content-Length included");
+                    assertEquals("2",
+                            request.getFirstHeader("Content-Length").getValue(), "Content-Length value");
+                    assertTrue(request.containsHeader("Foo"), "Custom header included");
+                    assertEquals("Bar", request.getFirstHeader("Foo").getValue(), "Custom header value");
                     response.setStatusCode(200);
                     new Thread(new Runnable() {
                         @Override
@@ -203,7 +203,7 @@ public class TbRestApiCallNodeTest {
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, TbMsg.EMPTY_JSON_OBJECT, ruleChainId, ruleNodeId);
         restNode.onMsg(ctx, msg);
 
-        assertTrue("Server handled request", latch.await(10, TimeUnit.SECONDS));
+        assertTrue(latch.await(10, TimeUnit.SECONDS), "Server handled request");
 
         ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java
index 454c1a9fe6..db632fe3c7 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java
@@ -16,12 +16,12 @@
 package org.thingsboard.rule.engine.rpc;
 
 import com.google.common.util.concurrent.SettableFuture;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ListeningExecutor;
 import org.thingsboard.rule.engine.api.RuleEngineRpcService;
@@ -43,7 +43,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbSendRPCReplyNodeTest {
 
     private static final String DUMMY_SERVICE_ID = "testServiceId";
@@ -68,7 +68,7 @@ public class TbSendRPCReplyNodeTest {
     @Mock
     private ListeningExecutor listeningExecutor;
 
-    @Before
+    @BeforeEach
     public void setUp() throws TbNodeException {
         node = new TbSendRPCReplyNode();
         TbSendRpcReplyNodeConfiguration config = new TbSendRpcReplyNodeConfiguration().defaultConfiguration();
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java
index e9803289bb..952a566695 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java
@@ -17,12 +17,12 @@ package org.thingsboard.rule.engine.transform;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.util.concurrent.Futures;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ListeningExecutor;
 import org.thingsboard.rule.engine.TestDbCallbackExecutor;
@@ -43,14 +43,14 @@ import org.thingsboard.server.dao.asset.AssetService;
 
 import java.util.NoSuchElementException;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbChangeOriginatorNodeTest {
 
     private static final String CUSTOMER_SOURCE = "CUSTOMER";
@@ -64,14 +64,14 @@ public class TbChangeOriginatorNodeTest {
 
     private ListeningExecutor dbExecutor;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    public void before() throws TbNodeException {
         dbExecutor = new TestDbCallbackExecutor();
+        init();
     }
 
     @Test
-    public void originatorCanBeChangedToCustomerId() throws TbNodeException {
-        init();
+    public void originatorCanBeChangedToCustomerId() {
         AssetId assetId = new AssetId(Uuids.timeBased());
         CustomerId customerId = new CustomerId(Uuids.timeBased());
         Asset asset = new Asset();
@@ -95,8 +95,7 @@ public class TbChangeOriginatorNodeTest {
     }
 
     @Test
-    public void newChainCanBeStarted() throws TbNodeException {
-        init();
+    public void newChainCanBeStarted() {
         AssetId assetId = new AssetId(Uuids.timeBased());
         CustomerId customerId = new CustomerId(Uuids.timeBased());
         Asset asset = new Asset();
@@ -119,8 +118,7 @@ public class TbChangeOriginatorNodeTest {
     }
 
     @Test
-    public void exceptionThrownIfCannotFindNewOriginator() throws TbNodeException {
-        init();
+    public void exceptionThrownIfCannotFindNewOriginator() {
         AssetId assetId = new AssetId(Uuids.timeBased());
         CustomerId customerId = new CustomerId(Uuids.timeBased());
         Asset asset = new Asset();
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
index a410b84532..98ecc237b6 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
@@ -17,11 +17,11 @@ package org.thingsboard.rule.engine.transform;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.util.concurrent.Futures;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.ScriptEngine;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -37,12 +37,12 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 
 import java.util.Collections;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbTransformMsgNodeTest {
 
     private TbTransformMsgNode node;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java
index e06be15fe6..47fa03e08e 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java
@@ -15,13 +15,13 @@
  */
 package org.thingsboard.rule.engine.util;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.AbstractListeningExecutor;
 import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
 import org.thingsboard.rule.engine.api.RuleEngineApiUsageStateService;
@@ -88,7 +88,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TenantIdLoaderTest {
 
     @Mock
@@ -145,7 +145,7 @@ public class TenantIdLoaderTest {
     private NotificationId notificationId;
     private AbstractListeningExecutor dbExecutor;
 
-    @Before
+    @BeforeEach
     public void before() {
         dbExecutor = new AbstractListeningExecutor() {
             @Override
@@ -165,7 +165,7 @@ public class TenantIdLoaderTest {
         }
     }
 
-    @After
+    @AfterEach
     public void after() {
         dbExecutor.destroy();
     }
@@ -384,9 +384,9 @@ public class TenantIdLoaderTest {
             TenantId targetTenantId = TenantIdLoader.findTenantId(ctx, entityId);
             String msg = "Check entity type <" + entityType.name() + ">:";
             if (equals) {
-                Assert.assertEquals(msg, targetTenantId, checkTenantId);
+                Assertions.assertEquals(targetTenantId, checkTenantId, msg);
             } else {
-                Assert.assertNotEquals(msg, targetTenantId, checkTenantId);
+                Assertions.assertNotEquals(targetTenantId, checkTenantId, msg);
             }
         }
     }
diff --git a/rule-engine/rule-engine-components/src/test/resources/junit-platform.properties b/rule-engine/rule-engine-components/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/transport/coap/src/main/resources/tb-coap-transport.yml b/transport/coap/src/main/resources/tb-coap-transport.yml
index 86ed3a269b..17a6a53aca 100644
--- a/transport/coap/src/main/resources/tb-coap-transport.yml
+++ b/transport/coap/src/main/resources/tb-coap-transport.yml
@@ -299,6 +299,8 @@ queue:
       transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
       # Kafka properties for Notifications topics
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
   aws_sqs:
     # Use the default credentials provider for AWS SQS
     use_default_credential_provider_chain: "${TB_QUEUE_AWS_SQS_USE_DEFAULT_CREDENTIAL_PROVIDER_CHAIN:false}"
@@ -420,6 +422,9 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:false}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   js:
     # JS Eval request topic
     request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
diff --git a/transport/http/src/main/resources/tb-http-transport.yml b/transport/http/src/main/resources/tb-http-transport.yml
index 8311dd90a1..4252dfac06 100644
--- a/transport/http/src/main/resources/tb-http-transport.yml
+++ b/transport/http/src/main/resources/tb-http-transport.yml
@@ -272,6 +272,8 @@ queue:
       transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
       # Kafka properties for Notifications topics
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
   aws_sqs:
     # Use default credentials provider for AWS SQS
     use_default_credential_provider_chain: "${TB_QUEUE_AWS_SQS_USE_DEFAULT_CREDENTIAL_PROVIDER_CHAIN:false}"
@@ -394,6 +396,9 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:false}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   js:
     # JS Eval request topic
     request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
diff --git a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
index 1070f17746..cf1ba51240 100644
--- a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
+++ b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
@@ -377,6 +377,8 @@ queue:
       transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
       # Kafka properties for Notifications topics
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
   aws_sqs:
     # Use the default credentials provider for AWS SQS
     use_default_credential_provider_chain: "${TB_QUEUE_AWS_SQS_USE_DEFAULT_CREDENTIAL_PROVIDER_CHAIN:false}"
@@ -496,6 +498,9 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:false}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   js:
     # JS Eval request topic
     request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
diff --git a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
index 86c7890f28..d210138852 100644
--- a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
+++ b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
@@ -304,6 +304,8 @@ queue:
       transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
       # Kafka properties for Notifications topics
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
   aws_sqs:
     # Use the default credentials provider for AWS SQS
     use_default_credential_provider_chain: "${TB_QUEUE_AWS_SQS_USE_DEFAULT_CREDENTIAL_PROVIDER_CHAIN:false}"
@@ -425,6 +427,9 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:false}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   js:
     # JS Eval request topic
     request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
diff --git a/transport/snmp/src/main/resources/tb-snmp-transport.yml b/transport/snmp/src/main/resources/tb-snmp-transport.yml
index 72bef5183b..76f6abdb61 100644
--- a/transport/snmp/src/main/resources/tb-snmp-transport.yml
+++ b/transport/snmp/src/main/resources/tb-snmp-transport.yml
@@ -254,6 +254,8 @@ queue:
       transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
       # Kafka properties for Notifications topics
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
     consumer-stats:
       # Prints lag between consumer group offset and last messages offset in Kafka topics
       enabled: "${TB_QUEUE_KAFKA_CONSUMER_STATS_ENABLED:true}"
@@ -382,6 +384,9 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:false}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   js:
     # JS Eval request topic
     request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts
index 9e7c91c114..0ce07406c9 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts
@@ -120,6 +120,12 @@ import {
 import {
   PieChartBasicConfigComponent
 } from '@home/components/widget/config/basic/chart/pie-chart-basic-config.component';
+import {
+  BarChartBasicConfigComponent
+} from '@home/components/widget/config/basic/chart/bar-chart-basic-config.component';
+import {
+  PolarAreaChartBasicConfigComponent
+} from '@home/components/widget/config/basic/chart/polar-area-chart-basic-config.component';
 
 @NgModule({
   declarations: [
@@ -159,7 +165,9 @@ import {
     ComparisonKeyRowComponent,
     ComparisonKeysTableComponent,
     StatusWidgetBasicConfigComponent,
-    PieChartBasicConfigComponent
+    PieChartBasicConfigComponent,
+    BarChartBasicConfigComponent,
+    PolarAreaChartBasicConfigComponent
   ],
   imports: [
     CommonModule,
@@ -201,7 +209,9 @@ import {
     ToggleButtonBasicConfigComponent,
     TimeSeriesChartBasicConfigComponent,
     StatusWidgetBasicConfigComponent,
-    PieChartBasicConfigComponent
+    PieChartBasicConfigComponent,
+    BarChartBasicConfigComponent,
+    PolarAreaChartBasicConfigComponent
   ]
 })
 export class BasicWidgetConfigModule {
@@ -237,5 +247,7 @@ export const basicWidgetConfigComponentsMap: {[key: string]: Type<IBasicWidgetCo
   'tb-toggle-button-basic-config': ToggleButtonBasicConfigComponent,
   'tb-time-series-chart-basic-config': TimeSeriesChartBasicConfigComponent,
   'tb-status-widget-basic-config': StatusWidgetBasicConfigComponent,
-  'tb-pie-chart-basic-config': PieChartBasicConfigComponent
+  'tb-pie-chart-basic-config': PieChartBasicConfigComponent,
+  'tb-bar-chart-basic-config': BarChartBasicConfigComponent,
+  'tb-polar-area-chart-basic-config': PolarAreaChartBasicConfigComponent
 };
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-basic-config.component.html
new file mode 100644
index 0000000000..ebf40b52ff
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-basic-config.component.html
@@ -0,0 +1,261 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<ng-container [formGroup]="barChartWidgetConfigForm">
+  <tb-timewindow-config-panel *ngIf="displayTimewindowConfig"
+                              [onlyHistoryTimewindow]="onlyHistoryTimewindow()"
+                              formControlName="timewindowConfig">
+  </tb-timewindow-config-panel>
+  <tb-datasources
+      [configMode]="basicMode"
+      hideDatasourceLabel
+      hideDataKeys
+      forceSingleDatasource
+      formControlName="datasources">
+  </tb-datasources>
+  <tb-data-keys-panel
+      panelTitle="{{ 'widgets.chart.series' | translate }}"
+      addKeyTitle="{{ 'widgets.chart.add-series' | translate }}"
+      keySettingsTitle="{{ 'widgets.chart.series-settings' | translate }}"
+      removeKeyTitle="{{ 'widgets.chart.remove-series' | translate }}"
+      noKeysText="{{ 'widgets.chart.no-series' | translate }}"
+      requiredKeysText="{{ 'widgets.chart.no-series-error' | translate }}"
+      hideUnits
+      hideDecimals
+      hideDataKeyUnits
+      hideDataKeyDecimals
+      [datasourceType]="datasource?.type"
+      [deviceId]="datasource?.deviceId"
+      [entityAliasId]="datasource?.entityAliasId"
+      formControlName="series">
+  </tb-data-keys-panel>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
+    <div class="tb-form-row column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width"  formControlName="showTitle">
+        {{ 'widget-config.card-title' | translate }}
+      </mat-slide-toggle>
+      <div fxFlex fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field fxFlex appearance="outline" subscriptSizing="dynamic">
+          <input matInput formControlName="title" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+        <tb-font-settings formControlName="titleFont"
+                          clearButton
+                          [previewText]="barChartWidgetConfigForm.get('title').value"
+                          [initialPreviewStyle]="widgetConfig.config.titleStyle">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="titleColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <div class="tb-form-row space-between">
+      <mat-slide-toggle class="mat-slide"  formControlName="showTitleIcon">
+        {{ 'widget-config.card-icon' | translate }}
+      </mat-slide-toggle>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <tb-material-icon-select asBoxInput
+                                 iconClearButton
+                                 [color]="barChartWidgetConfigForm.get('iconColor').value"
+                                 formControlName="titleIcon">
+        </tb-material-icon-select>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="iconColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="sortSeries">
+        {{ 'widgets.latest-chart.sort-series' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div class="tb-form-row space-between">
+      <div translate>widget-config.units-short</div>
+      <tb-unit-input
+          formControlName="units">
+      </tb-unit-input>
+    </div>
+    <div class="tb-form-row space-between">
+      <div translate>widget-config.decimals-short</div>
+      <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+        <input matInput formControlName="decimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
+    <tb-chart-bar-settings
+        formControlName="barSettings"
+        [series]="false">
+    </tb-chart-bar-settings>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-axis</div>
+    <div class="tb-form-row space-between column-xs">
+      <div translate>widgets.chart.chart-axis.scale</div>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-min</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="axisMin"
+                 type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+        </mat-form-field>
+        <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-max</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="axisMax"
+                 type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+        </mat-form-field>
+        <tb-font-settings formControlName="axisTickLabelFont"
+                          clearButton
+                          disabledLineHeight
+                          forceSizeUnit="px"
+                          previewText="100">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="axisTickLabelColor">
+        </tb-color-input>
+      </div>
+    </div>
+  </div>
+  <div class="tb-form-panel tb-slide-toggle">
+    <mat-expansion-panel class="tb-settings" [expanded]="barChartWidgetConfigForm.get('showLegend').value" [disabled]="!barChartWidgetConfigForm.get('showLegend').value">
+      <mat-expansion-panel-header fxLayout="row wrap">
+        <mat-panel-title>
+          <mat-slide-toggle class="mat-slide" formControlName="showLegend" (click)="$event.stopPropagation()"
+                            fxLayoutAlign="center">
+            {{ 'widget-config.legend' | translate }}
+          </mat-slide-toggle>
+        </mat-panel-title>
+      </mat-expansion-panel-header>
+      <ng-template matExpansionPanelContent>
+        <div class="tb-form-row space-between">
+          <div>{{ 'legend.position' | translate }}</div>
+          <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+            <mat-select formControlName="legendPosition">
+              <mat-option *ngFor="let pos of legendPositions" [value]="pos">
+                {{ legendPositionTranslationMap.get(pos) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'legend.label' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <tb-font-settings formControlName="legendLabelFont"
+                              previewText="Wind">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="legendLabelColor">
+            </tb-color-input>
+          </div>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'legend.value' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <tb-font-settings formControlName="legendValueFont"
+                              [previewText]="valuePreviewFn">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="legendValueColor">
+            </tb-color-input>
+          </div>
+        </div>
+      </ng-template>
+    </mat-expansion-panel>
+  </div>
+  <div class="tb-form-panel tb-slide-toggle">
+    <mat-expansion-panel class="tb-settings" [expanded]="barChartWidgetConfigForm.get('showTooltip').value" [disabled]="!barChartWidgetConfigForm.get('showTooltip').value">
+      <mat-expansion-panel-header fxLayout="row wrap">
+        <mat-panel-title>
+          <mat-slide-toggle class="mat-slide" formControlName="showTooltip" (click)="$event.stopPropagation()"
+                            fxLayoutAlign="center">
+            {{ 'widget-config.tooltip' | translate }}
+          </mat-slide-toggle>
+        </mat-panel-title>
+      </mat-expansion-panel-header>
+      <ng-template matExpansionPanelContent>
+        <div class="tb-form-row space-between column-xs">
+          <div>{{ 'tooltip.value' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+              <mat-select formControlName="tooltipValueType">
+                <mat-option *ngFor="let type of latestChartTooltipValueTypes" [value]="type">
+                  {{ latestChartTooltipValueTypeTranslationMap.get(type) | translate }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+            <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+              <input matInput formControlName="tooltipValueDecimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+              <div matSuffix fxHide.lt-md translate>widget-config.decimals-suffix</div>
+            </mat-form-field>
+            <tb-font-settings formControlName="tooltipValueFont"
+                              [previewText]="tooltipValuePreviewFn">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="tooltipValueColor">
+            </tb-color-input>
+          </div>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'tooltip.background-color' | translate }}</div>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="tooltipBackgroundColor">
+          </tb-color-input>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'tooltip.background-blur' | translate }}</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="tooltipBackgroundBlur" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+            <div matSuffix>px</div>
+          </mat-form-field>
+        </div>
+      </ng-template>
+    </mat-expansion-panel>
+  </div>
+  <tb-chart-animation-settings
+      formControlName="animation">
+  </tb-chart-animation-settings>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.background.background' | translate }}</div>
+      <tb-background-settings formControlName="background">
+      </tb-background-settings>
+    </div>
+    <div class="tb-form-row space-between column-lt-md">
+      <div translate>widget-config.show-card-buttons</div>
+      <mat-chip-listbox multiple formControlName="cardButtons">
+        <mat-chip-option value="fullscreen">{{ 'fullscreen.fullscreen' | translate }}</mat-chip-option>
+      </mat-chip-listbox>
+    </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widget-config.card-border-radius' | translate }}</div>
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <input matInput formControlName="borderRadius" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+  </div>
+  <tb-widget-actions-panel
+      formControlName="actions">
+  </tb-widget-actions-panel>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-basic-config.component.ts
new file mode 100644
index 0000000000..da8b94410d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-basic-config.component.ts
@@ -0,0 +1,316 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { BasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models';
+import { WidgetConfigComponentData } from '@home/models/widget-component.models';
+import {
+  DataKey,
+  Datasource,
+  datasourcesHasAggregation,
+  datasourcesHasOnlyComparisonAggregation,
+  legendPositions,
+  legendPositionTranslationMap,
+  WidgetConfig
+} from '@shared/models/widget.models';
+import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
+import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
+import { formatValue, isUndefined, mergeDeep } from '@core/utils';
+import {
+  getTimewindowConfig,
+  setTimewindowConfig
+} from '@home/components/widget/config/timewindow-config-panel.component';
+import {
+  LatestChartTooltipValueType,
+  latestChartTooltipValueTypes,
+  latestChartTooltipValueTypeTranslations
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import {
+  barChartWidgetDefaultSettings,
+  BarChartWidgetSettings
+} from '@home/components/widget/lib/chart/bar-chart-widget.models';
+
+@Component({
+  selector: 'tb-bar-chart-basic-config',
+  templateUrl: './bar-chart-basic-config.component.html',
+  styleUrls: ['../basic-config.scss']
+})
+export class BarChartBasicConfigComponent extends BasicWidgetConfigComponent {
+
+  public get datasource(): Datasource {
+    const datasources: Datasource[] = this.barChartWidgetConfigForm.get('datasources').value;
+    if (datasources && datasources.length) {
+      return datasources[0];
+    } else {
+      return null;
+    }
+  }
+
+  public get displayTimewindowConfig(): boolean {
+    const datasources = this.barChartWidgetConfigForm.get('datasources').value;
+    return datasourcesHasAggregation(datasources);
+  }
+
+  public onlyHistoryTimewindow(): boolean {
+    const datasources = this.barChartWidgetConfigForm.get('datasources').value;
+    return datasourcesHasOnlyComparisonAggregation(datasources);
+  }
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
+
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
+
+  barChartWidgetConfigForm: UntypedFormGroup;
+
+  valuePreviewFn = this._valuePreviewFn.bind(this);
+
+  tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
+
+  constructor(protected store: Store<AppState>,
+              protected widgetConfigComponent: WidgetConfigComponent,
+              private fb: UntypedFormBuilder) {
+    super(store, widgetConfigComponent);
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.barChartWidgetConfigForm;
+  }
+
+  protected defaultDataKeys(configData: WidgetConfigComponentData): DataKey[] {
+    return [{ name: 'windPower', label: 'Wind', type: DataKeyType.timeseries, units: '', decimals: 0, color: '#08872B' },
+      { name: 'solarPower', label: 'Solar', type: DataKeyType.timeseries, units: '', decimals: 0, color: '#FF4D5A' },
+      { name: 'hydroelectricPower', label: 'Hydroelectric', type: DataKeyType.timeseries, units: '', decimals: 0, color: '#FFDE30' }];
+  }
+
+  protected onConfigSet(configData: WidgetConfigComponentData) {
+    const settings: BarChartWidgetSettings = mergeDeep<BarChartWidgetSettings>({} as BarChartWidgetSettings,
+      barChartWidgetDefaultSettings, configData.config.settings as BarChartWidgetSettings);
+    this.barChartWidgetConfigForm = this.fb.group({
+      timewindowConfig: [getTimewindowConfig(configData.config), []],
+      datasources: [configData.config.datasources, []],
+
+      series: [this.getSeries(configData.config.datasources), []],
+
+      showTitle: [configData.config.showTitle, []],
+      title: [configData.config.title, []],
+      titleFont: [configData.config.titleFont, []],
+      titleColor: [configData.config.titleColor, []],
+      showTitleIcon: [configData.config.showTitleIcon, []],
+      titleIcon: [configData.config.titleIcon, []],
+      iconColor: [configData.config.iconColor, []],
+
+      sortSeries: [settings.sortSeries, []],
+
+      units: [configData.config.units, []],
+      decimals: [configData.config.decimals, []],
+
+      barSettings: [settings.barSettings, []],
+
+      axisMin: [settings.axisMin, []],
+      axisMax: [settings.axisMax, []],
+      axisTickLabelFont: [settings.axisTickLabelFont, []],
+      axisTickLabelColor: [settings.axisTickLabelColor, []],
+
+      animation: [settings.animation, []],
+
+      showLegend: [settings.showLegend, []],
+      legendPosition: [settings.legendPosition, []],
+      legendLabelFont: [settings.legendLabelFont, []],
+      legendLabelColor: [settings.legendLabelColor, []],
+      legendValueFont: [settings.legendValueFont, []],
+      legendValueColor: [settings.legendValueColor, []],
+
+      showTooltip: [settings.showTooltip, []],
+      tooltipValueType: [settings.tooltipValueType, []],
+      tooltipValueDecimals: [settings.tooltipValueDecimals, []],
+      tooltipValueFont: [settings.tooltipValueFont, []],
+      tooltipValueColor: [settings.tooltipValueColor, []],
+      tooltipBackgroundColor: [settings.tooltipBackgroundColor, []],
+      tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []],
+
+      background: [settings.background, []],
+
+      cardButtons: [this.getCardButtons(configData.config), []],
+      borderRadius: [configData.config.borderRadius, []],
+
+      actions: [configData.config.actions || {}, []]
+    });
+  }
+
+  protected prepareOutputConfig(config: any): WidgetConfigComponentData {
+    setTimewindowConfig(this.widgetConfig.config, config.timewindowConfig);
+    this.widgetConfig.config.datasources = config.datasources;
+    this.setSeries(config.series, this.widgetConfig.config.datasources);
+
+    this.widgetConfig.config.showTitle = config.showTitle;
+    this.widgetConfig.config.title = config.title;
+    this.widgetConfig.config.titleFont = config.titleFont;
+    this.widgetConfig.config.titleColor = config.titleColor;
+
+    this.widgetConfig.config.showTitleIcon = config.showTitleIcon;
+    this.widgetConfig.config.titleIcon = config.titleIcon;
+    this.widgetConfig.config.iconColor = config.iconColor;
+
+    this.widgetConfig.config.settings = this.widgetConfig.config.settings || {};
+
+    this.widgetConfig.config.settings.sortSeries = config.sortSeries;
+
+    this.widgetConfig.config.units = config.units;
+    this.widgetConfig.config.decimals = config.decimals;
+
+    this.widgetConfig.config.settings.barSettings = config.barSettings;
+
+    this.widgetConfig.config.settings.axisMin = config.axisMin;
+    this.widgetConfig.config.settings.axisMax = config.axisMax;
+    this.widgetConfig.config.settings.axisTickLabelFont = config.axisTickLabelFont;
+    this.widgetConfig.config.settings.axisTickLabelColor = config.axisTickLabelColor;
+
+    this.widgetConfig.config.settings.animation = config.animation;
+
+    this.widgetConfig.config.settings.showLegend = config.showLegend;
+    this.widgetConfig.config.settings.legendPosition = config.legendPosition;
+    this.widgetConfig.config.settings.legendLabelFont = config.legendLabelFont;
+    this.widgetConfig.config.settings.legendLabelColor = config.legendLabelColor;
+    this.widgetConfig.config.settings.legendValueFont = config.legendValueFont;
+    this.widgetConfig.config.settings.legendValueColor = config.legendValueColor;
+
+    this.widgetConfig.config.settings.showTooltip = config.showTooltip;
+    this.widgetConfig.config.settings.tooltipValueType = config.tooltipValueType;
+    this.widgetConfig.config.settings.tooltipValueDecimals = config.tooltipValueDecimals;
+    this.widgetConfig.config.settings.tooltipValueFont = config.tooltipValueFont;
+    this.widgetConfig.config.settings.tooltipValueColor = config.tooltipValueColor;
+    this.widgetConfig.config.settings.tooltipBackgroundColor = config.tooltipBackgroundColor;
+    this.widgetConfig.config.settings.tooltipBackgroundBlur = config.tooltipBackgroundBlur;
+
+    this.widgetConfig.config.settings.background = config.background;
+
+    this.setCardButtons(config.cardButtons, this.widgetConfig.config);
+    this.widgetConfig.config.borderRadius = config.borderRadius;
+
+    this.widgetConfig.config.actions = config.actions;
+
+    return this.widgetConfig;
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['showTitle', 'showTitleIcon', 'showLegend', 'showTooltip'];
+  }
+
+  protected updateValidators(emitEvent: boolean, trigger?: string) {
+    const showTitle: boolean = this.barChartWidgetConfigForm.get('showTitle').value;
+    const showTitleIcon: boolean = this.barChartWidgetConfigForm.get('showTitleIcon').value;
+    const showLegend: boolean = this.barChartWidgetConfigForm.get('showLegend').value;
+    const showTooltip: boolean = this.barChartWidgetConfigForm.get('showTooltip').value;
+
+    if (showTitle) {
+      this.barChartWidgetConfigForm.get('title').enable();
+      this.barChartWidgetConfigForm.get('titleFont').enable();
+      this.barChartWidgetConfigForm.get('titleColor').enable();
+      this.barChartWidgetConfigForm.get('showTitleIcon').enable({emitEvent: false});
+      if (showTitleIcon) {
+        this.barChartWidgetConfigForm.get('titleIcon').enable();
+        this.barChartWidgetConfigForm.get('iconColor').enable();
+      } else {
+        this.barChartWidgetConfigForm.get('titleIcon').disable();
+        this.barChartWidgetConfigForm.get('iconColor').disable();
+      }
+    } else {
+      this.barChartWidgetConfigForm.get('title').disable();
+      this.barChartWidgetConfigForm.get('titleFont').disable();
+      this.barChartWidgetConfigForm.get('titleColor').disable();
+      this.barChartWidgetConfigForm.get('showTitleIcon').disable({emitEvent: false});
+      this.barChartWidgetConfigForm.get('titleIcon').disable();
+      this.barChartWidgetConfigForm.get('iconColor').disable();
+    }
+    if (showLegend) {
+      this.barChartWidgetConfigForm.get('legendPosition').enable();
+      this.barChartWidgetConfigForm.get('legendLabelFont').enable();
+      this.barChartWidgetConfigForm.get('legendLabelColor').enable();
+      this.barChartWidgetConfigForm.get('legendValueFont').enable();
+      this.barChartWidgetConfigForm.get('legendValueColor').enable();
+    } else {
+      this.barChartWidgetConfigForm.get('legendPosition').disable();
+      this.barChartWidgetConfigForm.get('legendLabelFont').disable();
+      this.barChartWidgetConfigForm.get('legendLabelColor').disable();
+      this.barChartWidgetConfigForm.get('legendValueFont').disable();
+      this.barChartWidgetConfigForm.get('legendValueColor').disable();
+    }
+    if (showTooltip) {
+      this.barChartWidgetConfigForm.get('tooltipValueType').enable();
+      this.barChartWidgetConfigForm.get('tooltipValueDecimals').enable();
+      this.barChartWidgetConfigForm.get('tooltipValueFont').enable();
+      this.barChartWidgetConfigForm.get('tooltipValueColor').enable();
+      this.barChartWidgetConfigForm.get('tooltipBackgroundColor').enable();
+      this.barChartWidgetConfigForm.get('tooltipBackgroundBlur').enable();
+    } else {
+      this.barChartWidgetConfigForm.get('tooltipValueType').disable();
+      this.barChartWidgetConfigForm.get('tooltipValueDecimals').disable();
+      this.barChartWidgetConfigForm.get('tooltipValueFont').disable();
+      this.barChartWidgetConfigForm.get('tooltipValueColor').disable();
+      this.barChartWidgetConfigForm.get('tooltipBackgroundColor').disable();
+      this.barChartWidgetConfigForm.get('tooltipBackgroundBlur').disable();
+    }
+  }
+
+  private getSeries(datasources?: Datasource[]): DataKey[] {
+    if (datasources && datasources.length) {
+      return datasources[0].dataKeys || [];
+    }
+    return [];
+  }
+
+  private setSeries(series: DataKey[], datasources?: Datasource[]) {
+    if (datasources && datasources.length) {
+      datasources[0].dataKeys = series;
+    }
+  }
+
+  private getCardButtons(config: WidgetConfig): string[] {
+    const buttons: string[] = [];
+    if (isUndefined(config.enableFullscreen) || config.enableFullscreen) {
+      buttons.push('fullscreen');
+    }
+    return buttons;
+  }
+
+  private setCardButtons(buttons: string[], config: WidgetConfig) {
+    config.enableFullscreen = buttons.includes('fullscreen');
+  }
+
+  private _valuePreviewFn(): string {
+    const units: string = this.barChartWidgetConfigForm.get('units').value;
+    const decimals: number = this.barChartWidgetConfigForm.get('decimals').value;
+    return formatValue(110, decimals, units, false);
+  }
+
+  private _tooltipValuePreviewFn(): string {
+    const tooltipValueType: LatestChartTooltipValueType = this.barChartWidgetConfigForm.get('tooltipValueType').value;
+    const decimals: number = this.barChartWidgetConfigForm.get('tooltipValueDecimals').value;
+    if (tooltipValueType === LatestChartTooltipValueType.percentage) {
+      return formatValue(35, decimals, '%', false);
+    } else {
+      const units: string = this.barChartWidgetConfigForm.get('units').value;
+      return formatValue(110, decimals, units, false);
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html
index 458dfffa14..0d8537a3a6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html
@@ -143,26 +143,26 @@
     </div>
     <div class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="showBarBorder">
-        {{ 'widgets.time-series-chart.series.bar.show-border' | translate }}
+        {{ 'widgets.chart.bar.show-border' | translate }}
       </mat-slide-toggle>
     </div>
     <div class="tb-form-row space-between column-xs">
-      <div translate>widgets.time-series-chart.series.bar.border-width</div>
+      <div translate>widgets.chart.bar.border-width</div>
       <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
         <input matInput type="number" formControlName="barBorderWidth" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
       </mat-form-field>
     </div>
     <div class="tb-form-row space-between column-xs">
-      <div translate>widgets.time-series-chart.series.bar.border-radius</div>
+      <div translate>widgets.chart.bar.border-radius</div>
       <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
         <input matInput type="number" formControlName="barBorderRadius" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
       </mat-form-field>
     </div>
-    <tb-time-series-chart-fill-settings
+    <tb-chart-fill-settings
         formControlName="barBackgroundSettings"
-        title="widgets.time-series-chart.series.background"
-        fillNoneTitle="widgets.time-series-chart.series.fill-type-solid">
-    </tb-time-series-chart-fill-settings>
+        title="widgets.chart.background"
+        fillNoneTitle="widgets.chart.fill-type-solid">
+    </tb-chart-fill-settings>
     <tb-time-series-no-aggregation-bar-width-settings
         stroked
         formControlName="noAggregationBarWidthSettings">
@@ -306,9 +306,9 @@
       </ng-template>
     </mat-expansion-panel>
   </div>
-  <tb-echarts-animation-settings
+  <tb-chart-animation-settings
       formControlName="animation">
-  </tb-echarts-animation-settings>
+  </tb-chart-animation-settings>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
     <div class="tb-form-row space-between">
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.html
index 8ba255052d..13a4985647 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.html
@@ -229,9 +229,9 @@
       </ng-template>
     </mat-expansion-panel>
   </div>
-  <tb-echarts-animation-settings
+  <tb-chart-animation-settings
       formControlName="animation">
-  </tb-echarts-animation-settings>
+  </tb-chart-animation-settings>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
     <div class="tb-form-row space-between">
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.html
index e0b6352a8a..bdc94b1479 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.html
@@ -247,9 +247,9 @@
       </ng-template>
     </mat-expansion-panel>
   </div>
-  <tb-echarts-animation-settings
+  <tb-chart-animation-settings
       formControlName="animation">
-  </tb-echarts-animation-settings>
+  </tb-chart-animation-settings>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
     <div class="tb-form-row space-between">
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.ts
index 7e0dc8d993..e8d34933c3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.ts
@@ -48,7 +48,7 @@ import {
 import {
   pieChartLabelPositions,
   pieChartLabelPositionTranslations
-} from '@home/components/widget/lib/chart/pie-chart.models';
+} from '@home/components/widget/lib/chart/chart.models';
 
 @Component({
   selector: 'tb-pie-chart-basic-config',
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/polar-area-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/polar-area-chart-basic-config.component.html
new file mode 100644
index 0000000000..92b94b5912
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/polar-area-chart-basic-config.component.html
@@ -0,0 +1,268 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<ng-container [formGroup]="polarAreaChartWidgetConfigForm">
+  <tb-timewindow-config-panel *ngIf="displayTimewindowConfig"
+                              [onlyHistoryTimewindow]="onlyHistoryTimewindow()"
+                              formControlName="timewindowConfig">
+  </tb-timewindow-config-panel>
+  <tb-datasources
+      [configMode]="basicMode"
+      hideDatasourceLabel
+      hideDataKeys
+      forceSingleDatasource
+      formControlName="datasources">
+  </tb-datasources>
+  <tb-data-keys-panel
+      panelTitle="{{ 'widgets.chart.series' | translate }}"
+      addKeyTitle="{{ 'widgets.chart.add-series' | translate }}"
+      keySettingsTitle="{{ 'widgets.chart.series-settings' | translate }}"
+      removeKeyTitle="{{ 'widgets.chart.remove-series' | translate }}"
+      noKeysText="{{ 'widgets.chart.no-series' | translate }}"
+      requiredKeysText="{{ 'widgets.chart.no-series-error' | translate }}"
+      hideUnits
+      hideDecimals
+      hideDataKeyUnits
+      hideDataKeyDecimals
+      [datasourceType]="datasource?.type"
+      [deviceId]="datasource?.deviceId"
+      [entityAliasId]="datasource?.entityAliasId"
+      formControlName="series">
+  </tb-data-keys-panel>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
+    <div class="tb-form-row column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width"  formControlName="showTitle">
+        {{ 'widget-config.card-title' | translate }}
+      </mat-slide-toggle>
+      <div fxFlex fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field fxFlex appearance="outline" subscriptSizing="dynamic">
+          <input matInput formControlName="title" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+        <tb-font-settings formControlName="titleFont"
+                          clearButton
+                          [previewText]="polarAreaChartWidgetConfigForm.get('title').value"
+                          [initialPreviewStyle]="widgetConfig.config.titleStyle">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="titleColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <div class="tb-form-row space-between">
+      <mat-slide-toggle class="mat-slide"  formControlName="showTitleIcon">
+        {{ 'widget-config.card-icon' | translate }}
+      </mat-slide-toggle>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <tb-material-icon-select asBoxInput
+                                 iconClearButton
+                                 [color]="polarAreaChartWidgetConfigForm.get('iconColor').value"
+                                 formControlName="titleIcon">
+        </tb-material-icon-select>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="iconColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="sortSeries">
+        {{ 'widgets.latest-chart.sort-series' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div class="tb-form-row space-between">
+      <div translate>widget-config.units-short</div>
+      <tb-unit-input
+          formControlName="units">
+      </tb-unit-input>
+    </div>
+    <div class="tb-form-row space-between">
+      <div translate>widget-config.decimals-short</div>
+      <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+        <input matInput formControlName="decimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
+    <tb-chart-bar-settings
+        formControlName="barSettings"
+        pieLabelPosition
+        [series]="false">
+    </tb-chart-bar-settings>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.polar-area-chart.polar-axis</div>
+    <div class="tb-form-row space-between column-xs">
+      <div translate>widgets.chart.chart-axis.scale</div>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-min</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="axisMin"
+                 type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+        </mat-form-field>
+        <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-max</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="axisMax"
+                 type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+        </mat-form-field>
+        <tb-font-settings formControlName="axisTickLabelFont"
+                          clearButton
+                          disabledLineHeight
+                          forceSizeUnit="px"
+                          previewText="100">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="axisTickLabelColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <div class="tb-form-row space-between">
+      <div translate>widgets.polar-area-chart.start-angle</div>
+      <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+        <input matInput formControlName="angleAxisStartAngle" type="number" min="0" max="360" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+  </div>
+  <div class="tb-form-panel tb-slide-toggle">
+    <mat-expansion-panel class="tb-settings" [expanded]="polarAreaChartWidgetConfigForm.get('showLegend').value" [disabled]="!polarAreaChartWidgetConfigForm.get('showLegend').value">
+      <mat-expansion-panel-header fxLayout="row wrap">
+        <mat-panel-title>
+          <mat-slide-toggle class="mat-slide" formControlName="showLegend" (click)="$event.stopPropagation()"
+                            fxLayoutAlign="center">
+            {{ 'widget-config.legend' | translate }}
+          </mat-slide-toggle>
+        </mat-panel-title>
+      </mat-expansion-panel-header>
+      <ng-template matExpansionPanelContent>
+        <div class="tb-form-row space-between">
+          <div>{{ 'legend.position' | translate }}</div>
+          <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+            <mat-select formControlName="legendPosition">
+              <mat-option *ngFor="let pos of legendPositions" [value]="pos">
+                {{ legendPositionTranslationMap.get(pos) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'legend.label' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <tb-font-settings formControlName="legendLabelFont"
+                              previewText="Wind">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="legendLabelColor">
+            </tb-color-input>
+          </div>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'legend.value' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <tb-font-settings formControlName="legendValueFont"
+                              [previewText]="valuePreviewFn">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="legendValueColor">
+            </tb-color-input>
+          </div>
+        </div>
+      </ng-template>
+    </mat-expansion-panel>
+  </div>
+  <div class="tb-form-panel tb-slide-toggle">
+    <mat-expansion-panel class="tb-settings" [expanded]="polarAreaChartWidgetConfigForm.get('showTooltip').value" [disabled]="!polarAreaChartWidgetConfigForm.get('showTooltip').value">
+      <mat-expansion-panel-header fxLayout="row wrap">
+        <mat-panel-title>
+          <mat-slide-toggle class="mat-slide" formControlName="showTooltip" (click)="$event.stopPropagation()"
+                            fxLayoutAlign="center">
+            {{ 'widget-config.tooltip' | translate }}
+          </mat-slide-toggle>
+        </mat-panel-title>
+      </mat-expansion-panel-header>
+      <ng-template matExpansionPanelContent>
+        <div class="tb-form-row space-between column-xs">
+          <div>{{ 'tooltip.value' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+              <mat-select formControlName="tooltipValueType">
+                <mat-option *ngFor="let type of latestChartTooltipValueTypes" [value]="type">
+                  {{ latestChartTooltipValueTypeTranslationMap.get(type) | translate }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+            <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+              <input matInput formControlName="tooltipValueDecimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+              <div matSuffix fxHide.lt-md translate>widget-config.decimals-suffix</div>
+            </mat-form-field>
+            <tb-font-settings formControlName="tooltipValueFont"
+                              [previewText]="tooltipValuePreviewFn">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="tooltipValueColor">
+            </tb-color-input>
+          </div>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'tooltip.background-color' | translate }}</div>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="tooltipBackgroundColor">
+          </tb-color-input>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'tooltip.background-blur' | translate }}</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="tooltipBackgroundBlur" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+            <div matSuffix>px</div>
+          </mat-form-field>
+        </div>
+      </ng-template>
+    </mat-expansion-panel>
+  </div>
+  <tb-chart-animation-settings
+      formControlName="animation">
+  </tb-chart-animation-settings>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.background.background' | translate }}</div>
+      <tb-background-settings formControlName="background">
+      </tb-background-settings>
+    </div>
+    <div class="tb-form-row space-between column-lt-md">
+      <div translate>widget-config.show-card-buttons</div>
+      <mat-chip-listbox multiple formControlName="cardButtons">
+        <mat-chip-option value="fullscreen">{{ 'fullscreen.fullscreen' | translate }}</mat-chip-option>
+      </mat-chip-listbox>
+    </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widget-config.card-border-radius' | translate }}</div>
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <input matInput formControlName="borderRadius" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+  </div>
+  <tb-widget-actions-panel
+      formControlName="actions">
+  </tb-widget-actions-panel>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/polar-area-chart-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/polar-area-chart-basic-config.component.ts
new file mode 100644
index 0000000000..0d195dde38
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/polar-area-chart-basic-config.component.ts
@@ -0,0 +1,318 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { BasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models';
+import { WidgetConfigComponentData } from '@home/models/widget-component.models';
+import {
+  DataKey,
+  Datasource,
+  datasourcesHasAggregation,
+  datasourcesHasOnlyComparisonAggregation,
+  legendPositions,
+  legendPositionTranslationMap,
+  WidgetConfig
+} from '@shared/models/widget.models';
+import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
+import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
+import { formatValue, isUndefined, mergeDeep } from '@core/utils';
+import {
+  getTimewindowConfig,
+  setTimewindowConfig
+} from '@home/components/widget/config/timewindow-config-panel.component';
+import {
+  LatestChartTooltipValueType,
+  latestChartTooltipValueTypes,
+  latestChartTooltipValueTypeTranslations
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import {
+  polarAreaChartWidgetDefaultSettings,
+  PolarAreaChartWidgetSettings
+} from '@home/components/widget/lib/chart/polar-area-widget.models';
+
+@Component({
+  selector: 'tb-polar-area-chart-basic-config',
+  templateUrl: './polar-area-chart-basic-config.component.html',
+  styleUrls: ['../basic-config.scss']
+})
+export class PolarAreaChartBasicConfigComponent extends BasicWidgetConfigComponent {
+
+  public get datasource(): Datasource {
+    const datasources: Datasource[] = this.polarAreaChartWidgetConfigForm.get('datasources').value;
+    if (datasources && datasources.length) {
+      return datasources[0];
+    } else {
+      return null;
+    }
+  }
+
+  public get displayTimewindowConfig(): boolean {
+    const datasources = this.polarAreaChartWidgetConfigForm.get('datasources').value;
+    return datasourcesHasAggregation(datasources);
+  }
+
+  public onlyHistoryTimewindow(): boolean {
+    const datasources = this.polarAreaChartWidgetConfigForm.get('datasources').value;
+    return datasourcesHasOnlyComparisonAggregation(datasources);
+  }
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
+
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
+
+  polarAreaChartWidgetConfigForm: UntypedFormGroup;
+
+  valuePreviewFn = this._valuePreviewFn.bind(this);
+
+  tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
+
+  constructor(protected store: Store<AppState>,
+              protected widgetConfigComponent: WidgetConfigComponent,
+              private fb: UntypedFormBuilder) {
+    super(store, widgetConfigComponent);
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.polarAreaChartWidgetConfigForm;
+  }
+
+  protected defaultDataKeys(configData: WidgetConfigComponentData): DataKey[] {
+    return [{ name: 'windPower', label: 'Wind', type: DataKeyType.timeseries, units: '', decimals: 0, color: '#08872B' },
+      { name: 'solarPower', label: 'Solar', type: DataKeyType.timeseries, units: '', decimals: 0, color: '#FF4D5A' },
+      { name: 'hydroelectricPower', label: 'Hydroelectric', type: DataKeyType.timeseries, units: '', decimals: 0, color: '#FFDE30' }];
+  }
+
+  protected onConfigSet(configData: WidgetConfigComponentData) {
+    const settings: PolarAreaChartWidgetSettings = mergeDeep<PolarAreaChartWidgetSettings>({} as PolarAreaChartWidgetSettings,
+      polarAreaChartWidgetDefaultSettings, configData.config.settings as PolarAreaChartWidgetSettings);
+    this.polarAreaChartWidgetConfigForm = this.fb.group({
+      timewindowConfig: [getTimewindowConfig(configData.config), []],
+      datasources: [configData.config.datasources, []],
+
+      series: [this.getSeries(configData.config.datasources), []],
+
+      showTitle: [configData.config.showTitle, []],
+      title: [configData.config.title, []],
+      titleFont: [configData.config.titleFont, []],
+      titleColor: [configData.config.titleColor, []],
+      showTitleIcon: [configData.config.showTitleIcon, []],
+      titleIcon: [configData.config.titleIcon, []],
+      iconColor: [configData.config.iconColor, []],
+
+      sortSeries: [settings.sortSeries, []],
+
+      units: [configData.config.units, []],
+      decimals: [configData.config.decimals, []],
+
+      barSettings: [settings.barSettings, []],
+
+      axisMin: [settings.axisMin, []],
+      axisMax: [settings.axisMax, []],
+      axisTickLabelFont: [settings.axisTickLabelFont, []],
+      axisTickLabelColor: [settings.axisTickLabelColor, []],
+      angleAxisStartAngle: [settings.angleAxisStartAngle, [Validators.min(0), Validators.max(360)]],
+
+      animation: [settings.animation, []],
+
+      showLegend: [settings.showLegend, []],
+      legendPosition: [settings.legendPosition, []],
+      legendLabelFont: [settings.legendLabelFont, []],
+      legendLabelColor: [settings.legendLabelColor, []],
+      legendValueFont: [settings.legendValueFont, []],
+      legendValueColor: [settings.legendValueColor, []],
+
+      showTooltip: [settings.showTooltip, []],
+      tooltipValueType: [settings.tooltipValueType, []],
+      tooltipValueDecimals: [settings.tooltipValueDecimals, []],
+      tooltipValueFont: [settings.tooltipValueFont, []],
+      tooltipValueColor: [settings.tooltipValueColor, []],
+      tooltipBackgroundColor: [settings.tooltipBackgroundColor, []],
+      tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []],
+
+      background: [settings.background, []],
+
+      cardButtons: [this.getCardButtons(configData.config), []],
+      borderRadius: [configData.config.borderRadius, []],
+
+      actions: [configData.config.actions || {}, []]
+    });
+  }
+
+  protected prepareOutputConfig(config: any): WidgetConfigComponentData {
+    setTimewindowConfig(this.widgetConfig.config, config.timewindowConfig);
+    this.widgetConfig.config.datasources = config.datasources;
+    this.setSeries(config.series, this.widgetConfig.config.datasources);
+
+    this.widgetConfig.config.showTitle = config.showTitle;
+    this.widgetConfig.config.title = config.title;
+    this.widgetConfig.config.titleFont = config.titleFont;
+    this.widgetConfig.config.titleColor = config.titleColor;
+
+    this.widgetConfig.config.showTitleIcon = config.showTitleIcon;
+    this.widgetConfig.config.titleIcon = config.titleIcon;
+    this.widgetConfig.config.iconColor = config.iconColor;
+
+    this.widgetConfig.config.settings = this.widgetConfig.config.settings || {};
+
+    this.widgetConfig.config.settings.sortSeries = config.sortSeries;
+
+    this.widgetConfig.config.units = config.units;
+    this.widgetConfig.config.decimals = config.decimals;
+
+    this.widgetConfig.config.settings.barSettings = config.barSettings;
+
+    this.widgetConfig.config.settings.axisMin = config.axisMin;
+    this.widgetConfig.config.settings.axisMax = config.axisMax;
+    this.widgetConfig.config.settings.axisTickLabelFont = config.axisTickLabelFont;
+    this.widgetConfig.config.settings.axisTickLabelColor = config.axisTickLabelColor;
+    this.widgetConfig.config.settings.angleAxisStartAngle = config.angleAxisStartAngle;
+
+    this.widgetConfig.config.settings.animation = config.animation;
+
+    this.widgetConfig.config.settings.showLegend = config.showLegend;
+    this.widgetConfig.config.settings.legendPosition = config.legendPosition;
+    this.widgetConfig.config.settings.legendLabelFont = config.legendLabelFont;
+    this.widgetConfig.config.settings.legendLabelColor = config.legendLabelColor;
+    this.widgetConfig.config.settings.legendValueFont = config.legendValueFont;
+    this.widgetConfig.config.settings.legendValueColor = config.legendValueColor;
+
+    this.widgetConfig.config.settings.showTooltip = config.showTooltip;
+    this.widgetConfig.config.settings.tooltipValueType = config.tooltipValueType;
+    this.widgetConfig.config.settings.tooltipValueDecimals = config.tooltipValueDecimals;
+    this.widgetConfig.config.settings.tooltipValueFont = config.tooltipValueFont;
+    this.widgetConfig.config.settings.tooltipValueColor = config.tooltipValueColor;
+    this.widgetConfig.config.settings.tooltipBackgroundColor = config.tooltipBackgroundColor;
+    this.widgetConfig.config.settings.tooltipBackgroundBlur = config.tooltipBackgroundBlur;
+
+    this.widgetConfig.config.settings.background = config.background;
+
+    this.setCardButtons(config.cardButtons, this.widgetConfig.config);
+    this.widgetConfig.config.borderRadius = config.borderRadius;
+
+    this.widgetConfig.config.actions = config.actions;
+
+    return this.widgetConfig;
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['showTitle', 'showTitleIcon', 'showLegend', 'showTooltip'];
+  }
+
+  protected updateValidators(emitEvent: boolean, trigger?: string) {
+    const showTitle: boolean = this.polarAreaChartWidgetConfigForm.get('showTitle').value;
+    const showTitleIcon: boolean = this.polarAreaChartWidgetConfigForm.get('showTitleIcon').value;
+    const showLegend: boolean = this.polarAreaChartWidgetConfigForm.get('showLegend').value;
+    const showTooltip: boolean = this.polarAreaChartWidgetConfigForm.get('showTooltip').value;
+
+    if (showTitle) {
+      this.polarAreaChartWidgetConfigForm.get('title').enable();
+      this.polarAreaChartWidgetConfigForm.get('titleFont').enable();
+      this.polarAreaChartWidgetConfigForm.get('titleColor').enable();
+      this.polarAreaChartWidgetConfigForm.get('showTitleIcon').enable({emitEvent: false});
+      if (showTitleIcon) {
+        this.polarAreaChartWidgetConfigForm.get('titleIcon').enable();
+        this.polarAreaChartWidgetConfigForm.get('iconColor').enable();
+      } else {
+        this.polarAreaChartWidgetConfigForm.get('titleIcon').disable();
+        this.polarAreaChartWidgetConfigForm.get('iconColor').disable();
+      }
+    } else {
+      this.polarAreaChartWidgetConfigForm.get('title').disable();
+      this.polarAreaChartWidgetConfigForm.get('titleFont').disable();
+      this.polarAreaChartWidgetConfigForm.get('titleColor').disable();
+      this.polarAreaChartWidgetConfigForm.get('showTitleIcon').disable({emitEvent: false});
+      this.polarAreaChartWidgetConfigForm.get('titleIcon').disable();
+      this.polarAreaChartWidgetConfigForm.get('iconColor').disable();
+    }
+    if (showLegend) {
+      this.polarAreaChartWidgetConfigForm.get('legendPosition').enable();
+      this.polarAreaChartWidgetConfigForm.get('legendLabelFont').enable();
+      this.polarAreaChartWidgetConfigForm.get('legendLabelColor').enable();
+      this.polarAreaChartWidgetConfigForm.get('legendValueFont').enable();
+      this.polarAreaChartWidgetConfigForm.get('legendValueColor').enable();
+    } else {
+      this.polarAreaChartWidgetConfigForm.get('legendPosition').disable();
+      this.polarAreaChartWidgetConfigForm.get('legendLabelFont').disable();
+      this.polarAreaChartWidgetConfigForm.get('legendLabelColor').disable();
+      this.polarAreaChartWidgetConfigForm.get('legendValueFont').disable();
+      this.polarAreaChartWidgetConfigForm.get('legendValueColor').disable();
+    }
+    if (showTooltip) {
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueType').enable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueDecimals').enable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueFont').enable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueColor').enable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipBackgroundColor').enable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipBackgroundBlur').enable();
+    } else {
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueType').disable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueDecimals').disable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueFont').disable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueColor').disable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipBackgroundColor').disable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipBackgroundBlur').disable();
+    }
+  }
+
+  private getSeries(datasources?: Datasource[]): DataKey[] {
+    if (datasources && datasources.length) {
+      return datasources[0].dataKeys || [];
+    }
+    return [];
+  }
+
+  private setSeries(series: DataKey[], datasources?: Datasource[]) {
+    if (datasources && datasources.length) {
+      datasources[0].dataKeys = series;
+    }
+  }
+
+  private getCardButtons(config: WidgetConfig): string[] {
+    const buttons: string[] = [];
+    if (isUndefined(config.enableFullscreen) || config.enableFullscreen) {
+      buttons.push('fullscreen');
+    }
+    return buttons;
+  }
+
+  private setCardButtons(buttons: string[], config: WidgetConfig) {
+    config.enableFullscreen = buttons.includes('fullscreen');
+  }
+
+  private _valuePreviewFn(): string {
+    const units: string = this.polarAreaChartWidgetConfigForm.get('units').value;
+    const decimals: number = this.polarAreaChartWidgetConfigForm.get('decimals').value;
+    return formatValue(110, decimals, units, false);
+  }
+
+  private _tooltipValuePreviewFn(): string {
+    const tooltipValueType: LatestChartTooltipValueType = this.polarAreaChartWidgetConfigForm.get('tooltipValueType').value;
+    const decimals: number = this.polarAreaChartWidgetConfigForm.get('tooltipValueDecimals').value;
+    if (tooltipValueType === LatestChartTooltipValueType.percentage) {
+      return formatValue(35, decimals, '%', false);
+    } else {
+      const units: string = this.polarAreaChartWidgetConfigForm.get('units').value;
+      return formatValue(110, decimals, units, false);
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html
index 913974c313..1ba564b3ba 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html
@@ -186,8 +186,8 @@
         <div fxLayout="row" fxFlex.lt-md fxLayoutAlign="start center" fxLayoutGap="8px">
           <mat-form-field class="medium-width" fxFlex.lt-md appearance="outline" subscriptSizing="dynamic">
             <mat-select formControlName="pointLabelPosition">
-              <mat-option *ngFor="let position of seriesLabelPositions" [value]="position">
-                {{ seriesLabelPositionTranslations.get(position) | translate }}
+              <mat-option *ngFor="let position of chartLabelPositions" [value]="position">
+                {{ chartLabelPositionTranslations.get(position) | translate }}
               </mat-option>
             </mat-select>
           </mat-form-field>
@@ -216,8 +216,8 @@
         <div translate>widgets.time-series-chart.series.point.point-shape</div>
         <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
           <mat-select formControlName="pointShape">
-            <mat-option *ngFor="let shape of echartsShapes" [value]="shape">
-              {{ echartsShapeTranslations.get(shape) | translate }}
+            <mat-option *ngFor="let shape of chartShapes" [value]="shape">
+              {{ chartShapeTranslations.get(shape) | translate }}
             </mat-option>
           </mat-select>
         </mat-form-field>
@@ -367,9 +367,9 @@
       </ng-template>
     </mat-expansion-panel>
   </div>
-  <tb-echarts-animation-settings
+  <tb-chart-animation-settings
       formControlName="animation">
-  </tb-echarts-animation-settings>
+  </tb-chart-animation-settings>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
     <div class="tb-form-row space-between">
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts
index 1144f0b905..985fd74624 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts
@@ -47,12 +47,10 @@ import {
 import {
   lineSeriesStepTypes,
   lineSeriesStepTypeTranslations,
-  seriesLabelPositions,
-  seriesLabelPositionTranslations,
   timeSeriesLineTypes,
   timeSeriesLineTypeTranslations
 } from '@home/components/widget/lib/chart/time-series-chart.models';
-import { echartsShapes, echartsShapeTranslations } from '@home/components/widget/lib/chart/echarts-widget.models';
+import { chartLabelPositions, chartLabelPositionTranslations, chartShapes, chartShapeTranslations } from '@home/components/widget/lib/chart/chart.models';
 
 @Component({
   selector: 'tb-range-chart-basic-config',
@@ -78,13 +76,13 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
 
   timeSeriesLineTypeTranslations = timeSeriesLineTypeTranslations;
 
-  seriesLabelPositions = seriesLabelPositions;
+  chartLabelPositions = chartLabelPositions;
 
-  seriesLabelPositionTranslations = seriesLabelPositionTranslations;
+  chartLabelPositionTranslations = chartLabelPositionTranslations;
 
-  echartsShapes = echartsShapes;
+  chartShapes = chartShapes;
 
-  echartsShapeTranslations = echartsShapeTranslations;
+  chartShapeTranslations = chartShapeTranslations;
 
   legendPositions = legendPositions;
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
index f8e72b5676..3d0fe04e4c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
@@ -328,9 +328,9 @@
       </ng-template>
     </mat-expansion-panel>
   </div>
-  <tb-echarts-animation-settings
+  <tb-chart-animation-settings
     formControlName="animation">
-  </tb-echarts-animation-settings>
+  </tb-chart-animation-settings>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
     <div class="tb-form-row space-between">
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.ts
index f32f35d47e..9a8cb6a7b3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.ts
@@ -45,8 +45,8 @@ import {
   timeSeriesChartWidgetDefaultSettings,
   TimeSeriesChartWidgetSettings
 } from '@home/components/widget/lib/chart/time-series-chart-widget.models';
-import { EChartsTooltipTrigger } from '@home/components/widget/lib/chart/echarts-widget.models';
 import {
+  TimeSeriesChartTooltipTrigger,
   TimeSeriesChartKeySettings,
   TimeSeriesChartType,
   TimeSeriesChartYAxes,
@@ -76,7 +76,7 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
 
   TimeSeriesChartType = TimeSeriesChartType;
 
-  EChartsTooltipTrigger = EChartsTooltipTrigger;
+  EChartsTooltipTrigger = TimeSeriesChartTooltipTrigger;
 
   legendPositions = legendPositions;
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.component.ts
new file mode 100644
index 0000000000..b39066cf8a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.component.ts
@@ -0,0 +1,75 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, Input, OnInit, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core';
+import { WidgetContext } from '@home/models/widget-component.models';
+import { WidgetComponent } from '@home/components/widget/widget.component';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  LatestChartComponent,
+  LatestChartComponentCallbacks
+} from '@home/components/widget/lib/chart/latest-chart.component';
+import {
+  barChartWidgetBarsChartSettings,
+  barChartWidgetDefaultSettings,
+  BarChartWidgetSettings
+} from '@home/components/widget/lib/chart/bar-chart-widget.models';
+import { TbBarsChart } from '@home/components/widget/lib/chart/bars-chart';
+
+@Component({
+  selector: 'tb-bar-chart-widget',
+  templateUrl: './latest-chart-widget.component.html',
+  styleUrls: [],
+  encapsulation: ViewEncapsulation.None
+})
+export class BarChartWidgetComponent implements OnInit {
+
+  @ViewChild('latestChart')
+  latestChart: LatestChartComponent;
+
+  @Input()
+  ctx: WidgetContext;
+
+  @Input()
+  widgetTitlePanel: TemplateRef<any>;
+
+  settings: BarChartWidgetSettings;
+
+  callbacks: LatestChartComponentCallbacks;
+
+  constructor(private widgetComponent: WidgetComponent,
+              private translate: TranslateService) {
+  }
+
+  ngOnInit(): void {
+    this.ctx.$scope.barChartWidget = this;
+    this.settings = {...barChartWidgetDefaultSettings, ...this.ctx.settings};
+    this.callbacks = {
+      createChart: (chartShape, renderer) => {
+        const settings = barChartWidgetBarsChartSettings(this.settings);
+        return new TbBarsChart(this.ctx, settings, chartShape.nativeElement, renderer, this.translate, true);
+      }
+    };
+  }
+
+  public onInit() {
+    this.latestChart?.onInit();
+  }
+
+  public onDataUpdated() {
+    this.latestChart?.onDataUpdated();
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.models.ts
new file mode 100644
index 0000000000..b51368b071
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.models.ts
@@ -0,0 +1,78 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import {
+  latestChartWidgetDefaultSettings,
+  LatestChartWidgetSettings
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import { mergeDeep } from '@core/utils';
+import {
+  barsChartAnimationDefaultSettings,
+  BarsChartSettings
+} from '@home/components/widget/lib/chart/bars-chart.models';
+import { Font } from '@shared/models/widget-settings.models';
+import { DeepPartial } from '@shared/models/common';
+import {
+  ChartAnimationSettings,
+  chartBarDefaultSettings,
+  ChartBarSettings,
+  chartColorScheme
+} from '@home/components/widget/lib/chart/chart.models';
+
+export interface BarChartWidgetSettings extends LatestChartWidgetSettings {
+  axisMin?: number;
+  axisMax?: number;
+  axisTickLabelFont: Font;
+  axisTickLabelColor: string;
+  barSettings: ChartBarSettings;
+}
+
+export const barChartWidgetDefaultSettings: BarChartWidgetSettings = {
+  ...latestChartWidgetDefaultSettings,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    barsChartAnimationDefaultSettings),
+  axisTickLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  axisTickLabelColor: chartColorScheme['axis.tickLabel'].light,
+  barSettings: mergeDeep({} as ChartBarSettings, chartBarDefaultSettings,
+    {barWidth: 80, showLabel: true} as ChartBarSettings)
+};
+
+export const barChartWidgetBarsChartSettings = (settings: BarChartWidgetSettings): DeepPartial<BarsChartSettings> => ({
+  polar: false,
+  axisMin: settings.axisMin,
+  axisMax: settings.axisMax,
+  axisTickLabelFont: settings.axisTickLabelFont,
+  axisTickLabelColor: settings.axisTickLabelColor,
+  barSettings: settings.barSettings,
+  sortSeries: settings.sortSeries,
+  showTotal: false,
+  animation: settings.animation,
+  showLegend: settings.showLegend,
+  showTooltip: settings.showTooltip,
+  tooltipValueType: settings.tooltipValueType,
+  tooltipValueDecimals: settings.tooltipValueDecimals,
+  tooltipValueFont: settings.tooltipValueFont,
+  tooltipValueColor: settings.tooltipValueColor,
+  tooltipBackgroundColor: settings.tooltipBackgroundColor,
+  tooltipBackgroundBlur: settings.tooltipBackgroundBlur
+});
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts
index 5351b219a3..185922a3eb 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts
@@ -23,17 +23,10 @@ import {
   textStyle
 } from '@shared/models/widget-settings.models';
 import { LegendPosition } from '@shared/models/widget.models';
-import {
-  echartsAnimationDefaultSettings,
-  EChartsAnimationSettings,
-  EChartsTooltipWidgetSettings
-} from '@home/components/widget/lib/chart/echarts-widget.models';
 import { DeepPartial } from '@shared/models/common';
 import {
   defaultTimeSeriesChartXAxisSettings,
   defaultTimeSeriesChartYAxisSettings,
-  SeriesFillSettings,
-  SeriesFillType,
   timeSeriesChartGridDefaultSettings,
   TimeSeriesChartGridSettings,
   TimeSeriesChartKeySettings,
@@ -42,14 +35,21 @@ import {
   TimeSeriesChartSeriesType,
   TimeSeriesChartSettings,
   TimeSeriesChartThreshold,
+  TimeSeriesChartTooltipWidgetSettings,
   TimeSeriesChartXAxisSettings,
   TimeSeriesChartYAxisSettings
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { CallbackDataParams, LabelLayoutOptionCallbackParams } from 'echarts/types/dist/shared';
 import { formatValue, mergeDeep } from '@core/utils';
 import { LabelLayoutOption } from 'echarts/types/src/util/types';
+import {
+  chartAnimationDefaultSettings,
+  ChartAnimationSettings,
+  ChartFillSettings,
+  ChartFillType
+} from '@home/components/widget/lib/chart/chart.models';
 
-export interface BarChartWithLabelsWidgetSettings extends EChartsTooltipWidgetSettings {
+export interface BarChartWithLabelsWidgetSettings extends TimeSeriesChartTooltipWidgetSettings {
   dataZoom: boolean;
   showBarLabel: boolean;
   barLabelFont: Font;
@@ -60,12 +60,12 @@ export interface BarChartWithLabelsWidgetSettings extends EChartsTooltipWidgetSe
   showBarBorder: boolean;
   barBorderWidth: number;
   barBorderRadius: number;
-  barBackgroundSettings: SeriesFillSettings;
+  barBackgroundSettings: ChartFillSettings;
   noAggregationBarWidthSettings: TimeSeriesChartNoAggregationBarWidthSettings;
   grid: TimeSeriesChartGridSettings;
   yAxis: TimeSeriesChartYAxisSettings;
   xAxis: TimeSeriesChartXAxisSettings;
-  animation: EChartsAnimationSettings;
+  animation: ChartAnimationSettings;
   thresholds: TimeSeriesChartThreshold[];
   showLegend: boolean;
   legendPosition: LegendPosition;
@@ -101,7 +101,7 @@ export const barChartWithLabelsDefaultSettings: BarChartWithLabelsWidgetSettings
   barBorderWidth: 2,
   barBorderRadius: 0,
   barBackgroundSettings: {
-    type: SeriesFillType.none,
+    type: ChartFillType.none,
     opacity: 0.4,
     gradient: {
       start: 100,
@@ -118,8 +118,8 @@ export const barChartWithLabelsDefaultSettings: BarChartWithLabelsWidgetSettings
   xAxis: mergeDeep({} as TimeSeriesChartXAxisSettings,
     defaultTimeSeriesChartXAxisSettings,
     {showTicks: false, showSplitLines: false} as TimeSeriesChartXAxisSettings),
-  animation: mergeDeep({} as EChartsAnimationSettings,
-    echartsAnimationDefaultSettings),
+  animation: mergeDeep({} as ChartAnimationSettings,
+    chartAnimationDefaultSettings),
   thresholds: [],
   showLegend: true,
   legendPosition: LegendPosition.top,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bars-chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bars-chart.models.ts
new file mode 100644
index 0000000000..a099d11f7d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bars-chart.models.ts
@@ -0,0 +1,61 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { latestChartDefaultSettings, LatestChartSettings } from '@home/components/widget/lib/chart/latest-chart.models';
+import { mergeDeep } from '@core/utils';
+import {
+  chartAnimationDefaultSettings,
+  ChartAnimationSettings,
+  chartBarDefaultSettings,
+  ChartBarSettings,
+  chartColorScheme
+} from '@home/components/widget/lib/chart/chart.models';
+import { Font } from '@shared/models/widget-settings.models';
+
+export interface BarsChartSettings extends LatestChartSettings {
+  polar: boolean;
+  axisMin?: number | string;
+  axisMax?: number | string;
+  axisTickLabelFont: Font;
+  axisTickLabelColor: string;
+  angleAxisStartAngle?: number;
+  barSettings: ChartBarSettings;
+}
+
+export const barsChartAnimationDefaultSettings: ChartAnimationSettings =
+  mergeDeep({} as ChartAnimationSettings, chartAnimationDefaultSettings, {
+    animationDuration: 1000,
+    animationDurationUpdate: 500
+  } as ChartAnimationSettings);
+
+export const barsChartDefaultSettings: BarsChartSettings = {
+  ...latestChartDefaultSettings,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    barsChartAnimationDefaultSettings),
+  polar: false,
+  axisTickLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  axisTickLabelColor: chartColorScheme['axis.tickLabel'].light,
+  angleAxisStartAngle: 0,
+  barSettings: mergeDeep({} as ChartBarSettings, chartBarDefaultSettings,
+    {barWidth: 80, showLabel: true} as ChartBarSettings)
+};
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bars-chart.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bars-chart.ts
new file mode 100644
index 0000000000..f661223983
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bars-chart.ts
@@ -0,0 +1,173 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { TbLatestChart } from '@home/components/widget/lib/chart/latest-chart';
+import { barsChartDefaultSettings, BarsChartSettings } from '@home/components/widget/lib/chart/bars-chart.models';
+import { WidgetContext } from '@home/models/widget-component.models';
+import { DeepPartial } from '@shared/models/common';
+import { PieChartSettings } from '@home/components/widget/lib/chart/pie-chart.models';
+import { Renderer2 } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { ComponentStyle } from '@shared/models/widget-settings.models';
+import { LinearGradientObject } from 'zrender/lib/graphic/LinearGradient';
+import tinycolor from 'tinycolor2';
+import { BarDataItemOption, BarSeriesLabelOption } from 'echarts/types/src/chart/bar/BarSeries';
+import { formatValue, isDefinedAndNotNull } from '@core/utils';
+import {
+  ChartFillType,
+  ChartLabelPosition,
+  createChartTextStyle,
+  createLinearOpacityGradient
+} from '@home/components/widget/lib/chart/chart.models';
+import { ValueAxisBaseOption } from 'echarts/types/src/coord/axisCommonTypes';
+import { RadiusAxisOption, YAXisOption } from 'echarts/types/dist/shared';
+
+export class TbBarsChart extends TbLatestChart<BarsChartSettings> {
+
+  constructor(ctx: WidgetContext,
+              inputSettings: DeepPartial<PieChartSettings>,
+              chartElement: HTMLElement,
+              renderer: Renderer2,
+              translate: TranslateService,
+              autoResize = true) {
+
+    super(ctx, inputSettings, chartElement, renderer, translate, autoResize);
+  }
+
+  protected defaultSettings(): BarsChartSettings {
+    return barsChartDefaultSettings;
+  }
+
+  protected prepareLatestChartOption() {
+    let labelStyle: ComponentStyle = {};
+    if (this.settings.barSettings.showLabel) {
+      labelStyle = createChartTextStyle(this.settings.barSettings.labelFont,
+        this.settings.barSettings.labelColor, false, 'series.label', false);
+    }
+    const labelOption: BarSeriesLabelOption = {
+      show: this.settings.barSettings.showLabel,
+      position: this.settings.barSettings.labelPosition,
+      formatter: (params) => `{label|${params.name}}`,
+      rich: {
+        label: labelStyle
+      }
+    };
+    if (this.settings.barSettings.enableLabelBackground) {
+      labelOption.backgroundColor = this.settings.barSettings.labelBackground;
+      labelOption.padding = [4, 5];
+      labelOption.borderRadius = 4;
+    }
+    this.latestChartOption.series = [
+      {
+        type: 'bar',
+        barWidth: isDefinedAndNotNull(this.settings.barSettings.barWidth) ? this.settings.barSettings.barWidth + '%' : undefined,
+        itemStyle: {
+          borderWidth: this.settings.barSettings.showBorder ? this.settings.barSettings.borderWidth : 0
+        },
+        emphasis: {
+          focus: 'self'
+        },
+        coordinateSystem: this.settings.polar ? 'polar' : 'cartesian2d',
+        label: labelOption,
+        animation: this.settings.animation.animation,
+        animationThreshold: this.settings.animation.animationThreshold,
+        animationDuration: this.settings.animation.animationDuration,
+        animationEasing: this.settings.animation.animationEasing,
+        animationDelay: this.settings.animation.animationDelay,
+        animationDurationUpdate: this.settings.animation.animationDurationUpdate,
+        animationEasingUpdate: this.settings.animation.animationEasingUpdate,
+        animationDelayUpdate: this.settings.animation.animationDelayUpdate
+      }
+    ];
+
+    const axisTickLabelStyle = createChartTextStyle(this.settings.axisTickLabelFont,
+      this.settings.axisTickLabelColor, false, 'axis.tickLabel');
+    const valueAxis: ValueAxisBaseOption = {
+      type: 'value',
+      min: this.settings.axisMin,
+      max: this.settings.axisMax,
+      axisLabel: {
+        color: axisTickLabelStyle.color,
+        fontStyle: axisTickLabelStyle.fontStyle,
+        fontWeight: axisTickLabelStyle.fontWeight,
+        fontFamily: axisTickLabelStyle.fontFamily,
+        fontSize: axisTickLabelStyle.fontSize,
+        formatter: (value: any) => formatValue(value, this.decimals, this.units, false)
+      }
+    };
+    if (this.settings.polar) {
+      this.latestChartOption.polar = {
+        radius: '100%'
+      };
+      this.latestChartOption.radiusAxis = valueAxis as RadiusAxisOption;
+      this.latestChartOption.angleAxis = {
+        type: 'category',
+        data: [],
+        startAngle: this.settings.angleAxisStartAngle
+      };
+    } else {
+      let minTop = 0;
+      let minBottom = 0;
+      if (this.settings.barSettings.showLabel) {
+        if (this.settings.barSettings.labelPosition === ChartLabelPosition.top) {
+          minTop = this.settings.barSettings.labelFont.size;
+        } else if (this.settings.barSettings.labelPosition === ChartLabelPosition.bottom) {
+          minBottom = this.settings.barSettings.labelFont.size;
+        }
+      }
+      this.latestChartOption.grid = [{
+        containLabel: true,
+        top: minTop,
+        bottom: minBottom,
+        left: 0,
+        right: 0
+      }];
+      this.latestChartOption.xAxis = {
+        type: 'category',
+        data: []
+      };
+      this.latestChartOption.yAxis = valueAxis as YAXisOption;
+    }
+  }
+
+  protected doUpdateSeriesData() {
+    const seriesData: BarDataItemOption[] = [];
+    for (const dataItem of this.dataItems) {
+      if (dataItem.enabled && dataItem.hasValue) {
+        const barSettings = this.settings.barSettings;
+        let borderRadius: number[];
+        if (dataItem.value < 0) {
+          borderRadius = [0, 0, barSettings.borderRadius, barSettings.borderRadius];
+        } else {
+          borderRadius = [barSettings.borderRadius, barSettings.borderRadius, 0, 0];
+        }
+        let barColor: string | LinearGradientObject;
+        if (barSettings.backgroundSettings.type === ChartFillType.none) {
+          barColor = dataItem.dataKey.color;
+        } else if (barSettings.backgroundSettings.type === ChartFillType.opacity) {
+          barColor = tinycolor(dataItem.dataKey.color).setAlpha(barSettings.backgroundSettings.opacity).toRgbString();
+        } else {
+          barColor = createLinearOpacityGradient(dataItem.dataKey.color, barSettings.backgroundSettings.gradient);
+        }
+        seriesData.push(
+          {id: dataItem.id, value: dataItem.value, name: dataItem.dataKey.label,
+            itemStyle: {color: barColor, borderColor: dataItem.dataKey.color, borderRadius}}
+        );
+      }
+    }
+    this.latestChartOption.series[0].data = seriesData;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/chart.models.ts
new file mode 100644
index 0000000000..1f81f4bc3e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/chart.models.ts
@@ -0,0 +1,316 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { isNumber } from '@core/utils';
+import { TbColorScheme } from '@shared/models/color.models';
+import { LinearGradientObject } from 'zrender/lib/graphic/LinearGradient';
+import tinycolor from 'tinycolor2';
+import { ComponentStyle, Font, textStyle } from '@shared/models/widget-settings.models';
+import { LabelFormatterCallback } from 'echarts';
+import { LabelLayoutOption } from 'echarts/types/src/util/types';
+import { LabelLayoutOptionCallback } from 'echarts/types/dist/shared';
+import { BuiltinTextPosition } from 'zrender/src/core/types';
+
+export const chartColorScheme: TbColorScheme = {
+  'threshold.line': {
+    light: 'rgba(0, 0, 0, 0.76)',
+    dark: '#eee'
+  },
+  'threshold.label': {
+    light: 'rgba(0, 0, 0, 0.76)',
+    dark: '#eee'
+  },
+  'axis.line': {
+    light: 'rgba(0, 0, 0, 0.54)',
+    dark: '#B9B8CE'
+  },
+  'axis.label': {
+    light: 'rgba(0, 0, 0, 0.54)',
+    dark: '#B9B8CE'
+  },
+  'axis.ticks': {
+    light: 'rgba(0, 0, 0, 0.54)',
+    dark: '#B9B8CE'
+  },
+  'axis.tickLabel': {
+    light: 'rgba(0, 0, 0, 0.54)',
+    dark: '#B9B8CE'
+  },
+  'axis.splitLine': {
+    light: 'rgba(0, 0, 0, 0.12)',
+    dark: '#484753'
+  },
+  'series.label': {
+    light: 'rgba(0, 0, 0, 0.76)',
+    dark: '#eee'
+  }
+};
+
+export enum ChartShape {
+  emptyCircle = 'emptyCircle',
+  circle = 'circle',
+  rect = 'rect',
+  roundRect = 'roundRect',
+  triangle = 'triangle',
+  diamond = 'diamond',
+  pin = 'pin',
+  arrow = 'arrow',
+  none = 'none'
+}
+
+export const chartShapes = Object.keys(ChartShape) as ChartShape[];
+
+export const chartShapeTranslations = new Map<ChartShape, string>(
+  [
+    [ChartShape.emptyCircle, 'widgets.chart.shape-empty-circle'],
+    [ChartShape.circle, 'widgets.chart.shape-circle'],
+    [ChartShape.rect, 'widgets.chart.shape-rect'],
+    [ChartShape.roundRect, 'widgets.chart.shape-round-rect'],
+    [ChartShape.triangle, 'widgets.chart.shape-triangle'],
+    [ChartShape.diamond, 'widgets.chart.shape-diamond'],
+    [ChartShape.pin, 'widgets.chart.shape-pin'],
+    [ChartShape.arrow, 'widgets.chart.shape-arrow'],
+    [ChartShape.none, 'widgets.chart.shape-none']
+  ]
+);
+
+export enum ChartAnimationEasing {
+  linear = 'linear',
+  quadraticIn = 'quadraticIn',
+  quadraticOut = 'quadraticOut',
+  quadraticInOut = 'quadraticInOut',
+  cubicIn = 'cubicIn',
+  cubicOut = 'cubicOut',
+  cubicInOut = 'cubicInOut',
+  quarticIn = 'quarticIn',
+  quarticOut = 'quarticOut',
+  quarticInOut = 'quarticInOut',
+  quinticIn = 'quinticIn',
+  quinticOut = 'quinticOut',
+  quinticInOut = 'quinticInOut',
+  sinusoidalIn = 'sinusoidalIn',
+  sinusoidalOut = 'sinusoidalOut',
+  sinusoidalInOut = 'sinusoidalInOut',
+  exponentialIn = 'exponentialIn',
+  exponentialOut = 'exponentialOut',
+  exponentialInOut = 'exponentialInOut',
+  circularIn = 'circularIn',
+  circularOut = 'circularOut',
+  circularInOut = 'circularInOut',
+  elasticIn = 'elasticIn',
+  elasticOut = 'elasticOut',
+  elasticInOut = 'elasticInOut',
+  backIn = 'backIn',
+  backOut = 'backOut',
+  backInOut = 'backInOut',
+  bounceIn = 'bounceIn',
+  bounceOut = 'bounceOut',
+  bounceInOut = 'bounceInOut'
+}
+
+export const chartAnimationEasings = Object.keys(ChartAnimationEasing) as ChartAnimationEasing[];
+
+export enum ChartFillType {
+  none = 'none',
+  opacity = 'opacity',
+  gradient = 'gradient'
+}
+
+export const chartFillTypes = Object.keys(ChartFillType) as ChartFillType[];
+
+export const chartFillTypeTranslations = new Map<ChartFillType, string>(
+  [
+    [ChartFillType.none, 'widgets.chart.fill-type-none'],
+    [ChartFillType.opacity, 'widgets.chart.fill-type-opacity'],
+    [ChartFillType.gradient, 'widgets.chart.fill-type-gradient']
+  ]
+);
+
+export enum ChartLabelPosition {
+  top = 'top',
+  bottom = 'bottom'
+}
+
+export const chartLabelPositions = Object.keys(ChartLabelPosition) as ChartLabelPosition[];
+
+export const chartLabelPositionTranslations = new Map<ChartLabelPosition, string>(
+  [
+    [ChartLabelPosition.top, 'widgets.chart.label-position-top'],
+    [ChartLabelPosition.bottom, 'widgets.chart.label-position-bottom']
+  ]
+);
+
+export enum PieChartLabelPosition {
+  inside = 'inside',
+  outside = 'outside'
+}
+
+export const pieChartLabelPositions = Object.keys(PieChartLabelPosition) as PieChartLabelPosition[];
+
+export const pieChartLabelPositionTranslations = new Map<PieChartLabelPosition, string>(
+  [
+    [PieChartLabelPosition.inside, 'widgets.chart.label-position-inside'],
+    [PieChartLabelPosition.outside, 'widgets.chart.label-position-outside']
+  ]
+);
+
+export interface ChartAnimationSettings {
+  animation: boolean;
+  animationThreshold: number;
+  animationDuration: number;
+  animationEasing: ChartAnimationEasing;
+  animationDelay: number;
+  animationDurationUpdate: number;
+  animationEasingUpdate: ChartAnimationEasing;
+  animationDelayUpdate: number;
+}
+
+export const chartAnimationDefaultSettings: ChartAnimationSettings = {
+  animation: true,
+  animationThreshold: 2000,
+  animationDuration: 500,
+  animationEasing: ChartAnimationEasing.cubicOut,
+  animationDelay: 0,
+  animationDurationUpdate: 300,
+  animationEasingUpdate: ChartAnimationEasing.cubicOut,
+  animationDelayUpdate: 0
+};
+
+export interface ChartFillSettings {
+  type: ChartFillType;
+  opacity: number;
+  gradient: {
+    start: number;
+    end: number;
+  };
+}
+
+export interface ChartBarSettings {
+  showBorder: boolean;
+  borderWidth: number;
+  borderRadius: number;
+  barWidth?: number;
+  showLabel: boolean;
+  labelPosition: ChartLabelPosition | PieChartLabelPosition | BuiltinTextPosition;
+  labelFont: Font;
+  labelColor: string;
+  enableLabelBackground: boolean;
+  labelBackground: string;
+  labelFormatter?: string | LabelFormatterCallback;
+  labelLayout?: LabelLayoutOption | LabelLayoutOptionCallback;
+  additionalLabelOption?: {[key: string]: any};
+  backgroundSettings: ChartFillSettings;
+}
+
+export const chartBarDefaultSettings: ChartBarSettings = {
+  showBorder: false,
+  borderWidth: 2,
+  borderRadius: 0,
+  showLabel: false,
+  labelPosition: ChartLabelPosition.top,
+  labelFont: {
+    family: 'Roboto',
+    size: 11,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  labelColor: chartColorScheme['series.label'].light,
+  enableLabelBackground: false,
+  labelBackground: 'rgba(255,255,255,0.56)',
+  backgroundSettings: {
+    type: ChartFillType.none,
+    opacity: 0.4,
+    gradient: {
+      start: 100,
+      end: 0
+    }
+  }
+};
+
+type ChartShapeOffsetFunction = (size: number) => number;
+
+const chartShapeOffsetFunctions = new Map<ChartShape, ChartShapeOffsetFunction>(
+  [
+    [ChartShape.emptyCircle, size => size / 2 + 1],
+    [ChartShape.circle, size => size / 2],
+    [ChartShape.rect, size => size / 2],
+    [ChartShape.roundRect, size => size / 2],
+    [ChartShape.triangle, size => size / 2],
+    [ChartShape.diamond, size => size / 2],
+    [ChartShape.pin, size => size],
+    [ChartShape.arrow, () => 0],
+    [ChartShape.none, () => 0],
+  ]
+);
+
+export const measureSymbolOffset = (symbol: string, symbolSize: any): number => {
+  if (isNumber(symbolSize)) {
+    if (symbol) {
+      const offsetFunction = chartShapeOffsetFunctions.get(symbol as ChartShape);
+      if (offsetFunction) {
+        return offsetFunction(symbolSize);
+      } else {
+        return symbolSize / 2;
+      }
+    }
+  } else {
+    return 0;
+  }
+};
+
+export const createLinearOpacityGradient = (color: string, gradient: {start: number; end: number}): LinearGradientObject => ({
+  type: 'linear',
+  x: 0,
+  y: 0,
+  x2: 0,
+  y2: 1,
+  colorStops: [{
+    offset: 0, color: tinycolor(color).setAlpha(gradient.start / 100).toRgbString() // color at 0%
+  }, {
+    offset: 1, color: tinycolor(color).setAlpha(gradient.end / 100).toRgbString() // color at 100%
+  }],
+  global: false
+});
+
+export const createChartTextStyle = (font: Font, color: string, darkMode: boolean, colorKey?: string, fill = false): ComponentStyle => {
+  const style = textStyle(font);
+  delete style.lineHeight;
+  style.fontSize = font.size;
+  if (fill) {
+    style.fill = prepareChartThemeColor(color, darkMode, colorKey);
+  } else {
+    style.color = prepareChartThemeColor(color, darkMode, colorKey);
+  }
+  return style;
+};
+
+export const prepareChartThemeColor = (color: string, darkMode: boolean, colorKey?: string): string => {
+  if (darkMode) {
+    let colorInstance = tinycolor(color);
+    if (colorInstance.isDark()) {
+      if (colorKey && chartColorScheme[colorKey]) {
+        return chartColorScheme[colorKey].dark;
+      } else {
+        const rgb = colorInstance.toRgb();
+        colorInstance = tinycolor({r: 255 - rgb.r, g: 255 - rgb.g, b: 255 - rgb.b, a: rgb.a});
+        return colorInstance.toRgbString();
+      }
+    }
+  }
+  return color;
+};
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts
index d059e0186c..c8c6f724e5 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts
@@ -14,16 +14,16 @@
 /// limitations under the License.
 ///
 
-import { BackgroundType, ColorSettings, constantColor, Font } from '@shared/models/widget-settings.models';
+import { ColorSettings, constantColor, Font } from '@shared/models/widget-settings.models';
 import { LegendPosition } from '@shared/models/widget.models';
 import { pieChartAnimationDefaultSettings, PieChartSettings } from '@home/components/widget/lib/chart/pie-chart.models';
 import { DeepPartial } from '@shared/models/common';
 import {
-  LatestChartTooltipValueType,
+  latestChartWidgetDefaultSettings,
   LatestChartWidgetSettings
 } from '@home/components/widget/lib/chart/latest-chart.models';
 import { mergeDeep } from '@core/utils';
-import { EChartsAnimationSettings } from '@home/components/widget/lib/chart/echarts-widget.models';
+import { ChartAnimationSettings } from '@home/components/widget/lib/chart/chart.models';
 
 export enum DoughnutLayout {
   default = 'default',
@@ -61,10 +61,14 @@ export interface DoughnutWidgetSettings extends LatestChartWidgetSettings {
 }
 
 export const doughnutDefaultSettings = (horizontal: boolean): DoughnutWidgetSettings => ({
-  layout: DoughnutLayout.default,
+  ...latestChartWidgetDefaultSettings,
   autoScale: true,
-  clockwise: false,
   sortSeries: false,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    pieChartAnimationDefaultSettings),
+  legendPosition: horizontal ? LegendPosition.right : LegendPosition.bottom,
+  layout: DoughnutLayout.default,
+  clockwise: false,
   totalValueFont: {
     family: 'Roboto',
     size: 24,
@@ -73,52 +77,7 @@ export const doughnutDefaultSettings = (horizontal: boolean): DoughnutWidgetSett
     weight: '500',
     lineHeight: '1'
   },
-  totalValueColor: constantColor('rgba(0, 0, 0, 0.87)'),
-  animation: mergeDeep({} as EChartsAnimationSettings,
-    pieChartAnimationDefaultSettings),
-  showLegend: true,
-  legendPosition: horizontal ? LegendPosition.right : LegendPosition.bottom,
-  legendLabelFont: {
-    family: 'Roboto',
-    size: 12,
-    sizeUnit: 'px',
-    style: 'normal',
-    weight: '400',
-    lineHeight: '16px'
-  },
-  legendLabelColor: 'rgba(0, 0, 0, 0.38)',
-  legendValueFont: {
-    family: 'Roboto',
-    size: 14,
-    sizeUnit: 'px',
-    style: 'normal',
-    weight: '500',
-    lineHeight: '20px'
-  },
-  legendValueColor: 'rgba(0, 0, 0, 0.87)',
-  showTooltip: true,
-  tooltipValueType: LatestChartTooltipValueType.percentage,
-  tooltipValueDecimals: 0,
-  tooltipValueFont: {
-    family: 'Roboto',
-    size: 13,
-    sizeUnit: 'px',
-    style: 'normal',
-    weight: '500',
-    lineHeight: '16px'
-  },
-  tooltipValueColor: 'rgba(0, 0, 0, 0.76)',
-  tooltipBackgroundColor: 'rgba(255, 255, 255, 0.76)',
-  tooltipBackgroundBlur: 4,
-  background: {
-    type: BackgroundType.color,
-    color: '#fff',
-    overlay: {
-      enabled: false,
-      color: 'rgba(255,255,255,0.72)',
-      blur: 3
-    }
-  }
+  totalValueColor: constantColor('rgba(0, 0, 0, 0.87)')
 });
 
 export const doughnutPieChartSettings = (settings: DoughnutWidgetSettings): DeepPartial<PieChartSettings> => ({
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/echarts-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/echarts-widget.models.ts
index a225973b82..121d46c86d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/echarts-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/echarts-widget.models.ts
@@ -17,7 +17,6 @@
 import * as echarts from 'echarts/core';
 import AxisModel from 'echarts/types/src/coord/cartesian/AxisModel';
 import { estimateLabelUnionRect } from 'echarts/lib/coord/axisHelper';
-import { isDefinedAndNotNull, isFunction, isNumber } from '@core/utils';
 import {
   DataZoomComponent,
   DataZoomComponentOption,
@@ -25,6 +24,8 @@ import {
   GridComponentOption,
   MarkLineComponent,
   MarkLineComponentOption,
+  PolarComponent,
+  PolarComponentOption,
   TooltipComponent,
   TooltipComponentOption,
   VisualMapComponent,
@@ -42,21 +43,12 @@ import {
 } from 'echarts/charts';
 import { LabelLayout } from 'echarts/features';
 import { CanvasRenderer, SVGRenderer } from 'echarts/renderers';
-import { DataEntry, DataKey, DataSet, Datasource, FormattedData } from '@shared/models/widget.models';
-import {
-  calculateAggIntervalWithWidgetTimeWindow,
-  Interval,
-  IntervalMath,
-  WidgetTimewindow
-} from '@shared/models/time/time.models';
-import { CallbackDataParams, TimeAxisBandWidthCalculator } from 'echarts/types/dist/shared';
-import { Renderer2 } from '@angular/core';
-import { DateFormatProcessor, DateFormatSettings, Font } from '@shared/models/widget-settings.models';
+import { CallbackDataParams } from 'echarts/types/dist/shared';
 import GlobalModel from 'echarts/types/src/model/Global';
 import Axis2D from 'echarts/types/src/coord/cartesian/Axis2D';
 import SeriesModel from 'echarts/types/src/model/Series';
 import { MarkLine2DDataItemOption } from 'echarts/types/src/component/marker/MarkLineModel';
-import { TimeAxisBaseOption } from 'echarts/types/src/coord/axisCommonTypes';
+import { measureSymbolOffset } from '@home/components/widget/lib/chart/chart.models';
 
 class EChartsModule {
   private initialized = false;
@@ -69,6 +61,7 @@ class EChartsModule {
         VisualMapComponent,
         DataZoomComponent,
         MarkLineComponent,
+        PolarComponent,
         LineChart,
         BarChart,
         PieChart,
@@ -90,6 +83,7 @@ export type EChartsOption = echarts.ComposeOption<
   | VisualMapComponentOption
   | DataZoomComponentOption
   | MarkLineComponentOption
+  | PolarComponentOption
   | LineSeriesOption
   | CustomSeriesOption
   | BarSeriesOption
@@ -98,166 +92,6 @@ export type EChartsOption = echarts.ComposeOption<
 
 export type ECharts = echarts.ECharts;
 
-export type EChartsDataItem = [number, any, number, number];
-
-export type NamedDataSet = {name: string; value: EChartsDataItem}[];
-
-export type EChartsTooltipValueFormatFunction = (value: any, latestData: FormattedData, units?: string, decimals?: number) => string;
-
-export type EChartsSeriesItem = {
-  id: string;
-  datasource: Datasource;
-  dataKey: DataKey;
-  data: NamedDataSet;
-  dataSet?: DataSet;
-  enabled: boolean;
-  units?: string;
-  decimals?: number;
-  latestData?: FormattedData;
-  tooltipValueFormatFunction?: EChartsTooltipValueFormatFunction;
-  comparisonItem?: boolean;
-};
-
-export enum EChartsShape {
-  emptyCircle = 'emptyCircle',
-  circle = 'circle',
-  rect = 'rect',
-  roundRect = 'roundRect',
-  triangle = 'triangle',
-  diamond = 'diamond',
-  pin = 'pin',
-  arrow = 'arrow',
-  none = 'none'
-}
-
-export const echartsShapes = Object.keys(EChartsShape) as EChartsShape[];
-
-export const echartsShapeTranslations = new Map<EChartsShape, string>(
-  [
-    [EChartsShape.emptyCircle, 'widgets.time-series-chart.shape-empty-circle'],
-    [EChartsShape.circle, 'widgets.time-series-chart.shape-circle'],
-    [EChartsShape.rect, 'widgets.time-series-chart.shape-rect'],
-    [EChartsShape.roundRect, 'widgets.time-series-chart.shape-round-rect'],
-    [EChartsShape.triangle, 'widgets.time-series-chart.shape-triangle'],
-    [EChartsShape.diamond, 'widgets.time-series-chart.shape-diamond'],
-    [EChartsShape.pin, 'widgets.time-series-chart.shape-pin'],
-    [EChartsShape.arrow, 'widgets.time-series-chart.shape-arrow'],
-    [EChartsShape.none, 'widgets.time-series-chart.shape-none']
-  ]
-);
-
-type EChartsShapeOffsetFunction = (size: number) => number;
-
-export const timeSeriesChartShapeOffsetFunctions = new Map<EChartsShape, EChartsShapeOffsetFunction>(
-  [
-    [EChartsShape.emptyCircle, size => size / 2 + 1],
-    [EChartsShape.circle, size => size / 2],
-    [EChartsShape.rect, size => size / 2],
-    [EChartsShape.roundRect, size => size / 2],
-    [EChartsShape.triangle, size => size / 2],
-    [EChartsShape.diamond, size => size / 2],
-    [EChartsShape.pin, size => size],
-    [EChartsShape.arrow, () => 0],
-    [EChartsShape.none, () => 0],
-  ]
-);
-
-export enum EChartsAnimationEasing {
-  linear = 'linear',
-  quadraticIn = 'quadraticIn',
-  quadraticOut = 'quadraticOut',
-  quadraticInOut = 'quadraticInOut',
-  cubicIn = 'cubicIn',
-  cubicOut = 'cubicOut',
-  cubicInOut = 'cubicInOut',
-  quarticIn = 'quarticIn',
-  quarticOut = 'quarticOut',
-  quarticInOut = 'quarticInOut',
-  quinticIn = 'quinticIn',
-  quinticOut = 'quinticOut',
-  quinticInOut = 'quinticInOut',
-  sinusoidalIn = 'sinusoidalIn',
-  sinusoidalOut = 'sinusoidalOut',
-  sinusoidalInOut = 'sinusoidalInOut',
-  exponentialIn = 'exponentialIn',
-  exponentialOut = 'exponentialOut',
-  exponentialInOut = 'exponentialInOut',
-  circularIn = 'circularIn',
-  circularOut = 'circularOut',
-  circularInOut = 'circularInOut',
-  elasticIn = 'elasticIn',
-  elasticOut = 'elasticOut',
-  elasticInOut = 'elasticInOut',
-  backIn = 'backIn',
-  backOut = 'backOut',
-  backInOut = 'backInOut',
-  bounceIn = 'bounceIn',
-  bounceOut = 'bounceOut',
-  bounceInOut = 'bounceInOut'
-}
-
-export const echartsAnimationEasings = Object.keys(EChartsAnimationEasing) as EChartsAnimationEasing[];
-
-export interface EChartsAnimationSettings {
-  animation: boolean;
-  animationThreshold: number;
-  animationDuration: number;
-  animationEasing: EChartsAnimationEasing;
-  animationDelay: number;
-  animationDurationUpdate: number;
-  animationEasingUpdate: EChartsAnimationEasing;
-  animationDelayUpdate: number;
-}
-
-export const echartsAnimationDefaultSettings: EChartsAnimationSettings = {
-  animation: true,
-  animationThreshold: 2000,
-  animationDuration: 500,
-  animationEasing: EChartsAnimationEasing.cubicOut,
-  animationDelay: 0,
-  animationDurationUpdate: 300,
-  animationEasingUpdate: EChartsAnimationEasing.cubicOut,
-  animationDelayUpdate: 0
-};
-
-export const timeAxisBandWidthCalculator: TimeAxisBandWidthCalculator = (model) => {
-  let interval: number;
-  const axisOption = model.option;
-  const seriesDataIndices = axisOption.axisPointer?.seriesDataIndices;
-  if (seriesDataIndices?.length) {
-    const seriesDataIndex = seriesDataIndices[0];
-    const series = model.ecModel.getSeriesByIndex(seriesDataIndex.seriesIndex);
-    if (series) {
-      const values = series.getData().getValues(seriesDataIndex.dataIndex);
-      const start = values[2];
-      const end = values[3];
-      if (typeof start === 'number' && typeof end === 'number') {
-        interval = Math.max(end - start, 1);
-      }
-    }
-  }
-  if (!interval) {
-    const tbTimeWindow: WidgetTimewindow = (axisOption as any).tbTimeWindow;
-    if (isDefinedAndNotNull(tbTimeWindow)) {
-      if (axisOption.axisPointer?.value && typeof axisOption.axisPointer?.value === 'number') {
-        const intervalArray = calculateAggIntervalWithWidgetTimeWindow(tbTimeWindow, axisOption.axisPointer.value);
-        const start = intervalArray[0];
-        const end = intervalArray[1];
-        interval = Math.max(end - start, 1);
-      } else {
-        interval = IntervalMath.numberValue(tbTimeWindow.interval);
-      }
-    }
-  }
-  if (interval) {
-    const timeScale = model.axis.scale;
-    const axisExtent = model.axis.getExtent();
-    const dataExtent = timeScale.getExtent();
-    const size = Math.abs(axisExtent[1] - axisExtent[0]);
-    return interval * (size / (dataExtent[1] - dataExtent[0]));
-  }
-};
-
 export const getAxis = (chart: ECharts, mainType: string, axisId: string): Axis2D => {
   const model: GlobalModel = (chart as any).getModel();
   const models = model.queryComponents({mainType, id: axisId});
@@ -298,21 +132,6 @@ const _calculateAxisSize = (axis: Axis2D): number => {
   return size;
 };
 
-const measureSymbolOffset = (symbol: string, symbolSize: any): number => {
-  if (isNumber(symbolSize)) {
-    if (symbol) {
-      const offsetFunction = timeSeriesChartShapeOffsetFunctions.get(symbol as EChartsShape);
-      if (offsetFunction) {
-        return offsetFunction(symbolSize);
-      } else {
-        return symbolSize / 2;
-      }
-    }
-  } else {
-    return 0;
-  }
-};
-
 export const measureThresholdOffset = (chart: ECharts, axisId: string, thresholdId: string, value: any): [number, number] => {
   const offset: [number, number] = [0,0];
   const axis = getAxis(chart, 'yAxis', axisId);
@@ -435,294 +254,3 @@ export const getFocusedSeriesIndex = (chart: ECharts): number => {
   }
   return -1;
 };
-
-export const toNamedData = (data: DataSet, valueConverter?: (value: any) => any): NamedDataSet => {
-  if (!data?.length) {
-    return [];
-  } else {
-    return data.map(d => {
-      const ts = isDefinedAndNotNull(d[2]) ? d[2][0] : d[0];
-      return {
-        name: ts + '',
-        value: toEChartsDataItem(d, valueConverter)
-      };
-    });
-  }
-};
-
-const minDataTs = (dataSet: NamedDataSet): number => dataSet.length ? dataSet.map(data =>
-  Number(data.name)).reduce((a, b) => Math.min(a, b)) : undefined;
-
-const maxDataTs = (dataSet: NamedDataSet): number => dataSet.length ? dataSet.map(data =>
-  Number(data.name)).reduce((a, b) => Math.max(a, b)) : undefined;
-
-export const adjustTimeAxisExtentToData = (timeAxisOption: TimeAxisBaseOption,
-                                           dataItems: EChartsSeriesItem[],
-                                           defaultMin: number,
-                                           defaultMax: number): void => {
-  let min: number;
-  let max: number;
-  for (const item of dataItems) {
-    if (item.enabled) {
-      const minTs = minDataTs(item.data);
-      if (typeof minTs !== 'undefined') {
-        min = (typeof min !== 'undefined') ? Math.min(min, minTs) : minTs;
-      }
-      const maxTs = maxDataTs(item.data);
-      if (typeof maxTs !== 'undefined') {
-        max = (typeof max !== 'undefined') ? Math.max(max, maxTs) : maxTs;
-      }
-    }
-  }
-  timeAxisOption.min = (typeof min !== 'undefined' && Math.abs(min - defaultMin) < 1000) ? min : defaultMin;
-  timeAxisOption.max = (typeof max !== 'undefined' && Math.abs(max - defaultMax) < 1000) ? max : defaultMax;
-};
-
-const toEChartsDataItem = (entry: DataEntry, valueConverter?: (value: any) => any): EChartsDataItem => {
-  const value = valueConverter ? valueConverter(entry[1]) : entry[1];
-  const item: EChartsDataItem = [entry[0], value, entry[0], entry[0]];
-  if (isDefinedAndNotNull(entry[2])) {
-    item[2] = entry[2][0];
-    item[3] = entry[2][1];
-  }
-  return item;
-};
-
-export enum EChartsTooltipTrigger {
-  point = 'point',
-  axis = 'axis'
-}
-
-export const tooltipTriggerTranslationMap = new Map<EChartsTooltipTrigger, string>(
-  [
-    [ EChartsTooltipTrigger.point, 'tooltip.trigger-point' ],
-    [ EChartsTooltipTrigger.axis, 'tooltip.trigger-axis' ]
-  ]
-);
-
-export interface EChartsTooltipWidgetSettings {
-  showTooltip: boolean;
-  tooltipTrigger?: EChartsTooltipTrigger;
-  tooltipShowFocusedSeries?: boolean;
-  tooltipLabelFont: Font;
-  tooltipLabelColor: string;
-  tooltipValueFont: Font;
-  tooltipValueColor: string;
-  tooltipValueFormatter?: string | EChartsTooltipValueFormatFunction;
-  tooltipShowDate: boolean;
-  tooltipDateInterval?: boolean;
-  tooltipDateFormat: DateFormatSettings;
-  tooltipDateFont: Font;
-  tooltipDateColor: string;
-  tooltipBackgroundColor: string;
-  tooltipBackgroundBlur: number;
-}
-
-export const createTooltipValueFormatFunction =
-  (tooltipValueFormatter: string | EChartsTooltipValueFormatFunction): EChartsTooltipValueFormatFunction => {
-  let tooltipValueFormatFunction: EChartsTooltipValueFormatFunction;
-  if (isFunction(tooltipValueFormatter)) {
-    tooltipValueFormatFunction = tooltipValueFormatter as EChartsTooltipValueFormatFunction;
-  } else if (typeof tooltipValueFormatter === 'string' && tooltipValueFormatter.length) {
-    try {
-      tooltipValueFormatFunction =
-        new Function('value', 'latestData', tooltipValueFormatter) as EChartsTooltipValueFormatFunction;
-    } catch (e) {}
-  }
-  return tooltipValueFormatFunction;
-};
-
-export const echartsTooltipFormatter = (renderer: Renderer2,
-                                        tooltipDateFormat: DateFormatProcessor,
-                                        settings: EChartsTooltipWidgetSettings,
-                                        params: CallbackDataParams[] | CallbackDataParams,
-                                        valueFormatFunction: EChartsTooltipValueFormatFunction,
-                                        focusedSeriesIndex: number,
-                                        series?: EChartsSeriesItem[],
-                                        interval?: Interval): null | HTMLElement => {
-
-  const tooltipParams = mapTooltipParams(params, series, focusedSeriesIndex);
-  if (!tooltipParams.items.length && !tooltipParams.comparisonItems.length) {
-    return null;
-  }
-
-  const tooltipElement: HTMLElement = renderer.createElement('div');
-  renderer.setStyle(tooltipElement, 'display', 'flex');
-  renderer.setStyle(tooltipElement, 'flex-direction', 'column');
-  renderer.setStyle(tooltipElement, 'align-items', 'flex-start');
-  renderer.setStyle(tooltipElement, 'gap', '16px');
-
-  buildItemsTooltip(tooltipElement, tooltipParams.items, renderer, tooltipDateFormat, settings, valueFormatFunction, interval);
-  buildItemsTooltip(tooltipElement, tooltipParams.comparisonItems, renderer, tooltipDateFormat, settings, valueFormatFunction, interval);
-
-  return tooltipElement;
-};
-
-interface TooltipItem {
-  param: CallbackDataParams;
-  dataItem: EChartsSeriesItem;
-}
-
-interface TooltipParams {
-  items: TooltipItem[];
-  comparisonItems: TooltipItem[];
-}
-
-const buildItemsTooltip = (tooltipElement: HTMLElement,
-                           items: TooltipItem[],
-                           renderer: Renderer2,
-                           tooltipDateFormat: DateFormatProcessor,
-                           settings: EChartsTooltipWidgetSettings,
-                           valueFormatFunction: EChartsTooltipValueFormatFunction,
-                           interval?: Interval) => {
-  if (items.length) {
-    const tooltipItemsElement: HTMLElement = renderer.createElement('div');
-    renderer.setStyle(tooltipItemsElement, 'display', 'flex');
-    renderer.setStyle(tooltipItemsElement, 'flex-direction', 'column');
-    renderer.setStyle(tooltipItemsElement, 'align-items', 'flex-start');
-    renderer.setStyle(tooltipItemsElement, 'gap', '4px');
-    renderer.appendChild(tooltipElement, tooltipItemsElement);
-    if (settings.tooltipShowDate) {
-      renderer.appendChild(tooltipItemsElement,
-        constructEchartsTooltipDateElement(renderer, tooltipDateFormat, settings, items[0].param, interval));
-    }
-    for (const item of items) {
-      renderer.appendChild(tooltipItemsElement,
-        constructEchartsTooltipSeriesElement(renderer, settings, item, valueFormatFunction));
-    }
-  }
-};
-
-const mapTooltipParams = (params: CallbackDataParams[] | CallbackDataParams,
-                          series?: EChartsSeriesItem[],
-                          focusedSeriesIndex?: number): TooltipParams => {
-  const result: TooltipParams = {
-    items: [],
-    comparisonItems: []
-  };
-  if (!params || Array.isArray(params) && !params[0]) {
-    return result;
-  }
-  const firstParam = Array.isArray(params) ? params[0] : params;
-  if (!firstParam.value) {
-    return result;
-  }
-  let seriesParams: CallbackDataParams = null;
-  if (Array.isArray(params) && focusedSeriesIndex > -1) {
-    seriesParams = params.find(param => param.seriesIndex === focusedSeriesIndex);
-  } else if (!Array.isArray(params)) {
-    seriesParams = params;
-  }
-  if (seriesParams) {
-    appendTooltipItem(result, seriesParams, series);
-  } else if (Array.isArray(params)) {
-    for (seriesParams of params) {
-      appendTooltipItem(result, seriesParams, series);
-    }
-  }
-  return result;
-};
-
-const appendTooltipItem = (tooltipParams: TooltipParams, seriesParams: CallbackDataParams, series?: EChartsSeriesItem[]) => {
-  const dataItem = series?.find(s => s.id === seriesParams.seriesId);
-  const tooltipItem: TooltipItem = {
-    param: seriesParams,
-    dataItem
-  };
-  if (dataItem?.comparisonItem) {
-    tooltipParams.comparisonItems.push(tooltipItem);
-  } else {
-    tooltipParams.items.push(tooltipItem);
-  }
-};
-
-const constructEchartsTooltipDateElement = (renderer: Renderer2,
-                                            tooltipDateFormat: DateFormatProcessor,
-                                            settings: EChartsTooltipWidgetSettings,
-                                            param: CallbackDataParams,
-                                            interval?: Interval): HTMLElement => {
-  const dateElement: HTMLElement = renderer.createElement('div');
-  let dateText: string;
-  const startTs = param.value[2];
-  const endTs = param.value[3];
-  if (settings.tooltipDateInterval && startTs && endTs && (endTs - 1) > startTs) {
-    const startDateText = tooltipDateFormat.update(startTs, interval);
-    const endDateText = tooltipDateFormat.update(endTs - 1, interval);
-    if (startDateText === endDateText) {
-      dateText = startDateText;
-    } else {
-      dateText = startDateText + ' - ' + endDateText;
-    }
-  } else {
-    const ts = param.value[0];
-    dateText = tooltipDateFormat.update(ts, interval);
-  }
-  renderer.appendChild(dateElement, renderer.createText(dateText));
-  renderer.setStyle(dateElement, 'font-family', settings.tooltipDateFont.family);
-  renderer.setStyle(dateElement, 'font-size', settings.tooltipDateFont.size + settings.tooltipDateFont.sizeUnit);
-  renderer.setStyle(dateElement, 'font-style', settings.tooltipDateFont.style);
-  renderer.setStyle(dateElement, 'font-weight', settings.tooltipDateFont.weight);
-  renderer.setStyle(dateElement, 'line-height', settings.tooltipDateFont.lineHeight);
-  renderer.setStyle(dateElement, 'color', settings.tooltipDateColor);
-  return dateElement;
-};
-
-const constructEchartsTooltipSeriesElement = (renderer: Renderer2,
-                                              settings: EChartsTooltipWidgetSettings,
-                                              item: TooltipItem,
-                                              valueFormatFunction: EChartsTooltipValueFormatFunction): HTMLElement => {
-  const labelValueElement: HTMLElement = renderer.createElement('div');
-  renderer.setStyle(labelValueElement, 'display', 'flex');
-  renderer.setStyle(labelValueElement, 'flex-direction', 'row');
-  renderer.setStyle(labelValueElement, 'align-items', 'center');
-  renderer.setStyle(labelValueElement, 'align-self', 'stretch');
-  renderer.setStyle(labelValueElement, 'gap', '12px');
-  const labelElement: HTMLElement = renderer.createElement('div');
-  renderer.setStyle(labelElement, 'display', 'flex');
-  renderer.setStyle(labelElement, 'align-items', 'center');
-  renderer.setStyle(labelElement, 'gap', '8px');
-  renderer.appendChild(labelValueElement, labelElement);
-  const circleElement: HTMLElement = renderer.createElement('div');
-  renderer.setStyle(circleElement, 'width', '8px');
-  renderer.setStyle(circleElement, 'height', '8px');
-  renderer.setStyle(circleElement, 'border-radius', '50%');
-  renderer.setStyle(circleElement, 'background', item.param.color);
-  renderer.appendChild(labelElement, circleElement);
-  const labelTextElement: HTMLElement = renderer.createElement('div');
-  renderer.appendChild(labelTextElement, renderer.createText(item.param.seriesName));
-  renderer.setStyle(labelTextElement, 'font-family', settings.tooltipLabelFont.family);
-  renderer.setStyle(labelTextElement, 'font-size', settings.tooltipLabelFont.size + settings.tooltipLabelFont.sizeUnit);
-  renderer.setStyle(labelTextElement, 'font-style', settings.tooltipLabelFont.style);
-  renderer.setStyle(labelTextElement, 'font-weight', settings.tooltipLabelFont.weight);
-  renderer.setStyle(labelTextElement, 'line-height', settings.tooltipLabelFont.lineHeight);
-  renderer.setStyle(labelTextElement, 'color', settings.tooltipLabelColor);
-  renderer.appendChild(labelElement, labelTextElement);
-  const valueElement: HTMLElement = renderer.createElement('div');
-  let formatFunction = valueFormatFunction;
-  let latestData: FormattedData;
-  let units = '';
-  let decimals = 0;
-  if (item.dataItem) {
-    if (item.dataItem.tooltipValueFormatFunction) {
-      formatFunction = item.dataItem.tooltipValueFormatFunction;
-    }
-    latestData = item.dataItem.latestData;
-    units = item.dataItem.units;
-    decimals = item.dataItem.decimals;
-  }
-  if (!latestData) {
-    latestData = {} as FormattedData;
-  }
-  const value = formatFunction(item.param.value[1], latestData, units, decimals);
-  renderer.appendChild(valueElement, renderer.createText(value));
-  renderer.setStyle(valueElement, 'flex', '1');
-  renderer.setStyle(valueElement, 'text-align', 'end');
-  renderer.setStyle(valueElement, 'font-family', settings.tooltipValueFont.family);
-  renderer.setStyle(valueElement, 'font-size', settings.tooltipValueFont.size + settings.tooltipValueFont.sizeUnit);
-  renderer.setStyle(valueElement, 'font-style', settings.tooltipValueFont.style);
-  renderer.setStyle(valueElement, 'font-weight', settings.tooltipValueFont.weight);
-  renderer.setStyle(valueElement, 'line-height', settings.tooltipValueFont.lineHeight);
-  renderer.setStyle(valueElement, 'color', settings.tooltipValueColor);
-  renderer.appendChild(labelValueElement, valueElement);
-  return labelValueElement;
-};
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.models.ts
index c99cd5e773..22de664154 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.models.ts
@@ -15,11 +15,11 @@
 ///
 
 import { DataKey, Datasource, LegendPosition } from '@shared/models/widget.models';
-import { BackgroundSettings, Font } from '@shared/models/widget-settings.models';
+import { BackgroundSettings, BackgroundType, Font } from '@shared/models/widget-settings.models';
 import { Renderer2 } from '@angular/core';
 import { CallbackDataParams } from 'echarts/types/dist/shared';
-import { formatValue, isDefinedAndNotNull } from '@core/utils';
-import { EChartsAnimationSettings } from '@home/components/widget/lib/chart/echarts-widget.models';
+import { formatValue, isDefinedAndNotNull, mergeDeep } from '@core/utils';
+import { chartAnimationDefaultSettings, ChartAnimationSettings } from '@home/components/widget/lib/chart/chart.models';
 
 export interface LatestChartDataItem {
   id: number;
@@ -63,14 +63,40 @@ export interface LatestChartTooltipSettings {
   tooltipBackgroundBlur: number;
 }
 
+export const latestChartTooltipDefaultSettings: LatestChartTooltipSettings = {
+  showTooltip: true,
+  tooltipValueType: LatestChartTooltipValueType.percentage,
+  tooltipValueDecimals: 0,
+  tooltipValueFont: {
+    family: 'Roboto',
+    size: 13,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '500',
+    lineHeight: '16px'
+  },
+  tooltipValueColor: 'rgba(0, 0, 0, 0.76)',
+  tooltipBackgroundColor: 'rgba(255, 255, 255, 0.76)',
+  tooltipBackgroundBlur: 4
+};
+
 export interface LatestChartSettings extends LatestChartTooltipSettings {
   autoScale?: boolean;
   sortSeries: boolean;
   showTotal?: boolean;
   showLegend: boolean;
-  animation: EChartsAnimationSettings;
+  animation: ChartAnimationSettings;
 }
 
+export const latestChartDefaultSettings: LatestChartSettings = {
+  ...latestChartTooltipDefaultSettings,
+  autoScale: false,
+  sortSeries: false,
+  showTotal: false,
+  showLegend: true,
+  animation: mergeDeep({} as ChartAnimationSettings, chartAnimationDefaultSettings)
+};
+
 export interface LatestChartWidgetSettings extends LatestChartSettings {
   legendPosition: LegendPosition;
   legendLabelFont: Font;
@@ -80,6 +106,39 @@ export interface LatestChartWidgetSettings extends LatestChartSettings {
   background: BackgroundSettings;
 }
 
+export const latestChartWidgetDefaultSettings: LatestChartWidgetSettings = {
+  ...latestChartDefaultSettings,
+  showLegend: true,
+  legendPosition: LegendPosition.bottom,
+  legendLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '16px'
+  },
+  legendLabelColor: 'rgba(0, 0, 0, 0.38)',
+  legendValueFont: {
+    family: 'Roboto',
+    size: 14,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '500',
+    lineHeight: '20px'
+  },
+  legendValueColor: 'rgba(0, 0, 0, 0.87)',
+  background: {
+    type: BackgroundType.color,
+    color: '#fff',
+    overlay: {
+      enabled: false,
+      color: 'rgba(255,255,255,0.72)',
+      blur: 3
+    }
+  }
+};
+
 export const latestChartTooltipFormatter = (renderer: Renderer2,
                                             settings: LatestChartTooltipSettings,
                                             params: CallbackDataParams,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.models.ts
index 05dbef0959..fe6cc158e8 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.models.ts
@@ -15,19 +15,14 @@
 ///
 
 import {
-  LatestChartTooltipValueType,
+  latestChartWidgetDefaultSettings,
   LatestChartWidgetSettings
 } from '@home/components/widget/lib/chart/latest-chart.models';
-import { BackgroundType, Font } from '@shared/models/widget-settings.models';
-import { LegendPosition } from '@shared/models/widget.models';
+import { Font } from '@shared/models/widget-settings.models';
 import { DeepPartial } from '@shared/models/common';
-import {
-  pieChartAnimationDefaultSettings,
-  PieChartLabelPosition,
-  PieChartSettings
-} from '@home/components/widget/lib/chart/pie-chart.models';
+import { pieChartAnimationDefaultSettings, PieChartSettings } from '@home/components/widget/lib/chart/pie-chart.models';
 import { isDefinedAndNotNull, mergeDeep } from '@core/utils';
-import { EChartsAnimationSettings } from '@home/components/widget/lib/chart/echarts-widget.models';
+import { ChartAnimationSettings, PieChartLabelPosition } from '@home/components/widget/lib/chart/chart.models';
 
 export interface PieChartWidgetSettings extends LatestChartWidgetSettings {
   showLabel: boolean;
@@ -41,6 +36,9 @@ export interface PieChartWidgetSettings extends LatestChartWidgetSettings {
 }
 
 export const pieChartWidgetDefaultSettings: PieChartWidgetSettings = {
+  ...latestChartWidgetDefaultSettings,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    pieChartAnimationDefaultSettings),
   showLabel: true,
   labelPosition: PieChartLabelPosition.outside,
   labelFont: {
@@ -55,53 +53,7 @@ export const pieChartWidgetDefaultSettings: PieChartWidgetSettings = {
   borderWidth: 0,
   borderColor: '#000',
   radius: 80,
-  clockwise: false,
-  sortSeries: false,
-  animation: mergeDeep({} as EChartsAnimationSettings,
-    pieChartAnimationDefaultSettings),
-  showLegend: true,
-  legendPosition: LegendPosition.bottom,
-  legendLabelFont: {
-    family: 'Roboto',
-    size: 12,
-    sizeUnit: 'px',
-    style: 'normal',
-    weight: '400',
-    lineHeight: '16px'
-  },
-  legendLabelColor: 'rgba(0, 0, 0, 0.38)',
-  legendValueFont: {
-    family: 'Roboto',
-    size: 14,
-    sizeUnit: 'px',
-    style: 'normal',
-    weight: '500',
-    lineHeight: '20px'
-  },
-  legendValueColor: 'rgba(0, 0, 0, 0.87)',
-  showTooltip: true,
-  tooltipValueType: LatestChartTooltipValueType.percentage,
-  tooltipValueDecimals: 0,
-  tooltipValueFont: {
-    family: 'Roboto',
-    size: 13,
-    sizeUnit: 'px',
-    style: 'normal',
-    weight: '500',
-    lineHeight: '16px'
-  },
-  tooltipValueColor: 'rgba(0, 0, 0, 0.76)',
-  tooltipBackgroundColor: 'rgba(255, 255, 255, 0.76)',
-  tooltipBackgroundBlur: 4,
-  background: {
-    type: BackgroundType.color,
-    color: '#fff',
-    overlay: {
-      enabled: false,
-      color: 'rgba(255,255,255,0.72)',
-      blur: 3
-    }
-  }
+  clockwise: false
 };
 
 export const pieChartWidgetPieChartSettings = (settings: PieChartWidgetSettings): DeepPartial<PieChartSettings> => ({
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart.models.ts
index 419c4b61bb..ebe752eb4b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart.models.ts
@@ -15,29 +15,13 @@
 ///
 
 import { ColorSettings, constantColor, Font } from '@shared/models/widget-settings.models';
-import {
-  LatestChartSettings,
-  LatestChartTooltipValueType
-} from '@home/components/widget/lib/chart/latest-chart.models';
+import { latestChartDefaultSettings, LatestChartSettings } from '@home/components/widget/lib/chart/latest-chart.models';
 import { mergeDeep } from '@core/utils';
 import {
-  EChartsAnimationEasing,
-  EChartsAnimationSettings
-} from '@home/components/widget/lib/chart/echarts-widget.models';
-
-export enum PieChartLabelPosition {
-  outside = 'outside',
-  inside = 'inside'
-}
-
-export const pieChartLabelPositions = Object.keys(PieChartLabelPosition) as PieChartLabelPosition[];
-
-export const pieChartLabelPositionTranslations = new Map<PieChartLabelPosition, string>(
-  [
-    [PieChartLabelPosition.outside, 'widgets.pie-chart.label-position-outside'],
-    [PieChartLabelPosition.inside, 'widgets.pie-chart.label-position-inside']
-  ]
-);
+  chartAnimationDefaultSettings,
+  ChartAnimationSettings,
+  PieChartLabelPosition
+} from '@home/components/widget/lib/chart/chart.models';
 
 export interface PieChartSettings extends LatestChartSettings {
   doughnut: boolean;
@@ -59,27 +43,19 @@ export interface PieChartSettings extends LatestChartSettings {
   emphasisShadowColor: string;
 }
 
-export const pieChartAnimationDefaultSettings: EChartsAnimationSettings = {
-  animation: true,
-  animationThreshold: 2000,
-  animationDuration: 1000,
-  animationEasing: EChartsAnimationEasing.cubicOut,
-  animationDelay: 0,
-  animationDurationUpdate: 500,
-  animationEasingUpdate: EChartsAnimationEasing.cubicOut,
-  animationDelayUpdate: 0
-};
+export const pieChartAnimationDefaultSettings: ChartAnimationSettings =
+  mergeDeep({} as ChartAnimationSettings, chartAnimationDefaultSettings, {
+    animationDuration: 1000,
+    animationDurationUpdate: 500
+  } as ChartAnimationSettings);
 
 export const pieChartDefaultSettings: PieChartSettings = {
-  autoScale: false,
+  ...latestChartDefaultSettings,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    pieChartAnimationDefaultSettings),
   doughnut: false,
   radius: '80%',
   clockwise: false,
-  sortSeries: false,
-  showTotal: false,
-  animation: mergeDeep({} as EChartsAnimationSettings,
-    pieChartAnimationDefaultSettings),
-  showLegend: true,
   totalValueFont: {
     family: 'Roboto',
     size: 24,
@@ -107,20 +83,5 @@ export const pieChartDefaultSettings: PieChartSettings = {
   emphasisBorderWidth: 0,
   emphasisBorderColor: '#000',
   emphasisShadowBlur: 10,
-  emphasisShadowColor: 'rgba(0, 0, 0, 0.5)',
-  showTooltip: true,
-  tooltipValueType: LatestChartTooltipValueType.percentage,
-  tooltipValueDecimals: 0,
-  tooltipValueFont: {
-    family: 'Roboto',
-    size: 13,
-    sizeUnit: 'px',
-    style: 'normal',
-    weight: '500',
-    lineHeight: '16px'
-  },
-  tooltipValueColor: 'rgba(0, 0, 0, 0.76)',
-  tooltipBackgroundColor: 'rgba(255, 255, 255, 0.76)',
-  tooltipBackgroundBlur: 4
+  emphasisShadowColor: 'rgba(0, 0, 0, 0.5)'
 };
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.component.ts
new file mode 100644
index 0000000000..07cffaefab
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.component.ts
@@ -0,0 +1,75 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, Input, OnInit, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core';
+import { WidgetContext } from '@home/models/widget-component.models';
+import { WidgetComponent } from '@home/components/widget/widget.component';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  LatestChartComponent,
+  LatestChartComponentCallbacks
+} from '@home/components/widget/lib/chart/latest-chart.component';
+import { TbBarsChart } from '@home/components/widget/lib/chart/bars-chart';
+import {
+  polarAreaChartWidgetBarsChartSettings,
+  polarAreaChartWidgetDefaultSettings,
+  PolarAreaChartWidgetSettings
+} from '@home/components/widget/lib/chart/polar-area-widget.models';
+
+@Component({
+  selector: 'tb-polar-area-chart-widget',
+  templateUrl: './latest-chart-widget.component.html',
+  styleUrls: [],
+  encapsulation: ViewEncapsulation.None
+})
+export class PolarAreaWidgetComponent implements OnInit {
+
+  @ViewChild('latestChart')
+  latestChart: LatestChartComponent;
+
+  @Input()
+  ctx: WidgetContext;
+
+  @Input()
+  widgetTitlePanel: TemplateRef<any>;
+
+  settings: PolarAreaChartWidgetSettings;
+
+  callbacks: LatestChartComponentCallbacks;
+
+  constructor(private widgetComponent: WidgetComponent,
+              private translate: TranslateService) {
+  }
+
+  ngOnInit(): void {
+    this.ctx.$scope.polarAreaChartWidget = this;
+    this.settings = {...polarAreaChartWidgetDefaultSettings, ...this.ctx.settings};
+    this.callbacks = {
+      createChart: (chartShape, renderer) => {
+        const settings = polarAreaChartWidgetBarsChartSettings(this.settings);
+        return new TbBarsChart(this.ctx, settings, chartShape.nativeElement, renderer, this.translate, true);
+      }
+    };
+  }
+
+  public onInit() {
+    this.latestChart?.onInit();
+  }
+
+  public onDataUpdated() {
+    this.latestChart?.onDataUpdated();
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.models.ts
new file mode 100644
index 0000000000..6ef08f631e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.models.ts
@@ -0,0 +1,82 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import {
+  latestChartWidgetDefaultSettings,
+  LatestChartWidgetSettings
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import { Font } from '@shared/models/widget-settings.models';
+import {
+  ChartAnimationSettings,
+  chartBarDefaultSettings,
+  ChartBarSettings,
+  chartColorScheme,
+  PieChartLabelPosition
+} from '@home/components/widget/lib/chart/chart.models';
+import { mergeDeep } from '@core/utils';
+import {
+  barsChartAnimationDefaultSettings,
+  BarsChartSettings
+} from '@home/components/widget/lib/chart/bars-chart.models';
+import { DeepPartial } from '@shared/models/common';
+
+export interface PolarAreaChartWidgetSettings extends LatestChartWidgetSettings {
+  axisMin?: number;
+  axisMax?: number;
+  axisTickLabelFont: Font;
+  axisTickLabelColor: string;
+  angleAxisStartAngle?: number;
+  barSettings: ChartBarSettings;
+}
+
+export const polarAreaChartWidgetDefaultSettings: PolarAreaChartWidgetSettings = {
+  ...latestChartWidgetDefaultSettings,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    barsChartAnimationDefaultSettings),
+  axisTickLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  axisTickLabelColor: chartColorScheme['axis.tickLabel'].light,
+  angleAxisStartAngle: 90,
+  barSettings: mergeDeep({} as ChartBarSettings, chartBarDefaultSettings,
+    {barWidth: 100, showLabel: true, labelPosition: PieChartLabelPosition.outside} as ChartBarSettings)
+};
+
+export const polarAreaChartWidgetBarsChartSettings = (settings: PolarAreaChartWidgetSettings): DeepPartial<BarsChartSettings> => ({
+  polar: true,
+  axisMin: settings.axisMin,
+  axisMax: settings.axisMax,
+  axisTickLabelFont: settings.axisTickLabelFont,
+  axisTickLabelColor: settings.axisTickLabelColor,
+  angleAxisStartAngle: settings.angleAxisStartAngle,
+  barSettings: settings.barSettings,
+  sortSeries: settings.sortSeries,
+  showTotal: false,
+  animation: settings.animation,
+  showLegend: settings.showLegend,
+  showTooltip: settings.showTooltip,
+  tooltipValueType: settings.tooltipValueType,
+  tooltipValueDecimals: settings.tooltipValueDecimals,
+  tooltipValueFont: settings.tooltipValueFont,
+  tooltipValueColor: settings.tooltipValueColor,
+  tooltipBackgroundColor: settings.tooltipBackgroundColor,
+  tooltipBackgroundBlur: settings.tooltipBackgroundBlur
+});
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
index c411737761..45252bd7f6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
@@ -24,32 +24,36 @@ import {
   sortedColorRange
 } from '@shared/models/widget-settings.models';
 import { LegendPosition } from '@shared/models/widget.models';
-import {
-  echartsAnimationDefaultSettings,
-  EChartsAnimationSettings,
-  EChartsShape,
-  EChartsTooltipWidgetSettings
-} from '@home/components/widget/lib/chart/echarts-widget.models';
 import {
   createTimeSeriesChartVisualMapPiece,
   defaultTimeSeriesChartXAxisSettings,
   defaultTimeSeriesChartYAxisSettings,
   LineSeriesStepType,
-  SeriesFillType,
-  SeriesLabelPosition, ThresholdLabelPosition,
-  timeSeriesChartColorScheme, timeSeriesChartGridDefaultSettings, TimeSeriesChartGridSettings,
+  ThresholdLabelPosition,
+  timeSeriesChartGridDefaultSettings,
+  TimeSeriesChartGridSettings,
   TimeSeriesChartKeySettings,
   TimeSeriesChartLineType,
   TimeSeriesChartSeriesType,
   TimeSeriesChartSettings,
-  TimeSeriesChartThreshold, timeSeriesChartThresholdDefaultSettings,
+  TimeSeriesChartThreshold,
+  timeSeriesChartThresholdDefaultSettings,
   TimeSeriesChartThresholdType,
+  TimeSeriesChartTooltipWidgetSettings,
   TimeSeriesChartVisualMapPiece,
   TimeSeriesChartXAxisSettings,
   TimeSeriesChartYAxisSettings
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { isNumber, mergeDeep } from '@core/utils';
 import { DeepPartial } from '@shared/models/common';
+import {
+  chartAnimationDefaultSettings,
+  ChartAnimationSettings,
+  chartColorScheme,
+  ChartFillType,
+  ChartLabelPosition,
+  ChartShape
+} from '@home/components/widget/lib/chart/chart.models';
 
 export interface RangeItem {
   index: number;
@@ -62,7 +66,7 @@ export interface RangeItem {
   piece: TimeSeriesChartVisualMapPiece;
 }
 
-export interface RangeChartWidgetSettings extends EChartsTooltipWidgetSettings {
+export interface RangeChartWidgetSettings extends TimeSeriesChartTooltipWidgetSettings {
   dataZoom: boolean;
   rangeColors: Array<ColorRange>;
   outOfRangeColor: string;
@@ -78,17 +82,17 @@ export interface RangeChartWidgetSettings extends EChartsTooltipWidgetSettings {
   lineWidth: number;
   showPoints: boolean;
   showPointLabel: boolean;
-  pointLabelPosition: SeriesLabelPosition;
+  pointLabelPosition: ChartLabelPosition;
   pointLabelFont: Font;
   pointLabelColor: string;
   enablePointLabelBackground: boolean;
   pointLabelBackground: string;
-  pointShape: EChartsShape;
+  pointShape: ChartShape;
   pointSize: number;
   grid: TimeSeriesChartGridSettings;
   yAxis: TimeSeriesChartYAxisSettings;
   xAxis: TimeSeriesChartXAxisSettings;
-  animation: EChartsAnimationSettings;
+  animation: ChartAnimationSettings;
   thresholds: TimeSeriesChartThreshold[];
   showLegend: boolean;
   legendPosition: LegendPosition;
@@ -115,9 +119,9 @@ export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
     timeSeriesChartThresholdDefaultSettings,
     { lineColor: '#37383b',
       lineType: TimeSeriesChartLineType.dashed,
-      startSymbol: EChartsShape.circle,
+      startSymbol: ChartShape.circle,
       startSymbolSize: 5,
-      endSymbol: EChartsShape.arrow,
+      endSymbol: ChartShape.arrow,
       endSymbolSize: 7,
       labelPosition: ThresholdLabelPosition.insideEndTop,
       labelColor: '#37383b',
@@ -132,7 +136,7 @@ export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
   lineWidth: 2,
   showPoints: false,
   showPointLabel: false,
-  pointLabelPosition: SeriesLabelPosition.top,
+  pointLabelPosition: ChartLabelPosition.top,
   pointLabelFont: {
     family: 'Roboto',
     size: 11,
@@ -141,10 +145,10 @@ export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
     weight: '400',
     lineHeight: '1'
   },
-  pointLabelColor: timeSeriesChartColorScheme['series.label'].light,
+  pointLabelColor: chartColorScheme['series.label'].light,
   enablePointLabelBackground: false,
   pointLabelBackground: 'rgba(255,255,255,0.56)',
-  pointShape: EChartsShape.emptyCircle,
+  pointShape: ChartShape.emptyCircle,
   pointSize: 4,
   grid: mergeDeep({} as TimeSeriesChartGridSettings,
     timeSeriesChartGridDefaultSettings),
@@ -154,8 +158,8 @@ export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
   xAxis: mergeDeep({} as TimeSeriesChartXAxisSettings,
     defaultTimeSeriesChartXAxisSettings,
     {showSplitLines: false} as TimeSeriesChartXAxisSettings),
-  animation: mergeDeep({} as EChartsAnimationSettings,
-    echartsAnimationDefaultSettings),
+  animation: mergeDeep({} as ChartAnimationSettings,
+    chartAnimationDefaultSettings),
   thresholds: [],
   showLegend: true,
   legendPosition: LegendPosition.top,
@@ -279,7 +283,7 @@ export const rangeChartTimeSeriesKeySettings = (settings: RangeChartWidgetSettin
       pointShape: settings.pointShape,
       pointSize: settings.pointSize,
       fillAreaSettings: {
-        type: settings.fillArea ? SeriesFillType.opacity : SeriesFillType.none,
+        type: settings.fillArea ? ChartFillType.opacity : ChartFillType.none,
         opacity: settings.fillAreaOpacity
       }
     }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-bar.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-bar.models.ts
index f54a803d12..22d2a26473 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-bar.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-bar.models.ts
@@ -16,7 +16,7 @@
 
 import { LinearGradientObject } from 'zrender/lib/graphic/LinearGradient';
 import { Interval, IntervalMath } from '@shared/models/time/time.models';
-import { LabelFormatterCallback, SeriesLabelOption } from 'echarts/types/src/util/types';
+import { LabelFormatterCallback } from 'echarts/types/src/util/types';
 import {
   TimeSeriesChartDataItem,
   TimeSeriesChartNoAggregationBarWidthStrategy
@@ -25,6 +25,7 @@ import { CustomSeriesRenderItemParams } from 'echarts';
 import { CallbackDataParams, CustomSeriesRenderItemAPI, CustomSeriesRenderItemReturn } from 'echarts/types/dist/shared';
 import { isNumeric } from '@core/utils';
 import * as echarts from 'echarts/core';
+import { BarSeriesLabelOption } from 'echarts/types/src/chart/bar/BarSeries';
 
 export interface BarVisualSettings {
   color: string | LinearGradientObject;
@@ -48,7 +49,7 @@ export interface BarRenderContext {
   barIndex?: number;
   noAggregation?: boolean;
   visualSettings?: BarVisualSettings;
-  labelOption?: SeriesLabelOption;
+  labelOption?: BarSeriesLabelOption;
   additionalLabelOption?: {[key: string]: any};
   barStackIndex?: number;
   currentStackItems?: TimeSeriesChartDataItem[];
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-state.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-state.models.ts
index 9a72361632..35159ba944 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-state.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-state.models.ts
@@ -18,10 +18,10 @@ import {
   TimeSeriesChartStateSettings,
   TimeSeriesChartStateSourceType,
   TimeSeriesChartTicksFormatter,
-  TimeSeriesChartTicksGenerator
+  TimeSeriesChartTicksGenerator,
+  TimeSeriesChartTooltipValueFormatFunction
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { UtilsService } from '@core/services/utils.service';
-import { EChartsTooltipValueFormatFunction } from '@home/components/widget/lib/chart/echarts-widget.models';
 import { FormattedData } from '@shared/models/widget.models';
 import { formatValue, isDefinedAndNotNull, isNumber, isNumeric } from '@core/utils';
 import { LabelFormatterCallback } from 'echarts';
@@ -35,7 +35,7 @@ export class TimeSeriesChartStateValueConverter {
 
   public readonly ticksGenerator: TimeSeriesChartTicksGenerator;
   public readonly ticksFormatter: TimeSeriesChartTicksFormatter;
-  public readonly tooltipFormatter: EChartsTooltipValueFormatFunction;
+  public readonly tooltipFormatter: TimeSeriesChartTooltipValueFormatFunction;
   public readonly labelFormatter: LabelFormatterCallback;
   public readonly valueConverter: (value: any) => any;
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts
index 81ea480531..48a328613e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts
@@ -27,7 +27,10 @@ import {
   ViewChild,
   ViewEncapsulation
 } from '@angular/core';
-import { timeSeriesChartKeyDefaultSettings, TimeSeriesChartKeySettings } from '@home/components/widget/lib/chart/time-series-chart.models';
+import {
+  timeSeriesChartKeyDefaultSettings,
+  TimeSeriesChartKeySettings
+} from '@home/components/widget/lib/chart/time-series-chart.models';
 import { WidgetContext } from '@home/models/widget-component.models';
 import { Observable } from 'rxjs';
 import { backgroundStyle, ComponentStyle, overlayStyle, textStyle } from '@shared/models/widget-settings.models';
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.models.ts
index 00abd27c33..6ee3409269 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.models.ts
@@ -14,7 +14,10 @@
 /// limitations under the License.
 ///
 
-import { timeSeriesChartDefaultSettings, TimeSeriesChartSettings } from '@home/components/widget/lib/chart/time-series-chart.models';
+import {
+  timeSeriesChartDefaultSettings,
+  TimeSeriesChartSettings
+} from '@home/components/widget/lib/chart/time-series-chart.models';
 import { BackgroundSettings, BackgroundType, Font } from '@shared/models/widget-settings.models';
 import { defaultLegendConfig, LegendConfig, LegendPosition, widgetType } from '@shared/models/widget.models';
 import { mergeDeep } from '@core/utils';
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts
index 0fd702a95f..a906fe0bed 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts
@@ -16,27 +16,21 @@
 
 import {
   ECharts,
-  echartsAnimationDefaultSettings,
-  EChartsAnimationSettings,
   EChartsOption,
-  EChartsSeriesItem,
-  EChartsShape,
-  EChartsTooltipTrigger,
-  EChartsTooltipValueFormatFunction,
-  EChartsTooltipWidgetSettings,
-  measureThresholdOffset,
-  timeAxisBandWidthCalculator
+  measureThresholdOffset
 } from '@home/components/widget/lib/chart/echarts-widget.models';
 import {
   autoDateFormat,
   AutoDateFormatSettings,
   ComponentStyle,
+  DateFormatProcessor,
+  DateFormatSettings,
   Font,
-  textStyle,
   tsToFormatTimeUnit
 } from '@shared/models/widget-settings.models';
 import {
-  LabelLayoutOptionCallback,
+  CallbackDataParams,
+  TimeAxisBandWidthCalculator,
   VisualMapComponentOption,
   XAXisOption,
   YAXisOption
@@ -53,10 +47,9 @@ import {
   mergeDeep,
   parseFunction
 } from '@core/utils';
-import { LinearGradientObject } from 'zrender/lib/graphic/LinearGradient';
 import tinycolor from 'tinycolor2';
-import { ValueAxisBaseOption } from 'echarts/types/src/coord/axisCommonTypes';
-import { LabelLayoutOption, SeriesLabelOption } from 'echarts/types/src/util/types';
+import { TimeAxisBaseOption, ValueAxisBaseOption } from 'echarts/types/src/coord/axisCommonTypes';
+import { SeriesLabelOption } from 'echarts/types/src/util/types';
 import { LabelFormatterCallback } from 'echarts';
 import {
   BarRenderContext,
@@ -64,16 +57,402 @@ import {
   BarVisualSettings,
   renderTimeSeriesBar
 } from '@home/components/widget/lib/chart/time-series-chart-bar.models';
-import { DataKey, DataKeySettingsWithComparison, WidgetComparisonSettings } from '@shared/models/widget.models';
+import {
+  DataEntry,
+  DataKey,
+  DataKeySettingsWithComparison,
+  DataSet,
+  Datasource,
+  FormattedData,
+  WidgetComparisonSettings
+} from '@shared/models/widget.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
-import { TbColorScheme } from '@shared/models/color.models';
 import { AbstractControl, ValidationErrors } from '@angular/forms';
 import { MarkLine2DDataItemOption } from 'echarts/types/src/component/marker/MarkLineModel';
 import { DatePipe } from '@angular/common';
 import { BuiltinTextPosition } from 'zrender/src/core/types';
 import { CartesianAxisOption } from 'echarts/types/src/coord/cartesian/AxisModel';
-import { WidgetTimewindow } from '@shared/models/time/time.models';
+import {
+  calculateAggIntervalWithWidgetTimeWindow,
+  Interval,
+  IntervalMath,
+  WidgetTimewindow
+} from '@shared/models/time/time.models';
 import { UtilsService } from '@core/services/utils.service';
+import { Renderer2 } from '@angular/core';
+import {
+  chartAnimationDefaultSettings,
+  ChartAnimationSettings,
+  chartBarDefaultSettings,
+  ChartBarSettings,
+  chartColorScheme,
+  ChartFillSettings,
+  ChartFillType,
+  ChartLabelPosition,
+  ChartShape,
+  createChartTextStyle,
+  createLinearOpacityGradient,
+  PieChartLabelPosition,
+  prepareChartThemeColor
+} from '@home/components/widget/lib/chart/chart.models';
+import { BarSeriesLabelOption } from 'echarts/types/src/chart/bar/BarSeries';
+
+type TimeSeriesChartDataEntry = [number, any, number, number];
+
+type TimeSeriesChartDataSet = {name: string; value: TimeSeriesChartDataEntry}[];
+
+export const toTimeSeriesChartDataSet = (data: DataSet, valueConverter?: (value: any) => any): TimeSeriesChartDataSet => {
+  if (!data?.length) {
+    return [];
+  } else {
+    return data.map(d => {
+      const ts = isDefinedAndNotNull(d[2]) ? d[2][0] : d[0];
+      return {
+        name: ts + '',
+        value: toTimeSeriesChartDataEntry(d, valueConverter)
+      };
+    });
+  }
+};
+
+const toTimeSeriesChartDataEntry = (entry: DataEntry, valueConverter?: (value: any) => any): TimeSeriesChartDataEntry => {
+  const value = valueConverter ? valueConverter(entry[1]) : entry[1];
+  const item: TimeSeriesChartDataEntry = [entry[0], value, entry[0], entry[0]];
+  if (isDefinedAndNotNull(entry[2])) {
+    item[2] = entry[2][0];
+    item[3] = entry[2][1];
+  }
+  return item;
+};
+
+export type TimeSeriesChartTooltipValueFormatFunction =
+  (value: any, latestData: FormattedData, units?: string, decimals?: number) => string;
+
+export interface TimeSeriesChartDataItem {
+  id: string;
+  datasource: Datasource;
+  dataKey: DataKey;
+  data: TimeSeriesChartDataSet;
+  dataSet?: DataSet;
+  enabled: boolean;
+  units?: string;
+  decimals?: number;
+  latestData?: FormattedData;
+  tooltipValueFormatFunction?: TimeSeriesChartTooltipValueFormatFunction;
+  comparisonItem?: boolean;
+  xAxisIndex: number;
+  yAxisId: TimeSeriesChartYAxisId;
+  yAxisIndex: number;
+  option?: LineSeriesOption | CustomSeriesOption;
+  barRenderContext?: BarRenderContext;
+}
+
+export const timeAxisBandWidthCalculator: TimeAxisBandWidthCalculator = (model) => {
+  let interval: number;
+  const axisOption = model.option;
+  const seriesDataIndices = axisOption.axisPointer?.seriesDataIndices;
+  if (seriesDataIndices?.length) {
+    const seriesDataIndex = seriesDataIndices[0];
+    const series = model.ecModel.getSeriesByIndex(seriesDataIndex.seriesIndex);
+    if (series) {
+      const values = series.getData().getValues(seriesDataIndex.dataIndex);
+      const start = values[2];
+      const end = values[3];
+      if (typeof start === 'number' && typeof end === 'number') {
+        interval = Math.max(end - start, 1);
+      }
+    }
+  }
+  if (!interval) {
+    const tbTimeWindow: WidgetTimewindow = (axisOption as any).tbTimeWindow;
+    if (isDefinedAndNotNull(tbTimeWindow)) {
+      if (axisOption.axisPointer?.value && typeof axisOption.axisPointer?.value === 'number') {
+        const intervalArray = calculateAggIntervalWithWidgetTimeWindow(tbTimeWindow, axisOption.axisPointer.value);
+        const start = intervalArray[0];
+        const end = intervalArray[1];
+        interval = Math.max(end - start, 1);
+      } else {
+        interval = IntervalMath.numberValue(tbTimeWindow.interval);
+      }
+    }
+  }
+  if (interval) {
+    const timeScale = model.axis.scale;
+    const axisExtent = model.axis.getExtent();
+    const dataExtent = timeScale.getExtent();
+    const size = Math.abs(axisExtent[1] - axisExtent[0]);
+    return interval * (size / (dataExtent[1] - dataExtent[0]));
+  }
+};
+
+
+const minDataTs = (dataSet: TimeSeriesChartDataSet): number => dataSet.length ? dataSet.map(data =>
+  Number(data.name)).reduce((a, b) => Math.min(a, b)) : undefined;
+
+const maxDataTs = (dataSet: TimeSeriesChartDataSet): number => dataSet.length ? dataSet.map(data =>
+  Number(data.name)).reduce((a, b) => Math.max(a, b)) : undefined;
+
+export const adjustTimeAxisExtentToData = (timeAxisOption: TimeAxisBaseOption,
+                                           dataItems: TimeSeriesChartDataItem[],
+                                           defaultMin: number,
+                                           defaultMax: number): void => {
+  let min: number;
+  let max: number;
+  for (const item of dataItems) {
+    if (item.enabled) {
+      const minTs = minDataTs(item.data);
+      if (typeof minTs !== 'undefined') {
+        min = (typeof min !== 'undefined') ? Math.min(min, minTs) : minTs;
+      }
+      const maxTs = maxDataTs(item.data);
+      if (typeof maxTs !== 'undefined') {
+        max = (typeof max !== 'undefined') ? Math.max(max, maxTs) : maxTs;
+      }
+    }
+  }
+  timeAxisOption.min = (typeof min !== 'undefined' && Math.abs(min - defaultMin) < 1000) ? min : defaultMin;
+  timeAxisOption.max = (typeof max !== 'undefined' && Math.abs(max - defaultMax) < 1000) ? max : defaultMax;
+};
+
+export enum TimeSeriesChartTooltipTrigger {
+  point = 'point',
+  axis = 'axis'
+}
+
+export const tooltipTriggerTranslationMap = new Map<TimeSeriesChartTooltipTrigger, string>(
+  [
+    [ TimeSeriesChartTooltipTrigger.point, 'tooltip.trigger-point' ],
+    [ TimeSeriesChartTooltipTrigger.axis, 'tooltip.trigger-axis' ]
+  ]
+);
+
+export interface TimeSeriesChartTooltipWidgetSettings {
+  showTooltip: boolean;
+  tooltipTrigger?: TimeSeriesChartTooltipTrigger;
+  tooltipShowFocusedSeries?: boolean;
+  tooltipLabelFont: Font;
+  tooltipLabelColor: string;
+  tooltipValueFont: Font;
+  tooltipValueColor: string;
+  tooltipValueFormatter?: string | TimeSeriesChartTooltipValueFormatFunction;
+  tooltipShowDate: boolean;
+  tooltipDateInterval?: boolean;
+  tooltipDateFormat: DateFormatSettings;
+  tooltipDateFont: Font;
+  tooltipDateColor: string;
+  tooltipBackgroundColor: string;
+  tooltipBackgroundBlur: number;
+}
+
+export const createTooltipValueFormatFunction =
+  (tooltipValueFormatter: string | TimeSeriesChartTooltipValueFormatFunction): TimeSeriesChartTooltipValueFormatFunction => {
+    let tooltipValueFormatFunction: TimeSeriesChartTooltipValueFormatFunction;
+    if (isFunction(tooltipValueFormatter)) {
+      tooltipValueFormatFunction = tooltipValueFormatter as TimeSeriesChartTooltipValueFormatFunction;
+    } else if (typeof tooltipValueFormatter === 'string' && tooltipValueFormatter.length) {
+      try {
+        tooltipValueFormatFunction =
+          new Function('value', 'latestData', tooltipValueFormatter) as TimeSeriesChartTooltipValueFormatFunction;
+      } catch (e) {}
+    }
+    return tooltipValueFormatFunction;
+  };
+
+export const timeSeriesChartTooltipFormatter = (renderer: Renderer2,
+                                                tooltipDateFormat: DateFormatProcessor,
+                                                settings: TimeSeriesChartTooltipWidgetSettings,
+                                                params: CallbackDataParams[] | CallbackDataParams,
+                                                valueFormatFunction: TimeSeriesChartTooltipValueFormatFunction,
+                                                focusedSeriesIndex: number,
+                                                series?: TimeSeriesChartDataItem[],
+                                                interval?: Interval): null | HTMLElement => {
+
+  const tooltipParams = mapTooltipParams(params, series, focusedSeriesIndex);
+  if (!tooltipParams.items.length && !tooltipParams.comparisonItems.length) {
+    return null;
+  }
+
+  const tooltipElement: HTMLElement = renderer.createElement('div');
+  renderer.setStyle(tooltipElement, 'display', 'flex');
+  renderer.setStyle(tooltipElement, 'flex-direction', 'column');
+  renderer.setStyle(tooltipElement, 'align-items', 'flex-start');
+  renderer.setStyle(tooltipElement, 'gap', '16px');
+
+  buildItemsTooltip(tooltipElement, tooltipParams.items, renderer, tooltipDateFormat, settings, valueFormatFunction, interval);
+  buildItemsTooltip(tooltipElement, tooltipParams.comparisonItems, renderer, tooltipDateFormat, settings, valueFormatFunction, interval);
+
+  return tooltipElement;
+};
+
+interface TooltipItem {
+  param: CallbackDataParams;
+  dataItem: TimeSeriesChartDataItem;
+}
+
+interface TooltipParams {
+  items: TooltipItem[];
+  comparisonItems: TooltipItem[];
+}
+
+const buildItemsTooltip = (tooltipElement: HTMLElement,
+                           items: TooltipItem[],
+                           renderer: Renderer2,
+                           tooltipDateFormat: DateFormatProcessor,
+                           settings: TimeSeriesChartTooltipWidgetSettings,
+                           valueFormatFunction: TimeSeriesChartTooltipValueFormatFunction,
+                           interval?: Interval) => {
+  if (items.length) {
+    const tooltipItemsElement: HTMLElement = renderer.createElement('div');
+    renderer.setStyle(tooltipItemsElement, 'display', 'flex');
+    renderer.setStyle(tooltipItemsElement, 'flex-direction', 'column');
+    renderer.setStyle(tooltipItemsElement, 'align-items', 'flex-start');
+    renderer.setStyle(tooltipItemsElement, 'gap', '4px');
+    renderer.appendChild(tooltipElement, tooltipItemsElement);
+    if (settings.tooltipShowDate) {
+      renderer.appendChild(tooltipItemsElement,
+        constructTooltipDateElement(renderer, tooltipDateFormat, settings, items[0].param, interval));
+    }
+    for (const item of items) {
+      renderer.appendChild(tooltipItemsElement,
+        constructTooltipSeriesElement(renderer, settings, item, valueFormatFunction));
+    }
+  }
+};
+
+const mapTooltipParams = (params: CallbackDataParams[] | CallbackDataParams,
+                          series?: TimeSeriesChartDataItem[],
+                          focusedSeriesIndex?: number): TooltipParams => {
+  const result: TooltipParams = {
+    items: [],
+    comparisonItems: []
+  };
+  if (!params || Array.isArray(params) && !params[0]) {
+    return result;
+  }
+  const firstParam = Array.isArray(params) ? params[0] : params;
+  if (!firstParam.value) {
+    return result;
+  }
+  let seriesParams: CallbackDataParams = null;
+  if (Array.isArray(params) && focusedSeriesIndex > -1) {
+    seriesParams = params.find(param => param.seriesIndex === focusedSeriesIndex);
+  } else if (!Array.isArray(params)) {
+    seriesParams = params;
+  }
+  if (seriesParams) {
+    appendTooltipItem(result, seriesParams, series);
+  } else if (Array.isArray(params)) {
+    for (seriesParams of params) {
+      appendTooltipItem(result, seriesParams, series);
+    }
+  }
+  return result;
+};
+
+const appendTooltipItem = (tooltipParams: TooltipParams, seriesParams: CallbackDataParams, series?: TimeSeriesChartDataItem[]) => {
+  const dataItem = series?.find(s => s.id === seriesParams.seriesId);
+  const tooltipItem: TooltipItem = {
+    param: seriesParams,
+    dataItem
+  };
+  if (dataItem?.comparisonItem) {
+    tooltipParams.comparisonItems.push(tooltipItem);
+  } else {
+    tooltipParams.items.push(tooltipItem);
+  }
+};
+
+const constructTooltipDateElement = (renderer: Renderer2,
+                                     tooltipDateFormat: DateFormatProcessor,
+                                     settings: TimeSeriesChartTooltipWidgetSettings,
+                                     param: CallbackDataParams,
+                                     interval?: Interval): HTMLElement => {
+  const dateElement: HTMLElement = renderer.createElement('div');
+  let dateText: string;
+  const startTs = param.value[2];
+  const endTs = param.value[3];
+  if (settings.tooltipDateInterval && startTs && endTs && (endTs - 1) > startTs) {
+    const startDateText = tooltipDateFormat.update(startTs, interval);
+    const endDateText = tooltipDateFormat.update(endTs - 1, interval);
+    if (startDateText === endDateText) {
+      dateText = startDateText;
+    } else {
+      dateText = startDateText + ' - ' + endDateText;
+    }
+  } else {
+    const ts = param.value[0];
+    dateText = tooltipDateFormat.update(ts, interval);
+  }
+  renderer.appendChild(dateElement, renderer.createText(dateText));
+  renderer.setStyle(dateElement, 'font-family', settings.tooltipDateFont.family);
+  renderer.setStyle(dateElement, 'font-size', settings.tooltipDateFont.size + settings.tooltipDateFont.sizeUnit);
+  renderer.setStyle(dateElement, 'font-style', settings.tooltipDateFont.style);
+  renderer.setStyle(dateElement, 'font-weight', settings.tooltipDateFont.weight);
+  renderer.setStyle(dateElement, 'line-height', settings.tooltipDateFont.lineHeight);
+  renderer.setStyle(dateElement, 'color', settings.tooltipDateColor);
+  return dateElement;
+};
+
+const constructTooltipSeriesElement = (renderer: Renderer2,
+                                       settings: TimeSeriesChartTooltipWidgetSettings,
+                                       item: TooltipItem,
+                                       valueFormatFunction: TimeSeriesChartTooltipValueFormatFunction): HTMLElement => {
+  const labelValueElement: HTMLElement = renderer.createElement('div');
+  renderer.setStyle(labelValueElement, 'display', 'flex');
+  renderer.setStyle(labelValueElement, 'flex-direction', 'row');
+  renderer.setStyle(labelValueElement, 'align-items', 'center');
+  renderer.setStyle(labelValueElement, 'align-self', 'stretch');
+  renderer.setStyle(labelValueElement, 'gap', '12px');
+  const labelElement: HTMLElement = renderer.createElement('div');
+  renderer.setStyle(labelElement, 'display', 'flex');
+  renderer.setStyle(labelElement, 'align-items', 'center');
+  renderer.setStyle(labelElement, 'gap', '8px');
+  renderer.appendChild(labelValueElement, labelElement);
+  const circleElement: HTMLElement = renderer.createElement('div');
+  renderer.setStyle(circleElement, 'width', '8px');
+  renderer.setStyle(circleElement, 'height', '8px');
+  renderer.setStyle(circleElement, 'border-radius', '50%');
+  renderer.setStyle(circleElement, 'background', item.param.color);
+  renderer.appendChild(labelElement, circleElement);
+  const labelTextElement: HTMLElement = renderer.createElement('div');
+  renderer.appendChild(labelTextElement, renderer.createText(item.param.seriesName));
+  renderer.setStyle(labelTextElement, 'font-family', settings.tooltipLabelFont.family);
+  renderer.setStyle(labelTextElement, 'font-size', settings.tooltipLabelFont.size + settings.tooltipLabelFont.sizeUnit);
+  renderer.setStyle(labelTextElement, 'font-style', settings.tooltipLabelFont.style);
+  renderer.setStyle(labelTextElement, 'font-weight', settings.tooltipLabelFont.weight);
+  renderer.setStyle(labelTextElement, 'line-height', settings.tooltipLabelFont.lineHeight);
+  renderer.setStyle(labelTextElement, 'color', settings.tooltipLabelColor);
+  renderer.appendChild(labelElement, labelTextElement);
+  const valueElement: HTMLElement = renderer.createElement('div');
+  let formatFunction = valueFormatFunction;
+  let latestData: FormattedData;
+  let units = '';
+  let decimals = 0;
+  if (item.dataItem) {
+    if (item.dataItem.tooltipValueFormatFunction) {
+      formatFunction = item.dataItem.tooltipValueFormatFunction;
+    }
+    latestData = item.dataItem.latestData;
+    units = item.dataItem.units;
+    decimals = item.dataItem.decimals;
+  }
+  if (!latestData) {
+    latestData = {} as FormattedData;
+  }
+  const value = formatFunction(item.param.value[1], latestData, units, decimals);
+  renderer.appendChild(valueElement, renderer.createText(value));
+  renderer.setStyle(valueElement, 'flex', '1');
+  renderer.setStyle(valueElement, 'text-align', 'end');
+  renderer.setStyle(valueElement, 'font-family', settings.tooltipValueFont.family);
+  renderer.setStyle(valueElement, 'font-size', settings.tooltipValueFont.size + settings.tooltipValueFont.sizeUnit);
+  renderer.setStyle(valueElement, 'font-style', settings.tooltipValueFont.style);
+  renderer.setStyle(valueElement, 'font-weight', settings.tooltipValueFont.weight);
+  renderer.setStyle(valueElement, 'line-height', settings.tooltipValueFont.lineHeight);
+  renderer.setStyle(valueElement, 'color', settings.tooltipValueColor);
+  renderer.appendChild(labelValueElement, valueElement);
+  return labelValueElement;
+};
+
 
 export enum TimeSeriesChartType {
   default = 'default',
@@ -91,41 +470,6 @@ export const timeSeriesChartTypeTranslations = new Map<TimeSeriesChartType, stri
   ]
 );
 
-export const timeSeriesChartColorScheme: TbColorScheme = {
-  'threshold.line': {
-    light: 'rgba(0, 0, 0, 0.76)',
-    dark: '#eee'
-  },
-  'threshold.label': {
-    light: 'rgba(0, 0, 0, 0.76)',
-    dark: '#eee'
-  },
-  'axis.line': {
-    light: 'rgba(0, 0, 0, 0.54)',
-    dark: '#B9B8CE'
-  },
-  'axis.label': {
-    light: 'rgba(0, 0, 0, 0.54)',
-    dark: '#B9B8CE'
-  },
-  'axis.ticks': {
-    light: 'rgba(0, 0, 0, 0.54)',
-    dark: '#B9B8CE'
-  },
-  'axis.tickLabel': {
-    light: 'rgba(0, 0, 0, 0.54)',
-    dark: '#B9B8CE'
-  },
-  'axis.splitLine': {
-    light: 'rgba(0, 0, 0, 0.12)',
-    dark: '#484753'
-  },
-  'series.label': {
-    light: 'rgba(0, 0, 0, 0.76)',
-    dark: '#eee'
-  }
-};
-
 export enum AxisPosition {
   left = 'left',
   right = 'right',
@@ -225,36 +569,6 @@ export const timeSeriesStateSourceTypeTranslations = new Map<TimeSeriesChartStat
   ]
 );
 
-export enum SeriesFillType {
-  none = 'none',
-  opacity = 'opacity',
-  gradient = 'gradient'
-}
-
-export const seriesFillTypes = Object.keys(SeriesFillType) as SeriesFillType[];
-
-export const seriesFillTypeTranslations = new Map<SeriesFillType, string>(
-  [
-    [SeriesFillType.none, 'widgets.time-series-chart.series.fill-type-none'],
-    [SeriesFillType.opacity, 'widgets.time-series-chart.series.fill-type-opacity'],
-    [SeriesFillType.gradient, 'widgets.time-series-chart.series.fill-type-gradient']
-  ]
-);
-
-export enum SeriesLabelPosition {
-  top = 'top',
-  bottom = 'bottom'
-}
-
-export const seriesLabelPositions = Object.keys(SeriesLabelPosition) as SeriesLabelPosition[];
-
-export const seriesLabelPositionTranslations = new Map<SeriesLabelPosition, string>(
-  [
-    [SeriesLabelPosition.top, 'widgets.time-series-chart.series.label-position-top'],
-    [SeriesLabelPosition.bottom, 'widgets.time-series-chart.series.label-position-bottom']
-  ]
-);
-
 export enum LineSeriesStepType {
   start = 'start',
   middle = 'middle',
@@ -384,25 +698,25 @@ export const defaultTimeSeriesChartYAxisSettings: TimeSeriesChartYAxisSettings =
       weight: '600',
       lineHeight: '1'
   },
-  labelColor: timeSeriesChartColorScheme['axis.label'].light,
-    position: AxisPosition.left,
-    showTickLabels: true,
-    tickLabelFont: {
-    family: 'Roboto',
-      size: 12,
-      sizeUnit: 'px',
-      style: 'normal',
-      weight: '400',
-      lineHeight: '1'
+  labelColor: chartColorScheme['axis.label'].light,
+  position: AxisPosition.left,
+  showTickLabels: true,
+  tickLabelFont: {
+  family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
   },
-  tickLabelColor: timeSeriesChartColorScheme['axis.tickLabel'].light,
-    ticksFormatter: null,
-    showTicks: true,
-    ticksColor: timeSeriesChartColorScheme['axis.ticks'].light,
-    showLine: true,
-    lineColor: timeSeriesChartColorScheme['axis.line'].light,
-    showSplitLines: true,
-    splitLinesColor: timeSeriesChartColorScheme['axis.splitLine'].light
+  tickLabelColor: chartColorScheme['axis.tickLabel'].light,
+  ticksFormatter: null,
+  showTicks: true,
+  ticksColor: chartColorScheme['axis.ticks'].light,
+  showLine: true,
+  lineColor: chartColorScheme['axis.line'].light,
+  showSplitLines: true,
+  splitLinesColor: chartColorScheme['axis.splitLine'].light
 };
 
 export const defaultTimeSeriesChartXAxisSettings: TimeSeriesChartXAxisSettings = {
@@ -416,7 +730,7 @@ export const defaultTimeSeriesChartXAxisSettings: TimeSeriesChartXAxisSettings =
     weight: '600',
     lineHeight: '1'
   },
-  labelColor: timeSeriesChartColorScheme['axis.label'].light,
+  labelColor: chartColorScheme['axis.label'].light,
   position: AxisPosition.bottom,
   showTickLabels: true,
   tickLabelFont: {
@@ -427,14 +741,14 @@ export const defaultTimeSeriesChartXAxisSettings: TimeSeriesChartXAxisSettings =
     weight: '400',
     lineHeight: '1'
   },
-  tickLabelColor: timeSeriesChartColorScheme['axis.tickLabel'].light,
+  tickLabelColor: chartColorScheme['axis.tickLabel'].light,
   ticksFormat: {},
   showTicks: true,
-  ticksColor: timeSeriesChartColorScheme['axis.ticks'].light,
+  ticksColor: chartColorScheme['axis.ticks'].light,
   showLine: true,
-  lineColor: timeSeriesChartColorScheme['axis.line'].light,
+  lineColor: chartColorScheme['axis.line'].light,
   showSplitLines: true,
-  splitLinesColor: timeSeriesChartColorScheme['axis.splitLine'].light
+  splitLinesColor: chartColorScheme['axis.splitLine'].light
 };
 
 export type TimeSeriesChartYAxes = {[id: TimeSeriesChartYAxisId]: TimeSeriesChartYAxisSettings};
@@ -453,9 +767,9 @@ export interface TimeSeriesChartThreshold {
   lineColor: string;
   lineType: TimeSeriesChartLineType | number | number[];
   lineWidth: number;
-  startSymbol: EChartsShape;
+  startSymbol: ChartShape;
   startSymbolSize: number;
-  endSymbol: EChartsShape;
+  endSymbol: ChartShape;
   endSymbolSize: number;
   showLabel: boolean;
   labelPosition: ThresholdLabelPosition;
@@ -505,12 +819,12 @@ export const timeSeriesChartThresholdDefaultSettings: TimeSeriesChartThreshold =
   yAxisId: 'default',
   units: null,
   decimals: 0,
-  lineColor: timeSeriesChartColorScheme['threshold.line'].light,
+  lineColor: chartColorScheme['threshold.line'].light,
   lineType: TimeSeriesChartLineType.solid,
   lineWidth: 1,
-  startSymbol: EChartsShape.none,
+  startSymbol: ChartShape.none,
   startSymbolSize: 5,
-  endSymbol: EChartsShape.arrow,
+  endSymbol: ChartShape.arrow,
   endSymbolSize: 5,
   showLabel: true,
   labelPosition: ThresholdLabelPosition.end,
@@ -522,7 +836,7 @@ export const timeSeriesChartThresholdDefaultSettings: TimeSeriesChartThreshold =
     weight: '400',
     lineHeight: '1'
   },
-  labelColor: timeSeriesChartColorScheme['threshold.label'].light,
+  labelColor: chartColorScheme['threshold.label'].light,
   enableLabelBackground: false,
   labelBackground: 'rgba(255,255,255,0.56)'
 };
@@ -657,7 +971,7 @@ export const timeSeriesChartGridDefaultSettings: TimeSeriesChartGridSettings = {
   borderColor: '#ccc'
 };
 
-export interface TimeSeriesChartSettings extends EChartsTooltipWidgetSettings, TimeSeriesChartComparisonSettings {
+export interface TimeSeriesChartSettings extends TimeSeriesChartTooltipWidgetSettings, TimeSeriesChartComparisonSettings {
   thresholds: TimeSeriesChartThreshold[];
   darkMode: boolean;
   dataZoom: boolean;
@@ -665,7 +979,7 @@ export interface TimeSeriesChartSettings extends EChartsTooltipWidgetSettings, T
   grid: TimeSeriesChartGridSettings;
   yAxes: TimeSeriesChartYAxes;
   xAxis: TimeSeriesChartXAxisSettings;
-  animation: EChartsAnimationSettings;
+  animation: ChartAnimationSettings;
   barWidthSettings: TimeSeriesChartBarWidthSettings;
   noAggregationBarWidthSettings: TimeSeriesChartNoAggregationBarWidthSettings;
   visualMapSettings?: TimeSeriesChartVisualMapSettings;
@@ -686,8 +1000,8 @@ export const timeSeriesChartDefaultSettings: TimeSeriesChartSettings = {
   },
   xAxis: mergeDeep({} as TimeSeriesChartXAxisSettings,
     defaultTimeSeriesChartXAxisSettings),
-  animation: mergeDeep({} as EChartsAnimationSettings,
-    echartsAnimationDefaultSettings),
+  animation: mergeDeep({} as ChartAnimationSettings,
+    chartAnimationDefaultSettings),
   barWidthSettings: {
     barGap: 0.3,
     intervalGap: 0.6
@@ -695,7 +1009,7 @@ export const timeSeriesChartDefaultSettings: TimeSeriesChartSettings = {
   noAggregationBarWidthSettings: mergeDeep({} as TimeSeriesChartNoAggregationBarWidthSettings,
     timeSeriesChartNoAggregationBarWidthDefaultSettings),
   showTooltip: true,
-  tooltipTrigger: EChartsTooltipTrigger.axis,
+  tooltipTrigger: TimeSeriesChartTooltipTrigger.axis,
   tooltipLabelFont: {
     family: 'Roboto',
     size: 12,
@@ -736,15 +1050,6 @@ export const timeSeriesChartDefaultSettings: TimeSeriesChartSettings = {
     { position: AxisPosition.top } as TimeSeriesChartXAxisSettings)
 };
 
-export interface SeriesFillSettings {
-  type: SeriesFillType;
-  opacity: number;
-  gradient: {
-    start: number;
-    end: number;
-  };
-}
-
 export interface LineSeriesSettings {
   showLine: boolean;
   step: boolean;
@@ -754,31 +1059,15 @@ export interface LineSeriesSettings {
   lineWidth: number;
   showPoints: boolean;
   showPointLabel: boolean;
-  pointLabelPosition: SeriesLabelPosition;
+  pointLabelPosition: ChartLabelPosition;
   pointLabelFont: Font;
   pointLabelColor: string;
   enablePointLabelBackground: boolean;
   pointLabelBackground: string;
   pointLabelFormatter?: string | LabelFormatterCallback;
-  pointShape: EChartsShape;
+  pointShape: ChartShape;
   pointSize: number;
-  fillAreaSettings: SeriesFillSettings;
-}
-
-export interface BarSeriesSettings {
-  showBorder: boolean;
-  borderWidth: number;
-  borderRadius: number;
-  showLabel: boolean;
-  labelPosition: SeriesLabelPosition | BuiltinTextPosition;
-  labelFont: Font;
-  labelColor: string;
-  enableLabelBackground: boolean;
-  labelBackground: string;
-  labelFormatter?: string | LabelFormatterCallback;
-  labelLayout?: LabelLayoutOption | LabelLayoutOptionCallback;
-  additionalLabelOption?: {[key: string]: any};
-  backgroundSettings: SeriesFillSettings;
+  fillAreaSettings: ChartFillSettings;
 }
 
 export interface TimeSeriesChartKeySettings extends DataKeySettingsWithComparison {
@@ -787,8 +1076,8 @@ export interface TimeSeriesChartKeySettings extends DataKeySettingsWithCompariso
   dataHiddenByDefault: boolean;
   type: TimeSeriesChartSeriesType;
   lineSettings: LineSeriesSettings;
-  barSettings: BarSeriesSettings;
-  tooltipValueFormatter?: string | EChartsTooltipValueFormatFunction;
+  barSettings: ChartBarSettings;
+  tooltipValueFormatter?: string | TimeSeriesChartTooltipValueFormatFunction;
 }
 
 export const timeSeriesChartKeyDefaultSettings: TimeSeriesChartKeySettings = {
@@ -805,7 +1094,7 @@ export const timeSeriesChartKeyDefaultSettings: TimeSeriesChartKeySettings = {
     lineWidth: 2,
     showPoints: false,
     showPointLabel: false,
-    pointLabelPosition: SeriesLabelPosition.top,
+    pointLabelPosition: ChartLabelPosition.top,
     pointLabelFont: {
       family: 'Roboto',
       size: 11,
@@ -814,39 +1103,13 @@ export const timeSeriesChartKeyDefaultSettings: TimeSeriesChartKeySettings = {
       weight: '400',
       lineHeight: '1'
     },
-    pointLabelColor: timeSeriesChartColorScheme['series.label'].light,
+    pointLabelColor: chartColorScheme['series.label'].light,
     enablePointLabelBackground: false,
     pointLabelBackground: 'rgba(255,255,255,0.56)',
-    pointShape: EChartsShape.emptyCircle,
+    pointShape: ChartShape.emptyCircle,
     pointSize: 4,
     fillAreaSettings: {
-      type: SeriesFillType.none,
-      opacity: 0.4,
-      gradient: {
-        start: 100,
-        end: 0
-      }
-    }
-  },
-  barSettings: {
-    showBorder: false,
-    borderWidth: 2,
-    borderRadius: 0,
-    showLabel: false,
-    labelPosition: SeriesLabelPosition.top,
-    labelFont: {
-      family: 'Roboto',
-      size: 11,
-      sizeUnit: 'px',
-      style: 'normal',
-      weight: '400',
-      lineHeight: '1'
-    },
-    labelColor: timeSeriesChartColorScheme['series.label'].light,
-    enableLabelBackground: false,
-    labelBackground: 'rgba(255,255,255,0.56)',
-    backgroundSettings: {
-      type: SeriesFillType.none,
+      type: ChartFillType.none,
       opacity: 0.4,
       gradient: {
         start: 100,
@@ -854,6 +1117,7 @@ export const timeSeriesChartKeyDefaultSettings: TimeSeriesChartKeySettings = {
       }
     }
   },
+  barSettings: mergeDeep({} as ChartBarSettings, chartBarDefaultSettings),
   comparisonSettings: {
     showValuesForComparison: false,
     comparisonValuesLabel: '',
@@ -861,14 +1125,6 @@ export const timeSeriesChartKeyDefaultSettings: TimeSeriesChartKeySettings = {
   }
 };
 
-export interface TimeSeriesChartDataItem extends EChartsSeriesItem {
-  xAxisIndex: number;
-  yAxisId: TimeSeriesChartYAxisId;
-  yAxisIndex: number;
-  option?: LineSeriesOption | CustomSeriesOption;
-  barRenderContext?: BarRenderContext;
-}
-
 type TimeSeriesChartThresholdValue = number | string | (number | string)[];
 
 export interface TimeSeriesChartThresholdItem {
@@ -1288,7 +1544,7 @@ const generateChartSeries = (dataItems: TimeSeriesChartDataItem[],
   return series;
 };
 
-export const updateDarkMode = (options: EChartsOption, settings: TimeSeriesChartSettings,
+export const updateDarkMode = (options: EChartsOption,
                                xAxisList: TimeSeriesChartXAxis[],
                                yAxisList: TimeSeriesChartYAxis[],
                                dataItems: TimeSeriesChartDataItem[],
@@ -1332,7 +1588,7 @@ export const updateDarkMode = (options: EChartsOption, settings: TimeSeriesChart
       }
     } else {
       if (item.barRenderContext?.labelOption?.show) {
-        const barSettings = item.dataKey.settings as BarSeriesSettings;
+        const barSettings = item.dataKey.settings as ChartBarSettings;
         (item.barRenderContext.labelOption.rich.value as any).fill = prepareChartThemeColor(barSettings.labelColor,
           darkMode, 'series.label');
       }
@@ -1381,7 +1637,7 @@ const createTimeSeriesChartSeries = (item: TimeSeriesChartDataItem,
         lineSettings.pointLabelFont, lineSettings.pointLabelColor,
         lineSettings.enablePointLabelBackground, lineSettings.pointLabelBackground,
         lineSettings.pointLabelPosition,
-        lineSettings.pointLabelFormatter, false, darkMode);
+        lineSettings.pointLabelFormatter, false, darkMode) as SeriesLabelOption;
       lineSeriesOption.step = lineSettings.step ? lineSettings.stepType : false;
       lineSeriesOption.smooth = lineSettings.smooth ? 0.25 : false;
       if (lineSettings.smooth) {
@@ -1391,11 +1647,11 @@ const createTimeSeriesChartSeries = (item: TimeSeriesChartDataItem,
         width: lineSettings.showLine ? lineSettings.lineWidth : 0,
         type: lineSettings.lineType
       };
-      if (lineSettings.fillAreaSettings.type !== SeriesFillType.none) {
+      if (lineSettings.fillAreaSettings.type !== ChartFillType.none) {
         lineSeriesOption.areaStyle = {};
-        if (lineSettings.fillAreaSettings.type === SeriesFillType.opacity) {
+        if (lineSettings.fillAreaSettings.type === ChartFillType.opacity) {
           lineSeriesOption.areaStyle.opacity = lineSettings.fillAreaSettings.opacity;
-        } else if (lineSettings.fillAreaSettings.type === SeriesFillType.gradient) {
+        } else if (lineSettings.fillAreaSettings.type === ChartFillType.gradient) {
           lineSeriesOption.areaStyle.opacity = 1;
           lineSeriesOption.areaStyle.color = createLinearOpacityGradient(seriesColor, lineSettings.fillAreaSettings.gradient);
         }
@@ -1413,9 +1669,9 @@ const createTimeSeriesChartSeries = (item: TimeSeriesChartDataItem,
         borderWidth: barSettings.showBorder ? barSettings.borderWidth : 0,
         borderRadius: barSettings.borderRadius
       };
-      if (barSettings.backgroundSettings.type === SeriesFillType.none) {
+      if (barSettings.backgroundSettings.type === ChartFillType.none) {
         barVisualSettings.color = seriesColor;
-      } else if (barSettings.backgroundSettings.type === SeriesFillType.opacity) {
+      } else if (barSettings.backgroundSettings.type === ChartFillType.opacity) {
         barVisualSettings.color = tinycolor(seriesColor).setAlpha(barSettings.backgroundSettings.opacity).toRgbString();
       } else {
         barVisualSettings.color = createLinearOpacityGradient(seriesColor, barSettings.backgroundSettings.gradient);
@@ -1437,10 +1693,10 @@ const createTimeSeriesChartSeries = (item: TimeSeriesChartDataItem,
 const createSeriesLabelOption = (item: TimeSeriesChartDataItem, show: boolean,
                                  labelFont: Font, labelColor: string,
                                  enableBackground: boolean, labelBackground: string,
-                                 position: SeriesLabelPosition | BuiltinTextPosition,
+                                 position: ChartLabelPosition | PieChartLabelPosition | BuiltinTextPosition,
                                  labelFormatter: string | LabelFormatterCallback,
                                  labelColorFill: boolean,
-                                 darkMode: boolean): SeriesLabelOption => {
+                                 darkMode: boolean): SeriesLabelOption | BarSeriesLabelOption => {
   let labelStyle: ComponentStyle = {};
   if (show) {
     labelStyle = createChartTextStyle(labelFont, labelColor, darkMode, 'series.label', labelColorFill);
@@ -1467,7 +1723,7 @@ const createSeriesLabelOption = (item: TimeSeriesChartDataItem, show: boolean,
     }
     return result;
   };
-  const labelOption: SeriesLabelOption = {
+  const labelOption: SeriesLabelOption | BarSeriesLabelOption = {
     show,
     position,
     formatter,
@@ -1482,45 +1738,3 @@ const createSeriesLabelOption = (item: TimeSeriesChartDataItem, show: boolean,
   }
   return labelOption;
 };
-
-const createChartTextStyle = (font: Font, color: string, darkMode: boolean, colorKey?: string, fill = false): ComponentStyle => {
-  const style = textStyle(font);
-  delete style.lineHeight;
-  style.fontSize = font.size;
-  if (fill) {
-    style.fill = prepareChartThemeColor(color, darkMode, colorKey);
-  } else {
-    style.color = prepareChartThemeColor(color, darkMode, colorKey);
-  }
-  return style;
-};
-
-const createLinearOpacityGradient = (color: string, gradient: {start: number; end: number}): LinearGradientObject => ({
-    type: 'linear',
-    x: 0,
-    y: 0,
-    x2: 0,
-    y2: 1,
-    colorStops: [{
-      offset: 0, color: tinycolor(color).setAlpha(gradient.start / 100).toRgbString() // color at 0%
-    }, {
-      offset: 1, color: tinycolor(color).setAlpha(gradient.end / 100).toRgbString() // color at 100%
-    }],
-    global: false
-});
-
-const prepareChartThemeColor = (color: string, darkMode: boolean, colorKey?: string): string => {
-  if (darkMode) {
-    let colorInstance = tinycolor(color);
-    if (colorInstance.isDark()) {
-      if (colorKey && timeSeriesChartColorScheme[colorKey]) {
-        return timeSeriesChartColorScheme[colorKey].dark;
-      } else {
-        const rgb = colorInstance.toRgb();
-        colorInstance = tinycolor({r: 255 - rgb.r, g: 255 - rgb.g, b: 255 - rgb.b, a: rgb.a});
-        return colorInstance.toRgbString();
-      }
-    }
-  }
-  return color;
-};
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
index ad5aafd4eb..e1d9ca2324 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
@@ -16,15 +16,16 @@
 
 import { WidgetContext } from '@home/models/widget-component.models';
 import {
+  adjustTimeAxisExtentToData,
   calculateThresholdsOffset,
   createTimeSeriesVisualMapOption,
   createTimeSeriesXAxis,
   createTimeSeriesYAxis,
+  createTooltipValueFormatFunction,
   defaultTimeSeriesChartYAxisSettings,
   generateChartData,
   LineSeriesStepType,
   parseThresholdData,
-  SeriesLabelPosition,
   TimeSeriesChartAxis,
   TimeSeriesChartDataItem,
   timeSeriesChartDefaultSettings,
@@ -37,30 +38,27 @@ import {
   timeSeriesChartThresholdDefaultSettings,
   TimeSeriesChartThresholdItem,
   TimeSeriesChartThresholdType,
+  timeSeriesChartTooltipFormatter,
+  TimeSeriesChartTooltipTrigger,
+  TimeSeriesChartTooltipValueFormatFunction,
   TimeSeriesChartType,
   TimeSeriesChartXAxis,
   TimeSeriesChartYAxis,
   TimeSeriesChartYAxisId,
   TimeSeriesChartYAxisSettings,
+  toTimeSeriesChartDataSet,
   updateDarkMode,
   updateXAxisTimeWindow
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { ResizeObserver } from '@juggle/resize-observer';
 import {
-  adjustTimeAxisExtentToData,
   calculateAxisSize,
-  createTooltipValueFormatFunction,
   ECharts,
   echartsModule,
   EChartsOption,
-  EChartsShape,
-  echartsTooltipFormatter,
-  EChartsTooltipTrigger,
-  EChartsTooltipValueFormatFunction,
   getAxisExtent,
   getFocusedSeriesIndex,
-  measureAxisNameSize,
-  toNamedData
+  measureAxisNameSize
 } from '@home/components/widget/lib/chart/echarts-widget.models';
 import { DateFormatProcessor } from '@shared/models/widget-settings.models';
 import { formattedDataFormDatasourceData, formatValue, isDefinedAndNotNull, isEqual, mergeDeep } from '@core/utils';
@@ -76,6 +74,7 @@ import { DataKeySettingsFunction } from '@home/components/widget/config/data-key
 import { DeepPartial } from '@shared/models/common';
 import { BarRenderSharedContext } from '@home/components/widget/lib/chart/time-series-chart-bar.models';
 import { TimeSeriesChartStateValueConverter } from '@home/components/widget/lib/chart/time-series-chart-state.models';
+import { ChartLabelPosition, ChartShape } from '@home/components/widget/lib/chart/chart.models';
 
 export class TbTimeSeriesChart {
 
@@ -92,14 +91,14 @@ export class TbTimeSeriesChart {
           settings.type = TimeSeriesChartSeriesType.line;
           settings.lineSettings.showLine = false;
           settings.lineSettings.showPoints = true;
-          settings.lineSettings.pointShape = EChartsShape.circle;
+          settings.lineSettings.pointShape = ChartShape.circle;
           settings.lineSettings.pointSize = 8;
         } else if (type === TimeSeriesChartType.state) {
           settings.type = TimeSeriesChartSeriesType.line;
           settings.lineSettings.showLine = true;
           settings.lineSettings.step = true;
           settings.lineSettings.stepType = LineSeriesStepType.end;
-          settings.lineSettings.pointShape = EChartsShape.circle;
+          settings.lineSettings.pointShape = ChartShape.circle;
           settings.lineSettings.pointSize = 12;
         }
         return settings;
@@ -135,7 +134,7 @@ export class TbTimeSeriesChart {
   private timeSeriesChartOptions: EChartsOption;
 
   private readonly tooltipDateFormat: DateFormatProcessor;
-  private readonly tooltipValueFormatFunction: EChartsTooltipValueFormatFunction;
+  private readonly tooltipValueFormatFunction: TimeSeriesChartTooltipValueFormatFunction;
   private readonly stateValueConverter: TimeSeriesChartStateValueConverter;
 
   private yMinSubject = new BehaviorSubject(-1);
@@ -189,7 +188,7 @@ export class TbTimeSeriesChart {
         this.tooltipValueFormatFunction =
           createTooltipValueFormatFunction(this.settings.tooltipValueFormatter);
         if (!this.tooltipValueFormatFunction) {
-          this.tooltipValueFormatFunction = (value, latestData, units, decimals) => formatValue(value, decimals, units, false);
+          this.tooltipValueFormatFunction = (value, _latestData, units, decimals) => formatValue(value, decimals, units, false);
         }
       }
     }
@@ -218,7 +217,7 @@ export class TbTimeSeriesChart {
       const datasourceData = this.ctx.data ? this.ctx.data.find(d => d.dataKey === item.dataKey) : null;
       if (!isEqual(item.dataSet, datasourceData?.data)) {
         item.dataSet = datasourceData?.data;
-        item.data = datasourceData?.data ? toNamedData(datasourceData.data, this.stateValueConverter?.valueConverter) : [];
+        item.data = datasourceData?.data ? toTimeSeriesChartDataSet(datasourceData.data, this.stateValueConverter?.valueConverter) : [];
       }
     }
     this.onResize();
@@ -352,7 +351,7 @@ export class TbTimeSeriesChart {
       this.darkMode = darkMode;
       if (this.timeSeriesChart) {
         this.timeSeriesChartOptions = updateDarkMode(this.timeSeriesChartOptions,
-          this.settings, this.xAxisList, this.yAxisList, this.dataItems, darkMode);
+          this.xAxisList, this.yAxisList, this.dataItems, darkMode);
         this.timeSeriesChart.setOption(this.timeSeriesChartOptions);
       }
     }
@@ -381,11 +380,11 @@ export class TbTimeSeriesChart {
           const keySettings = mergeDeep<TimeSeriesChartKeySettings>({} as TimeSeriesChartKeySettings,
             timeSeriesChartKeyDefaultSettings, dataKey.settings);
           if ((keySettings.type === TimeSeriesChartSeriesType.line && keySettings.lineSettings.showPointLabel &&
-              keySettings.lineSettings.pointLabelPosition === SeriesLabelPosition.top) ||
+              keySettings.lineSettings.pointLabelPosition === ChartLabelPosition.top) ||
             (keySettings.type === TimeSeriesChartSeriesType.bar &&
               keySettings.barSettings.showLabel &&
-              [SeriesLabelPosition.top, SeriesLabelPosition.bottom]
-              .includes(keySettings.barSettings.labelPosition as SeriesLabelPosition))) {
+              [ChartLabelPosition.top, ChartLabelPosition.bottom]
+              .includes(keySettings.barSettings.labelPosition as ChartLabelPosition))) {
             this.topPointLabels = true;
           }
           if (this.stateValueConverter && keySettings.type === TimeSeriesChartSeriesType.line) {
@@ -393,7 +392,8 @@ export class TbTimeSeriesChart {
           }
           dataKey.settings = keySettings;
           const datasourceData = this.ctx.data ? this.ctx.data.find(d => d.dataKey === dataKey) : null;
-          const namedData = datasourceData?.data ? toNamedData(datasourceData.data, this.stateValueConverter?.valueConverter) : [];
+          const data = datasourceData?.data ?
+            toTimeSeriesChartDataSet(datasourceData.data, this.stateValueConverter?.valueConverter) : [];
           const units = dataKey.units && dataKey.units.length ? dataKey.units : this.ctx.units;
           const decimals = isDefinedAndNotNull(dataKey.decimals) ? dataKey.decimals :
             (isDefinedAndNotNull(this.ctx.decimals) ? this.ctx.decimals : 2);
@@ -413,7 +413,7 @@ export class TbTimeSeriesChart {
             comparisonItem,
             datasource,
             dataKey,
-            data: namedData,
+            data,
             enabled: !keySettings.dataHiddenByDefault,
             tooltipValueFormatFunction: createTooltipValueFormatFunction(keySettings.tooltipValueFormatter)
           });
@@ -596,14 +596,14 @@ export class TbTimeSeriesChart {
       darkMode: this.darkMode,
       backgroundColor: 'transparent',
       tooltip: [{
-        trigger: this.settings.tooltipTrigger === EChartsTooltipTrigger.axis ? 'axis' : 'item',
+        trigger: this.settings.tooltipTrigger === TimeSeriesChartTooltipTrigger.axis ? 'axis' : 'item',
         confine: true,
         appendTo: 'body',
         axisPointer: {
           type: this.noAggregation ? 'line' : 'shadow'
         },
         formatter: (params: CallbackDataParams[]) =>
-          this.settings.showTooltip ? echartsTooltipFormatter(this.renderer, this.tooltipDateFormat,
+          this.settings.showTooltip ? timeSeriesChartTooltipFormatter(this.renderer, this.tooltipDateFormat,
             this.settings, params, this.tooltipValueFormatFunction,
             this.settings.tooltipShowFocusedSeries ? getFocusedSeriesIndex(this.timeSeriesChart) : -1,
             this.dataItems,  this.noAggregation ? null : this.ctx.timeWindow.interval) : undefined,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-widget-settings.component.html
new file mode 100644
index 0000000000..36ff5a4d0d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-widget-settings.component.html
@@ -0,0 +1,169 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<ng-container [formGroup]="barChartWidgetSettingsForm">
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-chart-style</div>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="sortSeries">
+        {{ 'widgets.latest-chart.sort-series' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
+      <tb-chart-bar-settings
+          formControlName="barSettings"
+          [series]="false">
+      </tb-chart-bar-settings>
+    </div>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-axis</div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.chart.chart-axis.scale</div>
+        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+          <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-min</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="axisMin"
+                   type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+          </mat-form-field>
+          <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-max</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="axisMax"
+                   type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+          </mat-form-field>
+          <tb-font-settings formControlName="axisTickLabelFont"
+                            clearButton
+                            disabledLineHeight
+                            forceSizeUnit="px"
+                            previewText="100">
+          </tb-font-settings>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="axisTickLabelColor">
+          </tb-color-input>
+        </div>
+      </div>
+    </div>
+    <div class="tb-form-panel tb-slide-toggle">
+      <mat-expansion-panel class="tb-settings" [expanded]="barChartWidgetSettingsForm.get('showLegend').value" [disabled]="!barChartWidgetSettingsForm.get('showLegend').value">
+        <mat-expansion-panel-header fxLayout="row wrap">
+          <mat-panel-title>
+            <mat-slide-toggle class="mat-slide" formControlName="showLegend" (click)="$event.stopPropagation()"
+                              fxLayoutAlign="center">
+              {{ 'widget-config.legend' | translate }}
+            </mat-slide-toggle>
+          </mat-panel-title>
+        </mat-expansion-panel-header>
+        <ng-template matExpansionPanelContent>
+          <div class="tb-form-row space-between">
+            <div>{{ 'legend.position' | translate }}</div>
+            <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+              <mat-select formControlName="legendPosition">
+                <mat-option *ngFor="let pos of legendPositions" [value]="pos">
+                  {{ legendPositionTranslationMap.get(pos) | translate }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'legend.label' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-font-settings formControlName="legendLabelFont"
+                                previewText="Wind power">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="legendLabelColor">
+              </tb-color-input>
+            </div>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'legend.value' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-font-settings formControlName="legendValueFont"
+                                [previewText]="valuePreviewFn">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="legendValueColor">
+              </tb-color-input>
+            </div>
+          </div>
+        </ng-template>
+      </mat-expansion-panel>
+    </div>
+    <div class="tb-form-panel tb-slide-toggle">
+      <mat-expansion-panel class="tb-settings" [expanded]="barChartWidgetSettingsForm.get('showTooltip').value" [disabled]="!barChartWidgetSettingsForm.get('showTooltip').value">
+        <mat-expansion-panel-header fxLayout="row wrap">
+          <mat-panel-title>
+            <mat-slide-toggle class="mat-slide" formControlName="showTooltip" (click)="$event.stopPropagation()"
+                              fxLayoutAlign="center">
+              {{ 'widget-config.tooltip' | translate }}
+            </mat-slide-toggle>
+          </mat-panel-title>
+        </mat-expansion-panel-header>
+        <ng-template matExpansionPanelContent>
+          <div class="tb-form-row space-between column-xs">
+            <div>{{ 'tooltip.value' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+                <mat-select formControlName="tooltipValueType">
+                  <mat-option *ngFor="let type of latestChartTooltipValueTypes" [value]="type">
+                    {{ latestChartTooltipValueTypeTranslationMap.get(type) | translate }}
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
+              <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+                <input matInput formControlName="tooltipValueDecimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+                <div matSuffix fxHide.lt-md translate>widget-config.decimals-suffix</div>
+              </mat-form-field>
+              <tb-font-settings formControlName="tooltipValueFont"
+                                [previewText]="tooltipValuePreviewFn">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="tooltipValueColor">
+              </tb-color-input>
+            </div>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'tooltip.background-color' | translate }}</div>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="tooltipBackgroundColor">
+            </tb-color-input>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'tooltip.background-blur' | translate }}</div>
+            <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+              <input matInput formControlName="tooltipBackgroundBlur" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+              <div matSuffix>px</div>
+            </mat-form-field>
+          </div>
+        </ng-template>
+      </mat-expansion-panel>
+    </div>
+    <tb-chart-animation-settings
+        formControlName="animation">
+    </tb-chart-animation-settings>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.background.background' | translate }}</div>
+      <tb-background-settings formControlName="background">
+      </tb-background-settings>
+    </div>
+  </div>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-widget-settings.component.ts
new file mode 100644
index 0000000000..2074382257
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-widget-settings.component.ts
@@ -0,0 +1,160 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component } from '@angular/core';
+import {
+  legendPositions,
+  legendPositionTranslationMap,
+  WidgetSettings,
+  WidgetSettingsComponent
+} from '@shared/models/widget.models';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { formatValue, mergeDeep } from '@core/utils';
+import {
+  LatestChartTooltipValueType,
+  latestChartTooltipValueTypes,
+  latestChartTooltipValueTypeTranslations
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import {
+  barChartWidgetDefaultSettings,
+  BarChartWidgetSettings
+} from '@home/components/widget/lib/chart/bar-chart-widget.models';
+
+@Component({
+  selector: 'tb-bar-chart-widget-settings',
+  templateUrl: './bar-chart-widget-settings.component.html',
+  styleUrls: []
+})
+export class BarChartWidgetSettingsComponent extends WidgetSettingsComponent {
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
+
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
+
+  barChartWidgetSettingsForm: UntypedFormGroup;
+
+  valuePreviewFn = this._valuePreviewFn.bind(this);
+
+  tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
+
+  constructor(protected store: Store<AppState>,
+              private fb: UntypedFormBuilder) {
+    super(store);
+  }
+
+  protected settingsForm(): UntypedFormGroup {
+    return this.barChartWidgetSettingsForm;
+  }
+
+  protected defaultSettings(): WidgetSettings {
+    return mergeDeep<BarChartWidgetSettings>({} as BarChartWidgetSettings, barChartWidgetDefaultSettings);
+  }
+
+  protected onSettingsSet(settings: WidgetSettings) {
+    this.barChartWidgetSettingsForm = this.fb.group({
+
+      sortSeries: [settings.sortSeries, []],
+
+      barSettings: [settings.barSettings, []],
+
+      axisMin: [settings.axisMin, []],
+      axisMax: [settings.axisMax, []],
+      axisTickLabelFont: [settings.axisTickLabelFont, []],
+      axisTickLabelColor: [settings.axisTickLabelColor, []],
+
+      animation: [settings.animation, []],
+
+      showLegend: [settings.showLegend, []],
+      legendPosition: [settings.legendPosition, []],
+      legendLabelFont: [settings.legendLabelFont, []],
+      legendLabelColor: [settings.legendLabelColor, []],
+      legendValueFont: [settings.legendValueFont, []],
+      legendValueColor: [settings.legendValueColor, []],
+
+      showTooltip: [settings.showTooltip, []],
+      tooltipValueType: [settings.tooltipValueType, []],
+      tooltipValueDecimals: [settings.tooltipValueDecimals, []],
+      tooltipValueFont: [settings.tooltipValueFont, []],
+      tooltipValueColor: [settings.tooltipValueColor, []],
+      tooltipBackgroundColor: [settings.tooltipBackgroundColor, []],
+      tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []],
+
+      background: [settings.background, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['showLegend', 'showTooltip'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const showLegend: boolean = this.barChartWidgetSettingsForm.get('showLegend').value;
+    const showTooltip: boolean = this.barChartWidgetSettingsForm.get('showTooltip').value;
+
+    if (showLegend) {
+      this.barChartWidgetSettingsForm.get('legendPosition').enable();
+      this.barChartWidgetSettingsForm.get('legendLabelFont').enable();
+      this.barChartWidgetSettingsForm.get('legendLabelColor').enable();
+      this.barChartWidgetSettingsForm.get('legendValueFont').enable();
+      this.barChartWidgetSettingsForm.get('legendValueColor').enable();
+    } else {
+      this.barChartWidgetSettingsForm.get('legendPosition').disable();
+      this.barChartWidgetSettingsForm.get('legendLabelFont').disable();
+      this.barChartWidgetSettingsForm.get('legendLabelColor').disable();
+      this.barChartWidgetSettingsForm.get('legendValueFont').disable();
+      this.barChartWidgetSettingsForm.get('legendValueColor').disable();
+    }
+    if (showTooltip) {
+      this.barChartWidgetSettingsForm.get('tooltipValueType').enable();
+      this.barChartWidgetSettingsForm.get('tooltipValueDecimals').enable();
+      this.barChartWidgetSettingsForm.get('tooltipValueFont').enable();
+      this.barChartWidgetSettingsForm.get('tooltipValueColor').enable();
+      this.barChartWidgetSettingsForm.get('tooltipBackgroundColor').enable();
+      this.barChartWidgetSettingsForm.get('tooltipBackgroundBlur').enable();
+    } else {
+      this.barChartWidgetSettingsForm.get('tooltipValueType').disable();
+      this.barChartWidgetSettingsForm.get('tooltipValueDecimals').disable();
+      this.barChartWidgetSettingsForm.get('tooltipValueFont').disable();
+      this.barChartWidgetSettingsForm.get('tooltipValueColor').disable();
+      this.barChartWidgetSettingsForm.get('tooltipBackgroundColor').disable();
+      this.barChartWidgetSettingsForm.get('tooltipBackgroundBlur').disable();
+    }
+  }
+
+  private _valuePreviewFn(): string {
+    const units: string = this.widgetConfig.config.units;
+    const decimals: number = this.widgetConfig.config.decimals;
+    return formatValue(110, decimals, units, false);
+  }
+
+  private _tooltipValuePreviewFn(): string {
+    const tooltipValueType: LatestChartTooltipValueType = this.barChartWidgetSettingsForm.get('tooltipValueType').value;
+    const decimals: number = this.barChartWidgetSettingsForm.get('tooltipValueDecimals').value;
+    if (tooltipValueType === LatestChartTooltipValueType.percentage) {
+      return formatValue(35, decimals, '%', false);
+    } else {
+      const units: string = this.widgetConfig.config.units;
+      return formatValue(110, decimals, units, false);
+    }
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html
index 920374ec00..8965b462b1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html
@@ -62,26 +62,26 @@
       </div>
       <div class="tb-form-row">
         <mat-slide-toggle class="mat-slide" formControlName="showBarBorder">
-          {{ 'widgets.time-series-chart.series.bar.show-border' | translate }}
+          {{ 'widgets.chart.bar.show-border' | translate }}
         </mat-slide-toggle>
       </div>
       <div class="tb-form-row space-between column-xs">
-        <div translate>widgets.time-series-chart.series.bar.border-width</div>
+        <div translate>widgets.chart.bar.border-width</div>
         <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
           <input matInput type="number" formControlName="barBorderWidth" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
         </mat-form-field>
       </div>
       <div class="tb-form-row space-between column-xs">
-        <div translate>widgets.time-series-chart.series.bar.border-radius</div>
+        <div translate>widgets.chart.bar.border-radius</div>
         <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
           <input matInput type="number" formControlName="barBorderRadius" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
         </mat-form-field>
       </div>
-      <tb-time-series-chart-fill-settings
+      <tb-chart-fill-settings
           formControlName="barBackgroundSettings"
-          title="widgets.time-series-chart.series.background"
-          fillNoneTitle="widgets.time-series-chart.series.fill-type-solid">
-      </tb-time-series-chart-fill-settings>
+          title="widgets.chart.background"
+          fillNoneTitle="widgets.chart.fill-type-solid">
+      </tb-chart-fill-settings>
       <tb-time-series-no-aggregation-bar-width-settings
           stroked
           formControlName="noAggregationBarWidthSettings">
@@ -227,9 +227,9 @@
         </ng-template>
       </mat-expansion-panel>
     </div>
-    <tb-echarts-animation-settings
+    <tb-chart-animation-settings
         formControlName="animation">
-    </tb-echarts-animation-settings>
+    </tb-chart-animation-settings>
     <div class="tb-form-panel">
       <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
       <div class="tb-form-row space-between">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.html
index 863663db08..4f747206a0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.html
@@ -154,9 +154,9 @@
         </ng-template>
       </mat-expansion-panel>
     </div>
-    <tb-echarts-animation-settings
+    <tb-chart-animation-settings
         formControlName="animation">
-    </tb-echarts-animation-settings>
+    </tb-chart-animation-settings>
     <div class="tb-form-row space-between">
       <div>{{ 'widgets.background.background' | translate }}</div>
       <tb-background-settings formControlName="background">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.html
index ea96d8a4b5..9674bb8d6f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.html
@@ -172,9 +172,9 @@
         </ng-template>
       </mat-expansion-panel>
     </div>
-    <tb-echarts-animation-settings
+    <tb-chart-animation-settings
         formControlName="animation">
-    </tb-echarts-animation-settings>
+    </tb-chart-animation-settings>
     <div class="tb-form-row space-between">
       <div>{{ 'widgets.background.background' | translate }}</div>
       <tb-background-settings formControlName="background">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.ts
index ae96753264..19b49247cd 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.ts
@@ -33,7 +33,7 @@ import {
 import {
   pieChartLabelPositions,
   pieChartLabelPositionTranslations
-} from '@home/components/widget/lib/chart/pie-chart.models';
+} from '@home/components/widget/lib/chart/chart.models';
 import {
   pieChartWidgetDefaultSettings,
   PieChartWidgetSettings
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component.html
new file mode 100644
index 0000000000..9201173d4d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component.html
@@ -0,0 +1,176 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<ng-container [formGroup]="polarAreaChartWidgetSettingsForm">
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.polar-area-chart.polar-area-chart-style</div>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="sortSeries">
+        {{ 'widgets.latest-chart.sort-series' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
+      <tb-chart-bar-settings
+          formControlName="barSettings"
+          pieLabelPosition
+          [series]="false">
+      </tb-chart-bar-settings>
+    </div>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.polar-area-chart.polar-axis</div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.chart.chart-axis.scale</div>
+        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+          <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-min</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="axisMin"
+                   type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+          </mat-form-field>
+          <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-max</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="axisMax"
+                   type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+          </mat-form-field>
+          <tb-font-settings formControlName="axisTickLabelFont"
+                            clearButton
+                            disabledLineHeight
+                            forceSizeUnit="px"
+                            previewText="100">
+          </tb-font-settings>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="axisTickLabelColor">
+          </tb-color-input>
+        </div>
+      </div>
+      <div class="tb-form-row space-between">
+        <div translate>widgets.polar-area-chart.start-angle</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="angleAxisStartAngle" type="number" min="0" max="360" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+      </div>
+    </div>
+    <div class="tb-form-panel tb-slide-toggle">
+      <mat-expansion-panel class="tb-settings" [expanded]="polarAreaChartWidgetSettingsForm.get('showLegend').value" [disabled]="!polarAreaChartWidgetSettingsForm.get('showLegend').value">
+        <mat-expansion-panel-header fxLayout="row wrap">
+          <mat-panel-title>
+            <mat-slide-toggle class="mat-slide" formControlName="showLegend" (click)="$event.stopPropagation()"
+                              fxLayoutAlign="center">
+              {{ 'widget-config.legend' | translate }}
+            </mat-slide-toggle>
+          </mat-panel-title>
+        </mat-expansion-panel-header>
+        <ng-template matExpansionPanelContent>
+          <div class="tb-form-row space-between">
+            <div>{{ 'legend.position' | translate }}</div>
+            <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+              <mat-select formControlName="legendPosition">
+                <mat-option *ngFor="let pos of legendPositions" [value]="pos">
+                  {{ legendPositionTranslationMap.get(pos) | translate }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'legend.label' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-font-settings formControlName="legendLabelFont"
+                                previewText="Wind power">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="legendLabelColor">
+              </tb-color-input>
+            </div>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'legend.value' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-font-settings formControlName="legendValueFont"
+                                [previewText]="valuePreviewFn">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="legendValueColor">
+              </tb-color-input>
+            </div>
+          </div>
+        </ng-template>
+      </mat-expansion-panel>
+    </div>
+    <div class="tb-form-panel tb-slide-toggle">
+      <mat-expansion-panel class="tb-settings" [expanded]="polarAreaChartWidgetSettingsForm.get('showTooltip').value" [disabled]="!polarAreaChartWidgetSettingsForm.get('showTooltip').value">
+        <mat-expansion-panel-header fxLayout="row wrap">
+          <mat-panel-title>
+            <mat-slide-toggle class="mat-slide" formControlName="showTooltip" (click)="$event.stopPropagation()"
+                              fxLayoutAlign="center">
+              {{ 'widget-config.tooltip' | translate }}
+            </mat-slide-toggle>
+          </mat-panel-title>
+        </mat-expansion-panel-header>
+        <ng-template matExpansionPanelContent>
+          <div class="tb-form-row space-between column-xs">
+            <div>{{ 'tooltip.value' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+                <mat-select formControlName="tooltipValueType">
+                  <mat-option *ngFor="let type of latestChartTooltipValueTypes" [value]="type">
+                    {{ latestChartTooltipValueTypeTranslationMap.get(type) | translate }}
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
+              <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+                <input matInput formControlName="tooltipValueDecimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+                <div matSuffix fxHide.lt-md translate>widget-config.decimals-suffix</div>
+              </mat-form-field>
+              <tb-font-settings formControlName="tooltipValueFont"
+                                [previewText]="tooltipValuePreviewFn">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="tooltipValueColor">
+              </tb-color-input>
+            </div>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'tooltip.background-color' | translate }}</div>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="tooltipBackgroundColor">
+            </tb-color-input>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'tooltip.background-blur' | translate }}</div>
+            <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+              <input matInput formControlName="tooltipBackgroundBlur" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+              <div matSuffix>px</div>
+            </mat-form-field>
+          </div>
+        </ng-template>
+      </mat-expansion-panel>
+    </div>
+    <tb-chart-animation-settings
+        formControlName="animation">
+    </tb-chart-animation-settings>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.background.background' | translate }}</div>
+      <tb-background-settings formControlName="background">
+      </tb-background-settings>
+    </div>
+  </div>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component.ts
new file mode 100644
index 0000000000..64144b5319
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component.ts
@@ -0,0 +1,161 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component } from '@angular/core';
+import {
+  legendPositions,
+  legendPositionTranslationMap,
+  WidgetSettings,
+  WidgetSettingsComponent
+} from '@shared/models/widget.models';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { formatValue, mergeDeep } from '@core/utils';
+import {
+  LatestChartTooltipValueType,
+  latestChartTooltipValueTypes,
+  latestChartTooltipValueTypeTranslations
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import {
+  polarAreaChartWidgetDefaultSettings,
+  PolarAreaChartWidgetSettings
+} from '@home/components/widget/lib/chart/polar-area-widget.models';
+
+@Component({
+  selector: 'tb-polar-area-chart-widget-settings',
+  templateUrl: './polar-area-chart-widget-settings.component.html',
+  styleUrls: []
+})
+export class PolarAreaChartWidgetSettingsComponent extends WidgetSettingsComponent {
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
+
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
+
+  polarAreaChartWidgetSettingsForm: UntypedFormGroup;
+
+  valuePreviewFn = this._valuePreviewFn.bind(this);
+
+  tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
+
+  constructor(protected store: Store<AppState>,
+              private fb: UntypedFormBuilder) {
+    super(store);
+  }
+
+  protected settingsForm(): UntypedFormGroup {
+    return this.polarAreaChartWidgetSettingsForm;
+  }
+
+  protected defaultSettings(): WidgetSettings {
+    return mergeDeep<PolarAreaChartWidgetSettings>({} as PolarAreaChartWidgetSettings, polarAreaChartWidgetDefaultSettings);
+  }
+
+  protected onSettingsSet(settings: WidgetSettings) {
+    this.polarAreaChartWidgetSettingsForm = this.fb.group({
+
+      sortSeries: [settings.sortSeries, []],
+
+      barSettings: [settings.barSettings, []],
+
+      axisMin: [settings.axisMin, []],
+      axisMax: [settings.axisMax, []],
+      axisTickLabelFont: [settings.axisTickLabelFont, []],
+      axisTickLabelColor: [settings.axisTickLabelColor, []],
+      angleAxisStartAngle: [settings.angleAxisStartAngle, [Validators.min(0), Validators.max(360)]],
+
+      animation: [settings.animation, []],
+
+      showLegend: [settings.showLegend, []],
+      legendPosition: [settings.legendPosition, []],
+      legendLabelFont: [settings.legendLabelFont, []],
+      legendLabelColor: [settings.legendLabelColor, []],
+      legendValueFont: [settings.legendValueFont, []],
+      legendValueColor: [settings.legendValueColor, []],
+
+      showTooltip: [settings.showTooltip, []],
+      tooltipValueType: [settings.tooltipValueType, []],
+      tooltipValueDecimals: [settings.tooltipValueDecimals, []],
+      tooltipValueFont: [settings.tooltipValueFont, []],
+      tooltipValueColor: [settings.tooltipValueColor, []],
+      tooltipBackgroundColor: [settings.tooltipBackgroundColor, []],
+      tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []],
+
+      background: [settings.background, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['showLegend', 'showTooltip'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const showLegend: boolean = this.polarAreaChartWidgetSettingsForm.get('showLegend').value;
+    const showTooltip: boolean = this.polarAreaChartWidgetSettingsForm.get('showTooltip').value;
+
+    if (showLegend) {
+      this.polarAreaChartWidgetSettingsForm.get('legendPosition').enable();
+      this.polarAreaChartWidgetSettingsForm.get('legendLabelFont').enable();
+      this.polarAreaChartWidgetSettingsForm.get('legendLabelColor').enable();
+      this.polarAreaChartWidgetSettingsForm.get('legendValueFont').enable();
+      this.polarAreaChartWidgetSettingsForm.get('legendValueColor').enable();
+    } else {
+      this.polarAreaChartWidgetSettingsForm.get('legendPosition').disable();
+      this.polarAreaChartWidgetSettingsForm.get('legendLabelFont').disable();
+      this.polarAreaChartWidgetSettingsForm.get('legendLabelColor').disable();
+      this.polarAreaChartWidgetSettingsForm.get('legendValueFont').disable();
+      this.polarAreaChartWidgetSettingsForm.get('legendValueColor').disable();
+    }
+    if (showTooltip) {
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueType').enable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueDecimals').enable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueFont').enable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueColor').enable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipBackgroundColor').enable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipBackgroundBlur').enable();
+    } else {
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueType').disable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueDecimals').disable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueFont').disable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueColor').disable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipBackgroundColor').disable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipBackgroundBlur').disable();
+    }
+  }
+
+  private _valuePreviewFn(): string {
+    const units: string = this.widgetConfig.config.units;
+    const decimals: number = this.widgetConfig.config.decimals;
+    return formatValue(110, decimals, units, false);
+  }
+
+  private _tooltipValuePreviewFn(): string {
+    const tooltipValueType: LatestChartTooltipValueType = this.polarAreaChartWidgetSettingsForm.get('tooltipValueType').value;
+    const decimals: number = this.polarAreaChartWidgetSettingsForm.get('tooltipValueDecimals').value;
+    if (tooltipValueType === LatestChartTooltipValueType.percentage) {
+      return formatValue(35, decimals, '%', false);
+    } else {
+      const units: string = this.widgetConfig.config.units;
+      return formatValue(110, decimals, units, false);
+    }
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html
index 30c5eea4c1..87bbe59e1f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html
@@ -121,8 +121,8 @@
           <div fxLayout="row" fxFlex.lt-md fxLayoutAlign="start center" fxLayoutGap="8px">
             <mat-form-field class="medium-width" fxFlex.lt-md appearance="outline" subscriptSizing="dynamic">
               <mat-select formControlName="pointLabelPosition">
-                <mat-option *ngFor="let position of seriesLabelPositions" [value]="position">
-                  {{ seriesLabelPositionTranslations.get(position) | translate }}
+                <mat-option *ngFor="let position of chartLabelPositions" [value]="position">
+                  {{ chartLabelPositionTranslations.get(position) | translate }}
                 </mat-option>
               </mat-select>
             </mat-form-field>
@@ -151,8 +151,8 @@
           <div translate>widgets.time-series-chart.series.point.point-shape</div>
           <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
             <mat-select formControlName="pointShape">
-              <mat-option *ngFor="let shape of echartsShapes" [value]="shape">
-                {{ echartsShapeTranslations.get(shape) | translate }}
+              <mat-option *ngFor="let shape of chartShapes" [value]="shape">
+                {{ chartShapeTranslations.get(shape) | translate }}
               </mat-option>
             </mat-select>
           </mat-form-field>
@@ -303,9 +303,9 @@
         </ng-template>
       </mat-expansion-panel>
     </div>
-    <tb-echarts-animation-settings
+    <tb-chart-animation-settings
         formControlName="animation">
-    </tb-echarts-animation-settings>
+    </tb-chart-animation-settings>
     <div class="tb-form-panel">
       <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
       <div class="tb-form-row space-between">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts
index 872a77d2a7..895fc6888a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts
@@ -34,12 +34,10 @@ import { DateFormatProcessor, DateFormatSettings } from '@shared/models/widget-s
 import {
   lineSeriesStepTypes,
   lineSeriesStepTypeTranslations,
-  seriesLabelPositions,
-  seriesLabelPositionTranslations,
   timeSeriesLineTypes,
   timeSeriesLineTypeTranslations
 } from '@home/components/widget/lib/chart/time-series-chart.models';
-import { echartsShapes, echartsShapeTranslations } from '@home/components/widget/lib/chart/echarts-widget.models';
+import { chartLabelPositions, chartLabelPositionTranslations, chartShapes, chartShapeTranslations } from '@home/components/widget/lib/chart/chart.models';
 
 @Component({
   selector: 'tb-range-chart-widget-settings',
@@ -65,13 +63,13 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
 
   timeSeriesLineTypeTranslations = timeSeriesLineTypeTranslations;
 
-  seriesLabelPositions = seriesLabelPositions;
+  chartLabelPositions = chartLabelPositions;
 
-  seriesLabelPositionTranslations = seriesLabelPositionTranslations;
+  chartLabelPositionTranslations = chartLabelPositionTranslations;
 
-  echartsShapes = echartsShapes;
+  chartShapes = chartShapes;
 
-  echartsShapeTranslations = echartsShapeTranslations;
+  chartShapeTranslations = chartShapeTranslations;
 
   legendPositions = legendPositions;
 
@@ -164,7 +162,7 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
       'showLegend', 'showTooltip', 'tooltipShowDate'];
   }
 
-  protected updateValidators(emitEvent: boolean) {
+  protected updateValidators() {
     const showRangeThresholds: boolean = this.rangeChartWidgetSettingsForm.get('showRangeThresholds').value;
     const fillArea: boolean = this.rangeChartWidgetSettingsForm.get('fillArea').value;
     const showLine: boolean = this.rangeChartWidgetSettingsForm.get('showLine').value;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.html
index a265a1b431..1299f0574a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.html
@@ -52,9 +52,9 @@
                                         [chartType]="chartType"
                                         formControlName="lineSettings">
     </tb-time-series-chart-line-settings>
-    <tb-time-series-chart-bar-settings [fxShow]="timeSeriesChartKeySettingsForm.get('type').value === TimeSeriesChartSeriesType.bar"
-                                        formControlName="barSettings">
-    </tb-time-series-chart-bar-settings>
+    <tb-chart-bar-settings [fxShow]="timeSeriesChartKeySettingsForm.get('type').value === TimeSeriesChartSeriesType.bar"
+                                     formControlName="barSettings">
+    </tb-chart-bar-settings>
   </div>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widgets.chart.tooltip-settings</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.html
index f20f1323b3..906c4148a2 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.html
@@ -66,9 +66,9 @@
     </div>
     <ng-container *ngTemplateOutlet="pointSettings"></ng-container>
   </div>
-  <tb-time-series-chart-fill-settings
+  <tb-chart-fill-settings
     formControlName="fillAreaSettings">
-  </tb-time-series-chart-fill-settings>
+  </tb-chart-fill-settings>
 </ng-container>
 <ng-template #pointSettings [formGroup]="lineSettingsFormGroup">
   <div class="tb-form-row space-between column-lt-md">
@@ -80,8 +80,8 @@
     <div fxLayout="row" fxFlex.lt-md fxLayoutAlign="start center" fxLayoutGap="8px">
       <mat-form-field class="medium-width" fxFlex.lt-md appearance="outline" subscriptSizing="dynamic">
         <mat-select formControlName="pointLabelPosition">
-          <mat-option *ngFor="let position of seriesLabelPositions" [value]="position">
-            {{ seriesLabelPositionTranslations.get(position) | translate }}
+          <mat-option *ngFor="let position of chartLabelPositions" [value]="position">
+            {{ chartLabelPositionTranslations.get(position) | translate }}
           </mat-option>
         </mat-select>
       </mat-form-field>
@@ -110,8 +110,8 @@
     <div translate>widgets.time-series-chart.series.point.point-shape</div>
     <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
       <mat-select formControlName="pointShape">
-        <mat-option *ngFor="let shape of echartsShapes" [value]="shape">
-          {{ echartsShapeTranslations.get(shape) | translate }}
+        <mat-option *ngFor="let shape of chartShapes" [value]="shape">
+          {{ chartShapeTranslations.get(shape) | translate }}
         </mat-option>
       </mat-select>
     </mat-form-field>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.ts
index 1d57220b4e..4e970a5198 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.ts
@@ -26,18 +26,21 @@ import {
   LineSeriesSettings,
   lineSeriesStepTypes,
   lineSeriesStepTypeTranslations,
-  seriesLabelPositions,
-  seriesLabelPositionTranslations,
   TimeSeriesChartType,
   timeSeriesLineTypes,
   timeSeriesLineTypeTranslations
 } from '@home/components/widget/lib/chart/time-series-chart.models';
-import { echartsShapes, echartsShapeTranslations } from '@home/components/widget/lib/chart/echarts-widget.models';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { merge } from 'rxjs';
 import { formatValue, isDefinedAndNotNull } from '@core/utils';
 import { DataKeyConfigComponent } from '@home/components/widget/config/data-key-config.component';
+import {
+  chartLabelPositions,
+  chartLabelPositionTranslations,
+  chartShapes,
+  chartShapeTranslations
+} from '@home/components/widget/lib/chart/chart.models';
 
 @Component({
   selector: 'tb-time-series-chart-line-settings',
@@ -63,13 +66,13 @@ export class TimeSeriesChartLineSettingsComponent implements OnInit, ControlValu
 
   timeSeriesLineTypeTranslations = timeSeriesLineTypeTranslations;
 
-  seriesLabelPositions = seriesLabelPositions;
+  chartLabelPositions = chartLabelPositions;
 
-  seriesLabelPositionTranslations = seriesLabelPositionTranslations;
+  chartLabelPositionTranslations = chartLabelPositionTranslations;
 
-  echartsShapes = echartsShapes;
+  chartShapes = chartShapes;
 
-  echartsShapeTranslations = echartsShapeTranslations;
+  chartShapeTranslations = chartShapeTranslations;
 
   pointLabelPreviewFn = this._pointLabelPreviewFn.bind(this);
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html
index 6bf8abdb70..79a517a7d8 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html
@@ -254,9 +254,9 @@
         </ng-template>
       </mat-expansion-panel>
     </div>
-    <tb-echarts-animation-settings
+    <tb-chart-animation-settings
       formControlName="animation">
-    </tb-echarts-animation-settings>
+    </tb-chart-animation-settings>
     <div class="tb-form-panel">
       <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
       <div class="tb-form-row space-between">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.ts
index 8ea641d299..32d3f5dd80 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.ts
@@ -28,12 +28,12 @@ import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { formatValue, isDefinedAndNotNull, mergeDeep } from '@core/utils';
 import { DateFormatProcessor, DateFormatSettings } from '@shared/models/widget-settings.models';
-import { EChartsTooltipTrigger } from '../../chart/echarts-widget.models';
 import {
   timeSeriesChartWidgetDefaultSettings,
   TimeSeriesChartWidgetSettings
 } from '@home/components/widget/lib/chart/time-series-chart-widget.models';
 import {
+  TimeSeriesChartTooltipTrigger,
   TimeSeriesChartKeySettings,
   TimeSeriesChartType,
   TimeSeriesChartYAxes,
@@ -65,7 +65,7 @@ export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsCompon
 
   TimeSeriesChartType = TimeSeriesChartType;
 
-  EChartsTooltipTrigger = EChartsTooltipTrigger;
+  EChartsTooltipTrigger = TimeSeriesChartTooltipTrigger;
 
   legendPositions = legendPositions;
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/echarts-animation-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-animation-settings.component.html
similarity index 82%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/echarts-animation-settings.component.html
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-animation-settings.component.html
index 53246d2cfc..b0a091a5bc 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/echarts-animation-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-animation-settings.component.html
@@ -23,61 +23,61 @@
         <mat-panel-title>
           <mat-slide-toggle class="mat-slide" formControlName="animation" (click)="$event.stopPropagation()"
                             fxLayoutAlign="center">
-            {{ 'widgets.echarts.animation.animation' | translate }}
+            {{ 'widgets.chart.animation.animation' | translate }}
           </mat-slide-toggle>
         </mat-panel-title>
       </mat-expansion-panel-header>
       <ng-template matExpansionPanelContent>
         <div class="tb-form-row space-between column-xs">
-          <div>{{ 'widgets.echarts.animation.animation-threshold' | translate }}</div>
+          <div>{{ 'widgets.chart.animation.animation-threshold' | translate }}</div>
           <mat-form-field appearance="outline" class="medium-width number" subscriptSizing="dynamic">
             <input matInput formControlName="animationThreshold" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
             <div matSuffix>ms</div>
           </mat-form-field>
         </div>
         <div class="tb-form-row space-between column-xs">
-          <div>{{ 'widgets.echarts.animation.animation-duration' | translate }}</div>
+          <div>{{ 'widgets.chart.animation.animation-duration' | translate }}</div>
           <mat-form-field appearance="outline" class="medium-width number" subscriptSizing="dynamic">
             <input matInput formControlName="animationDuration" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
             <div matSuffix>ms</div>
           </mat-form-field>
         </div>
         <div class="tb-form-row space-between column-xs">
-          <div translate>widgets.echarts.animation.animation-easing</div>
+          <div translate>widgets.chart.animation.animation-easing</div>
           <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
             <mat-select formControlName="animationEasing">
-              <mat-option *ngFor="let easing of echartsAnimationEasings" [value]="easing">
+              <mat-option *ngFor="let easing of chartAnimationEasings" [value]="easing">
                 {{ easing }}
               </mat-option>
             </mat-select>
           </mat-form-field>
         </div>
         <div class="tb-form-row space-between column-xs">
-          <div>{{ 'widgets.echarts.animation.animation-delay' | translate }}</div>
+          <div>{{ 'widgets.chart.animation.animation-delay' | translate }}</div>
           <mat-form-field appearance="outline" class="medium-width number" subscriptSizing="dynamic">
             <input matInput formControlName="animationDelay" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
             <div matSuffix>ms</div>
           </mat-form-field>
         </div>
         <div class="tb-form-row space-between column-xs">
-          <div>{{ 'widgets.echarts.animation.update-animation-duration' | translate }}</div>
+          <div>{{ 'widgets.chart.animation.update-animation-duration' | translate }}</div>
           <mat-form-field appearance="outline" class="medium-width number" subscriptSizing="dynamic">
             <input matInput formControlName="animationDurationUpdate" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
             <div matSuffix>ms</div>
           </mat-form-field>
         </div>
         <div class="tb-form-row space-between column-xs">
-          <div translate>widgets.echarts.animation.update-animation-easing</div>
+          <div translate>widgets.chart.animation.update-animation-easing</div>
           <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
             <mat-select formControlName="animationEasingUpdate">
-              <mat-option *ngFor="let easing of echartsAnimationEasings" [value]="easing">
+              <mat-option *ngFor="let easing of chartAnimationEasings" [value]="easing">
                 {{ easing }}
               </mat-option>
             </mat-select>
           </mat-form-field>
         </div>
         <div class="tb-form-row space-between column-xs">
-          <div>{{ 'widgets.echarts.animation.update-animation-delay' | translate }}</div>
+          <div>{{ 'widgets.chart.animation.update-animation-delay' | translate }}</div>
           <mat-form-field appearance="outline" class="medium-width number" subscriptSizing="dynamic">
             <input matInput formControlName="animationDelayUpdate" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
             <div matSuffix>ms</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/echarts-animation-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-animation-settings.component.ts
similarity index 81%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/echarts-animation-settings.component.ts
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-animation-settings.component.ts
index b3a10c6298..19ccfcd18b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/echarts-animation-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-animation-settings.component.ts
@@ -22,41 +22,36 @@ import {
   UntypedFormGroup,
   Validators
 } from '@angular/forms';
-import { WidgetService } from '@core/http/widget.service';
-import {
-  echartsAnimationEasings,
-  EChartsAnimationSettings
-} from '@home/components/widget/lib/chart/echarts-widget.models';
+import { chartAnimationEasings, ChartAnimationSettings } from '@home/components/widget/lib/chart/chart.models';
 
 @Component({
-  selector: 'tb-echarts-animation-settings',
-  templateUrl: './echarts-animation-settings.component.html',
+  selector: 'tb-chart-animation-settings',
+  templateUrl: './chart-animation-settings.component.html',
   styleUrls: ['./../../widget-settings.scss'],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
-      useExisting: forwardRef(() => EchartsAnimationSettingsComponent),
+      useExisting: forwardRef(() => ChartAnimationSettingsComponent),
       multi: true
     }
   ]
 })
-export class EchartsAnimationSettingsComponent implements OnInit, ControlValueAccessor {
+export class ChartAnimationSettingsComponent implements OnInit, ControlValueAccessor {
 
   settingsExpanded = false;
 
-  echartsAnimationEasings = echartsAnimationEasings;
+  chartAnimationEasings = chartAnimationEasings;
 
   @Input()
   disabled: boolean;
 
-  private modelValue: EChartsAnimationSettings;
+  private modelValue: ChartAnimationSettings;
 
   private propagateChange = null;
 
   public animationSettingsFormGroup: UntypedFormGroup;
 
-  constructor(private fb: UntypedFormBuilder,
-              private widgetService: WidgetService,) {
+  constructor(private fb: UntypedFormBuilder) {
   }
 
   ngOnInit(): void {
@@ -96,7 +91,7 @@ export class EchartsAnimationSettingsComponent implements OnInit, ControlValueAc
     }
   }
 
-  writeValue(value: EChartsAnimationSettings): void {
+  writeValue(value: ChartAnimationSettings): void {
     this.modelValue = value;
     this.animationSettingsFormGroup.patchValue(
       value, {emitEvent: false}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.html
similarity index 70%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.html
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.html
index ddbeaf2480..07fab8b7ce 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.html
@@ -18,32 +18,39 @@
 <ng-container [formGroup]="barSettingsFormGroup">
   <div class="tb-form-row">
     <mat-slide-toggle class="mat-slide" formControlName="showBorder">
-      {{ 'widgets.time-series-chart.series.bar.show-border' | translate }}
+      {{ 'widgets.chart.bar.show-border' | translate }}
     </mat-slide-toggle>
   </div>
   <div class="tb-form-row space-between column-xs">
-    <div translate>widgets.time-series-chart.series.bar.border-width</div>
+    <div translate>widgets.chart.bar.border-width</div>
     <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
       <input matInput type="number" formControlName="borderWidth" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
     </mat-form-field>
   </div>
   <div class="tb-form-row space-between column-xs">
-    <div translate>widgets.time-series-chart.series.bar.border-radius</div>
+    <div translate>widgets.chart.bar.border-radius</div>
     <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
       <input matInput type="number" formControlName="borderRadius" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
     </mat-form-field>
   </div>
+  <div *ngIf="!series" class="tb-form-row space-between column-xs">
+    <div translate>widgets.chart.bar.bar-width</div>
+    <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+      <input matInput type="number" formControlName="barWidth" min="0" max="100" placeholder="{{ 'widget-config.set' | translate }}"/>
+      <div matSuffix>%</div>
+    </mat-form-field>
+  </div>
   <div class="tb-form-row space-between column-lt-md">
     <mat-slide-toggle class="mat-slide" formControlName="showLabel">
-      <div tb-hint-tooltip-icon="{{'widgets.time-series-chart.series.bar.label-hint' | translate}}">
-        {{ 'widgets.time-series-chart.series.bar.label' | translate }}
+      <div tb-hint-tooltip-icon="{{(series ? 'widgets.chart.bar.series-label-hint' : 'widgets.chart.bar.label-hint') | translate}}">
+        {{ 'widgets.chart.bar.label' | translate }}
       </div>
     </mat-slide-toggle>
     <div fxLayout="row" fxFlex.lt-md fxLayoutAlign="start center" fxLayoutGap="8px">
       <mat-form-field class="medium-width" fxFlex.lt-md appearance="outline" subscriptSizing="dynamic">
         <mat-select formControlName="labelPosition">
-          <mat-option *ngFor="let position of seriesLabelPositions" [value]="position">
-            {{ seriesLabelPositionTranslations.get(position) | translate }}
+          <mat-option *ngFor="let position of chartLabelPositions" [value]="position">
+            {{ chartLabelPositionTranslations.get(position) | translate }}
           </mat-option>
         </mat-select>
       </mat-form-field>
@@ -61,16 +68,16 @@
   </div>
   <div class="tb-form-row space-between">
     <mat-slide-toggle class="mat-slide" formControlName="enableLabelBackground">
-      {{ 'widgets.time-series-chart.series.bar.label-background' | translate }}
+      {{ 'widgets.chart.bar.label-background' | translate }}
     </mat-slide-toggle>
     <tb-color-input asBoxInput
                     colorClearButton
                     formControlName="labelBackground">
     </tb-color-input>
   </div>
-  <tb-time-series-chart-fill-settings
+  <tb-chart-fill-settings
     formControlName="backgroundSettings"
-    title="widgets.time-series-chart.series.background"
-    fillNoneTitle="widgets.time-series-chart.series.fill-type-solid">
-  </tb-time-series-chart-fill-settings>
+    title="widgets.chart.background"
+    fillNoneTitle="widgets.chart.fill-type-solid">
+  </tb-chart-fill-settings>
 </ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.ts
similarity index 67%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.ts
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.ts
index a2f8fd01c3..6fef380a40 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, forwardRef, Input, OnInit } from '@angular/core';
+import { Component, forwardRef, Input, OnInit, Optional } from '@angular/core';
 import {
   ControlValueAccessor,
   NG_VALUE_ACCESSOR,
@@ -22,52 +22,72 @@ import {
   UntypedFormGroup,
   Validators
 } from '@angular/forms';
-import {
-  BarSeriesSettings,
-  seriesLabelPositions,
-  seriesLabelPositionTranslations
-} from '@home/components/widget/lib/chart/time-series-chart.models';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { merge } from 'rxjs';
 import { formatValue, isDefinedAndNotNull } from '@core/utils';
 import { DataKeyConfigComponent } from '@home/components/widget/config/data-key-config.component';
+import {
+  ChartBarSettings,
+  ChartLabelPosition,
+  chartLabelPositions,
+  chartLabelPositionTranslations,
+  PieChartLabelPosition,
+  pieChartLabelPositions,
+  pieChartLabelPositionTranslations
+} from '@home/components/widget/lib/chart/chart.models';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
-  selector: 'tb-time-series-chart-bar-settings',
-  templateUrl: './time-series-chart-bar-settings.component.html',
-  styleUrls: ['./../widget-settings.scss'],
+  selector: 'tb-chart-bar-settings',
+  templateUrl: './chart-bar-settings.component.html',
+  styleUrls: ['./../../widget-settings.scss'],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
-      useExisting: forwardRef(() => TimeSeriesChartBarSettingsComponent),
+      useExisting: forwardRef(() => ChartBarSettingsComponent),
       multi: true
     }
   ]
 })
-export class TimeSeriesChartBarSettingsComponent implements OnInit, ControlValueAccessor {
+export class ChartBarSettingsComponent implements OnInit, ControlValueAccessor {
 
-  seriesLabelPositions = seriesLabelPositions;
+  chartLabelPositions: (ChartLabelPosition | PieChartLabelPosition)[];
 
-  seriesLabelPositionTranslations = seriesLabelPositionTranslations;
+  chartLabelPositionTranslations: Map<ChartLabelPosition | PieChartLabelPosition, string>;
 
   labelPreviewFn = this._labelPreviewFn.bind(this);
 
   @Input()
   disabled: boolean;
 
-  private modelValue: BarSeriesSettings;
+  @Input()
+  @coerceBoolean()
+  series = true;
+
+  @Input()
+  @coerceBoolean()
+  pieLabelPosition = false;
+
+  private modelValue: ChartBarSettings;
 
   private propagateChange = null;
 
   public barSettingsFormGroup: UntypedFormGroup;
 
   constructor(protected store: Store<AppState>,
-              private dataKeyConfigComponent: DataKeyConfigComponent,
+              @Optional() private dataKeyConfigComponent: DataKeyConfigComponent,
               private fb: UntypedFormBuilder) {
   }
 
   ngOnInit(): void {
+    if (this.pieLabelPosition) {
+      this.chartLabelPositions = pieChartLabelPositions;
+      this.chartLabelPositionTranslations = pieChartLabelPositionTranslations;
+    } else {
+      this.chartLabelPositions = chartLabelPositions;
+      this.chartLabelPositionTranslations = chartLabelPositionTranslations;
+    }
     this.barSettingsFormGroup = this.fb.group({
       showBorder: [null, []],
       borderWidth: [null, [Validators.min(0)]],
@@ -80,6 +100,10 @@ export class TimeSeriesChartBarSettingsComponent implements OnInit, ControlValue
       labelBackground: [null, []],
       backgroundSettings: [null, []]
     });
+    if (!this.series) {
+      this.barSettingsFormGroup.addControl('barWidth', this.fb.control(null,
+        [Validators.min(0), Validators.max(100)]));
+    }
     this.barSettingsFormGroup.valueChanges.subscribe(() => {
       this.updateModel();
     });
@@ -108,7 +132,7 @@ export class TimeSeriesChartBarSettingsComponent implements OnInit, ControlValue
     }
   }
 
-  writeValue(value: BarSeriesSettings): void {
+  writeValue(value: ChartBarSettings): void {
     this.modelValue = value;
     this.barSettingsFormGroup.patchValue(
       value, {emitEvent: false}
@@ -150,11 +174,15 @@ export class TimeSeriesChartBarSettingsComponent implements OnInit, ControlValue
   }
 
   private _labelPreviewFn(): string {
-    const dataKey = this.dataKeyConfigComponent.modelValue;
-    const widgetConfig = this.dataKeyConfigComponent.widgetConfig;
-    const units = dataKey.units && dataKey.units.length ? dataKey.units : widgetConfig.config.units;
-    const decimals = isDefinedAndNotNull(dataKey.decimals) ? dataKey.decimals :
-      (isDefinedAndNotNull(widgetConfig.config.decimals) ? widgetConfig.config.decimals : 2);
-    return formatValue(22, decimals, units, false);
+    if (this.series) {
+      const dataKey = this.dataKeyConfigComponent.modelValue;
+      const widgetConfig = this.dataKeyConfigComponent.widgetConfig;
+      const units = dataKey.units && dataKey.units.length ? dataKey.units : widgetConfig.config.units;
+      const decimals = isDefinedAndNotNull(dataKey.decimals) ? dataKey.decimals :
+        (isDefinedAndNotNull(widgetConfig.config.decimals) ? widgetConfig.config.decimals : 2);
+      return formatValue(22, decimals, units, false);
+    } else {
+      return 'Wind';
+    }
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.html
similarity index 78%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component.html
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.html
index 99e3c1be8f..d79e84d98e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.html
@@ -20,28 +20,28 @@
     <div class="tb-form-row no-border no-padding space-between">
       <div>{{ title | translate }}</div>
       <tb-toggle-select formControlName="type">
-        <tb-toggle-option *ngFor="let type of seriesFillTypes" [value]="type">{{ seriesFillTypeTranslationMap.get(type) | translate }}</tb-toggle-option>
+        <tb-toggle-option *ngFor="let type of chartFillTypes" [value]="type">{{ chartFillTypeTranslationMap.get(type) | translate }}</tb-toggle-option>
       </tb-toggle-select>
     </div>
-    <ng-container *ngIf="fillSettingsFormGroup.get('type').value === SeriesFillType.opacity">
+    <ng-container *ngIf="fillSettingsFormGroup.get('type').value === ChartFillType.opacity">
       <div class="tb-form-row space-between column-xs">
-        <div translate>widgets.time-series-chart.series.opacity</div>
+        <div translate>widgets.chart.opacity</div>
         <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
           <input matInput type="number" formControlName="opacity" min="0" max="1"
                  step="0.1" placeholder="{{ 'widget-config.set' | translate }}"/>
         </mat-form-field>
       </div>
     </ng-container>
-    <ng-container *ngIf="fillSettingsFormGroup.get('type').value === SeriesFillType.gradient" formGroupName="gradient">
+    <ng-container *ngIf="fillSettingsFormGroup.get('type').value === ChartFillType.gradient" formGroupName="gradient">
       <div class="tb-form-row space-between column-xs">
-        <div translate>widgets.time-series-chart.series.gradient-stops</div>
+        <div translate>widgets.chart.gradient-stops</div>
         <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
-          <div class="tb-small-label" translate>widgets.time-series-chart.series.gradient-start</div>
+          <div class="tb-small-label" translate>widgets.chart.gradient-start</div>
           <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
             <input matInput formControlName="start" min="0" max="100" step="1"
                    type="number" placeholder="{{ 'widget-config.set' | translate }}">
           </mat-form-field>
-          <div class="tb-small-label" translate>widgets.time-series-chart.series.gradient-end</div>
+          <div class="tb-small-label" translate>widgets.chart.gradient-end</div>
           <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
             <input matInput formControlName="end" min="0" max="100" step="1"
                    type="number" placeholder="{{ 'widget-config.set' | translate }}">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.ts
similarity index 70%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component.ts
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.ts
index dd7f4dd7f6..718c4cce02 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.ts
@@ -22,45 +22,45 @@ import {
   UntypedFormGroup,
   Validators
 } from '@angular/forms';
-import {
-  SeriesFillSettings,
-  SeriesFillType,
-  seriesFillTypes,
-  seriesFillTypeTranslations
-} from '@home/components/widget/lib/chart/time-series-chart.models';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
+import {
+  ChartFillSettings,
+  ChartFillType,
+  chartFillTypes,
+  chartFillTypeTranslations
+} from '@home/components/widget/lib/chart/chart.models';
 
 @Component({
-  selector: 'tb-time-series-chart-fill-settings',
-  templateUrl: './time-series-chart-fill-settings.component.html',
+  selector: 'tb-chart-fill-settings',
+  templateUrl: './chart-fill-settings.component.html',
   styleUrls: ['./../../widget-settings.scss'],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
-      useExisting: forwardRef(() => TimeSeriesChartFillSettingsComponent),
+      useExisting: forwardRef(() => ChartFillSettingsComponent),
       multi: true
     }
   ]
 })
-export class TimeSeriesChartFillSettingsComponent implements OnInit, ControlValueAccessor {
+export class ChartFillSettingsComponent implements OnInit, ControlValueAccessor {
 
-  seriesFillTypes = seriesFillTypes;
+  chartFillTypes = chartFillTypes;
 
-  seriesFillTypeTranslationMap: Map<SeriesFillType, string> = new Map<SeriesFillType, string>([]);
+  chartFillTypeTranslationMap: Map<ChartFillType, string> = new Map<ChartFillType, string>([]);
 
-  SeriesFillType = SeriesFillType;
+  ChartFillType = ChartFillType;
 
   @Input()
   disabled: boolean;
 
   @Input()
-  title = 'widgets.time-series-chart.series.fill';
+  title = 'widgets.chart.fill';
 
   @Input()
-  fillNoneTitle = 'widgets.time-series-chart.series.fill-type-none';
+  fillNoneTitle = 'widgets.chart.fill-type-none';
 
-  private modelValue: SeriesFillSettings;
+  private modelValue: ChartFillSettings;
 
   private propagateChange = null;
 
@@ -85,14 +85,14 @@ export class TimeSeriesChartFillSettingsComponent implements OnInit, ControlValu
     this.fillSettingsFormGroup.get('type').valueChanges.subscribe(() => {
       this.updateValidators();
     });
-    for (const type of seriesFillTypes) {
+    for (const type of chartFillTypes) {
       let translation: string;
-      if (type === SeriesFillType.none) {
+      if (type === ChartFillType.none) {
         translation = this.fillNoneTitle;
       } else {
-        translation = seriesFillTypeTranslations.get(type);
+        translation = chartFillTypeTranslations.get(type);
       }
-      this.seriesFillTypeTranslationMap.set(type, translation);
+      this.chartFillTypeTranslationMap.set(type, translation);
     }
   }
 
@@ -113,7 +113,7 @@ export class TimeSeriesChartFillSettingsComponent implements OnInit, ControlValu
     }
   }
 
-  writeValue(value: SeriesFillSettings): void {
+  writeValue(value: ChartFillSettings): void {
     this.modelValue = value;
     this.fillSettingsFormGroup.patchValue(
       value, {emitEvent: false}
@@ -122,21 +122,21 @@ export class TimeSeriesChartFillSettingsComponent implements OnInit, ControlValu
   }
 
   private updateValidators() {
-    const type: SeriesFillType = this.fillSettingsFormGroup.get('type').value;
-    if (type === SeriesFillType.none) {
+    const type: ChartFillType = this.fillSettingsFormGroup.get('type').value;
+    if (type === ChartFillType.none) {
       this.fillSettingsFormGroup.get('opacity').disable({emitEvent: false});
       this.fillSettingsFormGroup.get('gradient').disable({emitEvent: false});
-    } else if (type === SeriesFillType.opacity) {
+    } else if (type === ChartFillType.opacity) {
       this.fillSettingsFormGroup.get('opacity').enable({emitEvent: false});
       this.fillSettingsFormGroup.get('gradient').disable({emitEvent: false});
-    } else if (type === SeriesFillType.gradient) {
+    } else if (type === ChartFillType.gradient) {
       this.fillSettingsFormGroup.get('opacity').disable({emitEvent: false});
       this.fillSettingsFormGroup.get('gradient').enable({emitEvent: false});
     }
   }
 
   private updateModel() {
-    const value: SeriesFillSettings = this.fillSettingsFormGroup.getRawValue();
+    const value: ChartFillSettings = this.fillSettingsFormGroup.getRawValue();
     this.modelValue = value;
     this.propagateChange(this.modelValue);
   }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.html
index cd240ba8e4..7ee338bf21 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.html
@@ -145,7 +145,7 @@
           </div>
           <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
             <input matInput formControlName="interval"
-                   type="number" min="0" placeholder="{{ 'widgets.time-series-chart.axis.scale-auto' | translate }}">
+                   type="number" min="0" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
           </mat-form-field>
         </div>
         <div *ngIf="axisType === 'yAxis'" class="tb-form-row space-between">
@@ -154,24 +154,24 @@
           </div>
           <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
             <input matInput formControlName="splitNumber"
-                   type="number" min="1" placeholder="{{ 'widgets.time-series-chart.axis.scale-auto' | translate }}">
+                   type="number" min="1" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
           </mat-form-field>
         </div>
       </ng-template>
     </mat-expansion-panel>
     <div *ngIf="axisType === 'yAxis'" class="tb-form-panel no-border no-padding-top">
       <div class="tb-form-row space-between column-xs">
-        <div translate>widgets.time-series-chart.axis.scale</div>
+        <div translate>widgets.chart.chart-axis.scale</div>
         <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
-          <div class="tb-small-label" translate>widgets.time-series-chart.axis.scale-min</div>
+          <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-min</div>
           <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
             <input matInput formControlName="min"
-                   type="number" placeholder="{{ 'widgets.time-series-chart.axis.scale-auto' | translate }}">
+                   type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
           </mat-form-field>
-          <div class="tb-small-label" translate>widgets.time-series-chart.axis.scale-max</div>
+          <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-max</div>
           <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
             <input matInput formControlName="max"
-                   type="number" placeholder="{{ 'widgets.time-series-chart.axis.scale-auto' | translate }}">
+                   type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
           </mat-form-field>
         </div>
       </div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.html
index 4017a0ca2b..293952a342 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.html
@@ -103,8 +103,8 @@
         <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
           <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
             <mat-select formControlName="startSymbol">
-              <mat-option *ngFor="let shape of echartsShapes" [value]="shape">
-                {{ echartsShapeTranslations.get(shape) | translate }}
+              <mat-option *ngFor="let shape of chartShapes" [value]="shape">
+                {{ chartShapeTranslations.get(shape) | translate }}
               </mat-option>
             </mat-select>
           </mat-form-field>
@@ -120,8 +120,8 @@
         <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
           <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
             <mat-select formControlName="endSymbol">
-              <mat-option *ngFor="let shape of echartsShapes" [value]="shape">
-                {{ echartsShapeTranslations.get(shape) | translate }}
+              <mat-option *ngFor="let shape of chartShapes" [value]="shape">
+                {{ chartShapeTranslations.get(shape) | translate }}
               </mat-option>
             </mat-select>
           </mat-form-field>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts
index 766b8b7ccf..e868e1f2e9 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts
@@ -25,15 +25,11 @@ import {
   timeSeriesThresholdLabelPositions,
   timeSeriesThresholdLabelPositionTranslations
 } from '@home/components/widget/lib/chart/time-series-chart.models';
-import {
-  EChartsShape,
-  echartsShapes,
-  echartsShapeTranslations
-} from '@home/components/widget/lib/chart/echarts-widget.models';
 import { merge } from 'rxjs';
 import { WidgetConfig } from '@shared/models/widget.models';
 import { formatValue, isDefinedAndNotNull } from '@core/utils';
 import { coerceBoolean } from '@shared/decorators/coercion';
+import { ChartShape, chartShapes, chartShapeTranslations } from '@home/components/widget/lib/chart/chart.models';
 
 @Component({
   selector: 'tb-time-series-chart-threshold-settings-panel',
@@ -48,9 +44,9 @@ export class TimeSeriesChartThresholdSettingsPanelComponent implements OnInit {
 
   timeSeriesLineTypeTranslations = timeSeriesLineTypeTranslations;
 
-  echartsShapes = echartsShapes;
+  chartShapes = chartShapes;
 
-  echartsShapeTranslations = echartsShapeTranslations;
+  chartShapeTranslations = chartShapeTranslations;
 
   timeSeriesThresholdLabelPositions = timeSeriesThresholdLabelPositions;
 
@@ -127,8 +123,8 @@ export class TimeSeriesChartThresholdSettingsPanelComponent implements OnInit {
   private updateValidators() {
     const showLabel: boolean = this.thresholdSettingsFormGroup.get('showLabel').value;
     const enableLabelBackground: boolean = this.thresholdSettingsFormGroup.get('enableLabelBackground').value;
-    const startSymbol: EChartsShape = this.thresholdSettingsFormGroup.get('startSymbol').value;
-    const endSymbol: EChartsShape = this.thresholdSettingsFormGroup.get('endSymbol').value;
+    const startSymbol: ChartShape = this.thresholdSettingsFormGroup.get('startSymbol').value;
+    const endSymbol: ChartShape = this.thresholdSettingsFormGroup.get('endSymbol').value;
     if (showLabel) {
       this.thresholdSettingsFormGroup.get('labelPosition').enable({emitEvent: false});
       this.thresholdSettingsFormGroup.get('labelFont').enable({emitEvent: false});
@@ -146,12 +142,12 @@ export class TimeSeriesChartThresholdSettingsPanelComponent implements OnInit {
       this.thresholdSettingsFormGroup.get('enableLabelBackground').disable({emitEvent: false});
       this.thresholdSettingsFormGroup.get('labelBackground').disable({emitEvent: false});
     }
-    if (startSymbol === EChartsShape.none) {
+    if (startSymbol === ChartShape.none) {
       this.thresholdSettingsFormGroup.get('startSymbolSize').disable({emitEvent: false});
     } else {
       this.thresholdSettingsFormGroup.get('startSymbolSize').enable({emitEvent: false});
     }
-    if (endSymbol === EChartsShape.none) {
+    if (endSymbol === ChartShape.none) {
       this.thresholdSettingsFormGroup.get('endSymbolSize').disable({emitEvent: false});
     } else {
       this.thresholdSettingsFormGroup.get('endSymbolSize').enable({emitEvent: false});
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.html
index 0b1907033f..7291a2d4f7 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.html
@@ -32,12 +32,12 @@
   </mat-form-field>
   <div class="tb-min-field">
     <mat-form-field appearance="outline" class="tb-inline-field number" subscriptSizing="dynamic">
-      <input matInput formControlName="min" type="number" placeholder="{{ 'widgets.time-series-chart.axis.scale-auto' | translate }}">
+      <input matInput formControlName="min" type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
     </mat-form-field>
   </div>
   <div class="tb-max-field">
     <mat-form-field appearance="outline" class="tb-inline-field number" subscriptSizing="dynamic">
-      <input matInput formControlName="max" type="number" placeholder="{{ 'widgets.time-series-chart.axis.scale-auto' | translate }}">
+      <input matInput formControlName="max" type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
     </mat-form-field>
   </div>
   <div class="tb-units-field">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts
index 31c8f60c12..bbe3dfb20c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts
@@ -119,8 +119,8 @@ import {
   TimeSeriesChartAxisSettingsPanelComponent
 } from '@home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component';
 import {
-  EchartsAnimationSettingsComponent
-} from '@home/components/widget/lib/settings/common/chart/echarts-animation-settings.component';
+  ChartAnimationSettingsComponent
+} from '@home/components/widget/lib/settings/common/chart/chart-animation-settings.component';
 import {
   AutoDateFormatSettingsPanelComponent
 } from '@home/components/widget/lib/settings/common/auto-date-format-settings-panel.component';
@@ -128,8 +128,8 @@ import {
   AutoDateFormatSettingsComponent
 } from '@home/components/widget/lib/settings/common/auto-date-format-settings.component';
 import {
-  TimeSeriesChartFillSettingsComponent
-} from '@home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component';
+  ChartFillSettingsComponent
+} from '@home/components/widget/lib/settings/common/chart/chart-fill-settings.component';
 import {
   TimeSeriesChartThresholdSettingsComponent
 } from '@home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings.component';
@@ -148,6 +148,7 @@ import {
 import {
   StatusWidgetStateSettingsComponent
 } from '@home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component';
+import { ChartBarSettingsComponent } from '@home/components/widget/lib/settings/common/chart/chart-bar-settings.component';
 
 @NgModule({
   declarations: [
@@ -195,8 +196,9 @@ import {
     TimeSeriesChartYAxisRowComponent,
     TimeSeriesChartAxisSettingsPanelComponent,
     TimeSeriesChartAxisSettingsButtonComponent,
-    EchartsAnimationSettingsComponent,
-    TimeSeriesChartFillSettingsComponent,
+    ChartAnimationSettingsComponent,
+    ChartFillSettingsComponent,
+    ChartBarSettingsComponent,
     TimeSeriesChartThresholdSettingsComponent,
     TimeSeriesChartStatesPanelComponent,
     TimeSeriesChartStateRowComponent,
@@ -255,8 +257,9 @@ import {
     TimeSeriesChartYAxisRowComponent,
     TimeSeriesChartAxisSettingsPanelComponent,
     TimeSeriesChartAxisSettingsButtonComponent,
-    EchartsAnimationSettingsComponent,
-    TimeSeriesChartFillSettingsComponent,
+    ChartAnimationSettingsComponent,
+    ChartFillSettingsComponent,
+    ChartBarSettingsComponent,
     TimeSeriesChartThresholdSettingsComponent,
     TimeSeriesChartStatesPanelComponent,
     TimeSeriesChartStateRowComponent,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts
index fa34b2c358..db0973a5bc 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts
@@ -336,9 +336,6 @@ import {
 import {
   TimeSeriesChartLineSettingsComponent
 } from '@home/components/widget/lib/settings/chart/time-series-chart-line-settings.component';
-import {
-  TimeSeriesChartBarSettingsComponent
-} from '@home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component';
 import {
   TimeSeriesChartWidgetSettingsComponent
 } from '@home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component';
@@ -348,6 +345,12 @@ import {
 import {
   PieChartWidgetSettingsComponent
 } from '@home/components/widget/lib/settings/chart/pie-chart-widget-settings.component';
+import {
+  BarChartWidgetSettingsComponent
+} from '@home/components/widget/lib/settings/chart/bar-chart-widget-settings.component';
+import {
+  PolarAreaChartWidgetSettingsComponent
+} from '@home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component';
 
 @NgModule({
   declarations: [
@@ -469,10 +472,11 @@ import {
     ToggleButtonWidgetSettingsComponent,
     TimeSeriesChartKeySettingsComponent,
     TimeSeriesChartLineSettingsComponent,
-    TimeSeriesChartBarSettingsComponent,
     TimeSeriesChartWidgetSettingsComponent,
     StatusWidgetSettingsComponent,
-    PieChartWidgetSettingsComponent
+    PieChartWidgetSettingsComponent,
+    BarChartWidgetSettingsComponent,
+    PolarAreaChartWidgetSettingsComponent
   ],
   imports: [
     CommonModule,
@@ -599,10 +603,11 @@ import {
     ToggleButtonWidgetSettingsComponent,
     TimeSeriesChartKeySettingsComponent,
     TimeSeriesChartLineSettingsComponent,
-    TimeSeriesChartBarSettingsComponent,
     TimeSeriesChartWidgetSettingsComponent,
     StatusWidgetSettingsComponent,
-    PieChartWidgetSettingsComponent
+    PieChartWidgetSettingsComponent,
+    BarChartWidgetSettingsComponent,
+    PolarAreaChartWidgetSettingsComponent
   ]
 })
 export class WidgetSettingsModule {
@@ -697,5 +702,7 @@ export const widgetSettingsComponentsMap: {[key: string]: Type<IWidgetSettingsCo
   'tb-time-series-chart-key-settings': TimeSeriesChartKeySettingsComponent,
   'tb-time-series-chart-widget-settings': TimeSeriesChartWidgetSettingsComponent,
   'tb-status-widget-settings': StatusWidgetSettingsComponent,
-  'tb-pie-chart-widget-settings': PieChartWidgetSettingsComponent
+  'tb-pie-chart-widget-settings': PieChartWidgetSettingsComponent,
+  'tb-bar-chart-widget-settings': BarChartWidgetSettingsComponent,
+  'tb-polar-area-chart-widget-settings': PolarAreaChartWidgetSettingsComponent
 };
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts b/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
index 0011b76898..daa6d5bcb0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
@@ -89,6 +89,8 @@ import { TimeSeriesChartWidgetComponent } from '@home/components/widget/lib/char
 import { StatusWidgetComponent } from '@home/components/widget/lib/indicator/status-widget.component';
 import { LatestChartComponent } from '@home/components/widget/lib/chart/latest-chart.component';
 import { PieChartWidgetComponent } from '@home/components/widget/lib/chart/pie-chart-widget.component';
+import { BarChartWidgetComponent } from '@home/components/widget/lib/chart/bar-chart-widget.component';
+import { PolarAreaWidgetComponent } from '@home/components/widget/lib/chart/polar-area-widget.component';
 
 @NgModule({
   declarations:
@@ -144,7 +146,9 @@ import { PieChartWidgetComponent } from '@home/components/widget/lib/chart/pie-c
       TimeSeriesChartWidgetComponent,
       StatusWidgetComponent,
       LatestChartComponent,
-      PieChartWidgetComponent
+      PieChartWidgetComponent,
+      BarChartWidgetComponent,
+      PolarAreaWidgetComponent
     ],
   imports: [
     CommonModule,
@@ -203,7 +207,9 @@ import { PieChartWidgetComponent } from '@home/components/widget/lib/chart/pie-c
         ToggleButtonWidgetComponent,
         TimeSeriesChartWidgetComponent,
         StatusWidgetComponent,
-        PieChartWidgetComponent
+        PieChartWidgetComponent,
+        BarChartWidgetComponent,
+        PolarAreaWidgetComponent
     ],
   providers: [
     {provide: WIDGET_COMPONENTS_MODULE_TOKEN, useValue: WidgetComponentsModule }
diff --git a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html
index 5b477d0345..f5a2ddba17 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html
@@ -581,6 +581,19 @@
         </section>
       </form>
     </mat-step>
+
+    <mat-step *ngIf="ruleNotificationForm.get('triggerType').value === triggerType.TASK_PROCESSING_FAILURE"
+              [stepControl]="taskProcessingFailureTemplateForm">
+      <ng-template matStepLabel>{{ 'notification.task-processing-failure-trigger-settings' | translate }}</ng-template>
+      <form [formGroup]="ruleNotificationForm">
+        <section formGroupName="additionalConfig">
+          <mat-form-field class="mat-block">
+            <mat-label translate>notification.description</mat-label>
+            <input matInput formControlName="description">
+          </mat-form-field>
+        </section>
+      </form>
+    </mat-step>
   </mat-horizontal-stepper>
 </div>
 <mat-divider></mat-divider>
diff --git a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts
index 89488b7517..bc6935b4e7 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts
@@ -101,6 +101,7 @@ export class RuleNotificationDialogComponent extends
   rateLimitsTemplateForm: FormGroup;
   edgeCommunicationFailureTemplateForm: FormGroup;
   edgeConnectionTemplateForm: FormGroup;
+  taskProcessingFailureTemplateForm: FormGroup;
 
   triggerType = TriggerType;
   triggerTypes: TriggerType[];
@@ -337,6 +338,12 @@ export class RuleNotificationDialogComponent extends
       })
     });
 
+    this.taskProcessingFailureTemplateForm = this.fb.group({
+      triggerConfig: this.fb.group({
+        taskTypes: []
+      })
+    });
+
     this.triggerTypeFormsMap = new Map<TriggerType, FormGroup>([
       [TriggerType.ALARM, this.alarmTemplateForm],
       [TriggerType.ALARM_COMMENT, this.alarmCommentTemplateForm],
@@ -349,7 +356,8 @@ export class RuleNotificationDialogComponent extends
       [TriggerType.NEW_PLATFORM_VERSION, this.newPlatformVersionTemplateForm],
       [TriggerType.RATE_LIMITS, this.rateLimitsTemplateForm],
       [TriggerType.EDGE_COMMUNICATION_FAILURE, this.edgeCommunicationFailureTemplateForm],
-      [TriggerType.EDGE_CONNECTION, this.edgeConnectionTemplateForm]
+      [TriggerType.EDGE_CONNECTION, this.edgeConnectionTemplateForm],
+      [TriggerType.TASK_PROCESSING_FAILURE, this.taskProcessingFailureTemplateForm]
     ]);
 
     if (data.isAdd || data.isCopy) {
@@ -488,7 +496,8 @@ export class RuleNotificationDialogComponent extends
       TriggerType.ENTITIES_LIMIT,
       TriggerType.API_USAGE_LIMIT,
       TriggerType.NEW_PLATFORM_VERSION,
-      TriggerType.RATE_LIMITS
+      TriggerType.RATE_LIMITS,
+      TriggerType.TASK_PROCESSING_FAILURE
     ]);
 
     if (this.isSysAdmin()) {
diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
index c0ae4f1abb..ccbcb6bf22 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
@@ -179,7 +179,8 @@ export class TemplateNotificationDialogComponent
       NotificationType.ENTITIES_LIMIT,
       NotificationType.API_USAGE_LIMIT,
       NotificationType.NEW_PLATFORM_VERSION,
-      NotificationType.RATE_LIMITS
+      NotificationType.RATE_LIMITS,
+      NotificationType.TASK_PROCESSING_FAILURE
     ]);
 
     if (this.isSysAdmin()) {
diff --git a/ui-ngx/src/app/shared/models/notification.models.ts b/ui-ngx/src/app/shared/models/notification.models.ts
index b8097d18cb..cfb1312209 100644
--- a/ui-ngx/src/app/shared/models/notification.models.ts
+++ b/ui-ngx/src/app/shared/models/notification.models.ts
@@ -523,7 +523,8 @@ export enum NotificationType {
   RULE_NODE = 'RULE_NODE',
   RATE_LIMITS = 'RATE_LIMITS',
   EDGE_CONNECTION = 'EDGE_CONNECTION',
-  EDGE_COMMUNICATION_FAILURE = 'EDGE_COMMUNICATION_FAILURE'
+  EDGE_COMMUNICATION_FAILURE = 'EDGE_COMMUNICATION_FAILURE',
+  TASK_PROCESSING_FAILURE = 'TASK_PROCESSING_FAILURE'
 }
 
 export const NotificationTypeIcons = new Map<NotificationType, string | null>([
@@ -535,6 +536,7 @@ export const NotificationTypeIcons = new Map<NotificationType, string | null>([
   [NotificationType.RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT, 'settings_ethernet'],
   [NotificationType.ENTITIES_LIMIT, 'data_thresholding'],
   [NotificationType.API_USAGE_LIMIT, 'insert_chart'],
+  [NotificationType.TASK_PROCESSING_FAILURE, 'warning']
 ]);
 
 export const AlarmSeverityNotificationColors = new Map<AlarmSeverity, string>(
@@ -646,7 +648,13 @@ export const NotificationTemplateTypeTranslateMap = new Map<NotificationType, No
       name: 'notification.template-type.edge-communication-failure',
       helpId: 'notification/edge_communication_failure'
     }
-  ]
+  ],
+  [NotificationType.TASK_PROCESSING_FAILURE,
+    {
+      name: 'notification.template-type.task-processing-failure',
+      helpId: 'notification/task_processing_failure'
+    }
+  ],
 ]);
 
 export enum TriggerType {
@@ -661,7 +669,8 @@ export enum TriggerType {
   NEW_PLATFORM_VERSION = 'NEW_PLATFORM_VERSION',
   RATE_LIMITS = 'RATE_LIMITS',
   EDGE_CONNECTION = 'EDGE_CONNECTION',
-  EDGE_COMMUNICATION_FAILURE = 'EDGE_COMMUNICATION_FAILURE'
+  EDGE_COMMUNICATION_FAILURE = 'EDGE_COMMUNICATION_FAILURE',
+  TASK_PROCESSING_FAILURE = 'TASK_PROCESSING_FAILURE',
 }
 
 export const TriggerTypeTranslationMap = new Map<TriggerType, string>([
@@ -676,7 +685,8 @@ export const TriggerTypeTranslationMap = new Map<TriggerType, string>([
   [TriggerType.NEW_PLATFORM_VERSION, 'notification.trigger.new-platform-version'],
   [TriggerType.RATE_LIMITS, 'notification.trigger.rate-limits'],
   [TriggerType.EDGE_CONNECTION, 'notification.trigger.edge-connection'],
-  [TriggerType.EDGE_COMMUNICATION_FAILURE, 'notification.trigger.edge-communication-failure']
+  [TriggerType.EDGE_COMMUNICATION_FAILURE, 'notification.trigger.edge-communication-failure'],
+  [TriggerType.TASK_PROCESSING_FAILURE, 'notification.trigger.task-processing-failure']
 ]);
 
 export interface NotificationUserSettings {
diff --git a/ui-ngx/src/assets/help/en_US/notification/task_processing_failure.md b/ui-ngx/src/assets/help/en_US/notification/task_processing_failure.md
new file mode 100644
index 0000000000..0bcf107298
--- /dev/null
+++ b/ui-ngx/src/assets/help/en_US/notification/task_processing_failure.md
@@ -0,0 +1,46 @@
+#### Task processing failure notification templatization
+
+<div class="divider"></div>
+<br/>
+
+Notification subject and message fields support templatization.
+The list of available templatization parameters depends on the template type.
+See the available types and parameters below:
+
+Available template parameters:
+
+* `taskType` - the task type, e.g. 'telemetry deletion';
+* `taskDescription` - the task description, e.g. 'telemetry deletion for device c4d93dc0-63a1-11ee-aa6d-f7cbc0a71325';
+* `error` - the error stacktrace
+* `tenantId` - the tenant id;
+* `entityType` - the type of the entity to which the task is related;
+* `entityId` - the id of the entity to which the task is related;
+* `attempt` - the number of attempts processing the task
+
+Parameter names must be wrapped using `${...}`. For example: `${entityType}`.
+You may also modify the value of the parameter with one of the suffixes:
+
+* `upperCase`, for example - `${entityType:upperCase}`
+* `lowerCase`, for example - `${entityType:lowerCase}`
+* `capitalize`, for example - `${entityType:capitalize}`
+
+<div class="divider"></div>
+
+##### Examples
+
+Let's assume that telemetry deletion failed for some device.
+The following template:
+
+```text
+Failed to process ${taskType} for ${entityType:lowerCase} ${entityId}
+{:copy-code}
+```
+
+will be transformed to:
+
+```text
+Failed to process telemetry deletion for device c4d93dc0-63a1-11ee-aa6d-f7cbc0a71325
+```
+
+<br>
+<br>
diff --git a/ui-ngx/src/assets/locale/locale.constant-ar_AR.json b/ui-ngx/src/assets/locale/locale.constant-ar_AE.json
similarity index 100%
rename from ui-ngx/src/assets/locale/locale.constant-ar_AR.json
rename to ui-ngx/src/assets/locale/locale.constant-ar_AE.json
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 7485ba64f1..1ba94ab8bb 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -3355,6 +3355,7 @@
         "api-usage-trigger-settings": "API usage trigger settings",
         "new-platform-version-trigger-settings": "New platform version trigger settings",
         "rate-limits-trigger-settings": "Exceeded rate limits trigger settings",
+        "task-processing-failure-trigger-settings": "Task processing failure trigger settings",
         "at-least-one-should-be-selected": "At least one should be selected",
         "basic-settings": "Basic settings",
         "button-text": "Button text",
@@ -3565,7 +3566,8 @@
             "new-platform-version": "New platform version",
             "rate-limits": "Exceeded rate limits",
             "edge-communication-failure": "Edge communication failure",
-            "edge-connection": "Edge connection"
+            "edge-connection": "Edge connection",
+            "task-processing-failure": "Task processing failure"
         },
         "templates": "Templates",
         "notification-templates": "Notifications / Templates",
@@ -3588,6 +3590,7 @@
             "rate-limits": "Exceeded rate limits",
             "edge-connection": "Edge connection",
             "edge-communication-failure": "Edge communication failure",
+            "task-processing-failure": "Task processing failure",
             "trigger": "Trigger",
             "trigger-required": "Trigger is required"
         },
@@ -5429,7 +5432,13 @@
             "bar-appearance": "Bar appearance",
             "label-on-bar": "Label on bar",
             "value-on-bar": "Value on bar",
-            "bar-chart-style": "Bar chart style"
+            "bar-chart-style": "Bar chart style",
+            "bar-axis": "Bar axis"
+        },
+        "polar-area-chart": {
+            "polar-axis": "Polar axis",
+            "start-angle": "Start angle",
+            "polar-area-chart-style": "Polar area chart style"
         },
         "battery-level": {
             "layout": "Layout",
@@ -5609,7 +5618,56 @@
             "axis": "Axis",
             "vertical-axis": "Vertical axis",
             "ticks": "Ticks",
-            "horizontal-axis": "Horizontal axis"
+            "horizontal-axis": "Horizontal axis",
+            "shape-empty-circle": "Empty circle",
+            "shape-circle": "Circle",
+            "shape-rect": "Rectangle",
+            "shape-round-rect": "Rounded rectangle",
+            "shape-triangle": "Triangle",
+            "shape-diamond": "Diamond",
+            "shape-pin": "Pin",
+            "shape-arrow": "Arrow",
+            "shape-none": "None",
+            "label-position-top": "Top",
+            "label-position-bottom": "Bottom",
+            "label-position-outside": "Outside",
+            "label-position-inside": "Inside",
+            "fill": "Fill",
+            "fill-type-none": "None",
+            "fill-type-solid": "Solid",
+            "fill-type-opacity": "Opacity",
+            "fill-type-gradient": "Gradient",
+            "background": "Background",
+            "opacity": "Opacity",
+            "gradient-stops": "Gradient stops",
+            "gradient-start": "start",
+            "gradient-end": "end",
+            "animation": {
+              "animation": "Animation",
+              "animation-threshold": "Animation threshold",
+              "animation-duration": "Animation duration",
+              "animation-easing": "Animation easing",
+              "animation-delay": "Animation delay",
+              "update-animation-duration": "Update animation duration",
+              "update-animation-easing": "Update animation easing",
+              "update-animation-delay": "Update animation delay"
+            },
+            "chart-axis": {
+              "scale": "Scale",
+              "scale-min": "min",
+              "scale-max": "max",
+              "scale-auto": "Auto"
+            },
+            "bar": {
+              "show-border": "Show border",
+              "border-width": "Border width",
+              "border-radius": "Border radius",
+              "bar-width": "Bar width",
+              "label": "Label",
+              "label-hint": "Display label over the bar.",
+              "series-label-hint": "Display label with value over the bar.",
+              "label-background": "Label background"
+            }
         },
         "color": {
             "color-settings": "Color settings",
@@ -6730,18 +6788,6 @@
             "table-tabs": "Table tabs",
             "show-cell-actions-menu-mobile": "Show cell actions dropdown menu in mobile mode"
         },
-        "echarts": {
-            "animation": {
-              "animation": "Animation",
-              "animation-threshold": "Animation threshold",
-              "animation-duration": "Animation duration",
-              "animation-easing": "Animation easing",
-              "animation-delay": "Animation delay",
-              "update-animation-duration": "Update animation duration",
-              "update-animation-easing": "Update animation easing",
-              "update-animation-delay": "Update animation delay"
-            }
-        },
         "latest-chart": {
             "total": "Total",
             "auto-scale": "Auto scale",
@@ -6752,8 +6798,6 @@
         },
         "pie-chart": {
             "label": "Label",
-            "label-position-outside": "Outside",
-            "label-position-inside": "Inside",
             "border": "Border",
             "radius": "Radius",
             "pie-chart-card-style": "Pie chart card style"
@@ -6771,15 +6815,6 @@
             "line-type-dashed": "Dashed",
             "line-type-dotted": "Dotted",
             "line-width": "Line width",
-            "shape-empty-circle": "Empty circle",
-            "shape-circle": "Circle",
-            "shape-rect": "Rectangle",
-            "shape-round-rect": "Rounded rectangle",
-            "shape-triangle": "Triangle",
-            "shape-diamond": "Diamond",
-            "shape-pin": "Pin",
-            "shape-arrow": "Arrow",
-            "shape-none": "None",
             "type-line": "Line",
             "type-bar": "Bar",
             "type-point": "Point",
@@ -6878,10 +6913,6 @@
               "ticks-interval-hint": "Compulsively set segmentation interval for axis.",
               "split-number": "Split number",
               "split-number-hint": "Number of segments that the axis is split into.",
-              "scale": "Scale",
-              "scale-min": "min",
-              "scale-max": "max",
-              "scale-auto": "Auto",
               "min": "Min",
               "max": "Max",
               "show": "Show",
@@ -6897,18 +6928,6 @@
               "type": "Type",
               "type-line": "Line",
               "type-bar": "Bar",
-              "label-position-top": "Top",
-              "label-position-bottom": "Bottom",
-              "fill": "Fill",
-              "background": "Background",
-              "fill-type-none": "None",
-              "fill-type-solid": "Solid",
-              "fill-type-opacity": "Opacity",
-              "fill-type-gradient": "Gradient",
-              "opacity": "Opacity",
-              "gradient-stops": "Gradient stops",
-              "gradient-start": "start",
-              "gradient-end": "end",
               "line": {
                 "line": "Line",
                 "show-line": "Show line",
@@ -6926,14 +6945,6 @@
                 "point-label-background": "Point label background",
                 "point-shape": "Point shape",
                 "point-size": "Point size"
-              },
-              "bar": {
-                "show-border": "Show border",
-                "border-width": "Border width",
-                "border-radius": "Border radius",
-                "label": "Label",
-                "label-hint": "Display label with value over the bar.",
-                "label-background": "Label background"
               }
             }
         },
@@ -7291,7 +7302,7 @@
     "language": {
         "language": "Language",
         "locales": {
-            "ar_AR": "اَلْعَرَبِيَّةُ",
+            "ar_AE": "اَلْعَرَبِيَّةُ",
             "ca_ES": "Catalan",
             "cs_CZ": "Česky",
             "da_DK": "Dansk",