diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
index 9ca3957050..e0bdde1dd8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data;
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EventId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -26,6 +27,7 @@ import org.thingsboard.server.common.data.id.TenantId;
  * @author Andrew Shvayka
  */
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Schema
 public class EventInfo extends BaseData<EventId> {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java b/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
index ce9c8fce78..df2cdf2bf5 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
@@ -17,9 +17,11 @@ package org.thingsboard.server.common.data;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class HomeDashboard extends Dashboard {
 
     public static final String HIDE_DASHBOARD_TOOLBAR_DESCRIPTION = "Hide dashboard toolbar flag. Useful for rendering dashboards on mobile.";
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
index 4126b1acdd..8f38ecd750 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
@@ -17,10 +17,12 @@ package org.thingsboard.server.common.data;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.TenantId;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TenantInfo extends Tenant {
     @Schema(description = "Tenant Profile name", example = "Default")
     private String tenantProfileName;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
index ef7499fa33..20c1b218fc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
@@ -34,6 +34,7 @@ import java.io.Serial;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Builder
 @AllArgsConstructor
 public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
index 86a61e31b6..597cee3f1c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.DeviceTransportType;
 
 import java.util.HashMap;
@@ -27,6 +28,7 @@ import java.util.Map;
 
 @Data
 @Schema
+@EqualsAndHashCode(callSuper = false)
 public class CoapDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration {
 
     private static final long serialVersionUID = 6061442236008925609L;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
index 656262ab45..513accfe7b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.DeviceTransportType;
 
 import java.util.HashMap;
@@ -27,6 +28,7 @@ import java.util.Map;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class Lwm2mDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration {
 
     @JsonIgnore
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
index 85c1e97e24..14ef402718 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
@@ -17,9 +17,11 @@ package org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class LwM2MServerSecurityConfigDefault extends LwM2MServerSecurityConfig {
     @Schema(description = "Host for 'Security' mode (DTLS)", example = "0.0.0.0", accessMode = Schema.AccessMode.READ_ONLY)
     protected String securityHost;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
index dd751b8b9d..5dbd0212b3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
@@ -16,9 +16,11 @@
 package org.thingsboard.server.common.data.edge;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.EdgeId;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class EdgeInfo extends Edge {
 
     private String customerTitle;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
index 40ad22ed19..d05147b4d7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -26,6 +27,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class AssetFields extends AbstractEntityFields implements ProfileAwareFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
index ce91aac9d0..c519daa800 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
@@ -16,12 +16,14 @@
 package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class AssetProfileFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
index e2cdf8f295..c324f0f1ab 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class CustomerFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
index 4131d58e98..608a64436e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
@@ -19,6 +19,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -28,6 +29,7 @@ import java.util.UUID;
 
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class DashboardFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
index 90400ae70d..ef8aee952b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -26,6 +27,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class DeviceFields extends AbstractEntityFields implements ProfileAwareFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
index 067c961b9e..2331829054 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.thingsboard.server.common.data.DeviceProfileType;
@@ -23,6 +24,7 @@ import org.thingsboard.server.common.data.DeviceProfileType;
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class DeviceProfileFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
index 1d257b06e1..e048eb22a8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class EdgeFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
index 4e326cf779..c5027dfc8f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class EntityViewFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
index 13e05daad4..5c5a139364 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
@@ -16,12 +16,14 @@
 package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class QueueStatsFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
index 25b7db6aaa..d580f6b913 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class RuleChainFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
index 9b538511b2..ba350fec54 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class TenantFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
index f6a2889f67..5d1ff0e0e2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -23,6 +24,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class TenantProfileFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
index 225b85680f..70fde8bf9c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class UserFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
index 233c53849c..f46339c15a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
@@ -16,8 +16,10 @@
 package org.thingsboard.server.common.data.kv;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class BaseDeleteTsKvQuery extends BaseTsKvQuery implements DeleteTsKvQuery {
 
     private final Boolean rewriteLatestIfDeleted;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
index d45335021f..07be1d249d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
@@ -19,6 +19,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
@@ -31,6 +32,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
+@EqualsAndHashCode(callSuper = false)
 @ToString
 @Schema
 public class AlarmCountQuery extends EntityCountQuery {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java b/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
index 57e0e6af66..d6a4f2b12f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.queue;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseDataWithAdditionalInfo;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasTenantId;
@@ -30,6 +31,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 import java.util.Optional;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class Queue extends BaseDataWithAdditionalInfo<QueueId> implements HasName, HasTenantId, QueueConfig {
     private TenantId tenantId;
     @NoXss
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
index cb861a6726..0624350d7e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
@@ -16,12 +16,14 @@
 package org.thingsboard.server.common.data.rule;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.RuleNodeStateId;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class RuleNodeState extends BaseData<RuleNodeStateId> {
 
     private RuleNodeId ruleNodeId;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
index 9fe846796b..9acce93aa3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.widget;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
 import org.thingsboard.server.common.data.validation.NoXss;
 
@@ -26,6 +27,7 @@ import java.util.Collections;
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class WidgetTypeInfo extends BaseWidgetType {
 
     @Serial
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
index 45d9e21e39..8356a17748 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
@@ -16,8 +16,10 @@
 package org.thingsboard.server.transport.mqtt.limits;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class GatewaySessionLimits extends SessionLimits {
 
     private SessionRateLimits gatewayRateLimits;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
index 971c06c7a0..f73b634f08 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
@@ -26,6 +26,7 @@ import jakarta.persistence.SqlResultSetMapping;
 import jakarta.persistence.SqlResultSetMappings;
 import jakarta.persistence.Table;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.dao.model.sql.AbstractTsKvEntity;
 import org.thingsboard.server.dao.sqlts.latest.SearchTsKvLatestRepository;
@@ -35,6 +36,7 @@ import java.util.UUID;
 import static org.thingsboard.server.dao.model.ModelConstants.VERSION_COLUMN;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Entity
 @Table(name = "ts_kv_latest")
 @IdClass(TsKvLatestCompositeKey.class)
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
index a69a157241..ab305919fd 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
@@ -16,10 +16,12 @@
 package org.thingsboard.rule.engine.action;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.rule.engine.api.NodeConfiguration;
 import org.thingsboard.server.common.data.script.ScriptLanguage;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TbClearAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbClearAlarmNodeConfiguration> {
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
index 8c791e7634..bf305a55d1 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
@@ -16,6 +16,7 @@
 package org.thingsboard.rule.engine.action;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.rule.engine.api.NodeConfiguration;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.script.ScriptLanguage;
@@ -25,6 +26,7 @@ import java.util.Collections;
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TbCreateAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbCreateAlarmNodeConfiguration> {
 
     @NoXss
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
index 3b59d814f1..6551352823 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
@@ -16,6 +16,7 @@
 package org.thingsboard.rule.engine.geo;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.common.util.geo.PerimeterType;
 
 import java.util.concurrent.TimeUnit;
@@ -24,6 +25,7 @@ import java.util.concurrent.TimeUnit;
  * Created by ashvayka on 19.01.18.
  */
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TbGpsGeofencingActionNodeConfiguration extends TbGpsGeofencingFilterNodeConfiguration {
 
     private int minInsideDuration;
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
index fe17c659e1..93d1ef7ef8 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
@@ -20,6 +20,7 @@ import io.netty.handler.ssl.ClientAuth;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.thingsboard.common.util.AzureIotHubUtil;
@@ -29,6 +30,7 @@ import org.thingsboard.rule.engine.credentials.CredentialsType;
 import java.security.Security;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Slf4j
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AzureIotHubSasCredentials extends CertPemCredentials {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
index c786478575..f11173f3f9 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
@@ -17,9 +17,11 @@ package org.thingsboard.rule.engine.mqtt.azure;
 
 import io.netty.handler.codec.mqtt.MqttVersion;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.rule.engine.mqtt.TbMqttNodeConfiguration;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TbAzureIotHubNodeConfiguration extends TbMqttNodeConfiguration {
 
     @Override