diff --git a/.gitignore b/.gitignore
index 3a367cf1038..9bc95214ebb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*.iml
+.idea/*
 .DS_Store
 *.class
 *test.jar
diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/helper/WriteLockManager.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/helper/WriteLockManager.java
index 7cc2d566d94..b24acef7457 100644
--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/helper/WriteLockManager.java
+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/helper/WriteLockManager.java
@@ -22,27 +22,26 @@
 //       - 526957 : Split the logging and trace messages
 package org.eclipse.persistence.internal.helper;
 
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import org.eclipse.persistence.descriptors.ClassDescriptor;
 import org.eclipse.persistence.descriptors.FetchGroupManager;
 import org.eclipse.persistence.exceptions.ConcurrencyException;
 import org.eclipse.persistence.internal.helper.linkedlist.ExposedNodeLinkedList;
 import org.eclipse.persistence.internal.identitymaps.CacheKey;
-import org.eclipse.persistence.internal.localization.LoggingLocalization;
 import org.eclipse.persistence.internal.localization.TraceLocalization;
 import org.eclipse.persistence.internal.queries.ContainerPolicy;
-import org.eclipse.persistence.internal.sessions.AbstractSession;
-import org.eclipse.persistence.internal.sessions.MergeManager;
-import org.eclipse.persistence.internal.sessions.ObjectChangeSet;
-import org.eclipse.persistence.internal.sessions.UnitOfWorkChangeSet;
-import org.eclipse.persistence.internal.sessions.UnitOfWorkImpl;
+import org.eclipse.persistence.internal.sessions.*;
 import org.eclipse.persistence.logging.SessionLog;
 import org.eclipse.persistence.mappings.DatabaseMapping;
 
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static java.lang.Boolean.parseBoolean;
+
 /**
  * INTERNAL:
  * <p>
@@ -61,11 +60,19 @@
  */
 public class WriteLockManager {
 
+    private static final Logger logger = Logger.getLogger(WriteLockManager.class.getSimpleName());
+
     // this will allow us to prevent a readlock thread from looping forever.
     public static final int MAXTRIES = 10000;
 
     public static final int MAX_WAIT = 600000; //10 mins
 
+    private static boolean isInterruptionEnabled() {
+        String value = System.getProperty("interruptionEnabled");
+        return parseBoolean(value);
+    }
+
+
     /* This attribute stores the list of threads that have had a problem acquiring locks */
     /*  the first element in this list will be the prevailing thread */
     protected ExposedNodeLinkedList prevailingQueue;
@@ -98,7 +105,15 @@ public Map acquireLocksForClone(Object objectForClone, ClassDescriptor descripto
                             toWaitOn.wait();// wait for lock on object to be released
                         }
                     } catch (InterruptedException ex) {
-                        // Ignore exception thread should continue.
+                        //https://jira.site1.hyperwallet.local/browse/HW-53073
+                        //Custom change to allow thread interruptions for bad threads stuck in org.eclipse.persistence.internal.helper.WriteLockManager.acquireLocksForClone pattern
+                        if (isInterruptionEnabled()) {
+                            logger.log(Level.SEVERE,
+                                    "EclipseLinkLockHandler has set interruption flag to TRUE. Allowing interrupts");
+                            throw ConcurrencyException.waitWasInterrupted(ex.getMessage());
+                        }
+                        logger.log(Level.WARNING,
+                                "EclipseLinkLockHandler has not set the interruption flag to TRUE. Will not interrupt");
                     }
                 }
                 Object waitObject = toWaitOn.getObject();
@@ -110,6 +125,7 @@ public Map acquireLocksForClone(Object objectForClone, ClassDescriptor descripto
                 toWaitOn = acquireLockAndRelatedLocks(objectForClone, lockedObjects, refreshedObjects, cacheKey, descriptor, cloningSession);
                 if ((toWaitOn != null) && ((++tries) > MAXTRIES)) {
                     // If we've tried too many times abort.
+                    logger.log(Level.WARNING, "Interruption done by EclipseLink Library.");
                     throw ConcurrencyException.maxTriesLockOnCloneExceded(objectForClone);
                 }
             }