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 979b241e67..a66975d1e2 100644
--- a/application/src/main/data/json/system/widget_bundles/charts.json
+++ b/application/src/main/data/json/system/widget_bundles/charts.json
@@ -12,10 +12,11 @@
     "line_chart",
     "bar_chart",
     "point_chart",
+    "state_chart",
+    "bar_chart_with_labels",
+    "range_chart",
     "charts.basic_timeseries",
     "charts.state_chart",
-    "range_chart",
-    "bar_chart_with_labels",
     "charts.timeseries_bars_flot",
     "cards.aggregated_value_card",
     "charts.bars",
diff --git a/application/src/main/data/json/system/widget_types/state_chart.json b/application/src/main/data/json/system/widget_types/state_chart.json
index a78fc06f64..0af2631813 100644
--- a/application/src/main/data/json/system/widget_types/state_chart.json
+++ b/application/src/main/data/json/system/widget_types/state_chart.json
@@ -1,26 +1,34 @@
 {
-  "fqn": "charts.state_chart",
-  "name": "State Chart",
+  "fqn": "state_chart",
+  "name": "State chart",
   "deprecated": false,
-  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAB9VBMVEUAAAAhlvMilvMymeE+nNVDoetInslNq/VZqOdpuPd3d3d5p5Z5suB6enp8fHyBgYGDg4ODqoqEhISIiIiKioqKuN2MjIyNjY2Ojo6QkJCRkZGSkpKUlJSVlZWWlpaXl5eYmJiZmZmampqcnJydnZ2enp6goKCgr3KhoaGioqKisXSjo6OjvsmkpKSlpaWlwdempqanp6eoqKiosGOo1vqpqampsGOqqqqqsWOrq6usrKysw9Wurq6wsLCysrK0tLS1tbW1wbK2tra3t7e4wau5ubm6urq7u7u8vLy9vb2+vr6/xbTAwMDAxbjCwsLC3ejDw8PExMTFxcXGxsbHx8fIv3jIyMjJycnKysrK5vzMzc7Nzc3Ozs7Pz8/QuDnRzcHS0tLT09PT39HU1NTU6/3VzLLV1dXV3sjW1tbX19fYuTHY2NjZ2dna0Ira2trb29vc3Nzex4De3t7f39/guyvhvCfhvCvh4eHh6Nbi4uLjvCTj4+PkyXbk5OTlvCTm5ubm693o6Ojpxl7q6urr6+vswTTs7Ozt7e3uvhju7u7vvhjv7+/wvxjw8PDx8fHyvxX0yTv09PT19fX29vb39/f4wyL4+Pj5+fn6+vr75J37+/v8whP8/Pz9/f39/v/+/v7/wQf/xRb/3HT/5JH/9tz/++/////APs7XAAAAAWJLR0Smt7AblQAAA1RJREFUeNrt3dlT01AUBvAEd8UNl2oLrdrFolZArUul1hWlVhQXFAUF1xaxIqi4FUQUrDsUClZi4nb+Th96S9NQkjDOOKZ+3wuZw8md++M25OXMlKOccJQnTUYocdRqdw8UAqTfOjG4lvr7uowOqbtAtG6o5OiGFoNDapuJHO8tFK4xOKS9msTVgoUiaQjPclnSl01snZ/y4ly2yBNZbRarbc+3yvdpt/hLawOPJp9ur7O0mRiEmzFkY1M6N/4I8qJpulzR2sBx1sgRjQuyA2pk+STdylw2VqR/FPFfWdcCvjhduiM7kVF2db1Nuspu7JGes+I76SRba7f0Wfnn/6F6It+mfo7m8TvYvh7KTiT3PQIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggPwXkFa7e7AQIP3WiUFzdl7LuBDFvJZxIYp5LeNCFPNaBn7Yc+e1KlheSYcrFCniL7LZqPl8cbp0TjavNcqu9rZJB9gdPdIJVnwjbWG1ndI95UzWM9V5rS9Ti3P4VWy1+5jXAgQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAMK+FeS3Ma2FeC/NamNfCCxEQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBA/hZkTKSkwSGn7VUJOmOLV241NiRSRZ2uYcvt+Io+Y0N83USm+MqGWEnU2JCqXqI1ZE+QhYiIy36tXR5INpOQbB5kftcmK85mtdey2iJekeWqX6/3kc+TLCQTrq6eEuZCgKTsbnNXBsIZOERJMedNQnry73XpW8UAKVhIyBPScVfQE9RqEaP7iMT6g+pdw7vKbxKl3IJqV8K7OUqXPHvG9UMGykk2lz1d4g5yvNXo6QqZiA41aHT5OwQTUWBJSrWrvlMwj1jFU2f1Q8K1dCysCUmVhdenNLvMRKZt3hGNriEnxfxlGqt9aPYRkb9bP6Q1SMFrmltMukKuMT2QpckWjc/WhP2lYB/TgjzdHyCKVM/gGXnsp+qY5hbba+hIVA/ETL0+9SepsoNiTs/igGpXZIhKqVv9QVJARIfXIWqfiM1nS+qBnHdae1V7Qss8ngEijRO5a6sMCAtdqv+HfgPwpNPbU6ipOwAAAABJRU5ErkJggg==",
+  "image": "tb-image:Y2hhcnRfKDUpLnN2Zw==:IlN0YXRlIGNoYXJ0IiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_4437_96858)">
<path d="M2.76562 1.81641L0.882812 7H0.113281L2.28125 1.3125H2.77734L2.76562 1.81641ZM4.34375 7L2.45703 1.81641L2.44531 1.3125H2.94141L5.11719 7H4.34375ZM4.24609 4.89453V5.51172H1.05078V4.89453H4.24609Z" fill="black" fill-opacity="0.54"/>
<path d="M3.6875 32.5464H2.24609L2.23828 31.9409H3.54688C3.76302 31.9409 3.95182 31.9045 4.11328 31.8315C4.27474 31.7586 4.39974 31.6545 4.48828 31.519C4.57943 31.381 4.625 31.217 4.625 31.0269C4.625 30.8185 4.58464 30.6493 4.50391 30.519C4.42578 30.3862 4.30469 30.2899 4.14062 30.23C3.97917 30.1675 3.77344 30.1362 3.52344 30.1362H2.41406V35.2065H1.66016V29.519H3.52344C3.8151 29.519 4.07552 29.549 4.30469 29.6089C4.53385 29.6662 4.72786 29.7573 4.88672 29.8823C5.04818 30.0047 5.17057 30.161 5.25391 30.3511C5.33724 30.5412 5.37891 30.769 5.37891 31.0347C5.37891 31.269 5.31901 31.4813 5.19922 31.6714C5.07943 31.8589 4.91276 32.0125 4.69922 32.1323C4.48828 32.2521 4.24089 32.3289 3.95703 32.3628L3.6875 32.5464ZM3.65234 35.2065H1.94922L2.375 34.5933H3.65234C3.89193 34.5933 4.09505 34.5516 4.26172 34.4683C4.43099 34.3849 4.5599 34.2677 4.64844 34.1167C4.73698 33.9631 4.78125 33.7821 4.78125 33.5737C4.78125 33.3628 4.74349 33.1805 4.66797 33.0269C4.59245 32.8732 4.47396 32.7547 4.3125 32.6714C4.15104 32.5881 3.94271 32.5464 3.6875 32.5464H2.61328L2.62109 31.9409H4.08984L4.25 32.1597C4.52344 32.1831 4.75521 32.2612 4.94531 32.394C5.13542 32.5243 5.27995 32.6909 5.37891 32.894C5.48047 33.0972 5.53125 33.3211 5.53125 33.5659C5.53125 33.9201 5.45312 34.2196 5.29688 34.4644C5.14323 34.7065 4.92578 34.8914 4.64453 35.019C4.36328 35.144 4.03255 35.2065 3.65234 35.2065Z" fill="black" fill-opacity="0.54"/>
<path d="M4.09375 61.605H4.84375C4.80469 61.9644 4.70182 62.286 4.53516 62.5698C4.36849 62.8537 4.13281 63.0789 3.82812 63.2456C3.52344 63.4097 3.14323 63.4917 2.6875 63.4917C2.35417 63.4917 2.05078 63.4292 1.77734 63.3042C1.50651 63.1792 1.27344 63.0021 1.07812 62.7729C0.882812 62.5412 0.731771 62.2638 0.625 61.9409C0.520833 61.6154 0.46875 61.2534 0.46875 60.855V60.2886C0.46875 59.8901 0.520833 59.5295 0.625 59.2065C0.731771 58.881 0.884115 58.6024 1.08203 58.3706C1.28255 58.1388 1.52344 57.9604 1.80469 57.8354C2.08594 57.7104 2.40234 57.6479 2.75391 57.6479C3.18359 57.6479 3.54688 57.7287 3.84375 57.8901C4.14062 58.0516 4.37109 58.2756 4.53516 58.562C4.70182 58.8459 4.80469 59.1753 4.84375 59.5503H4.09375C4.05729 59.2847 3.98958 59.0568 3.89062 58.8667C3.79167 58.674 3.65104 58.5256 3.46875 58.4214C3.28646 58.3172 3.04818 58.2651 2.75391 58.2651C2.5013 58.2651 2.27865 58.3133 2.08594 58.4097C1.89583 58.506 1.73568 58.6427 1.60547 58.8198C1.47786 58.9969 1.38151 59.2091 1.31641 59.4565C1.2513 59.7039 1.21875 59.9787 1.21875 60.2808V60.855C1.21875 61.1336 1.2474 61.3953 1.30469 61.6401C1.36458 61.8849 1.45443 62.0998 1.57422 62.2847C1.69401 62.4696 1.84635 62.6154 2.03125 62.7222C2.21615 62.8263 2.4349 62.8784 2.6875 62.8784C3.00781 62.8784 3.26302 62.8276 3.45312 62.7261C3.64323 62.6245 3.78646 62.4787 3.88281 62.2886C3.98177 62.0985 4.05208 61.8706 4.09375 61.605Z" fill="black" fill-opacity="0.54"/>
<path d="M2.19922 91.6201H1.01172L1.01953 91.0068H2.19922C2.60547 91.0068 2.94401 90.9222 3.21484 90.7529C3.48568 90.5811 3.6888 90.3415 3.82422 90.0342C3.96224 89.7243 4.03125 89.3623 4.03125 88.9482V88.6006C4.03125 88.2751 3.99219 87.986 3.91406 87.7334C3.83594 87.4782 3.72135 87.2633 3.57031 87.0889C3.41927 86.9118 3.23438 86.7777 3.01562 86.6865C2.79948 86.5954 2.55078 86.5498 2.26953 86.5498H0.988281V85.9326H2.26953C2.64193 85.9326 2.98177 85.9951 3.28906 86.1201C3.59635 86.2425 3.86068 86.4209 4.08203 86.6553C4.30599 86.887 4.47786 87.1683 4.59766 87.499C4.71745 87.8271 4.77734 88.1969 4.77734 88.6084V88.9482C4.77734 89.3597 4.71745 89.7308 4.59766 90.0615C4.47786 90.3896 4.30469 90.6696 4.07812 90.9014C3.85417 91.1331 3.58333 91.3115 3.26562 91.4365C2.95052 91.5589 2.59505 91.6201 2.19922 91.6201ZM1.41406 85.9326V91.6201H0.660156V85.9326H1.41406Z" fill="black" fill-opacity="0.54"/>
<path d="M5.27344 119.214V119.827H2.26172V119.214H5.27344ZM2.41406 114.14V119.827H1.66016V114.14H2.41406ZM4.875 116.585V117.198H2.26172V116.585H4.875ZM5.23438 114.14V114.757H2.26172V114.14H5.23438Z" fill="black" fill-opacity="0.54"/>
<path d="M11 4.16113L186 4.16116" stroke="black" stroke-opacity="0.12"/>
<path d="M11 33.1611L186 33.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M11 61.1611L186 61.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M11 89.1611L186 89.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M11 118.161L186 118.161" stroke="black" stroke-opacity="0.12"/>
<line x1="9.2" y1="145.961" x2="188.8" y2="145.961" stroke="black" stroke-opacity="0.7" stroke-width="0.4" stroke-linecap="square"/>
<line x1="26.4502" y1="148.072" x2="26.4502" y2="147.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M18.5091 152.025V152.893C18.5091 153.359 18.4674 153.752 18.3841 154.072C18.3007 154.393 18.1809 154.65 18.0247 154.846C17.8684 155.041 17.6796 155.183 17.4583 155.271C17.2395 155.357 16.9921 155.4 16.7161 155.4C16.4973 155.4 16.2955 155.373 16.1106 155.318C15.9257 155.264 15.7591 155.176 15.6106 155.057C15.4648 154.934 15.3398 154.775 15.2356 154.58C15.1315 154.385 15.052 154.148 14.9973 153.869C14.9427 153.59 14.9153 153.265 14.9153 152.893V152.025C14.9153 151.559 14.957 151.169 15.0403 150.854C15.1262 150.538 15.2473 150.286 15.4036 150.096C15.5598 149.903 15.7473 149.765 15.9661 149.682C16.1874 149.598 16.4348 149.557 16.7083 149.557C16.9296 149.557 17.1328 149.584 17.3177 149.639C17.5052 149.691 17.6718 149.775 17.8177 149.893C17.9635 150.007 18.0872 150.161 18.1887 150.354C18.2929 150.544 18.3723 150.777 18.427 151.053C18.4817 151.329 18.5091 151.653 18.5091 152.025ZM17.7825 153.01V151.904C17.7825 151.649 17.7669 151.425 17.7356 151.232C17.707 151.037 17.664 150.87 17.6067 150.732C17.5494 150.594 17.4765 150.482 17.388 150.396C17.302 150.311 17.2018 150.248 17.0872 150.209C16.9752 150.167 16.8489 150.146 16.7083 150.146C16.5364 150.146 16.3841 150.179 16.2512 150.244C16.1184 150.307 16.0065 150.407 15.9153 150.545C15.8268 150.683 15.7591 150.864 15.7122 151.088C15.6653 151.312 15.6419 151.584 15.6419 151.904V153.01C15.6419 153.265 15.6562 153.49 15.6848 153.686C15.7161 153.881 15.7617 154.05 15.8216 154.193C15.8815 154.334 15.9544 154.45 16.0403 154.541C16.1262 154.632 16.2252 154.7 16.3372 154.744C16.4518 154.786 16.5781 154.807 16.7161 154.807C16.8932 154.807 17.0481 154.773 17.1809 154.705C17.3137 154.637 17.4244 154.532 17.513 154.389C17.6041 154.243 17.6718 154.057 17.7161 153.83C17.7604 153.601 17.7825 153.327 17.7825 153.01ZM21.8964 149.604V155.322H21.1737V150.506L19.7167 151.037V150.385L21.7831 149.604H21.8964ZM27.1124 149.635V155.322H26.3585V149.635H27.1124ZM29.4952 152.193V152.811H26.9483V152.193H29.4952ZM29.8819 149.635V150.252H26.9483V149.635H29.8819ZM32.4216 155.4C32.1273 155.4 31.8604 155.351 31.6208 155.252C31.3838 155.15 31.1794 155.008 31.0075 154.826C30.8383 154.644 30.7081 154.428 30.6169 154.178C30.5258 153.928 30.4802 153.654 30.4802 153.357V153.193C30.4802 152.85 30.531 152.544 30.6325 152.275C30.7341 152.005 30.8721 151.775 31.0466 151.588C31.2211 151.4 31.419 151.258 31.6403 151.162C31.8617 151.066 32.0909 151.018 32.3278 151.018C32.6299 151.018 32.8903 151.07 33.1091 151.174C33.3305 151.278 33.5114 151.424 33.6521 151.611C33.7927 151.796 33.8969 152.015 33.9646 152.268C34.0323 152.518 34.0661 152.791 34.0661 153.088V153.412H30.9099V152.822H33.3435V152.768C33.3331 152.58 33.294 152.398 33.2263 152.221C33.1612 152.044 33.057 151.898 32.9138 151.783C32.7706 151.669 32.5752 151.611 32.3278 151.611C32.1638 151.611 32.0127 151.646 31.8747 151.717C31.7367 151.785 31.6182 151.886 31.5193 152.021C31.4203 152.157 31.3435 152.322 31.2888 152.518C31.2341 152.713 31.2068 152.938 31.2068 153.193V153.357C31.2068 153.558 31.2341 153.747 31.2888 153.924C31.3461 154.098 31.4281 154.252 31.5349 154.385C31.6443 154.518 31.7758 154.622 31.9294 154.697C32.0857 154.773 32.2627 154.811 32.4607 154.811C32.7159 154.811 32.932 154.758 33.1091 154.654C33.2862 154.55 33.4411 154.411 33.5739 154.236L34.0114 154.584C33.9203 154.722 33.8044 154.854 33.6638 154.979C33.5232 155.104 33.35 155.205 33.1443 155.283C32.9411 155.361 32.7002 155.4 32.4216 155.4ZM34.9886 149.322H35.7152V154.502L35.6527 155.322H34.9886V149.322ZM38.5706 153.174V153.256C38.5706 153.563 38.5342 153.848 38.4613 154.111C38.3883 154.372 38.2816 154.598 38.1409 154.791C38.0003 154.984 37.8284 155.133 37.6253 155.24C37.4222 155.347 37.1891 155.4 36.9261 155.4C36.6579 155.4 36.4222 155.355 36.2191 155.264C36.0185 155.17 35.8493 155.036 35.7113 154.861C35.5732 154.687 35.4626 154.476 35.3792 154.229C35.2985 153.981 35.2425 153.702 35.2113 153.393V153.033C35.2425 152.721 35.2985 152.441 35.3792 152.193C35.4626 151.946 35.5732 151.735 35.7113 151.561C35.8493 151.383 36.0185 151.249 36.2191 151.158C36.4196 151.064 36.6527 151.018 36.9183 151.018C37.1839 151.018 37.4196 151.07 37.6253 151.174C37.831 151.275 38.0029 151.421 38.1409 151.611C38.2816 151.801 38.3883 152.029 38.4613 152.295C38.5342 152.558 38.5706 152.851 38.5706 153.174ZM37.8441 153.256V153.174C37.8441 152.963 37.8245 152.765 37.7855 152.58C37.7464 152.393 37.6839 152.229 37.598 152.088C37.512 151.945 37.3988 151.833 37.2581 151.752C37.1175 151.669 36.9443 151.627 36.7386 151.627C36.5563 151.627 36.3975 151.658 36.262 151.721C36.1292 151.783 36.0159 151.868 35.9222 151.975C35.8284 152.079 35.7516 152.199 35.6917 152.334C35.6344 152.467 35.5915 152.605 35.5628 152.748V153.689C35.6045 153.872 35.6722 154.048 35.7659 154.217C35.8623 154.383 35.9899 154.52 36.1488 154.627C36.3102 154.734 36.5094 154.787 36.7464 154.787C36.9417 154.787 37.1084 154.748 37.2464 154.67C37.387 154.589 37.5003 154.479 37.5863 154.338C37.6748 154.197 37.7399 154.035 37.7816 153.85C37.8232 153.665 37.8441 153.467 37.8441 153.256Z" fill="black" fill-opacity="0.54"/>
<g clip-path="url(#clip1_4437_96858)">
<line x1="61.8501" y1="147.072" x2="61.8501" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M53.909 152.025V152.893C53.909 153.359 53.8673 153.752 53.784 154.072C53.7006 154.393 53.5808 154.65 53.4246 154.846C53.2683 155.041 53.0795 155.183 52.8582 155.271C52.6394 155.357 52.392 155.4 52.116 155.4C51.8972 155.4 51.6954 155.373 51.5105 155.318C51.3256 155.264 51.159 155.176 51.0105 155.057C50.8647 154.934 50.7397 154.775 50.6355 154.58C50.5314 154.385 50.4519 154.148 50.3972 153.869C50.3426 153.59 50.3152 153.265 50.3152 152.893V152.025C50.3152 151.559 50.3569 151.169 50.4402 150.854C50.5261 150.538 50.6472 150.286 50.8035 150.096C50.9597 149.903 51.1472 149.765 51.366 149.682C51.5873 149.598 51.8347 149.557 52.1082 149.557C52.3295 149.557 52.5327 149.584 52.7176 149.639C52.9051 149.691 53.0717 149.775 53.2176 149.893C53.3634 150.007 53.4871 150.161 53.5886 150.354C53.6928 150.544 53.7722 150.777 53.8269 151.053C53.8816 151.329 53.909 151.653 53.909 152.025ZM53.1824 153.01V151.904C53.1824 151.649 53.1668 151.425 53.1355 151.232C53.1069 151.037 53.0639 150.87 53.0066 150.732C52.9493 150.594 52.8764 150.482 52.7879 150.396C52.7019 150.311 52.6017 150.248 52.4871 150.209C52.3751 150.167 52.2488 150.146 52.1082 150.146C51.9363 150.146 51.784 150.179 51.6511 150.244C51.5183 150.307 51.4064 150.407 51.3152 150.545C51.2267 150.683 51.159 150.864 51.1121 151.088C51.0652 151.312 51.0418 151.584 51.0418 151.904V153.01C51.0418 153.265 51.0561 153.49 51.0847 153.686C51.116 153.881 51.1616 154.05 51.2215 154.193C51.2814 154.334 51.3543 154.45 51.4402 154.541C51.5261 154.632 51.6251 154.7 51.7371 154.744C51.8517 154.786 51.978 154.807 52.116 154.807C52.2931 154.807 52.448 154.773 52.5808 154.705C52.7136 154.637 52.8243 154.532 52.9129 154.389C53.004 154.243 53.0717 154.057 53.116 153.83C53.1603 153.601 53.1824 153.327 53.1824 153.01ZM58.6478 154.729V155.322H54.9252V154.803L56.7885 152.729C57.0176 152.473 57.1947 152.257 57.3197 152.08C57.4473 151.9 57.5359 151.74 57.5853 151.6C57.6374 151.456 57.6635 151.311 57.6635 151.162C57.6635 150.975 57.6244 150.805 57.5463 150.654C57.4708 150.501 57.3588 150.378 57.2103 150.287C57.0619 150.196 56.8822 150.15 56.6713 150.15C56.4187 150.15 56.2077 150.2 56.0385 150.299C55.8718 150.395 55.7468 150.531 55.6635 150.705C55.5801 150.88 55.5385 151.08 55.5385 151.307H54.8158C54.8158 150.986 54.8861 150.693 55.0267 150.428C55.1674 150.162 55.3757 149.951 55.6517 149.795C55.9278 149.636 56.2676 149.557 56.6713 149.557C57.0307 149.557 57.3379 149.62 57.5932 149.748C57.8484 149.873 58.0437 150.05 58.1791 150.279C58.3171 150.506 58.3861 150.771 58.3861 151.076C58.3861 151.243 58.3575 151.412 58.3002 151.584C58.2455 151.753 58.1687 151.923 58.0697 152.092C57.9734 152.261 57.8601 152.428 57.7299 152.592C57.6023 152.756 57.4655 152.917 57.3197 153.076L55.7963 154.729H58.6478ZM62.5123 149.635V155.322H61.7584V149.635H62.5123ZM64.8951 152.193V152.811H62.3482V152.193H64.8951ZM65.2818 149.635V150.252H62.3482V149.635H65.2818ZM67.8215 155.4C67.5272 155.4 67.2603 155.351 67.0207 155.252C66.7837 155.15 66.5793 155.008 66.4074 154.826C66.2382 154.644 66.108 154.428 66.0168 154.178C65.9257 153.928 65.8801 153.654 65.8801 153.357V153.193C65.8801 152.85 65.9309 152.544 66.0324 152.275C66.134 152.005 66.272 151.775 66.4465 151.588C66.621 151.4 66.8189 151.258 67.0402 151.162C67.2616 151.066 67.4908 151.018 67.7277 151.018C68.0298 151.018 68.2902 151.07 68.509 151.174C68.7304 151.278 68.9113 151.424 69.052 151.611C69.1926 151.796 69.2968 152.015 69.3645 152.268C69.4322 152.518 69.466 152.791 69.466 153.088V153.412H66.3098V152.822H68.7434V152.768C68.733 152.58 68.6939 152.398 68.6262 152.221C68.5611 152.044 68.4569 151.898 68.3137 151.783C68.1705 151.669 67.9751 151.611 67.7277 151.611C67.5637 151.611 67.4126 151.646 67.2746 151.717C67.1366 151.785 67.0181 151.886 66.9192 152.021C66.8202 152.157 66.7434 152.322 66.6887 152.518C66.634 152.713 66.6067 152.938 66.6067 153.193V153.357C66.6067 153.558 66.634 153.747 66.6887 153.924C66.746 154.098 66.828 154.252 66.9348 154.385C67.0442 154.518 67.1757 154.622 67.3293 154.697C67.4856 154.773 67.6626 154.811 67.8606 154.811C68.1158 154.811 68.3319 154.758 68.509 154.654C68.6861 154.55 68.841 154.411 68.9738 154.236L69.4113 154.584C69.3202 154.722 69.2043 154.854 69.0637 154.979C68.9231 155.104 68.7499 155.205 68.5442 155.283C68.341 155.361 68.1001 155.4 67.8215 155.4ZM70.3885 149.322H71.1151V154.502L71.0526 155.322H70.3885V149.322ZM73.9705 153.174V153.256C73.9705 153.563 73.9341 153.848 73.8612 154.111C73.7882 154.372 73.6815 154.598 73.5408 154.791C73.4002 154.984 73.2283 155.133 73.0252 155.24C72.8221 155.347 72.589 155.4 72.326 155.4C72.0578 155.4 71.8221 155.355 71.619 155.264C71.4185 155.17 71.2492 155.036 71.1112 154.861C70.9731 154.687 70.8625 154.476 70.7791 154.229C70.6984 153.981 70.6424 153.702 70.6112 153.393V153.033C70.6424 152.721 70.6984 152.441 70.7791 152.193C70.8625 151.946 70.9731 151.735 71.1112 151.561C71.2492 151.383 71.4185 151.249 71.619 151.158C71.8195 151.064 72.0526 151.018 72.3182 151.018C72.5838 151.018 72.8195 151.07 73.0252 151.174C73.231 151.275 73.4028 151.421 73.5408 151.611C73.6815 151.801 73.7882 152.029 73.8612 152.295C73.9341 152.558 73.9705 152.851 73.9705 153.174ZM73.244 153.256V153.174C73.244 152.963 73.2244 152.765 73.1854 152.58C73.1463 152.393 73.0838 152.229 72.9979 152.088C72.9119 151.945 72.7987 151.833 72.658 151.752C72.5174 151.669 72.3442 151.627 72.1385 151.627C71.9562 151.627 71.7974 151.658 71.6619 151.721C71.5291 151.783 71.4158 151.868 71.3221 151.975C71.2283 152.079 71.1515 152.199 71.0916 152.334C71.0343 152.467 70.9914 152.605 70.9627 152.748V153.689C71.0044 153.872 71.0721 154.048 71.1658 154.217C71.2622 154.383 71.3898 154.52 71.5487 154.627C71.7101 154.734 71.9093 154.787 72.1463 154.787C72.3416 154.787 72.5083 154.748 72.6463 154.67C72.7869 154.589 72.9002 154.479 72.9862 154.338C73.0747 154.197 73.1398 154.035 73.1815 153.85C73.2231 153.665 73.244 153.467 73.244 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip2_4437_96858)">
<line x1="97.25" y1="147.072" x2="97.25" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M89.3089 152.025V152.893C89.3089 153.359 89.2672 153.752 89.1839 154.072C89.1005 154.393 88.9807 154.65 88.8245 154.846C88.6682 155.041 88.4794 155.183 88.2581 155.271C88.0393 155.357 87.7919 155.4 87.5159 155.4C87.2971 155.4 87.0953 155.373 86.9104 155.318C86.7255 155.264 86.5589 155.176 86.4104 155.057C86.2646 154.934 86.1396 154.775 86.0354 154.58C85.9313 154.385 85.8518 154.148 85.7971 153.869C85.7425 153.59 85.7151 153.265 85.7151 152.893V152.025C85.7151 151.559 85.7568 151.169 85.8401 150.854C85.9261 150.538 86.0471 150.286 86.2034 150.096C86.3596 149.903 86.5471 149.765 86.7659 149.682C86.9872 149.598 87.2346 149.557 87.5081 149.557C87.7294 149.557 87.9326 149.584 88.1175 149.639C88.305 149.691 88.4716 149.775 88.6175 149.893C88.7633 150.007 88.887 150.161 88.9886 150.354C89.0927 150.544 89.1721 150.777 89.2268 151.053C89.2815 151.329 89.3089 151.653 89.3089 152.025ZM88.5823 153.01V151.904C88.5823 151.649 88.5667 151.425 88.5354 151.232C88.5068 151.037 88.4638 150.87 88.4065 150.732C88.3492 150.594 88.2763 150.482 88.1878 150.396C88.1018 150.311 88.0016 150.248 87.887 150.209C87.775 150.167 87.6487 150.146 87.5081 150.146C87.3362 150.146 87.1839 150.179 87.0511 150.244C86.9182 150.307 86.8063 150.407 86.7151 150.545C86.6266 150.683 86.5589 150.864 86.512 151.088C86.4651 151.312 86.4417 151.584 86.4417 151.904V153.01C86.4417 153.265 86.456 153.49 86.4846 153.686C86.5159 153.881 86.5615 154.05 86.6214 154.193C86.6813 154.334 86.7542 154.45 86.8401 154.541C86.9261 154.632 87.025 154.7 87.137 154.744C87.2516 154.786 87.3779 154.807 87.5159 154.807C87.693 154.807 87.8479 154.773 87.9807 154.705C88.1136 154.637 88.2242 154.532 88.3128 154.389C88.4039 154.243 88.4716 154.057 88.5159 153.83C88.5602 153.601 88.5823 153.327 88.5823 153.01ZM91.3759 152.123H91.8915C92.1441 152.123 92.3524 152.081 92.5165 151.998C92.6832 151.912 92.8069 151.796 92.8876 151.65C92.9709 151.502 93.0126 151.335 93.0126 151.15C93.0126 150.932 92.9761 150.748 92.9032 150.6C92.8303 150.451 92.7209 150.339 92.5751 150.264C92.4293 150.188 92.2444 150.15 92.0204 150.15C91.8173 150.15 91.6376 150.191 91.4813 150.271C91.3277 150.35 91.2066 150.462 91.1181 150.607C91.0321 150.753 90.9891 150.925 90.9891 151.123H90.2665C90.2665 150.834 90.3394 150.571 90.4852 150.334C90.6311 150.097 90.8355 149.908 91.0985 149.768C91.3641 149.627 91.6714 149.557 92.0204 149.557C92.3641 149.557 92.6649 149.618 92.9227 149.74C93.1806 149.86 93.3811 150.04 93.5243 150.279C93.6675 150.516 93.7391 150.812 93.7391 151.166C93.7391 151.309 93.7053 151.463 93.6376 151.627C93.5725 151.788 93.4696 151.939 93.329 152.08C93.191 152.221 93.0113 152.337 92.7899 152.428C92.5686 152.516 92.3029 152.561 91.9931 152.561H91.3759V152.123ZM91.3759 152.717V152.283H91.9931C92.355 152.283 92.6545 152.326 92.8915 152.412C93.1285 152.498 93.3147 152.613 93.4501 152.756C93.5881 152.899 93.6845 153.057 93.7391 153.229C93.7964 153.398 93.8251 153.567 93.8251 153.736C93.8251 154.002 93.7795 154.238 93.6884 154.443C93.5998 154.649 93.4735 154.824 93.3095 154.967C93.148 155.11 92.9579 155.218 92.7391 155.291C92.5204 155.364 92.2821 155.4 92.0243 155.4C91.7769 155.4 91.5438 155.365 91.3251 155.295C91.1089 155.225 90.9175 155.123 90.7509 154.99C90.5842 154.855 90.454 154.689 90.3602 154.494C90.2665 154.296 90.2196 154.071 90.2196 153.818H90.9423C90.9423 154.016 90.9852 154.189 91.0712 154.338C91.1597 154.486 91.2847 154.602 91.4462 154.686C91.6102 154.766 91.8029 154.807 92.0243 154.807C92.2457 154.807 92.4358 154.769 92.5946 154.693C92.7561 154.615 92.8798 154.498 92.9657 154.342C93.0543 154.186 93.0985 153.989 93.0985 153.752C93.0985 153.515 93.049 153.321 92.9501 153.17C92.8511 153.016 92.7105 152.903 92.5282 152.83C92.3485 152.755 92.1363 152.717 91.8915 152.717H91.3759ZM97.9122 149.635V155.322H97.1583V149.635H97.9122ZM100.295 152.193V152.811H97.7481V152.193H100.295ZM100.682 149.635V150.252H97.7481V149.635H100.682ZM103.221 155.4C102.927 155.4 102.66 155.351 102.421 155.252C102.184 155.15 101.979 155.008 101.807 154.826C101.638 154.644 101.508 154.428 101.417 154.178C101.326 153.928 101.28 153.654 101.28 153.357V153.193C101.28 152.85 101.331 152.544 101.432 152.275C101.534 152.005 101.672 151.775 101.846 151.588C102.021 151.4 102.219 151.258 102.44 151.162C102.662 151.066 102.891 151.018 103.128 151.018C103.43 151.018 103.69 151.07 103.909 151.174C104.13 151.278 104.311 151.424 104.452 151.611C104.592 151.796 104.697 152.015 104.764 152.268C104.832 152.518 104.866 152.791 104.866 153.088V153.412H101.71V152.822H104.143V152.768C104.133 152.58 104.094 152.398 104.026 152.221C103.961 152.044 103.857 151.898 103.714 151.783C103.57 151.669 103.375 151.611 103.128 151.611C102.964 151.611 102.813 151.646 102.675 151.717C102.537 151.785 102.418 151.886 102.319 152.021C102.22 152.157 102.143 152.322 102.089 152.518C102.034 152.713 102.007 152.938 102.007 153.193V153.357C102.007 153.558 102.034 153.747 102.089 153.924C102.146 154.098 102.228 154.252 102.335 154.385C102.444 154.518 102.576 154.622 102.729 154.697C102.885 154.773 103.063 154.811 103.26 154.811C103.516 154.811 103.732 154.758 103.909 154.654C104.086 154.55 104.241 154.411 104.374 154.236L104.811 154.584C104.72 154.722 104.604 154.854 104.464 154.979C104.323 155.104 104.15 155.205 103.944 155.283C103.741 155.361 103.5 155.4 103.221 155.4ZM105.788 149.322H106.515V154.502L106.452 155.322H105.788V149.322ZM109.37 153.174V153.256C109.37 153.563 109.334 153.848 109.261 154.111C109.188 154.372 109.081 154.598 108.941 154.791C108.8 154.984 108.628 155.133 108.425 155.24C108.222 155.347 107.989 155.4 107.726 155.4C107.458 155.4 107.222 155.355 107.019 155.264C106.818 155.17 106.649 155.036 106.511 154.861C106.373 154.687 106.262 154.476 106.179 154.229C106.098 153.981 106.042 153.702 106.011 153.393V153.033C106.042 152.721 106.098 152.441 106.179 152.193C106.262 151.946 106.373 151.735 106.511 151.561C106.649 151.383 106.818 151.249 107.019 151.158C107.219 151.064 107.452 151.018 107.718 151.018C107.984 151.018 108.219 151.07 108.425 151.174C108.631 151.275 108.803 151.421 108.941 151.611C109.081 151.801 109.188 152.029 109.261 152.295C109.334 152.558 109.37 152.851 109.37 153.174ZM108.644 153.256V153.174C108.644 152.963 108.624 152.765 108.585 152.58C108.546 152.393 108.484 152.229 108.398 152.088C108.312 151.945 108.199 151.833 108.058 151.752C107.917 151.669 107.744 151.627 107.538 151.627C107.356 151.627 107.197 151.658 107.062 151.721C106.929 151.783 106.816 151.868 106.722 151.975C106.628 152.079 106.551 152.199 106.492 152.334C106.434 152.467 106.391 152.605 106.363 152.748V153.689C106.404 153.872 106.472 154.048 106.566 154.217C106.662 154.383 106.79 154.52 106.949 154.627C107.11 154.734 107.309 154.787 107.546 154.787C107.742 154.787 107.908 154.748 108.046 154.67C108.187 154.589 108.3 154.479 108.386 154.338C108.475 154.197 108.54 154.035 108.581 153.85C108.623 153.665 108.644 153.467 108.644 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip3_4437_96858)">
<line x1="132.65" y1="147.072" x2="132.65" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M124.709 152.025V152.893C124.709 153.359 124.668 153.752 124.584 154.072C124.501 154.393 124.381 154.65 124.225 154.846C124.069 155.041 123.88 155.183 123.658 155.271C123.44 155.357 123.192 155.4 122.916 155.4C122.698 155.4 122.496 155.373 122.311 155.318C122.126 155.264 121.959 155.176 121.811 155.057C121.665 154.934 121.54 154.775 121.436 154.58C121.332 154.385 121.252 154.148 121.198 153.869C121.143 153.59 121.116 153.265 121.116 152.893V152.025C121.116 151.559 121.157 151.169 121.241 150.854C121.326 150.538 121.448 150.286 121.604 150.096C121.76 149.903 121.948 149.765 122.166 149.682C122.388 149.598 122.635 149.557 122.908 149.557C123.13 149.557 123.333 149.584 123.518 149.639C123.705 149.691 123.872 149.775 124.018 149.893C124.164 150.007 124.287 150.161 124.389 150.354C124.493 150.544 124.573 150.777 124.627 151.053C124.682 151.329 124.709 151.653 124.709 152.025ZM123.983 153.01V151.904C123.983 151.649 123.967 151.425 123.936 151.232C123.907 151.037 123.864 150.87 123.807 150.732C123.75 150.594 123.677 150.482 123.588 150.396C123.502 150.311 123.402 150.248 123.287 150.209C123.175 150.167 123.049 150.146 122.908 150.146C122.737 150.146 122.584 150.179 122.451 150.244C122.319 150.307 122.207 150.407 122.116 150.545C122.027 150.683 121.959 150.864 121.912 151.088C121.866 151.312 121.842 151.584 121.842 151.904V153.01C121.842 153.265 121.856 153.49 121.885 153.686C121.916 153.881 121.962 154.05 122.022 154.193C122.082 154.334 122.155 154.45 122.241 154.541C122.326 154.632 122.425 154.7 122.537 154.744C122.652 154.786 122.778 154.807 122.916 154.807C123.093 154.807 123.248 154.773 123.381 154.705C123.514 154.637 123.625 154.532 123.713 154.389C123.804 154.243 123.872 154.057 123.916 153.83C123.961 153.601 123.983 153.327 123.983 153.01ZM129.565 153.408V154.002H125.456V153.576L128.003 149.635H128.593L127.96 150.775L126.276 153.408H129.565ZM128.772 149.635V155.322H128.05V149.635H128.772ZM133.313 149.635V155.322H132.559V149.635H133.313ZM135.695 152.193V152.811H133.149V152.193H135.695ZM136.082 149.635V150.252H133.149V149.635H136.082ZM138.622 155.4C138.328 155.4 138.061 155.351 137.821 155.252C137.584 155.15 137.38 155.008 137.208 154.826C137.038 154.644 136.908 154.428 136.817 154.178C136.726 153.928 136.68 153.654 136.68 153.357V153.193C136.68 152.85 136.731 152.544 136.833 152.275C136.934 152.005 137.072 151.775 137.247 151.588C137.421 151.4 137.619 151.258 137.841 151.162C138.062 151.066 138.291 151.018 138.528 151.018C138.83 151.018 139.091 151.07 139.309 151.174C139.531 151.278 139.712 151.424 139.852 151.611C139.993 151.796 140.097 152.015 140.165 152.268C140.232 152.518 140.266 152.791 140.266 153.088V153.412H137.11V152.822H139.544V152.768C139.533 152.58 139.494 152.398 139.426 152.221C139.361 152.044 139.257 151.898 139.114 151.783C138.971 151.669 138.775 151.611 138.528 151.611C138.364 151.611 138.213 151.646 138.075 151.717C137.937 151.785 137.818 151.886 137.719 152.021C137.62 152.157 137.544 152.322 137.489 152.518C137.434 152.713 137.407 152.938 137.407 153.193V153.357C137.407 153.558 137.434 153.747 137.489 153.924C137.546 154.098 137.628 154.252 137.735 154.385C137.844 154.518 137.976 154.622 138.13 154.697C138.286 154.773 138.463 154.811 138.661 154.811C138.916 154.811 139.132 154.758 139.309 154.654C139.486 154.55 139.641 154.411 139.774 154.236L140.212 154.584C140.12 154.722 140.005 154.854 139.864 154.979C139.723 155.104 139.55 155.205 139.344 155.283C139.141 155.361 138.9 155.4 138.622 155.4ZM141.189 149.322H141.915V154.502L141.853 155.322H141.189V149.322ZM144.771 153.174V153.256C144.771 153.563 144.734 153.848 144.661 154.111C144.589 154.372 144.482 154.598 144.341 154.791C144.201 154.984 144.029 155.133 143.826 155.24C143.622 155.347 143.389 155.4 143.126 155.4C142.858 155.4 142.622 155.355 142.419 155.264C142.219 155.17 142.049 155.036 141.911 154.861C141.773 154.687 141.663 154.476 141.579 154.229C141.499 153.981 141.443 153.702 141.411 153.393V153.033C141.443 152.721 141.499 152.441 141.579 152.193C141.663 151.946 141.773 151.735 141.911 151.561C142.049 151.383 142.219 151.249 142.419 151.158C142.62 151.064 142.853 151.018 143.118 151.018C143.384 151.018 143.62 151.07 143.826 151.174C144.031 151.275 144.203 151.421 144.341 151.611C144.482 151.801 144.589 152.029 144.661 152.295C144.734 152.558 144.771 152.851 144.771 153.174ZM144.044 153.256V153.174C144.044 152.963 144.025 152.765 143.986 152.58C143.947 152.393 143.884 152.229 143.798 152.088C143.712 151.945 143.599 151.833 143.458 151.752C143.318 151.669 143.145 151.627 142.939 151.627C142.757 151.627 142.598 151.658 142.462 151.721C142.329 151.783 142.216 151.868 142.122 151.975C142.029 152.079 141.952 152.199 141.892 152.334C141.835 152.467 141.792 152.605 141.763 152.748V153.689C141.805 153.872 141.872 154.048 141.966 154.217C142.062 154.383 142.19 154.52 142.349 154.627C142.51 154.734 142.71 154.787 142.947 154.787C143.142 154.787 143.309 154.748 143.447 154.67C143.587 154.589 143.701 154.479 143.786 154.338C143.875 154.197 143.94 154.035 143.982 153.85C144.023 153.665 144.044 153.467 144.044 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip4_4437_96858)">
<line x1="168.05" y1="147.072" x2="168.05" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M160.109 152.025V152.893C160.109 153.359 160.067 153.752 159.984 154.072C159.901 154.393 159.781 154.65 159.625 154.846C159.469 155.041 159.28 155.183 159.058 155.271C158.84 155.357 158.592 155.4 158.316 155.4C158.097 155.4 157.896 155.373 157.711 155.318C157.526 155.264 157.359 155.176 157.211 155.057C157.065 154.934 156.94 154.775 156.836 154.58C156.732 154.385 156.652 154.148 156.597 153.869C156.543 153.59 156.515 153.265 156.515 152.893V152.025C156.515 151.559 156.557 151.169 156.64 150.854C156.726 150.538 156.847 150.286 157.004 150.096C157.16 149.903 157.347 149.765 157.566 149.682C157.788 149.598 158.035 149.557 158.308 149.557C158.53 149.557 158.733 149.584 158.918 149.639C159.105 149.691 159.272 149.775 159.418 149.893C159.564 150.007 159.687 150.161 159.789 150.354C159.893 150.544 159.972 150.777 160.027 151.053C160.082 151.329 160.109 151.653 160.109 152.025ZM159.383 153.01V151.904C159.383 151.649 159.367 151.425 159.336 151.232C159.307 151.037 159.264 150.87 159.207 150.732C159.15 150.594 159.077 150.482 158.988 150.396C158.902 150.311 158.802 150.248 158.687 150.209C158.575 150.167 158.449 150.146 158.308 150.146C158.136 150.146 157.984 150.179 157.851 150.244C157.719 150.307 157.607 150.407 157.515 150.545C157.427 150.683 157.359 150.864 157.312 151.088C157.265 151.312 157.242 151.584 157.242 151.904V153.01C157.242 153.265 157.256 153.49 157.285 153.686C157.316 153.881 157.362 154.05 157.422 154.193C157.482 154.334 157.554 154.45 157.64 154.541C157.726 154.632 157.825 154.7 157.937 154.744C158.052 154.786 158.178 154.807 158.316 154.807C158.493 154.807 158.648 154.773 158.781 154.705C158.914 154.637 159.025 154.532 159.113 154.389C159.204 154.243 159.272 154.057 159.316 153.83C159.36 153.601 159.383 153.327 159.383 153.01ZM162.036 152.615L161.457 152.467L161.743 149.635H164.661V150.303H162.356L162.184 151.85C162.288 151.79 162.42 151.734 162.579 151.682C162.74 151.63 162.925 151.604 163.133 151.604C163.396 151.604 163.632 151.649 163.84 151.74C164.049 151.829 164.226 151.956 164.371 152.123C164.52 152.29 164.633 152.49 164.711 152.725C164.789 152.959 164.829 153.221 164.829 153.51C164.829 153.783 164.791 154.035 164.715 154.264C164.642 154.493 164.532 154.693 164.383 154.865C164.235 155.035 164.047 155.166 163.821 155.26C163.597 155.354 163.332 155.4 163.028 155.4C162.799 155.4 162.581 155.369 162.375 155.307C162.172 155.242 161.99 155.144 161.829 155.014C161.67 154.881 161.539 154.717 161.438 154.521C161.339 154.324 161.276 154.092 161.25 153.826H161.938C161.969 154.04 162.032 154.219 162.125 154.365C162.219 154.511 162.342 154.622 162.493 154.697C162.646 154.77 162.825 154.807 163.028 154.807C163.2 154.807 163.352 154.777 163.485 154.717C163.618 154.657 163.73 154.571 163.821 154.459C163.912 154.347 163.981 154.212 164.028 154.053C164.077 153.894 164.102 153.715 164.102 153.518C164.102 153.338 164.077 153.171 164.028 153.018C163.978 152.864 163.904 152.73 163.805 152.615C163.709 152.501 163.59 152.412 163.45 152.35C163.309 152.285 163.148 152.252 162.965 152.252C162.723 152.252 162.539 152.285 162.414 152.35C162.292 152.415 162.166 152.503 162.036 152.615ZM168.713 149.635V155.322H167.959V149.635H168.713ZM171.095 152.193V152.811H168.548V152.193H171.095ZM171.482 149.635V150.252H168.548V149.635H171.482ZM174.022 155.4C173.727 155.4 173.46 155.351 173.221 155.252C172.984 155.15 172.78 155.008 172.608 154.826C172.438 154.644 172.308 154.428 172.217 154.178C172.126 153.928 172.08 153.654 172.08 153.357V153.193C172.08 152.85 172.131 152.544 172.233 152.275C172.334 152.005 172.472 151.775 172.647 151.588C172.821 151.4 173.019 151.258 173.24 151.162C173.462 151.066 173.691 151.018 173.928 151.018C174.23 151.018 174.49 151.07 174.709 151.174C174.931 151.278 175.112 151.424 175.252 151.611C175.393 151.796 175.497 152.015 175.565 152.268C175.632 152.518 175.666 152.791 175.666 153.088V153.412H172.51V152.822H174.944V152.768C174.933 152.58 174.894 152.398 174.826 152.221C174.761 152.044 174.657 151.898 174.514 151.783C174.371 151.669 174.175 151.611 173.928 151.611C173.764 151.611 173.613 151.646 173.475 151.717C173.337 151.785 173.218 151.886 173.119 152.021C173.02 152.157 172.944 152.322 172.889 152.518C172.834 152.713 172.807 152.938 172.807 153.193V153.357C172.807 153.558 172.834 153.747 172.889 153.924C172.946 154.098 173.028 154.252 173.135 154.385C173.244 154.518 173.376 154.622 173.53 154.697C173.686 154.773 173.863 154.811 174.061 154.811C174.316 154.811 174.532 154.758 174.709 154.654C174.886 154.55 175.041 154.411 175.174 154.236L175.612 154.584C175.52 154.722 175.405 154.854 175.264 154.979C175.123 155.104 174.95 155.205 174.744 155.283C174.541 155.361 174.3 155.4 174.022 155.4ZM176.589 149.322H177.315V154.502L177.253 155.322H176.589V149.322ZM180.171 153.174V153.256C180.171 153.563 180.134 153.848 180.061 154.111C179.988 154.372 179.882 154.598 179.741 154.791C179.6 154.984 179.429 155.133 179.225 155.24C179.022 155.347 178.789 155.4 178.526 155.4C178.258 155.4 178.022 155.355 177.819 155.264C177.619 155.17 177.449 155.036 177.311 154.861C177.173 154.687 177.063 154.476 176.979 154.229C176.899 153.981 176.843 153.702 176.811 153.393V153.033C176.843 152.721 176.899 152.441 176.979 152.193C177.063 151.946 177.173 151.735 177.311 151.561C177.449 151.383 177.619 151.249 177.819 151.158C178.02 151.064 178.253 151.018 178.518 151.018C178.784 151.018 179.02 151.07 179.225 151.174C179.431 151.275 179.603 151.421 179.741 151.611C179.882 151.801 179.988 152.029 180.061 152.295C180.134 152.558 180.171 152.851 180.171 153.174ZM179.444 153.256V153.174C179.444 152.963 179.425 152.765 179.386 152.58C179.347 152.393 179.284 152.229 179.198 152.088C179.112 151.945 178.999 151.833 178.858 151.752C178.718 151.669 178.544 151.627 178.339 151.627C178.156 151.627 177.998 151.658 177.862 151.721C177.729 151.783 177.616 151.868 177.522 151.975C177.429 152.079 177.352 152.199 177.292 152.334C177.235 152.467 177.192 152.605 177.163 152.748V153.689C177.205 153.872 177.272 154.048 177.366 154.217C177.462 154.383 177.59 154.52 177.749 154.627C177.91 154.734 178.11 154.787 178.347 154.787C178.542 154.787 178.708 154.748 178.847 154.67C178.987 154.589 179.1 154.479 179.186 154.338C179.275 154.197 179.34 154.035 179.382 153.85C179.423 153.665 179.444 153.467 179.444 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<path d="M14.5 17.5H27H60.5C61.0523 17.5 61.5 17.9477 61.5 18.5V26C61.5 26.5523 61.9477 27 62.5 27H96C96.5523 27 97 26.5523 97 26V12.5C97 11.9477 97.4477 11.5 98 11.5H132C132.552 11.5 133 11.9477 133 12.5V32.5C133 33.0523 133.448 33.5 134 33.5H167.5C168.052 33.5 168.5 33.0523 168.5 32.5V24C168.5 23.4477 168.948 23 169.5 23H186" stroke="#FFC107" stroke-width="2" stroke-linecap="round"/>
<path d="M11 117H27V127.5H62V79.1611H97V101H132V89.2675H168.5V121.5H186" stroke="#4CAF50" stroke-width="2" stroke-linecap="round"/>
<path d="M12 60.5H28V69.5H62.5V47L97 47.0002V57.0002L133 57V69.5H168H185.5" stroke="#2196F3" stroke-width="2" stroke-linecap="round"/>
</g>
<defs>
<clipPath id="clip0_4437_96858">
<rect width="200" height="160" fill="white"/>
</clipPath>
<clipPath id="clip1_4437_96858">
<rect width="35.4" height="10.322" fill="white" transform="translate(44.3999 146)"/>
</clipPath>
<clipPath id="clip2_4437_96858">
<rect width="35.4" height="10.322" fill="white" transform="translate(79.7998 146)"/>
</clipPath>
<clipPath id="clip3_4437_96858">
<rect width="35.4" height="10.322" fill="white" transform="translate(115.2 146)"/>
</clipPath>
<clipPath id="clip4_4437_96858">
<rect width="35.4" height="10.322" fill="white" transform="translate(150.6 146)"/>
</clipPath>
</defs>
</svg>
",
   "description": "Displays changes to the state of the entity over time. For example, online and offline.",
   "descriptor": {
     "type": "timeseries",
     "sizeX": 8,
     "sizeY": 5,
     "resources": [],
-    "templateHtml": "<tb-flot-widget \n    [ctx]=\"ctx\" chartType=\"state\">\n</tb-flot-widget>",
-    "templateCss": ".legend {\n    font-size: 13px;\n    line-height: 10px;\n}\n\n.legend table { \n    border-spacing: 0px;\n    border-collapse: separate;\n}\n\n.mouse-events .flot-overlay {\n    cursor: crosshair; \n}\n\n",
-    "controllerScript": "self.onInit = function() {\n}\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.flotWidget.onDataUpdated();\n}\n\nself.onLatestDataUpdated = function() {\n    self.ctx.$scope.flotWidget.onLatestDataUpdated();\n}\n\nself.onResize = function() {\n    self.ctx.$scope.flotWidget.onResize();\n}\n\nself.onEditModeChanged = function() {\n    self.ctx.$scope.flotWidget.onEditModeChanged();\n}\n\nself.onDestroy = function() {\n    self.ctx.$scope.flotWidget.onDestroy();\n}\n\nself.typeParameters = function() {\n    return {\n        stateData: true,\n        hasAdditionalLatestDataKeys: true,\n        defaultDataKeysFunction: function() {\n            return [{ name: 'temperature', label: 'Temperature', type: 'timeseries', units: '°C', decimals: 0 }];\n        }\n    };\n}\n\n",
+    "templateHtml": "<tb-time-series-chart-widget \n    [ctx]=\"ctx\"\n    [widgetTitlePanel]=\"widgetTitlePanel\">\n</tb-time-series-chart-widget>",
+    "templateCss": "",
+    "controllerScript": "self.onInit = function() {\n    self.ctx.$scope.timeSeriesChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.timeSeriesChartWidget.onDataUpdated();\n}\n\nself.onLatestDataUpdated = function() {\n    self.ctx.$scope.timeSeriesChartWidget.onLatestDataUpdated();\n}\n\nself.typeParameters = function() {\n    return {\n        stateData: true,\n        chartType: 'state',\n        previewWidth: '80%',\n        embedTitlePanel: true,\n        hasAdditionalLatestDataKeys: true,\n        dataKeySettingsFunction: TbTimeSeriesChart.dataKeySettings('state'),\n        defaultDataKeysFunction: function() {\n            return [{ name: 'state', label: 'State', type: 'timeseries', units: '', decimals: 0 }];\n        }\n    };\n}\n",
     "settingsSchema": "{}",
     "dataKeySettingsSchema": "{}",
-    "settingsDirective": "tb-flot-line-widget-settings",
-    "dataKeySettingsDirective": "tb-flot-line-key-settings",
-    "latestDataKeySettingsDirective": "tb-flot-latest-key-settings",
+    "latestDataKeySettingsSchema": "{}",
+    "settingsDirective": "tb-time-series-chart-widget-settings",
+    "dataKeySettingsDirective": "tb-time-series-chart-key-settings",
+    "latestDataKeySettingsDirective": "",
     "hasBasicMode": true,
-    "basicModeDirective": "tb-flot-basic-config",
-    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Switch 1\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false,\"axisPosition\":\"left\",\"showSeparateAxis\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"return Math.random() > 0.5 ? 1 : 0;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Switch 2\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false,\"axisPosition\":\"left\"},\"_hash\":0.12775350966079668,\"funcBody\":\"return Math.random() <= 0.5 ? 1 : 0;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"stack\":false,\"fontSize\":10,\"fontColor\":\"#545454\",\"showTooltip\":true,\"tooltipIndividual\":false,\"tooltipCumulative\":false,\"hideZeros\":false,\"tooltipValueFormatter\":\"if (value > 0 && value <= 1) {\\n    return 'On';\\n} else if (value === 0) {\\n    return 'Off';\\n} else {\\n    return '';\\n}\",\"grid\":{\"verticalLines\":true,\"horizontalLines\":true,\"outlineWidth\":1,\"color\":\"#545454\",\"backgroundColor\":null,\"tickColor\":\"#DDDDDD\"},\"xaxis\":{\"title\":null,\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"min\":0,\"max\":1.2,\"title\":null,\"showLabels\":true,\"color\":\"#545454\",\"tickSize\":null,\"tickDecimals\":0,\"ticksFormatter\":\"if (value > 0 && value <= 1) {\\n    return 'On';\\n} else if (value === 0) {\\n    return 'Off';\\n} else {\\n    return '';\\n}\"},\"shadowSize\":4,\"smoothLines\":false,\"comparisonEnabled\":false,\"timeForComparison\":\"previousInterval\",\"comparisonCustomIntervalValue\":7200000,\"xaxisSecond\":{\"axisPosition\":\"top\",\"title\":null,\"showLabels\":true},\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"right\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":false,\"showTotal\":false,\"showLatest\":false},\"customLegendEnabled\":false,\"dataKeysListForLabels\":[]},\"title\":\"State Chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null,\"widgetStyle\":{},\"useDashboardTimewindow\":true,\"showLegend\":true,\"actions\":{},\"configMode\":\"basic\",\"showTitleIcon\":false,\"titleIcon\":\"waterfall_chart\",\"iconColor\":\"#1F6BDD\"}"
+    "basicModeDirective": "tb-time-series-chart-basic-config",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Switch 1\",\"color\":\"#2196f3\",\"settings\":{\"yAxisId\":\"default\",\"showInLegend\":true,\"dataHiddenByDefault\":false,\"type\":\"line\",\"lineSettings\":{\"showLine\":true,\"step\":true,\"stepType\":\"end\",\"smooth\":false,\"lineType\":\"solid\",\"lineWidth\":2,\"showPoints\":false,\"showPointLabel\":false,\"pointLabelPosition\":\"top\",\"pointLabelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"pointLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"enablePointLabelBackground\":false,\"pointLabelBackground\":\"rgba(255,255,255,0.56)\",\"pointShape\":\"circle\",\"pointSize\":12,\"fillAreaSettings\":{\"type\":\"opacity\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}},\"barSettings\":{\"showBorder\":false,\"borderWidth\":2,\"borderRadius\":0,\"showLabel\":false,\"labelPosition\":\"top\",\"labelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.76)\",\"enableLabelBackground\":false,\"labelBackground\":\"rgba(255,255,255,0.56)\",\"backgroundSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}},\"tooltipValueFormatter\":\"\"},\"_hash\":0.676226248393859,\"funcBody\":\"return Math.random() > 0.5 ? true : false;\",\"decimals\":0,\"aggregationType\":null,\"usePostProcessing\":null,\"postFuncBody\":null,\"units\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Switch 2\",\"color\":\"#FFC107\",\"settings\":{\"yAxisId\":\"default\",\"showInLegend\":true,\"dataHiddenByDefault\":false,\"type\":\"line\",\"lineSettings\":{\"showLine\":true,\"step\":true,\"stepType\":\"end\",\"smooth\":false,\"lineType\":\"solid\",\"lineWidth\":2,\"showPoints\":false,\"showPointLabel\":false,\"pointLabelPosition\":\"top\",\"pointLabelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"pointLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"enablePointLabelBackground\":false,\"pointLabelBackground\":\"rgba(255,255,255,0.56)\",\"pointShape\":\"circle\",\"pointSize\":12,\"fillAreaSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}},\"barSettings\":{\"showBorder\":false,\"borderWidth\":2,\"borderRadius\":0,\"showLabel\":false,\"labelPosition\":\"top\",\"labelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.76)\",\"enableLabelBackground\":false,\"labelBackground\":\"rgba(255,255,255,0.56)\",\"backgroundSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}},\"tooltipValueFormatter\":null},\"_hash\":0.1106990458957191,\"funcBody\":\"return Math.random() <= 0.5 ? true : false;\",\"decimals\":0,\"aggregationType\":null,\"usePostProcessing\":null,\"postFuncBody\":null,\"units\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]},\"latestDataKeys\":null}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":0,\"realtime\":{\"realtimeType\":0,\"timewindowMs\":60000,\"quickInterval\":\"CURRENT_DAY\",\"interval\":1000},\"aggregation\":{\"type\":\"NONE\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"yAxes\":{\"default\":{\"units\":null,\"decimals\":0,\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"left\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"ticksFormatter\":\"\",\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\",\"id\":\"default\",\"order\":0,\"interval\":null,\"splitNumber\":null,\"min\":null,\"max\":null,\"ticksGenerator\":\"\"}},\"thresholds\":[],\"dataZoom\":true,\"stack\":false,\"xAxis\":{\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"bottom\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":10,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"ticksFormat\":{},\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\"},\"noAggregationBarWidthSettings\":{\"strategy\":\"group\",\"groupWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000},\"barWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000}},\"showLegend\":true,\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"legendConfig\":{\"direction\":\"column\",\"position\":\"right\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":false,\"showTotal\":false,\"showLatest\":false},\"showTooltip\":true,\"tooltipTrigger\":\"axis\",\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipValueFormatter\":\"\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{\"millisecond\":\"MMM dd yyyy HH:mm:ss\"}},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipDateInterval\":true,\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"animation\":{\"animation\":true,\"animationThreshold\":2000,\"animationDuration\":500,\"animationEasing\":\"cubicOut\",\"animationDelay\":0,\"animationDurationUpdate\":300,\"animationEasingUpdate\":\"cubicOut\",\"animationDelayUpdate\":0},\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"padding\":\"12px\",\"states\":[{\"label\":\"Off\",\"value\":0,\"sourceType\":\"constant\",\"sourceValue\":false},{\"label\":\"On\",\"value\":1,\"sourceType\":\"constant\",\"sourceValue\":true}]},\"title\":\"State chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"#1F6BDD\",\"useDashboardTimewindow\":false,\"displayTimewindow\":true,\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"units\":\"\",\"decimals\":null,\"noDataDisplayMessage\":\"\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"margin\":\"0px\",\"borderRadius\":\"0px\",\"iconSize\":\"0px\"}"
   },
-  "externalId": null,
-  "tags": null
+  "tags": [
+    "chart",
+    "time series",
+    "time-series",
+    "state",
+    "state chart",
+    "online",
+    "offline"
+  ]
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/state_chart_deprecated.json b/application/src/main/data/json/system/widget_types/state_chart_deprecated.json
new file mode 100644
index 0000000000..90fc886d62
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/state_chart_deprecated.json
@@ -0,0 +1,25 @@
+{
+  "fqn": "charts.state_chart",
+  "name": "State Chart",
+  "deprecated": true,
+  "image": "tb-image:c3RhdGVfY2hhcnRfc3lzdGVtX3dpZGdldF9pbWFnZS5wbmc=:IlN0YXRlIENoYXJ0IiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAB9VBMVEUAAAAhlvMilvMymeE+nNVDoetInslNq/VZqOdpuPd3d3d5p5Z5suB6enp8fHyBgYGDg4ODqoqEhISIiIiKioqKuN2MjIyNjY2Ojo6QkJCRkZGSkpKUlJSVlZWWlpaXl5eYmJiZmZmampqcnJydnZ2enp6goKCgr3KhoaGioqKisXSjo6OjvsmkpKSlpaWlwdempqanp6eoqKiosGOo1vqpqampsGOqqqqqsWOrq6usrKysw9Wurq6wsLCysrK0tLS1tbW1wbK2tra3t7e4wau5ubm6urq7u7u8vLy9vb2+vr6/xbTAwMDAxbjCwsLC3ejDw8PExMTFxcXGxsbHx8fIv3jIyMjJycnKysrK5vzMzc7Nzc3Ozs7Pz8/QuDnRzcHS0tLT09PT39HU1NTU6/3VzLLV1dXV3sjW1tbX19fYuTHY2NjZ2dna0Ira2trb29vc3Nzex4De3t7f39/guyvhvCfhvCvh4eHh6Nbi4uLjvCTj4+PkyXbk5OTlvCTm5ubm693o6Ojpxl7q6urr6+vswTTs7Ozt7e3uvhju7u7vvhjv7+/wvxjw8PDx8fHyvxX0yTv09PT19fX29vb39/f4wyL4+Pj5+fn6+vr75J37+/v8whP8/Pz9/f39/v/+/v7/wQf/xRb/3HT/5JH/9tz/++/////APs7XAAAAAWJLR0Smt7AblQAAA1RJREFUeNrt3dlT01AUBvAEd8UNl2oLrdrFolZArUul1hWlVhQXFAUF1xaxIqi4FUQUrDsUClZi4nb+Th96S9NQkjDOOKZ+3wuZw8md++M25OXMlKOccJQnTUYocdRqdw8UAqTfOjG4lvr7uowOqbtAtG6o5OiGFoNDapuJHO8tFK4xOKS9msTVgoUiaQjPclnSl01snZ/y4ly2yBNZbRarbc+3yvdpt/hLawOPJp9ur7O0mRiEmzFkY1M6N/4I8qJpulzR2sBx1sgRjQuyA2pk+STdylw2VqR/FPFfWdcCvjhduiM7kVF2db1Nuspu7JGes+I76SRba7f0Wfnn/6F6It+mfo7m8TvYvh7KTiT3PQIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggPwXkFa7e7AQIP3WiUFzdl7LuBDFvJZxIYp5LeNCFPNaBn7Yc+e1KlheSYcrFCniL7LZqPl8cbp0TjavNcqu9rZJB9gdPdIJVnwjbWG1ndI95UzWM9V5rS9Ti3P4VWy1+5jXAgQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAMK+FeS3Ma2FeC/NamNfCCxEQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBA/hZkTKSkwSGn7VUJOmOLV241NiRSRZ2uYcvt+Io+Y0N83USm+MqGWEnU2JCqXqI1ZE+QhYiIy36tXR5INpOQbB5kftcmK85mtdey2iJekeWqX6/3kc+TLCQTrq6eEuZCgKTsbnNXBsIZOERJMedNQnry73XpW8UAKVhIyBPScVfQE9RqEaP7iMT6g+pdw7vKbxKl3IJqV8K7OUqXPHvG9UMGykk2lz1d4g5yvNXo6QqZiA41aHT5OwQTUWBJSrWrvlMwj1jFU2f1Q8K1dCysCUmVhdenNLvMRKZt3hGNriEnxfxlGqt9aPYRkb9bP6Q1SMFrmltMukKuMT2QpckWjc/WhP2lYB/TgjzdHyCKVM/gGXnsp+qY5hbba+hIVA/ETL0+9SepsoNiTs/igGpXZIhKqVv9QVJARIfXIWqfiM1nS+qBnHdae1V7Qss8ngEijRO5a6sMCAtdqv+HfgPwpNPbU6ipOwAAAABJRU5ErkJggg==",
+  "description": "Displays changes to the state of the entity over time. For example, online and offline.",
+  "descriptor": {
+    "type": "timeseries",
+    "sizeX": 8,
+    "sizeY": 5,
+    "resources": [],
+    "templateHtml": "<tb-flot-widget \n    [ctx]=\"ctx\" chartType=\"state\">\n</tb-flot-widget>",
+    "templateCss": ".legend {\n    font-size: 13px;\n    line-height: 10px;\n}\n\n.legend table { \n    border-spacing: 0px;\n    border-collapse: separate;\n}\n\n.mouse-events .flot-overlay {\n    cursor: crosshair; \n}\n\n",
+    "controllerScript": "self.onInit = function() {\n}\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.flotWidget.onDataUpdated();\n}\n\nself.onLatestDataUpdated = function() {\n    self.ctx.$scope.flotWidget.onLatestDataUpdated();\n}\n\nself.onResize = function() {\n    self.ctx.$scope.flotWidget.onResize();\n}\n\nself.onEditModeChanged = function() {\n    self.ctx.$scope.flotWidget.onEditModeChanged();\n}\n\nself.onDestroy = function() {\n    self.ctx.$scope.flotWidget.onDestroy();\n}\n\nself.typeParameters = function() {\n    return {\n        stateData: true,\n        hasAdditionalLatestDataKeys: true,\n        defaultDataKeysFunction: function() {\n            return [{ name: 'temperature', label: 'Temperature', type: 'timeseries', units: '°C', decimals: 0 }];\n        }\n    };\n}\n\n",
+    "settingsSchema": "{}",
+    "dataKeySettingsSchema": "{}",
+    "settingsDirective": "tb-flot-line-widget-settings",
+    "dataKeySettingsDirective": "tb-flot-line-key-settings",
+    "latestDataKeySettingsDirective": "tb-flot-latest-key-settings",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-flot-basic-config",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Switch 1\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false,\"axisPosition\":\"left\",\"showSeparateAxis\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"return Math.random() > 0.5 ? 1 : 0;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Switch 2\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false,\"axisPosition\":\"left\"},\"_hash\":0.12775350966079668,\"funcBody\":\"return Math.random() <= 0.5 ? 1 : 0;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"stack\":false,\"fontSize\":10,\"fontColor\":\"#545454\",\"showTooltip\":true,\"tooltipIndividual\":false,\"tooltipCumulative\":false,\"hideZeros\":false,\"tooltipValueFormatter\":\"if (value > 0 && value <= 1) {\\n    return 'On';\\n} else if (value === 0) {\\n    return 'Off';\\n} else {\\n    return '';\\n}\",\"grid\":{\"verticalLines\":true,\"horizontalLines\":true,\"outlineWidth\":1,\"color\":\"#545454\",\"backgroundColor\":null,\"tickColor\":\"#DDDDDD\"},\"xaxis\":{\"title\":null,\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"min\":0,\"max\":1.2,\"title\":null,\"showLabels\":true,\"color\":\"#545454\",\"tickSize\":null,\"tickDecimals\":0,\"ticksFormatter\":\"if (value > 0 && value <= 1) {\\n    return 'On';\\n} else if (value === 0) {\\n    return 'Off';\\n} else {\\n    return '';\\n}\"},\"shadowSize\":4,\"smoothLines\":false,\"comparisonEnabled\":false,\"timeForComparison\":\"previousInterval\",\"comparisonCustomIntervalValue\":7200000,\"xaxisSecond\":{\"axisPosition\":\"top\",\"title\":null,\"showLabels\":true},\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"right\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":false,\"showTotal\":false,\"showLatest\":false},\"customLegendEnabled\":false,\"dataKeysListForLabels\":[]},\"title\":\"State Chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null,\"widgetStyle\":{},\"useDashboardTimewindow\":true,\"showLegend\":true,\"actions\":{},\"configMode\":\"basic\",\"showTitleIcon\":false,\"titleIcon\":\"waterfall_chart\",\"iconColor\":\"#1F6BDD\"}"
+  },
+  "tags": null
+}
\ No newline at end of file
diff --git a/application/src/main/data/upgrade/3.6.3/schema_update.sql b/application/src/main/data/upgrade/3.6.3/schema_update.sql
index d7d8887d13..3e0fdc3b4b 100644
--- a/application/src/main/data/upgrade/3.6.3/schema_update.sql
+++ b/application/src/main/data/upgrade/3.6.3/schema_update.sql
@@ -14,123 +14,14 @@
 -- limitations under the License.
 --
 
--- create new attribute_kv table schema
-DO
-$$
-    BEGIN
-        -- in case of running the upgrade script a second time:
-        IF EXISTS(SELECT 1 FROM information_schema.columns WHERE table_name = 'attribute_kv' and column_name='entity_type') THEN
-            DROP VIEW IF EXISTS device_info_view;
-            DROP VIEW IF EXISTS device_info_active_attribute_view;
-            ALTER INDEX IF EXISTS idx_attribute_kv_by_key_and_last_update_ts RENAME TO idx_attribute_kv_by_key_and_last_update_ts_old;
-            IF EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'attribute_kv_pkey') THEN
-                ALTER TABLE attribute_kv RENAME CONSTRAINT attribute_kv_pkey TO attribute_kv_pkey_old;
-            END IF;
-            ALTER TABLE attribute_kv RENAME TO attribute_kv_old;
-            CREATE TABLE IF NOT EXISTS attribute_kv
-            (
-                entity_id uuid,
-                attribute_type int,
-                attribute_key int,
-                bool_v boolean,
-                str_v varchar(10000000),
-                long_v bigint,
-                dbl_v double precision,
-                json_v json,
-                last_update_ts bigint,
-                CONSTRAINT attribute_kv_pkey PRIMARY KEY (entity_id, attribute_type, attribute_key)
-            );
-        END IF;
-    END;
-$$;
+-- NOTIFICATIONS UPDATE START
 
--- rename ts_kv_dictionary table to key_dictionary or create table if not exists
-DO
-$$
-    BEGIN
-        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'ts_kv_dictionary') THEN
-            ALTER TABLE ts_kv_dictionary RENAME CONSTRAINT ts_key_id_pkey TO key_dictionary_id_pkey;
-            ALTER TABLE ts_kv_dictionary RENAME TO key_dictionary;
-        ELSE CREATE TABLE IF NOT EXISTS key_dictionary(
-                key    varchar(255) NOT NULL,
-                key_id serial UNIQUE,
-                CONSTRAINT key_dictionary_id_pkey PRIMARY KEY (key)
-                );
-        END IF;
-    END;
-$$;
+ALTER TABLE notification ADD COLUMN IF NOT EXISTS delivery_method VARCHAR(50) NOT NULL default 'WEB';
 
--- insert keys into key_dictionary
-DO
-$$
-    BEGIN
-        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
-            INSERT INTO key_dictionary(key) SELECT DISTINCT attribute_key FROM attribute_kv_old ON CONFLICT DO NOTHING;
-        END IF;
-    END;
-$$;
+DROP INDEX IF EXISTS idx_notification_recipient_id_created_time;
+DROP INDEX IF EXISTS idx_notification_recipient_id_unread;
 
--- migrate attributes from attribute_kv_old to attribute_kv
-DO
-$$
-DECLARE
-    row_num_old integer;
-    row_num integer;
-BEGIN
-    IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
-        INSERT INTO attribute_kv(entity_id, attribute_type, attribute_key, bool_v, str_v, long_v, dbl_v, json_v, last_update_ts)
-            SELECT a.entity_id, CASE
-                        WHEN a.attribute_type = 'CLIENT_SCOPE' THEN 1
-                        WHEN a.attribute_type = 'SERVER_SCOPE' THEN 2
-                        WHEN a.attribute_type = 'SHARED_SCOPE' THEN 3
-                        ELSE 0
-                        END,
-                k.key_id,  a.bool_v, a.str_v, a.long_v, a.dbl_v, a.json_v, a.last_update_ts
-                FROM attribute_kv_old a INNER JOIN key_dictionary k ON (a.attribute_key = k.key);
-        SELECT COUNT(*) INTO row_num_old FROM attribute_kv_old;
-        SELECT COUNT(*) INTO row_num FROM attribute_kv;
-        RAISE NOTICE 'Migrated % of % rows', row_num, row_num_old;
+CREATE INDEX IF NOT EXISTS idx_notification_delivery_method_recipient_id_created_time ON notification(delivery_method, recipient_id, created_time DESC);
+CREATE INDEX IF NOT EXISTS idx_notification_delivery_method_recipient_id_unread ON notification(delivery_method, recipient_id) WHERE status <> 'READ';
 
-        IF row_num != 0 THEN
-            DROP TABLE IF EXISTS attribute_kv_old;
-        ELSE
-           RAISE EXCEPTION 'Table attribute_kv is empty';
-        END IF;
-
-        CREATE INDEX IF NOT EXISTS idx_attribute_kv_by_key_and_last_update_ts ON attribute_kv(entity_id, attribute_key, last_update_ts desc);
-    END IF;
-EXCEPTION
-    WHEN others THEN
-        ROLLBACK;
-        RAISE EXCEPTION 'Error during COPY: %', SQLERRM;
-END
-$$;
-
--- OAUTH2 PARAMS ALTER TABLE START
-
-ALTER TABLE oauth2_params
-    ADD COLUMN IF NOT EXISTS edge_enabled boolean DEFAULT false;
-
--- OAUTH2 PARAMS ALTER TABLE END
-
--- QUEUE STATS UPDATE START
-
-CREATE TABLE IF NOT EXISTS queue_stats (
-    id uuid NOT NULL CONSTRAINT queue_stats_pkey PRIMARY KEY,
-    created_time bigint NOT NULL,
-    tenant_id uuid NOT NULL,
-    queue_name varchar(255) NOT NULL,
-    service_id varchar(255) NOT NULL,
-    CONSTRAINT queue_stats_name_unq_key UNIQUE (tenant_id, queue_name, service_id)
-);
-
-INSERT INTO queue_stats
-    SELECT id, created_time, tenant_id, substring(name FROM 1 FOR position('_' IN name) - 1) AS queue_name,
-           substring(name FROM position('_' IN name) + 1) AS service_id
-    FROM asset
-    WHERE type = 'TbServiceQueue' and name LIKE '%\_%';
-
-DELETE FROM asset WHERE type='TbServiceQueue';
-DELETE FROM asset_profile WHERE name ='TbServiceQueue';
-
--- QUEUE STATS UPDATE END
+-- NOTIFICATIONS UPDATE END
diff --git a/application/src/main/data/upgrade/3.6.4/schema_update.sql b/application/src/main/data/upgrade/3.6.4/schema_update.sql
new file mode 100644
index 0000000000..d7d8887d13
--- /dev/null
+++ b/application/src/main/data/upgrade/3.6.4/schema_update.sql
@@ -0,0 +1,136 @@
+--
+-- Copyright © 2016-2024 The Thingsboard Authors
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+-- create new attribute_kv table schema
+DO
+$$
+    BEGIN
+        -- in case of running the upgrade script a second time:
+        IF EXISTS(SELECT 1 FROM information_schema.columns WHERE table_name = 'attribute_kv' and column_name='entity_type') THEN
+            DROP VIEW IF EXISTS device_info_view;
+            DROP VIEW IF EXISTS device_info_active_attribute_view;
+            ALTER INDEX IF EXISTS idx_attribute_kv_by_key_and_last_update_ts RENAME TO idx_attribute_kv_by_key_and_last_update_ts_old;
+            IF EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'attribute_kv_pkey') THEN
+                ALTER TABLE attribute_kv RENAME CONSTRAINT attribute_kv_pkey TO attribute_kv_pkey_old;
+            END IF;
+            ALTER TABLE attribute_kv RENAME TO attribute_kv_old;
+            CREATE TABLE IF NOT EXISTS attribute_kv
+            (
+                entity_id uuid,
+                attribute_type int,
+                attribute_key int,
+                bool_v boolean,
+                str_v varchar(10000000),
+                long_v bigint,
+                dbl_v double precision,
+                json_v json,
+                last_update_ts bigint,
+                CONSTRAINT attribute_kv_pkey PRIMARY KEY (entity_id, attribute_type, attribute_key)
+            );
+        END IF;
+    END;
+$$;
+
+-- rename ts_kv_dictionary table to key_dictionary or create table if not exists
+DO
+$$
+    BEGIN
+        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'ts_kv_dictionary') THEN
+            ALTER TABLE ts_kv_dictionary RENAME CONSTRAINT ts_key_id_pkey TO key_dictionary_id_pkey;
+            ALTER TABLE ts_kv_dictionary RENAME TO key_dictionary;
+        ELSE CREATE TABLE IF NOT EXISTS key_dictionary(
+                key    varchar(255) NOT NULL,
+                key_id serial UNIQUE,
+                CONSTRAINT key_dictionary_id_pkey PRIMARY KEY (key)
+                );
+        END IF;
+    END;
+$$;
+
+-- insert keys into key_dictionary
+DO
+$$
+    BEGIN
+        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
+            INSERT INTO key_dictionary(key) SELECT DISTINCT attribute_key FROM attribute_kv_old ON CONFLICT DO NOTHING;
+        END IF;
+    END;
+$$;
+
+-- migrate attributes from attribute_kv_old to attribute_kv
+DO
+$$
+DECLARE
+    row_num_old integer;
+    row_num integer;
+BEGIN
+    IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
+        INSERT INTO attribute_kv(entity_id, attribute_type, attribute_key, bool_v, str_v, long_v, dbl_v, json_v, last_update_ts)
+            SELECT a.entity_id, CASE
+                        WHEN a.attribute_type = 'CLIENT_SCOPE' THEN 1
+                        WHEN a.attribute_type = 'SERVER_SCOPE' THEN 2
+                        WHEN a.attribute_type = 'SHARED_SCOPE' THEN 3
+                        ELSE 0
+                        END,
+                k.key_id,  a.bool_v, a.str_v, a.long_v, a.dbl_v, a.json_v, a.last_update_ts
+                FROM attribute_kv_old a INNER JOIN key_dictionary k ON (a.attribute_key = k.key);
+        SELECT COUNT(*) INTO row_num_old FROM attribute_kv_old;
+        SELECT COUNT(*) INTO row_num FROM attribute_kv;
+        RAISE NOTICE 'Migrated % of % rows', row_num, row_num_old;
+
+        IF row_num != 0 THEN
+            DROP TABLE IF EXISTS attribute_kv_old;
+        ELSE
+           RAISE EXCEPTION 'Table attribute_kv is empty';
+        END IF;
+
+        CREATE INDEX IF NOT EXISTS idx_attribute_kv_by_key_and_last_update_ts ON attribute_kv(entity_id, attribute_key, last_update_ts desc);
+    END IF;
+EXCEPTION
+    WHEN others THEN
+        ROLLBACK;
+        RAISE EXCEPTION 'Error during COPY: %', SQLERRM;
+END
+$$;
+
+-- OAUTH2 PARAMS ALTER TABLE START
+
+ALTER TABLE oauth2_params
+    ADD COLUMN IF NOT EXISTS edge_enabled boolean DEFAULT false;
+
+-- OAUTH2 PARAMS ALTER TABLE END
+
+-- QUEUE STATS UPDATE START
+
+CREATE TABLE IF NOT EXISTS queue_stats (
+    id uuid NOT NULL CONSTRAINT queue_stats_pkey PRIMARY KEY,
+    created_time bigint NOT NULL,
+    tenant_id uuid NOT NULL,
+    queue_name varchar(255) NOT NULL,
+    service_id varchar(255) NOT NULL,
+    CONSTRAINT queue_stats_name_unq_key UNIQUE (tenant_id, queue_name, service_id)
+);
+
+INSERT INTO queue_stats
+    SELECT id, created_time, tenant_id, substring(name FROM 1 FOR position('_' IN name) - 1) AS queue_name,
+           substring(name FROM position('_' IN name) + 1) AS service_id
+    FROM asset
+    WHERE type = 'TbServiceQueue' and name LIKE '%\_%';
+
+DELETE FROM asset WHERE type='TbServiceQueue';
+DELETE FROM asset_profile WHERE name ='TbServiceQueue';
+
+-- QUEUE STATS UPDATE END
diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
index 640d47362a..f411344e3f 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
+++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
@@ -19,6 +19,8 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -116,9 +118,6 @@ import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 import org.thingsboard.server.service.transport.TbCoreToTransportService;
 
-import jakarta.annotation.Nullable;
-import jakarta.annotation.PostConstruct;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
index 51205e97c9..87d5c8a63a 100644
--- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
@@ -43,7 +43,6 @@ import org.thingsboard.server.common.data.id.RpcId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.AttributeKey;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
-import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.SortOrder;
@@ -74,8 +73,6 @@ import org.thingsboard.server.gen.transport.TransportProtos.ClaimDeviceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.DeviceSessionsCacheEntry;
 import org.thingsboard.server.gen.transport.TransportProtos.GetAttributeRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetAttributeResponseMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.KeyValueProto;
-import org.thingsboard.server.gen.transport.TransportProtos.KeyValueType;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionCloseNotificationProto;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionEvent;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionEventMsg;
@@ -254,14 +251,12 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
     }
 
     private boolean isSendNewRpcAvailable() {
-        switch (rpcSubmitStrategy) {
-            case SEQUENTIAL_ON_ACK_FROM_DEVICE:
-                return toDeviceRpcPendingMap.values().stream().filter(md -> !md.isDelivered()).findAny().isEmpty();
-            case SEQUENTIAL_ON_RESPONSE_FROM_DEVICE:
-                return toDeviceRpcPendingMap.values().stream().filter(ToDeviceRpcRequestMetadata::isDelivered).findAny().isEmpty();
-            default:
-                return true;
-        }
+        return switch (rpcSubmitStrategy) {
+            case SEQUENTIAL_ON_ACK_FROM_DEVICE -> toDeviceRpcPendingMap.values().stream().filter(md -> !md.isDelivered()).findAny().isEmpty();
+            case SEQUENTIAL_ON_RESPONSE_FROM_DEVICE ->
+                    toDeviceRpcPendingMap.values().stream().filter(ToDeviceRpcRequestMetadata::isDelivered).findAny().isEmpty();
+            default -> true;
+        };
     }
 
     private void createRpc(ToDeviceRpcRequest request, RpcStatus status) {
@@ -465,7 +460,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
             handleSessionActivity(sessionInfo, msg.getSubscriptionInfo());
         }
         if (msg.hasClaimDevice()) {
-            handleClaimDeviceMsg(msg.getClaimDevice());
+            handleClaimDeviceMsg(sessionInfo, msg.getClaimDevice());
         }
         if (msg.hasRpcResponseStatusMsg()) {
             processRpcResponseStatus(sessionInfo, msg.getRpcResponseStatusMsg());
@@ -490,9 +485,22 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
                 });
     }
 
-    private void handleClaimDeviceMsg(ClaimDeviceMsg msg) {
+    private void handleClaimDeviceMsg(SessionInfoProto sessionInfo, ClaimDeviceMsg msg) {
+        UUID sessionId = getSessionId(sessionInfo);
         DeviceId deviceId = new DeviceId(new UUID(msg.getDeviceIdMSB(), msg.getDeviceIdLSB()));
-        systemContext.getClaimDevicesService().registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
+        ListenableFuture<Void> registrationFuture = systemContext.getClaimDevicesService()
+                        .registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
+        Futures.addCallback(registrationFuture, new FutureCallback<>() {
+            @Override
+            public void onSuccess(Void result) {
+                log.debug("[{}][{}] Successfully processed register claiming info request!", sessionId, deviceId);
+            }
+
+            @Override
+            public void onFailure(Throwable t) {
+                log.error("[{}][{}] Failed to process register claiming info request due to: ", sessionId, deviceId, t);
+            }
+        }, MoreExecutors.directExecutor());
     }
 
     private void reportSessionOpen() {
@@ -927,34 +935,6 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         return systemContext.getEdgeEventService().saveAsync(edgeEvent);
     }
 
-    private KeyValueProto toKeyValueProto(KvEntry kvEntry) {
-        KeyValueProto.Builder builder = KeyValueProto.newBuilder();
-        builder.setKey(kvEntry.getKey());
-        switch (kvEntry.getDataType()) {
-            case BOOLEAN:
-                builder.setType(KeyValueType.BOOLEAN_V);
-                builder.setBoolV(kvEntry.getBooleanValue().get());
-                break;
-            case DOUBLE:
-                builder.setType(KeyValueType.DOUBLE_V);
-                builder.setDoubleV(kvEntry.getDoubleValue().get());
-                break;
-            case LONG:
-                builder.setType(KeyValueType.LONG_V);
-                builder.setLongV(kvEntry.getLongValue().get());
-                break;
-            case STRING:
-                builder.setType(KeyValueType.STRING_V);
-                builder.setStringV(kvEntry.getStrValue().get());
-                break;
-            case JSON:
-                builder.setType(KeyValueType.JSON_V);
-                builder.setJsonV(kvEntry.getJsonValue().get());
-                break;
-        }
-        return builder.build();
-    }
-
     void restoreSessions() {
         if (systemContext.isLocalCacheType()) {
             return;
diff --git a/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java b/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
index 93e8c0be90..3df3d6887a 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
@@ -122,15 +122,9 @@ public abstract class AbstractRpcController extends BaseController {
             logRpcCall(rpcRequest, rpcError, null);
             RpcError error = rpcError.get();
             switch (error) {
-                case TIMEOUT:
-                    responseWriter.setResult(new ResponseEntity<>(timeoutStatus));
-                    break;
-                case NO_ACTIVE_CONNECTION:
-                    responseWriter.setResult(new ResponseEntity<>(noActiveConnectionStatus));
-                    break;
-                default:
-                    responseWriter.setResult(new ResponseEntity<>(timeoutStatus));
-                    break;
+                case TIMEOUT -> responseWriter.setResult(new ResponseEntity<>(timeoutStatus));
+                case NO_ACTIVE_CONNECTION -> responseWriter.setResult(new ResponseEntity<>(noActiveConnectionStatus));
+                default -> responseWriter.setResult(new ResponseEntity<>(timeoutStatus));
             }
         } else {
             Optional<String> responseData = response.getResponse();
diff --git a/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
index 595d6feef1..5271de2329 100644
--- a/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
@@ -68,7 +68,7 @@ public class ComponentDescriptorController extends BaseController {
     @RequestMapping(value = "/components/{componentType}", method = RequestMethod.GET)
     @ResponseBody
     public List<ComponentDescriptor> getComponentDescriptorsByType(
-            @Parameter(description = "Type of the Rule Node", schema = @Schema(allowableValues = "ENRICHMENT,FILTER,TRANSFORMATION,ACTION,EXTERNAL", required = true))
+            @Parameter(description = "Type of the Rule Node", schema = @Schema(allowableValues = "ENRICHMENT,FILTER,TRANSFORMATION,ACTION,EXTERNAL", requiredMode = Schema.RequiredMode.REQUIRED))
             @PathVariable("componentType") String strComponentType,
             @Parameter(description = "Type of the Rule Chain", schema = @Schema(allowableValues = "CORE,EDGE"))
             @RequestParam(value = "ruleChainType", required = false) String strRuleChainType) throws ThingsboardException {
diff --git a/application/src/main/java/org/thingsboard/server/controller/NotificationController.java b/application/src/main/java/org/thingsboard/server/controller/NotificationController.java
index 55f4e6d9fa..96f38daf35 100644
--- a/application/src/main/java/org/thingsboard/server/controller/NotificationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/NotificationController.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.controller;
 
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -105,6 +106,8 @@ public class NotificationController extends BaseController {
     private final NotificationCenter notificationCenter;
     private final NotificationSettingsService notificationSettingsService;
 
+    private static final String DELIVERY_METHOD_ALLOWABLE_VALUES = "WEB,MOBILE_APP";
+
     @ApiOperation(value = "Get notifications (getNotifications)",
             notes = "Returns the page of notifications for current user." + NEW_LINE +
                     PAGE_DATA_PARAMETERS +
@@ -172,10 +175,23 @@ public class NotificationController extends BaseController {
                                                    @RequestParam(required = false) String sortOrder,
                                                    @Parameter(description = "To search for unread notifications only")
                                                    @RequestParam(defaultValue = "false") boolean unreadOnly,
+                                                   @Parameter(description = "Delivery method", schema = @Schema(allowableValues = {DELIVERY_METHOD_ALLOWABLE_VALUES}))
+                                                   @RequestParam(defaultValue = "WEB") NotificationDeliveryMethod deliveryMethod,
                                                    @AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
         // no permissions
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
-        return notificationService.findNotificationsByRecipientIdAndReadStatus(user.getTenantId(), user.getId(), unreadOnly, pageLink);
+        return notificationService.findNotificationsByRecipientIdAndReadStatus(user.getTenantId(), deliveryMethod, user.getId(), unreadOnly, pageLink);
+    }
+
+    @ApiOperation(value = "Get unread notifications count (getUnreadNotificationsCount)",
+            notes = "Returns unread notifications count for chosen delivery method." +
+                    AVAILABLE_FOR_ANY_AUTHORIZED_USER)
+    @GetMapping("/notifications/unread/count")
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
+    public Integer getUnreadNotificationsCount(@Parameter(description = "Delivery method", schema = @Schema(allowableValues = {DELIVERY_METHOD_ALLOWABLE_VALUES}))
+                                               @RequestParam(defaultValue = "MOBILE_APP") NotificationDeliveryMethod deliveryMethod,
+                                               @AuthenticationPrincipal SecurityUser user) {
+        return notificationService.countUnreadNotificationsByRecipientId(user.getTenantId(), deliveryMethod, user.getId());
     }
 
     @ApiOperation(value = "Mark notification as read (markNotificationAsRead)",
@@ -195,9 +211,11 @@ public class NotificationController extends BaseController {
                     AVAILABLE_FOR_ANY_AUTHORIZED_USER)
     @PutMapping("/notifications/read")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    public void markAllNotificationsAsRead(@AuthenticationPrincipal SecurityUser user) {
+    public void markAllNotificationsAsRead(@Parameter(description = "Delivery method", schema = @Schema(allowableValues = {DELIVERY_METHOD_ALLOWABLE_VALUES}))
+                                           @RequestParam(defaultValue = "WEB") NotificationDeliveryMethod deliveryMethod,
+                                           @AuthenticationPrincipal SecurityUser user) {
         // no permissions
-        notificationCenter.markAllNotificationsAsRead(user.getTenantId(), user.getId());
+        notificationCenter.markAllNotificationsAsRead(user.getTenantId(), deliveryMethod, user.getId());
     }
 
     @ApiOperation(value = "Delete notification (deleteNotification)",
diff --git a/application/src/main/java/org/thingsboard/server/controller/QueueController.java b/application/src/main/java/org/thingsboard/server/controller/QueueController.java
index 089ba9bcca..6b90f8f8fd 100644
--- a/application/src/main/java/org/thingsboard/server/controller/QueueController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/QueueController.java
@@ -67,7 +67,7 @@ public class QueueController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @RequestMapping(value = "/queues", params = {"serviceType", "pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
-    public PageData<Queue> getTenantQueuesByServiceType(@Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, required = true))
+    public PageData<Queue> getTenantQueuesByServiceType(@Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, requiredMode = Schema.RequiredMode.REQUIRED))
                                                         @RequestParam String serviceType,
                                                         @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                         @RequestParam int pageSize,
@@ -126,7 +126,7 @@ public class QueueController extends BaseController {
     @ResponseBody
     public Queue saveQueue(@Parameter(description = "A JSON value representing the queue.")
                            @RequestBody Queue queue,
-                           @Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, required = true))
+                           @Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, requiredMode = Schema.RequiredMode.REQUIRED))
                            @RequestParam String serviceType) throws ThingsboardException {
         checkParameter("serviceType", serviceType);
         queue.setTenantId(getCurrentUser().getTenantId());
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 8d51daab8b..680633e103 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
@@ -47,8 +47,8 @@ import org.thingsboard.server.actors.tenant.DebugTbRateLimits;
 import org.thingsboard.server.common.data.EventInfo;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.edge.Edge;
-import org.thingsboard.server.common.data.event.EventType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.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;
@@ -80,6 +80,7 @@ import org.thingsboard.server.service.security.permission.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
@@ -340,18 +341,8 @@ public class RuleChainController extends BaseController {
         RuleNodeId ruleNodeId = new RuleNodeId(toUUID(strRuleNodeId));
         checkRuleNode(ruleNodeId, Operation.READ);
         TenantId tenantId = getCurrentUser().getTenantId();
-        List<EventInfo> events = eventService.findLatestEvents(tenantId, ruleNodeId, EventType.DEBUG_RULE_NODE, 2);
-        JsonNode result = null;
-        if (events != null) {
-            for (EventInfo event : events) {
-                JsonNode body = event.getBody();
-                if (body.has("type") && body.get("type").asText().equals("IN")) {
-                    result = body;
-                    break;
-                }
-            }
-        }
-        return result;
+        return Optional.ofNullable(eventService.findLatestDebugRuleNodeInEvent(tenantId, ruleNodeId))
+                .map(EventInfo::getBody).orElse(null);
     }
 
     @ApiOperation(value = "Is TBEL script executor enabled",
diff --git a/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java b/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
index 1908459200..e646c34e4f 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
@@ -268,9 +268,9 @@ public class TbResourceController extends BaseController {
                     "You can specify parameters to filter the results. " + LWM2M_OBJECT_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @GetMapping(value = "/resource/lwm2m")
-    public List<LwM2mObject> getLwm2mListObjects(@Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}, required = true))
+    public List<LwM2mObject> getLwm2mListObjects(@Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}, requiredMode = Schema.RequiredMode.REQUIRED))
                                                  @RequestParam String sortOrder,
-                                                 @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"id", "name"}, required = true))
+                                                 @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"id", "name"}, requiredMode = Schema.RequiredMode.REQUIRED))
                                                  @RequestParam String sortProperty,
                                                  @Parameter(description = "LwM2M Object ids.", required = true)
                                                  @RequestParam(required = false) String[] objectIds) throws ThingsboardException {
@@ -315,4 +315,4 @@ public class TbResourceController extends BaseController {
                 .body(resource);
     }
 
-}
\ No newline at end of file
+}
diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
index c73ac09cf1..cea449af31 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
@@ -25,7 +25,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
 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 io.swagger.v3.oas.annotations.responses.ApiResponses;
@@ -36,7 +35,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -49,9 +47,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
-import org.thingsboard.server.common.data.kv.AggregationParams;
-import org.thingsboard.server.common.data.kv.IntervalType;
-import org.thingsboard.server.common.msg.rule.engine.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
@@ -65,6 +60,7 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UUIDBased;
 import org.thingsboard.server.common.data.kv.Aggregation;
+import org.thingsboard.server.common.data.kv.AggregationParams;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BaseDeleteTsKvQuery;
@@ -74,6 +70,7 @@ import org.thingsboard.server.common.data.kv.BooleanDataEntry;
 import org.thingsboard.server.common.data.kv.DataType;
 import org.thingsboard.server.common.data.kv.DeleteTsKvQuery;
 import org.thingsboard.server.common.data.kv.DoubleDataEntry;
+import org.thingsboard.server.common.data.kv.IntervalType;
 import org.thingsboard.server.common.data.kv.JsonDataEntry;
 import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
@@ -239,7 +236,7 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> getAttributesByScope(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, required = true)) @PathVariable("scope") AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope") AttributeScope scope,
             @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
         SecurityUser user = getCurrentUser();
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
@@ -356,7 +353,7 @@ public class TelemetryController extends BaseController {
     @ResponseBody
     public DeferredResult<ResponseEntity> saveDeviceAttributes(
             @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable("deviceId") String deviceIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, required = true)) @PathVariable("scope") AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope") AttributeScope scope,
             @io.swagger.v3.oas.annotations.parameters.RequestBody(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
         return saveAttributes(getTenantId(), entityId, scope, request);
@@ -379,7 +376,7 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityAttributesV1(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"})) @PathVariable("scope")AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"})) @PathVariable("scope") AttributeScope scope,
             @io.swagger.v3.oas.annotations.parameters.RequestBody(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return saveAttributes(getTenantId(), entityId, scope, request);
@@ -402,7 +399,7 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityAttributesV2(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, required = true)) @PathVariable("scope")AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope")AttributeScope scope,
             @io.swagger.v3.oas.annotations.parameters.RequestBody(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return saveAttributes(getTenantId(), entityId, scope, request);
@@ -553,7 +550,7 @@ public class TelemetryController extends BaseController {
     @ResponseBody
     public DeferredResult<ResponseEntity> deleteDeviceAttributes(
             @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable(DEVICE_ID) String deviceIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, required = true)) @PathVariable("scope")AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope")AttributeScope scope,
                     @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION, required = true)@RequestParam(name = "keys")String keysStr) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
         return deleteAttributes(entityId, scope, keysStr);
@@ -918,4 +915,5 @@ public class TelemetryController extends BaseController {
         }
         return entry.getValue();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthConfigController.java b/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthConfigController.java
index 7468e683ab..01487b20a0 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthConfigController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthConfigController.java
@@ -100,7 +100,7 @@ public class TwoFactorAuthConfigController extends BaseController {
                     ControllerConstants.AVAILABLE_FOR_ANY_AUTHORIZED_USER)
     @PostMapping("/account/config/generate")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    public TwoFaAccountConfig generateTwoFaAccountConfig(@Parameter(description = "2FA provider type to generate new account config for", schema = @Schema(defaultValue = "TOTP", required = true))
+    public TwoFaAccountConfig generateTwoFaAccountConfig(@Parameter(description = "2FA provider type to generate new account config for", schema = @Schema(defaultValue = "TOTP", requiredMode = Schema.RequiredMode.REQUIRED))
                                                          @RequestParam TwoFaProviderType providerType) throws Exception {
         SecurityUser user = getCurrentUser();
         return twoFactorAuthService.generateNewAccountConfig(user, providerType);
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 63f85872d8..2eecd61798 100644
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -128,8 +128,11 @@ public class ThingsboardInstallService {
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.2");
                             systemDataLoaderService.updateDefaultNotificationConfigs(true);
                         case "3.6.3":
-                            log.info("Upgrading ThingsBoard from version 3.6.3 to 3.7.0 ...");
+                            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;
diff --git a/application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java b/application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
index 447c993e55..ab6d32fb44 100644
--- a/application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
@@ -250,7 +250,7 @@ public class EntityActionService {
         return result;
     }
 
-    private void addTimeseries(ObjectNode entityNode, List<TsKvEntry> timeseries) throws Exception {
+    private void addTimeseries(ObjectNode entityNode, List<TsKvEntry> timeseries) {
         if (timeseries != null && !timeseries.isEmpty()) {
             ArrayNode result = entityNode.putArray("timeseries");
             Map<Long, List<TsKvEntry>> groupedTelemetry = timeseries.stream()
diff --git a/application/src/main/java/org/thingsboard/server/service/device/ClaimDevicesServiceImpl.java b/application/src/main/java/org/thingsboard/server/service/device/ClaimDevicesServiceImpl.java
index 974bc06a40..a77b7d0874 100644
--- a/application/src/main/java/org/thingsboard/server/service/device/ClaimDevicesServiceImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/device/ClaimDevicesServiceImpl.java
@@ -20,6 +20,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
+import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -28,7 +29,6 @@ import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
-import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
@@ -51,9 +51,7 @@ import org.thingsboard.server.dao.device.claim.ReclaimResult;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
-import jakarta.annotation.Nullable;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -89,16 +87,16 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
         Device device = deviceService.findDeviceById(tenantId, deviceId);
         Cache cache = cacheManager.getCache(CLAIM_DEVICES_CACHE);
         List<Object> key = constructCacheKey(device.getId());
+        String deviceName = device.getName();
         if (isAllowedClaimingByDefault) {
             if (device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
                 persistInCache(secretKey, durationMs, cache, key);
                 return Futures.immediateFuture(null);
             }
-            log.warn("The device [{}] has been already claimed!", device.getName());
-            return Futures.immediateFailedFuture(new IllegalArgumentException());
+            return Futures.immediateFailedFuture(new IllegalArgumentException("Device [" + deviceName + "] has been already claimed!"));
         } else {
             ListenableFuture<List<AttributeKvEntry>> claimingAllowedFuture = attributesService.find(tenantId, device.getId(),
-                    AttributeScope.SERVER_SCOPE, Collections.singletonList(CLAIM_ATTRIBUTE_NAME));
+                    AttributeScope.SERVER_SCOPE, List.of(CLAIM_ATTRIBUTE_NAME));
             return Futures.transform(claimingAllowedFuture, list -> {
                 if (list != null && !list.isEmpty()) {
                     Optional<Boolean> claimingAllowedOptional = list.get(0).getBooleanValue();
@@ -108,8 +106,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
                         return null;
                     }
                 }
-                log.warn("Failed to find claimingAllowed attribute for device or it is already claimed![{}]", device.getName());
-                throw new IllegalArgumentException();
+                throw new IllegalArgumentException("Failed to find claimingAllowed attribute for device [" + deviceName + "] or it is already claimed!");
             }, MoreExecutors.directExecutor());
         }
     }
@@ -182,7 +179,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
             }
             SettableFuture<ReclaimResult> result = SettableFuture.create();
             telemetryService.saveAndNotify(
-                    tenantId, savedDevice.getId(), AttributeScope.SERVER_SCOPE, Collections.singletonList(
+                    tenantId, savedDevice.getId(), AttributeScope.SERVER_SCOPE, List.of(
                             new BaseAttributeKvEntry(new BooleanDataEntry(CLAIM_ATTRIBUTE_NAME, true), System.currentTimeMillis())
                     ),
                     new FutureCallback<>() {
@@ -203,7 +200,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
     }
 
     private List<Object> constructCacheKey(DeviceId deviceId) {
-        return Collections.singletonList(deviceId);
+        return List.of(deviceId);
     }
 
     private void persistInCache(String secretKey, long durationMs, Cache cache, List<Object> key) {
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
index 75bb8e10e9..7d0a1aaa92 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
@@ -557,8 +557,7 @@ public final class EdgeGrpcSession implements Closeable {
                     }
                     case ATTRIBUTES_UPDATED, POST_ATTRIBUTES, ATTRIBUTES_DELETED, TIMESERIES_UPDATED ->
                             downlinkMsg = ctx.getTelemetryProcessor().convertTelemetryEventToDownlink(edge, edgeEvent);
-                    default ->
-                            log.warn("[{}][{}] Unsupported action type [{}]", this.tenantId, this.sessionId, edgeEvent.getAction());
+                    default -> log.warn("[{}][{}] Unsupported action type [{}]", this.tenantId, this.sessionId, edgeEvent.getAction());
                 }
             } catch (Exception e) {
                 log.error("[{}][{}] Exception during converting edge event to downlink msg", this.tenantId, this.sessionId, e);
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/BaseMsgConstructorFactory.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/BaseMsgConstructorFactory.java
index 5253e5ac33..dd76f97d8f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/BaseMsgConstructorFactory.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/BaseMsgConstructorFactory.java
@@ -31,16 +31,10 @@ public abstract class BaseMsgConstructorFactory<T extends MsgConstructor, U exte
     protected U v2Constructor;
 
     public MsgConstructor getMsgConstructorByEdgeVersion(EdgeVersion edgeVersion) {
-        switch (edgeVersion) {
-            case V_3_3_0:
-            case V_3_3_3:
-            case V_3_4_0:
-            case V_3_6_0:
-            case V_3_6_1:
-                return v1Constructor;
-            case V_3_6_2:
-            default:
-                return v2Constructor;
-        }
+        return switch (edgeVersion) {
+            case V_3_3_0, V_3_3_3, V_3_4_0, V_3_6_0, V_3_6_1 -> v1Constructor;
+            default -> v2Constructor;
+        };
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/BaseTelemetryProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/BaseTelemetryProcessor.java
index 2a9af53807..ae8c851a85 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/BaseTelemetryProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/BaseTelemetryProcessor.java
@@ -23,10 +23,13 @@ import com.google.common.util.concurrent.SettableFuture;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
@@ -53,7 +56,6 @@ import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
-import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.msg.rule.engine.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.server.common.transport.util.JsonUtils;
 import org.thingsboard.server.dao.model.ModelConstants;
@@ -66,8 +68,6 @@ import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.service.edge.rpc.processor.BaseEdgeProcessor;
 
-import jakarta.annotation.Nullable;
-import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -317,36 +317,22 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
                                                                   JsonNode body) {
         EntityId entityId;
         switch (entityType) {
-            case DEVICE:
-                entityId = new DeviceId(entityUUID);
-                break;
-            case ASSET:
-                entityId = new AssetId(entityUUID);
-                break;
-            case ENTITY_VIEW:
-                entityId = new EntityViewId(entityUUID);
-                break;
-            case DASHBOARD:
-                entityId = new DashboardId(entityUUID);
-                break;
-            case TENANT:
-                entityId = TenantId.fromUUID(entityUUID);
-                break;
-            case CUSTOMER:
-                entityId = new CustomerId(entityUUID);
-                break;
-            case USER:
-                entityId = new UserId(entityUUID);
-                break;
-            case EDGE:
-                entityId = new EdgeId(entityUUID);
-                break;
-            default:
+            case DEVICE -> entityId = new DeviceId(entityUUID);
+            case ASSET -> entityId = new AssetId(entityUUID);
+            case ENTITY_VIEW -> entityId = new EntityViewId(entityUUID);
+            case DASHBOARD -> entityId = new DashboardId(entityUUID);
+            case TENANT -> entityId = TenantId.fromUUID(entityUUID);
+            case CUSTOMER -> entityId = new CustomerId(entityUUID);
+            case USER -> entityId = new UserId(entityUUID);
+            case EDGE -> entityId = new EdgeId(entityUUID);
+            default -> {
                 log.warn("[{}] Unsupported edge event type [{}]", tenantId, entityType);
                 return null;
+            }
         }
         String bodyJackson = JacksonUtil.toString(body);
         return bodyJackson == null ? null :
                 entityDataMsgConstructor.constructEntityDataMsg(tenantId, entityId, actionType, JsonParser.parseString(bodyJackson));
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java b/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
index c699cd6c02..bc7dc62e78 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
@@ -69,80 +69,71 @@ public class EntityStateSourcingListener {
 
     @TransactionalEventListener(fallbackExecution = true)
     public void handleEvent(SaveEntityEvent<?> event) {
-        log.trace("[{}] SaveEntityEvent called: {}", event.getTenantId(), event);
         TenantId tenantId = event.getTenantId();
         EntityId entityId = event.getEntityId();
         EntityType entityType = entityId.getEntityType();
+        log.debug("[{}][{}][{}] Handling entity save event: {}", tenantId, entityType, entityId, event);
         boolean isCreated = event.getCreated() != null && event.getCreated();
         ComponentLifecycleEvent lifecycleEvent = isCreated ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED;
 
         switch (entityType) {
-            case ASSET:
-            case ASSET_PROFILE:
-            case ENTITY_VIEW:
-            case NOTIFICATION_RULE:
+            case ASSET, ASSET_PROFILE, ENTITY_VIEW, NOTIFICATION_RULE -> {
                 tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, lifecycleEvent);
-                break;
-            case RULE_CHAIN:
+            }
+            case RULE_CHAIN -> {
                 RuleChain ruleChain = (RuleChain) event.getEntity();
                 if (RuleChainType.CORE.equals(ruleChain.getType())) {
                     tbClusterService.broadcastEntityStateChangeEvent(ruleChain.getTenantId(), ruleChain.getId(), lifecycleEvent);
                 }
-                break;
-            case TENANT:
+            }
+            case TENANT -> {
                 Tenant tenant = (Tenant) event.getEntity();
                 onTenantUpdate(tenant, lifecycleEvent);
-                break;
-            case TENANT_PROFILE:
+            }
+            case TENANT_PROFILE -> {
                 TenantProfile tenantProfile = (TenantProfile) event.getEntity();
                 onTenantProfileUpdate(tenantProfile, lifecycleEvent);
-                break;
-            case DEVICE:
+            }
+            case DEVICE -> {
                 onDeviceUpdate(event.getEntity(), event.getOldEntity());
-                break;
-            case DEVICE_PROFILE:
+            }
+            case DEVICE_PROFILE -> {
                 DeviceProfile deviceProfile = (DeviceProfile) event.getEntity();
                 onDeviceProfileUpdate(deviceProfile, event.getOldEntity(), isCreated);
-                break;
-            case EDGE:
+            }
+            case EDGE -> {
                 handleEdgeEvent(tenantId, entityId, event.getEntity(), lifecycleEvent);
-                break;
-            case TB_RESOURCE:
+            }
+            case TB_RESOURCE -> {
                 TbResource tbResource = (TbResource) event.getEntity();
                 tbClusterService.onResourceChange(tbResource, null);
-                break;
-            case API_USAGE_STATE:
+            }
+            case API_USAGE_STATE -> {
                 ApiUsageState apiUsageState = (ApiUsageState) event.getEntity();
                 tbClusterService.onApiStateChange(apiUsageState, null);
-                break;
-            default:
-                break;
+            }
+            default -> {}
         }
     }
 
     @TransactionalEventListener(fallbackExecution = true)
     public void handleEvent(DeleteEntityEvent<?> event) {
-        log.trace("[{}] DeleteEntityEvent called: {}", event.getTenantId(), event);
         TenantId tenantId = event.getTenantId();
         EntityId entityId = event.getEntityId();
         EntityType entityType = entityId.getEntityType();
+        log.debug("[{}][{}][{}] Handling entity deletion event: {}", tenantId, entityType, entityId, event);
 
         switch (entityType) {
-            case ASSET:
-            case ASSET_PROFILE:
-            case ENTITY_VIEW:
-            case CUSTOMER:
-            case EDGE:
-            case NOTIFICATION_RULE:
+            case ASSET, ASSET_PROFILE, ENTITY_VIEW, CUSTOMER, EDGE, NOTIFICATION_RULE -> {
                 tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, ComponentLifecycleEvent.DELETED);
-                break;
-            case NOTIFICATION_REQUEST:
+            }
+            case NOTIFICATION_REQUEST -> {
                 NotificationRequest request = (NotificationRequest) event.getEntity();
                 if (request.isScheduled()) {
                     tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, ComponentLifecycleEvent.DELETED);
                 }
-                break;
-            case RULE_CHAIN:
+            }
+            case RULE_CHAIN -> {
                 RuleChain ruleChain = (RuleChain) event.getEntity();
                 if (RuleChainType.CORE.equals(ruleChain.getType())) {
                     Set<RuleChainId> referencingRuleChainIds = JacksonUtil.fromString(event.getBody(), new TypeReference<>() {});
@@ -152,29 +143,28 @@ public class EntityStateSourcingListener {
                     }
                     tbClusterService.broadcastEntityStateChangeEvent(tenantId, ruleChain.getId(), ComponentLifecycleEvent.DELETED);
                 }
-                break;
-            case TENANT:
+            }
+            case TENANT -> {
                 Tenant tenant = (Tenant) event.getEntity();
                 onTenantDeleted(tenant);
-                break;
-            case TENANT_PROFILE:
+            }
+            case TENANT_PROFILE -> {
                 TenantProfile tenantProfile = (TenantProfile) event.getEntity();
                 tbClusterService.onTenantProfileDelete(tenantProfile, null);
-                break;
-            case DEVICE:
+            }
+            case DEVICE -> {
                 Device device = (Device) event.getEntity();
                 tbClusterService.onDeviceDeleted(tenantId, device, null);
-                break;
-            case DEVICE_PROFILE:
+            }
+            case DEVICE_PROFILE -> {
                 DeviceProfile deviceProfile = (DeviceProfile) event.getEntity();
                 onDeviceProfileDelete(event.getTenantId(), event.getEntityId(), deviceProfile);
-                break;
-            case TB_RESOURCE:
+            }
+            case TB_RESOURCE -> {
                 TbResourceInfo tbResource = (TbResourceInfo) event.getEntity();
                 tbClusterService.onResourceDeleted(tbResource, null);
-                break;
-            default:
-                break;
+            }
+            default -> {}
         }
     }
 
@@ -186,8 +176,7 @@ public class EntityStateSourcingListener {
                 && event.getEntity() instanceof DeviceCredentials) {
             tbClusterService.pushMsgToCore(new DeviceCredentialsUpdateNotificationMsg(event.getTenantId(),
                     (DeviceId) event.getEntityId(), (DeviceCredentials) event.getEntity()), null);
-        } else if (ActionType.ASSIGNED_TO_TENANT.equals(event.getActionType()) && event.getEntity() instanceof Device) {
-            Device device = (Device) event.getEntity();
+        } else if (ActionType.ASSIGNED_TO_TENANT.equals(event.getActionType()) && event.getEntity() instanceof Device device) {
             Tenant tenant = JacksonUtil.fromString(event.getBody(), Tenant.class);
             if (tenant != null) {
                 tbClusterService.onDeviceAssignedToTenant(tenant.getId(), device);
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java
index 17d52329b2..8096722940 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java
@@ -16,12 +16,10 @@
 package org.thingsboard.server.service.entitiy.tenant;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -45,25 +43,19 @@ public class DefaultTbTenantService extends AbstractTbEntityService implements T
     private final TbQueueService tbQueueService;
     private final TenantProfileService tenantProfileService;
     private final EntitiesVersionControlService versionControlService;
-    private final ApplicationEventPublisher eventPublisher;
 
     @Override
     public Tenant save(Tenant tenant) throws Exception {
         boolean created = tenant.getId() == null;
         Tenant oldTenant = !created ? tenantService.findTenantById(tenant.getId()) : null;
 
-        Tenant savedTenant = checkNotNull(tenantService.saveTenant(tenant, !created));
-        if (created) {
-            installScripts.createDefaultRuleChains(savedTenant.getId());
-            installScripts.createDefaultEdgeRuleChains(savedTenant.getId());
-            installScripts.createDefaultTenantDashboards(savedTenant.getId(), null);
-        }
+        Tenant savedTenant = tenantService.saveTenant(tenant, tenantId -> {
+            installScripts.createDefaultRuleChains(tenantId);
+            installScripts.createDefaultEdgeRuleChains(tenantId);
+            installScripts.createDefaultTenantDashboards(tenantId, null);
+        });
         tenantProfileCache.evict(savedTenant.getId());
 
-        if (created) {
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(TenantId.SYS_TENANT_ID).entityId(savedTenant.getId()).entity(savedTenant).created(true).build());
-        }
-
         TenantProfile oldTenantProfile = oldTenant != null ? tenantProfileService.findTenantProfileById(TenantId.SYS_TENANT_ID, oldTenant.getTenantProfileId()) : null;
         TenantProfile newTenantProfile = tenantProfileService.findTenantProfileById(TenantId.SYS_TENANT_ID, savedTenant.getTenantProfileId());
         tbQueueService.updateQueuesByTenants(Collections.singletonList(savedTenant.getTenantId()), newTenantProfile, oldTenantProfile);
diff --git a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
index f5bb67bdce..999079e913 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
@@ -151,17 +151,18 @@ public class InstallScripts {
         }
     }
 
-    public void createDefaultRuleChains(TenantId tenantId) throws IOException {
+    public void createDefaultRuleChains(TenantId tenantId) {
         Path tenantChainsDir = getTenantRuleChainsDir();
         loadRuleChainsFromPath(tenantId, tenantChainsDir);
     }
 
-    public void createDefaultEdgeRuleChains(TenantId tenantId) throws IOException {
+    public void createDefaultEdgeRuleChains(TenantId tenantId) {
         Path edgeChainsDir = getEdgeRuleChainsDir();
         loadRuleChainsFromPath(tenantId, edgeChainsDir);
     }
 
-    private void loadRuleChainsFromPath(TenantId tenantId, Path ruleChainsPath) throws IOException {
+    @SneakyThrows
+    private void loadRuleChainsFromPath(TenantId tenantId, Path ruleChainsPath) {
         findRuleChainsFromPath(ruleChainsPath).forEach(path -> {
             try {
                 createRuleChainFromFile(tenantId, path, null);
@@ -329,17 +330,18 @@ public class InstallScripts {
         }
     }
 
-    public void loadDashboards(TenantId tenantId, CustomerId customerId) throws Exception {
+    public void loadDashboards(TenantId tenantId, CustomerId customerId) {
         Path dashboardsDir = Paths.get(getDataDir(), JSON_DIR, DEMO_DIR, DASHBOARDS_DIR);
         loadDashboardsFromDir(tenantId, customerId, dashboardsDir);
     }
 
-    public void createDefaultTenantDashboards(TenantId tenantId, CustomerId customerId) throws Exception {
+    public void createDefaultTenantDashboards(TenantId tenantId, CustomerId customerId) {
         Path dashboardsDir = Paths.get(getDataDir(), JSON_DIR, TENANT_DIR, DASHBOARDS_DIR);
         loadDashboardsFromDir(tenantId, customerId, dashboardsDir);
     }
 
-    private void loadDashboardsFromDir(TenantId tenantId, CustomerId customerId, Path dashboardsDir) throws IOException {
+    @SneakyThrows
+    private void loadDashboardsFromDir(TenantId tenantId, CustomerId customerId, Path dashboardsDir) {
         try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(dashboardsDir, path -> path.toString().endsWith(JSON_EXT))) {
             dirStream.forEach(
                     path -> {
@@ -414,7 +416,7 @@ public class InstallScripts {
                     }
             );
         } catch (Exception e) {
-            log.error("Unable to load resources lwm2m object model from file: [{}]", resourceLwm2mPath.toString());
+            log.error("Unable to load resources lwm2m object model from file: [{}]", resourceLwm2mPath);
             throw new RuntimeException("resource lwm2m object model from file", e);
         }
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
index d2925870c4..86d922c305 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
@@ -116,7 +116,10 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                 updateSchema("3.6.2", 3006002, "3.6.3", 3006003, null);
                 break;
             case "3.6.3":
-                updateSchema("3.6.3", 3006003, "3.7.0", 3007000, null);
+                updateSchema("3.6.3", 3006003, "3.6.4", 3006004, null);
+                break;
+            case "3.6.4":
+                updateSchema("3.6.4", 3006004, "3.7.0", 3007000, null);
                 break;
             default:
                 throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java b/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java
index 362d0d971e..b8bd4329b0 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java
@@ -81,6 +81,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import static org.thingsboard.server.common.data.notification.NotificationDeliveryMethod.WEB;
+
 @Service
 @Slf4j
 @RequiredArgsConstructor
@@ -191,7 +193,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
             NotificationProcessingContext ctx = NotificationProcessingContext.builder()
                     .tenantId(tenantId)
                     .request(notificationRequest)
-                    .deliveryMethods(Set.of(NotificationDeliveryMethod.WEB))
+                    .deliveryMethods(Set.of(WEB))
                     .template(template)
                     .build();
 
@@ -322,6 +324,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
                 .requestId(request.getId())
                 .recipientId(recipient.getId())
                 .type(ctx.getNotificationType())
+                .deliveryMethod(WEB)
                 .subject(processedTemplate.getSubject())
                 .text(processedTemplate.getBody())
                 .additionalConfig(processedTemplate.getAdditionalConfig())
@@ -347,19 +350,22 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
         boolean updated = notificationService.markNotificationAsRead(tenantId, recipientId, notificationId);
         if (updated) {
             log.trace("Marked notification {} as read (recipient id: {}, tenant id: {})", notificationId, recipientId, tenantId);
-            NotificationUpdate update = NotificationUpdate.builder()
-                    .updated(true)
-                    .notificationId(notificationId.getId())
-                    .newStatus(NotificationStatus.READ)
-                    .build();
-            onNotificationUpdate(tenantId, recipientId, update);
+            Notification notification = notificationService.findNotificationById(tenantId, notificationId);
+            if (notification.getDeliveryMethod() == WEB) {
+                NotificationUpdate update = NotificationUpdate.builder()
+                        .updated(true)
+                        .notificationId(notificationId.getId())
+                        .newStatus(NotificationStatus.READ)
+                        .build();
+                onNotificationUpdate(tenantId, recipientId, update);
+            }
         }
     }
 
     @Override
-    public void markAllNotificationsAsRead(TenantId tenantId, UserId recipientId) {
-        int updatedCount = notificationService.markAllNotificationsAsRead(tenantId, recipientId);
-        if (updatedCount > 0) {
+    public void markAllNotificationsAsRead(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId) {
+        int updatedCount = notificationService.markAllNotificationsAsRead(tenantId, deliveryMethod, recipientId);
+        if (updatedCount > 0 && deliveryMethod == WEB) {
             log.trace("Marked all notifications as read (recipient id: {}, tenant id: {})", recipientId, tenantId);
             NotificationUpdate update = NotificationUpdate.builder()
                     .updated(true)
@@ -374,7 +380,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
     public void deleteNotification(TenantId tenantId, UserId recipientId, NotificationId notificationId) {
         Notification notification = notificationService.findNotificationById(tenantId, notificationId);
         boolean deleted = notificationService.deleteNotification(tenantId, recipientId, notificationId);
-        if (deleted) {
+        if (deleted && notification.getDeliveryMethod() == WEB) {
             NotificationUpdate update = NotificationUpdate.builder()
                     .deleted(true)
                     .notification(notification)
@@ -451,7 +457,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
 
     @Override
     public NotificationDeliveryMethod getDeliveryMethod() {
-        return NotificationDeliveryMethod.WEB;
+        return WEB;
     }
 
     @Override
@@ -462,7 +468,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
     @Autowired
     public void setChannels(List<NotificationChannel> channels, NotificationCenter webNotificationChannel) {
         this.channels = channels.stream().collect(Collectors.toMap(NotificationChannel::getDeliveryMethod, c -> c));
-        this.channels.put(NotificationDeliveryMethod.WEB, (NotificationChannel) webNotificationChannel);
+        this.channels.put(WEB, (NotificationChannel) webNotificationChannel);
     }
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java b/application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java
index 646556372a..f796e2b440 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.service.notification.channels;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Strings;
 import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.MessagingErrorCode;
@@ -26,11 +27,15 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.notification.FirebaseService;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.Notification;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
+import org.thingsboard.server.common.data.notification.NotificationRequest;
+import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.common.data.notification.info.NotificationInfo;
 import org.thingsboard.server.common.data.notification.settings.MobileAppNotificationDeliveryMethodConfig;
 import org.thingsboard.server.common.data.notification.settings.NotificationSettings;
 import org.thingsboard.server.common.data.notification.template.MobileAppDeliveryMethodNotificationTemplate;
+import org.thingsboard.server.dao.notification.NotificationService;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.service.notification.NotificationProcessingContext;
@@ -41,6 +46,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
+import static org.thingsboard.server.common.data.notification.NotificationDeliveryMethod.MOBILE_APP;
+
 @Component
 @RequiredArgsConstructor
 @Slf4j
@@ -48,25 +55,54 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
 
     private final FirebaseService firebaseService;
     private final UserService userService;
+    private final NotificationService notificationService;
     private final NotificationSettingsService notificationSettingsService;
 
     @Override
     public void sendNotification(User recipient, MobileAppDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) throws Exception {
+        NotificationRequest request = ctx.getRequest();
+        NotificationInfo info = request.getInfo();
+        if (info != null && info.getDashboardId() != null) {
+            ObjectNode additionalConfig = JacksonUtil.asObject(processedTemplate.getAdditionalConfig());
+            ObjectNode onClick = JacksonUtil.asObject(additionalConfig.get("onClick"));
+            if (onClick.get("enabled") == null || !Boolean.parseBoolean(onClick.get("enabled").asText())) {
+                onClick.put("enabled", true);
+                onClick.put("linkType", "DASHBOARD");
+                onClick.put("setEntityIdInState", true);
+                onClick.put("dashboardId", info.getDashboardId().toString());
+                additionalConfig.set("onClick", onClick);
+            }
+            processedTemplate.setAdditionalConfig(additionalConfig);
+        }
+        Notification notification = Notification.builder()
+                .requestId(request.getId())
+                .recipientId(recipient.getId())
+                .type(ctx.getNotificationType())
+                .deliveryMethod(MOBILE_APP)
+                .subject(processedTemplate.getSubject())
+                .text(processedTemplate.getBody())
+                .additionalConfig(processedTemplate.getAdditionalConfig())
+                .info(info)
+                .status(NotificationStatus.SENT)
+                .build();
+        notificationService.saveNotification(recipient.getTenantId(), notification);
+
         var mobileSessions = userService.findMobileSessions(recipient.getTenantId(), recipient.getId());
         if (mobileSessions.isEmpty()) {
             throw new IllegalArgumentException("User doesn't use the mobile app");
         }
 
-        MobileAppNotificationDeliveryMethodConfig config = ctx.getDeliveryMethodConfig(NotificationDeliveryMethod.MOBILE_APP);
+        MobileAppNotificationDeliveryMethodConfig config = ctx.getDeliveryMethodConfig(MOBILE_APP);
         String credentials = config.getFirebaseServiceAccountCredentials();
         Set<String> validTokens = new HashSet<>(mobileSessions.keySet());
 
         String subject = processedTemplate.getSubject();
         String body = processedTemplate.getBody();
         Map<String, String> data = getNotificationData(processedTemplate, ctx);
+        int unreadCount = notificationService.countUnreadNotificationsByRecipientId(ctx.getTenantId(), MOBILE_APP, recipient.getId());
         for (String token : mobileSessions.keySet()) {
             try {
-                firebaseService.sendMessage(ctx.getTenantId(), credentials, token, subject, body, data);
+                firebaseService.sendMessage(ctx.getTenantId(), credentials, token, subject, body, data, unreadCount);
             } catch (FirebaseMessagingException e) {
                 MessagingErrorCode errorCode = e.getMessagingErrorCode();
                 if (errorCode == MessagingErrorCode.UNREGISTERED || errorCode == MessagingErrorCode.INVALID_ARGUMENT) {
@@ -92,12 +128,6 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
         Optional.ofNullable(info.getStateEntityId()).ifPresent(stateEntityId -> {
             data.put("stateEntityId", stateEntityId.getId().toString());
             data.put("stateEntityType", stateEntityId.getEntityType().name());
-            if (!"true".equals(data.get("onClick.enabled")) && info.getDashboardId() != null) {
-                data.put("onClick.enabled", "true");
-                data.put("onClick.linkType", "DASHBOARD");
-                data.put("onClick.setEntityIdInState", "true");
-                data.put("onClick.dashboardId", info.getDashboardId().toString());
-            }
         });
         data.put("notificationType", ctx.getNotificationType().name());
         switch (ctx.getNotificationType()) {
@@ -116,14 +146,14 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
     @Override
     public void check(TenantId tenantId) throws Exception {
         NotificationSettings systemSettings = notificationSettingsService.findNotificationSettings(TenantId.SYS_TENANT_ID);
-        if (!systemSettings.getDeliveryMethodsConfigs().containsKey(NotificationDeliveryMethod.MOBILE_APP)) {
+        if (!systemSettings.getDeliveryMethodsConfigs().containsKey(MOBILE_APP)) {
             throw new RuntimeException("Push-notifications to mobile are not configured");
         }
     }
 
     @Override
     public NotificationDeliveryMethod getDeliveryMethod() {
-        return NotificationDeliveryMethod.MOBILE_APP;
+        return MOBILE_APP;
     }
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultFirebaseService.java b/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultFirebaseService.java
index b64d0b586d..11651f91c4 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultFirebaseService.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultFirebaseService.java
@@ -54,7 +54,8 @@ public class DefaultFirebaseService implements FirebaseService {
             .build();
 
     @Override
-    public void sendMessage(TenantId tenantId, String credentials, String fcmToken, String title, String body, Map<String, String> data) throws FirebaseMessagingException {
+    public void sendMessage(TenantId tenantId, String credentials, String fcmToken, String title, String body,
+                            Map<String, String> data, Integer badge) throws FirebaseMessagingException {
         FirebaseContext firebaseContext = contexts.asMap().compute(tenantId.toString(), (key, context) -> {
             if (context == null) {
                 return new FirebaseContext(key, credentials);
@@ -64,6 +65,12 @@ public class DefaultFirebaseService implements FirebaseService {
             }
         });
 
+        Aps.Builder apsConfig = Aps.builder()
+                .setSound("default");
+        if (badge != null) {
+            apsConfig.setBadge(badge);
+        }
+
         Message message = Message.builder()
                 .setToken(fcmToken)
                 .setNotification(Notification.builder()
@@ -74,14 +81,17 @@ public class DefaultFirebaseService implements FirebaseService {
                         .setPriority(AndroidConfig.Priority.HIGH)
                         .build())
                 .setApnsConfig(ApnsConfig.builder()
-                        .setAps(Aps.builder()
-                                .setContentAvailable(true)
-                                .build())
+                        .setAps(apsConfig.build())
                         .build())
                 .putAllData(data)
                 .build();
-        firebaseContext.getMessaging().send(message);
-        log.trace("[{}] Sent message for FCM token {}", tenantId, fcmToken);
+        try {
+            firebaseContext.getMessaging().send(message);
+            log.trace("[{}] Sent message for FCM token {}", tenantId, fcmToken);
+        } catch (Throwable t) {
+            log.debug("[{}] Failed to send message for FCM token {}", tenantId, fcmToken, t);
+            throw t;
+        }
     }
 
     public static class FirebaseContext {
diff --git a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java
index 1542f4095e..ebbd29e589 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java
@@ -208,52 +208,22 @@ public class AccessValidator {
 
     public void validate(SecurityUser currentUser, Operation operation, EntityId entityId, FutureCallback<ValidationResult> callback) {
         switch (entityId.getEntityType()) {
-            case DEVICE:
-                validateDevice(currentUser, operation, entityId, callback);
-                return;
-            case DEVICE_PROFILE:
-                validateDeviceProfile(currentUser, operation, entityId, callback);
-                return;
-            case ASSET:
-                validateAsset(currentUser, operation, entityId, callback);
-                return;
-            case ASSET_PROFILE:
-                validateAssetProfile(currentUser, operation, entityId, callback);
-                return;
-            case RULE_CHAIN:
-                validateRuleChain(currentUser, operation, entityId, callback);
-                return;
-            case CUSTOMER:
-                validateCustomer(currentUser, operation, entityId, callback);
-                return;
-            case TENANT:
-                validateTenant(currentUser, operation, entityId, callback);
-                return;
-            case TENANT_PROFILE:
-                validateTenantProfile(currentUser, operation, entityId, callback);
-                return;
-            case USER:
-                validateUser(currentUser, operation, entityId, callback);
-                return;
-            case ENTITY_VIEW:
-                validateEntityView(currentUser, operation, entityId, callback);
-                return;
-            case EDGE:
-                validateEdge(currentUser, operation, entityId, callback);
-                return;
-            case API_USAGE_STATE:
-                validateApiUsageState(currentUser, operation, entityId, callback);
-                return;
-            case TB_RESOURCE:
-                validateResource(currentUser, operation, entityId, callback);
-                return;
-            case OTA_PACKAGE:
-                validateOtaPackage(currentUser, operation, entityId, callback);
-                return;
-            case RPC:
-                validateRpc(currentUser, operation, entityId, callback);
-                return;
-            default:
+            case DEVICE -> validateDevice(currentUser, operation, entityId, callback);
+            case DEVICE_PROFILE -> validateDeviceProfile(currentUser, operation, entityId, callback);
+            case ASSET -> validateAsset(currentUser, operation, entityId, callback);
+            case ASSET_PROFILE -> validateAssetProfile(currentUser, operation, entityId, callback);
+            case RULE_CHAIN -> validateRuleChain(currentUser, operation, entityId, callback);
+            case CUSTOMER -> validateCustomer(currentUser, operation, entityId, callback);
+            case TENANT -> validateTenant(currentUser, operation, entityId, callback);
+            case TENANT_PROFILE -> validateTenantProfile(currentUser, operation, entityId, callback);
+            case USER -> validateUser(currentUser, operation, entityId, callback);
+            case ENTITY_VIEW -> validateEntityView(currentUser, operation, entityId, callback);
+            case EDGE -> validateEdge(currentUser, operation, entityId, callback);
+            case API_USAGE_STATE -> validateApiUsageState(currentUser, operation, entityId, callback);
+            case TB_RESOURCE -> validateResource(currentUser, operation, entityId, callback);
+            case OTA_PACKAGE -> validateOtaPackage(currentUser, operation, entityId, callback);
+            case RPC -> validateRpc(currentUser, operation, entityId, callback);
+            default ->
                 //TODO: add support of other entities
                 throw new IllegalStateException("Not Implemented!");
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginRequest.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginRequest.java
index 5d001ccf6a..dbb930755d 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginRequest.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginRequest.java
@@ -32,12 +32,12 @@ public class LoginRequest {
         this.password = password;
     }
 
-    @Schema(required = true, description = "User email", example = "tenant@thingsboard.org")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "User email", example = "tenant@thingsboard.org")
     public String getUsername() {
         return username;
     }
 
-    @Schema(required = true, description = "User password", example = "tenant")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "User password", example = "tenant")
     public String getPassword() {
         return password;
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginResponse.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginResponse.java
index 239186cf45..503767106a 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginResponse.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginResponse.java
@@ -22,11 +22,11 @@ import lombok.Data;
 @Data
 public class LoginResponse {
 
-    @Schema(required = true, description = "JWT token",
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JWT token",
             example = "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0ZW5hbnRAdGhpbmdzYm9hcmQub3JnIi...")
     private String token;
 
-    @Schema(required = true, description = "Refresh token",
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Refresh token",
             example = "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0ZW5hbnRAdGhpbmdzYm9hcmQub3JnIi...")
     private String refreshToken;
 
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/csv/AbstractBulkImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/csv/AbstractBulkImportService.java
index 909300a4b5..3890e5791d 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/csv/AbstractBulkImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/csv/AbstractBulkImportService.java
@@ -301,18 +301,13 @@ public abstract class AbstractBulkImportService<E extends HasId<? extends Entity
         private final DataType dataType;
 
         public JsonPrimitive toJsonPrimitive() {
-            switch (dataType) {
-                case STRING:
-                    return new JsonPrimitive((String) value);
-                case LONG:
-                    return new JsonPrimitive((Long) value);
-                case DOUBLE:
-                    return new JsonPrimitive((Double) value);
-                case BOOLEAN:
-                    return new JsonPrimitive((Boolean) value);
-                default:
-                    return null;
-            }
+            return switch (dataType) {
+                case STRING -> new JsonPrimitive((String) value);
+                case LONG -> new JsonPrimitive((Long) value);
+                case DOUBLE -> new JsonPrimitive((Double) value);
+                case BOOLEAN -> new JsonPrimitive((Boolean) value);
+                default -> null;
+            };
         }
 
         public String stringValue() {
diff --git a/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java b/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java
index f868a9d4f3..6fa9111c3d 100644
--- a/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java
+++ b/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java
@@ -51,6 +51,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import static org.thingsboard.server.common.data.notification.NotificationDeliveryMethod.WEB;
+
 @Service
 @TbCoreComponent
 @RequiredArgsConstructor
@@ -104,7 +106,7 @@ public class DefaultNotificationCommandsHandler implements NotificationCommandsH
     private void fetchUnreadNotifications(NotificationsSubscription subscription) {
         log.trace("[{}, subId: {}] Fetching unread notifications from DB", subscription.getSessionId(), subscription.getSubscriptionId());
         PageData<Notification> notifications = notificationService.findLatestUnreadNotificationsByRecipientId(subscription.getTenantId(),
-                (UserId) subscription.getEntityId(), subscription.getLimit());
+                WEB, (UserId) subscription.getEntityId(), subscription.getLimit());
         subscription.getLatestUnreadNotifications().clear();
         notifications.getData().forEach(notification -> {
             subscription.getLatestUnreadNotifications().put(notification.getUuidId(), notification);
@@ -114,7 +116,7 @@ public class DefaultNotificationCommandsHandler implements NotificationCommandsH
 
     private void fetchUnreadNotificationsCount(NotificationsCountSubscription subscription) {
         log.trace("[{}, subId: {}] Fetching unread notifications count from DB", subscription.getSessionId(), subscription.getSubscriptionId());
-        int unreadCount = notificationService.countUnreadNotificationsByRecipientId(subscription.getTenantId(), (UserId) subscription.getEntityId());
+        int unreadCount = notificationService.countUnreadNotificationsByRecipientId(subscription.getTenantId(), WEB, (UserId) subscription.getEntityId());
         subscription.getTotalUnreadCounter().set(unreadCount);
     }
 
@@ -235,7 +237,7 @@ public class DefaultNotificationCommandsHandler implements NotificationCommandsH
     @Override
     public void handleMarkAllAsReadCmd(WebSocketSessionRef sessionRef, MarkAllNotificationsAsReadCmd cmd) {
         SecurityUser securityCtx = sessionRef.getSecurityCtx();
-        notificationCenter.markAllNotificationsAsRead(securityCtx.getTenantId(), securityCtx.getId());
+        notificationCenter.markAllNotificationsAsRead(securityCtx.getTenantId(), WEB, securityCtx.getId());
     }
 
     @Override
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
index 1dc952c15b..5dd9e4b77f 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -41,6 +41,8 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -114,6 +116,7 @@ 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.device.ClaimDevicesService;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.service.entitiy.tenant.profile.TbTenantProfileService;
@@ -151,6 +154,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+import static org.thingsboard.server.common.data.CacheConstants.CLAIM_DEVICES_CACHE;
 
 @Slf4j
 public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
@@ -232,6 +236,9 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     @Autowired
     protected DefaultActorService actorService;
 
+    @Autowired
+    protected ClaimDevicesService claimDevicesService;
+
     @SpyBean
     protected MailService mailService;
 
@@ -1065,6 +1072,16 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         });
     }
 
+    protected void awaitForClaimingInfoToBeRegistered(DeviceId deviceId) {
+        CacheManager cacheManager = (CacheManager) ReflectionTestUtils.getField(claimDevicesService, "cacheManager");
+        Cache cache = cacheManager.getCache(CLAIM_DEVICES_CACHE);
+        Awaitility.await("Claiming request from the transport was registered").atMost(5, TimeUnit.SECONDS).until(() -> {
+            Cache.ValueWrapper value = cache.get(List.of(deviceId));
+            log.warn("device {}, claimingRequest registered: {}", deviceId, value);
+            return value != null;
+        });
+    }
+
     protected static String getMapName(FeatureType featureType) {
         switch (featureType) {
             case ATTRIBUTES:
diff --git a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
index cd47988658..63747d2c19 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
@@ -663,7 +663,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         savedDifferentTenant.setTenantProfileId(tenantProfile.getId());
         savedDifferentTenant = doPost("/api/tenant", savedDifferentTenant, Tenant.class);
         TenantId tenantId = differentTenantId;
-        await().atMost(10, TimeUnit.SECONDS)
+        await().atMost(30, TimeUnit.SECONDS)
                 .until(() -> {
                     TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_RULE_ENGINE, MAIN_QUEUE_NAME, tenantId, tenantId);
                     return !tpi.getTenantId().get().isSysTenantId();
@@ -677,7 +677,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         tenantProfile.setIsolatedTbRuleEngine(false);
         tenantProfile.getProfileData().setQueueConfiguration(Collections.emptyList());
         tenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
-        await().atMost(10, TimeUnit.SECONDS)
+        await().atMost(30, TimeUnit.SECONDS)
                 .until(() -> partitionService.resolve(ServiceType.TB_RULE_ENGINE, MAIN_QUEUE_NAME, tenantId, tenantId)
                         .getTenantId().get().isSysTenantId());
 
@@ -689,11 +689,11 @@ public class TenantControllerTest extends AbstractControllerTest {
             submittedMsgs.add(tbMsg.getId());
             Thread.sleep(timeLeft / msgs);
         }
-        await().atMost(15, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             verify(queueAdmin, times(1)).deleteTopic(eq(isolatedTopic));
         });
 
-        await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
             for (UUID msgId : submittedMsgs) {
                 verify(actorContext).tell(argThat(msg -> {
                     return msg instanceof QueueToRuleEngineMsg && ((QueueToRuleEngineMsg) msg).getMsg().getId().equals(msgId);
@@ -718,13 +718,13 @@ public class TenantControllerTest extends AbstractControllerTest {
         savedDifferentTenant.setTenantProfileId(tenantProfile.getId());
         savedDifferentTenant = doPost("/api/tenant", savedDifferentTenant, Tenant.class);
         TenantId tenantId = differentTenantId;
-        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(partitionService.getMyPartitions(new QueueKey(ServiceType.TB_RULE_ENGINE, tenantId))).isNotNull();
         });
         TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_RULE_ENGINE, tenantId, tenantId);
         assertThat(tpi.getTenantId()).hasValue(tenantId);
         TbMsg tbMsg = publishTbMsg(tenantId, tpi);
-        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             verify(actorContext).tell(argThat(msg -> {
                 return msg instanceof QueueToRuleEngineMsg && ((QueueToRuleEngineMsg) msg).getMsg().getId().equals(tbMsg.getId());
             }));
@@ -732,7 +732,7 @@ public class TenantControllerTest extends AbstractControllerTest {
 
         deleteDifferentTenant();
 
-        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(partitionService.getMyPartitions(new QueueKey(ServiceType.TB_RULE_ENGINE, tenantId))).isNull();
             assertThatThrownBy(() -> partitionService.resolve(ServiceType.TB_RULE_ENGINE, tenantId, tenantId))
                     .isInstanceOf(TenantNotFoundException.class);
@@ -752,7 +752,7 @@ public class TenantControllerTest extends AbstractControllerTest {
     }
 
     private void verifyUsedQueueAndMessage(String queue, TenantId tenantId, EntityId entityId, String msgType, Runnable action, Consumer<TopicPartitionInfo> tpiAssert) {
-        await().atMost(15, TimeUnit.SECONDS)
+        await().atMost(30, TimeUnit.SECONDS)
                 .untilAsserted(() -> {
                     TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_RULE_ENGINE, queue, tenantId, entityId);
                     tpiAssert.accept(tpi);
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java
index b945c162df..ae9dbe92c4 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java
@@ -145,7 +145,7 @@ public abstract class AbstractNotificationApiTest extends AbstractControllerTest
 
     protected NotificationRequest submitNotificationRequest(List<NotificationTargetId> targets, String text, int delayInSec, NotificationDeliveryMethod... deliveryMethods) {
         if (deliveryMethods.length == 0) {
-            deliveryMethods = new NotificationDeliveryMethod[]{NotificationDeliveryMethod.WEB};
+            deliveryMethods = new NotificationDeliveryMethod[]{NotificationDeliveryMethod.WEB, NotificationDeliveryMethod.MOBILE_APP};
         }
         NotificationTemplate notificationTemplate = createNotificationTemplate(DEFAULT_NOTIFICATION_TYPE, DEFAULT_NOTIFICATION_SUBJECT, text, deliveryMethods);
         return submitNotificationRequest(targets, notificationTemplate.getId(), delayInSec);
@@ -247,8 +247,12 @@ public abstract class AbstractNotificationApiTest extends AbstractControllerTest
     }
 
     protected List<Notification> getMyNotifications(boolean unreadOnly, int limit) throws Exception {
-        return doGetTypedWithPageLink("/api/notifications?unreadOnly={unreadOnly}&", new TypeReference<PageData<Notification>>() {},
-                new PageLink(limit, 0), unreadOnly).getData();
+        return getMyNotifications(NotificationDeliveryMethod.WEB, unreadOnly, limit);
+    }
+
+    protected List<Notification> getMyNotifications(NotificationDeliveryMethod deliveryMethod, boolean unreadOnly, int limit) throws Exception {
+        return doGetTypedWithPageLink("/api/notifications?unreadOnly={unreadOnly}&deliveryMethod={deliveryMethod}&", new TypeReference<PageData<Notification>>() {},
+                new PageLink(limit, 0), unreadOnly, deliveryMethod).getData();
     }
 
     protected NotificationRule createNotificationRule(NotificationRuleTriggerConfig triggerConfig, String subject, String text, NotificationTargetId... targets) {
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 d3b79029ba..060af9eac1 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
@@ -37,6 +37,7 @@ import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmComment;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.NotificationRequestId;
 import org.thingsboard.server.common.data.id.NotificationRuleId;
@@ -52,6 +53,7 @@ import org.thingsboard.server.common.data.notification.NotificationRequestPrevie
 import org.thingsboard.server.common.data.notification.NotificationRequestStats;
 import org.thingsboard.server.common.data.notification.NotificationRequestStatus;
 import org.thingsboard.server.common.data.notification.NotificationType;
+import org.thingsboard.server.common.data.notification.info.AlarmCommentNotificationInfo;
 import org.thingsboard.server.common.data.notification.info.EntityActionNotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.AlarmCommentNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.settings.MobileAppNotificationDeliveryMethodConfig;
@@ -81,7 +83,6 @@ import org.thingsboard.server.common.data.notification.template.WebDeliveryMetho
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.dao.notification.DefaultNotifications;
-import org.thingsboard.server.dao.notification.NotificationDao;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.service.notification.channels.MicrosoftTeamsNotificationChannel;
 import org.thingsboard.server.service.ws.notification.cmd.UnreadNotificationsUpdate;
@@ -116,17 +117,25 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
     @Autowired
     private NotificationCenter notificationCenter;
     @Autowired
-    private NotificationDao notificationDao;
-    @Autowired
     private MicrosoftTeamsNotificationChannel microsoftTeamsNotificationChannel;
     @MockBean
     private FirebaseService firebaseService;
 
+    private static final String TEST_MOBILE_TOKEN = "tenantFcmToken";
+
     @Before
     public void beforeEach() throws Exception {
         loginCustomerUser();
         wsClient = getWsClient();
+
+        loginSysAdmin();
+        MobileAppNotificationDeliveryMethodConfig config = new MobileAppNotificationDeliveryMethodConfig();
+        config.setFirebaseServiceAccountCredentials("testCredentials");
+        saveNotificationSettings(config);
+
         loginTenantAdmin();
+        mobileToken = TEST_MOBILE_TOKEN;
+        doPost("/api/user/mobile/session", new MobileSessionInfo()).andExpect(status().isOk());
     }
 
     @Test
@@ -242,7 +251,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         int notificationsCount = 20;
         wsClient.registerWaitForUpdate(notificationsCount);
         for (int i = 1; i <= notificationsCount; i++) {
-            submitNotificationRequest(target.getId(), "Test " + i, NotificationDeliveryMethod.WEB);
+            submitNotificationRequest(target.getId(), "Test " + i, NotificationDeliveryMethod.WEB, NotificationDeliveryMethod.MOBILE_APP);
         }
         wsClient.waitForUpdate(true);
         assertThat(wsClient.getLastDataUpdate().getTotalUnreadCount()).isEqualTo(notificationsCount);
@@ -306,7 +315,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         NotificationTarget target = createNotificationTarget(savedDifferentTenantUser.getId());
         int notificationsCount = 20;
         for (int i = 0; i < notificationsCount; i++) {
-            NotificationRequest request = submitNotificationRequest(target.getId(), "Test " + i, NotificationDeliveryMethod.WEB);
+            NotificationRequest request = submitNotificationRequest(target.getId(), "Test " + i, NotificationDeliveryMethod.WEB, NotificationDeliveryMethod.MOBILE_APP);
             awaitNotificationRequest(request.getId());
         }
         List<NotificationRequest> requests = notificationRequestService.findNotificationRequestsByTenantIdAndOriginatorType(tenantId, EntityType.USER, new PageLink(100)).getData();
@@ -500,7 +509,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
     @Test
     public void testNotificationRequestInfo() throws Exception {
         NotificationDeliveryMethod[] deliveryMethods = new NotificationDeliveryMethod[]{
-                NotificationDeliveryMethod.WEB
+                NotificationDeliveryMethod.WEB, NotificationDeliveryMethod.MOBILE_APP
         };
         NotificationTemplate template = createNotificationTemplate(NotificationType.GENERAL, "Test subject", "Test text", deliveryMethods);
         NotificationTarget target = createNotificationTarget(tenantAdminUserId);
@@ -525,7 +534,6 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         await().atMost(2, TimeUnit.SECONDS)
                 .until(() -> findNotificationRequest(notificationRequest.getId()).isSent());
         NotificationRequestStats stats = getStats(notificationRequest.getId());
-
         assertThat(stats.getSent().get(NotificationDeliveryMethod.WEB)).hasValue(1);
     }
 
@@ -727,17 +735,12 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
 
     @Test
     public void testMobileAppNotifications() throws Exception {
-        loginSysAdmin();
-        MobileAppNotificationDeliveryMethodConfig config = new MobileAppNotificationDeliveryMethodConfig();
-        config.setFirebaseServiceAccountCredentials("testCredentials");
-        saveNotificationSettings(config);
-
         loginCustomerUser();
         mobileToken = "customerFcmToken";
         doPost("/api/user/mobile/session", new MobileSessionInfo()).andExpect(status().isOk());
 
         loginTenantAdmin();
-        mobileToken = "tenantFcmToken1";
+        mobileToken = TEST_MOBILE_TOKEN;
         doPost("/api/user/mobile/session", new MobileSessionInfo()).andExpect(status().isOk());
         mobileToken = "tenantFcmToken2";
         doPost("/api/user/mobile/session", new MobileSessionInfo()).andExpect(status().isOk());
@@ -746,7 +749,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
 
         loginTenantAdmin();
         NotificationTarget target = createNotificationTarget(new AllUsersFilter());
-        NotificationTemplate template = createNotificationTemplate(NotificationType.GENERAL, "Title", "Message", NotificationDeliveryMethod.MOBILE_APP);
+        NotificationTemplate template = createNotificationTemplate(NotificationType.GENERAL, "Title", "Message", NotificationDeliveryMethod.MOBILE_APP, NotificationDeliveryMethod.WEB);
         ((MobileAppDeliveryMethodNotificationTemplate) template.getConfiguration().getDeliveryMethodsTemplates().get(NotificationDeliveryMethod.MOBILE_APP))
                 .setAdditionalConfig(JacksonUtil.newObjectNode().set("test", JacksonUtil.newObjectNode().put("test", "test")));
         saveNotificationTemplate(template);
@@ -758,11 +761,19 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
                 .contains("doesn't use the mobile app");
 
         verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
-                eq("tenantFcmToken1"), eq("Title"), eq("Message"), argThat(data -> "test".equals(data.get("test.test"))));
+                eq(TEST_MOBILE_TOKEN), eq("Title"), eq("Message"), argThat(data -> "test".equals(data.get("test.test"))), eq(1));
         verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
-                eq("tenantFcmToken2"), eq("Title"), eq("Message"), argThat(data -> "test".equals(data.get("test.test"))));
+                eq("tenantFcmToken2"), eq("Title"), eq("Message"), argThat(data -> "test".equals(data.get("test.test"))), eq(1));
         verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
-                eq("customerFcmToken"), eq("Title"), eq("Message"), argThat(data -> "test".equals(data.get("test.test"))));
+                eq("customerFcmToken"), eq("Title"), eq("Message"), argThat(data -> "test".equals(data.get("test.test"))), eq(1));
+        assertThat(getMyNotifications(NotificationDeliveryMethod.MOBILE_APP, true, 10)).singleElement().satisfies(notification -> {
+            assertThat(notification.getDeliveryMethod()).isEqualTo(NotificationDeliveryMethod.MOBILE_APP);
+            assertThat(notification.getText()).isEqualTo("Message");
+            assertThat(notification.getSubject()).isEqualTo("Title");
+        });
+        assertThat(getMyNotifications(true, 10)).singleElement().satisfies(notification -> {
+            assertThat(notification.getDeliveryMethod()).isEqualTo(NotificationDeliveryMethod.WEB);
+        });
         verifyNoMoreInteractions(firebaseService);
         clearInvocations(firebaseService);
 
@@ -770,26 +781,24 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         request = submitNotificationRequest(List.of(target.getId()), template.getId(), 0);
         awaitNotificationRequest(request.getId());
         verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
-                eq("tenantFcmToken1"), eq("Title"), eq("Message"), anyMap());
+                eq(TEST_MOBILE_TOKEN), eq("Title"), eq("Message"), anyMap(), eq(2));
         verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
-                eq("customerFcmToken"), eq("Title"), eq("Message"), anyMap());
+                eq("customerFcmToken"), eq("Title"), eq("Message"), anyMap(), eq(2));
         verifyNoMoreInteractions(firebaseService);
+
+        Integer unreadCount = doGet("/api/notifications/unread/count", Integer.class);
+        assertThat(unreadCount).isEqualTo(2);
     }
 
     @Test
     public void testMobileAppNotifications_ruleBased() throws Exception {
-        loginSysAdmin();
-        MobileAppNotificationDeliveryMethodConfig config = new MobileAppNotificationDeliveryMethodConfig();
-        config.setFirebaseServiceAccountCredentials("testCredentials");
-        saveNotificationSettings(config);
-
         loginTenantAdmin();
-        mobileToken = "tenantFcmToken";
+        mobileToken = TEST_MOBILE_TOKEN;
         doPost("/api/user/mobile/session", new MobileSessionInfo()).andExpect(status().isOk());
 
         createNotificationRule(AlarmCommentNotificationRuleTriggerConfig.builder().onlyUserComments(true).build(),
                 DefaultNotifications.alarmComment.getSubject(), DefaultNotifications.alarmComment.getText(),
-                List.of(createNotificationTarget(tenantAdminUserId).getId()), NotificationDeliveryMethod.MOBILE_APP);
+                List.of(createNotificationTarget(tenantAdminUserId).getId()), NotificationDeliveryMethod.MOBILE_APP, NotificationDeliveryMethod.WEB);
 
         Device device = createDevice("test", "test");
         UUID alarmDashboardId = UUID.randomUUID();
@@ -802,18 +811,21 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
                         .put("dashboardId", alarmDashboardId.toString()))
                 .build();
         alarm = doPost("/api/alarm", alarm, Alarm.class);
+        AlarmId alarmId = alarm.getId();
 
         AlarmComment comment = new AlarmComment();
         comment.setComment(JacksonUtil.newObjectNode()
                 .put("text", "text"));
-        doPost("/api/alarm/" + alarm.getId() + "/comment", comment, AlarmComment.class);
+        doPost("/api/alarm/" + alarmId + "/comment", comment, AlarmComment.class);
 
+        String expectedSubject = "Comment on 'test' alarm";
+        String expectedBody = TENANT_ADMIN_EMAIL + " added comment: text";
         ArgumentCaptor<Map<String, String>> msgCaptor = ArgumentCaptor.forClass(Map.class);
         await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
-                    eq("tenantFcmToken"), eq("Comment on 'test' alarm"),
-                    eq(TENANT_ADMIN_EMAIL + " added comment: text"),
-                    msgCaptor.capture());
+                    eq(TEST_MOBILE_TOKEN), eq(expectedSubject),
+                    eq(expectedBody),
+                    msgCaptor.capture(), eq(1));
         });
         Map<String, String> firebaseMessageData = msgCaptor.getValue();
         assertThat(firebaseMessageData.keySet()).doesNotContainNull().doesNotContain("");
@@ -823,6 +835,14 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         assertThat(firebaseMessageData.get("onClick.enabled")).isEqualTo("true");
         assertThat(firebaseMessageData.get("onClick.linkType")).isEqualTo("DASHBOARD");
         assertThat(firebaseMessageData.get("onClick.dashboardId")).isEqualTo(alarmDashboardId.toString());
+
+        assertThat(getMyNotifications(NotificationDeliveryMethod.MOBILE_APP, true, 10)).singleElement().satisfies(notification -> {
+            assertThat(notification.getDeliveryMethod()).isEqualTo(NotificationDeliveryMethod.MOBILE_APP);
+            assertThat(notification.getSubject()).isEqualTo(expectedSubject);
+            assertThat(notification.getText()).isEqualTo(expectedBody);
+            assertThat(notification.getInfo()).asInstanceOf(type(AlarmCommentNotificationInfo.class))
+                    .matches(info -> info.getAlarmId().equals(alarmId.getId()) && info.getDashboardId().getId().equals(alarmDashboardId));
+        });
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimDeviceTest.java
index 924792fca1..26bef40c48 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimDeviceTest.java
@@ -23,10 +23,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.thingsboard.server.common.data.ClaimRequest;
-import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.dao.device.claim.ClaimResponse;
 import org.thingsboard.server.dao.device.claim.ClaimResult;
@@ -45,37 +42,12 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @DaoSqlTest
 public class CoapClaimDeviceTest extends AbstractCoapIntegrationTest {
 
-    protected static final String CUSTOMER_USER_PASSWORD = "customerUser123!";
-
-    protected User customerAdmin;
-    protected Customer savedCustomer;
-
     @Before
     public void beforeTest() throws Exception {
         CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
                 .deviceName("Test Claim device")
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
-    }
-
-    protected void createCustomerAndUser() throws Exception {
-        Customer customer = new Customer();
-        customer.setTenantId(tenantId);
-        customer.setTitle("Test Claiming Customer");
-        savedCustomer = doPost("/api/customer", customer, Customer.class);
-        assertNotNull(savedCustomer);
-        assertEquals(tenantId, savedCustomer.getTenantId());
-
-        User user = new User();
-        user.setAuthority(Authority.CUSTOMER_USER);
-        user.setTenantId(tenantId);
-        user.setCustomerId(savedCustomer.getId());
-        user.setEmail("customer@thingsboard.org");
-
-        customerAdmin = createUser(user, CUSTOMER_USER_PASSWORD);
-        assertNotNull(customerAdmin);
-        assertEquals(customerAdmin.getCustomerId(), savedCustomer.getId());
     }
 
     @After
@@ -110,8 +82,9 @@ public class CoapClaimDeviceTest extends AbstractCoapIntegrationTest {
 
     protected void validateClaimResponse(boolean emptyPayload, CoapTestClient client, byte[] payloadBytes, byte[] failurePayloadBytes) throws Exception {
         postClaimRequest(client, failurePayloadBytes);
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
-        loginUser(customerAdmin.getName(), CUSTOMER_USER_PASSWORD);
+        loginCustomerUser();
         ClaimRequest claimRequest;
         if (!emptyPayload) {
             claimRequest = new ClaimRequest("value");
@@ -128,6 +101,7 @@ public class CoapClaimDeviceTest extends AbstractCoapIntegrationTest {
         assertEquals(claimResponse, ClaimResponse.FAILURE);
 
         postClaimRequest(client, payloadBytes);
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
         ClaimResult claimResult = doExecuteWithRetriesAndInterval(
                 () -> doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResult.class, status().isOk()),
@@ -138,7 +112,7 @@ public class CoapClaimDeviceTest extends AbstractCoapIntegrationTest {
         Device claimedDevice = claimResult.getDevice();
         assertNotNull(claimedDevice);
         assertNotNull(claimedDevice.getCustomerId());
-        assertEquals(customerAdmin.getCustomerId(), claimedDevice.getCustomerId());
+        assertEquals(customerId, claimedDevice.getCustomerId());
 
         claimResponse = doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResponse.class, status().isBadRequest());
         assertEquals(claimResponse, ClaimResponse.CLAIMED);
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimJsonDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimJsonDeviceTest.java
index 89ef5e57fe..8e1d663565 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimJsonDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimJsonDeviceTest.java
@@ -36,7 +36,6 @@ public class CoapClaimJsonDeviceTest extends CoapClaimDeviceTest {
                 .transportPayloadType(TransportPayloadType.JSON)
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
     }
 
     @After
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimProtoDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimProtoDeviceTest.java
index 7dbebac847..eb66e63190 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimProtoDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimProtoDeviceTest.java
@@ -39,7 +39,6 @@ public class CoapClaimProtoDeviceTest extends CoapClaimDeviceTest {
                 .transportPayloadType(TransportPayloadType.PROTOBUF)
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
     }
 
     @After
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
index 510854d759..c0aeaf37ef 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
@@ -189,9 +189,9 @@ public abstract class AbstractMqttIntegrationTest extends AbstractTransportInteg
         subscribeAndWait(client, attrSubTopic, deviceId, featureType, MqttQoS.AT_MOST_ONCE);
     }
 
-    protected void subscribeAndWait(MqttTestClient client, String attrSubTopic, DeviceId deviceId, FeatureType featureType, MqttQoS mqttQoS) throws MqttException {
+    protected void subscribeAndWait(MqttTestClient client, String subTopic, DeviceId deviceId, FeatureType featureType, MqttQoS mqttQoS) throws MqttException {
         int subscriptionCount = getDeviceActorSubscriptionCount(deviceId, featureType);
-        client.subscribeAndWait(attrSubTopic, mqttQoS);
+        client.subscribeAndWait(subTopic, mqttQoS);
         // TODO: This test awaits for the device actor to receive the subscription. Ideally it should not happen. See details below:
         // The transport layer acknowledge subscription request once the message about subscription is in the queue.
         // Test sends data immediately after acknowledgement.
@@ -200,8 +200,8 @@ public abstract class AbstractMqttIntegrationTest extends AbstractTransportInteg
         awaitForDeviceActorToReceiveSubscription(deviceId, featureType, subscriptionCount + 1);
     }
 
-    protected void subscribeAndCheckSubscription(MqttTestClient client, String attrSubTopic, DeviceId deviceId, FeatureType featureType) throws MqttException {
-        client.subscribeAndWait(attrSubTopic, MqttQoS.AT_MOST_ONCE);
+    protected void subscribeAndCheckSubscription(MqttTestClient client, String subTopic, DeviceId deviceId, FeatureType featureType) throws MqttException {
+        client.subscribeAndWait(subTopic, MqttQoS.AT_MOST_ONCE);
         // TODO: This test awaits for the device actor to receive the subscription. Ideally it should not happen. See details below:
         // The transport layer acknowledge subscription request once the message about subscription is in the queue.
         // Test sends data immediately after acknowledgement.
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimBackwardCompatibilityDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimBackwardCompatibilityDeviceTest.java
index feab658a9b..96e45d51c0 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimBackwardCompatibilityDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimBackwardCompatibilityDeviceTest.java
@@ -36,7 +36,6 @@ public class MqttClaimBackwardCompatibilityDeviceTest extends MqttClaimDeviceTes
                 .useJsonPayloadFormatForDefaultDownlinkTopics(true)
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimDeviceTest.java
index b253136b6e..fbc12e48ba 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimDeviceTest.java
@@ -19,10 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Before;
 import org.junit.Test;
 import org.thingsboard.server.common.data.ClaimRequest;
-import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.dao.device.claim.ClaimResponse;
 import org.thingsboard.server.dao.device.claim.ClaimResult;
 import org.thingsboard.server.dao.service.DaoSqlTest;
@@ -41,11 +38,6 @@ import static org.thingsboard.server.common.data.device.profile.MqttTopics.GATEW
 @DaoSqlTest
 public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
 
-    protected static final String CUSTOMER_USER_PASSWORD = "customerUser123!";
-
-    protected User customerAdmin;
-    protected Customer savedCustomer;
-
     @Before
     public void beforeTest() throws Exception {
         MqttTestConfigProperties configProperties = MqttTestConfigProperties.builder()
@@ -53,26 +45,6 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
                 .gatewayName("Test Claim gateway")
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
-    }
-
-    protected void createCustomerAndUser() throws Exception {
-        Customer customer = new Customer();
-        customer.setTenantId(tenantId);
-        customer.setTitle("Test Claiming Customer");
-        savedCustomer = doPost("/api/customer", customer, Customer.class);
-        assertNotNull(savedCustomer);
-        assertEquals(tenantId, savedCustomer.getTenantId());
-
-        User user = new User();
-        user.setAuthority(Authority.CUSTOMER_USER);
-        user.setTenantId(tenantId);
-        user.setCustomerId(savedCustomer.getId());
-        user.setEmail("customer@thingsboard.org");
-
-        customerAdmin = createUser(user, CUSTOMER_USER_PASSWORD);
-        assertNotNull(customerAdmin);
-        assertEquals(customerAdmin.getCustomerId(), savedCustomer.getId());
     }
 
     @Test
@@ -113,8 +85,9 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
 
     protected void validateClaimResponse(boolean emptyPayload, MqttTestClient client, byte[] payloadBytes, byte[] failurePayloadBytes) throws Exception {
         client.publishAndWait(DEVICE_CLAIM_TOPIC, failurePayloadBytes);
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
-        loginUser(customerAdmin.getName(), CUSTOMER_USER_PASSWORD);
+        loginCustomerUser();
         ClaimRequest claimRequest;
         if (!emptyPayload) {
             claimRequest = new ClaimRequest("value");
@@ -132,6 +105,7 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
 
         client.publishAndWait(DEVICE_CLAIM_TOPIC, payloadBytes);
         client.disconnect();
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
         ClaimResult claimResult = doExecuteWithRetriesAndInterval(
                 () -> doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResult.class, status().isOk()),
@@ -142,7 +116,7 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
         Device claimedDevice = claimResult.getDevice();
         assertNotNull(claimedDevice);
         assertNotNull(claimedDevice.getCustomerId());
-        assertEquals(customerAdmin.getCustomerId(), claimedDevice.getCustomerId());
+        assertEquals(customerId, claimedDevice.getCustomerId());
 
         claimResponse = doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResponse.class, status().isBadRequest());
         assertEquals(claimResponse, ClaimResponse.CLAIMED);
@@ -158,8 +132,9 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
         );
 
         assertNotNull(savedDevice);
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
-        loginUser(customerAdmin.getName(), CUSTOMER_USER_PASSWORD);
+        loginCustomerUser();
         ClaimRequest claimRequest;
         if (!emptyPayload) {
             claimRequest = new ClaimRequest("value");
@@ -172,6 +147,7 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
 
         client.publishAndWait(GATEWAY_CLAIM_TOPIC, payloadBytes);
         client.disconnect();
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
         ClaimResult claimResult = doExecuteWithRetriesAndInterval(
                 () -> doPostClaimAsync("/api/customer/device/" + deviceName + "/claim", claimRequest, ClaimResult.class, status().isOk()),
@@ -183,7 +159,7 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
         Device claimedDevice = claimResult.getDevice();
         assertNotNull(claimedDevice);
         assertNotNull(claimedDevice.getCustomerId());
-        assertEquals(customerAdmin.getCustomerId(), claimedDevice.getCustomerId());
+        assertEquals(customerId, claimedDevice.getCustomerId());
 
         claimResponse = doPostClaimAsync("/api/customer/device/" + deviceName + "/claim", claimRequest, ClaimResponse.class, status().isBadRequest());
         assertEquals(claimResponse, ClaimResponse.CLAIMED);
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimJsonDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimJsonDeviceTest.java
index a591933cf7..c567ef25d1 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimJsonDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimJsonDeviceTest.java
@@ -34,7 +34,6 @@ public class MqttClaimJsonDeviceTest extends MqttClaimDeviceTest {
                 .transportPayloadType(TransportPayloadType.JSON)
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimProtoDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimProtoDeviceTest.java
index d4276eb211..a8bc81cee5 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimProtoDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimProtoDeviceTest.java
@@ -36,7 +36,6 @@ public class MqttClaimProtoDeviceTest extends MqttClaimDeviceTest {
                 .transportPayloadType(TransportPayloadType.PROTOBUF)
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/AbstractMqttV5ClaimTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/AbstractMqttV5ClaimTest.java
index 7213ecafb5..00a190f6d0 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/AbstractMqttV5ClaimTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/AbstractMqttV5ClaimTest.java
@@ -17,10 +17,7 @@ package org.thingsboard.server.transport.mqtt.mqttv5.claim;
 
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.ClaimRequest;
-import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.dao.device.claim.ClaimResponse;
 import org.thingsboard.server.dao.device.claim.ClaimResult;
 import org.thingsboard.server.transport.mqtt.mqttv5.AbstractMqttV5Test;
@@ -33,10 +30,6 @@ import static org.thingsboard.server.common.data.device.profile.MqttTopics.DEVIC
 
 @Slf4j
 public abstract class AbstractMqttV5ClaimTest extends AbstractMqttV5Test {
-    protected static final String CUSTOMER_USER_PASSWORD = "customerUser123!";
-
-    protected User customerAdmin;
-    protected Customer savedCustomer;
 
     protected void processTestClaimingDevice() throws Exception {
         MqttV5TestClient client = new MqttV5TestClient();
@@ -50,8 +43,9 @@ public abstract class AbstractMqttV5ClaimTest extends AbstractMqttV5Test {
 
     protected void validateClaimResponse(MqttV5TestClient client, byte[] payloadBytes, byte[] failurePayloadBytes) throws Exception {
         client.publishAndWait(DEVICE_CLAIM_TOPIC, failurePayloadBytes);
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
-        loginUser(customerAdmin.getName(), CUSTOMER_USER_PASSWORD);
+        loginCustomerUser();
         ClaimRequest claimRequest = new ClaimRequest("value");
 
         ClaimResponse claimResponse = doExecuteWithRetriesAndInterval(
@@ -64,6 +58,7 @@ public abstract class AbstractMqttV5ClaimTest extends AbstractMqttV5Test {
 
         client.publishAndWait(DEVICE_CLAIM_TOPIC, payloadBytes);
         client.disconnect();
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
         ClaimResult claimResult = doExecuteWithRetriesAndInterval(
                 () -> doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResult.class, status().isOk()),
@@ -74,28 +69,10 @@ public abstract class AbstractMqttV5ClaimTest extends AbstractMqttV5Test {
         Device claimedDevice = claimResult.getDevice();
         assertNotNull(claimedDevice);
         assertNotNull(claimedDevice.getCustomerId());
-        assertEquals(customerAdmin.getCustomerId(), claimedDevice.getCustomerId());
+        assertEquals(customerId, claimedDevice.getCustomerId());
 
         claimResponse = doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResponse.class, status().isBadRequest());
         assertEquals(claimResponse, ClaimResponse.CLAIMED);
     }
 
-    protected void createCustomerAndUser() throws Exception {
-        Customer customer = new Customer();
-        customer.setTenantId(tenantId);
-        customer.setTitle("Test Claiming Customer");
-        savedCustomer = doPost("/api/customer", customer, Customer.class);
-        assertNotNull(savedCustomer);
-        assertEquals(tenantId, savedCustomer.getTenantId());
-
-        User user = new User();
-        user.setAuthority(Authority.CUSTOMER_USER);
-        user.setTenantId(tenantId);
-        user.setCustomerId(savedCustomer.getId());
-        user.setEmail("customer@thingsboard.org");
-
-        customerAdmin = createUser(user, CUSTOMER_USER_PASSWORD);
-        assertNotNull(customerAdmin);
-        assertEquals(customerAdmin.getCustomerId(), savedCustomer.getId());
-    }
 }
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/MqttV5ClaimTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/MqttV5ClaimTest.java
index dcabe07de1..75e884f9fd 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/MqttV5ClaimTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/MqttV5ClaimTest.java
@@ -29,7 +29,6 @@ public class MqttV5ClaimTest extends AbstractMqttV5ClaimTest {
                 .deviceName("Test Claim device")
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
     }
 
     @Test
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/event/EventService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/event/EventService.java
index 9b0d5a280d..ef6ebdcdd7 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/event/EventService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/event/EventService.java
@@ -35,6 +35,8 @@ public interface EventService {
 
     List<EventInfo> findLatestEvents(TenantId tenantId, EntityId entityId, EventType eventType, int limit);
 
+    EventInfo findLatestDebugRuleNodeInEvent(TenantId tenantId, EntityId entityId);
+
     PageData<EventInfo> findEventsByFilter(TenantId tenantId, EntityId entityId, EventFilter eventFilter, TimePageLink pageLink);
 
     void removeEvents(TenantId tenantId, EntityId entityId);
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationService.java
index 18c9d4a7fb..91f6f7a379 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationService.java
@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.id.NotificationId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.Notification;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 
@@ -30,13 +31,13 @@ public interface NotificationService {
 
     boolean markNotificationAsRead(TenantId tenantId, UserId recipientId, NotificationId notificationId);
 
-    int markAllNotificationsAsRead(TenantId tenantId, UserId recipientId);
+    int markAllNotificationsAsRead(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId);
 
-    PageData<Notification> findNotificationsByRecipientIdAndReadStatus(TenantId tenantId, UserId recipientId, boolean unreadOnly, PageLink pageLink);
+    PageData<Notification> findNotificationsByRecipientIdAndReadStatus(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, boolean unreadOnly, PageLink pageLink);
 
-    PageData<Notification> findLatestUnreadNotificationsByRecipientId(TenantId tenantId, UserId recipientId, int limit);
+    PageData<Notification> findLatestUnreadNotificationsByRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, int limit);
 
-    int countUnreadNotificationsByRecipientId(TenantId tenantId, UserId recipientId);
+    int countUnreadNotificationsByRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId);
 
     boolean deleteNotification(TenantId tenantId, UserId recipientId, NotificationId notificationId);
 
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java
index 11a71eaff5..bef82f921f 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.entity.EntityDaoService;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 public interface TenantService extends EntityDaoService {
 
@@ -36,7 +37,7 @@ public interface TenantService extends EntityDaoService {
 
     Tenant saveTenant(Tenant tenant);
 
-    Tenant saveTenant(Tenant tenant, boolean publishSaveEvent);
+    Tenant saveTenant(Tenant tenant, Consumer<TenantId> defaultEntitiesCreator);
 
     boolean tenantExists(TenantId tenantId);
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java b/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
index 9f0100dbb1..398cd17aa1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
@@ -36,7 +36,7 @@ public class Customer extends ContactBased<CustomerId> implements HasTenantId, E
 
     @NoXss
     @Length(fieldName = "title")
-    @Schema(required = true, description = "Title of the customer", example = "Company A")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Title of the customer", example = "Company A")
     private String title;
     @Schema(description = "JSON object with Tenant Id")
     private TenantId tenantId;
@@ -132,7 +132,7 @@ public class Customer extends ContactBased<CustomerId> implements HasTenantId, E
         return super.getPhone();
     }
 
-    @Schema(required = true, description = "Email", example = "example@company.com")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, 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/DashboardInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java
index be0f7ce109..238ef8744c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java
@@ -85,7 +85,7 @@ public class DashboardInfo extends BaseData<DashboardId> implements HasName, Has
         this.tenantId = tenantId;
     }
 
-    @Schema(required = true, description = "Title of the dashboard.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Title of the dashboard.")
     public String getTitle() {
         return title;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Device.java b/common/data/src/main/java/org/thingsboard/server/common/data/Device.java
index 13df99ca50..e7c37d3ed1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/Device.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/Device.java
@@ -136,7 +136,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         this.customerId = customerId;
     }
 
-    @Schema(required = true, description = "Unique Device Name in scope of Tenant", example = "A4B72CCDFF33")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Unique Device Name in scope of Tenant", example = "A4B72CCDFF33")
     @Override
     public String getName() {
         return name;
@@ -164,7 +164,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         this.label = label;
     }
 
-    @Schema(required = true, description = "JSON object with Device Profile Id.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with Device Profile Id.")
     public DeviceProfileId getDeviceProfileId() {
         return deviceProfileId;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
index 4a4e785dac..344045134e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
@@ -40,17 +40,17 @@ public class EntityView extends BaseDataWithAdditionalInfo<EntityViewId>
 
     private static final long serialVersionUID = 5582010124562018986L;
 
-    @Schema(required = true, description = "JSON object with the referenced Entity Id (Device or Asset).")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with the referenced Entity Id (Device or Asset).")
     private EntityId entityId;
     private TenantId tenantId;
     private CustomerId customerId;
     @NoXss
     @Length(fieldName = "name")
-    @Schema(required = true, description = "Entity View name", example = "A4B72CCDFF33")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Entity View name", example = "A4B72CCDFF33")
     private String name;
     @NoXss
     @Length(fieldName = "type")
-    @Schema(required = true, description = "Device Profile Name", example = "Temperature Sensor")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Device Profile Name", example = "Temperature Sensor")
     private String type;
     @Schema(description = "Set of telemetry and attribute keys to expose via Entity View.")
     private TelemetryEntityView keys;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/SaveDeviceWithCredentialsRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/SaveDeviceWithCredentialsRequest.java
index bc40710aed..24991bb71d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/SaveDeviceWithCredentialsRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/SaveDeviceWithCredentialsRequest.java
@@ -25,10 +25,10 @@ import jakarta.validation.constraints.NotNull;;
 @Data
 public class SaveDeviceWithCredentialsRequest {
 
-    @Schema(description = "The JSON with device entity.", required = true)
+    @Schema(description = "The JSON with device entity.", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull
     private final Device device;
-    @Schema(description = "The JSON with credentials entity.", required = true)
+    @Schema(description = "The JSON with credentials entity.", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull
     private final DeviceCredentials credentials;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java b/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java
index 1f649f69e6..7cb7e15395 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
@@ -33,7 +33,7 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId, HasTi
 
     @Length(fieldName = "title")
     @NoXss
-    @Schema(required = true, description = "Title of the tenant", example = "Company A")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Title of the tenant", example = "Company A")
     private String title;
     @NoXss
     @Length(fieldName = "region")
@@ -152,7 +152,7 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId, HasTi
         return super.getPhone();
     }
 
-    @Schema(required = true, description = "Email", example = "example@company.com")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, 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/User.java b/common/data/src/main/java/org/thingsboard/server/common/data/User.java
index 2027de62be..678b7cdac6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/User.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/User.java
@@ -103,7 +103,7 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
         this.customerId = customerId;
     }
 
-    @Schema(required = true, description = "Email of the user", example = "user@example.com")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Email of the user", example = "user@example.com")
     public String getEmail() {
         return email;
     }
@@ -119,7 +119,7 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
         return email;
     }
 
-    @Schema(required = true, description = "Authority", example = "SYS_ADMIN, TENANT_ADMIN or CUSTOMER_USER")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Authority", example = "SYS_ADMIN, TENANT_ADMIN or CUSTOMER_USER")
     public Authority getAuthority() {
         return authority;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
index 04d2b9231c..19e0bc29b1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
@@ -59,16 +59,16 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
     private CustomerId customerId;
 
     @NoXss
-    @Schema(required = true, description = "representing type of the Alarm", example = "High Temperature Alarm")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "representing type of the Alarm", example = "High Temperature Alarm")
     @Length(fieldName = "type")
     private String type;
-    @Schema(required = true, description = "JSON object with alarm originator id")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with alarm originator id")
     private EntityId originator;
-    @Schema(required = true, description = "Alarm severity", example = "CRITICAL")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Alarm severity", example = "CRITICAL")
     private AlarmSeverity severity;
-    @Schema(required = true, description = "Acknowledged", example = "true")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Acknowledged", example = "true")
     private boolean acknowledged;
-    @Schema(required = true, description = "Cleared", example = "false")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Cleared", example = "false")
     private boolean cleared;
     @Schema(description = "Alarm assignee user id")
     private UserId assigneeId;
@@ -128,7 +128,7 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
 
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @Schema(required = true, description = "representing type of the Alarm", example = "High Temperature Alarm")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "representing type of the Alarm", example = "High Temperature Alarm")
     public String getName() {
         return type;
     }
@@ -150,7 +150,7 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
     }
 
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @Schema(required = true, description = "status of the Alarm", example = "ACTIVE_UNACK", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "status of the Alarm", example = "ACTIVE_UNACK", accessMode = Schema.AccessMode.READ_ONLY)
     public AlarmStatus getStatus() {
         return toStatus(cleared, acknowledged);
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCreateOrUpdateActiveRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCreateOrUpdateActiveRequest.java
index 54dd8ba71b..c39c603a9e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCreateOrUpdateActiveRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCreateOrUpdateActiveRequest.java
@@ -40,14 +40,14 @@ public class AlarmCreateOrUpdateActiveRequest implements AlarmModificationReques
     @Schema(description = "JSON object with Customer Id", accessMode = Schema.AccessMode.READ_ONLY)
     private CustomerId customerId;
     @NotNull
-    @Schema(required = true, description = "representing type of the Alarm", example = "High Temperature Alarm")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "representing type of the Alarm", example = "High Temperature Alarm")
     @Length(fieldName = "type")
     private String type;
     @NotNull
-    @Schema(required = true, description = "JSON object with alarm originator id")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with alarm originator id")
     private EntityId originator;
     @NotNull
-    @Schema(required = true, description = "Alarm severity", example = "CRITICAL")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Alarm severity", example = "CRITICAL")
     private AlarmSeverity severity;
     @Schema(description = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
     private long startTs;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmUpdateRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmUpdateRequest.java
index 544d200a27..8eb418d6dc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmUpdateRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmUpdateRequest.java
@@ -41,7 +41,7 @@ public class AlarmUpdateRequest implements AlarmModificationRequest {
             "Omit this field to create new alarm.")
     private AlarmId alarmId;
     @NotNull
-    @Schema(required = true, description = "Alarm severity", example = "CRITICAL")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Alarm severity", example = "CRITICAL")
     private AlarmSeverity severity;
     @Schema(description = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
     private long startTs;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java b/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java
index 753a83fbaf..16518bc618 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java
@@ -120,7 +120,7 @@ public class Asset extends BaseDataWithAdditionalInfo<AssetId> implements HasLab
         this.customerId = customerId;
     }
 
-    @Schema(required = true, description = "Unique Asset Name in scope of Tenant", example = "Empire State Building")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Unique Asset Name in scope of Tenant", example = "Empire State Building")
     @Override
     public String getName() {
         return name;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
index d281589734..67d32d6e89 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
@@ -120,13 +120,13 @@ public class Edge extends BaseDataWithAdditionalInfo<EdgeId> implements HasLabel
         return this.rootRuleChainId;
     }
 
-    @Schema(required = true, description = "Unique Edge Name in scope of Tenant", example = "Silo_A_Edge")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Unique Edge Name in scope of Tenant", example = "Silo_A_Edge")
     @Override
     public String getName() {
         return this.name;
     }
 
-    @Schema(required = true, description = "Edge type", example = "Silos")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Edge type", example = "Silos")
     public String getType() {
         return this.type;
     }
@@ -136,12 +136,12 @@ public class Edge extends BaseDataWithAdditionalInfo<EdgeId> implements HasLabel
         return this.label;
     }
 
-    @Schema(required = true, description = "Edge routing key ('username') to authorize on cloud")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Edge routing key ('username') to authorize on cloud")
     public String getRoutingKey() {
         return this.routingKey;
     }
 
-    @Schema(required = true, description = "Edge secret ('password') to authorize on cloud")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Edge secret ('password') to authorize on cloud")
     public String getSecret() {
         return this.secret;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/EventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/EventFilter.java
index dc7f632037..6d2a110cf7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/EventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/EventFilter.java
@@ -33,7 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 })
 public interface EventFilter {
 
-    @Schema(required = true, description = "String value representing the event type", example = "STATS")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "String value representing the event type", example = "STATS")
     EventType getEventType();
 
     boolean isNotEmpty();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmId.java
index aae2e3726a..02b4d602ce 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmId.java
@@ -36,7 +36,7 @@ public class AlarmId extends UUIDBased implements EntityId {
         return new AlarmId(UUID.fromString(alarmId));
     }
 
-    @Schema(required = true, description = "string", example = "ALARM", allowableValues = "ALARM")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "ALARM", allowableValues = "ALARM")
     @Override
     public EntityType getEntityType() {
         return EntityType.ALARM;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/ApiUsageStateId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/ApiUsageStateId.java
index 228b4160a0..ec942731f3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/ApiUsageStateId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/ApiUsageStateId.java
@@ -34,7 +34,7 @@ public class ApiUsageStateId extends UUIDBased implements EntityId {
         return new ApiUsageStateId(UUID.fromString(userId));
     }
 
-    @Schema(required = true, description = "string", example = "API_USAGE_STATE", allowableValues = "API_USAGE_STATE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "API_USAGE_STATE", allowableValues = "API_USAGE_STATE")
     @Override
     public EntityType getEntityType() {
         return EntityType.API_USAGE_STATE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetId.java
index 2c70920aeb..a45668e9bd 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetId.java
@@ -36,7 +36,7 @@ public class AssetId extends UUIDBased implements EntityId {
         return new AssetId(UUID.fromString(assetId));
     }
 
-    @Schema(required = true, description = "string", example = "ASSET", allowableValues = "ASSET")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "ASSET", allowableValues = "ASSET")
     @Override
     public EntityType getEntityType() {
         return EntityType.ASSET;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetProfileId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetProfileId.java
index 0efd6dcf71..d2377c19e6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetProfileId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetProfileId.java
@@ -35,7 +35,7 @@ public class AssetProfileId extends UUIDBased implements EntityId {
         return new AssetProfileId(UUID.fromString(assetProfileId));
     }
 
-    @Schema(required = true, description = "string", example = "ASSET_PROFILE", allowableValues = "ASSET_PROFILE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "ASSET_PROFILE", allowableValues = "ASSET_PROFILE")
     @Override
     public EntityType getEntityType() {
         return EntityType.ASSET_PROFILE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/CustomerId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/CustomerId.java
index 72f380a4bd..d8ef7fd09e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/CustomerId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/CustomerId.java
@@ -32,7 +32,7 @@ public final class CustomerId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "CUSTOMER", allowableValues = "CUSTOMER")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "CUSTOMER", allowableValues = "CUSTOMER")
     @Override
     public EntityType getEntityType() {
         return EntityType.CUSTOMER;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/DashboardId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/DashboardId.java
index 7220919b14..a7c21821ff 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/DashboardId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/DashboardId.java
@@ -34,7 +34,7 @@ public class DashboardId extends UUIDBased implements EntityId {
         return new DashboardId(UUID.fromString(dashboardId));
     }
 
-    @Schema(required = true, description = "string", example = "DASHBOARD", allowableValues = "DASHBOARD")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "DASHBOARD", allowableValues = "DASHBOARD")
     @Override
     public EntityType getEntityType() {
         return EntityType.DASHBOARD;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceId.java
index d59de6cb07..8fe48b9836 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceId.java
@@ -37,7 +37,7 @@ public class DeviceId extends UUIDBased implements EntityId {
     }
 
     @Override
-    @Schema(required = true, description = "string", example = "DEVICE", allowableValues = "DEVICE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "DEVICE", allowableValues = "DEVICE")
     public EntityType getEntityType() {
         return EntityType.DEVICE;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceProfileId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceProfileId.java
index 11679436f5..7050fa7ff3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceProfileId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceProfileId.java
@@ -35,7 +35,7 @@ public class DeviceProfileId extends UUIDBased implements EntityId {
         return new DeviceProfileId(UUID.fromString(deviceProfileId));
     }
 
-    @Schema(required = true, description = "string", example = "DEVICE_PROFILE", allowableValues = "DEVICE_PROFILE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "DEVICE_PROFILE", allowableValues = "DEVICE_PROFILE")
     @Override
     public EntityType getEntityType() {
         return EntityType.DEVICE_PROFILE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java
index 1d6c1dad49..5c29c210df 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java
@@ -41,7 +41,7 @@ public class EdgeId extends UUIDBased implements EntityId {
         return new EdgeId(UUID.fromString(edgeId));
     }
 
-    @Schema(required = true, description = "string", example = "EDGE", allowableValues = "EDGE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "EDGE", allowableValues = "EDGE")
     @Override
     public EntityType getEntityType() {
         return EntityType.EDGE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityViewId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityViewId.java
index a44f35e5d3..7c5f7be1e8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityViewId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityViewId.java
@@ -38,7 +38,7 @@ public class EntityViewId extends UUIDBased implements EntityId {
         return new EntityViewId(UUID.fromString(entityViewID));
     }
 
-    @Schema(required = true, description = "string", example = "ENTITY_VIEW", allowableValues = "ENTITY_VIEW")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "ENTITY_VIEW", allowableValues = "ENTITY_VIEW")
     @Override
     public EntityType getEntityType() {
         return EntityType.ENTITY_VIEW;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationId.java
index be8aa8e9cd..8fc12993b2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationId.java
@@ -29,7 +29,7 @@ public class NotificationId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "NOTIFICATION", allowableValues = "NOTIFICATION")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "NOTIFICATION", allowableValues = "NOTIFICATION")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRequestId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRequestId.java
index afcb27f0c9..30c7336b79 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRequestId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRequestId.java
@@ -29,7 +29,7 @@ public class NotificationRequestId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "NOTIFICATION_REQUEST", allowableValues = "NOTIFICATION_REQUEST")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "NOTIFICATION_REQUEST", allowableValues = "NOTIFICATION_REQUEST")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_REQUEST;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRuleId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRuleId.java
index dc5e6c8671..c17e42a759 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRuleId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRuleId.java
@@ -29,7 +29,7 @@ public class NotificationRuleId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "NOTIFICATION_RULE", allowableValues = "NOTIFICATION_RULE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "NOTIFICATION_RULE", allowableValues = "NOTIFICATION_RULE")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_RULE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTargetId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTargetId.java
index 3966dbbbd7..2984bc7644 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTargetId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTargetId.java
@@ -29,7 +29,7 @@ public class NotificationTargetId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "NOTIFICATION_TARGET", allowableValues = "NOTIFICATION_TARGET")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "NOTIFICATION_TARGET", allowableValues = "NOTIFICATION_TARGET")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_TARGET;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTemplateId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTemplateId.java
index 65f312b7e0..9fb99a578e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTemplateId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTemplateId.java
@@ -29,7 +29,7 @@ public class NotificationTemplateId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "NOTIFICATION_TEMPLATE", allowableValues = "NOTIFICATION_TEMPLATE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "NOTIFICATION_TEMPLATE", allowableValues = "NOTIFICATION_TEMPLATE")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_TEMPLATE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/OtaPackageId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/OtaPackageId.java
index 3225a72f6f..bc042883ce 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/OtaPackageId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/OtaPackageId.java
@@ -35,7 +35,7 @@ public class OtaPackageId extends UUIDBased implements EntityId {
         return new OtaPackageId(UUID.fromString(firmwareId));
     }
 
-    @Schema(required = true, description = "string", example = "OTA_PACKAGE", allowableValues = "OTA_PACKAGE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "OTA_PACKAGE", allowableValues = "OTA_PACKAGE")
     @Override
     public EntityType getEntityType() {
         return EntityType.OTA_PACKAGE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueId.java
index 7f415fc451..48987a0539 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueId.java
@@ -35,9 +35,9 @@ public class QueueId extends UUIDBased implements EntityId {
         return new QueueId(UUID.fromString(queueId));
     }
 
-    @Schema(required = true, description = "string", example = "QUEUE", allowableValues = "QUEUE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "QUEUE", allowableValues = "QUEUE")
     @Override
     public EntityType getEntityType() {
         return EntityType.QUEUE;
     }
-}
\ No newline at end of file
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueStatsId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueStatsId.java
index ae5a4843ed..dd36f09313 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueStatsId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueStatsId.java
@@ -35,9 +35,9 @@ public class QueueStatsId extends UUIDBased implements EntityId {
         return new QueueStatsId(UUID.fromString(queueId));
     }
 
-    @Schema(required = true, description = "string", example = "QUEUE_STATS", allowableValues = "QUEUE_STATS")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "QUEUE_STATS", allowableValues = "QUEUE_STATS")
     @Override
     public EntityType getEntityType() {
         return EntityType.QUEUE_STATS;
     }
-}
\ No newline at end of file
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/RpcId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/RpcId.java
index b544971d98..c6bf1aff87 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/RpcId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/RpcId.java
@@ -31,7 +31,7 @@ public final class RpcId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "RPC", allowableValues = "RPC")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "RPC", allowableValues = "RPC")
     @Override
     public EntityType getEntityType() {
         return EntityType.RPC;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleChainId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleChainId.java
index 379d1f608e..1557b053c2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleChainId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleChainId.java
@@ -29,7 +29,7 @@ public class RuleChainId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "RULE_CHAIN", allowableValues = "RULE_CHAIN")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "RULE_CHAIN", allowableValues = "RULE_CHAIN")
     @Override
     public EntityType getEntityType() {
         return EntityType.RULE_CHAIN;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleNodeId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleNodeId.java
index b0c1d1c8e5..945c99a89a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleNodeId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleNodeId.java
@@ -29,7 +29,7 @@ public class RuleNodeId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "RULE_NODE", allowableValues = "RULE_NODE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "RULE_NODE", allowableValues = "RULE_NODE")
     @Override
     public EntityType getEntityType() {
         return EntityType.RULE_NODE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/TbResourceId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/TbResourceId.java
index 28d22d04f5..a2ef70b75b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/TbResourceId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/TbResourceId.java
@@ -31,7 +31,7 @@ public class TbResourceId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "TB_RESOURCE", allowableValues = "TB_RESOURCE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "TB_RESOURCE", allowableValues = "TB_RESOURCE")
     @Override
     public EntityType getEntityType() {
         return EntityType.TB_RESOURCE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java
index aead099818..e160eb59d0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java
@@ -50,7 +50,7 @@ public final class TenantId extends UUIDBased implements EntityId {
         return this.equals(SYS_TENANT_ID);
     }
 
-    @Schema(required = true, description = "string", example = "TENANT", allowableValues = "TENANT")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "TENANT", allowableValues = "TENANT")
     @Override
     public EntityType getEntityType() {
         return EntityType.TENANT;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantProfileId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantProfileId.java
index ea2aaa1ac1..7b40eb01ed 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantProfileId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantProfileId.java
@@ -35,7 +35,7 @@ public class TenantProfileId extends UUIDBased implements EntityId {
         return new TenantProfileId(UUID.fromString(tenantProfileId));
     }
 
-    @Schema(required = true, description = "string", example = "TENANT_PROFILE", allowableValues = "TENANT_PROFILE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "TENANT_PROFILE", allowableValues = "TENANT_PROFILE")
     @Override
     public EntityType getEntityType() {
         return EntityType.TENANT_PROFILE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/UUIDBased.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/UUIDBased.java
index b9fd9d30ee..e0a1abf9ff 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/UUIDBased.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/UUIDBased.java
@@ -36,7 +36,7 @@ public abstract class UUIDBased implements HasUUID, Serializable {
         this.id = id;
     }
 
-    @Schema(required = true, description = "string", example = "784f394c-42b6-435a-983c-b7beff2784f9")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "784f394c-42b6-435a-983c-b7beff2784f9")
     public UUID getId() {
         return id;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetTypeId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetTypeId.java
index dfa1934499..76a631d4fb 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetTypeId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetTypeId.java
@@ -31,7 +31,7 @@ public final class WidgetTypeId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "WIDGET_TYPE", allowableValues = "WIDGET_TYPE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "WIDGET_TYPE", allowableValues = "WIDGET_TYPE")
     @Override
     public EntityType getEntityType() {
         return EntityType.WIDGET_TYPE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetsBundleId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetsBundleId.java
index eaa679bc6a..fd9d3e9db7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetsBundleId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetsBundleId.java
@@ -31,7 +31,7 @@ public final class WidgetsBundleId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "WIDGETS_BUNDLE", allowableValues = "WIDGETS_BUNDLE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "WIDGETS_BUNDLE", allowableValues = "WIDGETS_BUNDLE")
     @Override
     public EntityType getEntityType() {
         return EntityType.WIDGETS_BUNDLE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/Notification.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/Notification.java
index 0f7095c755..6335cb671d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/Notification.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/Notification.java
@@ -36,13 +36,12 @@ public class Notification extends BaseData<NotificationId> {
 
     private NotificationRequestId requestId;
     private UserId recipientId;
-
     private NotificationType type;
+    private NotificationDeliveryMethod deliveryMethod;
     private String subject;
     private String text;
     private JsonNode additionalConfig;
     private NotificationInfo info;
-
     private NotificationStatus status;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
index 3d419caea8..926e063f8d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
@@ -38,7 +38,7 @@ public class OAuth2BasicMapperConfig {
     @Length(fieldName = "lastNameAttributeKey", max = 31)
     @Schema(description = "Last name attribute key")
     private final String lastNameAttributeKey;
-    @Schema(description = "Tenant naming strategy. For DOMAIN type, domain for tenant name will be taken from the email (substring before '@')", required = true)
+    @Schema(description = "Tenant naming strategy. For DOMAIN type, domain for tenant name will be taken from the email (substring before '@')", requiredMode = Schema.RequiredMode.REQUIRED)
     private final TenantNameStrategyType tenantNameStrategy;
     @Length(fieldName = "tenantNamePattern")
     @Schema(description = "Tenant name pattern for CUSTOM naming strategy. " +
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java
index 0f9f580264..aa15466d0e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java
@@ -36,7 +36,7 @@ import java.util.List;
 public class OAuth2ClientRegistrationTemplate extends BaseDataWithAdditionalInfo<OAuth2ClientRegistrationTemplateId> implements HasName {
 
     @Length(fieldName = "providerId")
-    @Schema(description = "OAuth2 provider identifier (e.g. its name)", required = true)
+    @Schema(description = "OAuth2 provider identifier (e.g. its name)", requiredMode = Schema.RequiredMode.REQUIRED)
     private String providerId;
     @Valid
     @Schema(description = "Default config for mapping OAuth2 log in response to platform entities")
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2DomainInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2DomainInfo.java
index 9ddc3c8492..dc70213e95 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2DomainInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2DomainInfo.java
@@ -31,8 +31,8 @@ import lombok.ToString;
 @Builder
 @Schema
 public class OAuth2DomainInfo {
-    @Schema(description = "Domain scheme. Mixed scheme means than both HTTP and HTTPS are going to be used", required = true)
+    @Schema(description = "Domain scheme. Mixed scheme means than both HTTP and HTTPS are going to be used", requiredMode = Schema.RequiredMode.REQUIRED)
     private SchemeType scheme;
-    @Schema(description = "Domain name. Cannot be empty", required = true)
+    @Schema(description = "Domain name. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String name;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Info.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Info.java
index 034070f57c..0a2ace050c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Info.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Info.java
@@ -37,6 +37,6 @@ public class OAuth2Info {
     private boolean enabled;
     @Schema(description = "Whether OAuth2 settings are enabled on Edge or not")
     private boolean edgeEnabled;
-    @Schema(description = "List of configured OAuth2 clients. Cannot contain null values", required = true)
+    @Schema(description = "List of configured OAuth2 clients. Cannot contain null values", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<OAuth2ParamsInfo> oauth2ParamsInfos;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MapperConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MapperConfig.java
index ad39cdad04..be13a032e2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MapperConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MapperConfig.java
@@ -32,7 +32,7 @@ public class OAuth2MapperConfig {
     private boolean allowUserCreation;
     @Schema(description = "Whether user credentials should be activated when user is created after successful authentication")
     private boolean activateUser;
-    @Schema(description = "Type of OAuth2 mapper. Depending on this param, different mapper config fields must be specified", required = true)
+    @Schema(description = "Type of OAuth2 mapper. Depending on this param, different mapper config fields must be specified", requiredMode = Schema.RequiredMode.REQUIRED)
     private MapperType type;
     @Valid
     @Schema(description = "Mapper config for BASIC and GITHUB mapper types")
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MobileInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MobileInfo.java
index 8aaffb80aa..053762bdf0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MobileInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MobileInfo.java
@@ -31,8 +31,8 @@ import lombok.ToString;
 @Builder
 @Schema
 public class OAuth2MobileInfo {
-    @Schema(description = "Application package name. Cannot be empty", required = true)
+    @Schema(description = "Application package name. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String pkgName;
-    @Schema(description = "Application secret. The length must be at least 16 characters", required = true)
+    @Schema(description = "Application secret. The length must be at least 16 characters", requiredMode = Schema.RequiredMode.REQUIRED)
     private String appSecret;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ParamsInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ParamsInfo.java
index 76dca282cf..c1b6124b8f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ParamsInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ParamsInfo.java
@@ -36,11 +36,11 @@ public class OAuth2ParamsInfo {
 
     @Schema(description = "List of configured domains where OAuth2 platform will redirect a user after successful " +
             "authentication. Cannot be empty. There have to be only one domain with specific name with scheme type 'MIXED'. " +
-            "Configured domains with the same name must have different scheme types", required = true)
+            "Configured domains with the same name must have different scheme types", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<OAuth2DomainInfo> domainInfos;
-    @Schema(description = "Mobile applications settings. Application package name must be unique within the list", required = true)
+    @Schema(description = "Mobile applications settings. Application package name must be unique within the list", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<OAuth2MobileInfo> mobileInfos;
-    @Schema(description = "List of OAuth2 provider settings. Cannot be empty", required = true)
+    @Schema(description = "List of OAuth2 provider settings. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<OAuth2RegistrationInfo> clientRegistrations;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2RegistrationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2RegistrationInfo.java
index 1773583ffc..36bae12b23 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2RegistrationInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2RegistrationInfo.java
@@ -34,17 +34,17 @@ import java.util.List;
 @Builder
 @Schema
 public class OAuth2RegistrationInfo {
-    @Schema(description = "Config for mapping OAuth2 log in response to platform entities", required = true)
+    @Schema(description = "Config for mapping OAuth2 log in response to platform entities", requiredMode = Schema.RequiredMode.REQUIRED)
     private OAuth2MapperConfig mapperConfig;
-    @Schema(description = "OAuth2 client ID. Cannot be empty", required = true)
+    @Schema(description = "OAuth2 client ID. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String clientId;
-    @Schema(description = "OAuth2 client secret. Cannot be empty", required = true)
+    @Schema(description = "OAuth2 client secret. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String clientSecret;
-    @Schema(description = "Authorization URI of the OAuth2 provider. Cannot be empty", required = true)
+    @Schema(description = "Authorization URI of the OAuth2 provider. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String authorizationUri;
-    @Schema(description = "Access token URI of the OAuth2 provider. Cannot be empty", required = true)
+    @Schema(description = "Access token URI of the OAuth2 provider. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String accessTokenUri;
-    @Schema(description = "OAuth scopes that will be requested from OAuth2 platform. Cannot be empty", required = true)
+    @Schema(description = "OAuth scopes that will be requested from OAuth2 platform. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<String> scope;
     @Schema(description = "User info URI of the OAuth2 provider")
     private String userInfoUri;
@@ -52,14 +52,14 @@ public class OAuth2RegistrationInfo {
     private String userNameAttributeName;
     @Schema(description = "JSON Web Key URI of the OAuth2 provider")
     private String jwkSetUri;
-    @Schema(description = "Client authentication method to use: 'BASIC' or 'POST'. Cannot be empty", required = true)
+    @Schema(description = "Client authentication method to use: 'BASIC' or 'POST'. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String clientAuthenticationMethod;
-    @Schema(description = "OAuth2 provider label. Cannot be empty", required = true)
+    @Schema(description = "OAuth2 provider label. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String loginButtonLabel;
     @Schema(description = "Log in button icon for OAuth2 provider")
     private String loginButtonIcon;
     @Schema(description = "List of platforms for which usage of the OAuth2 client is allowed (empty for all allowed)")
     private List<PlatformType> platforms;
-    @Schema(description = "Additional info of OAuth2 client (e.g. providerName)", required = true)
+    @Schema(description = "Additional info of OAuth2 client (e.g. providerName)", requiredMode = Schema.RequiredMode.REQUIRED)
     private JsonNode additionalInfo;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java
index a6f504577b..309385d5e4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java
@@ -31,11 +31,11 @@ import java.util.List;
 @NoArgsConstructor
 public class AttributesEntityView implements Serializable {
 
-    @Schema(required = true, description = "List of client-side attribute keys to expose", example = "currentConfiguration")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of client-side attribute keys to expose", example = "currentConfiguration")
     private List<String> cs = new ArrayList<>();
-    @Schema(required = true, description = "List of server-side attribute keys to expose", example = "model")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of server-side attribute keys to expose", example = "model")
     private List<String> ss = new ArrayList<>();
-    @Schema(required = true, description = "List of shared attribute keys to expose", example = "targetConfiguration")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of shared attribute keys to expose", example = "targetConfiguration")
     private List<String> sh = new ArrayList<>();
 
     public AttributesEntityView(List<String> cs,
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java
index 609d185f9c..a2484b0707 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java
@@ -31,9 +31,9 @@ import java.util.List;
 @NoArgsConstructor
 public class TelemetryEntityView implements Serializable {
 
-    @Schema(required = true, description = "List of time-series data keys to expose", example = "temperature, humidity")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of time-series data keys to expose", example = "temperature, humidity")
     private List<String> timeseries;
-    @Schema(required = true, description = "JSON object with attributes to expose")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with attributes to expose")
     private AttributesEntityView attributes;
 
     public TelemetryEntityView(List<String> timeseries, AttributesEntityView attributes) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/DefaultRuleChainCreateRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/DefaultRuleChainCreateRequest.java
index d984fd244d..cda3072101 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/DefaultRuleChainCreateRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/DefaultRuleChainCreateRequest.java
@@ -28,7 +28,7 @@ public class DefaultRuleChainCreateRequest implements Serializable {
 
     private static final long serialVersionUID = 5600333716030561537L;
 
-    @Schema(required = true, description = "Name of the new rule chain", example = "Root Rule Chain")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Name of the new rule chain", example = "Root Rule Chain")
     private String name;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/NodeConnectionInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/NodeConnectionInfo.java
index 82be10c121..fe80293d16 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/NodeConnectionInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/NodeConnectionInfo.java
@@ -24,10 +24,10 @@ import lombok.Data;
 @Schema
 @Data
 public class NodeConnectionInfo {
-    @Schema(required = true, description = "Index of rule node in the 'nodes' array of the RuleChainMetaData. Indicates the 'from' part of the connection.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Index of rule node in the 'nodes' array of the RuleChainMetaData. Indicates the 'from' part of the connection.")
     private int fromIndex;
-    @Schema(required = true, description = "Index of rule node in the 'nodes' array of the RuleChainMetaData. Indicates the 'to' part of the connection.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Index of rule node in the 'nodes' array of the RuleChainMetaData. Indicates the 'to' part of the connection.")
     private int toIndex;
-    @Schema(required = true, description = "Type of the relation. Typically indicated the result of processing by the 'from' rule node. For example, 'Success' or 'Failure'")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the relation. Typically indicated the result of processing by the 'from' rule node. For example, 'Success' or 'Failure'")
     private String type;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
index be901a9176..c293e6f570 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
@@ -39,11 +39,11 @@ public class RuleChain extends BaseDataWithAdditionalInfo<RuleChainId> implement
 
     private static final long serialVersionUID = -5656679015121935465L;
 
-    @Schema(required = true, description = "JSON object with Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
     @NoXss
     @Length(fieldName = "name")
-    @Schema(required = true, description = "Rule Chain name", example = "Humidity data processing")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Chain name", example = "Humidity data processing")
     private String name;
     @Schema(description = "Rule Chain type. 'EDGE' rule chains are processing messages on the edge devices only.", example = "A4B72CCDFF33")
     private RuleChainType type;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainConnectionInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainConnectionInfo.java
index 654f296c63..029cfb9976 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainConnectionInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainConnectionInfo.java
@@ -26,12 +26,12 @@ import org.thingsboard.server.common.data.id.RuleChainId;
 @Schema
 @Data
 public class RuleChainConnectionInfo {
-    @Schema(required = true, description = "Index of rule node in the 'nodes' array of the RuleChainMetaData. Indicates the 'from' part of the connection.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Index of rule node in the 'nodes' array of the RuleChainMetaData. Indicates the 'from' part of the connection.")
     private int fromIndex;
-    @Schema(required = true, description = "JSON object with the Rule Chain Id.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with the Rule Chain Id.")
     private RuleChainId targetRuleChainId;
-    @Schema(required = true, description = "JSON object with the additional information about the connection.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with the additional information about the connection.")
     private JsonNode additionalInfo;
-    @Schema(required = true, description = "Type of the relation. Typically indicated the result of processing by the 'from' rule node. For example, 'Success' or 'Failure'")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the relation. Typically indicated the result of processing by the 'from' rule node. For example, 'Success' or 'Failure'")
     private String type;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainData.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainData.java
index e9899d6019..e75d830e84 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainData.java
@@ -24,8 +24,8 @@ import java.util.List;
 @Data
 public class RuleChainData {
 
-    @Schema(required = true, description = "List of the Rule Chain objects.", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of the Rule Chain objects.", accessMode = Schema.AccessMode.READ_ONLY)
     List<RuleChain> ruleChains;
-    @Schema(required = true, description = "List of the Rule Chain metadata objects.", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of the Rule Chain metadata objects.", accessMode = Schema.AccessMode.READ_ONLY)
     List<RuleChainMetaData> metadata;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java
index 9a7bc70a7f..eb18e28c8c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java
@@ -29,19 +29,19 @@ import java.util.List;
 @Data
 public class RuleChainMetaData {
 
-    @Schema(required = true, description = "JSON object with Rule Chain Id.", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with Rule Chain Id.", accessMode = Schema.AccessMode.READ_ONLY)
     private RuleChainId ruleChainId;
 
-    @Schema(required = true, description = "Index of the first rule node in the 'nodes' list")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Index of the first rule node in the 'nodes' list")
     private Integer firstNodeIndex;
 
-    @Schema(required = true, description = "List of rule node JSON objects")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of rule node JSON objects")
     private List<RuleNode> nodes;
 
-    @Schema(required = true, description = "List of JSON objects that represent connections between rule nodes")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of JSON objects that represent connections between rule nodes")
     private List<NodeConnectionInfo> connections;
 
-    @Schema(required = true, description = "List of JSON objects that represent connections between rule nodes and other rule chains.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of JSON objects that represent connections between rule nodes and other rule chains.")
     private List<RuleChainConnectionInfo> ruleChainConnections;
 
     public void addConnectionInfo(int fromIndex, int toIndex, String type) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainOutputLabelsUsage.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainOutputLabelsUsage.java
index d0c7186501..b9fb1fc6d8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainOutputLabelsUsage.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainOutputLabelsUsage.java
@@ -28,16 +28,16 @@ import java.util.Set;
 @Slf4j
 public class RuleChainOutputLabelsUsage {
 
-    @Schema(required = true, description = "Rule Chain Id", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Chain Id", accessMode = Schema.AccessMode.READ_ONLY)
     private RuleChainId ruleChainId;
-    @Schema(required = true, description = "Rule Node Id", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Node Id", accessMode = Schema.AccessMode.READ_ONLY)
     private RuleNodeId ruleNodeId;
 
-    @Schema(required = true, description = "Rule Chain Name", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Chain Name", accessMode = Schema.AccessMode.READ_ONLY)
     private String ruleChainName;
-    @Schema(required = true, description = "Rule Node Name", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Node Name", accessMode = Schema.AccessMode.READ_ONLY)
     private String ruleNodeName;
-    @Schema(required = true, description = "Output labels", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Output labels", accessMode = Schema.AccessMode.READ_ONLY)
     private Set<String> labels;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentials.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentials.java
index f59b86af63..24d8cc1175 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentials.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentials.java
@@ -47,7 +47,7 @@ public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements
         this.credentialsValue = deviceCredentials.getCredentialsValue();
     }
 
-    @Schema(required = true, accessMode = Schema.AccessMode.READ_ONLY, description = "The Id is automatically generated during device creation. " +
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, accessMode = Schema.AccessMode.READ_ONLY, description = "The Id is automatically generated during device creation. " +
             "Use 'getDeviceCredentialsByDeviceId' to obtain the id based on device id. " +
             "Use 'updateDeviceCredentials' to update device credentials. ", example = "784f394c-42b6-435a-983c-b7beff2784f9")
     @Override
@@ -61,7 +61,7 @@ public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements
         return super.getCreatedTime();
     }
 
-    @Schema(required = true, description = "JSON object with the device Id.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with the device Id.")
     public DeviceId getDeviceId() {
         return deviceId;
     }
@@ -80,7 +80,7 @@ public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements
         this.credentialsType = credentialsType;
     }
 
-    @Schema(required = true, description = "Unique Credentials Id per platform instance. " +
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Unique Credentials Id per platform instance. " +
             "Used to lookup credentials from the database. " +
             "By default, new access token for your device. " +
             "Depends on the type of the credentials."
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java
index 8ed16a1c1c..5fc0c14d61 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java
@@ -20,27 +20,27 @@ import lombok.Data;
 
 @Data
 public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
-    @Schema(description = "SMPP version", allowableValues = "3.3, 3.4", required = true)
+    @Schema(description = "SMPP version", allowableValues = "3.3, 3.4", requiredMode = Schema.RequiredMode.REQUIRED)
     private String protocolVersion;
 
-    @Schema(description = "SMPP host", required = true)
+    @Schema(description = "SMPP host", requiredMode = Schema.RequiredMode.REQUIRED)
     private String host;
-    @Schema(description = "SMPP port", required = true)
+    @Schema(description = "SMPP port", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer port;
 
-    @Schema(description = "System ID", required = true)
+    @Schema(description = "System ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private String systemId;
-    @Schema(description = "Password", required = true)
+    @Schema(description = "Password", requiredMode = Schema.RequiredMode.REQUIRED)
     private String password;
 
-    @Schema(description = "System type", required = false)
+    @Schema(description = "System type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String systemType;
-    @Schema(description = "TX - Transmitter, RX - Receiver, TRX - Transciever. By default TX is used", required = false)
+    @Schema(description = "TX - Transmitter, RX - Receiver, TRX - Transciever. By default TX is used", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private SmppBindType bindType;
-    @Schema(description = "Service type", required = false)
+    @Schema(description = "Service type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String serviceType;
 
-    @Schema(description = "Source address", required = false)
+    @Schema(description = "Source address", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String sourceAddress;
     @Schema(description = "Source TON (Type of Number). Needed is source address is set. 5 by default.\n" +
             "0 - Unknown\n" +
@@ -49,7 +49,7 @@ public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
             "3 - Network Specific\n" +
             "4 - Subscriber Number\n" +
             "5 - Alphanumeric\n" +
-            "6 - Abbreviated", required = false)
+            "6 - Abbreviated", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Byte sourceTon;
     @Schema(description = "Source NPI (Numbering Plan Identification). Needed is source address is set. 0 by default.\n" +
             "0 - Unknown\n" +
@@ -61,7 +61,7 @@ public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
             "9 - Private numbering plan\n" +
             "10 - ERMES numbering plan (ETSI DE/PS 3 01-3)\n" +
             "13 - Internet (IP)\n" +
-            "18 - WAP Client Id (to be defined by WAP Forum)", required = false)
+            "18 - WAP Client Id (to be defined by WAP Forum)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Byte sourceNpi;
 
     @Schema(description = "Destination TON (Type of Number). 5 by default.\n" +
@@ -71,7 +71,7 @@ public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
             "3 - Network Specific\n" +
             "4 - Subscriber Number\n" +
             "5 - Alphanumeric\n" +
-            "6 - Abbreviated", required = false)
+            "6 - Abbreviated", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Byte destinationTon;
     @Schema(description = "Destination NPI (Numbering Plan Identification). 0 by default.\n" +
             "0 - Unknown\n" +
@@ -83,10 +83,10 @@ public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
             "9 - Private numbering plan\n" +
             "10 - ERMES numbering plan (ETSI DE/PS 3 01-3)\n" +
             "13 - Internet (IP)\n" +
-            "18 - WAP Client Id (to be defined by WAP Forum)", required = false)
+            "18 - WAP Client Id (to be defined by WAP Forum)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Byte destinationNpi;
 
-    @Schema(description = "Address range", required = false)
+    @Schema(description = "Address range", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String addressRange;
 
     @Schema(allowableValues = "0-10,13-14",
@@ -102,7 +102,7 @@ public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
                     "9 - Pictogram Encoding\n" +
                     "10 - Music Codes (ISO-2022-JP)\n" +
                     "13 - Extended Kanji JIS (X 0212-1990)\n" +
-                    "14 - Korean Graphic Character Set (KS C 5601/KS X 1001)", required = false)
+                    "14 - Korean Graphic Character Set (KS C 5601/KS X 1001)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Byte codingScheme;
 
     @Override
diff --git a/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java b/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
index 3c4a1e6be9..23bfe55f1b 100644
--- a/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
+++ b/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
@@ -111,7 +111,7 @@ public class EdgeGrpcClient implements EdgeRpcClient {
                 .setConnectRequestMsg(ConnectRequestMsg.newBuilder()
                         .setEdgeRoutingKey(edgeKey)
                         .setEdgeSecret(edgeSecret)
-                        .setEdgeVersion(EdgeVersion.V_3_6_2)
+                        .setEdgeVersion(EdgeVersion.V_3_7_0)
                         .setMaxInboundMessageSize(maxInboundMessageSize)
                         .build())
                 .build());
@@ -248,4 +248,5 @@ public class EdgeGrpcClient implements EdgeRpcClient {
             uplinkMsgLock.unlock();
         }
     }
+
 }
diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
index 58959e4d19..3096c7b08a 100644
--- a/common/edge-api/src/main/proto/edge.proto
+++ b/common/edge-api/src/main/proto/edge.proto
@@ -37,7 +37,8 @@ enum EdgeVersion {
   V_3_6_0 = 3;
   V_3_6_1 = 4;
   V_3_6_2 = 5;
-  V_3_7_0 = 6;
+  V_3_6_4 = 6;
+  V_3_7_0 = 7;
 }
 
 /**
diff --git a/common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java b/common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
index 38f84bb4a1..e89ce5634c 100644
--- a/common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
+++ b/common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
@@ -258,31 +258,31 @@ public class ProtoUtils {
                         .setLastUpdateTs(attributeKvEntry.getLastUpdateTs())
                         .setKey(attributeKvEntry.getKey());
                 switch (attributeKvEntry.getDataType()) {
-                    case BOOLEAN:
+                    case BOOLEAN -> {
                         attributeKvEntry.getBooleanValue().ifPresent(attributeValueBuilder::setBoolV);
                         attributeValueBuilder.setHasV(attributeKvEntry.getBooleanValue().isPresent());
                         attributeValueBuilder.setType(TransportProtos.KeyValueType.BOOLEAN_V);
-                        break;
-                    case STRING:
+                    }
+                    case STRING -> {
                         attributeKvEntry.getStrValue().ifPresent(attributeValueBuilder::setStringV);
                         attributeValueBuilder.setHasV(attributeKvEntry.getStrValue().isPresent());
                         attributeValueBuilder.setType(TransportProtos.KeyValueType.STRING_V);
-                        break;
-                    case DOUBLE:
+                    }
+                    case DOUBLE -> {
                         attributeKvEntry.getDoubleValue().ifPresent(attributeValueBuilder::setDoubleV);
                         attributeValueBuilder.setHasV(attributeKvEntry.getDoubleValue().isPresent());
                         attributeValueBuilder.setType(TransportProtos.KeyValueType.DOUBLE_V);
-                        break;
-                    case LONG:
+                    }
+                    case LONG -> {
                         attributeKvEntry.getLongValue().ifPresent(attributeValueBuilder::setLongV);
                         attributeValueBuilder.setHasV(attributeKvEntry.getLongValue().isPresent());
                         attributeValueBuilder.setType(TransportProtos.KeyValueType.LONG_V);
-                        break;
-                    case JSON:
+                    }
+                    case JSON -> {
                         attributeKvEntry.getJsonValue().ifPresent(attributeValueBuilder::setJsonV);
                         attributeValueBuilder.setHasV(attributeKvEntry.getJsonValue().isPresent());
                         attributeValueBuilder.setType(TransportProtos.KeyValueType.JSON_V);
-                        break;
+                    }
                 }
                 builder.addValues(attributeValueBuilder.build());
             }
diff --git a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
index 4190c6bbc9..6817ec71f0 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
@@ -30,6 +30,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.kv.DataType;
 import org.thingsboard.server.common.data.kv.KvEntry;
 
@@ -50,6 +51,7 @@ import java.util.regex.Pattern;
 /**
  * Created by Valerii Sosliuk on 5/12/2017.
  */
+@Slf4j
 public class JacksonUtil {
 
     public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@@ -158,6 +160,20 @@ public class JacksonUtil {
         }
     }
 
+    public static String toPlainText(String data) {
+        if (data == null) {
+            return null;
+        }
+        if (data.startsWith("\"") && data.endsWith("\"") && data.length() >= 2) {
+            final String dataBefore = data;
+            try {
+                data = JacksonUtil.fromString(data, String.class);
+            } catch (Exception ignored) {}
+            log.trace("Trimming double quotes. Before trim: [{}], after trim: [{}]", dataBefore, data);
+        }
+        return data;
+    }
+
     public static <T> T treeToValue(JsonNode node, Class<T> clazz) {
         try {
             return OBJECT_MAPPER.treeToValue(node, clazz);
@@ -239,6 +255,10 @@ public class JacksonUtil {
         return node;
     }
 
+    public static ObjectNode asObject(JsonNode node) {
+        return node != null && node.isObject() ? ((ObjectNode) node) : newObjectNode();
+    }
+
     public static void replaceUuidsRecursively(JsonNode node, Set<String> skippedRootFields, Pattern includedFieldsPattern, UnaryOperator<UUID> replacer, boolean root) {
         if (node == null) {
             return;
diff --git a/common/util/src/test/java/org/thingsboard/common/util/JacksonUtilTest.java b/common/util/src/test/java/org/thingsboard/common/util/JacksonUtilTest.java
index 7e37d34509..dcddc6e07a 100644
--- a/common/util/src/test/java/org/thingsboard/common/util/JacksonUtilTest.java
+++ b/common/util/src/test/java/org/thingsboard/common/util/JacksonUtilTest.java
@@ -19,6 +19,9 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.id.AssetId;
 
@@ -55,4 +58,15 @@ public class JacksonUtilTest {
         Assert.assertEquals(asset.getName(), result.getName());
         Assert.assertEquals(asset.getType(), result.getType());
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = { "", "false", "\"", "\"\"", "\"This is a string with double quotes\"", "Path: /home/developer/test.txt",
+            "First line\nSecond line\n\nFourth line", "Before\rAfter", "Tab\tSeparated\tValues", "Test\bbackspace", "[]",
+            "[1, 2, 3]", "{\"key\": \"value\"}", "{\n\"temperature\": 25.5,\n\"humidity\": 50.2\n\"}", "Expression: (a + b) * c",
+            "世界", "Україна", "\u1F1FA\u1F1E6", "🇺🇦"})
+    public void toPlainTextTest(String original) {
+         String serialized = JacksonUtil.toString(original);
+        Assertions.assertNotNull(serialized);
+        Assertions.assertEquals(original, JacksonUtil.toPlainText(serialized));
+    }
 }
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 d5b7955d85..466a591394 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
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.event.TransactionalEventListener;
 import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
@@ -366,7 +366,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
             return Futures.successfulAsList(futures);
         }, MoreExecutors.directExecutor());
 
-        edges = Futures.transform(edges, new Function<List<Edge>, List<Edge>>() {
+        edges = Futures.transform(edges, new Function<>() {
             @Nullable
             @Override
             public List<Edge> apply(@Nullable List<Edge> edgeList) {
@@ -426,7 +426,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     }
 
     private PaginatedRemover<TenantId, Edge> tenantEdgesRemover =
-            new PaginatedRemover<TenantId, Edge>() {
+            new PaginatedRemover<>() {
 
                 @Override
                 protected PageData<Edge> findEntities(TenantId tenantId, TenantId id, PageLink pageLink) {
@@ -439,7 +439,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
                 }
             };
 
-    private PaginatedRemover<CustomerId, Edge> customerEdgeUnassigner = new PaginatedRemover<CustomerId, Edge>() {
+    private PaginatedRemover<CustomerId, Edge> customerEdgeUnassigner = new PaginatedRemover<>() {
 
         @Override
         protected PageData<Edge> findEntities(TenantId tenantId, CustomerId id, PageLink pageLink) {
@@ -525,7 +525,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public String findMissingToRelatedRuleChains(TenantId tenantId, EdgeId edgeId, String tbRuleChainInputNodeClassName) {
         List<RuleChain> edgeRuleChains = findEdgeRuleChains(tenantId, edgeId);
-        List<RuleChainId> edgeRuleChainIds = edgeRuleChains.stream().map(IdBased::getId).collect(Collectors.toList());
+        List<RuleChainId> edgeRuleChainIds = edgeRuleChains.stream().map(IdBased::getId).toList();
         ObjectNode result = JacksonUtil.newObjectNode();
         for (RuleChain edgeRuleChain : edgeRuleChains) {
             List<RuleNode> ruleNodes =
@@ -534,8 +534,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
                 List<RuleChainId> connectedRuleChains =
                         ruleNodes.stream()
                                 .filter(rn -> rn.getType().equals(tbRuleChainInputNodeClassName))
-                                .map(rn -> new RuleChainId(UUID.fromString(rn.getConfiguration().get("ruleChainId").asText())))
-                                .collect(Collectors.toList());
+                                .map(rn -> new RuleChainId(UUID.fromString(rn.getConfiguration().get("ruleChainId").asText()))).toList();
                 List<String> missingRuleChains = new ArrayList<>();
                 for (RuleChainId connectedRuleChain : connectedRuleChains) {
                     if (!edgeRuleChainIds.contains(connectedRuleChain)) {
@@ -561,7 +560,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
         if (persistToTelemetry) {
             futureKvEntry = timeseriesService.findLatest(tenantId, edgeId, key);
         } else {
-            futureKvEntry = attributesService.find(tenantId, edgeId, DataConstants.SERVER_SCOPE, key);
+            futureKvEntry = attributesService.find(tenantId, edgeId, AttributeScope.SERVER_SCOPE, key);
         }
         return Futures.transformAsync(futureKvEntry, kvEntryOpt ->
                 Futures.immediateFuture(kvEntryOpt.flatMap(KvEntry::getBooleanValue).orElse(false)), MoreExecutors.directExecutor());
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
index 5edb59f5c8..3cdcf5e874 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
@@ -40,11 +40,16 @@ import org.thingsboard.server.common.data.query.EntityDataQuery;
 import org.thingsboard.server.common.data.query.EntityFilterType;
 import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.EntityListFilter;
+import org.thingsboard.server.common.data.query.KeyFilter;
 import org.thingsboard.server.common.data.query.RelationsQueryFilter;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -63,6 +68,10 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
     public static final String INCORRECT_CUSTOMER_ID = "Incorrect customerId ";
     public static final CustomerId NULL_CUSTOMER_ID = new CustomerId(NULL_UUID);
 
+    private static final int MAX_ENTITY_IDS_SIZE = 1024;
+    private static final Set<EntityFilterType> EXCLUDED_TYPES_FROM_OPTIMIZATION = Set.of(
+            EntityFilterType.ENTITY_LIST, EntityFilterType.SINGLE_ENTITY, EntityFilterType.RELATIONS_QUERY);
+
     @Autowired
     private EntityQueryDao entityQueryDao;
 
@@ -86,9 +95,7 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
         validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         validateEntityDataQuery(query);
 
-        if (EntityFilterType.RELATIONS_QUERY.equals(query.getEntityFilter().getType())
-                || EntityFilterType.SINGLE_ENTITY.equals(query.getEntityFilter().getType())
-                || StringUtils.isNotEmpty(query.getPageLink().getTextSearch())) {
+        if (!isValidForOptimization(query)) {
             return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, query);
         }
 
@@ -97,41 +104,10 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
         if (entityDataByQuery == null || entityDataByQuery.getData().isEmpty()) {
             return entityDataByQuery;
         }
-        // 2 step - find entity data by entity ids from the 1st step
-        PageData<EntityData> result = findEntityDataByEntityIds(tenantId, customerId, query, entityDataByQuery.getData());
-        return new PageData<>(result.getData(), entityDataByQuery.getTotalPages(), entityDataByQuery.getTotalElements(), entityDataByQuery.hasNext());
-    }
-
-    private PageData<EntityData> findEntityIdsByFilterAndSorterColumns(TenantId tenantId, CustomerId customerId, EntityDataQuery query) {
-        List<EntityKey> entityFields = null;
-        List<EntityKey> latestValues = null;
-        if (query.getPageLink().getSortOrder() != null) {
-            if (query.getEntityFields() != null) {
-                entityFields = query.getEntityFields().stream()
-                        .filter(entityKey -> entityKey.getKey().equals(query.getPageLink().getSortOrder().getKey().getKey()))
-                        .collect(Collectors.toList());
-            }
-            if (query.getLatestValues() != null) {
-                latestValues = query.getLatestValues().stream()
-                        .filter(entityKey -> entityKey.getKey().equals(query.getPageLink().getSortOrder().getKey().getKey()))
-                        .collect(Collectors.toList());
-            }
-        }
-        EntityDataQuery entityQuery = new EntityDataQuery(query.getEntityFilter(), query.getPageLink(), entityFields, latestValues, query.getKeyFilters());
-        return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, entityQuery);
-    }
-
-    private PageData<EntityData> findEntityDataByEntityIds(TenantId tenantId, CustomerId customerId, EntityDataQuery query, List<EntityData> data) {
-        List<String> entityIds = data.stream().map(d -> d.getEntityId().getId().toString()).toList();
-        EntityType entityType = data.isEmpty() ? null : data.get(0).getEntityId().getEntityType();
-
-        EntityListFilter filter = new EntityListFilter();
-        filter.setEntityType(entityType);
-        filter.setEntityList(entityIds);
 
-        EntityDataPageLink pageLink = new EntityDataPageLink(query.getPageLink().getPageSize(), 0, null, query.getPageLink().getSortOrder());
-        EntityDataQuery entityQuery = new EntityDataQuery(filter, pageLink, query.getEntityFields(), query.getLatestValues(), null);
-        return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, entityQuery);
+        // 2 step - find entity data by entity ids from the 1st step
+        List<EntityData> result = fetchEntityDataByIdsFromInitialQuery(tenantId, customerId, query, entityDataByQuery.getData());
+        return new PageData<>(result, entityDataByQuery.getTotalPages(), entityDataByQuery.getTotalElements(), entityDataByQuery.hasNext());
     }
 
     @Override
@@ -228,4 +204,75 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
         }
     }
 
+    private boolean isValidForOptimization(EntityDataQuery query) {
+        if (StringUtils.isNotEmpty(query.getPageLink().getTextSearch())) {
+            return false;
+        }
+
+        if (EXCLUDED_TYPES_FROM_OPTIMIZATION.contains(query.getEntityFilter().getType())) {
+            return false;
+        }
+
+        if ((query.getEntityFields() == null || query.getEntityFields().isEmpty()) &&
+                (query.getLatestValues() == null || query.getLatestValues().isEmpty())) {
+            return false;
+        }
+
+        Set<EntityKey> filteringKeys = new HashSet<>(Optional.ofNullable(query.getKeyFilters()).orElse(Collections.emptyList()).stream().map(KeyFilter::getKey).toList());
+        Set<EntityKey> entityFields = new HashSet<>(Optional.ofNullable(query.getEntityFields()).orElse(Collections.emptyList()));
+        Set<EntityKey> latestValues = new HashSet<>(Optional.ofNullable(query.getLatestValues()).orElse(Collections.emptyList()));
+
+        return !(filteringKeys.containsAll(entityFields) && filteringKeys.containsAll(latestValues));
+    }
+
+    private PageData<EntityData> findEntityIdsByFilterAndSorterColumns(TenantId tenantId, CustomerId customerId, EntityDataQuery query) {
+        List<EntityKey> entityFields = null;
+        List<EntityKey> latestValues = null;
+        if (query.getPageLink().getSortOrder() != null) {
+            if (query.getEntityFields() != null) {
+                entityFields = query.getEntityFields().stream()
+                        .filter(entityKey -> entityKey.getKey().equals(query.getPageLink().getSortOrder().getKey().getKey()))
+                        .collect(Collectors.toList());
+            }
+            if (query.getLatestValues() != null) {
+                latestValues = query.getLatestValues().stream()
+                        .filter(entityKey -> entityKey.getKey().equals(query.getPageLink().getSortOrder().getKey().getKey()))
+                        .collect(Collectors.toList());
+            }
+        }
+        EntityDataQuery entityQuery = new EntityDataQuery(query.getEntityFilter(), query.getPageLink(), entityFields, latestValues, query.getKeyFilters());
+        return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, entityQuery);
+    }
+
+    private List<EntityData> fetchEntityDataByIdsFromInitialQuery(TenantId tenantId, CustomerId customerId, EntityDataQuery query, List<EntityData> initialQueryResult) {
+        List<EntityData> result = new ArrayList<>();
+
+        List<String> entityIds = initialQueryResult.stream().map(d -> d.getEntityId().getId().toString()).collect(Collectors.toList());
+        EntityType entityType = initialQueryResult.get(0).getEntityId().getEntityType();
+
+        if (entityIds.size() > MAX_ENTITY_IDS_SIZE) {
+            List<List<String>> chunks = new ArrayList<>();
+            for (int i = 0; i < entityIds.size(); i += MAX_ENTITY_IDS_SIZE) {
+                chunks.add(entityIds.subList(i, Math.min(entityIds.size(), i + MAX_ENTITY_IDS_SIZE)));
+            }
+            for (List<String> chunk : chunks) {
+                result.addAll(findEntityDataByEntityIds(tenantId, customerId, query, chunk, entityType, chunk.size()));
+            }
+        } else {
+            result.addAll(findEntityDataByEntityIds(tenantId, customerId, query, entityIds, entityType, query.getPageLink().getPageSize()));
+        }
+        return result;
+    }
+
+    private List<EntityData> findEntityDataByEntityIds(TenantId tenantId, CustomerId customerId, EntityDataQuery query,
+                                                       List<String> entityIds, EntityType entityType, int pageSize) {
+        EntityListFilter filter = new EntityListFilter();
+        filter.setEntityType(entityType);
+        filter.setEntityList(entityIds);
+
+        EntityDataPageLink pageLink = new EntityDataPageLink(pageSize, 0, null, query.getPageLink().getSortOrder());
+        EntityDataQuery entityQuery = new EntityDataQuery(filter, pageLink, query.getEntityFields(), query.getLatestValues(), null);
+        return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, entityQuery).getData();
+    }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java
index 88834eecbc..5314dcd405 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java
@@ -37,6 +37,7 @@ import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.dao.service.DataValidator;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -106,6 +107,11 @@ public class BaseEventService implements EventService {
         return convert(entityId.getEntityType(), eventDao.findLatestEvents(tenantId.getId(), entityId.getId(), eventType, limit));
     }
 
+    @Override
+    public EventInfo findLatestDebugRuleNodeInEvent(TenantId tenantId, EntityId entityId) {
+        return convert(entityId.getEntityType(), eventDao.findLatestDebugRuleNodeInEvent(tenantId.getId(), entityId.getId()));
+    }
+
     @Override
     public PageData<EventInfo> findEventsByFilter(TenantId tenantId, EntityId entityId, EventFilter eventFilter, TimePageLink pageLink) {
         return convert(entityId.getEntityType(), eventDao.findEventByFilter(tenantId.getId(), entityId.getId(), eventFilter, pageLink));
@@ -140,4 +146,8 @@ public class BaseEventService implements EventService {
         return list == null ? null : list.stream().map(e -> e.toInfo(entityType)).collect(Collectors.toList());
     }
 
+    private EventInfo convert(EntityType entityType, Event event) {
+        return Optional.ofNullable(event).map(e -> e.toInfo(entityType)).orElse(null);
+    }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java
index 2db5a7012d..6b3febf502 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java
@@ -62,6 +62,15 @@ public interface EventDao {
      */
     List<? extends Event> findLatestEvents(UUID tenantId, UUID entityId, EventType eventType, int limit);
 
+    /**
+     * Find latest debug IN event by tenantId, entityId.
+     *
+     * @param tenantId the tenantId
+     * @param entityId the entityId
+     * @return the latest debug IN event
+     */
+    Event findLatestDebugRuleNodeInEvent(UUID tenantId, UUID entityId);
+
     /**
      * Executes stored procedure to cleanup old events. Uses separate ttl for debug and other events.
      * @param regularEventExpTs the expiration time of the regular events
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
index e1771c8a97..ae15c2d029 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
@@ -629,6 +629,7 @@ public class ModelConstants {
     public static final String NOTIFICATION_REQUEST_ID_PROPERTY = "request_id";
     public static final String NOTIFICATION_RECIPIENT_ID_PROPERTY = "recipient_id";
     public static final String NOTIFICATION_TYPE_PROPERTY = "type";
+    public static final String NOTIFICATION_DELIVERY_METHOD_PROPERTY = "delivery_method";
     public static final String NOTIFICATION_SUBJECT_PROPERTY = "subject";
     public static final String NOTIFICATION_TEXT_PROPERTY = "body";
     public static final String NOTIFICATION_ADDITIONAL_CONFIG_PROPERTY = "additional_config";
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationEntity.java
index 169af3b4c1..7d84f03e46 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationEntity.java
@@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.id.NotificationId;
 import org.thingsboard.server.common.data.id.NotificationRequestId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.Notification;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.common.data.notification.NotificationType;
 import org.thingsboard.server.common.data.notification.info.NotificationInfo;
@@ -54,6 +55,10 @@ public class NotificationEntity extends BaseSqlEntity<Notification> {
     @Column(name = ModelConstants.NOTIFICATION_TYPE_PROPERTY, nullable = false)
     private NotificationType type;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name = ModelConstants.NOTIFICATION_DELIVERY_METHOD_PROPERTY, nullable = false)
+    private NotificationDeliveryMethod deliveryMethod;
+
     @Column(name = ModelConstants.NOTIFICATION_SUBJECT_PROPERTY)
     private String subject;
 
@@ -80,6 +85,7 @@ public class NotificationEntity extends BaseSqlEntity<Notification> {
         setRequestId(getUuid(notification.getRequestId()));
         setRecipientId(getUuid(notification.getRecipientId()));
         setType(notification.getType());
+        setDeliveryMethod(notification.getDeliveryMethod());
         setSubject(notification.getSubject());
         setText(notification.getText());
         setAdditionalConfig(notification.getAdditionalConfig());
@@ -95,6 +101,7 @@ public class NotificationEntity extends BaseSqlEntity<Notification> {
         notification.setRequestId(getEntityId(requestId, NotificationRequestId::new));
         notification.setRecipientId(getEntityId(recipientId, UserId::new));
         notification.setType(type);
+        notification.setDeliveryMethod(deliveryMethod);
         notification.setSubject(subject);
         notification.setText(text);
         notification.setAdditionalConfig(additionalConfig);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationService.java
index b62d9a83ad..38a8cb4178 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationService.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.id.NotificationId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.Notification;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -57,29 +58,29 @@ public class DefaultNotificationService implements NotificationService, EntityDa
     }
 
     @Override
-    public int markAllNotificationsAsRead(TenantId tenantId, UserId recipientId) {
-        return notificationDao.updateStatusByRecipientId(tenantId, recipientId, NotificationStatus.READ);
+    public int markAllNotificationsAsRead(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId) {
+        return notificationDao.updateStatusByDeliveryMethodAndRecipientId(tenantId, deliveryMethod, recipientId, NotificationStatus.READ);
     }
 
     @Override
-    public PageData<Notification> findNotificationsByRecipientIdAndReadStatus(TenantId tenantId, UserId recipientId, boolean unreadOnly, PageLink pageLink) {
+    public PageData<Notification> findNotificationsByRecipientIdAndReadStatus(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, boolean unreadOnly, PageLink pageLink) {
         if (unreadOnly) {
-            return notificationDao.findUnreadByRecipientIdAndPageLink(tenantId, recipientId, pageLink);
+            return notificationDao.findUnreadByDeliveryMethodAndRecipientIdAndPageLink(tenantId, deliveryMethod, recipientId, pageLink);
         } else {
-            return notificationDao.findByRecipientIdAndPageLink(tenantId, recipientId, pageLink);
+            return notificationDao.findByDeliveryMethodAndRecipientIdAndPageLink(tenantId, deliveryMethod, recipientId, pageLink);
         }
     }
 
     @Override
-    public PageData<Notification> findLatestUnreadNotificationsByRecipientId(TenantId tenantId, UserId recipientId, int limit) {
+    public PageData<Notification> findLatestUnreadNotificationsByRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, int limit) {
         SortOrder sortOrder = new SortOrder(EntityKeyMapping.CREATED_TIME, SortOrder.Direction.DESC);
         PageLink pageLink = new PageLink(limit, 0, null, sortOrder);
-        return findNotificationsByRecipientIdAndReadStatus(tenantId, recipientId, true, pageLink);
+        return findNotificationsByRecipientIdAndReadStatus(tenantId, deliveryMethod, recipientId, true, pageLink);
     }
 
     @Override
-    public int countUnreadNotificationsByRecipientId(TenantId tenantId, UserId recipientId) {
-        return notificationDao.countUnreadByRecipientId(tenantId, recipientId);
+    public int countUnreadNotificationsByRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId) {
+        return notificationDao.countUnreadByDeliveryMethodAndRecipientId(tenantId, deliveryMethod, recipientId);
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java
index 012d220174..10438c484a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java
@@ -20,7 +20,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AdminSettings;
@@ -157,7 +156,7 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS
         return new UserNotificationSettings(prefs);
     }
 
-    @Transactional(propagation = Propagation.NOT_SUPPORTED) // so that parent transaction is not aborted on method failure
+    @Transactional
     @Override
     public void createDefaultNotificationConfigs(TenantId tenantId) {
         NotificationTarget allUsers = createTarget(tenantId, "All users", new AllUsersFilter(),
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationDao.java b/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationDao.java
index 02bfe11fde..2233840058 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationDao.java
@@ -20,6 +20,7 @@ import org.thingsboard.server.common.data.id.NotificationRequestId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.Notification;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -27,19 +28,17 @@ import org.thingsboard.server.dao.Dao;
 
 public interface NotificationDao extends Dao<Notification> {
 
-    PageData<Notification> findUnreadByRecipientIdAndPageLink(TenantId tenantId, UserId recipientId, PageLink pageLink);
+    PageData<Notification> findUnreadByDeliveryMethodAndRecipientIdAndPageLink(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, PageLink pageLink);
 
-    PageData<Notification> findByRecipientIdAndPageLink(TenantId tenantId, UserId recipientId, PageLink pageLink);
+    PageData<Notification> findByDeliveryMethodAndRecipientIdAndPageLink(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, PageLink pageLink);
 
     boolean updateStatusByIdAndRecipientId(TenantId tenantId, UserId recipientId, NotificationId notificationId, NotificationStatus status);
 
-    int countUnreadByRecipientId(TenantId tenantId, UserId recipientId);
-
-    PageData<Notification> findByRequestId(TenantId tenantId, NotificationRequestId notificationRequestId, PageLink pageLink);
+    int countUnreadByDeliveryMethodAndRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId);
 
     boolean deleteByIdAndRecipientId(TenantId tenantId, UserId recipientId, NotificationId notificationId);
 
-    int updateStatusByRecipientId(TenantId tenantId, UserId recipientId, NotificationStatus status);
+    int updateStatusByDeliveryMethodAndRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, NotificationStatus status);
 
     void deleteByRequestId(TenantId tenantId, NotificationRequestId requestId);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
index dff1b7ab5d..3b7e9ab664 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
@@ -119,7 +119,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     public RuleChain saveRuleChain(RuleChain ruleChain, boolean publishSaveEvent) {
         ruleChainValidator.validate(ruleChain, RuleChain::getTenantId);
         try {
-            RuleChain savedRuleChain = ruleChainDao.save(ruleChain.getTenantId(), ruleChain);
+            RuleChain savedRuleChain = ruleChainDao.saveAndFlush(ruleChain.getTenantId(), ruleChain);
             if (ruleChain.getId() == null) {
                 entityCountService.publishCountEntityEvictEvent(ruleChain.getTenantId(), EntityType.RULE_CHAIN);
             }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
index 67bde161b6..afd6608774 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
@@ -392,6 +392,11 @@ public class JpaBaseEventDao implements EventDao {
         return DaoUtil.convertDataList(getEventRepository(eventType).findLatestEvents(tenantId, entityId, limit));
     }
 
+    @Override
+    public Event findLatestDebugRuleNodeInEvent(UUID tenantId, UUID entityId) {
+        return DaoUtil.getData(ruleNodeDebugEventRepository.findLatestDebugRuleNodeInEvent(tenantId, entityId));
+    }
+
     @Override
     public void cleanupEvents(long regularEventExpTs, long debugEventExpTs, boolean cleanupDb) {
         if (regularEventExpTs > 0) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/RuleNodeDebugEventRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/RuleNodeDebugEventRepository.java
index 7c13c923c8..05473d92f7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/RuleNodeDebugEventRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/RuleNodeDebugEventRepository.java
@@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.event.RuleNodeDebugEvent;
 import org.thingsboard.server.dao.model.sql.RuleNodeDebugEventEntity;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 
@@ -35,6 +36,9 @@ public interface RuleNodeDebugEventRepository extends EventRepository<RuleNodeDe
     @Query(nativeQuery = true,  value = "SELECT * FROM rule_node_debug_event e WHERE e.tenant_id = :tenantId AND e.entity_id = :entityId ORDER BY e.ts DESC LIMIT :limit")
     List<RuleNodeDebugEventEntity> findLatestEvents(@Param("tenantId") UUID tenantId, @Param("entityId") UUID entityId, @Param("limit") int limit);
 
+    @Query(nativeQuery = true,  value = "SELECT * FROM rule_node_debug_event e WHERE e.tenant_id = :tenantId AND e.entity_id = :entityId AND e.e_type = 'IN' ORDER BY e.ts DESC LIMIT 1")
+    Optional<RuleNodeDebugEventEntity> findLatestDebugRuleNodeInEvent(@Param("tenantId") UUID tenantId, @Param("entityId") UUID entityId);
+
     @Override
     @Query("SELECT e FROM RuleNodeDebugEventEntity e WHERE " +
             "e.tenantId = :tenantId " +
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationDao.java
index f095aad1ae..64d663b397 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationDao.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.id.NotificationRequestId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.Notification;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -51,14 +52,14 @@ public class JpaNotificationDao extends JpaPartitionedAbstractDao<NotificationEn
     private int partitionSizeInHours;
 
     @Override
-    public PageData<Notification> findUnreadByRecipientIdAndPageLink(TenantId tenantId, UserId recipientId, PageLink pageLink) {
-        return DaoUtil.toPageData(notificationRepository.findByRecipientIdAndStatusNot(recipientId.getId(), NotificationStatus.READ,
-                pageLink.getTextSearch(), DaoUtil.toPageable(pageLink)));
+    public PageData<Notification> findUnreadByDeliveryMethodAndRecipientIdAndPageLink(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, PageLink pageLink) {
+        return DaoUtil.toPageData(notificationRepository.findByDeliveryMethodAndRecipientIdAndStatusNot(deliveryMethod,
+                recipientId.getId(), NotificationStatus.READ, pageLink.getTextSearch(), DaoUtil.toPageable(pageLink)));
     }
 
     @Override
-    public PageData<Notification> findByRecipientIdAndPageLink(TenantId tenantId, UserId recipientId, PageLink pageLink) {
-        return DaoUtil.toPageData(notificationRepository.findByRecipientId(recipientId.getId(),
+    public PageData<Notification> findByDeliveryMethodAndRecipientIdAndPageLink(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, PageLink pageLink) {
+        return DaoUtil.toPageData(notificationRepository.findByDeliveryMethodAndRecipientId(deliveryMethod, recipientId.getId(),
                 pageLink.getTextSearch(), DaoUtil.toPageable(pageLink)));
     }
 
@@ -71,13 +72,8 @@ public class JpaNotificationDao extends JpaPartitionedAbstractDao<NotificationEn
      * For this hot method, the partial index `idx_notification_recipient_id_unread` was introduced since 3.6.0
      * */
     @Override
-    public int countUnreadByRecipientId(TenantId tenantId, UserId recipientId) {
-        return notificationRepository.countByRecipientIdAndStatusNot(recipientId.getId(), NotificationStatus.READ);
-    }
-
-    @Override
-    public PageData<Notification> findByRequestId(TenantId tenantId, NotificationRequestId notificationRequestId, PageLink pageLink) {
-        return DaoUtil.toPageData(notificationRepository.findByRequestId(notificationRequestId.getId(), DaoUtil.toPageable(pageLink)));
+    public int countUnreadByDeliveryMethodAndRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId) {
+        return notificationRepository.countByDeliveryMethodAndRecipientIdAndStatusNot(deliveryMethod, recipientId.getId(), NotificationStatus.READ);
     }
 
     @Override
@@ -86,8 +82,8 @@ public class JpaNotificationDao extends JpaPartitionedAbstractDao<NotificationEn
     }
 
     @Override
-    public int updateStatusByRecipientId(TenantId tenantId, UserId recipientId, NotificationStatus status) {
-        return notificationRepository.updateStatusByRecipientId(recipientId.getId(), status);
+    public int updateStatusByDeliveryMethodAndRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, NotificationStatus status) {
+        return notificationRepository.updateStatusByDeliveryMethodAndRecipientIdAndStatusNot(deliveryMethod, recipientId.getId(), status);
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRepository.java
index 4baa6071c7..dc432a566e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRepository.java
@@ -23,6 +23,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.dao.model.sql.NotificationEntity;
 
@@ -31,20 +32,23 @@ import java.util.UUID;
 @Repository
 public interface NotificationRepository extends JpaRepository<NotificationEntity, UUID> {
 
-    @Query("SELECT n FROM NotificationEntity n WHERE n.recipientId = :recipientId AND n.status <> :status " +
+    @Query("SELECT n FROM NotificationEntity n WHERE n.deliveryMethod = :deliveryMethod " +
+            "AND n.recipientId = :recipientId AND n.status <> :status " +
             "AND (:searchText is NULL OR ilike(n.subject, concat('%', :searchText, '%')) = true " +
             "OR ilike(n.text, concat('%', :searchText, '%')) = true)")
-    Page<NotificationEntity> findByRecipientIdAndStatusNot(@Param("recipientId") UUID recipientId,
-                                                           @Param("status") NotificationStatus status,
-                                                           @Param("searchText") String searchText,
-                                                           Pageable pageable);
+    Page<NotificationEntity> findByDeliveryMethodAndRecipientIdAndStatusNot(@Param("deliveryMethod") NotificationDeliveryMethod deliveryMethod,
+                                                                            @Param("recipientId") UUID recipientId,
+                                                                            @Param("status") NotificationStatus status,
+                                                                            @Param("searchText") String searchText,
+                                                                            Pageable pageable);
 
-    @Query("SELECT n FROM NotificationEntity n WHERE n.recipientId = :recipientId " +
+    @Query("SELECT n FROM NotificationEntity n WHERE n.deliveryMethod = :deliveryMethod AND n.recipientId = :recipientId " +
             "AND (:searchText is NULL OR ilike(n.subject, concat('%', :searchText, '%')) = true " +
             "OR ilike(n.text, concat('%', :searchText, '%')) = true)")
-    Page<NotificationEntity> findByRecipientId(@Param("recipientId") UUID recipientId,
-                                               @Param("searchText") String searchText,
-                                               Pageable pageable);
+    Page<NotificationEntity> findByDeliveryMethodAndRecipientId(@Param("deliveryMethod") NotificationDeliveryMethod deliveryMethod,
+                                                                @Param("recipientId") UUID recipientId,
+                                                                @Param("searchText") String searchText,
+                                                                Pageable pageable);
 
     @Modifying
     @Transactional
@@ -54,9 +58,7 @@ public interface NotificationRepository extends JpaRepository<NotificationEntity
                                        @Param("recipientId") UUID recipientId,
                                        @Param("status") NotificationStatus status);
 
-    int countByRecipientIdAndStatusNot(UUID recipientId, NotificationStatus status);
-
-    Page<NotificationEntity> findByRequestId(UUID requestId, Pageable pageable);
+    int countByDeliveryMethodAndRecipientIdAndStatusNot(NotificationDeliveryMethod deliveryMethod, UUID recipientId, NotificationStatus status);
 
     @Transactional
     @Modifying
@@ -76,8 +78,9 @@ public interface NotificationRepository extends JpaRepository<NotificationEntity
     @Modifying
     @Transactional
     @Query("UPDATE NotificationEntity n SET n.status = :status " +
-            "WHERE n.recipientId = :recipientId AND n.status <> :status")
-    int updateStatusByRecipientId(@Param("recipientId") UUID recipientId,
-                                  @Param("status") NotificationStatus status);
+            "WHERE n.deliveryMethod = :deliveryMethod AND n.recipientId = :recipientId AND n.status <> :status")
+    int updateStatusByDeliveryMethodAndRecipientIdAndStatusNot(@Param("deliveryMethod") NotificationDeliveryMethod deliveryMethod,
+                                                               @Param("recipientId") UUID recipientId,
+                                                               @Param("status") NotificationStatus status);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
index 9e673b4f8b..da96dee67b 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
@@ -48,6 +48,7 @@ import org.thingsboard.server.dao.user.UserService;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Consumer;
 
 import static org.thingsboard.server.dao.service.Validator.validateId;
 
@@ -116,12 +117,12 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
     @Override
     @Transactional
     public Tenant saveTenant(Tenant tenant) {
-        return saveTenant(tenant, true);
+        return saveTenant(tenant, null);
     }
 
     @Override
     @Transactional
-    public Tenant saveTenant(Tenant tenant, boolean publishSaveEvent) {
+    public Tenant saveTenant(Tenant tenant, Consumer<TenantId> defaultEntitiesCreator) {
         log.trace("Executing saveTenant [{}]", tenant);
         tenant.setRegion(DEFAULT_TENANT_REGION);
         if (tenant.getTenantProfileId() == null) {
@@ -130,20 +131,20 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
         }
         tenantValidator.validate(tenant, Tenant::getId);
         boolean create = tenant.getId() == null;
+
         Tenant savedTenant = tenantDao.save(tenant.getId(), tenant);
-        publishEvictEvent(new TenantEvictEvent(savedTenant.getId(), create));
-        if (publishSaveEvent) {
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedTenant.getId())
-                    .entityId(savedTenant.getId()).entity(savedTenant).created(create).build());
-        }
-        if (tenant.getId() == null) {
-            deviceProfileService.createDefaultDeviceProfile(savedTenant.getId());
-            assetProfileService.createDefaultAssetProfile(savedTenant.getId());
-            apiUsageStateService.createDefaultApiUsageState(savedTenant.getId(), null);
-            try {
-                notificationSettingsService.createDefaultNotificationConfigs(savedTenant.getId());
-            } catch (Throwable e) {
-                log.error("Failed to create default notification configs for tenant {}", savedTenant.getId(), e);
+        TenantId tenantId = savedTenant.getId();
+        publishEvictEvent(new TenantEvictEvent(tenantId, create));
+        eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId)
+                .entityId(tenantId).entity(savedTenant).created(create).build());
+
+        if (create) {
+            deviceProfileService.createDefaultDeviceProfile(tenantId);
+            assetProfileService.createDefaultAssetProfile(tenantId);
+            apiUsageStateService.createDefaultApiUsageState(tenantId, null);
+            notificationSettingsService.createDefaultNotificationConfigs(tenantId);
+            if (defaultEntitiesCreator != null) {
+                defaultEntitiesCreator.accept(tenantId);
             }
         }
         return savedTenant;
diff --git a/dao/src/main/resources/sql/schema-entities-idx.sql b/dao/src/main/resources/sql/schema-entities-idx.sql
index a177c1325f..6b4f1a6c09 100644
--- a/dao/src/main/resources/sql/schema-entities-idx.sql
+++ b/dao/src/main/resources/sql/schema-entities-idx.sql
@@ -118,9 +118,9 @@ CREATE INDEX IF NOT EXISTS idx_notification_id ON notification(id);
 
 CREATE INDEX IF NOT EXISTS idx_notification_notification_request_id ON notification(request_id);
 
-CREATE INDEX IF NOT EXISTS idx_notification_recipient_id_created_time ON notification(recipient_id, created_time DESC);
+CREATE INDEX IF NOT EXISTS idx_notification_delivery_method_recipient_id_created_time ON notification(delivery_method, recipient_id, created_time DESC);
 
-CREATE INDEX IF NOT EXISTS idx_notification_recipient_id_unread ON notification(recipient_id) WHERE status <> 'READ';
+CREATE INDEX IF NOT EXISTS idx_notification_delivery_method_recipient_id_unread ON notification(delivery_method, recipient_id) WHERE status <> 'READ';
 
 CREATE INDEX IF NOT EXISTS idx_resource_etag ON resource(tenant_id, etag);
 
diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql
index 2236c7e6f8..1199f45181 100644
--- a/dao/src/main/resources/sql/schema-entities.sql
+++ b/dao/src/main/resources/sql/schema-entities.sql
@@ -25,7 +25,7 @@ CREATE OR REPLACE PROCEDURE insert_tb_schema_settings()
 $$
 BEGIN
     IF (SELECT COUNT(*) FROM tb_schema_settings) = 0 THEN
-        INSERT INTO tb_schema_settings (schema_version) VALUES (3006000);
+        INSERT INTO tb_schema_settings (schema_version) VALUES (3006004);
     END IF;
 END;
 $$;
@@ -864,6 +864,7 @@ CREATE TABLE IF NOT EXISTS notification (
     request_id UUID,
     recipient_id UUID NOT NULL,
     type VARCHAR(50) NOT NULL,
+    delivery_method VARCHAR(50) NOT NULL,
     subject VARCHAR(255),
     body VARCHAR(1000) NOT NULL,
     additional_config VARCHAR(1000),
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 f222c05b60..f1e1fd0e76 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
@@ -106,6 +106,10 @@ public abstract class AbstractServiceTest {
 
 
     protected RuleNodeDebugEvent generateEvent(TenantId tenantId, EntityId entityId) throws IOException {
+        return generateEvent(tenantId, entityId, null);
+    }
+
+    protected RuleNodeDebugEvent generateEvent(TenantId tenantId, EntityId entityId, String eventType) throws IOException {
         if (tenantId == null) {
             tenantId = TenantId.fromUUID(Uuids.timeBased());
         }
@@ -113,6 +117,7 @@ public abstract class AbstractServiceTest {
                 .tenantId(tenantId)
                 .entityId(entityId.getId())
                 .serviceId("server A")
+                .eventType(eventType)
                 .data(JacksonUtil.toString(readFromResource("TestJsonData.json")))
                 .build();
     }
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 216d2abb07..d9b94fb26b 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
@@ -26,7 +26,6 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.ResultSetExtractor;
 import org.thingsboard.server.common.data.AttributeScope;
-import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
@@ -99,6 +98,8 @@ import java.util.stream.Stream;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.thingsboard.server.common.data.query.EntityKeyType.ATTRIBUTE;
+import static org.thingsboard.server.common.data.query.EntityKeyType.ENTITY_FIELD;
 
 @Slf4j
 @DaoSqlTest
@@ -2113,6 +2114,132 @@ public class EntityServiceTest extends AbstractServiceTest {
         deviceService.deleteDevicesByTenantId(tenantId);
     }
 
+    @Test
+    public void testFindEntityQuery_for_5000_devices_with_3000_pageSize() {
+        int pageSize = 3000;
+        int expectedDevicesSize = 4000;
+        int unexpectedDevicesSize = 1000;
+
+        for (int i = 0; i < expectedDevicesSize + unexpectedDevicesSize; i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            if (i < expectedDevicesSize) {
+                device.setName("Device_" + i); // match deviceNameFilter 'D%'
+            } else {
+                device.setName("Test_" + i); // does not match deviceNameFilter 'D%'
+            }
+            device.setType("default");
+            device.setLabel("testLabel" + (int) (Math.random() * 1000));
+            Device savedDevice = deviceService.saveDevice(device);
+
+            attributesService.save(tenantId, savedDevice.getId(), AttributeScope.CLIENT_SCOPE,
+                    new BaseAttributeKvEntry(System.currentTimeMillis(), new LongDataEntry("telemetry", (long) i)));
+        }
+
+        DeviceTypeFilter filter = new DeviceTypeFilter();
+        filter.setDeviceTypes(List.of("default"));
+        filter.setDeviceNameFilter("D%");
+
+        EntityDataSortOrder sortOrder = new EntityDataSortOrder(new EntityKey(ATTRIBUTE, "telemetry"), EntityDataSortOrder.Direction.DESC);
+
+        List<KeyFilter> deviceTypeFilters = createStringKeyFilters("type", ENTITY_FIELD, StringFilterPredicate.StringOperation.EQUAL, "default");
+
+        List<KeyFilter> attributeFilters = Collections.singletonList(createNumericKeyFilter("telemetry", ATTRIBUTE, NumericFilterPredicate.NumericOperation.LESS, expectedDevicesSize));
+
+        List<KeyFilter> nameFilters = createStringKeyFilters("name", ENTITY_FIELD, StringFilterPredicate.StringOperation.CONTAINS, "Device");
+
+        List<EntityKey> entityFields = Arrays.asList(new EntityKey(ENTITY_FIELD, "name"), new EntityKey(ENTITY_FIELD, "type"));
+
+        // 1. Device type filters:
+
+        // query with textSearch - optimization is not performing
+        EntityDataPageLink originalPageLink = new EntityDataPageLink(pageSize, 0, "Device", sortOrder);
+        EntityDataQuery originalQuery = new EntityDataQuery(filter, originalPageLink, entityFields, null, deviceTypeFilters);
+        PageData<EntityData> originalData = entityService.findEntityDataByQuery(tenantId, new CustomerId(CustomerId.NULL_UUID), originalQuery);
+
+        // query without textSearch - optimization is performing
+        EntityDataPageLink optimizedPageLink = new EntityDataPageLink(pageSize, 0, null, sortOrder);
+        EntityDataQuery optimizedQuery = new EntityDataQuery(filter, optimizedPageLink, entityFields, null, deviceTypeFilters);
+        PageData<EntityData> optimizedData = entityService.findEntityDataByQuery(tenantId, new CustomerId(CustomerId.NULL_UUID), optimizedQuery);
+        List<EntityData> loadedEntities = getLoadedEntities(optimizedData, optimizedQuery);
+        Assert.assertEquals(expectedDevicesSize, loadedEntities.size());
+        loadedEntities = getLoadedEntities(originalData, originalQuery);
+        Assert.assertEquals(expectedDevicesSize, loadedEntities.size());
+        Assert.assertEquals(pageSize, optimizedData.getData().size());
+
+        for (int i = 0; i < pageSize; i++) {
+            EntityData originalElement = originalData.getData().get(i);
+            EntityData optimizedElement = optimizedData.getData().get(i);
+            Assert.assertEquals(originalElement.getEntityId(), optimizedElement.getEntityId());
+            originalElement.getLatest().get(ENTITY_FIELD).forEach((key, value) -> {
+                Assert.assertEquals(value.getValue(), optimizedElement.getLatest().get(EntityKeyType.ENTITY_FIELD).get(key).getValue());
+                Assert.assertEquals(value.getCount(), optimizedElement.getLatest().get(EntityKeyType.ENTITY_FIELD).get(key).getCount());
+            });
+        }
+        Assert.assertEquals(originalData.getTotalPages(), optimizedData.getTotalPages());
+        Assert.assertEquals(originalData.getTotalElements(), optimizedData.getTotalElements());
+
+        // 2. Device attribute filters
+
+        // query with textSearch - optimization is not performing
+        originalPageLink = new EntityDataPageLink(pageSize, 0, "Device", sortOrder);
+        originalQuery = new EntityDataQuery(filter, originalPageLink, entityFields, null, attributeFilters);
+        originalData = entityService.findEntityDataByQuery(tenantId, new CustomerId(CustomerId.NULL_UUID), originalQuery);
+
+        // query without textSearch - optimization is performing
+        optimizedPageLink = new EntityDataPageLink(pageSize, 0, null, sortOrder);
+        optimizedQuery = new EntityDataQuery(filter, optimizedPageLink, entityFields, null, attributeFilters);
+        optimizedData = entityService.findEntityDataByQuery(tenantId, new CustomerId(CustomerId.NULL_UUID), optimizedQuery);
+        loadedEntities = getLoadedEntities(optimizedData, optimizedQuery);
+        Assert.assertEquals(expectedDevicesSize, loadedEntities.size());
+        loadedEntities = getLoadedEntities(originalData, originalQuery);
+        Assert.assertEquals(expectedDevicesSize, loadedEntities.size());
+        Assert.assertEquals(pageSize, optimizedData.getData().size());
+
+        for (int i = 0; i < pageSize; i++) {
+            EntityData originalElement = originalData.getData().get(i);
+            EntityData optimizedElement = optimizedData.getData().get(i);
+            Assert.assertEquals(originalElement.getEntityId(), optimizedElement.getEntityId());
+            originalElement.getLatest().get(ENTITY_FIELD).forEach((key, value) -> {
+                Assert.assertEquals(value.getValue(), optimizedElement.getLatest().get(EntityKeyType.ENTITY_FIELD).get(key).getValue());
+                Assert.assertEquals(value.getCount(), optimizedElement.getLatest().get(EntityKeyType.ENTITY_FIELD).get(key).getCount());
+            });
+        }
+        Assert.assertEquals(originalData.getTotalPages(), optimizedData.getTotalPages());
+        Assert.assertEquals(originalData.getTotalElements(), optimizedData.getTotalElements());
+
+        // 3. Device name filters
+
+        // query with textSearch - optimization is not performing
+        originalPageLink = new EntityDataPageLink(pageSize, 0, "Device", sortOrder);
+        originalQuery = new EntityDataQuery(filter, originalPageLink, entityFields, null, nameFilters);
+        originalData = entityService.findEntityDataByQuery(tenantId, new CustomerId(CustomerId.NULL_UUID), originalQuery);
+
+        // query without textSearch - optimization is performing
+        optimizedPageLink = new EntityDataPageLink(pageSize, 0, null, sortOrder);
+        optimizedQuery = new EntityDataQuery(filter, optimizedPageLink, entityFields, null, nameFilters);
+        optimizedData = entityService.findEntityDataByQuery(tenantId, new CustomerId(CustomerId.NULL_UUID), optimizedQuery);
+        loadedEntities = getLoadedEntities(optimizedData, optimizedQuery);
+        Assert.assertEquals(expectedDevicesSize, loadedEntities.size());
+        loadedEntities = getLoadedEntities(originalData, originalQuery);
+        Assert.assertEquals(expectedDevicesSize, loadedEntities.size());
+        Assert.assertEquals(pageSize, optimizedData.getData().size());
+
+        for (int i = 0; i < pageSize; i++) {
+            EntityData originalElement = originalData.getData().get(i);
+            EntityData optimizedElement = optimizedData.getData().get(i);
+            Assert.assertEquals(originalElement.getEntityId(), optimizedElement.getEntityId());
+            originalElement.getLatest().get(ENTITY_FIELD).forEach((key, value) -> {
+                Assert.assertEquals(value.getValue(), optimizedElement.getLatest().get(EntityKeyType.ENTITY_FIELD).get(key).getValue());
+                Assert.assertEquals(value.getCount(), optimizedElement.getLatest().get(EntityKeyType.ENTITY_FIELD).get(key).getCount());
+            });
+        }
+        Assert.assertEquals(originalData.getTotalPages(), optimizedData.getTotalPages());
+        Assert.assertEquals(originalData.getTotalElements(), optimizedData.getTotalElements());
+
+        deviceService.deleteDevicesByTenantId(tenantId);
+    }
+
     private Boolean listEqualWithoutOrder(List<String> A, List<String> B) {
         return A.containsAll(B) && B.containsAll(A);
     }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/RuleChainServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/RuleChainServiceTest.java
index 50f46020d8..86b76bd5a5 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/RuleChainServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/RuleChainServiceTest.java
@@ -40,8 +40,11 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 import java.util.function.Function;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 /**
  * Created by igor on 3/13/18.
  */
@@ -560,4 +563,35 @@ public class RuleChainServiceTest extends AbstractServiceTest {
         Assert.assertFalse(pageData.hasNext());
         Assert.assertEquals(0, pageData.getData().size());
     }
+
+    @Test
+    public void testSaveRuleChainWithExistingExternalId() {
+        RuleChainId externalRuleChainId = new RuleChainId(UUID.fromString("2675d180-e1e5-11ee-9f06-71b6c7dc2cbf"));
+
+        RuleChain ruleChain = getRuleChain();
+        ruleChain.setTenantId(tenantId);
+        ruleChain.setExternalId(externalRuleChainId);
+        ruleChainService.saveRuleChain(ruleChain);
+
+        assertThatThrownBy(() -> ruleChainService.saveRuleChain(ruleChain))
+                .isInstanceOf(DataValidationException.class)
+                .hasMessage("Rule Chain with such external id already exists!");
+
+        ruleChainService.deleteRuleChainsByTenantId(tenantId);
+    }
+
+    private RuleChain getRuleChain() {
+        String ruleChainStr = "{\n" +
+                "  \"name\": \"Root Rule Chain\",\n" +
+                "  \"type\": \"CORE\",\n" +
+                "  \"firstRuleNodeId\": {\n" +
+                "    \"entityType\": \"RULE_NODE\",\n" +
+                "    \"id\": \"91ad0b00-e779-11ee-9cf0-15d8b6079fdb\"\n" +
+                "  },\n" +
+                "  \"debugMode\": false,\n" +
+                "  \"configuration\": null,\n" +
+                "  \"additionalInfo\": null\n" +
+                "}";
+        return JacksonUtil.fromString(ruleChainStr, RuleChain.class);
+    }
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java
index b73728d314..8aa943484d 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java
@@ -132,8 +132,28 @@ public abstract class BaseEventServiceTest extends AbstractServiceTest {
         eventService.cleanupEvents(timeBeforeStartTime - 1, timeAfterEndTime + 1, true);
     }
 
+    @Test
+    public void findLatestDebugRuleNodeInEvent() throws Exception {
+        CustomerId customerId = new CustomerId(Uuids.timeBased());
+        TenantId tenantId = TenantId.fromUUID(Uuids.timeBased());
+
+        Event event1 = saveEventWithProvidedTimeAndEventType(eventTime, "IN", customerId, tenantId);
+        Event event2 = saveEventWithProvidedTimeAndEventType(eventTime + 1, "IN", customerId, tenantId);
+
+        EventInfo event = eventService.findLatestDebugRuleNodeInEvent(tenantId, customerId);
+
+        Assert.assertNotNull(event);
+        Assert.assertEquals(event2.getUuidId(), event.getUuidId());
+
+        eventService.cleanupEvents(timeBeforeStartTime - 1, timeAfterEndTime + 1, true);
+    }
+
     private Event saveEventWithProvidedTime(long time, EntityId entityId, TenantId tenantId) throws Exception {
-        RuleNodeDebugEvent event = generateEvent(tenantId, entityId);
+        return saveEventWithProvidedTimeAndEventType(time, null, entityId, tenantId);
+    }
+
+    private Event saveEventWithProvidedTimeAndEventType(long time, String eventType, EntityId entityId, TenantId tenantId) throws Exception {
+        RuleNodeDebugEvent event = generateEvent(tenantId, entityId, eventType);
         event.setId(new EventId(Uuids.timeBased()));
         event.setCreatedTime(time);
         eventService.saveAsync(event).get();
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
index 5c908fa1b4..b178d7c78f 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
@@ -27,6 +27,7 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.dao.AbstractJpaDaoTest;
 import org.thingsboard.server.dao.event.EventDao;
+import org.thingsboard.server.dao.model.sql.RuleNodeDebugEventEntity;
 
 import java.util.List;
 import java.util.UUID;
@@ -42,6 +43,10 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest {
 
     @Autowired
     private EventDao eventDao;
+
+    @Autowired
+    private RuleNodeDebugEventRepository ruleNodeDebugEventRepository;
+
     UUID tenantId = Uuids.timeBased();
 
 
@@ -106,6 +111,23 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest {
 
     }
 
+    @Test
+    public void findLatestDebugRuleNodeInEvent() throws Exception {
+
+        UUID entityId = Uuids.timeBased();
+
+        RuleNodeDebugEventEntity event = getDebugInEventEntity(Uuids.timeBased(), tenantId, entityId);
+        eventDao.saveAsync(event.toData()).get(1, TimeUnit.MINUTES);
+        Thread.sleep(2);
+        RuleNodeDebugEventEntity event2 = getDebugInEventEntity(Uuids.timeBased(), tenantId, entityId);
+        eventDao.saveAsync(event2.toData()).get(1, TimeUnit.MINUTES);
+
+        RuleNodeDebugEventEntity foundEvent = ruleNodeDebugEventRepository.findLatestDebugRuleNodeInEvent(tenantId, entityId).get();
+        assertNotNull("Events expected to be not null", foundEvent);
+        assertEquals(event2.getEventType(), foundEvent.getEventType());
+        assertEquals(event2.getId(), foundEvent.getId());
+    }
+
     private Event getStatsEvent(UUID eventId, UUID tenantId, UUID entityId) {
         StatisticsEvent.StatisticsEventBuilder event = StatisticsEvent.builder();
         event.id(eventId);
@@ -117,4 +139,13 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest {
         event.errorsOccurred(0);
         return event.build();
     }
+
+    private RuleNodeDebugEventEntity getDebugInEventEntity(UUID eventId, UUID tenantId, UUID entityId) {
+        RuleNodeDebugEventEntity event = new RuleNodeDebugEventEntity();
+        event.setId(eventId);
+        event.setEventType("IN");
+        event.setEntityId(entityId);
+        event.setTenantId(tenantId);
+        return event;
+    }
 }
diff --git a/msa/tb/pom.xml b/msa/tb/pom.xml
index ad0fa66cb9..70fea2c0a5 100644
--- a/msa/tb/pom.xml
+++ b/msa/tb/pom.xml
@@ -38,7 +38,7 @@
         <tb-postgres.docker.name>tb-postgres</tb-postgres.docker.name>
         <tb-cassandra.docker.name>tb-cassandra</tb-cassandra.docker.name>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
-        <pkg.upgradeVersion>3.6.3</pkg.upgradeVersion>
+        <pkg.upgradeVersion>3.6.4</pkg.upgradeVersion>
     </properties>
 
     <dependencies>
diff --git a/rest-client/src/main/java/org/thingsboard/rest/client/utils/RestJsonConverter.java b/rest-client/src/main/java/org/thingsboard/rest/client/utils/RestJsonConverter.java
index 903983d00f..31a0c7b63b 100644
--- a/rest-client/src/main/java/org/thingsboard/rest/client/utils/RestJsonConverter.java
+++ b/rest-client/src/main/java/org/thingsboard/rest/client/utils/RestJsonConverter.java
@@ -62,7 +62,7 @@ public class RestJsonConverter {
                                 KvEntry entry = parseValue(key, ts.get(VALUE));
                                 return new BasicTsKvEntry(ts.get(TS).asLong(), entry);
                             }
-                    ).collect(Collectors.toList()))
+                    ).toList())
             );
             return result;
         } else {
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NotificationCenter.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NotificationCenter.java
index fd63ace9c4..d108a6981d 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NotificationCenter.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NotificationCenter.java
@@ -38,7 +38,7 @@ public interface NotificationCenter {
 
     void markNotificationAsRead(TenantId tenantId, UserId recipientId, NotificationId notificationId);
 
-    void markAllNotificationsAsRead(TenantId tenantId, UserId recipientId);
+    void markAllNotificationsAsRead(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId);
 
     void deleteNotification(TenantId tenantId, UserId recipientId, NotificationId notificationId);
 
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/notification/FirebaseService.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/notification/FirebaseService.java
index 28aa4c96af..ef10d8cecc 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/notification/FirebaseService.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/notification/FirebaseService.java
@@ -21,6 +21,6 @@ import java.util.Map;
 
 public interface FirebaseService {
 
-    void sendMessage(TenantId tenantId, String credentials, String fcmToken, String title, String body, Map<String, String> data) throws Exception;
+    void sendMessage(TenantId tenantId, String credentials, String fcmToken, String title, String body, Map<String, String> data, Integer badge) throws Exception;
 
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java
index 9377fca636..7e535596cd 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java
@@ -176,7 +176,7 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
                 existingAlarm.setPropagateRelationTypes(relationTypes);
                 existingAlarm.setDetails(details);
             }
-            existingAlarm.setEndTs(System.currentTimeMillis());
+            existingAlarm.setEndTs(currentTimeMillis());
             return ctx.getAlarmService().updateAlarm(AlarmUpdateRequest.fromAlarm(existingAlarm));
         }, ctx.getDbCallbackExecutor());
         return Futures.transform(asyncUpdated, TbAlarmResult::fromAlarmResult, MoreExecutors.directExecutor());
@@ -209,4 +209,8 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
         return severity;
     }
 
+    long currentTimeMillis() {
+        return System.currentTimeMillis();
+    }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java
index 4176ead31c..73368d40f5 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java
@@ -87,24 +87,23 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
             Map<String, Object> entityBody = new HashMap<>();
             JsonNode dataJson = JacksonUtil.toJsonNode(msg.getData());
             switch (actionType) {
-                case ATTRIBUTES_UPDATED:
-                case POST_ATTRIBUTES:
+                case ATTRIBUTES_UPDATED, POST_ATTRIBUTES -> {
                     entityBody.put("kv", dataJson);
                     entityBody.put(SCOPE, getScope(metadata));
                     if (EdgeEventActionType.POST_ATTRIBUTES.equals(actionType)) {
                         entityBody.put("isPostAttributes", true);
                     }
-                    break;
-                case ATTRIBUTES_DELETED:
+                }
+                case ATTRIBUTES_DELETED -> {
                     List<String> keys = JacksonUtil.convertValue(dataJson.get("attributes"), new TypeReference<>() {
                     });
                     entityBody.put("keys", keys);
                     entityBody.put(SCOPE, getScope(metadata));
-                    break;
-                case TIMESERIES_UPDATED:
+                }
+                case TIMESERIES_UPDATED -> {
                     entityBody.put("data", dataJson);
                     entityBody.put("ts", msg.getMetaDataTs());
-                    break;
+                }
             }
             return buildEvent(ctx.getTenantId(),
                     actionType,
@@ -179,4 +178,5 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
         return msg.isTypeOneOf(POST_TELEMETRY_REQUEST, POST_ATTRIBUTES_REQUEST, ATTRIBUTES_UPDATED, ATTRIBUTES_DELETED, TIMESERIES_UPDATED,
                 ALARM, CONNECT_EVENT, DISCONNECT_EVENT, ACTIVITY_EVENT, INACTIVITY_EVENT, TO_SERVER_RPC_REQUEST);
     }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/BaseTbMsgPushNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/BaseTbMsgPushNodeConfiguration.java
index 36b6a44c70..a509f1f578 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/BaseTbMsgPushNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/BaseTbMsgPushNodeConfiguration.java
@@ -30,4 +30,5 @@ public class BaseTbMsgPushNodeConfiguration implements NodeConfiguration<BaseTbM
         configuration.setScope(AttributeScope.SERVER_SCOPE.name());
         return configuration;
     }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNodeConfiguration.java
index 7c8e0d1f1c..563d78eccf 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNodeConfiguration.java
@@ -17,7 +17,7 @@ package org.thingsboard.rule.engine.edge;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -26,7 +26,8 @@ public class TbMsgPushToCloudNodeConfiguration extends BaseTbMsgPushNodeConfigur
     @Override
     public TbMsgPushToCloudNodeConfiguration defaultConfiguration() {
         TbMsgPushToCloudNodeConfiguration configuration = new TbMsgPushToCloudNodeConfiguration();
-        configuration.setScope(DataConstants.SERVER_SCOPE);
+        configuration.setScope(AttributeScope.SERVER_SCOPE.name());
         return configuration;
     }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
index e70c64134d..a43c4be9d2 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
@@ -155,4 +155,5 @@ public class TbMsgPushToEdgeNode extends AbstractTbMsgPushNode<TbMsgPushToEdgeNo
         edgeEvent.setEdgeId(edgeId);
         return ctx.getEdgeEventService().saveAsync(edgeEvent);
     }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeConfiguration.java
index 3b40d8ef30..b0d8ad113e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeConfiguration.java
@@ -17,7 +17,7 @@ package org.thingsboard.rule.engine.edge;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -26,7 +26,8 @@ public class TbMsgPushToEdgeNodeConfiguration extends BaseTbMsgPushNodeConfigura
     @Override
     public TbMsgPushToEdgeNodeConfiguration defaultConfiguration() {
         TbMsgPushToEdgeNodeConfiguration configuration = new TbMsgPushToEdgeNodeConfiguration();
-        configuration.setScope(DataConstants.SERVER_SCOPE);
+        configuration.setScope(AttributeScope.SERVER_SCOPE.name());
         return configuration;
     }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java
index 609888db84..7141d66f42 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java
@@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.msg.TbMsgType;
 import org.thingsboard.server.common.data.msg.TbNodeConnectionType;
 import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 
@@ -46,7 +47,9 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
 
 @Slf4j
 @RuleNode(type = ComponentType.ENRICHMENT,
-        name = "calculate delta", relationTypes = {TbNodeConnectionType.SUCCESS, TbNodeConnectionType.FAILURE, TbNodeConnectionType.OTHER},
+        name = "calculate delta",
+        version = 1,
+        relationTypes = {TbNodeConnectionType.SUCCESS, TbNodeConnectionType.FAILURE, TbNodeConnectionType.OTHER},
         configClazz = CalculateDeltaNodeConfiguration.class,
         nodeDescription = "Calculates delta and amount of time passed between previous timeseries key reading " +
                 "and current value for this key from the incoming message",
@@ -101,6 +104,11 @@ public class CalculateDeltaNode implements TbNode {
                         return;
                     }
 
+                    if (config.isExcludeZeroDeltas() && delta.doubleValue() == 0) {
+                        ctx.tellSuccess(msg);
+                        return;
+                    }
+
                     if (config.getRound() != null) {
                         delta = delta.setScale(config.getRound(), RoundingMode.HALF_UP);
                     }
@@ -128,6 +136,23 @@ public class CalculateDeltaNode implements TbNode {
         }
     }
 
+    @Override
+    public TbPair<Boolean, JsonNode> upgrade(int fromVersion, JsonNode oldConfiguration) throws TbNodeException {
+        boolean hasChanges = false;
+        switch (fromVersion) {
+            case 0:
+                String excludeZeroDeltas = "excludeZeroDeltas";
+                if (!oldConfiguration.has(excludeZeroDeltas)) {
+                    hasChanges = true;
+                    ((ObjectNode) oldConfiguration).put(excludeZeroDeltas, false);
+                }
+                break;
+            default:
+                break;
+        }
+        return new TbPair<>(hasChanges, oldConfiguration);
+    }
+
     private ListenableFuture<ValueWithTs> fetchLatestValueAsync(EntityId entityId) {
         return Futures.transform(timeseriesService.findLatest(ctx.getTenantId(), entityId, Collections.singletonList(config.getInputValueKey())),
                 list -> extractValue(list.get(0))
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeConfiguration.java
index 0c4e6de556..0ae558718b 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeConfiguration.java
@@ -30,6 +30,7 @@ public class CalculateDeltaNodeConfiguration implements NodeConfiguration<Calcul
     private String periodValueKey;
     private Integer round;
     private boolean tellFailureIfDeltaIsNegative;
+    private boolean excludeZeroDeltas;
 
     @Override
     public CalculateDeltaNodeConfiguration defaultConfiguration() {
@@ -40,6 +41,7 @@ public class CalculateDeltaNodeConfiguration implements NodeConfiguration<Calcul
         configuration.setAddPeriodBetweenMsgs(false);
         configuration.setPeriodValueKey("periodInMs");
         configuration.setTellFailureIfDeltaIsNegative(true);
+        configuration.setExcludeZeroDeltas(false);
         return configuration;
     }
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java
index 6e80a1577b..5074024be5 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java
@@ -15,11 +15,14 @@
  */
 package org.thingsboard.rule.engine.mqtt;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.mqtt.MqttQoS;
 import io.netty.handler.ssl.SslContext;
 import io.netty.util.concurrent.Promise;
 import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.mqtt.MqttClient;
 import org.thingsboard.mqtt.MqttClientConfig;
 import org.thingsboard.mqtt.MqttConnectResult;
@@ -35,6 +38,7 @@ import org.thingsboard.rule.engine.external.TbAbstractExternalNode;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.plugin.ComponentClusteringMode;
 import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 
@@ -81,7 +85,8 @@ public class TbMqttNode extends TbAbstractExternalNode {
     public void onMsg(TbContext ctx, TbMsg msg) {
         String topic = TbNodeUtils.processPattern(this.mqttNodeConfiguration.getTopicPattern(), msg);
         var tbMsg = ackIfNeeded(ctx, msg);
-        this.mqttClient.publish(topic, Unpooled.wrappedBuffer(tbMsg.getData().getBytes(UTF8)), MqttQoS.AT_LEAST_ONCE, mqttNodeConfiguration.isRetainedMessage())
+        this.mqttClient.publish(topic, Unpooled.wrappedBuffer(getData(tbMsg, mqttNodeConfiguration.isParseToPlainText()).getBytes(UTF8)),
+                        MqttQoS.AT_LEAST_ONCE, mqttNodeConfiguration.isRetainedMessage())
                 .addListener(future -> {
                             if (future.isSuccess()) {
                                 tellSuccess(ctx, tbMsg);
@@ -153,4 +158,27 @@ public class TbMqttNode extends TbAbstractExternalNode {
         return this.mqttNodeConfiguration.isSsl() ? this.mqttNodeConfiguration.getCredentials().initSslContext() : null;
     }
 
+    private String getData(TbMsg tbMsg, boolean parseToPlainText) {
+        if (parseToPlainText) {
+            return JacksonUtil.toPlainText(tbMsg.getData());
+        }
+        return tbMsg.getData();
+    }
+
+    @Override
+    public TbPair<Boolean, JsonNode> upgrade(int fromVersion, JsonNode oldConfiguration) throws TbNodeException {
+        boolean hasChanges = false;
+        switch (fromVersion) {
+            case 0:
+                String parseToPlainText = "parseToPlainText";
+                if (!oldConfiguration.has(parseToPlainText)) {
+                    hasChanges = true;
+                    ((ObjectNode) oldConfiguration).put(parseToPlainText, false);
+                }
+                break;
+            default:
+                break;
+        }
+        return new TbPair<>(hasChanges, oldConfiguration);
+    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeConfiguration.java
index 5f13b0e677..edf3618631 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeConfiguration.java
@@ -33,6 +33,7 @@ public class TbMqttNodeConfiguration implements NodeConfiguration<TbMqttNodeConf
 
     private boolean cleanSession;
     private boolean ssl;
+    private boolean parseToPlainText;
     private ClientCredentials credentials;
 
     @Override
@@ -44,6 +45,7 @@ public class TbMqttNodeConfiguration implements NodeConfiguration<TbMqttNodeConf
         configuration.setCleanSession(true);
         configuration.setSsl(false);
         configuration.setRetainedMessage(false);
+        configuration.setParseToPlainText(false);
         configuration.setCredentials(new AnonymousCredentials());
         return configuration;
     }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java
index 93ba7c4359..1db9dd2fc5 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java
@@ -238,23 +238,11 @@ public class TbHttpClient {
 
     private String getData(TbMsg tbMsg, boolean ignoreBody, boolean parseToPlainText) {
         if (!ignoreBody && parseToPlainText) {
-            return parseJsonStringToPlainText(tbMsg.getData());
+            return JacksonUtil.toPlainText(tbMsg.getData());
         }
         return tbMsg.getData();
     }
 
-    protected String parseJsonStringToPlainText(String data) {
-        if (data.startsWith("\"") && data.endsWith("\"") && data.length() >= 2) {
-            final String dataBefore = data;
-            try {
-                data = JacksonUtil.fromString(data, String.class);
-            } catch (Exception ignored) {}
-            log.trace("Trimming double quotes. Before trim: [{}], after trim: [{}]", dataBefore, data);
-        }
-
-        return data;
-    }
-
     private TbMsg processResponse(TbContext ctx, TbMsg origMsg, ResponseEntity<String> response) {
         TbMsgMetaData metaData = origMsg.getMetaData();
         HttpStatus httpStatus = (HttpStatus) response.getStatusCode();
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java
deleted file mode 100644
index 837a80d626..0000000000
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java
+++ /dev/null
@@ -1,642 +0,0 @@
-/**
- * Copyright © 2016-2024 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.rule.engine.action;
-
-import com.datastax.oss.driver.api.core.uuid.Uuids;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.util.concurrent.Futures;
-import org.apache.commons.lang3.NotImplementedException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.common.util.ListeningExecutor;
-import org.thingsboard.rule.engine.TestDbCallbackExecutor;
-import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
-import org.thingsboard.rule.engine.api.ScriptEngine;
-import org.thingsboard.rule.engine.api.TbContext;
-import org.thingsboard.rule.engine.api.TbNodeConfiguration;
-import org.thingsboard.rule.engine.api.TbNodeException;
-import org.thingsboard.server.common.data.DataConstants;
-import org.thingsboard.server.common.data.alarm.Alarm;
-import org.thingsboard.server.common.data.alarm.AlarmApiCallResult;
-import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
-import org.thingsboard.server.common.data.alarm.AlarmInfo;
-import org.thingsboard.server.common.data.alarm.AlarmSeverity;
-import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
-import org.thingsboard.server.common.data.id.AlarmId;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.RuleChainId;
-import org.thingsboard.server.common.data.id.RuleNodeId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.msg.TbMsgType;
-import org.thingsboard.server.common.data.script.ScriptLanguage;
-import org.thingsboard.server.common.msg.TbMsg;
-import org.thingsboard.server.common.msg.TbMsgDataType;
-import org.thingsboard.server.common.msg.TbMsgMetaData;
-
-import javax.script.ScriptException;
-import java.io.IOException;
-import java.util.function.Consumer;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.anyLong;
-import static org.mockito.Mockito.atMost;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.same;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-@RunWith(MockitoJUnitRunner.class)
-public class TbAlarmNodeTest {
-
-    private TbAbstractAlarmNode node;
-
-    @Mock
-    private TbContext ctx;
-    @Mock
-    private RuleEngineAlarmService alarmService;
-
-    @Mock
-    private ScriptEngine detailsJs;
-
-    @Captor
-    private ArgumentCaptor<Runnable> successCaptor;
-    @Captor
-    private ArgumentCaptor<Consumer<Throwable>> failureCaptor;
-
-    private final RuleChainId ruleChainId = new RuleChainId(Uuids.timeBased());
-    private final RuleNodeId ruleNodeId = new RuleNodeId(Uuids.timeBased());
-
-    private ListeningExecutor dbExecutor;
-
-    private final EntityId originator = new DeviceId(Uuids.timeBased());
-    private final EntityId alarmOriginator = new AlarmId(Uuids.timeBased());
-    private final TenantId tenantId = TenantId.fromUUID(Uuids.timeBased());
-    private final TbMsgMetaData metaData = new TbMsgMetaData();
-    private final String rawJson = "{\"name\": \"Vit\", \"passed\": 5}";
-
-    @Before
-    public void before() {
-        dbExecutor = new TestDbCallbackExecutor();
-    }
-
-    @Test
-    public void newAlarmCanBeCreated() {
-        initWithCreateAlarmScript();
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-        long ts = msg.getTs();
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(null);
-        Alarm expectedAlarm = Alarm.builder()
-                .startTs(ts)
-                .endTs(ts)
-                .tenantId(tenantId)
-                .originator(originator)
-                .severity(AlarmSeverity.CRITICAL)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .build();
-        when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
-                AlarmApiCallResult.builder()
-                        .created(true)
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Created"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(originator, originatorCaptor.getValue());
-        assertEquals("value", metadataCaptor.getValue().getValue("key"));
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_NEW_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void buildDetailsThrowsException() {
-        initWithCreateAlarmScript();
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFailedFuture(new NotImplementedException("message")));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(null);
-
-        node.onMsg(ctx, msg);
-
-        verifyError(msg, "message", NotImplementedException.class);
-
-        verify(ctx).createScriptEngine(ScriptLanguage.JS, "DETAILS");
-        verify(ctx).getAlarmService();
-        verify(ctx, times(2)).getDbCallbackExecutor();
-        verify(ctx).logJsEvalRequest();
-        verify(ctx).getTenantId();
-        verify(alarmService).findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType");
-
-        verifyNoMoreInteractions(ctx, alarmService);
-    }
-
-    @Test
-    public void ifAlarmClearedCreateNew() {
-        initWithCreateAlarmScript();
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-        long ts = msg.getTs();
-        Alarm clearedAlarm = Alarm.builder().cleared(true).acknowledged(true).build();
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(clearedAlarm);
-
-        Alarm expectedAlarm = Alarm.builder()
-                .startTs(ts)
-                .endTs(ts)
-                .tenantId(tenantId)
-                .originator(originator)
-                .severity(AlarmSeverity.CRITICAL)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .build();
-        when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
-                AlarmApiCallResult.builder()
-                        .successful(true)
-                        .created(true)
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Created"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(originator, originatorCaptor.getValue());
-        assertEquals("value", metadataCaptor.getValue().getValue("key"));
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_NEW_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void alarmCanBeUpdated() {
-        initWithCreateAlarmScript();
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-
-        long oldEndDate = System.currentTimeMillis();
-        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).severity(AlarmSeverity.WARNING).endTs(oldEndDate).build();
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(activeAlarm);
-
-        Alarm expectedAlarm = Alarm.builder()
-                .tenantId(tenantId)
-                .originator(originator)
-                .severity(AlarmSeverity.CRITICAL)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .endTs(activeAlarm.getEndTs())
-                .build();
-        when(alarmService.updateAlarm(any(AlarmUpdateRequest.class))).thenReturn(
-                AlarmApiCallResult.builder()
-                        .successful(true)
-                        .modified(true)
-                        .old(new Alarm(activeAlarm))
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Updated"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(originator, originatorCaptor.getValue());
-        assertEquals("value", metadataCaptor.getValue().getValue("key"));
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_EXISTING_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertTrue(activeAlarm.getEndTs() >= oldEndDate);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void alarmCanBeCleared() {
-        initWithClearAlarmScript();
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-
-        long oldEndDate = System.currentTimeMillis();
-        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).severity(AlarmSeverity.WARNING).endTs(oldEndDate).build();
-
-        Alarm expectedAlarm = Alarm.builder()
-                .tenantId(tenantId)
-                .originator(originator)
-                .cleared(true)
-                .severity(AlarmSeverity.WARNING)
-                .propagate(false)
-                .type("SomeType")
-                .details(null)
-                .endTs(oldEndDate)
-                .build();
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(activeAlarm);
-        when(alarmService.clearAlarm(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()), anyLong(), nullable(JsonNode.class)))
-                .thenReturn(AlarmApiCallResult.builder()
-                        .successful(true)
-                        .cleared(true)
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Cleared"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(originator, originatorCaptor.getValue());
-        assertEquals("value", metadataCaptor.getValue().getValue("key"));
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_CLEARED_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void alarmCanBeClearedWithAlarmOriginator() throws ScriptException, IOException {
-        initWithClearAlarmScript();
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, alarmOriginator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-
-        long oldEndDate = System.currentTimeMillis();
-        AlarmId id = new AlarmId(alarmOriginator.getId());
-        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).severity(AlarmSeverity.WARNING).endTs(oldEndDate).build();
-        activeAlarm.setId(id);
-
-        Alarm expectedAlarm = Alarm.builder()
-                .tenantId(tenantId)
-                .originator(originator)
-                .cleared(true)
-                .severity(AlarmSeverity.WARNING)
-                .propagate(false)
-                .type("SomeType")
-                .details(null)
-                .endTs(oldEndDate)
-                .build();
-        expectedAlarm.setId(id);
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findAlarmById(tenantId, id)).thenReturn(activeAlarm);
-        when(alarmService.clearAlarm(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()), anyLong(), nullable(JsonNode.class)))
-                .thenReturn(AlarmApiCallResult.builder()
-                        .successful(true)
-                        .cleared(true)
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Cleared"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(alarmOriginator, originatorCaptor.getValue());
-        assertEquals("value", metadataCaptor.getValue().getValue("key"));
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_CLEARED_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void testCreateAlarmWithDynamicSeverityFromMessageBody() throws Exception {
-        TbCreateAlarmNodeConfiguration config = new TbCreateAlarmNodeConfiguration();
-        config.setPropagate(true);
-        config.setSeverity("$[alarmSeverity]");
-        config.setAlarmType("SomeType");
-        config.setScriptLang(ScriptLanguage.JS);
-        config.setAlarmDetailsBuildJs("DETAILS");
-        config.setDynamicSeverity(true);
-        TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-
-        when(ctx.createScriptEngine(ScriptLanguage.JS, "DETAILS")).thenReturn(detailsJs);
-
-        when(ctx.getTenantId()).thenReturn(tenantId);
-        when(ctx.getAlarmService()).thenReturn(alarmService);
-        when(ctx.getDbCallbackExecutor()).thenReturn(dbExecutor);
-
-        node = new TbCreateAlarmNode();
-        node.init(ctx, nodeConfiguration);
-
-        String rawJson = "{\"alarmSeverity\": \"WARNING\", \"passed\": 5}";
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-        long ts = msg.getTs();
-        Alarm expectedAlarm = Alarm.builder()
-                .startTs(ts)
-                .endTs(ts)
-                .tenantId(tenantId)
-                .originator(originator)
-                .severity(AlarmSeverity.WARNING)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .build();
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(null);
-        when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
-                AlarmApiCallResult.builder()
-                        .successful(true)
-                        .created(true)
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Created"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(originator, originatorCaptor.getValue());
-        assertEquals("value", metadataCaptor.getValue().getValue("key"));
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_NEW_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void testCreateAlarmWithDynamicSeverityFromMetadata() throws Exception {
-        TbCreateAlarmNodeConfiguration config = new TbCreateAlarmNodeConfiguration();
-        config.setPropagate(true);
-        config.setScriptLang(ScriptLanguage.JS);
-        config.setSeverity("${alarmSeverity}");
-        config.setAlarmType("SomeType");
-        config.setAlarmDetailsBuildJs("DETAILS");
-        config.setDynamicSeverity(true);
-        TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-
-        when(ctx.createScriptEngine(ScriptLanguage.JS, "DETAILS")).thenReturn(detailsJs);
-
-        when(ctx.getTenantId()).thenReturn(tenantId);
-        when(ctx.getAlarmService()).thenReturn(alarmService);
-        when(ctx.getDbCallbackExecutor()).thenReturn(dbExecutor);
-
-        node = new TbCreateAlarmNode();
-        node.init(ctx, nodeConfiguration);
-
-        metaData.putValue("alarmSeverity", "WARNING");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-        long ts = msg.getTs();
-        Alarm expectedAlarm = Alarm.builder()
-                .startTs(ts)
-                .endTs(ts)
-                .tenantId(tenantId)
-                .originator(originator)
-                .severity(AlarmSeverity.WARNING)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .build();
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(null);
-        when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
-                AlarmApiCallResult.builder()
-                        .successful(true)
-                        .created(true)
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Created"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(originator, originatorCaptor.getValue());
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_NEW_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void testCreateAlarmsWithPropagationToTenantWithDynamicTypes() throws Exception {
-        for (int i = 0; i < 10; i++) {
-            var config = new TbCreateAlarmNodeConfiguration();
-            config.setPropagateToTenant(true);
-            config.setSeverity(AlarmSeverity.CRITICAL.name());
-            config.setAlarmType("SomeType" + i);
-            config.setScriptLang(ScriptLanguage.JS);
-            config.setAlarmDetailsBuildJs("DETAILS");
-            config.setDynamicSeverity(true);
-            TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-
-            when(ctx.createScriptEngine(ScriptLanguage.JS, "DETAILS")).thenReturn(detailsJs);
-
-            when(ctx.getTenantId()).thenReturn(tenantId);
-            when(ctx.getAlarmService()).thenReturn(alarmService);
-            when(ctx.getDbCallbackExecutor()).thenReturn(dbExecutor);
-
-            node = new TbCreateAlarmNode();
-            node.init(ctx, nodeConfiguration);
-
-            metaData.putValue("key", "value");
-            TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-            long ts = msg.getTs();
-            Alarm expectedAlarm = Alarm.builder()
-                    .startTs(ts)
-                    .endTs(ts)
-                    .tenantId(tenantId)
-                    .originator(originator)
-                    .severity(AlarmSeverity.CRITICAL)
-                    .propagateToTenant(true)
-                    .type("SomeType" + i)
-                    .details(null)
-                    .build();
-
-            when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-            when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType" + i)).thenReturn(null);
-            when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
-                    AlarmApiCallResult.builder()
-                            .successful(true)
-                            .created(true)
-                            .alarm(new AlarmInfo(expectedAlarm))
-                            .build());
-            node.onMsg(ctx, msg);
-
-            verify(ctx, atMost(10)).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-            successCaptor.getValue().run();
-            verify(ctx, atMost(10)).tellNext(any(), eq("Created"));
-
-            ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-            ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-            ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-            ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-            ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-            verify(ctx, atMost(10)).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-            assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-            assertEquals(originator, originatorCaptor.getValue());
-            assertEquals("value", metadataCaptor.getValue().getValue("key"));
-            assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_NEW_ALARM));
-            assertNotSame(metaData, metadataCaptor.getValue());
-
-            Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-            assertEquals(expectedAlarm, actualAlarm);
-        }
-    }
-
-    private void initWithCreateAlarmScript() {
-        try {
-            TbCreateAlarmNodeConfiguration config = new TbCreateAlarmNodeConfiguration();
-            config.setPropagate(true);
-            config.setSeverity(AlarmSeverity.CRITICAL.name());
-            config.setAlarmType("SomeType");
-            config.setScriptLang(ScriptLanguage.JS);
-            config.setAlarmDetailsBuildJs("DETAILS");
-            TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-
-            when(ctx.createScriptEngine(ScriptLanguage.JS, "DETAILS")).thenReturn(detailsJs);
-
-            when(ctx.getTenantId()).thenReturn(tenantId);
-            when(ctx.getAlarmService()).thenReturn(alarmService);
-            when(ctx.getDbCallbackExecutor()).thenReturn(dbExecutor);
-
-            node = new TbCreateAlarmNode();
-            node.init(ctx, nodeConfiguration);
-        } catch (TbNodeException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    private void initWithClearAlarmScript() {
-        try {
-            TbClearAlarmNodeConfiguration config = new TbClearAlarmNodeConfiguration();
-            config.setAlarmType("SomeType");
-            config.setScriptLang(ScriptLanguage.JS);
-            config.setAlarmDetailsBuildJs("DETAILS");
-            TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-
-            when(ctx.createScriptEngine(ScriptLanguage.JS, "DETAILS")).thenReturn(detailsJs);
-
-            when(ctx.getTenantId()).thenReturn(tenantId);
-            when(ctx.getAlarmService()).thenReturn(alarmService);
-            when(ctx.getDbCallbackExecutor()).thenReturn(dbExecutor);
-
-            node = new TbClearAlarmNode();
-            node.init(ctx, nodeConfiguration);
-        } catch (TbNodeException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    private void verifyError(TbMsg msg, String message, Class expectedClass) {
-        ArgumentCaptor<Throwable> captor = ArgumentCaptor.forClass(Throwable.class);
-        verify(ctx).tellFailure(same(msg), captor.capture());
-
-        Throwable value = captor.getValue();
-        assertEquals(expectedClass, value.getClass());
-        assertEquals(message, value.getMessage());
-    }
-
-}
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeTest.java
new file mode 100644
index 0000000000..afab0a0a99
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeTest.java
@@ -0,0 +1,218 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.rule.engine.action;
+
+import com.datastax.oss.driver.api.core.uuid.Uuids;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.util.concurrent.Futures;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.common.util.ListeningExecutor;
+import org.thingsboard.rule.engine.TestDbCallbackExecutor;
+import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
+import org.thingsboard.rule.engine.api.ScriptEngine;
+import org.thingsboard.rule.engine.api.TbContext;
+import org.thingsboard.rule.engine.api.TbNodeConfiguration;
+import org.thingsboard.rule.engine.api.TbNodeException;
+import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmApiCallResult;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.id.AlarmId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.msg.TbMsgType;
+import org.thingsboard.server.common.data.script.ScriptLanguage;
+import org.thingsboard.server.common.msg.TbMsg;
+import org.thingsboard.server.common.msg.TbMsgMetaData;
+
+import java.util.function.Consumer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class TbClearAlarmNodeTest {
+
+    @Mock
+    TbContext ctxMock;
+    @Mock
+    RuleEngineAlarmService alarmServiceMock;
+    @Mock
+    ScriptEngine alarmDetailsScriptMock;
+
+    @Captor
+    ArgumentCaptor<Runnable> successCaptor;
+    @Captor
+    ArgumentCaptor<Consumer<Throwable>> failureCaptor;
+
+    TbClearAlarmNode node;
+
+    final TenantId tenantId = TenantId.fromUUID(Uuids.timeBased());
+    final EntityId msgOriginator = new DeviceId(Uuids.timeBased());
+    final EntityId alarmOriginator = new AlarmId(Uuids.timeBased());
+    TbMsgMetaData metadata;
+
+    ListeningExecutor dbExecutor;
+
+    @BeforeEach
+    void before() {
+        dbExecutor = new TestDbCallbackExecutor();
+        metadata = new TbMsgMetaData();
+    }
+
+    @Test
+    void alarmCanBeCleared() {
+        initWithClearAlarmScript();
+        metadata.putValue("key", "value");
+        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50}");
+
+        long oldEndDate = System.currentTimeMillis();
+        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(msgOriginator).severity(AlarmSeverity.WARNING).endTs(oldEndDate).build();
+
+        Alarm expectedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(true)
+                .severity(AlarmSeverity.WARNING)
+                .propagate(false)
+                .type("SomeType")
+                .details(null)
+                .endTs(oldEndDate)
+                .build();
+
+        when(alarmDetailsScriptMock.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
+        when(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, "SomeType")).thenReturn(activeAlarm);
+        when(alarmServiceMock.clearAlarm(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()), anyLong(), nullable(JsonNode.class)))
+                .thenReturn(AlarmApiCallResult.builder()
+                        .successful(true)
+                        .cleared(true)
+                        .alarm(new AlarmInfo(expectedAlarm))
+                        .build());
+
+        node.onMsg(ctxMock, msg);
+
+        verify(ctxMock).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
+        successCaptor.getValue().run();
+        verify(ctxMock).tellNext(any(), eq("Cleared"));
+
+        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
+        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
+        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
+        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
+        verify(ctxMock).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
+
+        assertThat(TbMsgType.ALARM).isEqualTo(typeCaptor.getValue());
+        assertThat(msgOriginator).isEqualTo(originatorCaptor.getValue());
+        assertThat("value").isEqualTo(metadataCaptor.getValue().getValue("key"));
+        assertThat(Boolean.TRUE.toString()).isEqualTo(metadataCaptor.getValue().getValue(DataConstants.IS_CLEARED_ALARM));
+        assertThat(metadata).isNotSameAs(metadataCaptor.getValue());
+
+        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
+        assertThat(actualAlarm).isEqualTo(expectedAlarm);
+    }
+
+    @Test
+    void alarmCanBeClearedWithAlarmOriginator() {
+        initWithClearAlarmScript();
+        metadata.putValue("key", "value");
+        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, alarmOriginator, metadata, "{\"temperature\": 50}");
+
+        long oldEndDate = System.currentTimeMillis();
+        AlarmId id = new AlarmId(alarmOriginator.getId());
+        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(msgOriginator).severity(AlarmSeverity.WARNING).endTs(oldEndDate).build();
+        activeAlarm.setId(id);
+
+        Alarm expectedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(true)
+                .severity(AlarmSeverity.WARNING)
+                .propagate(false)
+                .type("SomeType")
+                .details(null)
+                .endTs(oldEndDate)
+                .build();
+        expectedAlarm.setId(id);
+
+        when(alarmDetailsScriptMock.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
+        when(alarmServiceMock.findAlarmById(tenantId, id)).thenReturn(activeAlarm);
+        when(alarmServiceMock.clearAlarm(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()), anyLong(), nullable(JsonNode.class)))
+                .thenReturn(AlarmApiCallResult.builder()
+                        .successful(true)
+                        .cleared(true)
+                        .alarm(new AlarmInfo(expectedAlarm))
+                        .build());
+
+        node.onMsg(ctxMock, msg);
+
+        verify(ctxMock).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
+        successCaptor.getValue().run();
+        verify(ctxMock).tellNext(any(), eq("Cleared"));
+
+        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
+        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
+        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
+        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
+        verify(ctxMock).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
+
+        assertThat(TbMsgType.ALARM).isEqualTo(typeCaptor.getValue());
+        assertThat(alarmOriginator).isEqualTo(originatorCaptor.getValue());
+        assertThat("value").isEqualTo(metadataCaptor.getValue().getValue("key"));
+        assertThat(Boolean.TRUE.toString()).isEqualTo(metadataCaptor.getValue().getValue(DataConstants.IS_CLEARED_ALARM));
+        assertThat(metadata).isNotSameAs(metadataCaptor.getValue());
+
+        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
+        assertThat(actualAlarm).isEqualTo(expectedAlarm);
+    }
+
+    private void initWithClearAlarmScript() {
+        try {
+            TbClearAlarmNodeConfiguration config = new TbClearAlarmNodeConfiguration();
+            config.setAlarmType("SomeType");
+            config.setScriptLang(ScriptLanguage.JS);
+            config.setAlarmDetailsBuildJs("DETAILS");
+            TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
+
+            when(ctxMock.createScriptEngine(ScriptLanguage.JS, "DETAILS")).thenReturn(alarmDetailsScriptMock);
+
+            when(ctxMock.getTenantId()).thenReturn(tenantId);
+            when(ctxMock.getAlarmService()).thenReturn(alarmServiceMock);
+            when(ctxMock.getDbCallbackExecutor()).thenReturn(dbExecutor);
+
+            node = new TbClearAlarmNode();
+            node.init(ctxMock, nodeConfiguration);
+        } catch (TbNodeException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+
+}
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeTest.java
new file mode 100644
index 0000000000..c0e27231c4
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeTest.java
@@ -0,0 +1,1223 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.rule.engine.action;
+
+import com.datastax.oss.driver.api.core.uuid.Uuids;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.util.concurrent.Futures;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.common.util.ListeningExecutor;
+import org.thingsboard.rule.engine.TestDbCallbackExecutor;
+import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
+import org.thingsboard.rule.engine.api.ScriptEngine;
+import org.thingsboard.rule.engine.api.TbContext;
+import org.thingsboard.rule.engine.api.TbNodeConfiguration;
+import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmApiCallResult;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmPropagationInfo;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
+import org.thingsboard.server.common.data.id.AlarmId;
+import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.RuleNodeId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.msg.TbMsgType;
+import org.thingsboard.server.common.data.msg.TbNodeConnectionType;
+import org.thingsboard.server.common.data.script.ScriptLanguage;
+import org.thingsboard.server.common.msg.TbMsg;
+import org.thingsboard.server.common.msg.TbMsgMetaData;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.never;
+
+@ExtendWith(MockitoExtension.class)
+class TbCreateAlarmNodeTest {
+
+    @Mock
+    TbContext ctxMock;
+    @Mock
+    RuleEngineAlarmService alarmServiceMock;
+    @Mock
+    ScriptEngine alarmDetailsScriptMock;
+    @Mock
+    TbMsg alarmActionMsgMock;
+
+    @Captor
+    ArgumentCaptor<Runnable> successCaptor;
+
+    @Spy
+    TbCreateAlarmNode nodeSpy;
+    TbCreateAlarmNodeConfiguration config;
+
+    final TenantId tenantId = TenantId.fromUUID(Uuids.timeBased());
+    final EntityId msgOriginator = new DeviceId(Uuids.timeBased());
+    TbMsgMetaData metadata;
+
+    ListeningExecutor dbExecutor;
+
+    @BeforeEach
+    void before() {
+        dbExecutor = new TestDbCallbackExecutor();
+        metadata = new TbMsgMetaData();
+        config = new TbCreateAlarmNodeConfiguration();
+    }
+
+    @Test
+    @DisplayName("When defaultConfiguration() is called, then correct values are set.")
+    void whenDefaultConfiguration_thenShouldSetCorrectValues() {
+        // GIVEN-WHEN
+        config = config.defaultConfiguration();
+
+        // THEN
+        assertThat(config.getAlarmType()).isEqualTo("General Alarm");
+        assertThat(config.getScriptLang()).isEqualTo(ScriptLanguage.TBEL);
+        assertThat(config.getAlarmDetailsBuildJs()).isEqualTo("""
+                \
+                var details = {};
+                if (metadata.prevAlarmDetails) {
+                    details = JSON.parse(metadata.prevAlarmDetails);
+                    //remove prevAlarmDetails from metadata
+                    delete metadata.prevAlarmDetails;
+                    //now metadata is the same as it comes IN this rule node
+                }
+
+
+                return details;""");
+        assertThat(config.getAlarmDetailsBuildTbel()).isEqualTo("""
+                \
+                var details = {};
+                if (metadata.prevAlarmDetails != null) {
+                    details = JSON.parse(metadata.prevAlarmDetails);
+                    //remove prevAlarmDetails from metadata
+                    metadata.remove('prevAlarmDetails');
+                    //now metadata is the same as it comes IN this rule node
+                }
+
+
+                return details;""");
+        assertThat(config.getSeverity()).isEqualTo(AlarmSeverity.CRITICAL.name());
+        assertThat(config.isPropagate()).isFalse();
+        assertThat(config.isPropagateToOwner()).isFalse();
+        assertThat(config.isPropagateToTenant()).isFalse();
+        assertThat(config.isUseMessageAlarmData()).isFalse();
+        assertThat(config.isOverwriteAlarmDetails()).isFalse();
+        assertThat(config.isDynamicSeverity()).isFalse();
+        assertThat(config.getRelationTypes()).isEmpty();
+    }
+
+    @Test
+    @DisplayName("When node is taking alarm info from default node config and alarm does not exist, then should create new alarm using info from default config.")
+    void whenAlarmDataIsTakenFromDefaultNodeConfigAndAlarmDoesNotExist_thenNewAlarmIsCreated() throws Exception {
+        // GIVEN
+
+        // node configuration
+        config = config.defaultConfiguration();
+
+        // other values
+        String alarmType = config.getAlarmType();
+        AlarmSeverity alarmSeverity = AlarmSeverity.valueOf(config.getSeverity());
+        JsonNode alarmDetails = JacksonUtil.newObjectNode();
+
+        long metadataTs = 1711631716127L;
+        metadata.putValue("ts", Long.toString(metadataTs));
+        metadata.putValue("location", "Company office");
+
+        var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50}");
+
+        Alarm existingAlarm = null;
+
+        // expected values
+        var expectedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(alarmSeverity)
+                .propagate(false)
+                .propagateToOwner(false)
+                .propagateToTenant(false)
+                .propagateRelationTypes(Collections.emptyList())
+                .type(alarmType)
+                .startTs(metadataTs)
+                .endTs(metadataTs)
+                .details(alarmDetails)
+                .build();
+        var expectedCreatedAlarmInfo = new AlarmInfo(expectedAlarm);
+        expectedCreatedAlarmInfo.setId(new AlarmId(Uuids.timeBased()));
+
+        var expectedCreateAlarmRequest = AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(null)
+                .type(alarmType)
+                .originator(msgOriginator)
+                .severity(alarmSeverity)
+                .startTs(metadataTs)
+                .endTs(metadataTs)
+                .details(alarmDetails)
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(false)
+                        .propagateToOwner(false)
+                        .propagateToTenant(false)
+                        .propagateRelationTypes(Collections.emptyList()).build())
+                .userId(null)
+                .edgeAlarmId(null)
+                .build();
+
+        // mocks
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.getSelfId()).willReturn(ruleNodeSelfId);
+        given(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, alarmType)).willReturn(existingAlarm);
+        given(alarmDetailsScriptMock.executeJsonAsync(incomingMsg)).willReturn(Futures.immediateFuture(alarmDetails));
+        var apiCallResult = AlarmApiCallResult.builder()
+                .successful(true)
+                .created(true)
+                .modified(false)
+                .cleared(false)
+                .deleted(false)
+                .alarm(expectedCreatedAlarmInfo)
+                .old(null)
+                .propagatedEntitiesList(Collections.emptyList())
+                .build();
+        given(alarmServiceMock.createAlarm(expectedCreateAlarmRequest)).willReturn(apiCallResult);
+        given(ctxMock.alarmActionMsg(expectedCreatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_CREATED)).willReturn(alarmActionMsgMock);
+        given(ctxMock.transformMsg(any(TbMsg.class), any(TbMsgType.class), any(EntityId.class), any(TbMsgMetaData.class), anyString()))
+                .willAnswer(answer -> TbMsg.transformMsg(
+                        answer.getArgument(0, TbMsg.class),
+                        answer.getArgument(1, TbMsgType.class),
+                        answer.getArgument(2, EntityId.class),
+                        answer.getArgument(3, TbMsgMetaData.class),
+                        answer.getArgument(4, String.class))
+                );
+        given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, TbAbstractAlarmNodeConfiguration.ALARM_DETAILS_BUILD_TBEL_TEMPLATE)).willReturn(alarmDetailsScriptMock);
+
+        // node initialization
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+
+        // verify alarm details script evaluation
+        then(ctxMock).should().logJsEvalRequest();
+        then(alarmDetailsScriptMock).should().executeJsonAsync(incomingMsg);
+        then(ctxMock).should().logJsEvalResponse();
+
+        // verify we called createAlarm() with correct AlarmCreateOrUpdateActiveRequest
+        then(alarmServiceMock).should().createAlarm(expectedCreateAlarmRequest);
+        then(alarmServiceMock).should(never()).updateAlarm(any());
+
+        // verify that we created a correct alarm action message and enqueued it
+        then(ctxMock).should().alarmActionMsg(expectedCreatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_CREATED);
+        then(ctxMock).should().enqueue(eq(alarmActionMsgMock), successCaptor.capture(), any());
+
+        // run success captor to emulate successful sending and to trigger further processing on the success path
+        successCaptor.getValue().run();
+
+        // capture and verify an outgoing message
+        var outgoingMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(ctxMock).should().tellNext(outgoingMsgCaptor.capture(), eq("Created"));
+        var actualOutgoingMsg = outgoingMsgCaptor.getValue();
+        assertThat(actualOutgoingMsg.getType()).isEqualTo(TbMsgType.ALARM.name());
+        assertThat(actualOutgoingMsg.getOriginator()).isEqualTo(msgOriginator);
+        assertThat(actualOutgoingMsg.getData()).isEqualTo(JacksonUtil.valueToTree(expectedCreatedAlarmInfo).toString());
+
+        Map<String, String> actualOutgoingMsgMetadataContent = actualOutgoingMsg.getMetaData().getData();
+        assertThat(actualOutgoingMsgMetadataContent).containsAllEntriesOf(metadata.getData());
+        assertThat(actualOutgoingMsgMetadataContent).containsEntry(DataConstants.IS_NEW_ALARM, Boolean.TRUE.toString());
+        assertThat(actualOutgoingMsgMetadataContent).size().isEqualTo(metadata.getData().size() + 1);
+
+        // verify wrong processing paths were not taken
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Updated"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+        then(ctxMock).should(never()).tellFailure(any(), any());
+    }
+
+    @Test
+    @DisplayName("When node is taking alarm info from node config and cleared alarm exists, then should create new alarm using info from config.")
+    void whenAlarmDataIsTakenFromNodeConfigAndClearedAlarmExists_thenNewAlarmIsCreated() throws Exception {
+        // GIVEN
+
+        // node configuration
+        config.setAlarmType("$[alarmType]");
+        config.setScriptLang(ScriptLanguage.JS);
+        config.setAlarmDetailsBuildJs("""
+                return {
+                    alarmDetails: "Some alarm details"
+                };
+                """);
+        config.setAlarmDetailsBuildTbel("""
+                return {
+                    alarmDetails: "Some alarm details"
+                };
+                """);
+        config.setDynamicSeverity(true);
+        config.setSeverity("${alarmSeverity}");
+        config.setPropagate(true);
+        config.setPropagateToOwner(true);
+        config.setPropagateToTenant(true);
+        config.setRelationTypes(List.of("RELATION_TYPE_1", "RELATION_TYPE_2", "RELATION_TYPE_3"));
+        config.setUseMessageAlarmData(false);
+        config.setOverwriteAlarmDetails(false);
+
+        // other values
+        String alarmType = "High Temperature";
+        AlarmSeverity alarmSeverity = AlarmSeverity.MAJOR;
+        JsonNode alarmDetails = JacksonUtil.newObjectNode().put("alarmDetails", "Some alarm details");
+
+        long metadataTs = 1711631716127L;
+        metadata.putValue("ts", Long.toString(metadataTs));
+        metadata.putValue("alarmSeverity", alarmSeverity.name());
+        metadata.putValue("location", "Company office");
+
+        var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50, \"alarmType\": \"" + alarmType + "\"}");
+
+        var existingClearedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(true)
+                .acknowledged(false)
+                .severity(AlarmSeverity.WARNING)
+                .propagate(false)
+                .propagateToOwner(false)
+                .propagateToTenant(false)
+                .propagateRelationTypes(Collections.emptyList())
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(200L)
+                .details(JacksonUtil.newObjectNode().put("oldAlarmDetailsProperty", "oldAlarmDetailsPropertyValue"))
+                .build();
+        existingClearedAlarm.setId(new AlarmId(Uuids.timeBased()));
+
+        // expected values
+        var expectedCreatedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(alarmSeverity)
+                .propagate(true)
+                .propagateToOwner(true)
+                .propagateToTenant(true)
+                .propagateRelationTypes(config.getRelationTypes())
+                .type(alarmType)
+                .startTs(metadataTs)
+                .endTs(metadataTs)
+                .details(alarmDetails)
+                .build();
+        var expectedCreatedAlarmInfo = new AlarmInfo(expectedCreatedAlarm);
+        expectedCreatedAlarmInfo.setId(new AlarmId(Uuids.timeBased()));
+
+        var expectedCreateAlarmRequest = AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(null)
+                .type(alarmType)
+                .originator(msgOriginator)
+                .severity(alarmSeverity)
+                .startTs(metadataTs)
+                .endTs(metadataTs)
+                .details(alarmDetails)
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(true)
+                        .propagateToOwner(true)
+                        .propagateToTenant(true)
+                        .propagateRelationTypes(config.getRelationTypes()).build())
+                .userId(null)
+                .edgeAlarmId(null)
+                .build();
+
+        // mocks
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.getSelfId()).willReturn(ruleNodeSelfId);
+        given(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, alarmType)).willReturn(existingClearedAlarm);
+        given(alarmDetailsScriptMock.executeJsonAsync(incomingMsg)).willReturn(Futures.immediateFuture(alarmDetails));
+        var apiCallResult = AlarmApiCallResult.builder()
+                .successful(true)
+                .created(true)
+                .modified(false)
+                .cleared(false)
+                .deleted(false)
+                .alarm(expectedCreatedAlarmInfo)
+                .old(null)
+                .propagatedEntitiesList(List.of(TenantId.fromUUID(Uuids.timeBased()), new CustomerId(Uuids.timeBased()), new AssetId(Uuids.timeBased())))
+                .build();
+        given(alarmServiceMock.createAlarm(expectedCreateAlarmRequest)).willReturn(apiCallResult);
+        given(ctxMock.alarmActionMsg(expectedCreatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_CREATED)).willReturn(alarmActionMsgMock);
+        given(ctxMock.transformMsg(any(TbMsg.class), any(TbMsgType.class), any(EntityId.class), any(TbMsgMetaData.class), anyString()))
+                .willAnswer(answer -> TbMsg.transformMsg(
+                        answer.getArgument(0, TbMsg.class),
+                        answer.getArgument(1, TbMsgType.class),
+                        answer.getArgument(2, EntityId.class),
+                        answer.getArgument(3, TbMsgMetaData.class),
+                        answer.getArgument(4, String.class))
+                );
+        given(ctxMock.createScriptEngine(ScriptLanguage.JS, config.getAlarmDetailsBuildJs())).willReturn(alarmDetailsScriptMock);
+
+        // node initialization
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+
+        // verify alarm details script evaluation
+        then(ctxMock).should().logJsEvalRequest();
+        then(alarmDetailsScriptMock).should().executeJsonAsync(incomingMsg);
+        then(ctxMock).should().logJsEvalResponse();
+
+        // verify we called createAlarm() with correct AlarmCreateOrUpdateActiveRequest
+        then(alarmServiceMock).should().createAlarm(expectedCreateAlarmRequest);
+        then(alarmServiceMock).should(never()).updateAlarm(any());
+
+        // verify that we created a correct alarm action message and enqueued it
+        then(ctxMock).should().alarmActionMsg(expectedCreatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_CREATED);
+        then(ctxMock).should().enqueue(eq(alarmActionMsgMock), successCaptor.capture(), any());
+
+        // run success captor to emulate successful sending and to trigger further processing on the success path
+        successCaptor.getValue().run();
+
+        // capture and verify an outgoing message
+        var outgoingMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(ctxMock).should().tellNext(outgoingMsgCaptor.capture(), eq("Created"));
+        var actualOutgoingMsg = outgoingMsgCaptor.getValue();
+        assertThat(actualOutgoingMsg.getType()).isEqualTo(TbMsgType.ALARM.name());
+        assertThat(actualOutgoingMsg.getOriginator()).isEqualTo(msgOriginator);
+        assertThat(actualOutgoingMsg.getData()).isEqualTo(JacksonUtil.valueToTree(expectedCreatedAlarmInfo).toString());
+
+        Map<String, String> actualOutgoingMsgMetadataContent = actualOutgoingMsg.getMetaData().getData();
+        assertThat(actualOutgoingMsgMetadataContent).containsAllEntriesOf(metadata.getData());
+        assertThat(actualOutgoingMsgMetadataContent).containsEntry(DataConstants.IS_NEW_ALARM, Boolean.TRUE.toString());
+        assertThat(actualOutgoingMsgMetadataContent).size().isEqualTo(metadata.getData().size() + 1);
+
+        // verify wrong processing paths were not taken
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Updated"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+        then(ctxMock).should(never()).tellFailure(any(), any());
+    }
+
+    @Test
+    @DisplayName("When node is taking alarm info from node config and active alarm exists, then should update existing alarm using info from config.")
+    void whenAlarmDataIsTakenFromNodeConfigAndActiveAlarmExists_thenExistingAlarmIsUpdated() throws Exception {
+        // GIVEN
+
+        // values that changed between existing alarm and updated alarm
+        AlarmSeverity oldAlarmSeverity = AlarmSeverity.WARNING;
+        AlarmSeverity newAlarmSeverity = AlarmSeverity.MAJOR;
+
+        boolean oldPropagate = true;
+        boolean newPropagate = false;
+
+        boolean oldPropagateToOwner = false;
+        boolean newPropagateToOwner = true;
+
+        boolean oldPropagateToTenant = false;
+        boolean newPropagateToTenant = true;
+
+        List<String> oldPropagateRelationTypes = List.of("RELATION_TYPE_1", "RELATION_TYPE_2", "RELATION_TYPE_3");
+        List<String> newPropagateRelationTypes = Collections.emptyList();
+
+        JsonNode oldAlarmDetails = JacksonUtil.newObjectNode().put("oldAlarmDetailsKey", "oldAlarmDetailsValue");
+        JsonNode newAlarmDetails = JacksonUtil.newObjectNode().put("newAlarmDetails", "Some alarm details TBEL").set("oldAlarmDetails", oldAlarmDetails);
+
+        long oldEndTs = 200L;
+        long newEndTs = 300L;
+
+        // node configuration
+        config.setAlarmType("${alarmType}");
+        config.setScriptLang(ScriptLanguage.TBEL);
+        config.setAlarmDetailsBuildJs("""
+                return {
+                    oldAlarmDetails: metadata.prevAlarmDetails,
+                    newAlarmDetails: "Some alarm details JS"
+                };
+                """);
+        config.setAlarmDetailsBuildTbel("""
+                return {
+                    oldAlarmDetails: metadata.prevAlarmDetails,
+                    newAlarmDetails: "Some alarm details TBEL"
+                };
+                """);
+        config.setDynamicSeverity(true);
+        config.setSeverity("$[alarmSeverity]");
+        config.setPropagate(newPropagate);
+        config.setPropagateToOwner(newPropagateToOwner);
+        config.setPropagateToTenant(newPropagateToTenant);
+        config.setRelationTypes(newPropagateRelationTypes);
+        config.setUseMessageAlarmData(false);
+        config.setOverwriteAlarmDetails(false);
+
+        // other values
+        String alarmType = "High Temperature";
+
+        long metadataTs = 1711631716127L;
+        metadata.putValue("ts", Long.toString(metadataTs));
+        metadata.putValue("alarmType", alarmType);
+        metadata.putValue("location", "Company office");
+
+        var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50, \"alarmSeverity\": \"" + newAlarmSeverity.name() + "\"}");
+
+        var existingAlarmId = new AlarmId(Uuids.timeBased());
+        var existingActiveAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(oldAlarmSeverity)
+                .propagate(oldPropagate)
+                .propagateToOwner(oldPropagateToOwner)
+                .propagateToTenant(oldPropagateToTenant)
+                .propagateRelationTypes(oldPropagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(oldEndTs)
+                .details(oldAlarmDetails)
+                .build();
+        existingActiveAlarm.setId(existingAlarmId);
+
+        // expected values
+        var expectedUpdatedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(newAlarmSeverity)
+                .propagate(newPropagate)
+                .propagateToOwner(newPropagateToOwner)
+                .propagateToTenant(newPropagateToTenant)
+                .propagateRelationTypes(newPropagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(newEndTs)
+                .details(newAlarmDetails)
+                .build();
+        expectedUpdatedAlarm.setId(existingAlarmId);
+        var expectedUpdatedAlarmInfo = new AlarmInfo(expectedUpdatedAlarm);
+
+        var expectedUpdateAlarmRequest = AlarmUpdateRequest.builder()
+                .tenantId(tenantId)
+                .alarmId(existingAlarmId)
+                .severity(newAlarmSeverity)
+                .startTs(100L)
+                .endTs(newEndTs)
+                .details(newAlarmDetails)
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(newPropagate)
+                        .propagateToOwner(newPropagateToOwner)
+                        .propagateToTenant(newPropagateToTenant)
+                        .propagateRelationTypes(newPropagateRelationTypes).build())
+                .userId(null)
+                .build();
+
+        // mocks
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.getSelfId()).willReturn(ruleNodeSelfId);
+        given(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, alarmType)).willReturn(existingActiveAlarm);
+        given(alarmDetailsScriptMock.executeJsonAsync(any())).willReturn(Futures.immediateFuture(newAlarmDetails));
+        doReturn(newEndTs).when(nodeSpy).currentTimeMillis();
+        var apiCallResult = AlarmApiCallResult.builder()
+                .successful(true)
+                .created(false)
+                .modified(true)
+                .cleared(false)
+                .deleted(false)
+                .alarm(expectedUpdatedAlarmInfo)
+                .old(new Alarm(existingActiveAlarm))
+                .propagatedEntitiesList(List.of(tenantId))
+                .build();
+        given(alarmServiceMock.updateAlarm(expectedUpdateAlarmRequest)).willReturn(apiCallResult);
+        given(ctxMock.alarmActionMsg(expectedUpdatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_UPDATED)).willReturn(alarmActionMsgMock);
+        given(ctxMock.transformMsg(any(TbMsg.class), any(TbMsgType.class), any(EntityId.class), any(TbMsgMetaData.class), anyString()))
+                .willAnswer(answer -> TbMsg.transformMsg(
+                        answer.getArgument(0, TbMsg.class),
+                        answer.getArgument(1, TbMsgType.class),
+                        answer.getArgument(2, EntityId.class),
+                        answer.getArgument(3, TbMsgMetaData.class),
+                        answer.getArgument(4, String.class))
+                );
+        given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
+
+        // node initialization
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+
+        // verify alarm details script evaluation
+        then(ctxMock).should().logJsEvalRequest();
+        var dummyMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(alarmDetailsScriptMock).should().executeJsonAsync(dummyMsgCaptor.capture());
+        TbMsg actualDummyMsg = dummyMsgCaptor.getValue();
+        assertThat(actualDummyMsg.getType()).isEqualTo(incomingMsg.getType());
+        assertThat(actualDummyMsg.getData()).isEqualTo(incomingMsg.getData());
+        assertThat(actualDummyMsg.getMetaData().getData()).containsEntry("prevAlarmDetails", JacksonUtil.toString(oldAlarmDetails));
+        then(ctxMock).should().logJsEvalResponse();
+
+        // verify we called updateAlarm() with correct AlarmUpdateRequest
+        then(alarmServiceMock).should().updateAlarm(expectedUpdateAlarmRequest);
+        then(alarmServiceMock).should(never()).createAlarm(any());
+
+        // verify that we created a correct alarm action message and enqueued it
+        then(ctxMock).should().alarmActionMsg(expectedUpdatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_UPDATED);
+        then(ctxMock).should().enqueue(eq(alarmActionMsgMock), successCaptor.capture(), any());
+
+        // run success captor to emulate successful queueing of an alarm action message and to trigger further processing on the success path
+        successCaptor.getValue().run();
+
+        // capture and verify an outgoing message
+        var outgoingMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(ctxMock).should().tellNext(outgoingMsgCaptor.capture(), eq("Updated"));
+        var actualOutgoingMsg = outgoingMsgCaptor.getValue();
+        assertThat(actualOutgoingMsg.getType()).isEqualTo(TbMsgType.ALARM.name());
+        assertThat(actualOutgoingMsg.getOriginator()).isEqualTo(msgOriginator);
+        assertThat(actualOutgoingMsg.getData()).isEqualTo(JacksonUtil.valueToTree(expectedUpdatedAlarmInfo).toString());
+
+        Map<String, String> actualOutgoingMsgMetadataContent = actualOutgoingMsg.getMetaData().getData();
+        assertThat(actualOutgoingMsgMetadataContent).containsAllEntriesOf(metadata.getData());
+        assertThat(actualOutgoingMsgMetadataContent).containsEntry(DataConstants.IS_EXISTING_ALARM, Boolean.TRUE.toString());
+        assertThat(actualOutgoingMsgMetadataContent).size().isEqualTo(metadata.getData().size() + 1);
+
+        // verify wrong processing paths were not taken
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Created"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+        then(ctxMock).should(never()).tellFailure(any(), any());
+    }
+
+    @Test
+    @DisplayName("When node is taking alarm data from incoming message and cleared alarm exists, then should create new alarm using info from incoming message.")
+    void whenAlarmDataIsTakenFromMsgAndClearedAlarmExists_thenNewAlarmIsCreated() throws Exception {
+        // GIVEN
+
+        // node configuration
+        config = config.defaultConfiguration();
+        config.setUseMessageAlarmData(true);
+        config.setOverwriteAlarmDetails(false);
+
+        // other values
+        String alarmType = "High Temperature";
+        AlarmSeverity alarmSeverity = AlarmSeverity.MAJOR;
+        JsonNode alarmDetails = JacksonUtil.newObjectNode().put("alarmDetails", "Some alarm details");
+
+        // alarm that is inside an incoming message
+        var alarmFromIncomingMessage = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(alarmSeverity)
+                .propagate(true)
+                .propagateToOwner(true)
+                .propagateToTenant(true)
+                .propagateRelationTypes(Collections.emptyList())
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(300L)
+                .details(alarmDetails)
+                .build();
+
+        long metadataTs = 1711631716127L;
+        metadata.putValue("ts", Long.toString(metadataTs));
+        metadata.putValue("location", "Company office");
+
+        var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.ALARM, msgOriginator, metadata, JacksonUtil.toString(alarmFromIncomingMessage));
+
+        var existingClearedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(true)
+                .acknowledged(false)
+                .severity(AlarmSeverity.WARNING)
+                .propagate(false)
+                .propagateToOwner(true)
+                .propagateToTenant(true)
+                .propagateRelationTypes(Collections.emptyList())
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(200L)
+                .details(JacksonUtil.newObjectNode())
+                .build();
+        existingClearedAlarm.setId(new AlarmId(Uuids.timeBased()));
+
+        // expected values
+        var expectedCreatedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(alarmSeverity)
+                .propagate(true)
+                .propagateToOwner(true)
+                .propagateToTenant(true)
+                .propagateRelationTypes(Collections.emptyList())
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(300L)
+                .details(alarmDetails)
+                .build();
+        var expectedCreatedAlarmInfo = new AlarmInfo(expectedCreatedAlarm);
+        expectedCreatedAlarmInfo.setId(new AlarmId(Uuids.timeBased()));
+
+        var expectedCreateAlarmRequest = AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(null)
+                .type(alarmType)
+                .originator(msgOriginator)
+                .severity(alarmSeverity)
+                .startTs(100L)
+                .endTs(300L)
+                .details(alarmDetails)
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(true)
+                        .propagateToOwner(true)
+                        .propagateToTenant(true)
+                        .propagateRelationTypes(Collections.emptyList()).build())
+                .userId(null)
+                .edgeAlarmId(null)
+                .build();
+
+        // mocks
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.getSelfId()).willReturn(ruleNodeSelfId);
+        given(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, alarmType)).willReturn(existingClearedAlarm);
+        var apiCallResult = AlarmApiCallResult.builder()
+                .successful(true)
+                .created(true)
+                .modified(false)
+                .cleared(false)
+                .deleted(false)
+                .alarm(expectedCreatedAlarmInfo)
+                .old(null)
+                .propagatedEntitiesList(List.of(TenantId.fromUUID(Uuids.timeBased()), new CustomerId(Uuids.timeBased()), new AssetId(Uuids.timeBased())))
+                .build();
+        given(alarmServiceMock.createAlarm(expectedCreateAlarmRequest)).willReturn(apiCallResult);
+        given(ctxMock.alarmActionMsg(expectedCreatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_CREATED)).willReturn(alarmActionMsgMock);
+        given(ctxMock.transformMsg(any(TbMsg.class), any(TbMsgType.class), any(EntityId.class), any(TbMsgMetaData.class), anyString()))
+                .willAnswer(answer -> TbMsg.transformMsg(
+                        answer.getArgument(0, TbMsg.class),
+                        answer.getArgument(1, TbMsgType.class),
+                        answer.getArgument(2, EntityId.class),
+                        answer.getArgument(3, TbMsgMetaData.class),
+                        answer.getArgument(4, String.class))
+                );
+        given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
+
+        // node initialization
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+
+        // verify alarm details script was not evaluated
+        then(ctxMock).should(never()).logJsEvalRequest();
+        then(alarmDetailsScriptMock).should(never()).executeJsonAsync(any());
+        then(ctxMock).should(never()).logJsEvalResponse();
+
+        // verify we called createAlarm() with correct AlarmCreateOrUpdateActiveRequest
+        then(alarmServiceMock).should().createAlarm(expectedCreateAlarmRequest);
+        then(alarmServiceMock).should(never()).updateAlarm(any());
+
+        // verify that we created a correct alarm action message and enqueued it
+        then(ctxMock).should().alarmActionMsg(expectedCreatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_CREATED);
+        then(ctxMock).should().enqueue(eq(alarmActionMsgMock), successCaptor.capture(), any());
+
+        // run success captor to emulate successful sending and to trigger further processing on the success path
+        successCaptor.getValue().run();
+
+        // capture and verify an outgoing message
+        var outgoingMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(ctxMock).should().tellNext(outgoingMsgCaptor.capture(), eq("Created"));
+        var actualOutgoingMsg = outgoingMsgCaptor.getValue();
+        assertThat(actualOutgoingMsg.getType()).isEqualTo(TbMsgType.ALARM.name());
+        assertThat(actualOutgoingMsg.getOriginator()).isEqualTo(msgOriginator);
+        assertThat(actualOutgoingMsg.getData()).isEqualTo(JacksonUtil.valueToTree(expectedCreatedAlarmInfo).toString());
+
+        Map<String, String> actualOutgoingMsgMetadataContent = actualOutgoingMsg.getMetaData().getData();
+        assertThat(actualOutgoingMsgMetadataContent).containsAllEntriesOf(metadata.getData());
+        assertThat(actualOutgoingMsgMetadataContent).containsEntry(DataConstants.IS_NEW_ALARM, Boolean.TRUE.toString());
+        assertThat(actualOutgoingMsgMetadataContent).size().isEqualTo(metadata.getData().size() + 1);
+
+        // verify wrong processing paths were not taken
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Updated"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+        then(ctxMock).should(never()).tellFailure(any(), any());
+    }
+
+    @Test
+    @DisplayName("When node is taking alarm data from incoming message and active alarm exists, then should update existing alarm using info from incoming message.")
+    void whenAlarmDataIsTakenFromMsgAndActiveAlarmExists_thenExistingAlarmIsUpdated() throws Exception {
+        // GIVEN
+
+        // values that changed between existing alarm and updated alarm
+        AlarmSeverity oldAlarmSeverity = AlarmSeverity.WARNING;
+        AlarmSeverity newAlarmSeverity = AlarmSeverity.MAJOR;
+
+        boolean oldPropagate = true;
+        boolean newPropagate = false;
+
+        boolean oldPropagateToOwner = false;
+        boolean newPropagateToOwner = true;
+
+        boolean oldPropagateToTenant = false;
+        boolean newPropagateToTenant = true;
+
+        List<String> oldPropagateRelationTypes = List.of("RELATION_TYPE_1", "RELATION_TYPE_2", "RELATION_TYPE_3");
+        List<String> newPropagateRelationTypes = Collections.emptyList();
+
+        JsonNode oldAlarmDetails = JacksonUtil.newObjectNode().put("oldAlarmDetailsKey", "oldAlarmDetailsValue");
+        JsonNode newAlarmDetails = JacksonUtil.newObjectNode().put("newAlarmDetails", "Some alarm details TBEL").set("oldAlarmDetails", oldAlarmDetails);
+
+        long oldEndTs = 200L;
+        long newEndTs = 300L;
+
+        // node configuration
+        config = config.defaultConfiguration();
+        config.setUseMessageAlarmData(true);
+        config.setOverwriteAlarmDetails(true);
+
+        // other values
+        String alarmType = "High Temperature";
+
+        long metadataTs = 1711631716127L;
+        metadata.putValue("ts", Long.toString(metadataTs));
+        metadata.putValue("location", "Company office");
+
+        var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
+
+        // alarm that is inside an incoming message
+        var alarmFromIncomingMessage = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(newAlarmSeverity)
+                .propagate(newPropagate)
+                .propagateToOwner(newPropagateToOwner)
+                .propagateToTenant(newPropagateToTenant)
+                .propagateRelationTypes(newPropagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(newEndTs)
+                .details(newAlarmDetails)
+                .build();
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, JacksonUtil.toString(alarmFromIncomingMessage));
+
+        var existingAlarmId = new AlarmId(Uuids.timeBased());
+        var existingActiveAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(oldAlarmSeverity)
+                .propagate(oldPropagate)
+                .propagateToOwner(oldPropagateToOwner)
+                .propagateToTenant(oldPropagateToTenant)
+                .propagateRelationTypes(oldPropagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(oldEndTs)
+                .details(oldAlarmDetails)
+                .build();
+        existingActiveAlarm.setId(existingAlarmId);
+
+        // expected values
+        var expectedUpdatedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(newAlarmSeverity)
+                .propagate(newPropagate)
+                .propagateToOwner(newPropagateToOwner)
+                .propagateToTenant(newPropagateToTenant)
+                .propagateRelationTypes(newPropagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(newEndTs)
+                .details(newAlarmDetails)
+                .build();
+        expectedUpdatedAlarm.setId(existingAlarmId);
+        var expectedUpdatedAlarmInfo = new AlarmInfo(expectedUpdatedAlarm);
+
+        var expectedUpdateAlarmRequest = AlarmUpdateRequest.builder()
+                .tenantId(tenantId)
+                .alarmId(existingAlarmId)
+                .severity(newAlarmSeverity)
+                .startTs(100L)
+                .endTs(newEndTs)
+                .details(newAlarmDetails)
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(newPropagate)
+                        .propagateToOwner(newPropagateToOwner)
+                        .propagateToTenant(newPropagateToTenant)
+                        .propagateRelationTypes(newPropagateRelationTypes).build())
+                .userId(null)
+                .build();
+
+        // mocks
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.getSelfId()).willReturn(ruleNodeSelfId);
+        given(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, alarmType)).willReturn(existingActiveAlarm);
+        given(alarmDetailsScriptMock.executeJsonAsync(any())).willReturn(Futures.immediateFuture(newAlarmDetails));
+        doReturn(newEndTs).when(nodeSpy).currentTimeMillis();
+        var apiCallResult = AlarmApiCallResult.builder()
+                .successful(true)
+                .created(false)
+                .modified(true)
+                .cleared(false)
+                .deleted(false)
+                .alarm(expectedUpdatedAlarmInfo)
+                .old(new Alarm(existingActiveAlarm))
+                .propagatedEntitiesList(List.of(tenantId))
+                .build();
+        given(alarmServiceMock.updateAlarm(expectedUpdateAlarmRequest)).willReturn(apiCallResult);
+        given(ctxMock.alarmActionMsg(expectedUpdatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_UPDATED)).willReturn(alarmActionMsgMock);
+        given(ctxMock.transformMsg(any(TbMsg.class), any(TbMsgType.class), any(EntityId.class), any(TbMsgMetaData.class), anyString()))
+                .willAnswer(answer -> TbMsg.transformMsg(
+                        answer.getArgument(0, TbMsg.class),
+                        answer.getArgument(1, TbMsgType.class),
+                        answer.getArgument(2, EntityId.class),
+                        answer.getArgument(3, TbMsgMetaData.class),
+                        answer.getArgument(4, String.class))
+                );
+        given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
+
+        // node initialization
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+
+        // verify alarm details script evaluation
+        then(ctxMock).should().logJsEvalRequest();
+        var dummyMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(alarmDetailsScriptMock).should().executeJsonAsync(dummyMsgCaptor.capture());
+        TbMsg actualDummyMsg = dummyMsgCaptor.getValue();
+        assertThat(actualDummyMsg.getType()).isEqualTo(incomingMsg.getType());
+        assertThat(actualDummyMsg.getData()).isEqualTo(incomingMsg.getData());
+        assertThat(actualDummyMsg.getMetaData().getData()).containsEntry("prevAlarmDetails", JacksonUtil.toString(oldAlarmDetails));
+        then(ctxMock).should().logJsEvalResponse();
+
+        // verify we called updateAlarm() with correct AlarmUpdateRequest
+        then(alarmServiceMock).should().updateAlarm(expectedUpdateAlarmRequest);
+        then(alarmServiceMock).should(never()).createAlarm(any());
+
+        // verify that we created a correct alarm action message and enqueued it
+        then(ctxMock).should().alarmActionMsg(expectedUpdatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_UPDATED);
+        then(ctxMock).should().enqueue(eq(alarmActionMsgMock), successCaptor.capture(), any());
+
+        // run success captor to emulate successful queueing of an alarm action message and to trigger further processing on the success path
+        successCaptor.getValue().run();
+
+        // capture and verify an outgoing message
+        var outgoingMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(ctxMock).should().tellNext(outgoingMsgCaptor.capture(), eq("Updated"));
+        var actualOutgoingMsg = outgoingMsgCaptor.getValue();
+        assertThat(actualOutgoingMsg.getType()).isEqualTo(TbMsgType.ALARM.name());
+        assertThat(actualOutgoingMsg.getOriginator()).isEqualTo(msgOriginator);
+        assertThat(actualOutgoingMsg.getData()).isEqualTo(JacksonUtil.valueToTree(expectedUpdatedAlarmInfo).toString());
+
+        Map<String, String> actualOutgoingMsgMetadataContent = actualOutgoingMsg.getMetaData().getData();
+        assertThat(actualOutgoingMsgMetadataContent).containsAllEntriesOf(metadata.getData());
+        assertThat(actualOutgoingMsgMetadataContent).containsEntry(DataConstants.IS_EXISTING_ALARM, Boolean.TRUE.toString());
+        assertThat(actualOutgoingMsgMetadataContent).size().isEqualTo(metadata.getData().size() + 1);
+
+        // verify wrong processing paths were not taken
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Created"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+        then(ctxMock).should(never()).tellFailure(any(), any());
+    }
+
+    @Test
+    @DisplayName("When only severity was updated (other fields the same), then should consider this as an alarm update and take update processing path.")
+    void whenOnlySeverityWasUpdated_thenShouldTakeAlarmUpdatedPath() throws Exception {
+        // GIVEN
+
+        // values that changed between existing alarm and updated alarm
+        AlarmSeverity oldAlarmSeverity = AlarmSeverity.WARNING;
+        AlarmSeverity newAlarmSeverity = AlarmSeverity.MAJOR;
+
+        boolean propagate = true;
+        boolean propagateToOwner = false;
+        boolean propagateToTenant = false;
+        List<String> propagateRelationTypes = List.of("RELATION_TYPE_1", "RELATION_TYPE_2", "RELATION_TYPE_3");
+        JsonNode alarmDetails = JacksonUtil.newObjectNode().put("oldAlarmDetailsKey", "oldAlarmDetailsValue");
+        long endTs = 200L;
+
+        // node configuration
+        config = config.defaultConfiguration();
+        config.setUseMessageAlarmData(true);
+        config.setOverwriteAlarmDetails(true);
+
+        // other values
+        String alarmType = "High Temperature";
+
+        long metadataTs = 1711631716127L;
+        metadata.putValue("ts", Long.toString(metadataTs));
+        metadata.putValue("location", "Company office");
+
+        var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
+
+        // alarm that is inside an incoming message
+        var alarmFromIncomingMessage = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(newAlarmSeverity)
+                .propagate(propagate)
+                .propagateToOwner(propagateToOwner)
+                .propagateToTenant(propagateToTenant)
+                .propagateRelationTypes(propagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(endTs)
+                .details(alarmDetails)
+                .build();
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, JacksonUtil.toString(alarmFromIncomingMessage));
+
+        var existingAlarmId = new AlarmId(Uuids.timeBased());
+        var existingActiveAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(oldAlarmSeverity)
+                .propagate(propagate)
+                .propagateToOwner(propagateToOwner)
+                .propagateToTenant(propagateToTenant)
+                .propagateRelationTypes(propagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(endTs)
+                .details(alarmDetails)
+                .build();
+        existingActiveAlarm.setId(existingAlarmId);
+
+        // expected values
+        var expectedUpdatedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(newAlarmSeverity)
+                .propagate(propagate)
+                .propagateToOwner(propagateToOwner)
+                .propagateToTenant(propagateToTenant)
+                .propagateRelationTypes(propagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(endTs)
+                .details(alarmDetails)
+                .build();
+        expectedUpdatedAlarm.setId(existingAlarmId);
+        var expectedUpdatedAlarmInfo = new AlarmInfo(expectedUpdatedAlarm);
+
+        var expectedUpdateAlarmRequest = AlarmUpdateRequest.builder()
+                .tenantId(tenantId)
+                .alarmId(existingAlarmId)
+                .severity(newAlarmSeverity)
+                .startTs(100L)
+                .endTs(endTs)
+                .details(alarmDetails)
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(propagate)
+                        .propagateToOwner(propagateToOwner)
+                        .propagateToTenant(propagateToTenant)
+                        .propagateRelationTypes(propagateRelationTypes).build())
+                .userId(null)
+                .build();
+
+        // mocks
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.getSelfId()).willReturn(ruleNodeSelfId);
+        given(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, alarmType)).willReturn(existingActiveAlarm);
+        given(alarmDetailsScriptMock.executeJsonAsync(any())).willReturn(Futures.immediateFuture(alarmDetails));
+        doReturn(endTs).when(nodeSpy).currentTimeMillis();
+        var apiCallResult = AlarmApiCallResult.builder()
+                .successful(true)
+                .created(false)
+                .modified(true)
+                .cleared(false)
+                .deleted(false)
+                .alarm(expectedUpdatedAlarmInfo)
+                .old(new Alarm(existingActiveAlarm))
+                .propagatedEntitiesList(List.of(tenantId))
+                .build();
+        given(alarmServiceMock.updateAlarm(expectedUpdateAlarmRequest)).willReturn(apiCallResult);
+        given(ctxMock.alarmActionMsg(expectedUpdatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_UPDATED)).willReturn(alarmActionMsgMock);
+        given(ctxMock.transformMsg(any(TbMsg.class), any(TbMsgType.class), any(EntityId.class), any(TbMsgMetaData.class), anyString()))
+                .willAnswer(answer -> TbMsg.transformMsg(
+                        answer.getArgument(0, TbMsg.class),
+                        answer.getArgument(1, TbMsgType.class),
+                        answer.getArgument(2, EntityId.class),
+                        answer.getArgument(3, TbMsgMetaData.class),
+                        answer.getArgument(4, String.class))
+                );
+        given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
+
+        // node initialization
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+
+        // verify alarm details script evaluation
+        then(ctxMock).should().logJsEvalRequest();
+        var dummyMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(alarmDetailsScriptMock).should().executeJsonAsync(dummyMsgCaptor.capture());
+        TbMsg actualDummyMsg = dummyMsgCaptor.getValue();
+        assertThat(actualDummyMsg.getType()).isEqualTo(incomingMsg.getType());
+        assertThat(actualDummyMsg.getData()).isEqualTo(incomingMsg.getData());
+        assertThat(actualDummyMsg.getMetaData().getData()).containsEntry("prevAlarmDetails", JacksonUtil.toString(alarmDetails));
+        then(ctxMock).should().logJsEvalResponse();
+
+        // verify we called updateAlarm() with correct AlarmUpdateRequest
+        then(alarmServiceMock).should().updateAlarm(expectedUpdateAlarmRequest);
+        then(alarmServiceMock).should(never()).createAlarm(any());
+
+        // verify that we created a correct alarm action message and enqueued it
+        then(ctxMock).should().alarmActionMsg(expectedUpdatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_UPDATED);
+        then(ctxMock).should().enqueue(eq(alarmActionMsgMock), successCaptor.capture(), any());
+
+        // run success captor to emulate successful queueing of an alarm action message and to trigger further processing on the success path
+        successCaptor.getValue().run();
+
+        // capture and verify an outgoing message
+        var outgoingMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(ctxMock).should().tellNext(outgoingMsgCaptor.capture(), eq("Updated"));
+        var actualOutgoingMsg = outgoingMsgCaptor.getValue();
+        assertThat(actualOutgoingMsg.getType()).isEqualTo(TbMsgType.ALARM.name());
+        assertThat(actualOutgoingMsg.getOriginator()).isEqualTo(msgOriginator);
+        assertThat(actualOutgoingMsg.getData()).isEqualTo(JacksonUtil.valueToTree(expectedUpdatedAlarmInfo).toString());
+
+        Map<String, String> actualOutgoingMsgMetadataContent = actualOutgoingMsg.getMetaData().getData();
+        assertThat(actualOutgoingMsgMetadataContent).containsAllEntriesOf(metadata.getData());
+        assertThat(actualOutgoingMsgMetadataContent).containsEntry(DataConstants.IS_EXISTING_ALARM, Boolean.TRUE.toString());
+        assertThat(actualOutgoingMsgMetadataContent).size().isEqualTo(metadata.getData().size() + 1);
+
+        // verify wrong processing paths were not taken
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Created"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+        then(ctxMock).should(never()).tellFailure(any(), any());
+    }
+
+    @Test
+    @DisplayName("When the alarm details script throws an exception, " +
+            "node should tell failure with that exception, and it should neither create nor update any alarms, nor should it send any other messages.")
+    void whenAlarmDetailsScriptThrowsException_thenShouldTellFailureAndNoOtherActions() throws Exception {
+        // GIVEN
+        config = config.defaultConfiguration();
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50}");
+
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
+
+        var expectedException = new ExecutionException("Failed to execute script.", new RuntimeException("Something went wrong!"));
+        given(alarmDetailsScriptMock.executeJsonAsync(incomingMsg)).willReturn(Futures.immediateFailedFuture(expectedException));
+
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+        var exceptionCaptor = ArgumentCaptor.forClass(Throwable.class);
+        then(ctxMock).should().tellFailure(eq(incomingMsg), exceptionCaptor.capture());
+        Throwable actualException = exceptionCaptor.getValue();
+        assertThat(actualException).isEqualTo(expectedException);
+
+        then(alarmServiceMock).should(never()).createAlarm(any());
+        then(alarmServiceMock).should(never()).updateAlarm(any());
+
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Created"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Updated"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+    }
+
+}
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java
index 707de1741f..74269b9be6 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java
@@ -16,19 +16,26 @@
 package org.thingsboard.rule.engine.metadata;
 
 import com.google.common.util.concurrent.Futures;
+import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.ArgumentCaptor;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
+import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ListeningExecutor;
+import org.thingsboard.rule.engine.AbstractRuleNodeUpgradeTest;
 import org.thingsboard.rule.engine.TestDbCallbackExecutor;
 import org.thingsboard.rule.engine.api.TbContext;
+import org.thingsboard.rule.engine.api.TbNode;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -48,7 +55,10 @@ import org.thingsboard.server.dao.timeseries.TimeseriesService;
 
 import java.util.List;
 import java.util.UUID;
+import java.util.function.BiConsumer;
+import java.util.stream.Stream;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -63,10 +73,11 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-public class CalculateDeltaNodeTest {
+public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
 
     private static final DeviceId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID());
     private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
@@ -75,13 +86,13 @@ public class CalculateDeltaNodeTest {
     private TbContext ctxMock;
     @Mock
     private TimeseriesService timeseriesServiceMock;
+    @Spy
     private CalculateDeltaNode node;
     private CalculateDeltaNodeConfiguration config;
     private TbNodeConfiguration nodeConfiguration;
 
     @BeforeEach
     public void setUp() throws TbNodeException {
-        node = new CalculateDeltaNode();
         config = new CalculateDeltaNodeConfiguration().defaultConfiguration();
         nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
         when(ctxMock.getTimeseriesService()).thenReturn(timeseriesServiceMock);
@@ -424,6 +435,91 @@ public class CalculateDeltaNodeTest {
                 .hasMessage("Calculation failed. JSON values are not supported!");
     }
 
+    @ParameterizedTest
+    @MethodSource("CalculateDeltaTestConfig")
+    public void givenCalculateDeltaConfig_whenOnMsg_thenVerify(CalculateDeltaTestConfig testConfig) throws TbNodeException {
+        // GIVEN
+        config.setTellFailureIfDeltaIsNegative(testConfig.isTellFailureIfDeltaIsNegative());
+        config.setExcludeZeroDeltas(testConfig.isExcludeZeroDeltas());
+        config.setInputValueKey("temperature");
+        nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
+        node.init(ctxMock, nodeConfiguration);
+
+        mockFindLatest(new BasicTsKvEntry(1L, new DoubleDataEntry("temperature", testConfig.getPrevValue())));
+
+        var msgData = "{\"temperature\":" + testConfig.getCurrentValue() + ",\"airPressure\":123}";
+        var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
+
+        // WHEN
+
+        node.onMsg(ctxMock, msg);
+
+        // THEN
+        testConfig.getVerificationMethod().accept(ctxMock, msg);
+    }
+
+    private static Stream<CalculateDeltaTestConfig> CalculateDeltaTestConfig() {
+        return Stream.of(
+                // delta = 0, tell failure if delta is negative is set to true and exclude zero deltas is set to true so delta should filter out the message.
+                new CalculateDeltaTestConfig(true, true, 40, 40, (ctx, msg) -> {
+                    verify(ctx).tellSuccess(eq(msg));
+                    verify(ctx).getDbCallbackExecutor();
+                    verifyNoMoreInteractions(ctx);
+                }),
+                // delta < 0, tell failure if delta is negative is set to true so it should throw exception.
+                new CalculateDeltaTestConfig(true, true, 41, 40, (ctx, msg) -> {
+                    var errorCaptor = ArgumentCaptor.forClass(Throwable.class);
+                    verify(ctx).tellFailure(eq(msg), errorCaptor.capture());
+                    verify(ctx).getDbCallbackExecutor();
+                    verifyNoMoreInteractions(ctx);
+                    assertThat(errorCaptor.getValue()).isInstanceOf(IllegalArgumentException.class).hasMessage("Delta value is negative!");
+                }),
+                // delta < 0, exclude zero deltas is set to true so it should return message with delta if delta is negative is set to false.
+                new CalculateDeltaTestConfig(false, true, 41, 40, (ctx, msg) -> {
+                    var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+                    verify(ctx).tellSuccess(actualMsgCaptor.capture());
+                    verify(ctx).getDbCallbackExecutor();
+                    verifyNoMoreInteractions(ctx);
+                    String expectedMsgData = "{\"temperature\":40.0,\"airPressure\":123,\"delta\":-1}";
+                    assertEquals(expectedMsgData, actualMsgCaptor.getValue().getData());
+                }),
+                // delta = 0, tell failure if delta is negative is set to false and exclude zero deltas is set to true so delta should filter out the message.
+                new CalculateDeltaTestConfig(false, true, 40, 40, (ctx, msg) -> {
+                    verify(ctx).tellSuccess(eq(msg));
+                    verify(ctx).getDbCallbackExecutor();
+                    verifyNoMoreInteractions(ctx);
+                }),
+                // delta > 0, exclude zero deltas is set to true so it should return message with delta.
+                new CalculateDeltaTestConfig(false, true, 39, 40, (ctx, msg) -> {
+                    var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+                    verify(ctx).tellSuccess(actualMsgCaptor.capture());
+                    verify(ctx).getDbCallbackExecutor();
+                    verifyNoMoreInteractions(ctx);
+                    String expectedMsgData = "{\"temperature\":40.0,\"airPressure\":123,\"delta\":1}";
+                    assertEquals(expectedMsgData, actualMsgCaptor.getValue().getData());
+                }),
+                // delta > 0, exclude zero deltas is set to false so it should return message with delta.
+                new CalculateDeltaTestConfig(false, false, 39, 40, (ctx, msg) -> {
+                    var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+                    verify(ctx).tellSuccess(actualMsgCaptor.capture());
+                    verify(ctx).getDbCallbackExecutor();
+                    verifyNoMoreInteractions(ctx);
+                    String expectedMsgData = "{\"temperature\":40.0,\"airPressure\":123,\"delta\":1}";
+                    assertEquals(expectedMsgData, actualMsgCaptor.getValue().getData());
+                })
+        );
+    }
+
+    @Data
+    @RequiredArgsConstructor
+    private static class CalculateDeltaTestConfig {
+        private final boolean tellFailureIfDeltaIsNegative;
+        private final boolean excludeZeroDeltas;
+        private final double prevValue;
+        private final double currentValue;
+        private final BiConsumer<TbContext, TbMsg> verificationMethod;
+    }
+
     private void mockFindLatest(TsKvEntry tsKvEntry) {
         when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
         when(timeseriesServiceMock.findLatestSync(
@@ -457,4 +553,24 @@ public class CalculateDeltaNodeTest {
 
     }
 
+    private static Stream<Arguments> givenFromVersionAndConfig_whenUpgrade_thenVerifyHasChangesAndConfig() {
+        return Stream.of(
+                // default config for version 0
+                Arguments.of(0,
+                        "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true}",
+                        true,
+                        "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true, \"excludeZeroDeltas\":false}"),
+                // default config for version 1 with upgrade from version 0
+                Arguments.of(1,
+                        "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true, \"excludeZeroDeltas\":false}",
+                        false,
+                        "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true, \"excludeZeroDeltas\":false}")
+        );
+
+    }
+
+    @Override
+    protected TbNode getTestNode() {
+        return node;
+    }
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeTest.java
new file mode 100644
index 0000000000..b46ecdf6fe
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeTest.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.rule.engine.mqtt;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.provider.Arguments;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.rule.engine.AbstractRuleNodeUpgradeTest;
+import org.thingsboard.rule.engine.api.TbNode;
+
+import java.util.stream.Stream;
+
+import static org.mockito.Mockito.mock;
+
+@ExtendWith(MockitoExtension.class)
+class TbMqttNodeTest extends AbstractRuleNodeUpgradeTest {
+    @Spy
+    TbMqttNode node;
+
+    @BeforeEach
+    public void setUp() throws Exception {
+        node = mock(TbMqttNode.class);
+    }
+
+    private static Stream<Arguments> givenFromVersionAndConfig_whenUpgrade_thenVerifyHasChangesAndConfig() {
+        return Stream.of(
+                // default config for version 0
+                Arguments.of(0,
+                        "{\"topicPattern\":\"my-topic\",\"port\":1883,\"connectTimeoutSec\":10,\"cleanSession\":true, \"ssl\":false, \"retainedMessage\":false,\"credentials\":{\"type\":\"anonymous\"}}",
+                        true,
+                        "{\"topicPattern\":\"my-topic\",\"port\":1883,\"connectTimeoutSec\":10,\"cleanSession\":true, \"ssl\":false, \"retainedMessage\":false,\"credentials\":{\"type\":\"anonymous\"},\"parseToPlainText\":false}"),
+                // default config for version 1 with upgrade from version 0
+                Arguments.of(1,
+                        "{\"topicPattern\":\"my-topic\",\"port\":1883,\"connectTimeoutSec\":10,\"cleanSession\":true, \"ssl\":false, \"retainedMessage\":false,\"credentials\":{\"type\":\"anonymous\"},\"parseToPlainText\":false}",
+                        false,
+                        "{\"topicPattern\":\"my-topic\",\"port\":1883,\"connectTimeoutSec\":10,\"cleanSession\":true, \"ssl\":false, \"retainedMessage\":false,\"credentials\":{\"type\":\"anonymous\"},\"parseToPlainText\":false}")
+        );
+
+    }
+
+    @Override
+    protected TbNode getTestNode() {
+        return node;
+    }
+}
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java
index 617c553770..2eb65c1787 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java
@@ -22,13 +22,10 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.mockserver.integration.ClientAndServer;
 import org.springframework.util.LinkedMultiValueMap;
-import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -47,7 +44,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.willCallRealMethod;
 import static org.mockito.Mockito.mock;
@@ -222,16 +218,4 @@ public class TbHttpClientTest {
         Assertions.assertEquals(data.get("Set-Cookie"), "[\"sap-context=sap-client=075; path=/\",\"sap-token=sap-client=075; path=/\"]");
     }
 
-    @ParameterizedTest
-    @ValueSource(strings = { "false", "\"", "\"\"", "\"This is a string with double quotes\"", "Path: /home/developer/test.txt",
-            "First line\nSecond line\n\nFourth line", "Before\rAfter", "Tab\tSeparated\tValues", "Test\bbackspace", "[]",
-            "[1, 2, 3]", "{\"key\": \"value\"}", "{\n\"temperature\": 25.5,\n\"humidity\": 50.2\n\"}", "Expression: (a + b) * c",
-            "世界", "Україна", "\u1F1FA\u1F1E6", "🇺🇦"})
-    public void testParseJsonStringToPlainText(String original) {
-        Mockito.when(client.parseJsonStringToPlainText(anyString())).thenCallRealMethod();
-
-        String serialized = JacksonUtil.toString(original);
-        Assertions.assertNotNull(serialized);
-        Assertions.assertEquals(original, client.parseJsonStringToPlainText(serialized));
-    }
 }
diff --git a/ui-ngx/src/app/core/api/data-aggregator.ts b/ui-ngx/src/app/core/api/data-aggregator.ts
index 61cb1f1a85..5bce9115e8 100644
--- a/ui-ngx/src/app/core/api/data-aggregator.ts
+++ b/ui-ngx/src/app/core/api/data-aggregator.ts
@@ -378,6 +378,7 @@ export class DataAggregator {
   private updateStateBounds(keyData: DataSet, lastPrevKvPair: DataEntry) {
     if (lastPrevKvPair) {
       lastPrevKvPair[0] = this.startTs;
+      lastPrevKvPair[2] = [this.startTs, this.startTs];
     }
     let firstKvPair: DataEntry;
     if (!keyData.length) {
@@ -398,6 +399,7 @@ export class DataAggregator {
       if (lastKvPair[0] < this.endTs) {
         lastKvPair = deepClone(lastKvPair);
         lastKvPair[0] = this.endTs;
+        lastKvPair[2] = [this.endTs, this.endTs];
         keyData.push(lastKvPair);
       }
     }
diff --git a/ui-ngx/src/app/core/api/widget-api.models.ts b/ui-ngx/src/app/core/api/widget-api.models.ts
index 54552c714f..1848733006 100644
--- a/ui-ngx/src/app/core/api/widget-api.models.ts
+++ b/ui-ngx/src/app/core/api/widget-api.models.ts
@@ -30,7 +30,7 @@ import {
 import { TimeService } from '../services/time.service';
 import { DeviceService } from '../http/device.service';
 import { UtilsService } from '@core/services/utils.service';
-import { Timewindow, WidgetTimewindow } from '@shared/models/time/time.models';
+import { SubscriptionTimewindow, Timewindow, WidgetTimewindow } from '@shared/models/time/time.models';
 import { EntityType } from '@shared/models/entity-type.models';
 import { HttpErrorResponse } from '@angular/common/http';
 import { RafService } from '@core/services/raf.service';
@@ -303,6 +303,7 @@ export interface IWidgetSubscription {
   hiddenData?: Array<{data: DataSet}>;
   timeWindowConfig?: Timewindow;
   timeWindow?: WidgetTimewindow;
+  subscriptionTimewindow: SubscriptionTimewindow;
   onTimewindowChangeFunction?: (timewindow: Timewindow) => Timewindow;
   widgetTimewindowChanged$: Observable<WidgetTimewindow>;
   comparisonEnabled?: boolean;
diff --git a/ui-ngx/src/app/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 94866da201..80e13a96a2 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
@@ -41,6 +41,10 @@
       [entityAliasId]="datasource?.entityAliasId"
       formControlName="series">
   </tb-data-keys-panel>
+  <tb-time-series-chart-states-panel
+      *ngIf="chartType === TimeSeriesChartType.state"
+      formControlName="states">
+  </tb-time-series-chart-states-panel>
   <tb-time-series-chart-y-axes-panel
     formControlName="yAxes"
     (axisRemoved)="yAxisRemoved($event)">
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 31dca75c7e..8ab44db11d 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
@@ -46,8 +46,9 @@ import {
 } from '@home/components/widget/lib/chart/time-series-chart-widget.models';
 import { EChartsTooltipTrigger } from '@home/components/widget/lib/chart/echarts-widget.models';
 import {
-  TimeSeriesChartKeySettings, TimeSeriesChartThreshold,
-  TimeSeriesChartType, TimeSeriesChartYAxes,
+  TimeSeriesChartKeySettings,
+  TimeSeriesChartType,
+  TimeSeriesChartYAxes,
   TimeSeriesChartYAxisId
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 
@@ -178,6 +179,9 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
 
       actions: [configData.config.actions || {}, []]
     });
+    if (this.chartType === TimeSeriesChartType.state) {
+      this.timeSeriesChartWidgetConfigForm.addControl('states', this.fb.control(settings.states, []));
+    }
   }
 
   protected prepareOutputConfig(config: any): WidgetConfigComponentData {
@@ -233,6 +237,10 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
     this.widgetConfig.config.settings.padding = config.padding;
 
     this.widgetConfig.config.actions = config.actions;
+
+    if (this.chartType === TimeSeriesChartType.state) {
+      this.widgetConfig.config.settings.states = config.states;
+    }
     return this.widgetConfig;
   }
 
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 81ffb457b9..0a1bb673cb 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,7 @@
 import * as echarts from 'echarts/core';
 import AxisModel from 'echarts/types/src/coord/cartesian/AxisModel';
 import { estimateLabelUnionRect } from 'echarts/lib/coord/axisHelper';
-import { formatValue, isDefinedAndNotNull, isNumber } from '@core/utils';
+import { isDefinedAndNotNull, isFunction, isNumber } from '@core/utils';
 import {
   DataZoomComponent,
   DataZoomComponentOption,
@@ -42,7 +42,7 @@ import {
 } from 'echarts/charts';
 import { LabelLayout } from 'echarts/features';
 import { CanvasRenderer, SVGRenderer } from 'echarts/renderers';
-import { DataEntry, DataKey, DataSet } from '@shared/models/widget.models';
+import { DataEntry, DataKey, DataSet, Datasource, FormattedData } from '@shared/models/widget.models';
 import {
   calculateAggIntervalWithWidgetTimeWindow,
   Interval,
@@ -56,6 +56,7 @@ 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';
 
 class EChartsModule {
   private initialized = false;
@@ -101,14 +102,19 @@ 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;
 };
 
 export enum EChartsShape {
@@ -270,7 +276,7 @@ const measureSymbolOffset = (symbol: string, symbolSize: any): number => {
   } else {
     return 0;
   }
-}
+};
 
 export const measureThresholdOffset = (chart: ECharts, axisId: string, thresholdId: string, value: any): [number, number] => {
   const offset: [number, number] = [0,0];
@@ -395,7 +401,7 @@ export const getFocusedSeriesIndex = (chart: ECharts): number => {
   return -1;
 };
 
-export const toNamedData = (data: DataSet): NamedDataSet => {
+export const toNamedData = (data: DataSet, valueConverter?: (value: any) => any): NamedDataSet => {
   if (!data?.length) {
     return [];
   } else {
@@ -403,14 +409,43 @@ export const toNamedData = (data: DataSet): NamedDataSet => {
       const ts = isDefinedAndNotNull(d[2]) ? d[2][0] : d[0];
       return {
         name: ts + '',
-        value: toEChartsDataItem(d)
+        value: toEChartsDataItem(d, valueConverter)
       };
     });
   }
 };
 
-const toEChartsDataItem = (entry: DataEntry): EChartsDataItem => {
-  const item: EChartsDataItem = [entry[0], entry[1], entry[0], entry[0]];
+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') ? min : defaultMin;
+  timeAxisOption.max = (typeof max !== 'undefined') ? 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];
@@ -436,6 +471,7 @@ export interface EChartsTooltipWidgetSettings {
   tooltipShowFocusedSeries?: boolean;
   tooltipValueFont: Font;
   tooltipValueColor: string;
+  tooltipValueFormatter?: string | EChartsTooltipValueFormatFunction;
   tooltipShowDate: boolean;
   tooltipDateInterval?: boolean;
   tooltipDateFormat: DateFormatSettings;
@@ -445,12 +481,25 @@ export interface EChartsTooltipWidgetSettings {
   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,
-                                        decimals: number,
-                                        units: string,
+                                        valueFormatFunction: EChartsTooltipValueFormatFunction,
                                         focusedSeriesIndex: number,
                                         series?: EChartsSeriesItem[],
                                         interval?: Interval): null | HTMLElement => {
@@ -499,10 +548,12 @@ export const echartsTooltipFormatter = (renderer: Renderer2,
     seriesParams = params;
   }
   if (seriesParams) {
-    renderer.appendChild(tooltipElement, constructEchartsTooltipSeriesElement(renderer, settings, seriesParams, decimals, units, series));
+    renderer.appendChild(tooltipElement,
+      constructEchartsTooltipSeriesElement(renderer, settings, seriesParams, valueFormatFunction, series));
   } else if (Array.isArray(params)) {
     for (seriesParams of params) {
-      renderer.appendChild(tooltipElement, constructEchartsTooltipSeriesElement(renderer, settings, seriesParams, decimals, units, series));
+      renderer.appendChild(tooltipElement,
+        constructEchartsTooltipSeriesElement(renderer, settings, seriesParams, valueFormatFunction, series));
     }
   }
   return tooltipElement;
@@ -511,8 +562,7 @@ export const echartsTooltipFormatter = (renderer: Renderer2,
 const constructEchartsTooltipSeriesElement = (renderer: Renderer2,
                                               settings: EChartsTooltipWidgetSettings,
                                               seriesParams: CallbackDataParams,
-                                              decimals: number,
-                                              units: string,
+                                              valueFormatFunction: EChartsTooltipValueFormatFunction,
                                               series?: EChartsSeriesItem[]): HTMLElement => {
   const labelValueElement: HTMLElement = renderer.createElement('div');
   renderer.setStyle(labelValueElement, 'display', 'flex');
@@ -542,16 +592,25 @@ const constructEchartsTooltipSeriesElement = (renderer: Renderer2,
   renderer.setStyle(labelTextElement, 'color', 'rgba(0, 0, 0, 0.76)');
   renderer.appendChild(labelElement, labelTextElement);
   const valueElement: HTMLElement = renderer.createElement('div');
-  let formatDecimals = decimals;
-  let formatUnits = units;
+  let formatFunction = valueFormatFunction;
+  let latestData: FormattedData;
+  let units = '';
+  let decimals = 0;
   if (series) {
     const item = series.find(s => s.id === seriesParams.seriesId);
     if (item) {
-      formatDecimals = item.decimals;
-      formatUnits = item.units;
+      if (item.tooltipValueFormatFunction) {
+        formatFunction = item.tooltipValueFormatFunction;
+      }
+      latestData = item.latestData;
+      units = item.units;
+      decimals = item.decimals;
     }
   }
-  const value = formatValue(seriesParams.value[1], formatDecimals, formatUnits, false);
+  if (!latestData) {
+    latestData = {} as FormattedData;
+  }
+  const value = formatFunction(seriesParams.value[1], latestData, units, decimals);
   renderer.appendChild(valueElement, renderer.createText(value));
   renderer.setStyle(valueElement, 'flex', '1');
   renderer.setStyle(valueElement, 'text-align', 'end');
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-state.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-state.models.ts
new file mode 100644
index 0000000000..9a72361632
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-state.models.ts
@@ -0,0 +1,109 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import {
+  TimeSeriesChartStateSettings,
+  TimeSeriesChartStateSourceType,
+  TimeSeriesChartTicksFormatter,
+  TimeSeriesChartTicksGenerator
+} 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';
+
+export class TimeSeriesChartStateValueConverter {
+
+  private readonly constantsMap = new Map<any, number>();
+  private readonly rangeStates: TimeSeriesChartStateSettings[] = [];
+  private readonly ticks: {value: number}[] = [];
+  private readonly labelsMap = new Map<number, string>();
+
+  public readonly ticksGenerator: TimeSeriesChartTicksGenerator;
+  public readonly ticksFormatter: TimeSeriesChartTicksFormatter;
+  public readonly tooltipFormatter: EChartsTooltipValueFormatFunction;
+  public readonly labelFormatter: LabelFormatterCallback;
+  public readonly valueConverter: (value: any) => any;
+
+  constructor(utils: UtilsService,
+              states: TimeSeriesChartStateSettings[]) {
+    const ticks: number[] = [];
+    for (const state of states) {
+      if (state.sourceType === TimeSeriesChartStateSourceType.constant) {
+        this.constantsMap.set(state.sourceValue, state.value);
+      } else {
+        this.rangeStates.push(state);
+      }
+      if (!ticks.includes(state.value)) {
+        ticks.push(state.value);
+        const label = utils.customTranslation(state.label, state.label);
+        this.labelsMap.set(state.value, label);
+      }
+    }
+    this.ticks = ticks.map(val => ({value: val}));
+    this.ticksGenerator = () => this.ticks;
+    this.ticksFormatter = (value: any) => {
+      const result = this.labelsMap.get(value);
+      return result || '';
+    };
+    this.tooltipFormatter = (value: any, latestData: FormattedData, units?: string, decimals?: number) => {
+      const result = this.labelsMap.get(value);
+      if (typeof result === 'string') {
+        return result;
+      } else {
+        return formatValue(value, decimals, units, false);
+      }
+    };
+    this.labelFormatter = (params) => {
+      const value = params.value[1];
+      const result = this.labelsMap.get(value);
+      if (typeof result === 'string') {
+        return `{value|${result}}`;
+      } else {
+        return undefined;
+      }
+    };
+    this.valueConverter = (value: any) => {
+      let key = value;
+      if (key === 'true') {
+        key = true;
+      } else if (key === 'false') {
+        key = false;
+      }
+      const result = this.constantsMap.get(key);
+      if (typeof result === 'number') {
+        return result;
+      } else if (this.rangeStates.length && isDefinedAndNotNull(value) && isNumeric(value)) {
+        for (const state of this.rangeStates) {
+          const num = Number(value);
+          if (TimeSeriesChartStateValueConverter.constantRange(state) && state.sourceRangeFrom === num) {
+            return state.value;
+          } else if ((!isNumber(state.sourceRangeFrom) || num >= state.sourceRangeFrom) &&
+            (!isNumber(state.sourceRangeTo) || num < state.sourceRangeTo)) {
+            return state.value;
+          }
+        }
+      }
+      return value;
+    };
+  }
+
+  static constantRange(state: TimeSeriesChartStateSettings): boolean {
+    return isNumber(state.sourceRangeFrom) && isNumber(state.sourceRangeTo) && state.sourceRangeFrom === state.sourceRangeTo;
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts
index 3589d69d4f..252a284aaa 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
@@ -17,8 +17,10 @@
 import {
   ECharts,
   EChartsOption,
-  EChartsSeriesItem, EChartsShape,
+  EChartsSeriesItem,
+  EChartsShape,
   EChartsTooltipTrigger,
+  EChartsTooltipValueFormatFunction,
   EChartsTooltipWidgetSettings,
   measureThresholdOffset,
   timeAxisBandWidthCalculator
@@ -41,7 +43,8 @@ import { CustomSeriesOption, LineSeriesOption } from 'echarts/charts';
 import {
   formatValue,
   isDefinedAndNotNull,
-  isFunction, isNumber,
+  isFunction,
+  isNumber,
   isNumeric,
   isUndefined,
   isUndefinedOrNull,
@@ -51,7 +54,8 @@ import {
 import { LinearGradientObject } from 'zrender/lib/graphic/LinearGradient';
 import tinycolor from 'tinycolor2';
 import { ValueAxisBaseOption } from 'echarts/types/src/coord/axisCommonTypes';
-import { LabelFormatterCallback, LabelLayoutOption, SeriesLabelOption } from 'echarts/types/src/util/types';
+import { LabelLayoutOption, SeriesLabelOption } from 'echarts/types/src/util/types';
+import { LabelFormatterCallback } from 'echarts';
 import {
   BarRenderContext,
   BarRenderSharedContext,
@@ -70,7 +74,8 @@ export enum TimeSeriesChartType {
   default = 'default',
   line = 'line',
   bar = 'bar',
-  point = 'point'
+  point = 'point',
+  state = 'state'
 }
 
 export const timeSeriesChartTypeTranslations = new Map<TimeSeriesChartType, string>(
@@ -200,6 +205,21 @@ export const timeSeriesThresholdTypeTranslations = new Map<TimeSeriesChartThresh
   ]
 );
 
+
+export enum TimeSeriesChartStateSourceType {
+  constant = 'constant',
+  range = 'range'
+}
+
+export const timeSeriesStateSourceTypes = Object.keys(TimeSeriesChartStateSourceType) as TimeSeriesChartStateSourceType[];
+
+export const timeSeriesStateSourceTypeTranslations = new Map<TimeSeriesChartStateSourceType, string>(
+  [
+    [TimeSeriesChartStateSourceType.constant, 'widgets.time-series-chart.state.type-constant'],
+    [TimeSeriesChartStateSourceType.range, 'widgets.time-series-chart.state.type-range']
+  ]
+);
+
 export enum SeriesFillType {
   none = 'none',
   opacity = 'opacity',
@@ -639,6 +659,39 @@ export interface TimeSeriesChartVisualMapSettings {
   pieces: TimeSeriesChartVisualMapPiece[];
 }
 
+export interface TimeSeriesChartStateSettings {
+  label: string;
+  value: number;
+  sourceType: TimeSeriesChartStateSourceType;
+  sourceValue?: any;
+  sourceRangeFrom?: number;
+  sourceRangeTo?: number;
+}
+
+export const timeSeriesChartStateValid = (state: TimeSeriesChartStateSettings): boolean => {
+  if (isUndefinedOrNull(state.value) || !state.sourceType) {
+    return false;
+  }
+  switch (state.sourceType) {
+    case TimeSeriesChartStateSourceType.constant:
+      if (isUndefinedOrNull(state.sourceValue)) {
+        return false;
+      }
+      break;
+  }
+  return true;
+};
+
+export const timeSeriesChartStateValidator = (control: AbstractControl): ValidationErrors | null => {
+  const state: TimeSeriesChartStateSettings = control.value;
+  if (!timeSeriesChartStateValid(state)) {
+    return {
+      state: true
+    };
+  }
+  return null;
+};
+
 export interface TimeSeriesChartSettings extends EChartsTooltipWidgetSettings {
   thresholds: TimeSeriesChartThreshold[];
   darkMode: boolean;
@@ -650,6 +703,7 @@ export interface TimeSeriesChartSettings extends EChartsTooltipWidgetSettings {
   barWidthSettings: TimeSeriesChartBarWidthSettings;
   noAggregationBarWidthSettings: TimeSeriesChartNoAggregationBarWidthSettings;
   visualMapSettings?: TimeSeriesChartVisualMapSettings;
+  states?: TimeSeriesChartStateSettings[];
 }
 
 export const timeSeriesChartDefaultSettings: TimeSeriesChartSettings = {
@@ -751,6 +805,7 @@ export interface TimeSeriesChartKeySettings {
   type: TimeSeriesChartSeriesType;
   lineSettings: LineSeriesSettings;
   barSettings: BarSeriesSettings;
+  tooltipValueFormatter?: string | EChartsTooltipValueFormatFunction;
 }
 
 export const timeSeriesChartKeyDefaultSettings: TimeSeriesChartKeySettings = {
@@ -1359,28 +1414,28 @@ const createSeriesLabelOption = (item: TimeSeriesChartDataItem, show: boolean,
   if (show) {
     labelStyle = createChartTextStyle(labelFont, labelColor, darkMode, 'series.label', labelColorFill);
   }
-  let formatter: LabelFormatterCallback;
-  if (isFunction(labelFormatter)) {
-    formatter = labelFormatter as LabelFormatterCallback;
-  } else if (labelFormatter?.length) {
-    const formatFunction = parseFunction(labelFormatter, ['value']);
-    formatter = (params): string => {
-      let result: string;
-      try {
-        result = formatFunction(params.value[1]);
-      } catch (_e) {
-      }
-      if (isUndefined(result)) {
-        result = formatValue(params.value[1], item.decimals, item.units, false);
-      }
-      return `{value|${result}}`;
-    };
-  } else {
-    formatter = (params): string => {
-      const value = formatValue(params.value[1], item.decimals, item.units, false);
-      return `{value|${value}}`;
-    };
+  let formatFunction: (...args: any[]) => any;
+  if (typeof labelFormatter === 'string' && labelFormatter.length) {
+    formatFunction = parseFunction(labelFormatter, ['value']);
   }
+  const formatter: LabelFormatterCallback = (params): string => {
+    let result: string;
+    if (typeof labelFormatter === 'string') {
+      if (formatFunction) {
+        try {
+          result = formatFunction(params.value[1]);
+        } catch (_e) {
+        }
+      }
+    } else if (isFunction(labelFormatter)) {
+      result = labelFormatter(params);
+    }
+    if (isUndefined(result)) {
+      result = formatValue(params.value[1], item.decimals, item.units, false);
+      result = `{value|${result}}`;
+    }
+    return result;
+  };
   const labelOption: SeriesLabelOption = {
     show,
     position,
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 00f2c55d3f..700f07da15 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
@@ -23,6 +23,7 @@ import {
   createTimeSeriesYAxis,
   defaultTimeSeriesChartYAxisSettings,
   generateChartData,
+  LineSeriesStepType,
   parseThresholdData,
   SeriesLabelPosition,
   TimeSeriesChartDataItem,
@@ -44,13 +45,17 @@ import {
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { ResizeObserver } from '@juggle/resize-observer';
 import {
+  adjustTimeAxisExtentToData,
   calculateXAxisHeight,
   calculateYAxisWidth,
+  createTooltipValueFormatFunction,
   ECharts,
   echartsModule,
-  EChartsOption, EChartsShape,
+  EChartsOption,
+  EChartsShape,
   echartsTooltipFormatter,
   EChartsTooltipTrigger,
+  EChartsTooltipValueFormatFunction,
   getAxisExtent,
   getFocusedSeriesIndex,
   measureXAxisNameHeight,
@@ -58,12 +63,11 @@ import {
   toNamedData
 } from '@home/components/widget/lib/chart/echarts-widget.models';
 import { DateFormatProcessor } from '@shared/models/widget-settings.models';
-import { isDefinedAndNotNull, isEqual, mergeDeep } from '@core/utils';
-import { DataKey, Datasource, DatasourceType, widgetType } from '@shared/models/widget.models';
+import { formattedDataFormDatasourceData, formatValue, isDefinedAndNotNull, isEqual, mergeDeep } from '@core/utils';
+import { DataKey, Datasource, DatasourceType, FormattedData, widgetType } from '@shared/models/widget.models';
 import * as echarts from 'echarts/core';
 import { CallbackDataParams, PiecewiseVisualMapOption } from 'echarts/types/dist/shared';
 import { Renderer2 } from '@angular/core';
-import { CustomSeriesOption, LineSeriesOption } from 'echarts/charts';
 import { BehaviorSubject } from 'rxjs';
 import { AggregationType } from '@shared/models/time/time.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
@@ -71,6 +75,7 @@ import { WidgetSubscriptionOptions } from '@core/api/widget-api.models';
 import { DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 import { DeepPartial } from '@shared/models/common';
 import { BarRenderSharedContext } from '@home/components/widget/lib/chart/time-series-chart-bar.models';
+import { TimeSeriesChartStateValueConverter } from '@home/components/widget/lib/chart/time-series-chart-state.models';
 
 export class TbTimeSeriesChart {
 
@@ -89,6 +94,13 @@ export class TbTimeSeriesChart {
           settings.lineSettings.showPoints = true;
           settings.lineSettings.pointShape = EChartsShape.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.pointSize = 12;
         }
         return settings;
       }
@@ -97,7 +109,11 @@ export class TbTimeSeriesChart {
   }
 
   private get noAggregation(): boolean {
-    return this.ctx.defaultSubscription.timeWindowConfig?.aggregation?.type === AggregationType.NONE;
+    return this.ctx.defaultSubscription.subscriptionTimewindow?.aggregation?.type === AggregationType.NONE;
+  }
+
+  private get stateData(): boolean {
+    return this.ctx.defaultSubscription.subscriptionTimewindow?.aggregation?.stateData === true;
   }
 
   private readonly shapeResize$: ResizeObserver;
@@ -115,6 +131,8 @@ export class TbTimeSeriesChart {
   private timeSeriesChartOptions: EChartsOption;
 
   private readonly tooltipDateFormat: DateFormatProcessor;
+  private readonly tooltipValueFormatFunction: EChartsTooltipValueFormatFunction;
+  private readonly stateValueConverter: TimeSeriesChartStateValueConverter;
 
   private yMinSubject = new BehaviorSubject(-1);
   private yMaxSubject = new BehaviorSubject(1);
@@ -131,6 +149,8 @@ export class TbTimeSeriesChart {
 
   private barRenderSharedContext: BarRenderSharedContext;
 
+  private latestData: FormattedData[] = [];
+
   yMin$ = this.yMinSubject.asObservable();
   yMax$ = this.yMaxSubject.asObservable();
 
@@ -143,6 +163,10 @@ export class TbTimeSeriesChart {
     this.settings = mergeDeep({} as TimeSeriesChartSettings,
       timeSeriesChartDefaultSettings,
       this.inputSettings as TimeSeriesChartSettings);
+    if (this.settings.states && this.settings.states.length) {
+      this.stateValueConverter = new TimeSeriesChartStateValueConverter(this.ctx.dashboard.utils, this.settings.states);
+      this.tooltipValueFormatFunction = this.stateValueConverter.tooltipFormatter;
+    }
     const $dashboardPageElement = this.ctx.$containerParent.parents('.tb-dashboard-page');
     const dashboardPageElement = $dashboardPageElement.length ? $($dashboardPageElement[$dashboardPageElement.length-1]) : null;
     this.darkMode = this.settings.darkMode || dashboardPageElement?.hasClass('dark');
@@ -150,8 +174,17 @@ export class TbTimeSeriesChart {
     this.setupData();
     this.setupThresholds();
     this.setupVisualMap();
-    if (this.settings.showTooltip && this.settings.tooltipShowDate) {
-      this.tooltipDateFormat = DateFormatProcessor.fromSettings(this.ctx.$injector, this.settings.tooltipDateFormat);
+    if (this.settings.showTooltip) {
+      if (this.settings.tooltipShowDate) {
+        this.tooltipDateFormat = DateFormatProcessor.fromSettings(this.ctx.$injector, this.settings.tooltipDateFormat);
+      }
+      if (!this.tooltipValueFormatFunction) {
+        this.tooltipValueFormatFunction =
+          createTooltipValueFormatFunction(this.settings.tooltipValueFormatter);
+        if (!this.tooltipValueFormatFunction) {
+          this.tooltipValueFormatFunction = (value, latestData, units, decimals) => formatValue(value, decimals, units, false);
+        }
+      }
     }
     this.onResize();
     if (this.autoResize) {
@@ -178,7 +211,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) : [];
+        item.data = datasourceData?.data ? toNamedData(datasourceData.data, this.stateValueConverter?.valueConverter) : [];
       }
     }
     this.onResize();
@@ -205,6 +238,14 @@ export class TbTimeSeriesChart {
   public latestUpdated() {
     let update = false;
     if (this.ctx.latestData) {
+      this.latestData = formattedDataFormDatasourceData(this.ctx.latestData);
+      for (const item of this.dataItems) {
+        let latestData = this.latestData.find(data => data.$datasource === item.datasource);
+        if (!latestData) {
+          latestData = {} as FormattedData;
+        }
+        item.latestData = latestData;
+      }
       for (const item of this.thresholdItems) {
         if (item.settings.type === TimeSeriesChartThresholdType.latestKey && item.latestDataKey) {
           const data = this.ctx.latestData.find(d => d.dataKey === item.latestDataKey);
@@ -253,7 +294,7 @@ export class TbTimeSeriesChart {
           seriesId: dataItem.id
         });
       }
-      this.timeSeriesChartOptions.series = this.updateSeries();
+      this.updateSeries();
       const mergeList = ['series'];
       if (this.updateYAxisScale(this.yAxisList)) {
         this.timeSeriesChartOptions.yAxis = this.yAxisList.map(axis => axis.option);
@@ -338,9 +379,12 @@ export class TbTimeSeriesChart {
               .includes(keySettings.barSettings.labelPosition as SeriesLabelPosition))) {
             this.topPointLabels = true;
           }
+          if (this.stateValueConverter && keySettings.type === TimeSeriesChartSeriesType.line) {
+            keySettings.lineSettings.pointLabelFormatter = this.stateValueConverter.labelFormatter;
+          }
           dataKey.settings = keySettings;
           const datasourceData = this.ctx.data ? this.ctx.data.find(d => d.dataKey === dataKey) : null;
-          const namedData = datasourceData?.data ? toNamedData(datasourceData.data) : [];
+          const namedData = datasourceData?.data ? toNamedData(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);
@@ -354,9 +398,11 @@ export class TbTimeSeriesChart {
             decimals,
             yAxisId,
             yAxisIndex: this.getYAxisIndex(yAxisId),
+            datasource,
             dataKey,
             data: namedData,
-            enabled: !keySettings.dataHiddenByDefault
+            enabled: !keySettings.dataHiddenByDefault,
+            tooltipValueFormatFunction: createTooltipValueFormatFunction(keySettings.tooltipValueFormatter)
           });
         }
       }
@@ -451,6 +497,10 @@ export class TbTimeSeriesChart {
       const units = axisSettings.units && axisSettings.units.length ? axisSettings.units : this.ctx.units;
       const decimals = isDefinedAndNotNull(axisSettings.decimals) ? axisSettings.decimals :
         (isDefinedAndNotNull(this.ctx.decimals) ? this.ctx.decimals : 2);
+      if (this.stateValueConverter) {
+        axisSettings.ticksGenerator = this.stateValueConverter.ticksGenerator;
+        axisSettings.ticksFormatter = this.stateValueConverter.ticksFormatter;
+      }
       const yAxis = createTimeSeriesYAxis(units, decimals, axisSettings, this.darkMode);
       this.yAxisList.push(yAxis);
     }
@@ -528,7 +578,7 @@ export class TbTimeSeriesChart {
         },
         formatter: (params: CallbackDataParams[]) =>
           this.settings.showTooltip ? echartsTooltipFormatter(this.renderer, this.tooltipDateFormat,
-            this.settings, params, 0, '',
+            this.settings, params, this.tooltipValueFormatFunction,
             this.settings.tooltipShowFocusedSeries ? getFocusedSeriesIndex(this.timeSeriesChart) : -1,
             this.dataItems,  this.noAggregation ? null : this.ctx.timeWindow.interval) : undefined,
         padding: [8, 12],
@@ -551,13 +601,15 @@ export class TbTimeSeriesChart {
         {
           type: 'inside',
           disabled: !this.settings.dataZoom,
-          realtime: true
+          realtime: true,
+          filterMode: this.stateData ? 'none' : 'filter'
         },
         {
           type: 'slider',
           show: this.settings.dataZoom,
           showDetail: false,
           realtime: true,
+          filterMode: this.stateData ? 'none' : 'filter',
           bottom: 10
         }
       ],
@@ -577,7 +629,7 @@ export class TbTimeSeriesChart {
 
     this.timeSeriesChartOptions.xAxis[0].tbTimeWindow = this.ctx.defaultSubscription.timeWindow;
 
-    this.timeSeriesChartOptions.series = this.updateSeries();
+    this.updateSeries();
     if (this.updateYAxisScale(this.yAxisList)) {
       this.timeSeriesChartOptions.yAxis = this.yAxisList.map(axis => axis.option);
     }
@@ -593,7 +645,7 @@ export class TbTimeSeriesChart {
   }
 
   private updateSeriesData(updateScale = false): void {
-    this.timeSeriesChartOptions.series = this.updateSeries();
+    this.updateSeries();
     if (updateScale && this.updateYAxisScale(this.yAxisList)) {
       this.timeSeriesChartOptions.yAxis = this.yAxisList.map(axis => axis.option);
     }
@@ -601,11 +653,16 @@ export class TbTimeSeriesChart {
     this.updateAxes();
   }
 
-  private updateSeries(): Array<LineSeriesOption | CustomSeriesOption> {
-    return generateChartData(this.dataItems, this.thresholdItems,
+  private updateSeries(): void {
+    this.timeSeriesChartOptions.series = generateChartData(this.dataItems, this.thresholdItems,
       this.settings.stack,
       this.noAggregation,
       this.barRenderSharedContext, this.darkMode);
+    if (this.stateData) {
+      adjustTimeAxisExtentToData(this.timeSeriesChartOptions.xAxis[0], this.dataItems,
+        this.ctx.defaultSubscription.timeWindow.minTime,
+        this.ctx.defaultSubscription.timeWindow.maxTime);
+    }
   }
 
   private updateAxes(lazy = true) {
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 5f0fbb9e37..6d015e04fa 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
@@ -56,6 +56,16 @@
                                         formControlName="barSettings">
     </tb-time-series-chart-bar-settings>
   </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.chart.tooltip-settings</div>
+    <tb-js-func
+        formControlName="tooltipValueFormatter"
+        [globalVariables]="functionScopeVariables"
+        [functionArgs]="['value', 'latestData']"
+        functionTitle="{{ 'widgets.chart.tooltip-value-format-function' | translate }}"
+        helpId="widget/lib/flot/tooltip_value_format_fn">
+    </tb-js-func>
+  </div>
 </ng-container>
 <ng-template #chartTypeTitle>
   <div class="tb-form-panel-title">{{ timeSeriesChartTypeTranslations.get(chartType) | translate }}</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.ts
index d1ac428396..3b49476a59 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.ts
@@ -29,6 +29,7 @@ import {
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { WidgetConfigComponentData } from '@home/models/widget-component.models';
 import { TimeSeriesChartWidgetSettings } from '@home/components/widget/lib/chart/time-series-chart-widget.models';
+import { WidgetService } from '@core/http/widget.service';
 
 @Component({
   selector: 'tb-time-series-chart-key-settings',
@@ -53,7 +54,10 @@ export class TimeSeriesChartKeySettingsComponent extends WidgetSettingsComponent
 
   yAxisIds: TimeSeriesChartYAxisId[];
 
+  functionScopeVariables = this.widgetService.getWidgetScopeVariables();
+
   constructor(protected store: Store<AppState>,
+              private widgetService: WidgetService,
               private fb: UntypedFormBuilder) {
     super(store);
   }
@@ -88,7 +92,8 @@ export class TimeSeriesChartKeySettingsComponent extends WidgetSettingsComponent
       dataHiddenByDefault: [seriesSettings.dataHiddenByDefault, []],
       type: [seriesSettings.type, []],
       lineSettings: [seriesSettings.lineSettings, []],
-      barSettings: [seriesSettings.barSettings, []]
+      barSettings: [seriesSettings.barSettings, []],
+      tooltipValueFormatter: [seriesSettings.tooltipValueFormatter, []],
     });
   }
 
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 cc3102c475..f20f1323b3 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
@@ -18,7 +18,7 @@
 <ng-container [formGroup]="lineSettingsFormGroup">
   <div *ngIf="chartType !== TimeSeriesChartType.point" class="tb-form-panel stroked">
     <div class="tb-form-panel-title" translate>widgets.time-series-chart.series.line.line</div>
-    <div class="tb-form-row">
+    <div *ngIf="chartType !== TimeSeriesChartType.state" class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="showLine">
         {{ 'widgets.time-series-chart.series.line.show-line' | translate }}
       </mat-slide-toggle>
@@ -35,7 +35,7 @@
         </mat-select>
       </mat-form-field>
     </div>
-    <div class="tb-form-row">
+    <div *ngIf="chartType !== TimeSeriesChartType.state" class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="smooth">
         {{ 'widgets.time-series-chart.series.line.smooth-line' | translate }}
       </mat-slide-toggle>
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 5b4701bf07..1d57220b4e 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
@@ -147,12 +147,22 @@ export class TimeSeriesChartLineSettingsComponent implements OnInit, ControlValu
   }
 
   private updateValidators() {
+    const state = this.chartType === TimeSeriesChartType.state;
     const showLine: boolean = this.lineSettingsFormGroup.get('showLine').value;
     const step: boolean = this.lineSettingsFormGroup.get('step').value;
     const showPointLabel: boolean = this.lineSettingsFormGroup.get('showPointLabel').value;
     const enablePointLabelBackground: boolean = this.lineSettingsFormGroup.get('enablePointLabelBackground').value;
+    if (state) {
+      this.lineSettingsFormGroup.get('showLine').disable({emitEvent: false});
+    } else {
+      this.lineSettingsFormGroup.get('showLine').enable({emitEvent: false});
+    }
     if (showLine) {
-      this.lineSettingsFormGroup.get('step').enable({emitEvent: false});
+      if (state) {
+        this.lineSettingsFormGroup.get('step').disable({emitEvent: false});
+      } else {
+        this.lineSettingsFormGroup.get('step').enable({emitEvent: false});
+      }
       if (step) {
         this.lineSettingsFormGroup.get('stepType').enable({emitEvent: false});
         this.lineSettingsFormGroup.get('smooth').disable({emitEvent: false});
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 fbd960be18..d98f9ee319 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
@@ -16,6 +16,10 @@
 
 -->
 <ng-container [formGroup]="timeSeriesChartWidgetSettingsForm">
+  <tb-time-series-chart-states-panel
+      *ngIf="chartType === TimeSeriesChartType.state"
+      formControlName="states">
+  </tb-time-series-chart-states-panel>
   <tb-time-series-chart-y-axes-panel
     formControlName="yAxes"
     (axisRemoved)="yAxisRemoved($event)"
@@ -118,6 +122,13 @@
               </tb-color-input>
             </div>
           </div>
+          <tb-js-func
+              formControlName="tooltipValueFormatter"
+              [globalVariables]="functionScopeVariables"
+              [functionArgs]="['value', 'latestData']"
+              functionTitle="{{ 'widgets.chart.tooltip-value-format-function' | translate }}"
+              helpId="widget/lib/flot/tooltip_value_format_fn">
+          </tb-js-func>
           <div class="tb-form-row column-xs">
             <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="tooltipShowDate">
               {{ 'tooltip.date' | translate }}
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 6edab7ecf2..01ecca2944 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
@@ -39,6 +39,7 @@ import {
   TimeSeriesChartYAxisId
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { WidgetConfigComponentData } from '@home/models/widget-component.models';
+import { WidgetService } from '@core/http/widget.service';
 
 @Component({
   selector: 'tb-time-series-chart-widget-settings',
@@ -77,8 +78,11 @@ export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsCompon
 
   chartType: TimeSeriesChartType = TimeSeriesChartType.default;
 
+  functionScopeVariables = this.widgetService.getWidgetScopeVariables();
+
   constructor(protected store: Store<AppState>,
               private $injector: Injector,
+              private widgetService: WidgetService,
               private fb: UntypedFormBuilder) {
     super(store);
   }
@@ -129,6 +133,7 @@ export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsCompon
       tooltipTrigger: [settings.tooltipTrigger, []],
       tooltipValueFont: [settings.tooltipValueFont, []],
       tooltipValueColor: [settings.tooltipValueColor, []],
+      tooltipValueFormatter: [settings.tooltipValueFormatter, []],
       tooltipShowDate: [settings.tooltipShowDate, []],
       tooltipDateFormat: [settings.tooltipDateFormat, []],
       tooltipDateFont: [settings.tooltipDateFont, []],
@@ -143,6 +148,9 @@ export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsCompon
       background: [settings.background, []],
       padding: [settings.padding, []]
     });
+    if (this.chartType === TimeSeriesChartType.state) {
+      this.timeSeriesChartWidgetSettingsForm.addControl('states', this.fb.control(settings.states, []));
+    }
   }
 
   protected validatorTriggers(): string[] {
@@ -168,6 +176,7 @@ export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsCompon
       this.timeSeriesChartWidgetSettingsForm.get('tooltipTrigger').enable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipValueFont').enable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipValueColor').enable();
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipValueFormatter').enable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipShowDate').enable({emitEvent: false});
       this.timeSeriesChartWidgetSettingsForm.get('tooltipBackgroundColor').enable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipBackgroundBlur').enable();
@@ -185,6 +194,7 @@ export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsCompon
     } else {
       this.timeSeriesChartWidgetSettingsForm.get('tooltipValueFont').disable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipValueColor').disable();
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipValueFormatter').disable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipShowDate').disable({emitEvent: false});
       this.timeSeriesChartWidgetSettingsForm.get('tooltipDateFormat').disable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipDateFont').disable();
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 66b6c9896d..cd240ba8e4 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
@@ -68,6 +68,15 @@
             <input matInput formControlName="decimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
           </mat-form-field>
         </div>
+        <div *ngIf="axisType === 'yAxis' && advanced" class="tb-form-row">
+          <tb-js-func fxFlex
+                      formControlName="ticksGenerator"
+                      [globalVariables]="functionScopeVariables"
+                      [functionArgs]="['extent']"
+                      functionTitle="{{ 'widgets.time-series-chart.axis.ticks-generator-function' | translate }}"
+                      helpId="widget/lib/chart/ticks_generator_fn">
+          </tb-js-func>
+        </div>
         <div class="tb-form-panel no-padding stroked">
           <div class="tb-form-row no-border space-between column-xs">
             <mat-slide-toggle class="mat-slide" formControlName="showTickLabels">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.ts
index ac49b8137d..91fe61caa3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.ts
@@ -85,7 +85,7 @@ export class TimeSeriesChartAxisSettingsComponent implements OnInit, ControlValu
   public axisSettingsFormGroup: UntypedFormGroup;
 
   constructor(private fb: UntypedFormBuilder,
-              private widgetService: WidgetService,) {
+              private widgetService: WidgetService) {
   }
 
   ngOnInit(): void {
@@ -113,6 +113,7 @@ export class TimeSeriesChartAxisSettingsComponent implements OnInit, ControlValu
       this.axisSettingsFormGroup.addControl('units', this.fb.control(null, []));
       this.axisSettingsFormGroup.addControl('decimals', this.fb.control(null, [Validators.min(0)]));
       this.axisSettingsFormGroup.addControl('ticksFormatter', this.fb.control(null, []));
+      this.axisSettingsFormGroup.addControl('ticksGenerator', this.fb.control(null, []));
       this.axisSettingsFormGroup.addControl('interval', this.fb.control(null, [Validators.min(0)]));
       this.axisSettingsFormGroup.addControl('splitNumber', this.fb.control(null, [Validators.min(1)]));
       this.axisSettingsFormGroup.addControl('min', this.fb.control(null, []));
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.html
new file mode 100644
index 0000000000..a2e11c3a8e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.html
@@ -0,0 +1,62 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div [formGroup]="stateFormGroup" class="tb-form-table-row tb-time-series-state-row">
+  <mat-form-field appearance="outline" class="tb-inline-field tb-state-label-field" subscriptSizing="dynamic">
+    <input matInput formControlName="label" placeholder="{{ 'widget-config.set' | translate }}">
+  </mat-form-field>
+  <mat-form-field appearance="outline" class="tb-inline-field number tb-state-value-field" subscriptSizing="dynamic">
+    <input matInput formControlName="value" type="number" placeholder="{{ 'widget-config.set' | translate }}">
+  </mat-form-field>
+  <mat-form-field class="tb-inline-field tb-state-source-field" appearance="outline" subscriptSizing="dynamic">
+    <mat-select formControlName="sourceType">
+      <mat-option *ngFor="let type of timeSeriesStateSourceTypes" [value]="type">
+        {{ timeSeriesStateSourceTypeTranslations.get(type) | translate }}
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
+  <div class="tb-state-source-value-field">
+    <tb-value-input
+        *ngIf="stateFormGroup.get('sourceType').value === TimeSeriesChartStateSourceType.constant"
+        formControlName="sourceValue"
+        fxFlex
+        [layout]="{
+                    layout: 'column',
+                    breakpoints: {'gt-sm': 'row'}
+                 }">
+    </tb-value-input>
+    <mat-form-field
+        *ngIf="stateFormGroup.get('sourceType').value === TimeSeriesChartStateSourceType.range"
+        appearance="outline" class="tb-inline-field number" subscriptSizing="dynamic">
+      <input matInput formControlName="sourceRangeFrom" type="number" placeholder="{{ 'widgets.time-series-chart.state.from' | translate }}">
+    </mat-form-field>
+    <mat-form-field
+        *ngIf="stateFormGroup.get('sourceType').value === TimeSeriesChartStateSourceType.range"
+        appearance="outline" class="tb-inline-field number" subscriptSizing="dynamic">
+      <input matInput formControlName="sourceRangeTo" type="number" placeholder="{{ 'widgets.time-series-chart.state.to' | translate }}">
+    </mat-form-field>
+  </div>
+  <div class="tb-form-table-row-cell-buttons">
+    <button type="button"
+            mat-icon-button
+            (click)="stateRemoved.emit()"
+            matTooltip="{{ 'widgets.time-series-chart.state.remove-state' | translate }}"
+            matTooltipPosition="above">
+      <mat-icon>delete</mat-icon>
+    </button>
+  </div>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.scss
new file mode 100644
index 0000000000..247eb5d28f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.scss
@@ -0,0 +1,51 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import '../../../../../../../../../scss/constants';
+
+.tb-form-table-row.tb-time-series-state-row {
+  @media #{$mat-lt-md} {
+    align-items: flex-start;
+  }
+  .tb-state-label-field {
+    flex: 1;
+    min-width: 70px;
+  }
+  .tb-state-value-field {
+    width: 80px;
+    min-width: 80px;
+  }
+  .tb-state-source-field {
+    width: 100px;
+    min-width: 100px;
+  }
+  .tb-state-source-value-field {
+    flex: 1;
+    min-width: 200px;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    @media #{$mat-gt-sm} {
+      min-width: 358px;
+      flex-direction: row;
+      align-items: center;
+      gap: 12px;
+    }
+    .tb-inline-field {
+      flex: 1;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.ts
new file mode 100644
index 0000000000..97c87432c2
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.ts
@@ -0,0 +1,138 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  forwardRef,
+  Input,
+  OnInit,
+  Output,
+  ViewEncapsulation
+} from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators
+} from '@angular/forms';
+import {
+  TimeSeriesChartStateSettings,
+  TimeSeriesChartStateSourceType,
+  timeSeriesStateSourceTypes,
+  timeSeriesStateSourceTypeTranslations
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+
+@Component({
+  selector: 'tb-time-series-chart-state-row',
+  templateUrl: './time-series-chart-state-row.component.html',
+  styleUrls: ['./time-series-chart-state-row.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartStateRowComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class TimeSeriesChartStateRowComponent implements ControlValueAccessor, OnInit {
+
+  TimeSeriesChartStateSourceType = TimeSeriesChartStateSourceType;
+
+  timeSeriesStateSourceTypes = timeSeriesStateSourceTypes;
+
+  timeSeriesStateSourceTypeTranslations = timeSeriesStateSourceTypeTranslations;
+
+  @Input()
+  disabled: boolean;
+
+  @Output()
+  stateRemoved = new EventEmitter();
+
+  stateFormGroup: UntypedFormGroup;
+
+  modelValue: TimeSeriesChartStateSettings;
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder,
+              private cd: ChangeDetectorRef) {
+  }
+
+  ngOnInit() {
+    this.stateFormGroup = this.fb.group({
+      label: [null, []],
+      value: [null, [Validators.required]],
+      sourceType: [null, [Validators.required]],
+      sourceValue: [null, [Validators.required]],
+      sourceRangeFrom: [null, []],
+      sourceRangeTo: [null, []]
+    });
+    this.stateFormGroup.valueChanges.subscribe(
+      () => this.updateModel()
+    );
+    this.stateFormGroup.get('sourceType').valueChanges.subscribe(() => {
+      this.updateValidators();
+    });
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.stateFormGroup.disable({emitEvent: false});
+    } else {
+      this.stateFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  writeValue(value: TimeSeriesChartStateSettings): void {
+    this.modelValue = value;
+    this.stateFormGroup.patchValue(
+      value, {emitEvent: false}
+    );
+    this.updateValidators();
+    this.cd.markForCheck();
+  }
+
+  private updateValidators() {
+    const sourceType: TimeSeriesChartStateSourceType = this.stateFormGroup.get('sourceType').value;
+    if (sourceType === TimeSeriesChartStateSourceType.constant) {
+      this.stateFormGroup.get('sourceValue').enable({emitEvent: false});
+      this.stateFormGroup.get('sourceRangeFrom').disable({emitEvent: false});
+      this.stateFormGroup.get('sourceRangeTo').disable({emitEvent: false});
+    } else if (sourceType === TimeSeriesChartStateSourceType.range) {
+      this.stateFormGroup.get('sourceValue').disable({emitEvent: false});
+      this.stateFormGroup.get('sourceRangeFrom').enable({emitEvent: false});
+      this.stateFormGroup.get('sourceRangeTo').enable({emitEvent: false});
+    }
+  }
+
+  private updateModel() {
+    this.modelValue = this.stateFormGroup.value;
+    this.propagateChange(this.modelValue);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.html
new file mode 100644
index 0000000000..5db76d1493
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.html
@@ -0,0 +1,47 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div class="tb-form-panel tb-time-series-states-panel">
+  <div class="tb-form-panel-title">{{ 'widgets.time-series-chart.state.states' | translate }}</div>
+  <div class="tb-form-table">
+    <div class="tb-form-table-header">
+      <div class="tb-form-table-header-cell tb-state-label-header" translate>widgets.time-series-chart.state.label</div>
+      <div class="tb-form-table-header-cell tb-state-value-header" translate>widgets.time-series-chart.state.ticks-value</div>
+      <div class="tb-form-table-header-cell tb-state-source-header" translate>widgets.time-series-chart.state.source</div>
+      <div class="tb-form-table-header-cell tb-state-source-value-header" translate>widgets.time-series-chart.state.value-range</div>
+      <div class="tb-form-table-header-cell tb-actions-header"></div>
+    </div>
+    <div *ngIf="statesFormArray().controls.length; else noStates" class="tb-form-table-body">
+      <div *ngFor="let stateControl of statesFormArray().controls; trackBy: trackByState; let $index = index; let $last = last">
+        <tb-time-series-chart-state-row fxFlex
+                                        [formControl]="stateControl"
+                                        (stateRemoved)="removeState($index)">
+        </tb-time-series-chart-state-row>
+        <mat-divider *ngIf="!$last"></mat-divider>
+      </div>
+    </div>
+  </div>
+  <div>
+    <button type="button" mat-stroked-button color="primary" (click)="addState()">
+      {{ 'widgets.time-series-chart.state.add-state' | translate }}
+    </button>
+  </div>
+</div>
+<ng-template #noStates>
+  <span fxLayoutAlign="center center"
+        class="tb-prompt">{{ 'widgets.time-series-chart.state.no-states' | translate }}</span>
+</ng-template>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.scss
new file mode 100644
index 0000000000..3177b8cdc1
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.scss
@@ -0,0 +1,60 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import '../../../../../../../../../scss/constants';
+
+.tb-time-series-states-panel {
+  .tb-form-table {
+    overflow-x: auto;
+  }
+  .tb-form-table-header-cell {
+    &.tb-state-label-header {
+      flex: 1;
+      min-width: 80px;
+    }
+    &.tb-state-value-header {
+      width: 80px;
+      min-width: 80px;
+    }
+    &.tb-state-source-header {
+      width: 100px;
+      min-width: 100px;
+    }
+    &.tb-state-source-value-header {
+      flex: 1;
+      min-width: 200px;
+      @media #{$mat-gt-sm} {
+        min-width: 358px;
+      }
+    }
+    &.tb-actions-header {
+      width: 40px;
+      min-width: 40px;
+    }
+  }
+  .tb-form-table-header {
+    min-width: fit-content;
+  }
+  .tb-form-table-body {
+    min-width: fit-content;
+    .mat-divider {
+      margin-top: 8px;
+      @media #{$mat-gt-sm} {
+        display: none;
+      }
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.ts
new file mode 100644
index 0000000000..8c30582425
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.ts
@@ -0,0 +1,144 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, forwardRef, Input, OnInit, ViewEncapsulation } from '@angular/core';
+import {
+  AbstractControl,
+  ControlValueAccessor,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  UntypedFormArray,
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validator
+} from '@angular/forms';
+import {
+  TimeSeriesChartStateSettings,
+  TimeSeriesChartStateSourceType,
+  timeSeriesChartStateValid,
+  timeSeriesChartStateValidator
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+
+@Component({
+  selector: 'tb-time-series-chart-states-panel',
+  templateUrl: './time-series-chart-states-panel.component.html',
+  styleUrls: ['./time-series-chart-states-panel.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartStatesPanelComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => TimeSeriesChartStatesPanelComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class TimeSeriesChartStatesPanelComponent implements ControlValueAccessor, OnInit, Validator {
+
+  @Input()
+  disabled: boolean;
+
+  statesFormGroup: UntypedFormGroup;
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit() {
+    this.statesFormGroup = this.fb.group({
+      states: [this.fb.array([]), []]
+    });
+    this.statesFormGroup.valueChanges.subscribe(
+      () => {
+        let states: TimeSeriesChartStateSettings[] = this.statesFormGroup.get('states').value;
+        if (states) {
+          states = states.filter(s => timeSeriesChartStateValid(s));
+        }
+        this.propagateChange(states);
+      }
+    );
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.statesFormGroup.disable({emitEvent: false});
+    } else {
+      this.statesFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(value: TimeSeriesChartStateSettings[] | undefined): void {
+    const states = value || [];
+    this.statesFormGroup.setControl('states', this.prepareStatesFormArray(states), {emitEvent: false});
+  }
+
+  public validate(c: UntypedFormControl) {
+    const valid = this.statesFormGroup.valid;
+    return valid ? null : {
+      states: {
+        valid: false,
+      },
+    };
+  }
+
+  statesFormArray(): UntypedFormArray {
+    return this.statesFormGroup.get('states') as UntypedFormArray;
+  }
+
+  trackByState(index: number, stateControl: AbstractControl): any {
+    return stateControl;
+  }
+
+  removeState(index: number) {
+    (this.statesFormGroup.get('states') as UntypedFormArray).removeAt(index);
+  }
+
+  addState() {
+    const state: TimeSeriesChartStateSettings = {
+      label: '',
+      value: 0,
+      sourceType: TimeSeriesChartStateSourceType.constant
+    };
+    const statesArray = this.statesFormGroup.get('states') as UntypedFormArray;
+    const stateControl = this.fb.control(state, [timeSeriesChartStateValidator]);
+    statesArray.push(stateControl);
+  }
+
+  private prepareStatesFormArray(states: TimeSeriesChartStateSettings[] | undefined): UntypedFormArray {
+    const statesControls: Array<AbstractControl> = [];
+    if (states) {
+      states.forEach((state) => {
+        statesControls.push(this.fb.control(state, [timeSeriesChartStateValidator]));
+      });
+    }
+    return this.fb.array(statesControls);
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts
index 86e460ff9d..e25282bb4c 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
@@ -133,6 +133,12 @@ import {
 import {
   TimeSeriesChartThresholdSettingsComponent
 } from '@home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings.component';
+import {
+  TimeSeriesChartStateRowComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component';
+import {
+  TimeSeriesChartStatesPanelComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component';
 
 @NgModule({
   declarations: [
@@ -182,6 +188,8 @@ import {
     TimeSeriesChartAnimationSettingsComponent,
     TimeSeriesChartFillSettingsComponent,
     TimeSeriesChartThresholdSettingsComponent,
+    TimeSeriesChartStatesPanelComponent,
+    TimeSeriesChartStateRowComponent,
     DataKeyInputComponent,
     EntityAliasInputComponent
   ],
@@ -237,6 +245,8 @@ import {
     TimeSeriesChartAnimationSettingsComponent,
     TimeSeriesChartFillSettingsComponent,
     TimeSeriesChartThresholdSettingsComponent,
+    TimeSeriesChartStatesPanelComponent,
+    TimeSeriesChartStateRowComponent,
     DataKeyInputComponent,
     EntityAliasInputComponent
   ],
diff --git a/ui-ngx/src/assets/help/en_US/widget/lib/chart/ticks_generator_fn.md b/ui-ngx/src/assets/help/en_US/widget/lib/chart/ticks_generator_fn.md
new file mode 100644
index 0000000000..e3b5bf817a
--- /dev/null
+++ b/ui-ngx/src/assets/help/en_US/widget/lib/chart/ticks_generator_fn.md
@@ -0,0 +1,61 @@
+#### Ticks generator function
+
+<div class="divider"></div>
+<br/>
+
+*function (extent): {value: number}[]*
+
+A JavaScript function used to generate Y axis ticks.
+
+**Parameters:**
+
+<ul>
+  <li><b>extent:</b> <code>number[]</code> - An array of two numbers holding axis min and max values <b>[axisMin, axisMax]</b>.
+  </li>
+</ul>
+
+**Returns:**
+
+An array of tick values with the following structure:
+
+```typescript
+{
+    value: number
+}
+```
+
+<div class="divider"></div>
+
+##### Examples
+
+* Always display only one tick in the middle:
+
+```javascript
+return extent ? [{ value: (extent[0] + extent[1]) / 2}] : [];
+{:copy-code}
+```
+
+* Display only min and max ticks:
+
+```javascript
+if (extent) {
+  return [ {value: extent[0]}, {value: extent[1]} ];
+} else {
+  return [];
+}
+{:copy-code}
+```
+
+* Disable ticks:
+
+```javascript
+return [];
+{:copy-code}
+```
+
+* Constant ticks (1,2,3):
+
+```javascript
+return [ {value: 1}, {value: 2}, {value: 3} ];
+{:copy-code}
+```
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index ea3d0f62d0..1f3b79f292 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -6786,6 +6786,20 @@
               "label-position-inside-end-bottom": "Inside end bottom",
               "label-background": "Label background"
             },
+            "state": {
+              "states": "States",
+              "label": "Label",
+              "ticks-value": "Ticks value",
+              "source": "Source",
+              "value-range": "Value / Range",
+              "no-states": "No states configured",
+              "add-state": "Add state",
+              "type-constant": "Constant",
+              "type-range": "Range",
+              "from": "From",
+              "to": "To",
+              "remove-state": "Remove state"
+            },
             "axis": {
               "axes": "Axes",
               "x-axis": "X axis",
@@ -6801,6 +6815,7 @@
               "position-bottom": "Bottom",
               "tick-labels": "Tick labels",
               "ticks-formatter-function": "Ticks formatter function",
+              "ticks-generator-function": "Ticks generator function",
               "show-ticks": "Show ticks",
               "show-line": "Show line",
               "show-split-lines": "Show split lines",